From 05d6b16b9c57223cccb55fb08a0dc9016fea8b26 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 9 Apr 2020 18:49:40 +0800
Subject: [PATCH 001/292] Fix loading music fadeout on far TP between ring and
 mainland

---
 ryzom/client/src/main_loop.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index 172c4056b..356b00452 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -2517,9 +2517,6 @@ bool mainLoop()
 				Actions.enable(true);
 				EditActions.enable(true);
 
-				// For stoping the outgame music, start after 30 frames, and duration of 3 seconds
-				outgameFader = CMusicFader(60, 3);
-
 				// check for banned player
 				if (testPermanentBanMarkers())
 				{
@@ -2529,6 +2526,9 @@ bool mainLoop()
 				}
 			}
 
+			// For stoping the outgame music, start after 30 frames, and duration of 3 seconds
+			outgameFader = CMusicFader(60, 3);
+
 			// Short reinit of the main loop after farTP or character reselection
 			Ping.init();
 			updateLightDesc();

From 9b0852a91d5437dc9acab8f0a825cc6b974d5dd3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 10 Apr 2020 09:59:11 +0800
Subject: [PATCH 002/292] Protect from duplicate UP and DOWN callbacks, fix
 ryzom/ryzomcore#601

---
 nel/include/nel/net/unified_network.h |  1 +
 nel/src/net/unified_network.cpp       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/nel/include/nel/net/unified_network.h b/nel/include/nel/net/unified_network.h
index d380427b6..df735a740 100644
--- a/nel/include/nel/net/unified_network.h
+++ b/nel/include/nel/net/unified_network.h
@@ -662,6 +662,7 @@ private:
 	std::vector<TCallbackArgItem>				_UpUniCallback;
 	TNameMappedCallback							_DownCallbacks;
 	std::vector<TCallbackArgItem>				_DownUniCallback;
+	std::set<std::pair<std::string, TServiceId>>	_NotifiedUpCallbacks;
 
 	/// Recording state
 	CCallbackNetBase::TRecordingState			_RecordingState;
diff --git a/nel/src/net/unified_network.cpp b/nel/src/net/unified_network.cpp
index 5a6034e18..ca3ef37d7 100644
--- a/nel/src/net/unified_network.cpp
+++ b/nel/src/net/unified_network.cpp
@@ -2090,6 +2090,14 @@ void CUnifiedNetwork::addNetworkAssociation (const string &networkName, uint8 ni
 
 void CUnifiedNetwork::callServiceUpCallback (const std::string &serviceName, TServiceId sid, bool callGlobalCallback)
 {
+	std::pair<std::string, TServiceId> pss = std::make_pair(serviceName, sid);
+	if (_NotifiedUpCallbacks.find(pss) != _NotifiedUpCallbacks.end())
+	{
+		nlwarning("HNETL5: Attempt to call service UP callback twice for '%s', ignored!", serviceName.c_str());
+		return;
+	}
+	_NotifiedUpCallbacks.insert(pss);
+
 	// now we warn the user
 	CUnifiedNetwork::TNameMappedCallback::iterator	it = _UpCallbacks.find(serviceName);
 	if (it != _UpCallbacks.end())
@@ -2119,6 +2127,14 @@ void CUnifiedNetwork::callServiceUpCallback (const std::string &serviceName, TSe
 
 void CUnifiedNetwork::callServiceDownCallback (const std::string &serviceName, TServiceId sid, bool callGlobalCallback)
 {
+	std::pair<std::string, TServiceId> pss = std::make_pair(serviceName, sid);
+	if (_NotifiedUpCallbacks.find(pss) == _NotifiedUpCallbacks.end())
+	{
+		nlwarning("HNETL5: Attempt to call service DOWN callback twice for '%s', ignored!", serviceName.c_str());
+		return;
+	}
+	_NotifiedUpCallbacks.erase(pss);
+
 	// now we warn the user
 	CUnifiedNetwork::TNameMappedCallback::iterator	it = _DownCallbacks.find(serviceName);
 	if (it != _DownCallbacks.end())

From 5c0c6d24178a1e63c49e72941ea7714adf7d42fc Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 11 Apr 2020 11:52:09 +0800
Subject: [PATCH 003/292] Generate 7z server patch, ref ryzom/ryzomcore#586

---
 nel/tools/build_gamedata/c1_shard_patch.py    | 39 ++++++++++++-------
 .../build_gamedata/configuration/tools.py     |  1 +
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/nel/tools/build_gamedata/c1_shard_patch.py b/nel/tools/build_gamedata/c1_shard_patch.py
index b67b053a8..e67314cd8 100755
--- a/nel/tools/build_gamedata/c1_shard_patch.py
+++ b/nel/tools/build_gamedata/c1_shard_patch.py
@@ -49,6 +49,9 @@ printLog(log, "-------")
 printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
 printLog(log, "")
 
+# Find tools
+SevenZip = findTool(log, ToolDirectories, SevenZipTool, ToolSuffix)
+
 # List the directories that will be used
 archiveDirectories = [ ]
 for dir in InstallShardDataDirectories:
@@ -89,23 +92,29 @@ else:
 printLog(log, "")
 
 if not args.admininstall:
-	printLog(log, ">>> Create new version <<<")
-	newVersion = 1
-	vstr = str(newVersion).zfill(6)
-	vpath = PatchmanBridgeServerDirectory + "/" + vstr
-	while os.path.exists(vpath):
-		newVersion = newVersion + 1
+	if SevenZip == "":
+		toolLogFail(log, SevenZipTool, ToolSuffix)
+	else:
+		printLog(log, ">>> Create new version <<<")
+		newVersion = 1
 		vstr = str(newVersion).zfill(6)
 		vpath = PatchmanBridgeServerDirectory + "/" + vstr
-	mkPath(log, vpath)
-	for dir in archiveDirectories:
-		mkPath(log, ShardInstallDirectory + "/" + dir)
-		tgzPath = vpath + "/" + dir + ".tgz"
-		printLog(log, "WRITE " + tgzPath)
-		tar = tarfile.open(tgzPath, "w:gz")
-		tar.add(ShardInstallDirectory + "/" + dir, arcname = dir)
-		tar.close()
-	printLog(log, "")
+		while os.path.exists(vpath):
+			newVersion = newVersion + 1
+			vstr = str(newVersion).zfill(6)
+			vpath = PatchmanBridgeServerDirectory + "/" + vstr
+		mkPath(log, vpath)
+		for dir in archiveDirectories:
+			mkPath(log, ShardInstallDirectory + "/" + dir)
+			# tgzPath = vpath + "/" + dir + ".tgz"
+			# printLog(log, "WRITE " + tgzPath)
+			# tar = tarfile.open(tgzPath, "w:gz")
+			# tar.add(ShardInstallDirectory + "/" + dir, arcname = dir)
+			# tar.close()
+			sevenZipPath = vpath + "/" + dir + ".7z"
+			printLog(log, "WRITE " + sevenZipPath)
+			subprocess.call([ SevenZip, "a", sevenZipPath, ShardInstallDirectory + "/" + dir ])
+		printLog(log, "")
 
 log.close()
 if os.path.isfile("c1_shard_patch.log"):
diff --git a/nel/tools/build_gamedata/configuration/tools.py b/nel/tools/build_gamedata/configuration/tools.py
index ebb1d07da..ee933c8e9 100755
--- a/nel/tools/build_gamedata/configuration/tools.py
+++ b/nel/tools/build_gamedata/configuration/tools.py
@@ -98,3 +98,4 @@ PatchGenTool = "patch_gen"
 TranslationToolsTool = "translation_tools"
 BuildWorldPackedColTool = "build_world_packed_col"
 R2IslandsTexturesTool = "r2_islands_textures"
+SevenZipTool = "7za"

From 1ab8fe06de6a0593a27333ef915ad3b8033778ed Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 15 Apr 2020 16:40:53 +0800
Subject: [PATCH 004/292] Just copy actors without MRM setup

---
 nel/tools/build_gamedata/processes/shape/2_build.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nel/tools/build_gamedata/processes/shape/2_build.py b/nel/tools/build_gamedata/processes/shape/2_build.py
index f261473fe..86a3b6a99 100755
--- a/nel/tools/build_gamedata/processes/shape/2_build.py
+++ b/nel/tools/build_gamedata/processes/shape/2_build.py
@@ -74,6 +74,13 @@ else:
 	printLog(log, ">>> Copy Shape <<<")
 	copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
 
+printLog(log, ">>> Copy non-ShadowSkin non-CLodTex Shape <<<")
+shapeDirectory = ExportBuildDirectory + "/" + ShapeNotOptimizedExportDirectory
+mkPath(log, shapeDirectory)
+mkPath(log, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory)
+copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
+shapeDirectory = ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory
+
 # copy lightmap_not_optimized to lightmap
 printLog(log, ">>> Optimize lightmaps <<<")
 loPathLightmapsOriginal = ExportBuildDirectory + "/" + ShapeLightmapNotOptimizedExportDirectory

From db92cbc6bbd270835c7d50fbe49240b95980e8b0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 16 Apr 2020 09:22:32 +0800
Subject: [PATCH 005/292] Disable warning

---
 nel/src/sound/driver/xaudio2/source_xaudio2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
index 785ce0565..273c6ee60 100644
--- a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
+++ b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
@@ -480,7 +480,7 @@ void CSourceXAudio2::setLooping(bool l)
 					_SourceVoice->GetState(&voice_state);
 					if (voice_state.BuffersQueued)
 					{
-						nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue");
+						// nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue");
 						if (FAILED(_SourceVoice->FlushSourceBuffers())) 
 							nlwarning(NLSOUND_XAUDIO2_PREFIX "FAILED FlushSourceBuffers");
 						// queue buffer with correct looping parameters

From c00701eee1dfdc7fbb3ed30f0c1742bc12803cb8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 16 Apr 2020 09:22:47 +0800
Subject: [PATCH 006/292] More useful warnings

---
 nel/src/pacs/move_container.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nel/src/pacs/move_container.cpp b/nel/src/pacs/move_container.cpp
index 7c346aed4..099f46839 100644
--- a/nel/src/pacs/move_container.cpp
+++ b/nel/src/pacs/move_container.cpp
@@ -418,13 +418,13 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 /*	// Check BB width not too large
 	if (wI->getBBXMax() - wI->getBBXMin() > _CellWidth)
 	{
-		nlwarning ("Primitives have moved more than a cell.");
+		nlwarning ("Primitives have moved more than a cell, width: %f.", (float)(wI->getBBXMax() - wI->getBBXMin()));
 	}
 
 	// Check BB height not too large
 	if (wI->getBBYMax() - wI->getBBYMin() > _CellHeight)
 	{
-		nlwarning ("Primitives have moved more than a cell.");
+		nlwarning ("Primitives have moved more than a cell, height: %f.", (float)(wI->getBBYMax() - wI->getBBYMin()));
 	}
 */
 #endif

From 8b8308c3544788179bc128f51b56d8d756fb1662 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 17 Apr 2020 08:16:53 +0800
Subject: [PATCH 007/292] Allow setting patch version

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df8279f1..54b133ac3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ ENDIF()
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 1)
-SET(NL_VERSION_MINOR 0)
-SET(NL_VERSION_PATCH 2)
+SET(NL_VERSION_MINOR 1)
+SET(NL_VERSION_PATCH 0 CACHE STRING "Patch version")
 SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 

From d0068265fb715cd96eab9ca8d8f3b0efe5e76448 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 17 Apr 2020 06:11:56 +0800
Subject: [PATCH 008/292] Compare tag for creating bnp, since bnp get older
 timestamp reset if they match

---
 nel/tools/build_gamedata/d1_client_patch.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nel/tools/build_gamedata/d1_client_patch.py b/nel/tools/build_gamedata/d1_client_patch.py
index ea4cc742c..5237542f6 100755
--- a/nel/tools/build_gamedata/d1_client_patch.py
+++ b/nel/tools/build_gamedata/d1_client_patch.py
@@ -123,7 +123,9 @@ else:
 	printLog(log, "")
 	printLog(log, ">>> Make bnp <<<")
 	targetPath = ClientPatchDirectory + "/bnp"
+	tagPath = ClientPatchDirectory + "/bnp_tag"
 	mkPath(log, targetPath)
+	mkPath(log, tagPath)
 	for category in InstallClientData:
 		packExt = ".bnp"
 		if (category["StreamedPackages"]):
@@ -133,25 +135,32 @@ else:
 			sourcePath = InstallDirectory + "/" + package[0]
 			mkPath(log, sourcePath)
 			targetBnp = targetPath + "/" + package[0] + packExt
+			tagBnp = tagPath + "/" + package[0] + packExt + ".tag"
 			if (len(package[1]) > 0):
 				targetBnp = targetPath + "/" + package[1][0]
+				tagBnp = tagPath + "/" + package[1][0] + ".tag"
 				printLog(log, "TARGET " + package[1][0])
 			needUpdateBnp = 1
 			if (len(package) > 2):
-				needUpdateBnp = needUpdate(log, sourcePath + "/" + package[2], targetBnp)
+				needUpdateBnp = needUpdate(log, sourcePath + "/" + package[2], tagBnp)
 			else:
-				needUpdateBnp = needUpdateDirNoSubdirFile(log, sourcePath, targetBnp)
+				needUpdateBnp = needUpdateDirNoSubdirFile(log, sourcePath, tagBnp)
 			if (needUpdateBnp):
+				subRet = 0
+				open(tagBnp, 'a').close()
+				os.utime(tagBnp, None)
 				if (category["StreamedPackages"]):
 					printLog(log, "SNP " + targetBnp)
 					# cwDir = os.getcwd().replace("\\", "/")
 					# toolDir = os.path.dirname(Lzma).replace("\\", "/")
 					# os.chdir(toolDir)
-					subprocess.call([ SnpMake, "-p", sourcePath, targetBnp, ClientPatchDirectory + "/stream" ] + package[1][1:])
+					subRet = subprocess.call([ SnpMake, "-p", sourcePath, targetBnp, ClientPatchDirectory + "/stream" ] + package[1][1:])
 					# os.chdir(cwDir)
 				else:
 					printLog(log, "BNP " + targetBnp)
-					subprocess.call([ BnpMake, "-p", sourcePath, "-o", targetBnp ] + package[1][1:])
+					subRet = subprocess.call([ BnpMake, "-p", sourcePath, "-o", targetBnp ] + package[1][1:])
+				if (subRet != 0):
+					os.remove(tagBnp)
 			else:
 				printLog(log, "SKIP " + targetBnp)
 	printLog(log, "")

From ec61fa02b6dc812ccf16c7d2e2e912a231759bc3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 17 Apr 2020 20:25:41 +0800
Subject: [PATCH 009/292] Fix hand slots for fauna, ref
 kaetemi/ryzomclassic#125

---
 ryzom/client/src/character_cl.cpp                 | 13 +++++++------
 .../client/src/client_sheets/character_sheet.cpp  | 15 +++++++++++++++
 ryzom/client/src/entity_cl.cpp                    |  2 ++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 447ce8e3d..76263ee56 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -1120,7 +1120,7 @@ void CCharacterCL::computeAnimSet()
 	// Use the generic method to compute the animation set.
 	if(!::computeAnimSet(_CurrentAnimSet[MOVE], _Mode, _Sheet->getAnimSetBaseName(), _Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet, _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet, !modeWithHiddenItems()))
 	{
-		//nlwarning("CH:computeAnimSet:%d: pb when trying to compute the animset. Sheet Id '%u(%s)'.", _Slot, _SheetId.asInt(), _SheetId.toString().c_str());
+		nlwarning("CH:computeAnimSet:%d: pb when trying to compute the animset. Sheet Id '%u(%s)'.", _Slot, _SheetId.asInt(), _SheetId.toString().c_str());
 	}
 
 }// computeAnimSet //
@@ -3360,7 +3360,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible )
 		lHandInstIdx = SLOTTYPE::LEFT_HAND_SLOT;
 
 		// hide gloves(armor) if player has magician amplifier
-		if( _Items[rHandInstIdx].Sheet && (_Items[rHandInstIdx].Sheet->ItemType == ITEM_TYPE::MAGICIAN_STAFF) )
+		if( _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet && (_Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet->ItemType == ITEM_TYPE::MAGICIAN_STAFF) )
 		{
 			if( !_Instances[SLOTTYPE::HANDS_SLOT].Current.empty() )
 				_Instances[SLOTTYPE::HANDS_SLOT].Current.hide();
@@ -3378,8 +3378,9 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible )
 	if( !objectsVisible )
 	{
 		// Right Hand
+		nlassert(SLOTTYPE::RIGHT_HAND_SLOT < _Items.size() && SLOTTYPE::LEFT_HAND_SLOT < _Items.size());
 		if(rHandInstIdx<_Instances.size())
-			if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquipped ) )
+			if( !(_Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet && _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet->NeverHideWhenEquipped ) )
 				if(!_Instances[rHandInstIdx].Current.empty())
 				{
 					_Instances[rHandInstIdx].Current.hide();
@@ -3387,7 +3388,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible )
 				}
 		// Left Hand
 		if(lHandInstIdx <_Instances.size())
-			if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquipped ) )
+			if( !(_Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet && _Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet->NeverHideWhenEquipped ) )
 				if(!_Instances[lHandInstIdx].Current.empty())
 				{
 					_Instances[lHandInstIdx].Current.hide();
@@ -9293,14 +9294,14 @@ const char *CCharacterCL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TS
 const CItemSheet *CCharacterCL::getRightHandItemSheet() const
 {
 	if (_RHandInstIdx == CEntityCL::BadIndex) return NULL;
-	return _Items[_RHandInstIdx].Sheet;
+	return _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet;
 }
 
 // *********************************************************************************************
 const CItemSheet *CCharacterCL::getLeftHandItemSheet() const
 {
 	if (_LHandInstIdx == CEntityCL::BadIndex) return NULL;
-	return _Items[_LHandInstIdx].Sheet;
+	return _Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet;
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/client_sheets/character_sheet.cpp b/ryzom/client/src/client_sheets/character_sheet.cpp
index ab935268b..e6e5cbd00 100644
--- a/ryzom/client/src/client_sheets/character_sheet.cpp
+++ b/ryzom/client/src/client_sheets/character_sheet.cpp
@@ -213,6 +213,21 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 	// IN LEFT HAND
 	readEquipment(item, "Basics.Equipment.HandL", ObjectInLeftHand);
 
+	if (!ObjectInRightHand.IdItem)
+	{
+		std::string	right;
+		item.getValueByName(right, "item_right");
+		if (!right.empty())
+			ObjectInRightHand.IdItem = ClientSheetsStrings.add(NLMISC::toLower(right));
+	}
+
+	if (!ObjectInLeftHand.IdItem)
+	{
+		std::string	left;
+		item.getValueByName(left, "item_left");
+		if (!left.empty())
+			ObjectInLeftHand.IdItem = ClientSheetsStrings.add(NLMISC::toLower(left));
+	}
 
 	// Get the animation set Base Name.
 	string AnimSetBaseName;
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 14f3a1769..10d1573cf 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -378,6 +378,8 @@ void CEntityCL::SInstanceCL::updateCurrentFromLoading(NL3D::USkeleton Skeleton)
 			sint stickID = Skeleton.getBoneIdByName(StickPoint);
 			if(stickID != -1)
 				Skeleton.stickObject(Current, stickID);
+			else
+				nlwarning("Skeleton '%s' is missing bone '%s' for object attachment.", Skeleton.getShapeName().c_str(), StickPoint.c_str());
 		}
 	}
 

From 3cbfa82a6ed5c092bfb944c83bb56e29bc8c0455 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 18 Apr 2020 13:09:08 +0800
Subject: [PATCH 010/292] Fix georges editor

---
 .../georges_dll/file_tree_view.cpp            |  2 +-
 .../leveldesign/georges_dll/form_dialog.cpp   | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp b/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
index 673c12d9a..e1a52d887 100644
--- a/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
@@ -187,7 +187,7 @@ BOOL CFileTreeCtrl::OnNotify ( WPARAM wParam, LPARAM lParam, LRESULT* pResult )
 {
 	LPNMHDR pnmh = (LPNMHDR) lParam;
 	// Tree ?
-	if (wParam == 0)
+	// if (wParam == 0)
 	{
 		switch (pnmh->code)
 		{
diff --git a/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
index a4d35fdcc..b4def1a14 100644
--- a/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
@@ -720,6 +720,8 @@ void CFormDialog::onLastFocus ()
 
 int CFormDialog::getWidget (uint dialogId) const
 {
+	if (dialogId == 0xFFFE)
+		dialogId = 0;
 	for (uint i=0; i<Widgets.size(); i++)
 	{
 		if (Widgets[i]->isDialog (dialogId))
@@ -1198,6 +1200,11 @@ void CFormDialog::onGetSubFocus (uint id)
 {
 	// Get the widget
 	int widget = getWidget (id);
+	if (widget < 0)
+	{
+		nldebug("Invalid widget id %d", (int)id);
+		return;
+	}
 	WidgetFocused = widget;
 
 	// Window view
@@ -1584,7 +1591,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
 	{
 		// Create the mem combobox
 		parent->setComboSpinSize (currentPos);
-		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize);
+		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
 		parent->initWidget (Combo);
 
 		// Create the spin
@@ -1599,7 +1606,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
 	{
 		// Create the mem combobox
 		parent->setComboBrowseSize (currentPos);
-		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize);
+		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
 		parent->initWidget (Combo);
 
 		// Create the spin
@@ -1621,7 +1628,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
 	{
 		// Create the mem combobox
 		parent->setComboSize (currentPos, parent->SmallWidget);
-		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize);
+		Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
 		parent->initWidget (Combo);
 		parent->getNextPos (currentPos);
 	}
@@ -1914,7 +1921,7 @@ void CFormCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, ui
 	parent->setComboSize (currentPos, parent->SmallWidget);
 	RECT comboPos = currentPos;
 	parent->adjusteComboSize (comboPos);
-	Combo.Create (WS_CHILD|WS_VSCROLL|WS_VISIBLE|CBS_DROPDOWNLIST|CBS_HASSTRINGS|WS_CHILD|WS_TABSTOP, comboPos, parent, dialog_index);
+	Combo.Create (WS_CHILD|WS_VSCROLL|WS_VISIBLE|CBS_DROPDOWNLIST|CBS_HASSTRINGS|WS_CHILD|WS_TABSTOP, comboPos, parent, dialog_index ? dialog_index : 0xFFFE);
 	parent->initWidget (Combo);
 	parent->getNextPos (currentPos);
 
@@ -2097,7 +2104,7 @@ void CFormBigEdit::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
 
 	// Create the mem combobox
 	parent->setBigEditSize (currentPos, parent->SmallWidget);
-	Edit.CreateEx (WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), WS_VSCROLL|ES_OEMCONVERT|ES_MULTILINE|ES_WANTRETURN|WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_AUTOVSCROLL, currentPos, parent, dialog_index);
+	Edit.CreateEx (WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), WS_VSCROLL|ES_OEMCONVERT|ES_MULTILINE|ES_WANTRETURN|WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_AUTOVSCROLL, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
 	parent->initWidget (Edit);
 	parent->getNextPos (currentPos);
 
@@ -2271,7 +2278,7 @@ void CColorEdit::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, ui
 
 	// Create the mem combobox
 	parent->setColorSize (currentPos, parent->SmallWidget);
-	Color.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index);
+	Color.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
 	parent->initWidget (Color);
 
 	// Create the reset button
@@ -2501,7 +2508,7 @@ void CListWidget::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, u
 
 	// Create the mem combobox
 	parent->setListSize (currentPos, parent->SmallWidget);
-	ListCtrl.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index);
+	ListCtrl.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
 	parent->initWidget (ListCtrl);
 	parent->getNextPos (currentPos);
 
@@ -2759,7 +2766,7 @@ void CIconWidget::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, u
 
 	// Create the mem combobox
 	parent->setEditSize (currentPos, parent->IconHeight, parent->IconHeight);
-	Icon.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index);
+	Icon.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
 	parent->initWidget (Icon);
 
 	parent->getNextPos (currentPos);

From 98709e55dbb40c0e0ac764174cc1533857b844f1 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Apr 2020 10:50:20 +0300
Subject: [PATCH 011/292] Fixed: Crash on switching chars, logout

---
 ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 063ffdfad..ba13c135e 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -564,6 +564,11 @@ CDBCtrlSheet::~CDBCtrlSheet()
 			Driver->deleteTextureFile(_GuildSymb);
 		_GuildSymb = NULL;
 	}
+	if (_RegenText)
+	{
+		delete _RegenText;
+		_RegenText = NULL;
+	}
 
 	// ensure erase static
 	if(this==_CurrMenuSheet)		_CurrMenuSheet = NULL;

From 4ebca98559c3f3b5bc98fb024e2474f63d544456 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 17 Apr 2020 11:49:21 +0300
Subject: [PATCH 012/292] Fixed: Audio decoder getMusicInfo/getSongTitle needs
 to be thread safe

---
 nel/include/nel/sound/driver/sound_driver.h   |  2 +-
 nel/src/sound/audio_decoder.cpp               | 11 ++++-----
 .../sound/driver/fmod/sound_driver_fmod.cpp   | 24 ++++---------------
 nel/src/sound/driver/fmod/sound_driver_fmod.h |  2 +-
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/nel/include/nel/sound/driver/sound_driver.h b/nel/include/nel/sound/driver/sound_driver.h
index 1fba9c887..9c758487a 100644
--- a/nel/include/nel/sound/driver/sound_driver.h
+++ b/nel/include/nel/sound/driver/sound_driver.h
@@ -191,7 +191,7 @@ public:
 	/// Create a native music channel, only supported by the FMod driver.
 	virtual IMusicChannel *createMusicChannel() { return NULL; }
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */
diff --git a/nel/src/sound/audio_decoder.cpp b/nel/src/sound/audio_decoder.cpp
index a282942c4..db87bd990 100644
--- a/nel/src/sound/audio_decoder.cpp
+++ b/nel/src/sound/audio_decoder.cpp
@@ -110,10 +110,9 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
 
 bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	std::string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
-		nlwarning("Music file %s does not exist!", filepath.c_str());
+		nlwarning("Music file '%s' does not exist!", filepath.c_str());
 		return false;
 	}
 
@@ -121,7 +120,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 	CIFile ifile;
 	ifile.setCacheFileOnOpen(false);
 	ifile.allowBNPCacheFileOnOpen(false);
-	if (ifile.open(lookup))
+	if (ifile.open(filepath))
 		return CAudioDecoderFfmpeg::getInfo(&ifile, artist, title, length);
 #else
 	std::string type = CFile::getExtension(filepath);
@@ -132,7 +131,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderVorbis::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());
@@ -143,7 +142,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderMP3::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());
diff --git a/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
index d98aa600f..2b250a1d3 100644
--- a/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
+++ b/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
@@ -496,36 +496,20 @@ bool getTag (std::string &result, const char *tag, FSOUND_STREAM *stream)
 }
 
 /** Get music info. Returns false if the song is not found or the function is not implemented. 
- *  \param filepath path to file, CPath::lookup done by driver
+ *  \param filepath full path to file
  *  \param artist returns the song artist (empty if not available)
  *  \param title returns the title (empty if not available)
  */
 bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	/* Open a stream, get the tag if it exists, close the stream */
-	string pathName = CPath::lookup(filepath, false);
-	uint32 fileOffset = 0, fileSize = 0;
-	if (pathName.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
 		nlwarning("NLSOUND FMod Driver: Music file %s not found!", filepath.c_str());
 		return false;
 	}
-	// if the file is in a bnp
-	if (pathName.find('@') != string::npos)
-	{
-		if (CBigFile::getInstance().getFileInfo(pathName, fileSize, fileOffset))
-		{
-			// set pathname to bnp
-			pathName = pathName.substr(0, pathName.find('@'));			
-		}
-		else
-		{
-			nlwarning("NLSOUND FMod Driver: BNP BROKEN");
-			return false;
-		}
-	}
 
-	FSOUND_STREAM *stream = FSOUND_Stream_Open((const char *)CPath::lookup(filepath, false).c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
+	uint32 fileOffset = 0, fileSize = 0;
+	FSOUND_STREAM *stream = FSOUND_Stream_Open(filepath.c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
 	if (stream)
 	{
 		getTag(artist, "ARTIST", stream);
diff --git a/nel/src/sound/driver/fmod/sound_driver_fmod.h b/nel/src/sound/driver/fmod/sound_driver_fmod.h
index db82cde6e..73d3b8673 100644
--- a/nel/src/sound/driver/fmod/sound_driver_fmod.h
+++ b/nel/src/sound/driver/fmod/sound_driver_fmod.h
@@ -112,7 +112,7 @@ public:
 	virtual IMusicChannel *createMusicChannel();
 	
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */

From da890311bb02133c10cf40ceb85c4924f876eb71 Mon Sep 17 00:00:00 2001
From: karu <nimetu@gmail.com>
Date: Mon, 6 Jan 2020 19:55:08 +0200
Subject: [PATCH 013/292] Added: Show disabled until timer on icon

---
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 39 +++++++++++++++++++
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  3 ++
 2 files changed, 42 insertions(+)

diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index ba13c135e..e0e5f2e74 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -540,6 +540,9 @@ CCtrlDraggable(param)
 	_SapBuffIcon = "ico_sap.tga";
 	_StaBuffIcon = "ico_stamina.tga";
 	_FocusBuffIcon = "ico_focus.tga";
+
+	_RegenText = NULL;
+	_RegenTextValue = 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -2050,6 +2053,12 @@ void CDBCtrlSheet::draw()
 		if (!_LastSheetId)
 		{
 			_RegenTickRange = CTickRange();
+			if (_RegenText)
+			{
+				delete _RegenText;
+				_RegenText = NULL;
+				_RegenTextValue = 0;
+			}
 		}
 		else
 		{
@@ -2076,6 +2085,36 @@ void CDBCtrlSheet::draw()
 			{
 				rVR.drawQuad(_RenderLayer + 1, regenTris[tri], backTex, CRGBA::White, false);
 			}
+
+			if (!_RegenText) {
+				_RegenText = new CViewText(CViewBase::TCtorParam());
+				_RegenText->setId(getId() + ":regen");
+				_RegenText->setParent(_Parent);
+				_RegenText->setOverflowText(ucstring(""));
+				_RegenText->setModulateGlobalColor(false);
+				_RegenText->setMultiLine(false);
+				_RegenText->setTextMode(CViewText::ClipWord);
+				_RegenText->setFontSizing("0", "0");
+				// TODO: font size / color hardcoded.
+				_RegenText->setFontSize(8);
+				_RegenText->setColor(CRGBA::White);
+				_RegenText->setShadow(true);
+				_RegenText->setActive(true);
+				_RegenText->updateTextContext();
+			}
+
+			// TODO: ticks in second hardcoded
+			uint32 nextValue = _RegenTickRange.EndTick > LastGameCycle ? (_RegenTickRange.EndTick - LastGameCycle) / 10 : 0;
+			if (_RegenTextValue != nextValue)
+			{
+				_RegenTextValue = nextValue;
+				_RegenText->setText(toString("%d", _RegenTextValue));
+				_RegenText->updateTextContext();
+			}
+			_RegenText->setXReal(_XReal+1);
+			_RegenText->setYReal(_YReal+2);
+			_RegenText->setRenderLayer(_RenderLayer+2);
+			_RegenText->draw();
 		}
 	}
 
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index 8b89a91ed..e6ed7587b 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -56,6 +56,7 @@ class COutpostBuildingSheet;
 namespace NLGUI
 {
 	class CViewRenderer;
+	class CViewText;
 }
 
 class CDBCtrlSheet;
@@ -736,6 +737,8 @@ protected:
 	sint8			_ArmourColorIndex;
 
 	CTickRange		_RegenTickRange;
+	NLGUI::CViewText	*_RegenText;
+	uint32			_RegenTextValue;
 
 	/// D'n'd
 	sint32		_DragX, _DragY;

From 3aa0493570bd989eeea407f52ec7fc56633789bd Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 17 Apr 2020 13:29:27 +0300
Subject: [PATCH 014/292] Fixed: Clear song info when all songs are done
 playing.

---
 .../client/src/interface_v3/music_player.cpp  | 60 +++++++++++++------
 ryzom/client/src/interface_v3/music_player.h  |  6 ++
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 2f02352fb..98bbd5299 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -174,28 +174,30 @@ void CMusicPlayer::playSongs (const std::vector<std::string> &filenames)
 
 	// If pause, stop, else play will resume
 	if (_State == Paused || _Songs.empty())
-		_State = Stopped;
+		stop();
 
 	// get song title/duration using worker thread
 	MusicPlayerWorker.getSongsInfo(filenames);
 }
 
 // ***************************************************************************
-void CMusicPlayer::updatePlaylist(sint prevIndex)
+void CMusicPlayer::updatePlaylist(uint index, bool state)
 {
-	CInterfaceElement  *pIE;
-	std::string rowId;
+	if (index >= _Songs.size()) return;
+
+	std::string rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, index);
+	CInterfaceElement *pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
+	if (pIE) pIE->setActive(state);
+}
 
+void CMusicPlayer::updatePlaylist(sint prevIndex)
+{
 	if (prevIndex >= 0 && prevIndex < _Songs.size())
 	{
-		rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, prevIndex);
-		pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
-		if (pIE) pIE->setActive(false);
+		updatePlaylist(prevIndex, false);
 	}
 
-	rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, _CurrentSongIndex);
-	pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
-	if (pIE) pIE->setActive(true);
+	updatePlaylist(_CurrentSongIndex, true);
 }
 
 // ***************************************************************************
@@ -361,7 +363,7 @@ void CMusicPlayer::play (sint index)
 
 	if (_Songs.empty())
 	{
-		_State = Stopped;
+		stop();
 		return;
 	}
 
@@ -437,6 +439,8 @@ void CMusicPlayer::stop ()
 	_PlayStart = 0;
 	_PauseTime = 0;
 
+	clearPlayingInfo();
+
 	NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:MP3_PLAYING")->setValueBool(false);
 }
 
@@ -472,12 +476,31 @@ void CMusicPlayer::next ()
 }
 
 // ***************************************************************************
+void CMusicPlayer::updatePlayingInfo(const std::string info)
+{
+	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
+	if (pVT)
+	{
+		pVT->setText(ucstring::makeFromUtf8(info));
+	}
+}
+
+// ***************************************************************************
+void CMusicPlayer::clearPlayingInfo()
+{
+	updatePlayingInfo("");
+}
 
+// ***************************************************************************
 void CMusicPlayer::update ()
 {
 	if(!SoundMngr)
 	{
-		_State = Stopped;
+		if (_State != Stopped)
+		{
+			_State = Stopped;
+			clearPlayingInfo();
+		}
 		return;
 	}
 
@@ -488,8 +511,6 @@ void CMusicPlayer::update ()
 
 	if (_State == Playing)
 	{
-		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
-		if (pVT)
 		{
 			TTime dur = (CTime::getLocalTime() - _PlayStart) / 1000;
 			uint min = (dur / 60) % 60;
@@ -499,7 +520,7 @@ void CMusicPlayer::update ()
 			std::string title(toString("%02d:%02d", min, sec));
 			if (hour > 0) title = toString("%02d:", hour) + title;
 			title += " " + _CurrentSong.Title;
-			pVT->setText(ucstring::makeFromUtf8(title));
+			updatePlayingInfo(title);
 		}
 
 		if (SoundMngr->isMusicEnded ())
@@ -520,8 +541,13 @@ void CMusicPlayer::update ()
 			}
 			else
 			{
-				SoundMngr->stopMusic(0);
-				_State = Stopped;
+				// remove active highlight from playlist
+				updatePlaylist(_CurrentSongIndex, false);
+
+				stop();
+
+				// restart from top on next 'play'
+				_CurrentSongIndex = 0;
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/music_player.h b/ryzom/client/src/interface_v3/music_player.h
index 1932591e3..febfde719 100644
--- a/ryzom/client/src/interface_v3/music_player.h
+++ b/ryzom/client/src/interface_v3/music_player.h
@@ -62,6 +62,10 @@ public:
 
 	void update ();
 
+	// update currently playing song info/duration on main gui
+	void updatePlayingInfo(const std::string info);
+	void clearPlayingInfo();
+
 	bool isRepeatEnabled() const;
 	bool isShuffleEnabled() const;
 
@@ -71,6 +75,8 @@ public:
 	void shuffleAndRebuildPlaylist();
 	// Update playlist active row
 	void updatePlaylist(sint prevIndex = -1);
+	// set/remove playlist highlight
+	void updatePlaylist(uint index, bool state);
 
 	// Update single song title/duration on _Songs and on playlist
 	void updateSong(const CSongs &song);

From 334d1d2af1c04edb21031000b7ffbbf388f153aa Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Apr 2020 09:31:29 +0300
Subject: [PATCH 015/292] Changed: SHow no-files text if there is no songs in
 playlist

---
 ryzom/client/src/interface_v3/music_player.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 98bbd5299..6c94fa2cf 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -488,7 +488,14 @@ void CMusicPlayer::updatePlayingInfo(const std::string info)
 // ***************************************************************************
 void CMusicPlayer::clearPlayingInfo()
 {
-	updatePlayingInfo("");
+	if (_Songs.empty())
+	{
+		updatePlayingInfo(CI18N::get("uiNoFiles").toUtf8());
+	}
+	else
+	{
+		updatePlayingInfo("");
+	}
 }
 
 // ***************************************************************************

From e9f63f2556fc59c0ea12298bc974b3b2e48628bf Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Apr 2020 11:47:28 +0300
Subject: [PATCH 016/292] Merge "Fixed: Restore playlist after charselect"

---
 ryzom/client/src/interface_v3/interface_manager.cpp | 4 ++++
 ryzom/client/src/release.cpp                        | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 50acc2308..23440218e 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1044,6 +1044,10 @@ void CInterfaceManager::initInGame()
 		gc->setTarget(gc->getSavedTarget());
 	}
 
+	// rebuild mp3 player playlist if user reselected a char (songs are already scanned)
+	CAHManager::getInstance()->runActionHandler("music_player", NULL, "update_playlist");
+	CAHManager::getInstance()->runActionHandler("music_player", NULL, "stop");
+	
 	CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHATLOG_STATE", false);
 	if (node)
 	{
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index 0477acce9..889bcee11 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -240,8 +240,8 @@ void	releaseMainLoopReselect()
 	// alredy called from farTPMainLoop()
 	// --R2::getEditor().autoConfigRelease(IsInRingSession);
 
-	// Pause any user played music
-	MusicPlayer.pause();
+	// stop any user played music
+	MusicPlayer.stop();
 
 	// only really needed at exit
 	// --STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();
@@ -390,8 +390,8 @@ void releaseMainLoop(bool closeConnection)
 	// Release R2 editor if applicable
 	R2::getEditor().autoConfigRelease(IsInRingSession);
 
-	// Pause any user played music
-	MusicPlayer.pause();
+	// stop any user played music
+	MusicPlayer.stop();
 
 	// flush the server string cache
 	STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();

From c09736a08ae8aae85ab6aac84a2b4df9fdcae2b8 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 6 May 2020 17:43:51 +0300
Subject: [PATCH 017/292] Fixed: Calling stop on music player should not affect
 background music.

---
 ryzom/client/src/interface_v3/music_player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 6c94fa2cf..56f97b554 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -434,7 +434,9 @@ void CMusicPlayer::stop ()
 		return;
 
 	// stop the music only if we are really playing (else risk to stop a background music!)
-	SoundMngr->stopMusic(0);
+	if (_State != Stopped)
+		SoundMngr->stopMusic(0);
+
 	_State = Stopped;
 	_PlayStart = 0;
 	_PauseTime = 0;

From 4fd3f59b9a0e9a408928f8af1cc5c99d28c35045 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 13 Jun 2020 20:37:43 +0300
Subject: [PATCH 018/292] Fixed: Releasing curl handle when not connected.

---
 nel/src/web/http_client_curl.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nel/src/web/http_client_curl.cpp b/nel/src/web/http_client_curl.cpp
index e61baa89f..10bb0776c 100644
--- a/nel/src/web/http_client_curl.cpp
+++ b/nel/src/web/http_client_curl.cpp
@@ -191,8 +191,11 @@ bool CCurlHttpClient::receive(string &res, bool verbose)
 // ***************************************************************************
 void CCurlHttpClient::disconnect()
 {
-	curl_easy_cleanup(_Curl);
-	_CurlStruct = NULL;
+	if (_CurlStruct)
+	{
+		curl_easy_cleanup(_Curl);
+		_CurlStruct = NULL;
+	}
 	curl_global_cleanup();
 }
 

From 5e3cd0321a08917003a3366468008df30b17295c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 13 Jun 2020 20:30:37 +0300
Subject: [PATCH 019/292] Fixed: Delay CDecal init as it depends on Scene
 object

---
 ryzom/client/src/decal.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/decal.cpp b/ryzom/client/src/decal.cpp
index e270a7c29..a16cb93bf 100644
--- a/ryzom/client/src/decal.cpp
+++ b/ryzom/client/src/decal.cpp
@@ -162,7 +162,9 @@ CDecal::CDecal()
 	{
 		DecalAttenuationVertexProgram = new CVertexProgramDecalAttenuation();
 	}
-	_ShadowMap = new CShadowMap(&(((CSceneUser *) Scene)->getScene().getRenderTrav().getShadowMapManager()));
+
+	// initialized in render() as depends on scene
+	_ShadowMap = NULL;
 	_Material.initUnlit();
 	_Diffuse = CRGBA::White;
 	_Emissive = CRGBA::Black;
@@ -251,7 +253,11 @@ CRGBA CDecal::getDiffuse() const
 // ****************************************************************************
 CDecal::~CDecal()
 {
-	delete _ShadowMap;
+	if (_ShadowMap)
+	{
+		delete _ShadowMap;
+		_ShadowMap = NULL;
+	}
 }
 
 // ****************************************************************************
@@ -527,7 +533,12 @@ void CDecal::render(NL3D::UDriver &/* drv */,
 	//
 	float tileNear = Landscape->getTileNear();
 	//
-	nlassert(_ShadowMap);
+	if (!_ShadowMap)
+	{
+		_ShadowMap = new CShadowMap(&(((CSceneUser *) Scene)->getScene().getRenderTrav().getShadowMapManager()));
+		nlassert(_ShadowMap);
+	}
+
 	_ShadowMap->LocalClipPlanes.resize(4);
 	CVector corners[4] =
 	{

From d367e32a400dba41a394e7e69b6d10a419dd487c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 24 Jun 2020 13:59:39 +0300
Subject: [PATCH 020/292] Fixed: set_desktop handler only worked with keypress
 event

---
 .../src/interface_v3/action_handler_game.cpp  | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 58c00421b..5af8485d6 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2822,24 +2822,6 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
 	{
-		/* // Previous version (multiple pressed on a desktop change a central window
-		uint desktop;
-		fromString(Params, desktop);
-		if (desktop <MAX_NUM_MODES)
-		{
-			CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-			const string procNames[MAX_NUM_MODES] = { "tb_setexp", "tb_setinfo", "tb_setlab", "tb_setkeys" };
-			const string dbNames[MAX_NUM_MODES] = { "", "UI:SAVE:CURRENT_INFO_MODE", "UI:SAVE:CURRENT_LAB_MODE", "UI:SAVE:CURRENT_KEY_MODE" };
-			string sValue;
-			CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp(dbNames[desktop], false);
-			if (pNL != NULL)
-				sValue = NLMISC::toString((sint32)pNL->getValue64());
-			vector<string> vecStr;
-			vecStr.push_back(procNames[desktop]);
-			vecStr.push_back(sValue);
-			CWidgetManager::getInstance()->runProcedure(procNames[desktop], NULL, vecStr);
-		}*/
-
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:gestion_windows"));
 		if (pGC == NULL)
@@ -2850,11 +2832,14 @@ public:
 		CInterfaceElement *pIE = CWidgetManager::getInstance()->getElementFromId("ui:interface:gestion_windows:close");
 		if (pIE != NULL) pIE->setActive(false);
 
+		bool switchDesktop = false;
+
 		CActionsManager *pAM = &Actions;
 		if (!pAM->valide(CAction::CName("set_desktop",Params.c_str())))
 		{
 			pGC->setActive(false);
 			_FirstTime = true;
+			switchDesktop = true;
 		}
 		else // Key is down
 		{
@@ -2862,11 +2847,7 @@ public:
 			if (_FirstTime)
 			{
 				_FirstTime = false;
-
-				vector<string> vecStr;
-				vecStr.push_back("tb_setdesktop");
-				vecStr.push_back(Params);
-				CWidgetManager::getInstance()->runProcedure("tb_setdesktop", NULL, vecStr);
+				switchDesktop = true;
 			}
 			else // Not the first time
 			{
@@ -2876,6 +2857,13 @@ public:
 				CWidgetManager::getInstance()->setTopWindow(pGC);
 			}
 		}
+		if (switchDesktop)
+		{
+			vector<string> vecStr;
+			vecStr.push_back("tb_setdesktop");
+			vecStr.push_back(Params);
+			CWidgetManager::getInstance()->runProcedure("tb_setdesktop", NULL, vecStr);
+		}
 	}
 private:
 	bool _FirstTime;

From 720f6da8b9c1d986357139895032d0cee8bdb036 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 26 Sep 2020 17:27:00 +0300
Subject: [PATCH 021/292] Fixed: Remove unused include (fixes #618)

---
 nel/src/misc/system_info.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nel/src/misc/system_info.cpp b/nel/src/misc/system_info.cpp
index 1f5039de5..5dc70182c 100644
--- a/nel/src/misc/system_info.cpp
+++ b/nel/src/misc/system_info.cpp
@@ -179,7 +179,6 @@
 #else
 #	include <sys/types.h>
 #	include <sys/stat.h>
-#	include <sys/sysctl.h>
 #	include <fcntl.h>
 #	include <unistd.h>
 #	include <cerrno>

From b4901bf267af685e9253fc1412a6060208f49838 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 17 Oct 2020 12:32:59 +0300
Subject: [PATCH 022/292] Fixed: Ingame map search and search result tooltips
 for UTF8 strings

---
 ryzom/client/src/interface_v3/group_map.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 24e1d14cc..17e75486a 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -2471,7 +2471,8 @@ void CGroupMap::updateMatchedLandmarks()
 		std::vector<std::pair<string,string> > params;
 		params.clear();
 		params.push_back(std::pair<string,string>("id", toString("lm%d", k)));
-		params.push_back(std::pair<string,string>("tooltip", _MatchedLandmarks[k].Title.toUtf8()));
+		// ctrl base expects utf8 string to start with "u:"
+		params.push_back(std::pair<string,string>("tooltip", "u:" + _MatchedLandmarks[k].Title.toUtf8()));
 		params.push_back(std::pair<string,string>("index", toString(k)));
 
 		CInterfaceGroup *g = CWidgetManager::getInstance()->getParser()->createGroupInstance("lm_search_result", pL->getId(), params);
@@ -2675,7 +2676,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s)
 	if (!s.empty()) {
 		ucstring ucs;
 		ucs.fromUtf8(s);
-		splitUCString(toLower(s), ucstring(" "), _LandmarkFilter);
+		splitUCString(toLower(ucs), ucstring(" "), _LandmarkFilter);
 	}
 
 	// recreate landmarks

From b1056ee5ca540f1567a45f88e0c2f88314bff460 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 22 Oct 2020 05:48:10 +0800
Subject: [PATCH 023/292] Merge a GL thing from Atys branch

---
 nel/src/3d/driver/opengl/driver_opengl_extension.cpp | 8 ++++++++
 nel/src/3d/driver/opengl/driver_opengl_window.cpp    | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index c81ab9e1e..0b8c4a458 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -1584,6 +1584,14 @@ void	registerGlExtensions(CGlExtensions &ext)
 {
 	H_AUTO_OGL(registerGlExtensions);
 
+#ifdef NL_OS_MAC
+	CGLContextObj ctx = CGLGetCurrentContext();
+	if (ctx == NULL)
+	{
+		nlerror("No OpenGL context set");
+	}
+#endif
+
 	// OpenGL 1.2 ??
 	const char	*nglVersion = (const char *)glGetString (GL_VERSION);
 
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index 293cb28bb..f04ad304e 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -1072,6 +1072,9 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	[_ctx flushBuffer];
 	[_glView display];
 
+	// Set context as thread context
+	CGLSetCurrentContext((CGLContextObj)[_ctx CGLContextObj]);
+
 	_EventEmitter.init(this, _glView, _DestroyWindow);
 
 #elif defined(NL_OS_UNIX)

From 8bf18d2e1da6ee7c57383bbf57d10326d5a6bfb4 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 23 Oct 2020 05:07:09 +0800
Subject: [PATCH 024/292] Improve error message, kaetemi/ryzomclassic#120

---
 nel/include/nel/gui/lua_helper_inline.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/include/nel/gui/lua_helper_inline.h b/nel/include/nel/gui/lua_helper_inline.h
index 0d380bbf1..5dbc3cef4 100644
--- a/nel/include/nel/gui/lua_helper_inline.h
+++ b/nel/include/nel/gui/lua_helper_inline.h
@@ -263,8 +263,8 @@ inline lua_Integer CLuaState::toInteger(int index)
 	if (!isnum)
 	{
 		lua_Number d = lua_tonumber(_State, index);
-		nlwarning("Lua: Unable to convert Lua number %lf to integer", d);
 		res = (lua_Integer)d;
+		nlwarning("Lua: Converting lua_Number %lf to lua_Integer %i", d, (int)res);
 	}
 	return res;
 #else

From c4b142f770df2cbc4c2319c141f230708686aec2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 23 Oct 2020 22:27:36 +0800
Subject: [PATCH 025/292] Load the Lua socket library dynamically if it's
 available, necessary for MobDebug

---
 nel/include/nel/gui/lua_helper.h |  4 +++
 nel/src/gui/lua_helper.cpp       | 53 ++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/lua_helper.h b/nel/include/nel/gui/lua_helper.h
index da5c33e6a..8a0f985a6 100644
--- a/nel/include/nel/gui/lua_helper.h
+++ b/nel/include/nel/gui/lua_helper.h
@@ -379,6 +379,10 @@ namespace NLGUI
 		TSmallScriptCache			_SmallScriptCache;
 		static const char *			_NELSmallScriptTableName;
 
+#ifdef _WIN32
+		HMODULE m_LuaSocket;
+#endif
+
 	private:
 		// this object isn't intended to be copied
 		CLuaState(const CLuaState &/* other */):NLMISC::CRefCount() { nlassert(0); }
diff --git a/nel/src/gui/lua_helper.cpp b/nel/src/gui/lua_helper.cpp
index d2b6a68d3..c27c6aeba 100644
--- a/nel/src/gui/lua_helper.cpp
+++ b/nel/src/gui/lua_helper.cpp
@@ -216,16 +216,55 @@ namespace NLGUI
 		// *** Load base libs
 		{
 			CLuaStackChecker lsc(this);
-	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
 			luaL_openlibs(_State);
-	#else
+#else
 			luaopen_base (_State);
 			luaopen_table (_State);
 			luaopen_io (_State);
 			luaopen_string (_State);
 			luaopen_math (_State);
 			luaopen_debug (_State);
-	#endif
+#endif
+
+#ifdef _WIN32
+			// Lua socket library for MobDebug, optional
+			if (NLMISC::CFile::fileExists("socket\\core.dll"))
+			{
+				// Load socket\core.dll dynamically
+				m_LuaSocket = LoadLibraryW(L"socket\\core.dll");
+				if (!m_LuaSocket)
+				{
+					nlwarning("Lua socket library found, but failed to load");
+				}
+				else
+				{
+					void *luaopen_socket_core = (void *)GetProcAddress(m_LuaSocket, "luaopen_socket_core");
+					if (!luaopen_socket_core)
+					{
+						nlwarning("Lua socket library loaded, but `luaopen_socket_core` not found");
+						FreeLibrary(m_LuaSocket);
+						m_LuaSocket = NULL;
+					}
+					else
+					{
+						// preload['socket.core'] = luaopen_socket_core
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
+						lua_getglobal(_State, "package");
+						lua_getfield(_State, -1, "preload");
+						lua_pushcfunction(_State, (lua_CFunction)luaopen_socket_core);
+						lua_setfield(_State, -2, "socket.core");
+						lua_pop(_State, 2);
+						nlinfo("Lua socket library preloaded");
+#endif
+					}
+				}
+			}
+			else
+			{
+				m_LuaSocket = NULL;
+			}
+#endif
 
 			// open are buggy????
 			clear();
@@ -313,6 +352,14 @@ namespace NLGUI
 		// Clear Small Script Cache
 		_SmallScriptPool= 0;
 		_SmallScriptCache.clear();
+
+#ifdef _WIN32
+		if (m_LuaSocket)
+		{
+			FreeLibrary(m_LuaSocket);
+			m_LuaSocket = NULL;
+		}
+#endif
 	}
 
 	// ***************************************************************************

From 6531fb0a2eb1e40f4cd792de0916b8203ae1b8b2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 23 Oct 2020 23:18:20 +0800
Subject: [PATCH 026/292] Lua debugger requires properly standardized paths

---
 nel/src/gui/lua_helper.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nel/src/gui/lua_helper.cpp b/nel/src/gui/lua_helper.cpp
index c27c6aeba..a07ba3b71 100644
--- a/nel/src/gui/lua_helper.cpp
+++ b/nel/src/gui/lua_helper.cpp
@@ -511,7 +511,23 @@ namespace NLGUI
 
 
 		// execute the script text,   with dbgSrc==filename (use @ for lua internal purpose)
-		executeScriptInternal(script,   string("@") + CFile::getFilename(pathName));
+#ifdef _WIN32
+		// Paths need to be correct for debugging to work
+		std::string pathNameStandardized = pathName;
+		if (pathNameStandardized.size() > 1)
+		{
+			if (pathNameStandardized[1] == ':' && pathNameStandardized[0] >= 'a' && pathNameStandardized[0] <= 'z')
+				pathNameStandardized[0] -= 'a' - 'A';
+			for (ptrdiff_t i = 0; i < (ptrdiff_t)pathNameStandardized.size(); ++i)
+			{
+				if (pathNameStandardized[i] == '/')
+					pathNameStandardized[i] = '\\';
+			}
+		}
+#else
+		const std::string &pathNameStandardized = pathName;
+#endif
+		executeScriptInternal(script, string("@") + pathNameStandardized);
 
 		return true;
 	}

From bbf4a0ac8a0eb676f87de8a04b97e4986fc1d399 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 01:25:20 +0800
Subject: [PATCH 027/292] Fix editor not returning to initial act,
 kaetemi/ryzomclassic#80

---
 ryzom/client/src/r2/editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 457cee562..8e146e9ad 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -5785,7 +5785,7 @@ void CEditor::scenarioUpdated(CObject* highLevel, bool willTP, uint32 initialAct
 	}
 	//
 	projectInLua(_Scenario); // push on the lua stack
-	getLua().push(float(initialActIndex)); // example reconnect after test in act4
+	getLua().push(initialActIndex); // example reconnect after test in act4
 	// update value in the framework
 	callEnvFunc("onScenarioUpdated", 2);
 	//nlwarning("Instance list now is :");

From 3dddc5ab4062b89c55cfbf6c35eb456a7fc54ff6 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 03:57:15 +0800
Subject: [PATCH 028/292] Move ucstring utf8 implementation to header

---
 nel/include/nel/misc/ucstring.h | 132 +--------------------------
 nel/src/misc/ucstring.cpp       | 152 ++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 129 deletions(-)
 create mode 100644 nel/src/misc/ucstring.cpp

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index b3dc1294f..8cedb04ec 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -149,43 +149,7 @@ public:
 	}
 
 	/// Convert this ucstring (16bits char) into a utf8 string
-	std::string toUtf8() const
-	{
-		std::string	res;
-		ucstring::const_iterator first(begin()), last(end());
-		for (; first != last; ++first)
-		{
-			//ucchar	c = *first;
-			uint nbLoop = 0;
-			if (*first < 0x80)
-				res += char(*first);
-			else if (*first < 0x800)
-			{
-				ucchar c = *first;
-				c = c >> 6;
-				c = c & 0x1F;
-				res += char(c) | 0xC0;
-				nbLoop = 1;
-			}
-			else /*if (*first < 0x10000)*/
-			{
-				ucchar c = *first;
-				c = c >> 12;
-				c = c & 0x0F;
-				res += char(c) | 0xE0;
-				nbLoop = 2;
-			}
-
-			for (uint i=0; i<nbLoop; ++i)
-			{
-				ucchar	c = *first;
-				c = c >> ((nbLoop - i - 1) * 6);
-				c = c & 0x3F;
-				res += char(c) | 0x80;
-			}
-		}
-		return res;
-	}
+	std::string toUtf8() const;
 
 	ucstring substr(size_type pos = 0, size_type n = npos) const
 	{
@@ -199,86 +163,7 @@ public:
 	}
 
 	/// Convert the utf8 string into this ucstring (16 bits char)
-	void fromUtf8(const std::string &stringUtf8)
-	{
-		// clear the string
-		erase();
-
-		uint8 c;
-		ucchar code;
-		sint iterations = 0;
-
-		std::string::const_iterator first(stringUtf8.begin()), last(stringUtf8.end());
-		for (; first != last; )
-		{
-			c = *first++;
-			code = c;
-
-			if ((code & 0xFE) == 0xFC)
-			{
-				code &= 0x01;
-				iterations = 5;
-			}
-			else if ((code & 0xFC) == 0xF8)
-			{
-				code &= 0x03;
-				iterations = 4;
-			}
-			else if ((code & 0xF8) == 0xF0)
-			{
-				code &= 0x07;
-				iterations = 3;
-			}
-			else if ((code & 0xF0) == 0xE0)
-			{
-				code &= 0x0F;
-				iterations = 2;
-			}
-			else if ((code & 0xE0) == 0xC0)
-			{
-				code &= 0x1F;
-				iterations = 1;
-			}
-			else if ((code & 0x80) == 0x80)
-			{
-				// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-				rawCopy(stringUtf8);
-				return;
-			}
-			else
-			{
-				push_back(code);
-				iterations = 0;
-			}
-
-			if (iterations)
-			{
-				for (sint i = 0; i < iterations; i++)
-				{
-					if (first == last)
-					{
-						// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-						rawCopy(stringUtf8);
-						return;
-					}
-
-					uint8 ch;
-					ch = *first ++;
-
-					if ((ch & 0xC0) != 0x80)
-					{
-						// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-						rawCopy(stringUtf8);
-						return;
-					}
-
-					code <<= 6;
-					code |= (ucchar)(ch & 0x3F);
-				}
-				push_back(code);
-			}
-		}
-	}
+	void fromUtf8(const std::string &stringUtf8);
 
 	static ucstring makeFromUtf8(const std::string &stringUtf8)
 	{
@@ -289,19 +174,8 @@ public:
 	}
 
 private:
+	void rawCopy(const std::string &str);
 
-	void rawCopy(const std::string &str)
-	{
-		// We need to convert the char into 8bits unsigned int before promotion to 16 bits
-		// otherwise, as char are signed on some compiler (MSCV for ex), the sign bit is extended to 16 bits.
-		resize(str.size());
-		std::string::const_iterator first(str.begin()), last(str.end());
-		iterator dest(begin());
-		for (;first != last; ++first, ++dest)
-		{
-			*dest = uint8(*first);
-		}
-	}
 };
 
 inline ucstring operator+(const ucstringbase &ucstr, ucchar c)
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
new file mode 100644
index 000000000..5d7112114
--- /dev/null
+++ b/nel/src/misc/ucstring.cpp
@@ -0,0 +1,152 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/ucstring.h"
+
+std::string ucstring::toUtf8() const
+{
+	std::string	res;
+	ucstring::const_iterator first(begin()), last(end());
+	for (; first != last; ++first)
+	{
+		//ucchar	c = *first;
+		uint nbLoop = 0;
+		if (*first < 0x80)
+			res += char(*first);
+		else if (*first < 0x800)
+		{
+			ucchar c = *first;
+			c = c >> 6;
+			c = c & 0x1F;
+			res += char(c) | 0xC0;
+			nbLoop = 1;
+		}
+		else /*if (*first < 0x10000)*/
+		{
+			ucchar c = *first;
+			c = c >> 12;
+			c = c & 0x0F;
+			res += char(c) | 0xE0;
+			nbLoop = 2;
+		}
+
+		for (uint i=0; i<nbLoop; ++i)
+		{
+			ucchar	c = *first;
+			c = c >> ((nbLoop - i - 1) * 6);
+			c = c & 0x3F;
+			res += char(c) | 0x80;
+		}
+	}
+	return res;
+}
+
+void ucstring::fromUtf8(const std::string &stringUtf8)
+{
+	// clear the string
+	erase();
+
+	uint8 c;
+	ucchar code;
+	sint iterations = 0;
+
+	std::string::const_iterator first(stringUtf8.begin()), last(stringUtf8.end());
+	for (; first != last; )
+	{
+		c = *first++;
+		code = c;
+
+		if ((code & 0xFE) == 0xFC)
+		{
+			code &= 0x01;
+			iterations = 5;
+		}
+		else if ((code & 0xFC) == 0xF8)
+		{
+			code &= 0x03;
+			iterations = 4;
+		}
+		else if ((code & 0xF8) == 0xF0)
+		{
+			code &= 0x07;
+			iterations = 3;
+		}
+		else if ((code & 0xF0) == 0xE0)
+		{
+			code &= 0x0F;
+			iterations = 2;
+		}
+		else if ((code & 0xE0) == 0xC0)
+		{
+			code &= 0x1F;
+			iterations = 1;
+		}
+		else if ((code & 0x80) == 0x80)
+		{
+			// If it's not a valid UTF8 string, just copy the line without utf8 conversion
+			rawCopy(stringUtf8);
+			return;
+		}
+		else
+		{
+			push_back(code);
+			iterations = 0;
+		}
+
+		if (iterations)
+		{
+			for (sint i = 0; i < iterations; i++)
+			{
+				if (first == last)
+				{
+					// If it's not a valid UTF8 string, just copy the line without utf8 conversion
+					rawCopy(stringUtf8);
+					return;
+				}
+
+				uint8 ch;
+				ch = *first ++;
+
+				if ((ch & 0xC0) != 0x80)
+				{
+					// If it's not a valid UTF8 string, just copy the line without utf8 conversion
+					rawCopy(stringUtf8);
+					return;
+				}
+
+				code <<= 6;
+				code |= (ucchar)(ch & 0x3F);
+			}
+			push_back(code);
+		}
+	}
+}
+
+void ucstring::rawCopy(const std::string &str)
+{
+	// We need to convert the char into 8bits unsigned int before promotion to 16 bits
+	// otherwise, as char are signed on some compiler (MSCV for ex), the sign bit is extended to 16 bits.
+	resize(str.size());
+	std::string::const_iterator first(str.begin()), last(str.end());
+	iterator dest(begin());
+	for (;first != last; ++first, ++dest)
+	{
+		*dest = uint8(*first);
+	}
+}
+
+/* end of file */

From 1300d5d4d4efd188ebfca26fb9cc31b8d6a388ce Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 04:02:02 +0800
Subject: [PATCH 029/292] Move ucstring utf8 implementation to header

---
 nel/include/nel/misc/ucstring.h | 12 +-----------
 nel/src/misc/ucstring.cpp       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 8cedb04ec..5f0616d8f 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -128,17 +128,7 @@ public:
 	}
 
 	/// Converts the controlled ucstring to a string str
-	void toString (std::string &str) const
-	{
-		str.resize (size ());
-		for (uint i = 0; i < str.size (); i++)
-		{
-			if (operator[](i) > 255)
-				str[i] = '?';
-			else
-				str[i] = (char) operator[](i);
-		}
-	}
+	void toString(std::string &str) const;
 
 	/// Converts the controlled ucstring and returns the resulting string
 	std::string toString () const
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index 5d7112114..df8f52406 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -17,6 +17,18 @@
 #include "stdmisc.h"
 #include "nel/misc/ucstring.h"
 
+void ucstring::toString(std::string &str) const
+{
+	str.resize(size());
+	for (uint i = 0; i < str.size (); i++)
+	{
+		if (operator[](i) > 255)
+			str[i] = '?';
+		else
+			str[i] = (char) operator[](i);
+	}
+}
+
 std::string ucstring::toUtf8() const
 {
 	std::string	res;

From dd281306178fa10451569341b60e6e62d1c9bbeb Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 04:17:36 +0800
Subject: [PATCH 030/292] Format ucstring source

---
 nel/include/nel/misc/ucstring.h | 119 +++++++++++++++++---------------
 nel/src/misc/ucstring.cpp       |  16 ++---
 2 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 5f0616d8f..28afcdb9a 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -35,95 +35,98 @@ typedef std::basic_string<ucchar> ucstringbase;
 class ucstring : public ucstringbase
 {
 public:
+	ucstring() { }
 
-	ucstring () {}
-
-	ucstring (const ucstringbase &str) : ucstringbase (str) {}
+	ucstring(const ucstringbase &str)
+	    : ucstringbase(str)
+	{
+	}
 
-	ucstring (const std::string &str) : ucstringbase ()
+	ucstring(const std::string &str)
+	    : ucstringbase()
 	{
 		rawCopy(str);
 	}
 
-	~ucstring () {}
+	~ucstring() { }
 
-	ucstring &operator= (ucchar c)
+	ucstring &operator=(ucchar c)
 	{
-		resize (1);
+		resize(1);
 		operator[](0) = c;
 		return *this;
 	}
 
-	ucstring &operator= (const char *str)
+	ucstring &operator=(const char *str)
 	{
-		resize (strlen (str));
-		for (uint i = 0; i < strlen (str); i++)
+		resize(strlen(str));
+		for (uint i = 0; i < strlen(str); i++)
 		{
 			operator[](i) = uint8(str[i]);
 		}
 		return *this;
 	}
 
-	ucstring &operator= (const std::string &str)
+	ucstring &operator=(const std::string &str)
 	{
-		resize (str.size ());
-		for (uint i = 0; i < str.size (); i++)
+		resize(str.size());
+		for (uint i = 0; i < str.size(); i++)
 		{
 			operator[](i) = uint8(str[i]);
 		}
 		return *this;
 	}
 
-	ucstring &operator= (const ucstringbase &str)
+	ucstring &operator=(const ucstringbase &str)
 	{
-		ucstringbase::operator =(str);
+		ucstringbase::operator=(str);
 		return *this;
 	}
 
-	ucstring& operator= (const ucchar *str)
+	ucstring &operator=(const ucchar *str)
 	{
-		ucstringbase::operator =(str);
+		ucstringbase::operator=(str);
 		return *this;
 	}
-	ucstring &operator+= (ucchar c)
+	ucstring &operator+=(ucchar c)
 	{
-		resize (size() + 1);
-		operator[](size()-1) = c;
+		resize(size() + 1);
+		operator[](size() - 1) = c;
 		return *this;
 	}
 
-	ucstring &operator+= (const char *str)
+	ucstring &operator+=(const char *str)
 	{
 		size_t s = size();
-		resize (s + strlen(str));
+		resize(s + strlen(str));
 		for (uint i = 0; i < strlen(str); i++)
 		{
-			operator[](s+i) = uint8(str[i]);
+			operator[](s + i) = uint8(str[i]);
 		}
 		return *this;
 	}
 
-	ucstring &operator+= (const std::string &str)
+	ucstring &operator+=(const std::string &str)
 	{
 		size_t s = size();
-		resize (s + str.size());
+		resize(s + str.size());
 		for (uint i = 0; i < str.size(); i++)
 		{
-			operator[](s+i) = uint8(str[i]);
+			operator[](s + i) = uint8(str[i]);
 		}
 		return *this;
 	}
 
-	ucstring &operator+= (const ucstringbase &str)
+	ucstring &operator+=(const ucstringbase &str)
 	{
-		ucstringbase::operator +=(str);
+		ucstringbase::operator+=(str);
 		return *this;
 	}
 
 	const ucchar *c_str() const
 	{
 		const ucchar *tmp = ucstringbase::c_str();
-		const_cast<ucchar*>(tmp)[size()] = 0;
+		const_cast<ucchar *>(tmp)[size()] = 0;
 		return tmp;
 	}
 
@@ -131,7 +134,7 @@ public:
 	void toString(std::string &str) const;
 
 	/// Converts the controlled ucstring and returns the resulting string
-	std::string toString () const
+	std::string toString() const
 	{
 		std::string str;
 		toString(str);
@@ -165,70 +168,72 @@ public:
 
 private:
 	void rawCopy(const std::string &str);
-
 };
 
 inline ucstring operator+(const ucstringbase &ucstr, ucchar c)
 {
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
+	ucstring ret;
+	ret = ucstr;
+	ret += c;
 	return ret;
 }
 
 inline ucstring operator+(const ucstringbase &ucstr, const char *c)
 {
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
+	ucstring ret;
+	ret = ucstr;
+	ret += c;
 	return ret;
 }
 
 inline ucstring operator+(const ucstringbase &ucstr, const std::string &c)
 {
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
+	ucstring ret;
+	ret = ucstr;
+	ret += c;
 	return ret;
 }
 
 inline ucstring operator+(ucchar c, const ucstringbase &ucstr)
 {
-	ucstring	ret;
-	ret= c;
+	ucstring ret;
+	ret = c;
 	ret += ucstr;
 	return ret;
 }
 
 inline ucstring operator+(const char *c, const ucstringbase &ucstr)
 {
-	ucstring	ret;
-	ret= c;
+	ucstring ret;
+	ret = c;
 	ret += ucstr;
 	return ret;
 }
 
 inline ucstring operator+(const std::string &c, const ucstringbase &ucstr)
 {
-	ucstring	ret;
-	ret= c;
+	ucstring ret;
+	ret = c;
 	ret += ucstr;
 	return ret;
 }
 
-namespace NLMISC
-{
+namespace NLMISC {
 
 // Traits for hash_map using CEntityId
 struct CUCStringHashMapTraits
 {
-	enum { bucket_size = 4, min_buckets = 8 };
+	enum
+	{
+		bucket_size = 4,
+		min_buckets = 8
+	};
 	CUCStringHashMapTraits() { }
-	size_t operator() (const ucstring &id ) const
+	size_t operator()(const ucstring &id) const
 	{
 		return id.size();
 	}
-	bool operator() (const ucstring &id1, const ucstring &id2) const
+	bool operator()(const ucstring &id1, const ucstring &id2) const
 	{
 		return id1 < id2;
 	}
@@ -239,18 +244,18 @@ struct CUCStringHashMapTraits
  * \param a string or a char to transform to lower case
  */
 
-ucstring	toLower (const ucstring &str);
-void		toLower (ucchar *str);
-ucchar		toLower (ucchar c);
+ucstring toLower(const ucstring &str);
+void toLower(ucchar *str);
+ucchar toLower(ucchar c);
 
 /** Convert an unicode string in upper case.
  * Characters with accent are converted in a uppercase character without accent
  * \param a string or a char to transform to upper case
  */
 
-ucstring	toUpper (const ucstring &str);
-void		toUpper (ucchar *str);
-ucchar		toUpper (ucchar c);
+ucstring toUpper(const ucstring &str);
+void toUpper(ucchar *str);
+ucchar toUpper(ucchar c);
 
 };
 
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index df8f52406..8f81cbea1 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -20,18 +20,18 @@
 void ucstring::toString(std::string &str) const
 {
 	str.resize(size());
-	for (uint i = 0; i < str.size (); i++)
+	for (uint i = 0; i < str.size(); i++)
 	{
 		if (operator[](i) > 255)
 			str[i] = '?';
 		else
-			str[i] = (char) operator[](i);
+			str[i] = (char)operator[](i);
 	}
 }
 
 std::string ucstring::toUtf8() const
 {
-	std::string	res;
+	std::string res;
 	ucstring::const_iterator first(begin()), last(end());
 	for (; first != last; ++first)
 	{
@@ -56,9 +56,9 @@ std::string ucstring::toUtf8() const
 			nbLoop = 2;
 		}
 
-		for (uint i=0; i<nbLoop; ++i)
+		for (uint i = 0; i < nbLoop; ++i)
 		{
-			ucchar	c = *first;
+			ucchar c = *first;
 			c = c >> ((nbLoop - i - 1) * 6);
 			c = c & 0x3F;
 			res += char(c) | 0x80;
@@ -77,7 +77,7 @@ void ucstring::fromUtf8(const std::string &stringUtf8)
 	sint iterations = 0;
 
 	std::string::const_iterator first(stringUtf8.begin()), last(stringUtf8.end());
-	for (; first != last; )
+	for (; first != last;)
 	{
 		c = *first++;
 		code = c;
@@ -131,7 +131,7 @@ void ucstring::fromUtf8(const std::string &stringUtf8)
 				}
 
 				uint8 ch;
-				ch = *first ++;
+				ch = *first++;
 
 				if ((ch & 0xC0) != 0x80)
 				{
@@ -155,7 +155,7 @@ void ucstring::rawCopy(const std::string &str)
 	resize(str.size());
 	std::string::const_iterator first(str.begin()), last(str.end());
 	iterator dest(begin());
-	for (;first != last; ++first, ++dest)
+	for (; first != last; ++first, ++dest)
 	{
 		*dest = uint8(*first);
 	}

From 771248fcf4e021ba6e1fca9afd39f119de7bb6ca Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 04:18:25 +0800
Subject: [PATCH 031/292] Use platform implementation in ucstring for UTF-8
 conversion on Windows to get valid UTF-16

---
 nel/include/nel/misc/stream.h   |  7 +++++++
 nel/include/nel/misc/types_nl.h |  4 ++++
 nel/include/nel/misc/ucstring.h |  4 ++++
 nel/src/misc/seven_zip.cpp      |  4 ++--
 nel/src/misc/string_common.cpp  |  2 +-
 nel/src/misc/ucstring.cpp       | 17 +++++++++++++++++
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h
index 89db78a1c..35b6c3f26 100644
--- a/nel/include/nel/misc/stream.h
+++ b/nel/include/nel/misc/stream.h
@@ -300,6 +300,13 @@ public:
 	virtual void	serial(bool &b) ;
 #ifndef NL_OS_CYGWIN
 	virtual void	serial(char &b) ;
+#endif
+#ifdef NL_OS_WINDOWS
+	inline void     serial(wchar_t &b)
+	{ 
+		nlctassert(sizeof(wchar_t) == sizeof(uint16)); 
+		serial(reinterpret_cast<uint16 &>(b));
+	}
 #endif
 	virtual void	serial(std::string &b) ;
 	virtual void	serial(ucstring &b) ;
diff --git a/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h
index 445882c34..73c05b3a5 100644
--- a/nel/include/nel/misc/types_nl.h
+++ b/nel/include/nel/misc/types_nl.h
@@ -546,7 +546,11 @@ template<> struct hash<uint64>
  * \typedef ucchar
  * An Unicode character (16 bits)
  */
+#if defined(NL_OS_WINDOWS)
+typedef	wchar_t ucchar;
+#else
 typedef	uint16	ucchar;
+#endif
 
 #ifndef NL_OVERRIDE
 #define NL_OVERRIDE override
diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 28afcdb9a..8859a21d9 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -30,7 +30,11 @@
  * An unicode string class (16 bits per character).
  * Add features to convert and assign \c ucstring to \c string and \c string to \c ucstring.
  */
+#if defined(NL_OS_WINDOWS)
+typedef std::wstring ucstringbase;
+#else
 typedef std::basic_string<ucchar> ucstringbase;
+#endif
 
 class ucstring : public ucstringbase
 {
diff --git a/nel/src/misc/seven_zip.cpp b/nel/src/misc/seven_zip.cpp
index ff226af7d..ad07bf3cc 100644
--- a/nel/src/misc/seven_zip.cpp
+++ b/nel/src/misc/seven_zip.cpp
@@ -172,8 +172,8 @@ bool unpack7Zip(const std::string &sevenZipFile, const std::string &destFileName
 	filename.resize(nameLen);
 
 	// write filename into ucstring
-	SzArEx_GetFileNameUtf16(&db, 0, &filename[0]);
-
+	SzArEx_GetFileNameUtf16(&db, 0, reinterpret_cast<UInt16 *>(&filename[0]));
+	
 	// write the extracted file
 	FILE *outputHandle = nlfopen(destFileName, "wb+");
 
diff --git a/nel/src/misc/string_common.cpp b/nel/src/misc/string_common.cpp
index a0fb40942..93122cc70 100644
--- a/nel/src/misc/string_common.cpp
+++ b/nel/src/misc/string_common.cpp
@@ -244,7 +244,7 @@ std::wstring utf8ToWide(const char *str, size_t len)
 #if defined(NL_OS_WINDOWS)
 	return winCpToWide(str, len, CP_UTF8);
 #else
-	// TODO: UTF-32 to UTF-8
+	// TODO: UTF-8 to UTF-32
 	nlassert(false);
 #endif
 }
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index 8f81cbea1..5fad643ce 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -31,6 +31,12 @@ void ucstring::toString(std::string &str) const
 
 std::string ucstring::toUtf8() const
 {
+#if defined(NL_OS_WINDOWS)
+	// Use OS implementation
+	nlctassert(sizeof(wchar_t) == sizeof(ucchar));
+	nlctassert(sizeof(wchar_t) == sizeof(uint16));
+	return NLMISC::wideToUtf8(static_cast<const std::wstring &>(*this));
+#else
 	std::string res;
 	ucstring::const_iterator first(begin()), last(end());
 	for (; first != last; ++first)
@@ -65,10 +71,20 @@ std::string ucstring::toUtf8() const
 		}
 	}
 	return res;
+#endif
 }
 
 void ucstring::fromUtf8(const std::string &stringUtf8)
 {
+#if defined(NL_OS_WINDOWS)
+	// Use OS implementation
+	nlctassert(sizeof(wchar_t) == sizeof(ucchar));
+	nlctassert(sizeof(wchar_t) == sizeof(uint16));
+	nlctassert(sizeof(std::wstring) == sizeof(ucstring)); // These can be swapped on Windows
+	static_cast<std::wstring &>(*this) = nlmove(NLMISC::utf8ToWide(stringUtf8));
+	if (stringUtf8.size() && !size())
+		rawCopy(stringUtf8);
+#else
 	// clear the string
 	erase();
 
@@ -146,6 +162,7 @@ void ucstring::fromUtf8(const std::string &stringUtf8)
 			push_back(code);
 		}
 	}
+#endif
 }
 
 void ucstring::rawCopy(const std::string &str)

From 8be138931d8d14d5bb3c026cf839ce6412df92ef Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 04:33:08 +0800
Subject: [PATCH 032/292] Fix pCB NULL

---
 ryzom/client/src/login.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index cb6117744..2da407ecb 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -1211,9 +1211,10 @@ void initShardDisplay()
 	{
 		CCtrlButton *pCB = dynamic_cast<CCtrlButton*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_SHARD ":s0:but"));
 		if (pCB != NULL)
+		{
 			pCB->setPushed(true);
-		CAHManager::getInstance()->runActionHandler (pCB->getActionOnLeftClick(), pCB, pCB->getParamsOnLeftClick());
-
+			CAHManager::getInstance()->runActionHandler(pCB->getActionOnLeftClick(), pCB, pCB->getParamsOnLeftClick());
+		}
 	}
 	pList->invalidateCoords();
 }

From 0367e4f7c3adc0db9e762716f00d3dad334703c3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 04:35:18 +0800
Subject: [PATCH 033/292] Fix build warnings

---
 ryzom/common/src/game_share/visual_slot_manager.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/common/src/game_share/visual_slot_manager.h b/ryzom/common/src/game_share/visual_slot_manager.h
index 4fd46cd81..135e729a8 100644
--- a/ryzom/common/src/game_share/visual_slot_manager.h
+++ b/ryzom/common/src/game_share/visual_slot_manager.h
@@ -53,7 +53,7 @@ public:
 	static void releaseInstance();
 
 public:
-	typedef struct
+	typedef struct TElement
 	{
 		uint32				Index;
 		NLMISC::CSheetId	SheetId;
@@ -66,7 +66,7 @@ public:
 		}
 	} TElement;
 
-	typedef struct
+	typedef struct TElementList
 	{
 		// elements list for a visual slot.
 		std::vector<TElement> Element;

From 9896eae64d55585ff6a94109c3736da5816eb0b8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 06:05:22 +0800
Subject: [PATCH 034/292] Fix build warnings

---
 .../3d/driver/direct3d/driver_direct3d.cpp    |  2 +-
 .../driver_opengl_vertex_buffer_hard.cpp      |  9 +-
 nel/src/3d/render_trav.cpp                    |  2 +-
 nel/src/3d/scene.cpp                          |  4 +-
 nel/src/3d/shadow_map_manager.cpp             |  4 +-
 nel/src/3d/shape_bank.cpp                     |  3 +-
 nel/src/3d/surface_light_grid.cpp             | 23 ++---
 nel/src/3d/tessellation.cpp                   |  6 ++
 nel/src/gui/group_header.cpp                  | 21 +++--
 nel/src/logic/logic_state_machine.cpp         |  2 +-
 nel/src/misc/big_file.cpp                     | 10 ++-
 nel/src/misc/bitmap.cpp                       |  2 +-
 nel/src/misc/cdb_branch.cpp                   |  2 +-
 nel/src/misc/debug.cpp                        |  2 +
 nel/src/misc/eval_num_expr.cpp                |  6 +-
 nel/src/misc/i18n.cpp                         | 28 ++++---
 nel/src/misc/mem_displayer.cpp                |  2 +
 nel/src/misc/object_arena_allocator.cpp       | 29 ++++---
 nel/src/misc/path.cpp                         |  9 +-
 nel/src/misc/system_utils.cpp                 | 28 ++++---
 nel/src/misc/win_thread.cpp                   |  2 +-
 ryzom/client/src/client_chat_manager.cpp      | 10 ++-
 ryzom/client/src/continent.cpp                |  1 +
 ryzom/client/src/forage_source_cl.cpp         |  2 +-
 ryzom/client/src/fx_cl.cpp                    |  2 +-
 .../src/interface_v3/action_handler_game.cpp  |  2 +-
 .../interface_v3/action_handler_phrase.cpp    | 83 ++++++++++---------
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  2 +-
 .../src/interface_v3/interface_manager.cpp    |  2 +-
 .../src/interface_v3/sphrase_manager.cpp      | 11 ++-
 .../client/src/r2/displayer_visual_group.cpp  |  2 +-
 .../src/r2/dmc/client_edition_module.cpp      |  1 +
 ryzom/client/src/r2/editor.cpp                |  2 +-
 ryzom/client/src/r2/prim_render.cpp           |  2 +-
 ryzom/client/src/timed_fx_manager.cpp         |  2 +-
 .../time_weather_season/weather_function.cpp  |  2 +-
 36 files changed, 181 insertions(+), 141 deletions(-)

diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 3a4f67aee..fc853602f 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1173,7 +1173,7 @@ void D3DWndProc(CDriverD3D *driver, HWND hWnd, UINT message, WPARAM wParam, LPAR
 		}
 	}
 
-	if (driver->_EventEmitter.getNumEmitters() > 0)
+	if (driver && driver->_EventEmitter.getNumEmitters() > 0)
 	{
 		CWinEventEmitter *we = NLMISC::safe_cast<CWinEventEmitter *>(driver->_EventEmitter.getEmitter(0));
 		// Process the message by the emitter
diff --git a/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
index 689c37ba5..8e539afd7 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
@@ -1373,10 +1373,11 @@ CVertexBufferHardARB::~CVertexBufferHardARB()
 		}
 	}
 	#ifdef NL_DEBUG
-		if (_VertexPtr)
-		{
-			_VertexArrayRange->_MappedVBList.erase(_IteratorInMappedVBList);
-		}
+	if (_VertexPtr)
+	{
+		nlassert(_VertexArrayRange);
+		_VertexArrayRange->_MappedVBList.erase(_IteratorInMappedVBList);
+	}
 	#endif
 
 #ifdef USE_OPENGLES
diff --git a/nel/src/3d/render_trav.cpp b/nel/src/3d/render_trav.cpp
index 0a071303f..355ceb7ab 100644
--- a/nel/src/3d/render_trav.cpp
+++ b/nel/src/3d/render_trav.cpp
@@ -921,7 +921,7 @@ void		CRenderTrav::changeVPLightSetupMaterial(const CMaterial &mat, bool exclude
 		Driver->setUniform4f(IDriver::VertexProgram, program->idxLighted().Diffuse[i], color);
 	}
 
-
+	nlassert(_VPNumLights < MaxVPLight);
 	if (i != _VPNumLights)
 	{
 		color= _VPLightDiffuse[i] * matDiff;
diff --git a/nel/src/3d/scene.cpp b/nel/src/3d/scene.cpp
index 7f1263ea1..db8a629ff 100644
--- a/nel/src/3d/scene.cpp
+++ b/nel/src/3d/scene.cpp
@@ -775,9 +775,9 @@ CTransformShape	*CScene::createInstance(const string &shapeName)
 
 	// Look if this instance get lightmap information
 #if defined(__GNUC__) && __GNUC__ < 3
-	CMeshBase *pMB = (CMeshBase*)((IShape*)(pTShp->Shape));
+	CMeshBase *pMB = pTShp ? (CMeshBase*)((IShape*)(pTShp->Shape)) : NULL;
 #else // not GNUC
-	CMeshBase *pMB = dynamic_cast<CMeshBase*>((IShape*)(pTShp->Shape));
+	CMeshBase *pMB = pTShp ? dynamic_cast<CMeshBase*>((IShape*)(pTShp->Shape)) : NULL;
 #endif // not GNUC
 	CMeshBaseInstance *pMBI = dynamic_cast<CMeshBaseInstance*>( pTShp );
 	if( ( pMB != NULL ) && ( pMBI != NULL ) )
diff --git a/nel/src/3d/shadow_map_manager.cpp b/nel/src/3d/shadow_map_manager.cpp
index a8400ce0b..e6a7cfe50 100644
--- a/nel/src/3d/shadow_map_manager.cpp
+++ b/nel/src/3d/shadow_map_manager.cpp
@@ -256,14 +256,14 @@ void			CShadowMapManager::renderGenerate(CScene *scene)
 	garbageShadowTextures(scene);
 
 	IDriver *driverForShadowGeneration= scene->getRenderTrav().getAuxDriver();
+	nlassert(driverForShadowGeneration);
 	CSmartPtr<NL3D::ITexture> previousRenderTarget = driverForShadowGeneration->getRenderTarget();
 
 	// Init
 	// ********
 	uint32	wndW= _BlurTextureW, wndH= _BlurTextureH;
 	// get some text/screen size.
-	if(driverForShadowGeneration)
-		driverForShadowGeneration->getWindowSize(wndW, wndH);
+	driverForShadowGeneration->getWindowSize(wndW, wndH);
 	uint	baseTextureSize= scene->getShadowMapTextureSize();
 	// Minimize the Dest Texture size, so the blurTexture don't get too heavy in VRAM.
 	uint32	textDestW= min(wndW, (uint32)NL3D_SMM_MAX_TEXTDEST_SIZE);
diff --git a/nel/src/3d/shape_bank.cpp b/nel/src/3d/shape_bank.cpp
index 61a65c423..a7c60cd03 100644
--- a/nel/src/3d/shape_bank.cpp
+++ b/nel/src/3d/shape_bank.cpp
@@ -683,8 +683,7 @@ void CShapeBank::reset()
 	while( scmIt != ShapeCacheNameToShapeCache.end() )
 	{
 		CShapeCache *pShpCache = getShapeCachePtrFromShapeCacheName( scmIt->first );
-		if( pShpCache == NULL )
-			nlstop; // Should never happen
+		nlassert(pShpCache);
 		pShpCache->MaxSize = 0;
 		checkShapeCache( pShpCache );
 
diff --git a/nel/src/3d/surface_light_grid.cpp b/nel/src/3d/surface_light_grid.cpp
index deec090a4..b30abe730 100644
--- a/nel/src/3d/surface_light_grid.cpp
+++ b/nel/src/3d/surface_light_grid.cpp
@@ -121,17 +121,20 @@ void		CSurfaceLightGrid::getStaticLightSetup(NLMISC::CRGBA sunAmbient, const CVe
 			CLightInfluenceInterpolator::CCorner	&corner= interp.Corners[y*2 + x];
 			// For all lights
 			uint lid;
-			for(lid= 0; lid<CSurfaceLightGrid::NumLightPerCorner; lid++)
+			if (igPointLights)
 			{
-				// get the id of the light in the ig
-				uint	igLightId= cellCorner.Light[lid];
-				// If empty id, stop
-				if(igLightId==0xFF)
-					break;
-				else
+				for (lid = 0; lid < CSurfaceLightGrid::NumLightPerCorner; lid++)
 				{
-					// Set pointer of the light in the corner
-					corner.Lights[lid]= igPointLights + igLightId;
+					// get the id of the light in the ig
+					uint	igLightId = cellCorner.Light[lid];
+					// If empty id, stop
+					if (igLightId == 0xFF)
+						break;
+					else
+					{
+						// Set pointer of the light in the corner
+						corner.Lights[lid] = igPointLights + igLightId;
+					}
 				}
 			}
 			// Reset Empty slots.
@@ -152,7 +155,7 @@ void		CSurfaceLightGrid::getStaticLightSetup(NLMISC::CRGBA sunAmbient, const CVe
 			// BiLinear Ambient Contribution.
 			//-------------
 			// If FF, then take Sun Ambient => leave color and alpha To 0.
-			if(cellCorner.LocalAmbientId!=0xFF)
+			if(igPointLights && cellCorner.LocalAmbientId!=0xFF)
 			{
 				CPointLight	&pl= igPointLights[cellCorner.LocalAmbientId];
 				// take current ambient from pointLight
diff --git a/nel/src/3d/tessellation.cpp b/nel/src/3d/tessellation.cpp
index 451e1013b..9dbc12296 100644
--- a/nel/src/3d/tessellation.cpp
+++ b/nel/src/3d/tessellation.cpp
@@ -2678,6 +2678,8 @@ void		CTessFace::updateBindAndSplit()
 	}
 	else
 	{
+		nlassert(f0);
+		nlassert(f1);
 		// multipatch face case are detected when face->Patch==NULL !!!
 		if(f0->FLeft && f0->FLeft->Patch==NULL)
 		{
@@ -2710,6 +2712,8 @@ void		CTessFace::updateBindAndSplit()
 	}
 	else
 	{
+		nlassert(f0);
+		nlassert(f1);
 		if(f0->FLeft)
 		{
 			while(f0->FLeft->isLeaf())
@@ -2781,6 +2785,8 @@ void		CTessFace::updateBindAndSplit()
 	{
 		CTessFace	*f;
 		sint		i;
+		nlassert(f0);
+		nlassert(f1);
 
 		// Same reasoning for rectangular patchs, as above.
 		for(i=0;i<2;i++)
diff --git a/nel/src/gui/group_header.cpp b/nel/src/gui/group_header.cpp
index 03d688921..5fec1d4be 100644
--- a/nel/src/gui/group_header.cpp
+++ b/nel/src/gui/group_header.cpp
@@ -161,8 +161,14 @@ namespace NLGUI
 				// ...
 				limitingParent = limitingParent->getParent();
 			}
-
-			getParentContainer()->setW(totalWidth + getParentContainer()->getWReal() - limitingParent->getWReal());
+			if (limitingParent)
+			{
+				getParentContainer()->setW(totalWidth + getParentContainer()->getWReal() - limitingParent->getWReal());
+			}
+			else
+			{
+				nlwarning("No limiting parent for width");
+			}
 		}
 
 		// resize H
@@ -178,9 +184,14 @@ namespace NLGUI
 					CInterfaceGroup *limitingParent = colEnclosing->getParent();
 					while (limitingParent && (limitingParent->getResizeFromChildH() || dynamic_cast<CGroupList *>(limitingParent)))
 						limitingParent = limitingParent->getParent();
-
-					nlassert(limitingParent);
-					getParentContainer()->setH(col->getH() + getParentContainer()->getHReal() - limitingParent->getHReal());
+					if (limitingParent)
+					{
+						getParentContainer()->setH(col->getH() + getParentContainer()->getHReal() - limitingParent->getHReal());
+					}
+					else
+					{
+						nlwarning("No limiting parent for height");
+					}
 				}
 			}
 		}
diff --git a/nel/src/logic/logic_state_machine.cpp b/nel/src/logic/logic_state_machine.cpp
index ff99255d2..3d55be849 100644
--- a/nel/src/logic/logic_state_machine.cpp
+++ b/nel/src/logic/logic_state_machine.cpp
@@ -50,7 +50,7 @@ void xmlCheckNodeName (xmlNodePtr &node, const char *nodeName)
 		// Make an error message
 		char tmp[512];
 		smprintf (tmp, 512, "LogicStateMachine STATE_MACHINE XML Syntax error in block line %d, node %s should be %s",
-			node ? (int)node->line:-1, node->name, nodeName);
+			node ? (int)node->line:-1, node ? (const char *)node->name : "NULL", nodeName);
 
 		nlinfo (tmp);
 		nlstop;
diff --git a/nel/src/misc/big_file.cpp b/nel/src/misc/big_file.cpp
index 9713610cb..f01bbf297 100644
--- a/nel/src/misc/big_file.cpp
+++ b/nel/src/misc/big_file.cpp
@@ -75,7 +75,7 @@ CBigFile::CHandleFile		&CBigFile::CThreadFileArray::get(uint32 index)
 	// if the vector is not allocated, allocate it (empty entries filled with NULL => not opened FILE* in this thread)
 	if(index>=ptr->size())
 	{
-		ptr->resize(index+1);
+		ptr->resize((ptrdiff_t)index + 1);
 	}
 
 	return (*ptr)[index];
@@ -278,11 +278,13 @@ bool CBigFile::BNP::readHeader(FILE *file)
 		}
 
 		char sFileName[256];
-		if (fread (sFileName, 1, nStringSize, file) != nStringSize)
+		if (nStringSize)
 		{
-			return false;
+			if (fread(sFileName, 1, nStringSize, file) != nStringSize)
+			{
+				return false;
+			}
 		}
-
 		sFileName[nStringSize] = 0;
 
 		uint32 nFileSize2;
diff --git a/nel/src/misc/bitmap.cpp b/nel/src/misc/bitmap.cpp
index 015a9c4c4..967cc325e 100644
--- a/nel/src/misc/bitmap.cpp
+++ b/nel/src/misc/bitmap.cpp
@@ -4325,7 +4325,7 @@ void CBitmap::blend(CBitmap &Bm0, CBitmap &Bm1, uint16 factor, bool inputBitmapI
 	else
 	#endif //#ifdef NL_OS_WINDOWS
 	{
-		uint8 *endPix			= dest + (numPix << 2);
+		uint8 *endPix			= dest + ((ptrdiff_t)numPix << 2);
 		// no mmx version
 		uint blendFact    = (uint) factor;
 		uint invblendFact = 256 - blendFact;
diff --git a/nel/src/misc/cdb_branch.cpp b/nel/src/misc/cdb_branch.cpp
index 5f5cea571..f3e4f7de5 100644
--- a/nel/src/misc/cdb_branch.cpp
+++ b/nel/src/misc/cdb_branch.cpp
@@ -215,7 +215,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, IProgressCallback &progressCallBack,
 	else
 	{
 		if (!_Nodes.empty())
-			for ( _IdBits=1; _Nodes.size() > unsigned(1<<_IdBits) ; _IdBits++ ) {}
+			for ( _IdBits=1; _Nodes.size() > ((size_t)1 <<_IdBits) ; _IdBits++ ) {}
 		else
 			_IdBits = 0;
 	}
diff --git a/nel/src/misc/debug.cpp b/nel/src/misc/debug.cpp
index 1f7cf38db..6a40d3b0b 100644
--- a/nel/src/misc/debug.cpp
+++ b/nel/src/misc/debug.cpp
@@ -807,6 +807,8 @@ public:
 
 		DWORD symSize = 10000;
 		PIMAGEHLP_SYMBOL  sym = (PIMAGEHLP_SYMBOL) GlobalAlloc (GMEM_FIXED, symSize);
+		if (!sym) return str;
+
 		::ZeroMemory (sym, symSize);
 		sym->SizeOfStruct = symSize;
 		sym->MaxNameLength = symSize - sizeof(IMAGEHLP_SYMBOL);
diff --git a/nel/src/misc/eval_num_expr.cpp b/nel/src/misc/eval_num_expr.cpp
index 52dce523f..5d19e22a1 100644
--- a/nel/src/misc/eval_num_expr.cpp
+++ b/nel/src/misc/eval_num_expr.cpp
@@ -773,7 +773,7 @@ CEvalNumExpr::TReturnState CEvalNumExpr::evalExpression (double &finalResult, TT
 							case Exponent:
 								{
 									int exponent;
-									frexp( arg0, &exponent);
+									(void)frexp( arg0, &exponent);
 									value = (double)exponent;
 								}
 								break;
@@ -1032,13 +1032,13 @@ CEvalNumExpr::TReturnState CEvalNumExpr::evalExpression (double &finalResult, TT
 				v0 -= v1;
 				break;
 			case ULeftShift:
-				v0 = (double)(((uint)floor (v0 + 0.5))<<((uint)floor (v1 + 0.5)));
+				v0 = (double)(uint)(((uint)floor (v0 + 0.5))<<((uint)floor (v1 + 0.5)));
 				break;
 			case URightShift:
 				v0 = (double)(((uint)floor (v0 + 0.5))>>((uint)floor (v1 + 0.5)));
 				break;
 			case SLeftShift:
-				v0 = (double)(((sint)floor (v0 + 0.5))<<((sint)floor (v1 + 0.5)));
+				v0 = (double)(sint)(((sint)floor (v0 + 0.5))<<((sint)floor (v1 + 0.5)));
 				break;
 			case SRightShift:
 				v0 = (double)(((sint)floor (v0 + 0.5))>>((sint)floor (v1 + 0.5)));
diff --git a/nel/src/misc/i18n.cpp b/nel/src/misc/i18n.cpp
index f692fd849..27a47c2e4 100644
--- a/nel/src/misc/i18n.cpp
+++ b/nel/src/misc/i18n.cpp
@@ -339,21 +339,25 @@ std::string CI18N::getSystemLanguageCode ()
 		typedef int (WINAPI* GetUserDefaultLocaleNamePtr)(LPWSTR lpLocaleName, int cchLocaleName);
 
 		// get pointer on GetUserDefaultLocaleName, kernel32.dll is always in memory so no need to call LoadLibrary
-		GetUserDefaultLocaleNamePtr nlGetUserDefaultLocaleName = (GetUserDefaultLocaleNamePtr)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetUserDefaultLocaleName");
-
-		// only use it if found
-		if (nlGetUserDefaultLocaleName)
+		HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
+		if (hKernel32)
 		{
-			// get user locale
-			wchar_t buffer[LOCALE_NAME_MAX_LENGTH];
-			sint res = nlGetUserDefaultLocaleName(buffer, LOCALE_NAME_MAX_LENGTH);
+			GetUserDefaultLocaleNamePtr nlGetUserDefaultLocaleName = (GetUserDefaultLocaleNamePtr)GetProcAddress(hKernel32, "GetUserDefaultLocaleName");
 
-			// convert wide string to std::string
-			std::string lang = wideToUtf8(buffer);
+			// only use it if found
+			if (nlGetUserDefaultLocaleName)
+			{
+				// get user locale
+				wchar_t buffer[LOCALE_NAME_MAX_LENGTH];
+				sint res = nlGetUserDefaultLocaleName(buffer, LOCALE_NAME_MAX_LENGTH);
 
-			// only keep 2 first characters
-			if (lang.size() > 1)
-				_SystemLanguageCode = lang.substr(0, 2);
+				// convert wide string to std::string
+				std::string lang = wideToUtf8(buffer);
+
+				// only keep 2 first characters
+				if (lang.size() > 1)
+					_SystemLanguageCode = lang.substr(0, 2);
+			}
 		}
 	}
 #endif
diff --git a/nel/src/misc/mem_displayer.cpp b/nel/src/misc/mem_displayer.cpp
index 04e5c71dd..0250fc4c6 100644
--- a/nel/src/misc/mem_displayer.cpp
+++ b/nel/src/misc/mem_displayer.cpp
@@ -58,6 +58,8 @@ static string getFuncInfo (DWORD_TYPE funcAddr, DWORD_TYPE stackAddr)
 
 	DWORD symSize = 10000;
 	PIMAGEHLP_SYMBOL  sym = (PIMAGEHLP_SYMBOL) GlobalAlloc (GMEM_FIXED, symSize);
+	if (!sym) return str;
+
 	::ZeroMemory (sym, symSize);
 	sym->SizeOfStruct = symSize;
 	sym->MaxNameLength = symSize - sizeof(IMAGEHLP_SYMBOL);
diff --git a/nel/src/misc/object_arena_allocator.cpp b/nel/src/misc/object_arena_allocator.cpp
index bd00affc9..ba2c81148 100644
--- a/nel/src/misc/object_arena_allocator.cpp
+++ b/nel/src/misc/object_arena_allocator.cpp
@@ -60,22 +60,23 @@ CObjectArenaAllocator::~CObjectArenaAllocator()
 void *CObjectArenaAllocator::alloc(uint size)
 {
 	#ifdef NL_DEBUG
-		if (_WantBreakOnAlloc)
+	if (_WantBreakOnAlloc)
+	{
+		if (_AllocID == _BreakAllocID)
 		{
-			if (_AllocID == _BreakAllocID)
-			{
-				nlassert(0);
-			}
+			nlassert(0);
 		}
+	}
 	#endif
 	if (size >= _MaxAllocSize)
 	{
 		// use standard allocator
 		nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT >= sizeof(uint));
-		uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block
-		if (!block) return NULL;
+		uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + (ptrdiff_t)size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block
+		if (!block) throw std::bad_alloc();
 		#ifdef NL_DEBUG
-			_MemBlockToAllocID[block] = _AllocID;
+		_MemBlockToAllocID[block] = _AllocID;
+		++_AllocID;
 		#endif
 		*(uint *) block = size;
 		return block + NL_DEFAULT_MEMORY_ALIGNMENT;
@@ -87,16 +88,14 @@ void *CObjectArenaAllocator::alloc(uint size)
 		_ObjectSizeToAllocator[entry] = new CFixedSizeAllocator(entry * _Granularity + NL_DEFAULT_MEMORY_ALIGNMENT, _MaxAllocSize / size); // an additionnal uint is needed to store size of block
 	}
 	void *block = _ObjectSizeToAllocator[entry]->alloc();
+	if (!block) throw std::bad_alloc();
 	nlassert(((uintptr_t)block % NL_DEFAULT_MEMORY_ALIGNMENT) == 0);
 	#ifdef NL_DEBUG
-		if (block)
-		{
-			_MemBlockToAllocID[block] = _AllocID;
-		}
-		++_AllocID;
+	_MemBlockToAllocID[block] = _AllocID;
+	++_AllocID;
 	#endif
-	*(uint *) block = size;
-	return (void *) ((uint8 *) block + NL_DEFAULT_MEMORY_ALIGNMENT);
+	*(uint *)block = size;
+	return (void *)((uint8 *)block + NL_DEFAULT_MEMORY_ALIGNMENT);
 }
 
 // *****************************************************************************************************************
diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index cdc71c1eb..a2f817210 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -1341,10 +1341,13 @@ void CFileContainer::addSearchBigFile (const string &sBigFilename, bool recurse,
 				fclose(Handle);
 				return;
 			}
-			if (fread (FileName, 1, nStringSize, Handle) != nStringSize)
+			if (nStringSize)
 			{
-				fclose(Handle);
-				return;
+				if (fread(FileName, 1, nStringSize, Handle) != nStringSize)
+				{
+					fclose(Handle);
+					return;
+				}
 			}
 			FileName[nStringSize] = 0;
 			uint32 nFileSize2;
diff --git a/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
index 8e6a1feae..45da347bd 100644
--- a/nel/src/misc/system_utils.cpp
+++ b/nel/src/misc/system_utils.cpp
@@ -173,23 +173,25 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 		{
 			// create a lock on this buffer
 			void *hLock = GlobalLock(mem);
+			if (hLock)
+			{
+				// copy text to this buffer
+				if (isUnicode)
+					wcscpy((wchar_t *)hLock, (const wchar_t *)text.c_str());
+				else
+					strcpy((char *)hLock, text.toString().c_str());
 
-			// copy text to this buffer
-			if (isUnicode)
-				wcscpy((wchar_t*)hLock, (const wchar_t*)text.c_str());
-			else
-				strcpy((char*)hLock, text.toString().c_str());
-
-			// unlock buffer
-			GlobalUnlock(mem);
+				// unlock buffer
+				GlobalUnlock(mem);
 
-			// empty clipboard
-			EmptyClipboard();
+				// empty clipboard
+				EmptyClipboard();
 
-			// set new data to clipboard in the right format
-			SetClipboardData(isUnicode ? CF_UNICODETEXT:CF_TEXT, mem);
+				// set new data to clipboard in the right format
+				SetClipboardData(isUnicode ? CF_UNICODETEXT : CF_TEXT, mem);
 
-			res = true;
+				res = true;
+			}
 		}
 
 		CloseClipboard();
diff --git a/nel/src/misc/win_thread.cpp b/nel/src/misc/win_thread.cpp
index 0de191d55..c3624c161 100644
--- a/nel/src/misc/win_thread.cpp
+++ b/nel/src/misc/win_thread.cpp
@@ -209,11 +209,11 @@ void CWinThread::start ()
 	ThreadHandle = (void *) ::CreateThread (NULL, 0, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 //	nldebug("NLMISC: thread %x started for runnable '%x'", typeid( Runnable ).name());
 //	OutputDebugString(toString(NL_LOC_MSG " NLMISC: thread %x started for runnable '%s'\n", ThreadId, typeid( *Runnable ).name()).c_str());
-	SetThreadPriorityBoost (ThreadHandle, TRUE); // FALSE == Enable Priority Boost
 	if (ThreadHandle == NULL)
 	{
 		throw EThread ( "Cannot create new thread" );
 	}
+	SetThreadPriorityBoost (ThreadHandle, TRUE); // FALSE == Enable Priority Boost
 
 	_SuspendCount = 0;
 }
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index 9d222a1b7..a61c21701 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -1230,11 +1230,13 @@ class CHandlerEnterTell : public IActionHandler
 		{
 			CGroupContainer *pGC = pCGW->createFreeTeller(receiver);
 			if (pGC != NULL)
-				pGC->setActive(true);
-			CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(pGC->getGroup("eb"));
-			if (eb)
 			{
-				CWidgetManager::getInstance()->setCaptureKeyboard(eb);
+				pGC->setActive(true);
+				CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(pGC->getGroup("eb"));
+				if (eb)
+				{
+					CWidgetManager::getInstance()->setCaptureKeyboard(eb);
+				}
 			}
 		}
 	}
diff --git a/ryzom/client/src/continent.cpp b/ryzom/client/src/continent.cpp
index 03b9a1fce..6bd22741a 100644
--- a/ryzom/client/src/continent.cpp
+++ b/ryzom/client/src/continent.cpp
@@ -956,6 +956,7 @@ void CContinent::unselect()
 		// Setup the Root scene.
 		if (BackgroundIG)
 		{
+			nlassert(SceneRoot);
 			BackgroundIG->removeFromScene (*SceneRoot);
 			SceneRoot->deleteInstanceGroup (BackgroundIG);
 			BackgroundIG = NULL;
diff --git a/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
index 4e673caaf..be41c0e75 100644
--- a/ryzom/client/src/forage_source_cl.cpp
+++ b/ryzom/client/src/forage_source_cl.cpp
@@ -101,7 +101,7 @@ bool CForageSourceCL::build( const CEntitySheet *sheet )
 	const CForageSourceSheet *forageSourceSheet = dynamic_cast<const CForageSourceSheet*>(sheet);
 	if ( ! forageSourceSheet )
 	{
-		nlwarning( "Bad sheet %s for forage source", sheet->Id.toString().c_str() );
+		nlwarning( "Bad sheet %s for forage source", sheet ? sheet->Id.toString().c_str() : "NULL" );
 		return false;
 	}
 	if ( ! setFx( forageSourceSheet->FxFilename ) )
diff --git a/ryzom/client/src/fx_cl.cpp b/ryzom/client/src/fx_cl.cpp
index e1f29fd77..aeb3ddcba 100644
--- a/ryzom/client/src/fx_cl.cpp
+++ b/ryzom/client/src/fx_cl.cpp
@@ -75,7 +75,7 @@ bool CFxCL::build( const CEntitySheet *sheet )
 	if ( (! _FXSheet) || (_FXSheet->PSList.empty()) )
 	{
 		_BadBuild = true;
-		nlwarning( "Bad sheet %s for fx", sheet->Id.toString().c_str() );
+		nlwarning( "Bad sheet %s for fx", sheet ? sheet->Id.toString().c_str() : "NULL" );
 		return false;
 	}
 
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 5af8485d6..bbb392131 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1334,7 +1334,7 @@ class CSelectItemSheet : public IActionHandler
 		// check if user has the level to use the item (applies to item & plans)
 		if (ctrlSheet->getSheetCategory() == CDBCtrlSheet::Item)
 		{
-			if (csg->getName() == "buy_selection")
+			if (csg && csg->getName() == "buy_selection")
 			{
 				const CItemSheet *is = ctrlSheet->asItemSheet();
 				if (is)
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 8a94a4c16..dcc55f9ea 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1191,57 +1191,60 @@ public:
 			if( pPM->avoidCyclicForPhrase(phraseCom) )
 				cyclic= false;
 
-			// **** Launch the cast
-			// Cast only if their is a target, or if it is not a combat action
-			CEntityCL	*target = EntitiesMngr.entity(UserEntity->targetSlot());
-			if(target || !rootBrick->isCombat())
+			if (UserEntity)
 			{
-				// combat (may moveTo before) ?
-				if(rootBrick->isCombat())
+				// **** Launch the cast
+				// Cast only if their is a target, or if it is not a combat action
+				CEntityCL *target = EntitiesMngr.entity(UserEntity->targetSlot());
+				if (target || !rootBrick->isCombat())
 				{
-					if( !UserEntity->canEngageCombat() )
-						return;
+					// combat (may moveTo before) ?
+					if (rootBrick->isCombat())
+					{
+						if (!UserEntity->canEngageCombat())
+							return;
 
-					UserEntity->executeCombatWithPhrase(target, memoryLine, memoryIndex, cyclic);
-				}
-				// else can cast soon!
-				else if ( rootBrick->isForageExtraction() && (! UserEntity->isRiding()) ) // if mounted, send directly to server (without moving) to receive the error message
-				{
-					// Yoyo: TEMP if a target selected, must be a forage source
-					if(!target || target->isForageSource())
+						UserEntity->executeCombatWithPhrase(target, memoryLine, memoryIndex, cyclic);
+					}
+					// else can cast soon!
+					else if (rootBrick->isForageExtraction() && (!UserEntity->isRiding())) // if mounted, send directly to server (without moving) to receive the error message
+					{
+						// Yoyo: TEMP if a target selected, must be a forage source
+						if (!target || target->isForageSource())
+						{
+							// Cancel any follow
+							UserEntity->disableFollow();
+							// reset any moveTo also (if target==NULL, moveToExtractionPhrase() and therefore resetAnyMoveTo() not called)
+							// VERY important if previous MoveTo was a SPhrase MoveTo (because cancelClientExecute() must be called)
+							UserEntity->resetAnyMoveTo();
+
+							// Move to targetted source
+							if (target)
+								UserEntity->moveToExtractionPhrase(target->slot(), MaxExtractionDistance, memoryLine, memoryIndex, cyclic);
+
+							// start client execution
+							pPM->clientExecute(memoryLine, memoryIndex, cyclic);
+
+							if (!target)
+							{
+								// inform Server of phrase cast
+								pPM->sendExecuteToServer(memoryLine, memoryIndex, cyclic);
+							}
+						}
+					}
+					else
 					{
-						// Cancel any follow
-						UserEntity->disableFollow();
-						// reset any moveTo also (if target==NULL, moveToExtractionPhrase() and therefore resetAnyMoveTo() not called)
+						// Cancel any moveTo(), because don't want to continue reaching the prec entity
 						// VERY important if previous MoveTo was a SPhrase MoveTo (because cancelClientExecute() must be called)
 						UserEntity->resetAnyMoveTo();
 
-						// Move to targetted source
-						if ( target )
-							UserEntity->moveToExtractionPhrase( target->slot(), MaxExtractionDistance, memoryLine, memoryIndex, cyclic );
-
-						// start client execution
+						// start client execution: NB: start client execution even if it
 						pPM->clientExecute(memoryLine, memoryIndex, cyclic);
 
-						if ( ! target )
-						{
-							// inform Server of phrase cast
-							pPM->sendExecuteToServer(memoryLine, memoryIndex, cyclic);
-						}
+						// inform Server of phrase cast
+						pPM->sendExecuteToServer(memoryLine, memoryIndex, cyclic);
 					}
 				}
-				else
-				{
-					// Cancel any moveTo(), because don't want to continue reaching the prec entity
-					// VERY important if previous MoveTo was a SPhrase MoveTo (because cancelClientExecute() must be called)
-					UserEntity->resetAnyMoveTo();
-
-					// start client execution: NB: start client execution even if it
-					pPM->clientExecute(memoryLine, memoryIndex, cyclic);
-
-					// inform Server of phrase cast
-					pPM->sendExecuteToServer(memoryLine, memoryIndex, cyclic);
-				}
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 4a7ef5701..ce7f2fcf5 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -475,7 +475,7 @@ bool CDBGroupListSheetTrade::CSheetChildTrade::isSheetValid(CDBGroupListSheetTex
 		if ((pIS != NULL) && (!pIS->DropOrSell))
 			return false;
 		// test if this whole family of items can be sold
-		if( !ITEMFAMILY::isSellableByPlayer(pIS->Family) )
+		if((pIS != NULL) && !ITEMFAMILY::isSellableByPlayer(pIS->Family) )
 			return false;
 	}
 
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 23440218e..5737e50a0 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2980,8 +2980,8 @@ void CInterfaceManager::log(const ucstring &str, const std::string &cat)
 		{
 			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str.toUtf8();
 			fprintf(f, "%s\n", finalString.c_str());
+			fclose(f);
 		}
-		fclose(f);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index 5ebf3eee9..dc605d11d 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -3576,13 +3576,12 @@ void				CSPhraseManager::updatePhraseProgressionDB()
 					break;
 				}
 			}
-		}
-
 
-		// if show, but only if full learnt, skip it if not fully learnt
-		if(phrase->ShowInAPOnlyIfLearnt && !known)
-		{
-			continue;
+			// if show, but only if full learnt, skip it if not fully learnt
+			if (phrase->ShowInAPOnlyIfLearnt && !known)
+			{
+				continue;
+			}
 		}
 
 
diff --git a/ryzom/client/src/r2/displayer_visual_group.cpp b/ryzom/client/src/r2/displayer_visual_group.cpp
index 05e120e66..0edc18880 100644
--- a/ryzom/client/src/r2/displayer_visual_group.cpp
+++ b/ryzom/client/src/r2/displayer_visual_group.cpp
@@ -98,7 +98,7 @@ protected:
 	{
 		CGroupMap *gm = CTool::getWorldMap();
 		if (!gm) dest = CVector::Null;
-		gm->worldToWindow(dest, src);
+		else gm->worldToWindow(dest, src);
 	}
 };
 
diff --git a/ryzom/client/src/r2/dmc/client_edition_module.cpp b/ryzom/client/src/r2/dmc/client_edition_module.cpp
index f58a9f669..6740dabfe 100644
--- a/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -2227,6 +2227,7 @@ void CClientEditionModule::addToSaveList(const std::string& filename, const std:
 	if (!ok)
 	{
 		delete sv;
+		return;
 	}
 	else
 	{
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 8e146e9ad..96b935e34 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -6302,7 +6302,7 @@ CInstance *CEditor::getInstanceUnderPos(float x, float y, float distSelection, b
 			objectSelected= precInstanceUnderPos->getDisplayerVisual();
 	}
 
-	if (objectSelected->getSelectionType() == ISelectableObject::GroundProjected)
+	if (objectSelected && objectSelected->getSelectionType() == ISelectableObject::GroundProjected)
 	{
 		if (borderSelected && borderSelected != objectSelected)
 		{
diff --git a/ryzom/client/src/r2/prim_render.cpp b/ryzom/client/src/r2/prim_render.cpp
index 59b05e1c4..f4b6cb8a9 100644
--- a/ryzom/client/src/r2/prim_render.cpp
+++ b/ryzom/client/src/r2/prim_render.cpp
@@ -202,7 +202,7 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const
 		{
 			CGroupMap *gm = CTool::getWorldMap();
 			if (!gm) dest = CVector::Null;
-			gm->worldToWindow(dest, src);
+			else gm->worldToWindow(dest, src);
 		}
 	};
 	CViewBase::TCtorParam param;
diff --git a/ryzom/client/src/timed_fx_manager.cpp b/ryzom/client/src/timed_fx_manager.cpp
index b316f0ab5..6f46d6712 100644
--- a/ryzom/client/src/timed_fx_manager.cpp
+++ b/ryzom/client/src/timed_fx_manager.cpp
@@ -204,7 +204,7 @@ CTimedFXManager::TFXGroupHandle CTimedFXManager::add(const std::vector<CTimedFX>
 		//sint32 debugDay;
 		if (!(fi.FXSheet && fi.FXSheet->Mode == CSeasonFXSheet::AlwaysStarted))
 		{
-			if (fi.FXSheet->Mode == CSeasonFXSheet::Spawn)
+			if (fi.FXSheet && fi.FXSheet->Mode == CSeasonFXSheet::Spawn)
 			{
 				// compute next spawn date
 				float cycleLength = fi.FXSheet ? fi.FXSheet->CycleDuration : _DayLength;
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_function.cpp b/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
index 02432142f..f62a5a244 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
@@ -37,7 +37,7 @@ CWeatherFunction::CWeatherFunction()
 void CWeatherFunction::buildFromSheet(const CWeatherFunctionSheet &sheet, const CWeatherManager &wm)
 {
 	// copy common part of objects (parameters)
-	*static_cast<CWeatherFunctionParameters *>(this) = *static_cast<const CWeatherFunctionParameters *>(&sheet);
+	static_cast<CWeatherFunctionParameters &>(*this) = static_cast<const CWeatherFunctionParameters &>(sheet);
 	// get pointer on the setup from their names
 	_WeatherSetups.resize(sheet.SetupNames.size());
 	nlassert(sheet.SetupWeights.size() == sheet.SetupNames.size());

From c68c3746dd1554fdd3b31a7cff7d7c4f93c7ff34 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 19:07:41 +0800
Subject: [PATCH 035/292] Build fix

---
 nel/tools/3d/panoply_preview/main_window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/tools/3d/panoply_preview/main_window.cpp b/nel/tools/3d/panoply_preview/main_window.cpp
index 1b743d439..1ef144a14 100644
--- a/nel/tools/3d/panoply_preview/main_window.cpp
+++ b/nel/tools/3d/panoply_preview/main_window.cpp
@@ -53,7 +53,7 @@ namespace {
 
 QString nli18n(const char *label)
 {
-	return QString::fromUtf16(CI18N::get(label).c_str());
+	return QString::fromUtf16((const ushort *)CI18N::get(label).c_str());
 }
 
 } /* anonymous namespace */

From c068d757eb2442692f47201e9124afbab6c2f523 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 19:23:11 +0800
Subject: [PATCH 036/292] Build fix

---
 nel/include/nel/misc/string_common.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nel/include/nel/misc/string_common.h b/nel/include/nel/misc/string_common.h
index 9f6d59aae..6021b8159 100644
--- a/nel/include/nel/misc/string_common.h
+++ b/nel/include/nel/misc/string_common.h
@@ -193,6 +193,10 @@ inline std::string toString(const sint32 &val) { return toString("%d", val); }
 inline std::string toString(const uint64 &val) { return toString("%" NL_I64 "u", val); }
 inline std::string toString(const sint64 &val) { return toString("%" NL_I64 "d", val); }
 
+#ifdef NL_OS_WINDOWS
+inline std::string toString(const wchar_t &val) { return toString(reinterpret_cast<const uint16 &>(val)); }
+#endif
+
 #ifdef NL_COMP_GCC
 #	if GCC_VERSION == 40102
 
@@ -246,6 +250,10 @@ inline bool fromString(const std::string &str, sint64 &val) { bool ret = sscanf(
 inline bool fromString(const std::string &str, float &val) { bool ret = sscanf(str.c_str(), "%f", &val) == 1; if (!ret) val = 0.0f; return ret; }
 inline bool fromString(const std::string &str, double &val) { bool ret = sscanf(str.c_str(), "%lf", &val) == 1; if (!ret) val = 0.0; return ret; }
 
+#ifdef NL_OS_WINDOWS
+inline bool fromString(const std::string &str, wchar_t &val) { return fromString(str, reinterpret_cast<uint16 &>(val)); }
+#endif
+
 // Fast string to bool, reliably defined for strings starting with 0, 1, t, T, f, F, y, Y, n, N, anything else is undefined.
 // (str[0] == '1' || (str[0] & 0xD2) == 0x50)
 //  - Kaetemi

From 8d94baaf14a9ba71ffbca056df6673383e3cd7ae Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 21:17:22 +0800
Subject: [PATCH 037/292] More consistent unicode behaviour for text

---
 nel/include/nel/gui/group_editbox.h           |  4 +-
 nel/src/gui/ctrl_base.cpp                     | 52 ++++++++++---------
 nel/src/gui/ctrl_text_button.cpp              |  8 +--
 nel/src/gui/dbgroup_combo_box.cpp             |  2 +-
 nel/src/gui/dbview_quantity.cpp               |  7 +--
 nel/src/gui/group_editbox.cpp                 | 20 +------
 nel/src/gui/group_html.cpp                    |  4 +-
 nel/src/gui/group_list.cpp                    |  9 ++--
 nel/src/gui/group_menu.cpp                    |  7 +--
 nel/src/gui/group_paragraph.cpp               |  9 ++--
 nel/src/gui/group_tree.cpp                    |  7 +--
 nel/src/gui/lua_ihm.cpp                       |  6 +--
 nel/src/gui/view_text.cpp                     | 12 ++---
 nel/src/gui/view_text_formated.cpp            | 38 +++++++-------
 nel/src/gui/view_text_id_formated.cpp         | 27 +++++-----
 nel/src/misc/system_utils.cpp                 | 21 +++++---
 .../src/interface_v3/macrocmd_manager.cpp     | 10 ++--
 ryzom/client/src/login.cpp                    |  4 +-
 18 files changed, 121 insertions(+), 126 deletions(-)

diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 096f3daa0..dc343410b 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -79,8 +79,6 @@ namespace NLGUI
 		sint64		getInputStringAsInt64() const;
 		void		setInputStringAsFloat(float val);
 		float		getInputStringAsFloat() const;
-		void		setInputStringAsStdString(const std::string &str);
-		std::string	getInputStringAsStdString() const;
 		void		setInputStringAsUtf8(const std::string &str);
 		std::string	getInputStringAsUtf8() const;
 		void		setColor(NLMISC::CRGBA col);
@@ -189,7 +187,7 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setSelectionAll", luaSetSelectionAll);
 			REFLECT_LUA_METHOD("setFocusOnText", luaSetFocusOnText);
 			REFLECT_LUA_METHOD("cancelFocusOnText", luaCancelFocusOnText);
-			REFLECT_STRING("input_string", getInputStringAsStdString, setInputStringAsStdString);
+			REFLECT_STRING("input_string", getInputStringAsUtf8, setInputStringAsUtf8);
 			REFLECT_UCSTRING("uc_input_string", getInputString, setInputString);
 		REFLECT_EXPORT_END
 
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index 2d67ccc30..0124bfdee 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -122,30 +122,26 @@ namespace NLGUI
 		CXMLAutoPtr prop;
 
 		// get static toolTip
-		prop = (char*) xmlGetProp( cur, (xmlChar*)"tooltip" );
-		if (prop)
+		prop = (char *)xmlGetProp(cur, (xmlChar *)"tooltip_i18n");
+		if ((bool)prop && strlen((const char *)prop) > 0)
 		{
-			const char *propPtr = prop;
-			if (strlen(propPtr) > 2 && propPtr[0] == 'u' && propPtr[1] == ':')
-				_ContextHelp = ucstring::makeFromUtf8(std::string(propPtr).substr(2));
+			// Force I18N tooltip
+			if (!editorMode)
+				_ContextHelp = CI18N::get((const char *)prop);
 			else
-				_ContextHelp = ucstring(propPtr);
-			
-
-			if( !editorMode && ( strlen(propPtr) > 2 ) )
-			{
-				if ((propPtr[0] == 'u') && (propPtr[1] == 'i'))
-					_ContextHelp = CI18N::get ((const char *) prop);
-			}
+				_ContextHelp.fromUtf8((const char *)prop);
 		}
-		// Force I18N tooltip
-		prop = (char*) xmlGetProp( cur, (xmlChar*)"tooltip_i18n" );
-		if ((bool)prop && strlen((const char*)prop)>0)
+		else
 		{
-			if( !editorMode )
-				_ContextHelp = CI18N::get ((const char *) prop);
-			else
-				_ContextHelp = (const char*)prop;
+			// get static toolTip
+			prop = (char *)xmlGetProp(cur, (xmlChar *)"tooltip");
+			if (prop)
+			{
+				if (!editorMode && NLMISC::startsWith((const char *)prop, "ui"))
+					_ContextHelp = CI18N::get((const char *)prop);
+				else
+					_ContextHelp.fromUtf8((const char *)prop);
+			}
 		}
 
 		// get dynamic toolTip ActionHandler
@@ -173,7 +169,7 @@ namespace NLGUI
 		_ToolTipSpecialParent= CStringShared();
 		if(prop)
 		{
-			_ToolTipSpecialParent= std::string((const char*)prop);
+			_ToolTipSpecialParent= (const char*)prop;
 		}
 
 		// Tooltip posref
@@ -201,12 +197,12 @@ namespace NLGUI
 	{
 		if( name == "tooltip" )
 		{
-			return _ContextHelp.toString();
+			return _ContextHelp.toUtf8();
 		}
 		else
 		if( name == "tooltip_i18n" )
 		{
-			return _ContextHelp.toString();
+			return _ContextHelp.toUtf8();
 		}
 		else
 		if( name == "on_tooltip" )
@@ -262,13 +258,19 @@ namespace NLGUI
 	{
 		if( name == "tooltip" )
 		{
-			_ContextHelp = ucstring::makeFromUtf8(value);
+			if (!editorMode && NLMISC::startsWith(value, "ui"))
+				_ContextHelp = CI18N::get(value);
+			else
+				_ContextHelp.fromUtf8(value);
 			return;
 		}
 		else
 		if( name == "tooltip_i18n" )
 		{
-			_ContextHelp = value;
+			if (!editorMode)
+				_ContextHelp = CI18N::get(value);
+			else
+				_ContextHelp.fromUtf8(value);
 			return;
 		}
 		else
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index de01174ed..942dd11f8 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -596,9 +596,11 @@ namespace NLGUI
 			if (prop)
 			{
 				const char *propPtr = prop;
-				ucstring text = ucstring(propPtr);
-				if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-					text = CI18N::get (propPtr);
+				ucstring text;
+				if (NLMISC::startsWith(propPtr, "ui"))
+					text = CI18N::get(propPtr);
+				else
+					text.fromUtf8(propPtr);
 				_ViewText->setText(text);
 			}
 		}
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 834d2d5bf..59a8b03c8 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -467,7 +467,7 @@ namespace NLGUI
 	void CDBGroupComboBox::setViewText(const ucstring & text)
 	{
 		_IsExternViewText = true;
-		_ExternViewText = ucstring(text);
+		_ExternViewText = text;
 		_ViewText->setText(_ExternViewText);
 	}
 
diff --git a/nel/src/gui/dbview_quantity.cpp b/nel/src/gui/dbview_quantity.cpp
index cac772c96..0b01f14f0 100644
--- a/nel/src/gui/dbview_quantity.cpp
+++ b/nel/src/gui/dbview_quantity.cpp
@@ -147,9 +147,10 @@ namespace NLGUI
 		if(ptr)
 		{
 			const char *propPtr = ptr;
-			_EmptyText = ucstring(propPtr);
-			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-				_EmptyText = CI18N::get (propPtr);
+			if (NLMISC::startsWith(propPtr, "ui"))
+				_EmptyText = CI18N::get(propPtr);
+			else
+				_EmptyText.fromUtf8(propPtr);
 		}
 
 		// init cache.
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 136909f63..2879a62af 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -1229,7 +1229,7 @@ namespace NLGUI
 			{
 				makeTopWindow();
 				// for french, deutsch and russian, be aware of unicode
-				std::string command = ucstring(_InputString.substr(1)).toUtf8();
+				std::string command = _InputString.substr(1).toUtf8();
 				ICommand::expand(command);
 				// then back to ucstring
 				_InputString.fromUtf8(command);
@@ -1735,26 +1735,10 @@ namespace NLGUI
 		CInterfaceGroup::setActive(active);
 	}
 
-	// ***************************************************************************
-	void CGroupEditBox::setInputStringAsStdString(const std::string &str)
-	{
-		setInputString(ucstring(str));
-	}
-
-	// ***************************************************************************
-	std::string CGroupEditBox::getInputStringAsStdString() const
-	{
-		std::string result;
-		_InputString.toString(result);
-		return result;
-	}
-
 	// ***************************************************************************
 	void	CGroupEditBox::setInputStringAsUtf8(const std::string &str)
 	{
-		ucstring	tmp;
-		tmp.fromUtf8(str);
-		setInputString(tmp);
+		setInputString(ucstring::makeFromUtf8(str));
 	}
 
 	// ***************************************************************************
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 50b381a3c..0c294c766 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -4716,7 +4716,7 @@ namespace NLGUI
 		const char *funcName = "addString";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
-		addString(ucstring(ls.toString(1)));
+		addString(ucstring::makeFromUtf8(ls.toString(1)));
 		return 0;
 	}
 
@@ -5470,7 +5470,7 @@ namespace NLGUI
 					}
 					else
 					{
-						ctrlButton->setDefaultContextHelp(ucstring(tooltip));
+						ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
 					}
 				}
 
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index b49eed7cc..d619a8146 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -518,11 +518,10 @@ namespace NLGUI
 		{
 			_HardText = std::string( (const char*)ptr );
 			const char *propPtr = ptr;
-			ucstring Text = ucstring(propPtr);
-			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-				Text = CI18N::get (propPtr);
-
-			addTextChild(Text);
+			if (NLMISC::startsWith(propPtr, "ui"))
+				addTextChild(CI18N::get(propPtr));
+			else
+				addTextChild(ucstring::makeFromUtf8(propPtr));
 		}
 		else
 		{
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index 3fc8d0bbb..830b74fb9 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -283,9 +283,10 @@ namespace NLGUI
 				if (name)
 				{
 					const char *ptrName = (const char*)name;
-					ucstrName = ucstring(ptrName);
-					if ((strlen(ptrName)>2) && (ptrName[0] == 'u') && (ptrName[1] == 'i'))
-						ucstrName = CI18N::get (ptrName);
+					if (NLMISC::startsWith(ptrName, "ui"))
+						ucstrName = CI18N::get(ptrName);
+					else
+						ucstrName.fromUtf8(ptrName);
 				}
 
 				CXMLAutoPtr ah((const char*) xmlGetProp (cur,  (xmlChar*)"handler"));
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index 9424c0218..f772309a6 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -476,11 +476,10 @@ namespace NLGUI
 		{
 			_HardText = std::string( (const char*)ptr );
 			const char *propPtr = ptr;
-			ucstring Text = ucstring(propPtr);
-			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-				Text = CI18N::get (propPtr);
-
-			addTextChild(Text);
+			if (NLMISC::startsWith(propPtr, "ui"))
+				addTextChild(CI18N::get(propPtr));
+			else
+				addTextChild(ucstring::makeFromUtf8(propPtr));
 		}
 		else
 		{
diff --git a/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
index 83c080b5e..9fad363f0 100644
--- a/nel/src/gui/group_tree.cpp
+++ b/nel/src/gui/group_tree.cpp
@@ -306,9 +306,10 @@ namespace NLGUI
 			if (name)
 			{
 				const char *ptrName = (const char*)name;
-				Text = ucstring(ptrName);
-				if ((strlen(ptrName)>2) && (ptrName[0] == 'u') && (ptrName[1] == 'i'))
-					Text = CI18N::get (ptrName);
+				if (NLMISC::startsWith(ptrName, "ui"))
+					Text = CI18N::get(ptrName);
+				else
+					ucstring::makeFromUtf8(ptrName);
 			}
 
 			CXMLAutoPtr color((const char*) xmlGetProp (cur,   (xmlChar*)"color"));
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index 946baa560..cf60444a6 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -1880,21 +1880,21 @@ namespace NLGUI
 	ucstring		CLuaIHM::findReplaceAll(const ucstring &str,   const std::string &search,   const std::string &replace)
 	{
 		//H_AUTO(Lua_CLuaIHM_findReplaceAll)
-		return findReplaceAll(str,   ucstring(search),   ucstring(replace));
+		return findReplaceAll(str,   ucstring::makeFromUtf8(search),   ucstring::makeFromUtf8(replace));
 	}
 
 	// ***************************************************************************
 	ucstring		CLuaIHM::findReplaceAll(const ucstring &str,   const std::string &search,   const ucstring &replace)
 	{
 		//H_AUTO(Lua_CLuaIHM_findReplaceAll)
-		return findReplaceAll(str,   ucstring(search),   ucstring(replace));
+		return findReplaceAll(str,   ucstring::makeFromUtf8(search),  replace);
 	}
 
 	// ***************************************************************************
 	ucstring		CLuaIHM::findReplaceAll(const ucstring &str,   const ucstring &search,   const std::string &replace)
 	{
 		//H_AUTO(Lua_CLuaIHM_findReplaceAll)
-		return findReplaceAll(str,   ucstring(search),   ucstring(replace));
+		return findReplaceAll(str,   search,   ucstring::makeFromUtf8(replace));
 	}
 
 
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index dab618ff8..1b7d3f457 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -982,11 +982,11 @@ namespace NLGUI
 		if (prop)
 		{
 			const char *propPtr = prop;
-			_Text = ucstring(propPtr);
-
-			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-				_Text = CI18N::get (propPtr);
-			setCase (_Text, _CaseMode);
+			if (NLMISC::startsWith(propPtr, "ui"))
+				_Text = CI18N::get(propPtr);
+			else
+				_Text.fromUtf8(propPtr);
+			setCase(_Text, _CaseMode);
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"hardtext_format" );
@@ -2155,7 +2155,7 @@ namespace NLGUI
 				float dotWidth = 0.f;
 				if (_OverflowText.size() > 0)
 				{
-					si = TextContext->getStringInfo (ucstring(_OverflowText));
+					si = TextContext->getStringInfo(_OverflowText);
 					dotWidth = si.StringWidth;
 				}
 
diff --git a/nel/src/gui/view_text_formated.cpp b/nel/src/gui/view_text_formated.cpp
index ac9263936..aa948e986 100644
--- a/nel/src/gui/view_text_formated.cpp
+++ b/nel/src/gui/view_text_formated.cpp
@@ -34,26 +34,26 @@ namespace NLGUI
 
 	CViewTextFormated::IViewTextFormatter *CViewTextFormated::textFormatter = NULL;
 
-	std::string CViewTextFormated::getProperty( const std::string &name ) const
-	{
-		if( name == "format" )
-		{
-			return getFormatString().toString();
-		}
-		else
-			return CViewText::getProperty( name );
-	}
-
-	void CViewTextFormated::setProperty( const std::string &name, const std::string &value )
-	{
-		if( name == "format" )
+	std::string CViewTextFormated::getProperty(const std::string &name) const
+    {
+		if (name == "format")
 		{
-			setFormatString( value );
-			return;
+			return getFormatString().toUtf8();
 		}
 		else
-			CViewText::setProperty( name, value );
-	}
+			return CViewText::getProperty(name);
+    }
+
+    void CViewTextFormated::setProperty(const std::string &name, const std::string &value)
+    {
+	    if (name == "format")
+	    {
+		    setFormatString(ucstring::makeFromUtf8(value));
+		    return;
+	    }
+	    else
+		    CViewText::setProperty(name, value);
+    }
 
 	xmlNodePtr CViewTextFormated::serialize( xmlNodePtr parentNode, const char *type ) const
 	{
@@ -62,7 +62,7 @@ namespace NLGUI
 			return NULL;
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_formated" );
-		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().c_str() );
+		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().toUtf8().c_str() );
 
 		return NULL;
 	}
@@ -73,7 +73,7 @@ namespace NLGUI
 		if (!CViewText::parse(cur, parentGroup)) return false;
 		CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
 		if (prop)
-			setFormatString(ucstring((const char *) prop));
+			setFormatString(ucstring::makeFromUtf8((const char *)prop));
 		else
 			setFormatString(ucstring("$t"));
 		return true;
diff --git a/nel/src/gui/view_text_id_formated.cpp b/nel/src/gui/view_text_id_formated.cpp
index 28998cee0..5304e9e5c 100644
--- a/nel/src/gui/view_text_id_formated.cpp
+++ b/nel/src/gui/view_text_id_formated.cpp
@@ -33,36 +33,35 @@ NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_for
 namespace NLGUI
 {
 
-	std::string CViewTextIDFormated::getProperty( const std::string &name ) const
+	std::string CViewTextIDFormated::getProperty(const std::string &name) const
 	{
-		if( name == "format" )
+		if (name == "format")
 		{
-			return getFormatString().toString();
+			return getFormatString().toUtf8();
 		}
 		else
-		return CViewTextID::getProperty( name );
+			return CViewTextID::getProperty(name);
 	}
 
-
-	void CViewTextIDFormated::setProperty( const std::string &name, const std::string &value )
+	void CViewTextIDFormated::setProperty(const std::string &name, const std::string &value)
 	{
-		if( name == "format" )
+		if (name == "format")
 		{
-			setFormatString( value );
+			setFormatString(ucstring::makeFromUtf8(value));
 			return;
 		}
 		else
-			CViewTextID::setProperty( name, value );
+			CViewTextID::setProperty(name, value);
 	}
 
-	xmlNodePtr CViewTextIDFormated::serialize( xmlNodePtr parentNode, const char *type ) const
+	xmlNodePtr CViewTextIDFormated::serialize(xmlNodePtr parentNode, const char *type) const
 	{
-		xmlNodePtr node = CViewTextID::serialize( parentNode, type );
-		if( node == NULL )
+		xmlNodePtr node = CViewTextID::serialize(parentNode, type);
+		if (node == NULL)
 			return NULL;
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_id_formated" );
-		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().c_str() );
+		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().toUtf8().c_str() );
 
 		return node;
 	}
@@ -73,7 +72,7 @@ namespace NLGUI
 		if (!CViewTextID::parse(cur, parentGroup)) return false;
 		CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
 		if (prop)
-			setFormatString(ucstring((const char *) prop));
+			setFormatString(ucstring::makeFromUtf8((const char *)prop));
 		else
 			setFormatString(ucstring("$t"));
 		return true;
diff --git a/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
index 45da347bd..42fe63fca 100644
--- a/nel/src/misc/system_utils.cpp
+++ b/nel/src/misc/system_utils.cpp
@@ -167,7 +167,10 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 		bool isUnicode = (IsClipboardFormatAvailable(CF_UNICODETEXT) == TRUE);
 
 		// allocates a buffer to copy text in global memory
-		HGLOBAL mem = GlobalAlloc(GHND|GMEM_DDESHARE, (text.size()+1) * (isUnicode ? 2:1));
+		std::string textLocal;
+		if (!isUnicode) textLocal = NLMISC::wideToMbcs(text);
+		if (text.size() && !textLocal.size()) textLocal = text.toString();
+		HGLOBAL mem = GlobalAlloc(GHND | GMEM_DDESHARE, isUnicode ? ((text.size() + 1) * sizeof(wchar_t)) : textLocal.size());
 
 		if (mem)
 		{
@@ -179,7 +182,7 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 				if (isUnicode)
 					wcscpy((wchar_t *)hLock, (const wchar_t *)text.c_str());
 				else
-					strcpy((char *)hLock, text.toString().c_str());
+					strcpy((char *)hLock, textLocal.c_str());
 
 				// unlock buffer
 				GlobalUnlock(mem);
@@ -213,7 +216,7 @@ bool CSystemUtils::pasteTextFromClipboard(ucstring &text)
 
 		// get data from clipboard (if not of this type, they are converted)
 		// warning, this code can't be debuggued in VC++ IDE, hObj will be always NULL
-		HANDLE hObj = GetClipboardData(isUnicode ? CF_UNICODETEXT:CF_TEXT);
+		HANDLE hObj = GetClipboardData(isUnicode ? CF_UNICODETEXT : CF_TEXT);
 
 		if (hObj)
 		{
@@ -224,9 +227,15 @@ bool CSystemUtils::pasteTextFromClipboard(ucstring &text)
 			{
 				// retrieve clipboard data
 				if (isUnicode)
-					text = (const ucchar*)hLock;
-				else
-					text = (const char*)hLock;
+				{
+					text = (const ucchar *)hLock;
+				}
+				else 
+				{
+					static_cast<std::wstring &>(text) = NLMISC::mbcsToWide((const char *)hLock);
+					if (!text.size() && ((const char *)hLock)[0])
+						text = (const char *)hLock;
+				}
 
 				// unlock data
 				GlobalUnlock(hObj);
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 4ffb2bb17..6aa831eac 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -636,7 +636,7 @@ public:
 
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getElementFromId(Params));
 		if (pCS == NULL) return;
-		pCS->setMacroText(pEB->getInputStringAsStdString());
+		pCS->setMacroText(pEB->getInputStringAsUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerEBUpdateMacroText, "eb_update_macro_text");
@@ -703,10 +703,10 @@ public:
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_MACROICONCREATION_EDITTEXT));
 		if (pEB != NULL)
 		{
-			pEB->setInputStringAsStdString(pMCM->CurrentEditMacro.DispText);
+			pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.DispText);
 			CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getElementFromId(CTRL_MACROICONCREATION_ICON));
 			if (pCS != NULL)
-				pCS->setMacroText(pEB->getInputStringAsStdString());
+				pCS->setMacroText(pEB->getInputStringAsUtf8());
 		}
 
 		CAHManager::getInstance()->runActionHandler("set_macro_back", NULL, string("target=")+CTRL_MACROICONCREATION_ICON+"|value="+toString(back));
@@ -862,11 +862,11 @@ public:
 		if (pEB == NULL) return;
 
 		CMacroCmdManager *pMCM = CMacroCmdManager::getInstance();
-		pMCM->CurrentEditMacro.Name = pEB->getInputStringAsStdString();
+		pMCM->CurrentEditMacro.Name = pEB->getInputStringAsUtf8();
 		if ((pMCM->CurrentEditMacro.Name.size() >= 2) &&
 			(pMCM->CurrentEditMacro.Name[0] == 'u') && (pMCM->CurrentEditMacro.Name[1] == 'i'))
 			pMCM->CurrentEditMacro.Name[0] = 'U';
-		pEB->setInputString(pMCM->CurrentEditMacro.Name);
+		pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.Name);
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerNewMacroEnterName, "new_macro_enter_name");
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index 2da407ecb..96922d399 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -1379,8 +1379,8 @@ class CAHOnLogin : public IActionHandler
 			return;
 		}
 
-		LoginLogin = pGEBLog->getInputStringAsStdString();
-		LoginPassword = pGEBPwd->getInputStringAsStdString();
+		LoginLogin = pGEBLog->getInputString().toString(); // FIXME: Unicode login
+		LoginPassword = pGEBPwd->getInputString().toString();
 
 		onlogin();
 	}

From 639b4328171882c35d48fa0bfd7bb6ade71d1f87 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 24 Oct 2020 21:17:44 +0800
Subject: [PATCH 038/292] Match GL behaviour in D3D for screensaver

---
 .../3d/driver/direct3d/driver_direct3d.cpp    | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index fc853602f..211ed27fd 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1225,12 +1225,29 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		D3DWndProc (pDriver, hWnd, message, wParam, lParam);
 	}
 
+	if (message == WM_SYSCOMMAND)
+	{
+		switch (wParam)
+		{
 #ifdef NL_DISABLE_MENU
-	// disable menu (F10, ALT and ALT+SPACE key doesn't freeze or open the menu)
-	if(message == WM_SYSCOMMAND && wParam == SC_KEYMENU)
-		return 0;
+			// disable menu (F10, ALT and ALT+SPACE key doesn't freeze or open the menu)
+		case SC_KEYMENU:
 #endif // NL_DISABLE_MENU
 
+			// Screensaver Trying To Start?
+		case SC_SCREENSAVE:
+
+			// Monitor Trying To Enter Powersave?
+		case SC_MONITORPOWER:
+
+			// Prevent From Happening
+			return 0;
+
+		default:
+			break;
+		}
+	}
+
 	// ace: if we receive close, exit now or it'll assert after
 	if(message == WM_CLOSE)
 	{

From 8c6609943b1217735eaabcf77b273bee77554f89 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 01:23:14 +0800
Subject: [PATCH 039/292] Dump scenario, kaetemi/ryzomclassic#155

---
 ryzom/client/src/r2/dmc/client_edition_module.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ryzom/client/src/r2/dmc/client_edition_module.cpp b/ryzom/client/src/r2/dmc/client_edition_module.cpp
index 6740dabfe..e388707ca 100644
--- a/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -1154,6 +1154,15 @@ void CClientEditionModule::startingScenario(class NLNET::IModuleProxy * /* serve
 			{
 				ok = true;
 				connectionState = "uiR2EDUploadScenario";
+
+#if !FINAL_VERSION
+				string filename = CFile::findNewFile("scenario.rt.txt");
+				COFile output(filename);
+				std::string ss;
+				rtDataPtr->serialize(ss);
+				output.serialBuffer((uint8*)ss.c_str(),(uint)ss.size());
+				output.flush();
+#endif
 			}
 			else
 			{

From 78917354d9bd23f279bd07f6feb01e2e1501f6c3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 01:23:29 +0800
Subject: [PATCH 040/292] Disable tmp debug feature

---
 ryzom/client/src/connection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 47c45984d..38a10d7e4 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -981,7 +981,7 @@ TInterfaceState globalMenu()
 	while (PlayerWantToGoInGame == false)
 	{
 
-		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
+		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) && 0
 			// tmp for debug
 			if (::GetAsyncKeyState(VK_SPACE))
 			{
@@ -1067,7 +1067,7 @@ TInterfaceState globalMenu()
 			nlSleep(ClientCfg.Sleep);
 		}
 
-		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
+		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) && 0
 			if (::GetAsyncKeyState(VK_CONTROL))
 			{
 				pIM->displayUIViewBBoxs("");

From 06b430349c0b3d5150747c9f0f375fcc52517668 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 01:55:35 +0800
Subject: [PATCH 041/292] Disconnect if UDP Login fails, ryzom/ryzomcore#622

---
 ryzom/client/src/network_connection.cpp | 12 ++++++++++++
 ryzom/client/src/network_connection.h   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/ryzom/client/src/network_connection.cpp b/ryzom/client/src/network_connection.cpp
index 731677043..c1e9d8975 100644
--- a/ryzom/client/src/network_connection.cpp
+++ b/ryzom/client/src/network_connection.cpp
@@ -680,6 +680,7 @@ bool	CNetworkConnection::connect(string &result)
 	_LatestLoginTime = ryzomGetLocalTime ();
 	_LatestSyncTime = _LatestLoginTime;
 	_LatestProbeTime = _LatestLoginTime;
+	m_LoginAttempts = 0;
 
 	nlinfo("CNET[%p]: Client connected to shard, attempting login", this);
 	return true;
@@ -1091,6 +1092,17 @@ bool	CNetworkConnection::stateLogin()
 	{
 		sendSystemLogin();
 		_LatestLoginTime = _UpdateTime;
+		if (m_LoginAttempts > 24)
+		{
+			m_LoginAttempts = 0;
+			disconnect(); // will send disconnection message
+			nlwarning("CNET[%p]: Too many LOGIN attempts, connection problem", this);
+			return false; // exit now from loop, don't expect a new state
+		}
+		else
+		{
+			++m_LoginAttempts;
+		}
 	}
 
 	return false;
diff --git a/ryzom/client/src/network_connection.h b/ryzom/client/src/network_connection.h
index d11702682..84bb26d43 100644
--- a/ryzom/client/src/network_connection.h
+++ b/ryzom/client/src/network_connection.h
@@ -822,6 +822,7 @@ private:
 	void						sendSystemLogin();
 	bool						stateLogin();
 	NLMISC::TTime				_LatestLoginTime;
+	int                         m_LoginAttempts;
 
 	//
 	void						receiveSystemSync(NLMISC::CBitMemStream &msgin);

From 2568b6f321507c9d5b8178d55eed8385fca6fd48 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 01:56:10 +0800
Subject: [PATCH 042/292] Don't probe if normal received in probe state,
 otherwise server will not enter probe state, ryzom/ryzomcore#622,
 ryzom/ryzomcore#133

---
 ryzom/client/src/network_connection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ryzom/client/src/network_connection.cpp b/ryzom/client/src/network_connection.cpp
index c1e9d8975..4778641c0 100644
--- a/ryzom/client/src/network_connection.cpp
+++ b/ryzom/client/src/network_connection.cpp
@@ -2320,6 +2320,7 @@ bool	CNetworkConnection::stateProbe()
 			else
 			{
 				nlwarning("CNET[%p]: received normal in state Probe", this);
+				_LatestProbeTime = _UpdateTime;
 			}
 		}
 	}

From c252b56c93e5d7f18e66ace296d6a46fb84b93c3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 04:18:56 +0800
Subject: [PATCH 043/292] Fix crash on save file corruption

---
 ryzom/client/src/item_group_manager.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index fddba873f..83c8b4f5a 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -301,10 +301,18 @@ bool CItemGroupManager::loadGroups()
 	NLMISC::CIFile f;
 	f.open(userGroupFileName);
 	NLMISC::CIXml xmlStream;
-	xmlStream.init(f);
-	// Actual loading
 	xmlNodePtr globalEnclosing;
-	globalEnclosing = xmlStream.getRootNode();
+	try
+	{
+		xmlStream.init(f);
+		// Actual loading
+		globalEnclosing = xmlStream.getRootNode();
+	}
+	catch (const NLMISC::EXmlParsingError &ex)
+	{
+		nlwarning("Failed to parse '%s', skip", userGroupFileName.c_str());
+		return false;
+	}
 	if(!globalEnclosing)
 	{
 		nlwarning("no root element in item_group xml, skipping xml parsing");

From a3780e307ed084223b87af505d613bb2a61ed468 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 25 Oct 2020 05:44:08 +0800
Subject: [PATCH 044/292] Fix missing ghost components in animation loading
 mode, kaetemi/ryzomclassic#155

---
 ryzom/client/src/r2/editor.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 96b935e34..036e77b21 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -212,14 +212,24 @@ CDynamicMapClient(eid, clientGateway, luaState)
 void CDynamicMapClientEventForwarder::nodeErased(const std::string& instanceId, const std::string& attrName, sint32 position)
 {
 	//H_AUTO(R2_CDynamicMapClientEventForwarder_nodeErased)
-	if (getEditor().getMode() != CEditor::EditionMode) return;
+	if (getEditor().getMode() != CEditor::EditionMode)
+	{
+		nlassert(getEditor().getMode() != CEditor::AnimationModeLoading); /* Probably should not happen */
+		nldebug("Node erased, but not in edition mode");
+		return;
+	}
 	getEditor().nodeErased(instanceId, attrName, position);
 }
 
 void CDynamicMapClientEventForwarder::nodeSet(const std::string& instanceId, const std::string& attrName, CObject* value)
 {
 	//H_AUTO(R2_CDynamicMapClientEventForwarder_nodeSet)
-	if (getEditor().getMode() != CEditor::EditionMode) return;
+	if (getEditor().getMode() != CEditor::EditionMode
+		&& getEditor().getMode() != CEditor::AnimationModeLoading /* Loading animation scenario from terminal, ghost nodes created by translator */)
+	{
+		nldebug("Node set, but not in edition mode");
+		return;
+	}
 	getEditor().nodeSet(instanceId, attrName, value);
 }
 
@@ -227,7 +237,12 @@ void CDynamicMapClientEventForwarder::nodeInserted(const std::string& instanceId
 							  const std::string& key, CObject* value)
 {
 	//H_AUTO(R2_CDynamicMapClientEventForwarder_nodeInserted)
-	if (getEditor().getMode() != CEditor::EditionMode) return;
+	if (getEditor().getMode() != CEditor::EditionMode
+		&& getEditor().getMode() != CEditor::AnimationModeLoading /* Loading animation scenario from terminal, ghost nodes created by translator */)
+	{
+		nldebug("Node inserted, but not in edition mode");
+		return;
+	}
 	getEditor().nodeInserted(instanceId, attrName, position, key, value);
 }
 
@@ -236,7 +251,12 @@ void CDynamicMapClientEventForwarder::nodeMoved(
 				const std::string& destInstanceId, const std::string& destAttrName, sint32 destPosition)
 {
 	//H_AUTO(R2_CDynamicMapClientEventForwarder_nodeMoved)
-	if (getEditor().getMode() != CEditor::EditionMode) return;
+	if (getEditor().getMode() != CEditor::EditionMode)
+	{
+		nlassert(getEditor().getMode() != CEditor::AnimationModeLoading); /* Probably should not happen */
+		nldebug("Node moved, but not in edition mode");
+		return;
+	}
 	getEditor().nodeMoved(instanceId, attrName, position, destInstanceId, destAttrName, destPosition);
 }
 

From 973531f461d46ded593c4615c6575a96cb09c1a7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 26 Oct 2020 03:55:36 +0800
Subject: [PATCH 045/292] UTF string view base, ryzom/ryzomcore#335

---
 nel/include/nel/misc/types_nl.h        |  8 +++
 nel/include/nel/misc/utf_string_view.h | 95 ++++++++++++++++++++++++++
 nel/src/misc/utf_string_view.cpp       | 76 +++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 nel/include/nel/misc/utf_string_view.h
 create mode 100644 nel/src/misc/utf_string_view.cpp

diff --git a/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h
index 73c05b3a5..b8fe8270a 100644
--- a/nel/include/nel/misc/types_nl.h
+++ b/nel/include/nel/misc/types_nl.h
@@ -552,6 +552,14 @@ typedef	wchar_t ucchar;
 typedef	uint16	ucchar;
 #endif
 
+#ifdef NL_CPP14
+typedef char32_t u32char;
+typedef std::u32string u32string;
+#else
+typedef uint32 u32char;
+typedef std::basic_string<uint32> u32string;
+#endif
+
 #ifndef NL_OVERRIDE
 #define NL_OVERRIDE override
 #endif
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
new file mode 100644
index 000000000..78df8c141
--- /dev/null
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -0,0 +1,95 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NLMISC_UTF_STRING_VIEW_H
+#define NLMISC_UTF_STRING_VIEW_H
+
+#include <nel/misc/types_nl.h>
+#include <nel/misc/ucstring.h>
+#include <nel/misc/utf32_string.h>
+#include <string>
+
+namespace NLMISC {
+
+/// String view for UTF-8 and UTF-32 iteration as 32-bit codepoints.
+/// This string view keeps the string as a reference, it does not make a copy.
+/// Only use this for iterating a string's codepoints.
+/// Strings are not necessarily NUL-terminated.
+class CUtfStringView
+{
+public:
+	inline CUtfStringView(const char *utf8Str) : m_Str(utf8Str), m_Size(strlen(utf8Str)), m_Iterator(utf8Iterator) {}
+	inline CUtfStringView(const char *utf8Str, size_t len): m_Str(utf8Str), m_Size(len), m_Iterator(utf8Iterator)
+	{
+		nlassert(len <= strlen(utf8Str));
+	}
+
+	inline CUtfStringView(const std::string &utf8Str) : m_Str(utf8Str.c_str()), m_Size(utf8Str.size()), m_Iterator(utf8Iterator) {}
+	inline CUtfStringView(const ucstring &utf16Str) : m_Str(utf16Str.c_str()), m_Size(utf16Str.size() << 1), m_Iterator(utf16Iterator) {}
+	inline CUtfStringView(const u32string &utf32Str) : m_Str(utf32Str.c_str()), m_Size(utf32Str.size() << 2), m_Iterator(utf32Iterator) {}
+
+	std::string toUtf8(); // Makes a copy
+	u32string toUtf32(); // Makes a copy
+
+	inline bool isUtf8() { return m_Iterator == utf8Iterator; }
+	inline bool isUtf16() { return m_Iterator == utf16Iterator; }
+	inline bool isUtf32() { return m_Iterator == utf32Iterator; }
+
+	struct const_iterator
+	{
+	public:
+		inline void operator++()
+		{ 
+			m_Char = m_View.m_Iterator(&m_Addr); 
+			if ((ptrdiff_t)m_Addr > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
+			{
+				m_Addr = 0;
+				m_Char = 0;
+			}
+		}
+		inline bool operator!=(const const_iterator &o) const { return m_Addr != o.m_Addr; }
+		inline bool operator==(const const_iterator &o) const { return m_Addr == o.m_Addr; }
+		inline const u32char &operator*() const {  return m_Char; }
+	private:
+		friend class CUtfStringView;
+		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Char(addr ? view.m_Iterator(&m_Addr) : 0) { }
+		const CUtfStringView &m_View;
+		const void *m_Addr; // Next address
+		u32char m_Char;
+	};
+
+	typedef const_iterator iterator;
+
+	iterator begin() const { return iterator(*this, m_Str); }
+	inline iterator end() const { return iterator(*this, NULL); }
+
+private:
+	typedef u32char (*TIterator)(const void **addr);
+	static u32char utf8Iterator(const void **addr);
+	static u32char utf16Iterator(const void **addr);
+	static u32char utf32Iterator(const void **addr);
+
+	const void *const m_Str;
+	const size_t m_Size;
+	const TIterator m_Iterator;
+	
+}; /* class CUtfStringView */
+
+} /* namespace NLMISC */
+
+#endif /* #ifndef NLMISC_STREAMED_PACKAGE_PROVIDER_H */
+
+/* end of file */
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
new file mode 100644
index 000000000..57dc5e226
--- /dev/null
+++ b/nel/src/misc/utf_string_view.cpp
@@ -0,0 +1,76 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+
+// Project includes
+#include <nel/misc/utf_string_view.h>
+
+namespace NLMISC
+{
+
+std::string CUtfStringView::toUtf8()
+{
+	if (m_Iterator == utf8Iterator)
+		return std::string((const char *)m_Str, (const char *)((ptrdiff_t)m_Str + m_Size));
+	std::string res;
+	res.reserve((m_Size << 1) + 1);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+	{
+		u32char c = *it;
+		res += (char)c; /* TODO: Encode UTF-8 */
+	}
+}
+
+u32string CUtfStringView::toUtf32()
+{
+	if (m_Iterator == utf32Iterator)
+		return u32string((const u32char *)m_Str, (const u32char *)((ptrdiff_t)m_Str + m_Size));
+	u32string res;
+	res.reserve(m_Size + 1);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+		res += *it;
+}
+
+u32char CUtfStringView::utf8Iterator(const void **addr)
+{
+	/* TODO: Decode UTF-8 */
+	const ucchar **pp = reinterpret_cast<const ucchar **>(addr);
+	ucchar c = **pp;
+	++(*pp);
+	return c;
+}
+
+u32char CUtfStringView::utf16Iterator(const void **addr)
+{
+	/* TODO: Decode UTF-16 */
+	const ucchar **pp = reinterpret_cast<const ucchar **>(addr);
+	ucchar c = **pp;
+	++(*pp);
+	return c;
+}
+
+u32char CUtfStringView::utf32Iterator(const void **addr)
+{
+	const u32char **pp = reinterpret_cast<const u32char **>(addr);
+	u32char c = **pp;
+	++(*pp);
+	return c;
+}
+
+} /* namespace NLMISC */
+
+/* end of file */

From 81143cdf438cc7e3b8e54e97dafcac03b82a028c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 01:03:02 +0800
Subject: [PATCH 046/292] Proper UTF encoding, ryzom/ryzomcore#335

---
 nel/include/nel/misc/ucstring.h        |   5 +
 nel/include/nel/misc/utf_string_view.h |  18 +--
 nel/src/misc/ucstring.cpp              | 131 +--------------------
 nel/src/misc/utf_string_view.cpp       | 154 ++++++++++++++++++++++---
 4 files changed, 157 insertions(+), 151 deletions(-)

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 8859a21d9..28c83ce2f 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -46,6 +46,11 @@ public:
 	{
 	}
 
+	ucstring(const ucchar *begin, const ucchar *end)
+		: ucstringbase(begin, end)
+	{
+	}
+
 	ucstring(const std::string &str)
 	    : ucstringbase()
 	{
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 78df8c141..503fc3737 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -19,7 +19,6 @@
 
 #include <nel/misc/types_nl.h>
 #include <nel/misc/ucstring.h>
-#include <nel/misc/utf32_string.h>
 #include <string>
 
 namespace NLMISC {
@@ -27,7 +26,7 @@ namespace NLMISC {
 /// String view for UTF-8 and UTF-32 iteration as 32-bit codepoints.
 /// This string view keeps the string as a reference, it does not make a copy.
 /// Only use this for iterating a string's codepoints.
-/// Strings are not necessarily NUL-terminated.
+/// Strings are not required to be NUL-terminated, but must have at least one character extra.
 class CUtfStringView
 {
 public:
@@ -41,12 +40,13 @@ public:
 	inline CUtfStringView(const ucstring &utf16Str) : m_Str(utf16Str.c_str()), m_Size(utf16Str.size() << 1), m_Iterator(utf16Iterator) {}
 	inline CUtfStringView(const u32string &utf32Str) : m_Str(utf32Str.c_str()), m_Size(utf32Str.size() << 2), m_Iterator(utf32Iterator) {}
 
-	std::string toUtf8(); // Makes a copy
-	u32string toUtf32(); // Makes a copy
+	std::string toUtf8(bool reEncode = false) const; // Makes a copy
+	ucstring toUtf16(bool reEncode = false) const; // Makes a copy
+	u32string toUtf32() const; // Makes a copy
 
-	inline bool isUtf8() { return m_Iterator == utf8Iterator; }
-	inline bool isUtf16() { return m_Iterator == utf16Iterator; }
-	inline bool isUtf32() { return m_Iterator == utf32Iterator; }
+	inline bool isUtf8() const { return m_Iterator == utf8Iterator; }
+	inline bool isUtf16() const { return m_Iterator == utf16Iterator; }
+	inline bool isUtf32() const { return m_Iterator == utf32Iterator; }
 
 	struct const_iterator
 	{
@@ -82,8 +82,8 @@ private:
 	static u32char utf16Iterator(const void **addr);
 	static u32char utf32Iterator(const void **addr);
 
-	const void *const m_Str;
-	const size_t m_Size;
+	const void *const m_Str; // String
+	const size_t m_Size; // Size in bytes
 	const TIterator m_Iterator;
 	
 }; /* class CUtfStringView */
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index 5fad643ce..79cf78f7e 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -16,6 +16,7 @@
 
 #include "stdmisc.h"
 #include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
 
 void ucstring::toString(std::string &str) const
 {
@@ -31,138 +32,12 @@ void ucstring::toString(std::string &str) const
 
 std::string ucstring::toUtf8() const
 {
-#if defined(NL_OS_WINDOWS)
-	// Use OS implementation
-	nlctassert(sizeof(wchar_t) == sizeof(ucchar));
-	nlctassert(sizeof(wchar_t) == sizeof(uint16));
-	return NLMISC::wideToUtf8(static_cast<const std::wstring &>(*this));
-#else
-	std::string res;
-	ucstring::const_iterator first(begin()), last(end());
-	for (; first != last; ++first)
-	{
-		//ucchar	c = *first;
-		uint nbLoop = 0;
-		if (*first < 0x80)
-			res += char(*first);
-		else if (*first < 0x800)
-		{
-			ucchar c = *first;
-			c = c >> 6;
-			c = c & 0x1F;
-			res += char(c) | 0xC0;
-			nbLoop = 1;
-		}
-		else /*if (*first < 0x10000)*/
-		{
-			ucchar c = *first;
-			c = c >> 12;
-			c = c & 0x0F;
-			res += char(c) | 0xE0;
-			nbLoop = 2;
-		}
-
-		for (uint i = 0; i < nbLoop; ++i)
-		{
-			ucchar c = *first;
-			c = c >> ((nbLoop - i - 1) * 6);
-			c = c & 0x3F;
-			res += char(c) | 0x80;
-		}
-	}
-	return res;
-#endif
+	return NLMISC::CUtfStringView(*this).toUtf8();
 }
 
 void ucstring::fromUtf8(const std::string &stringUtf8)
 {
-#if defined(NL_OS_WINDOWS)
-	// Use OS implementation
-	nlctassert(sizeof(wchar_t) == sizeof(ucchar));
-	nlctassert(sizeof(wchar_t) == sizeof(uint16));
-	nlctassert(sizeof(std::wstring) == sizeof(ucstring)); // These can be swapped on Windows
-	static_cast<std::wstring &>(*this) = nlmove(NLMISC::utf8ToWide(stringUtf8));
-	if (stringUtf8.size() && !size())
-		rawCopy(stringUtf8);
-#else
-	// clear the string
-	erase();
-
-	uint8 c;
-	ucchar code;
-	sint iterations = 0;
-
-	std::string::const_iterator first(stringUtf8.begin()), last(stringUtf8.end());
-	for (; first != last;)
-	{
-		c = *first++;
-		code = c;
-
-		if ((code & 0xFE) == 0xFC)
-		{
-			code &= 0x01;
-			iterations = 5;
-		}
-		else if ((code & 0xFC) == 0xF8)
-		{
-			code &= 0x03;
-			iterations = 4;
-		}
-		else if ((code & 0xF8) == 0xF0)
-		{
-			code &= 0x07;
-			iterations = 3;
-		}
-		else if ((code & 0xF0) == 0xE0)
-		{
-			code &= 0x0F;
-			iterations = 2;
-		}
-		else if ((code & 0xE0) == 0xC0)
-		{
-			code &= 0x1F;
-			iterations = 1;
-		}
-		else if ((code & 0x80) == 0x80)
-		{
-			// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-			rawCopy(stringUtf8);
-			return;
-		}
-		else
-		{
-			push_back(code);
-			iterations = 0;
-		}
-
-		if (iterations)
-		{
-			for (sint i = 0; i < iterations; i++)
-			{
-				if (first == last)
-				{
-					// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-					rawCopy(stringUtf8);
-					return;
-				}
-
-				uint8 ch;
-				ch = *first++;
-
-				if ((ch & 0xC0) != 0x80)
-				{
-					// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-					rawCopy(stringUtf8);
-					return;
-				}
-
-				code <<= 6;
-				code |= (ucchar)(ch & 0x3F);
-			}
-			push_back(code);
-		}
-	}
-#endif
+	*this = NLMISC::CUtfStringView(stringUtf8).toUtf16();
 }
 
 void ucstring::rawCopy(const std::string &str)
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 57dc5e226..ee5fdf089 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -19,52 +19,178 @@
 // Project includes
 #include <nel/misc/utf_string_view.h>
 
+// References:
+// - https://twiserandom.com/unicode/unicode-encoding-utf-8-utf-16-utf-32/
+// - https://www.compart.com/en/unicode/U+1F30D
+//   - 0xF0 0x9F 0x8C 0x8D
+//   - 0xD83C 0xDF0D
+//   - 0x0001F30D
+
 namespace NLMISC
 {
 
-std::string CUtfStringView::toUtf8()
+std::string CUtfStringView::toUtf8(bool reEncode) const
 {
-	if (m_Iterator == utf8Iterator)
+	// Decode UTF and encode UTF-8
+	// This implementation makes no attempt at fixing invalid codepoints
+	if (m_Iterator == utf8Iterator && !reEncode)
 		return std::string((const char *)m_Str, (const char *)((ptrdiff_t)m_Str + m_Size));
 	std::string res;
-	res.reserve((m_Size << 1) + 1);
+	res.reserve(m_Size);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x80)
+		{
+			// Encode as 1 byte
+			res += (char)c;
+		}
+		else if (c < 0x0800)
+		{
+			// Encode as 2 bytes
+			res += (char)((c & 0x07C0) >> 6) | 0xC0;
+			res += (char)(c & 0x3F) | 0x80;
+		}
+		else if (c < 0x010000)
+		{
+			// Encode as 3 bytes
+			res += (char)((c & 0xF000) >> 12) | 0xE0;
+			res += (char)((c & 0x0FC0) >> 6) | 0x80;
+			res += (char)(c & 0x3F) | 0x80;
+		}
+		else
+		{
+			// Encode as 4 bytes
+			res += (char)((c & 0x1C0000) >> 18) | 0xF0;
+			res += (char)((c & 0x03F000) >> 12) | 0x80;
+			res += (char)((c & 0x0FC0) >> 6) | 0x80;
+			res += (char)(c & 0x3F) | 0x80;
+		}
+	}
+	return res;
+}
+
+ucstring CUtfStringView::toUtf16(bool reEncode) const
+{
+	if (m_Iterator == utf16Iterator && !reEncode)
+		return ucstring((const ucchar *)m_Str, (const ucchar *)((ptrdiff_t)m_Str + m_Size));
+	ucstring res;
+	res.reserve(m_Size << 1);
 	for (iterator it(begin()), end(end()); it != end; ++it)
 	{
 		u32char c = *it;
-		res += (char)c; /* TODO: Encode UTF-8 */
+		if (c < 0x10000)
+		{
+			res += c;
+		}
+		else
+		{
+			c -= 0x10000;
+			res += (c >> 10) | 0xD800;
+			res += (c & 0x3FF) | 0xDC00;
+		}
 	}
+	return res;
 }
 
-u32string CUtfStringView::toUtf32()
+u32string CUtfStringView::toUtf32() const
 {
+	// Decode any UTF
+	// This implementation makes no attempt at fixing bad encoding
 	if (m_Iterator == utf32Iterator)
 		return u32string((const u32char *)m_Str, (const u32char *)((ptrdiff_t)m_Str + m_Size));
 	u32string res;
-	res.reserve(m_Size + 1);
+	res.reserve(m_Size << 2);
 	for (iterator it(begin()), end(end()); it != end; ++it)
 		res += *it;
+	return res;
 }
 
 u32char CUtfStringView::utf8Iterator(const void **addr)
 {
-	/* TODO: Decode UTF-8 */
-	const ucchar **pp = reinterpret_cast<const ucchar **>(addr);
-	ucchar c = **pp;
+	// Decode UTF-8
+	// This implementation makes no attempt at fixing bad encoding, except for bad UTF-16 surrogate pairs
+	const uint8 **pp = reinterpret_cast<const uint8 **>(addr);
+	u32char c0 = **pp;
 	++(*pp);
-	return c;
+	if ((c0 & 0xC0) == 0xC0)
+	{
+		uint8 cx = **pp;
+		if ((cx & 0xC0) == 0x80)
+		{
+			++(*pp);
+			c0 &= 0x3F; // Drop first two bits
+			c0 <<= 6;
+			c0 |= (cx & 0x3F); // 12 bits now (6 + 6), 2-byte encoding
+			if (c0 & 0x800)
+			{
+				cx = **pp;
+				if ((cx & 0xC0) == 0x80)
+				{
+					++(*pp);
+					c0 &= 0x07FF; // Drop first bit
+					c0 <<= 6;
+					c0 |= (cx & 0x3F); // 17 bits now (12 - 1 + 6), 3-byte encoding
+					if (c0 & 0x10000)
+					{
+						cx = **pp;
+						if ((cx & 0xC0) == 0x80)
+						{
+							++(*pp);
+							c0 &= 0xFFFF; // Drop first bit
+							c0 <<= 6;
+							c0 |= (cx & 0x3F); // 22 bits now (17 - 1 + 6), 3-byte encoding
+						}
+					}
+					else if ((c0 & 0xFC00) == 0xD800) // Higher bits of nutcase UTF-16 encoded as UTF-8
+					{
+						uint8 cy;
+						if ((*pp)[0] == 0xED && ((cx = (*pp)[1]) & 0xF0) == 0xB0 && ((cy = (*pp)[2]) & 0xC0) == 0x80)
+						{
+							// Lower bits of nutcase UTF-16 encoded as UTF-8
+							(*pp) += 3;
+							uint16 c1 = (cx & 0x0F);
+							c1 <<= 6;
+							c1 |= (cy & 0x3F);
+							c0 &= 0x03FF;
+							c0 <<= 10;
+							c0 |= (c1 & 0x03FF);
+							c0 += 0x10000;
+						}
+					}
+				}
+			}
+		}
+	}
+	return c0;
 }
 
 u32char CUtfStringView::utf16Iterator(const void **addr)
 {
-	/* TODO: Decode UTF-16 */
-	const ucchar **pp = reinterpret_cast<const ucchar **>(addr);
-	ucchar c = **pp;
+	// Decode UTF-16
+	// This implementation makes no attempt at fixing bad encoding
+	const uint16 **pp = reinterpret_cast<const uint16 **>(addr);
+	u32char c0 = **pp;
 	++(*pp);
-	return c;
+	if ((c0 & 0xFC00) == 0xD800) // Higher bits
+	{
+		uint16 c1 = **pp;
+		if ((c1 & 0xFC00) == 0xDC00) // Lower bits
+		{
+			++(*pp);
+			c0 &= 0x03FF;
+			c0 <<= 10;
+			c0 |= (c1 & 0x03FF);
+			c0 += 0x10000;
+		}
+	}
+	return c0;
 }
 
 u32char CUtfStringView::utf32Iterator(const void **addr)
 {
+	// UTF-32
+	// This implementation makes no attempt at fixing bad encoding
 	const u32char **pp = reinterpret_cast<const u32char **>(addr);
 	u32char c = **pp;
 	++(*pp);

From 8fc6ec3b3554e95e509979353a4f28b66a2cd55c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 01:03:13 +0800
Subject: [PATCH 047/292] Show box character instead of dot

---
 nel/src/3d/font_generator.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
index 44d8f5ab0..0bad785a6 100644
--- a/nel/src/3d/font_generator.cpp
+++ b/nel/src/3d/font_generator.cpp
@@ -307,11 +307,13 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 	// retrieve glyph index from character code
 	FT_UInt glyph_index = FT_Get_Char_Index (_Face, c);
 
+	/*
 	if (glyph_index == 0)
 	{
 		// no glyph available, replace with a dot
 		glyph_index = FT_Get_Char_Index (_Face, ucchar('.'));
 	}
+	*/
 
 	// load glyph image into the slot (erase previous one)
 	error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);

From 25049eaead0d2cf2cb9e0d902923a7195e09663a Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 01:15:16 +0800
Subject: [PATCH 048/292] Complete some missing implementation for wide strings

---
 nel/include/nel/misc/utf_string_view.h | 15 ++++++++++++
 nel/src/misc/string_common.cpp         |  9 ++++---
 nel/src/misc/utf_string_view.cpp       | 33 ++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 503fc3737..e972ca7cf 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -35,6 +35,19 @@ public:
 	{
 		nlassert(len <= strlen(utf8Str));
 	}
+#if defined(NL_OS_WINDOWS)
+	inline CUtfStringView(const wchar_t *utf16Str) : m_Str(utf16Str), m_Size(wcslen(utf16Str)), m_Iterator(utf16Iterator) {}
+	inline CUtfStringView(const wchar_t *utf16Str, size_t len): m_Str(utf16Str), m_Size(len), m_Iterator(utf16Iterator)
+	{
+		nlassert(len <= wcslen(utf16Str));
+	}
+#else
+	inline CUtfStringView(const wchar_t *utf32Str) : m_Str(utf32Str), m_Size(wcslen(utf32Str)), m_Iterator(utf32Iterator) {}
+	inline CUtfStringView(const wchar_t *utf32Str, size_t len): m_Str(utf32Str), m_Size(len), m_Iterator(utf32Iterator)
+	{
+		nlassert(len <= wcslen(utf32Str));
+	}
+#endif
 
 	inline CUtfStringView(const std::string &utf8Str) : m_Str(utf8Str.c_str()), m_Size(utf8Str.size()), m_Iterator(utf8Iterator) {}
 	inline CUtfStringView(const ucstring &utf16Str) : m_Str(utf16Str.c_str()), m_Size(utf16Str.size() << 1), m_Iterator(utf16Iterator) {}
@@ -44,6 +57,8 @@ public:
 	ucstring toUtf16(bool reEncode = false) const; // Makes a copy
 	u32string toUtf32() const; // Makes a copy
 
+	std::wstring toWide() const; // Platform dependent, UTF-16 or UTF-32. Makes a copy.
+
 	inline bool isUtf8() const { return m_Iterator == utf8Iterator; }
 	inline bool isUtf16() const { return m_Iterator == utf16Iterator; }
 	inline bool isUtf32() const { return m_Iterator == utf32Iterator; }
diff --git a/nel/src/misc/string_common.cpp b/nel/src/misc/string_common.cpp
index 93122cc70..f869a5d35 100644
--- a/nel/src/misc/string_common.cpp
+++ b/nel/src/misc/string_common.cpp
@@ -21,6 +21,7 @@
 
 #include "nel/misc/string_common.h"
 #include "nel/misc/sstring.h"
+#include "nel/misc/utf_string_view.h"
 
 using namespace std;
 
@@ -228,8 +229,7 @@ std::string wideToUtf8(const wchar_t *str, size_t len)
 #if defined(NL_OS_WINDOWS)
 	return winWideToCp(str, len, CP_UTF8);
 #else
-	// TODO: UTF-32 to UTF-8
-	nlassert(false);
+	return CUtfStringView(str, len).toUtf8();
 #endif
 }
 
@@ -242,10 +242,9 @@ std::string wideToUtf8(const std::wstring &str)
 std::wstring utf8ToWide(const char *str, size_t len)
 {
 #if defined(NL_OS_WINDOWS)
-	return winCpToWide(str, len, CP_UTF8);
+	return winCpToWide(str, len, CP_UTF8); // UTF-16
 #else
-	// TODO: UTF-8 to UTF-32
-	nlassert(false);
+	return CUtfStringView(str, len).toWide(); // UTF-32
 #endif
 }
 
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index ee5fdf089..db2ea7cec 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -106,6 +106,39 @@ u32string CUtfStringView::toUtf32() const
 	return res;
 }
 
+std::wstring CUtfStringView::toWide() const
+{
+#ifdef NL_OS_WINDOWS
+	if (m_Iterator == utf16Iterator)
+		return std::wstring((const wchar_t *)m_Str, (const wchar_t *)((ptrdiff_t)m_Str + m_Size));
+	std::wstring res;
+	res.reserve(m_Size << 1);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x10000)
+		{
+			res += c;
+		}
+		else
+		{
+			c -= 0x10000;
+			res += (c >> 10) | 0xD800;
+			res += (c & 0x3FF) | 0xDC00;
+		}
+	}
+	return res;
+#else
+	if (m_Iterator == utf32Iterator)
+		return std::wstring((const wchar_t *)m_Str, (const wchar_t *)((ptrdiff_t)m_Str + m_Size));
+	std::wstring res;
+	res.reserve(m_Size << 2);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+		res += *it;
+	return res;
+#endif
+}
+
 u32char CUtfStringView::utf8Iterator(const void **addr)
 {
 	// Decode UTF-8

From dca59073aa4121819a080cb5bec367db8c32c7d9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 01:15:49 +0800
Subject: [PATCH 049/292] Use platform wide string interface for platform api,
 not ucstring

---
 nel/src/misc/path.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index a2f817210..2e3aacae6 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -2790,16 +2790,13 @@ bool CPath::isAbsolutePath(const std::string &path)
 bool CFile::setRWAccess(const std::string &filename)
 {
 #ifdef NL_OS_WINDOWS
-	ucstring ucFile;
-	ucFile.fromUtf8(filename);
-
-	wchar_t *wideFile = (wchar_t*)ucFile.c_str();
+	std::wstring wideFile = NLMISC::utf8ToWide(filename);
 
 	// if the file exists and there's no write access
-	if (_waccess (wideFile, 00) == 0 && _waccess (wideFile, 06) == -1)
+	if (_waccess (wideFile.c_str(), 00) == 0 && _waccess (wideFile.c_str(), 06) == -1)
 	{
 		// try to set the read/write access
-		if (_wchmod (wideFile, _S_IREAD | _S_IWRITE) == -1)
+		if (_wchmod (wideFile.c_str(), _S_IREAD | _S_IWRITE) == -1)
 		{
 			if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
 			{
@@ -2822,6 +2819,7 @@ bool CFile::setRWAccess(const std::string &filename)
 			return false;
 		}
 	}
+#endif
 	else
 	{
 		if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
@@ -2830,7 +2828,6 @@ bool CFile::setRWAccess(const std::string &filename)
 		}
 //		return false;
 	}
-#endif
 	return true;
 }
 

From 1a045e437e9b1a11f28711e3749696c99f0235e1 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 02:47:44 +0800
Subject: [PATCH 050/292] Accept any UTF string in NL3D text rendering, support
 UTF-32 characters, ryzom/ryzomcore#335

---
 nel/include/nel/3d/computed_string.h   |  2 +-
 nel/include/nel/3d/font_generator.h    |  8 ++---
 nel/include/nel/3d/font_manager.h      |  7 +++--
 nel/include/nel/3d/text_context.h      | 14 ++++-----
 nel/include/nel/3d/text_context_user.h |  8 ++---
 nel/include/nel/3d/texture_font.h      |  4 +--
 nel/include/nel/3d/u_text_context.h    | 10 +++---
 nel/include/nel/misc/utf_string_view.h |  7 +++++
 nel/src/3d/font_generator.cpp          | 24 +++++++--------
 nel/src/3d/font_manager.cpp            | 42 ++++++++------------------
 nel/src/3d/text_context.cpp            |  8 ++---
 nel/src/3d/text_context_user.cpp       | 18 +++++------
 12 files changed, 72 insertions(+), 80 deletions(-)

diff --git a/nel/include/nel/3d/computed_string.h b/nel/include/nel/3d/computed_string.h
index 3f27a2879..c4404f661 100644
--- a/nel/include/nel/3d/computed_string.h
+++ b/nel/include/nel/3d/computed_string.h
@@ -181,7 +181,7 @@ public:
 	CVertexBuffer Vertices;
 	CMaterial	*Material;
 	CRGBA Color;
-	ucstring Text;
+	std::string Text;
 
 	uint32 CacheVersion;
 
diff --git a/nel/include/nel/3d/font_generator.h b/nel/include/nel/3d/font_generator.h
index b69249d58..ea737afab 100644
--- a/nel/include/nel/3d/font_generator.h
+++ b/nel/include/nel/3d/font_generator.h
@@ -64,17 +64,17 @@ public:
 	 * \param height height of the generated bitmap, this value is set by this function
 	 * \param pitch pitch of the generated bitmap (+ or - the number of bytes per row), this value is set by this function
 	 */
-	uint8	*getBitmap (ucchar c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex);
+	uint8	*getBitmap (u32char c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex);
 
 	/** returns the width and height of a character using a specific size and
 	 *
 	 * \warning this function is not very fast (but faster than getBitmap()) because it has to load the char before.
 	 */
-	void	getSizes (ucchar c, uint32 size, uint32 &width, uint32 &height);
+	void	getSizes (u32char c, uint32 size, uint32 &width, uint32 &height);
 
-	void	getKerning (ucchar left, ucchar right, sint32 &kernx);
+	void	getKerning (u32char left, u32char right, sint32 &kernx);
 
-	uint32	getCharIndex (ucchar c);
+	uint32	getCharIndex (u32char c);
 
 	uint32	getUID() { return _UID; }
 
diff --git a/nel/include/nel/3d/font_manager.h b/nel/include/nel/3d/font_manager.h
index 663e9d23a..53310e95a 100644
--- a/nel/include/nel/3d/font_manager.h
+++ b/nel/include/nel/3d/font_manager.h
@@ -19,6 +19,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/smart_ptr.h"
+#include "nel/misc/utf_string_view.h"
 #include "nel/3d/texture.h"
 #include "nel/3d/material.h"
 #include "nel/3d/texture_font.h"
@@ -111,6 +112,7 @@ public:
 	 * \param output computed string
 	 * \param keep800x600Ratio true if you want that CFontManager look at Driver window size, and resize fontSize so it keeps same size...
 	 */
+	/*
 	void computeString (const std::string& s,
 						CFontGenerator *fontGen,
 						const NLMISC::CRGBA &color,
@@ -120,11 +122,12 @@ public:
 					    IDriver *driver,
 						CComputedString& output,
 						bool	keep800x600Ratio= true);
+						*/
 
 	/**
 	 * Same as computeString but works with a unicode string (ucstring)
 	 */
-	void computeString (const ucstring &s,
+	void computeString (NLMISC::CUtfStringView sv,
 						CFontGenerator *fontGen,
 						const NLMISC::CRGBA &color,
 						uint32 fontSize,
@@ -137,7 +140,7 @@ public:
 	/**
 	 * Same as computeString but do not make vertex buffers and primitives
 	 */
-	void computeStringInfo (const ucstring &s,
+	void computeStringInfo (NLMISC::CUtfStringView sv,
 							CFontGenerator *fontGen,
 							const NLMISC::CRGBA &color,
 							uint32 fontSize,
diff --git a/nel/include/nel/3d/text_context.h b/nel/include/nel/3d/text_context.h
index 1eb256855..b18747e9a 100644
--- a/nel/include/nel/3d/text_context.h
+++ b/nel/include/nel/3d/text_context.h
@@ -134,7 +134,7 @@ public:
 	uint32 textPush (const char *format, ...);
 
 	/// computes an ucstring and adds the result to the cache (return the index)
-	uint32 textPush (const ucstring &str);
+	uint32 textPush (NLMISC::CUtfStringView sv);
 
 	/// remove a string from the cache
 	void erase (uint32 index);
@@ -262,12 +262,12 @@ public:
 	}
 
 	/// Directly print a string
-	void printAt (float x, float z, const ucstring &ucstr)
+	void printAt (float x, float z, NLMISC::CUtfStringView sv)
 	{
 		nlassert(_FontGen);
 
 		// compute the string just one time
-		_FontManager->computeString (ucstr, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, _TempString, _Keep800x600Ratio);
+		_FontManager->computeString (sv, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, _TempString, _Keep800x600Ratio);
 
 		// draw shaded
 		if (_Shaded)
@@ -372,14 +372,14 @@ public:
 	 * \param an ucstring
 	 * \param the computed string
 	 */
-	void computeString (const ucstring& s, CComputedString& output)
+	void computeString (NLMISC::CUtfStringView sv, CComputedString& output)
 	{
-		_FontManager->computeString (s, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
+		_FontManager->computeString (sv, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
 	}
 
-	void computeStringInfo (const ucstring& s, CComputedString& output)
+	void computeStringInfo (NLMISC::CUtfStringView sv, CComputedString& output)
 	{
-		_FontManager->computeStringInfo (s, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
+		_FontManager->computeStringInfo (sv, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
 	}
 
 	/// Debug : write to the disk the texture cache
diff --git a/nel/include/nel/3d/text_context_user.h b/nel/include/nel/3d/text_context_user.h
index 2a167b2e9..951f5b154 100644
--- a/nel/include/nel/3d/text_context_user.h
+++ b/nel/include/nel/3d/text_context_user.h
@@ -97,13 +97,13 @@ public:
 	 */
 	// @{
 	uint32 textPush(const char *format, ...)  ;
-	uint32 textPush(const ucstring &str)  ;
+	uint32 textPush(NLMISC::CUtfStringView sv)  ;
 	void setStringColor(uint32 i, CRGBA newCol);
 	void setStringSelection(uint32 i, uint32 selectStart, uint32 selectSize);
 	void resetStringSelection(uint32 i);
 	void erase(uint32 i)  ;
 	virtual	CStringInfo		getStringInfo (uint32 i);
-	virtual	CStringInfo		getStringInfo (const ucstring &ucstr);
+	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv);
 
 	void clear()  ;
 	void printAt(float x, float y, uint32 i) ;
@@ -111,10 +111,10 @@ public:
 	void printClipAtUnProjected(URenderStringBuffer &renderBuffer, class NL3D::CFrustum &frustum, const NLMISC::CMatrix &scaleMatrix, float x, float y, float depth, uint32 i, float xmin, float ymin, float xmax, float ymax);
 	void printClipAtOld (float x, float y, uint32 i, float xmin, float ymin, float xmax, float ymax);
 
-	void printAt(float x, float y, const ucstring &ucstr) ;
+	void printAt(float x, float y, NLMISC::CUtfStringView sv) ;
 	void printfAt(float x, float y, const char * format, ...) ;
 
-	void render3D(const CMatrix &mat, const ucstring &ucstr) ;
+	void render3D(const CMatrix &mat, NLMISC::CUtfStringView sv) ;
 	void render3D(const CMatrix &mat, const char *format, ...) ;
 
 	float getLastXBound() const ;
diff --git a/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
index 865615b63..5b0796721 100644
--- a/nel/include/nel/3d/texture_font.h
+++ b/nel/include/nel/3d/texture_font.h
@@ -69,7 +69,7 @@ public:
 	// Holds info for glyphs displayed on screen
 	struct SLetterInfo
 	{
-		ucchar Char;
+		u32char Char;
 		sint Size;
 		bool Embolden;
 		bool Oblique;
@@ -94,7 +94,7 @@ public:
 
 	struct SLetterKey
 	{
-		ucchar Char;
+		u32char Char;
 		sint Size;
 		bool Embolden;
 		bool Oblique;
diff --git a/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
index cdde02f82..829e80844 100644
--- a/nel/include/nel/3d/u_text_context.h
+++ b/nel/include/nel/3d/u_text_context.h
@@ -24,7 +24,7 @@
 #include "nel/misc/rgba.h"
 #include "nel/misc/ucstring.h"
 #include "nel/misc/matrix.h"
-
+#include "nel/misc/utf_string_view.h"
 
 namespace NL3D {
 
@@ -248,7 +248,7 @@ public:
 	 * \param an ucstring
 	 * \return the index where computed string has been inserted
 	 */
-	virtual	uint32			textPush (const ucstring &str) = 0;
+	virtual	uint32			textPush (NLMISC::CUtfStringView sv) = 0;
 	/**
 	 * set the color of a string.
 	 */
@@ -274,7 +274,7 @@ public:
 	 * Get a string information from the ucstring
 	 *	The returned string info is in pixel size per default.
 	 */
-	virtual	CStringInfo		getStringInfo (const ucstring &ucstr) = 0;
+	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv) = 0;
 	/**
 	 * empty the map
 	 */
@@ -299,7 +299,7 @@ public:
 	/**
 	 * compute and print a ucstring at the location (2D method) x/y E [0,1]
 	 */
-	virtual	void			printAt (float x, float y, const ucstring &ucstr) = 0;
+	virtual	void			printAt (float x, float y, NLMISC::CUtfStringView sv) = 0;
 	/**
 	 * compute and print a string at the location (2D method) x/y E [0,1]
 	 */
@@ -309,7 +309,7 @@ public:
 	 * compute and render a ucstring at the location (3D method)
 	 *	render3D() use UDriver Matrix context for Frustum/ViewMatrix, but use its own modelmatrix (mat).
 	 */
-	virtual	void			render3D (const NLMISC::CMatrix &mat, const ucstring &ucstr) = 0;
+	virtual	void			render3D (const NLMISC::CMatrix &mat, NLMISC::CUtfStringView sv) = 0;
 	/**
 	 * compute and render a string at the location (3D method)
 	 *	render3D() use UDriver Matrix context for Frustum/ViewMatrix, but use its own modelmatrix (mat).
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index e972ca7cf..cc726bb33 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -91,6 +91,13 @@ public:
 	iterator begin() const { return iterator(*this, m_Str); }
 	inline iterator end() const { return iterator(*this, NULL); }
 
+	/// Largest possible number of characters in this string.
+	/// Number of actual characters may be less or equal.
+	inline size_t largestSize() const { return m_Size; }
+
+	inline bool empty() const { return !m_Size; }
+	const void *ptr() const { return m_Str; }
+
 private:
 	typedef u32char (*TIterator)(const void **addr);
 	static u32char utf8Iterator(const void **addr);
diff --git a/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
index 0bad785a6..86a233f22 100644
--- a/nel/src/3d/font_generator.cpp
+++ b/nel/src/3d/font_generator.cpp
@@ -256,7 +256,7 @@ CFontGenerator::~CFontGenerator ()
 	}
 }
 
-void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &height)
+void CFontGenerator::getSizes (u32char c, uint32 size, uint32 &width, uint32 &height)
 {
 	FT_Error error;
 
@@ -272,7 +272,7 @@ void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &hei
 	if (glyph_index == 0)
 	{
 		// no glyph available, replace with a dot
-		glyph_index = FT_Get_Char_Index (_Face, ucchar('.'));
+		glyph_index = FT_Get_Char_Index (_Face, u32char('.'));
 	}
 
 	// load glyph image into the slot (erase previous one)
@@ -294,7 +294,7 @@ void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &hei
 	height = _Face->glyph->metrics.height >> 6;
 }
 
-uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex)
+uint8 *CFontGenerator::getBitmap (u32char c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex)
 {
 	FT_Error error;
 
@@ -311,7 +311,7 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 	if (glyph_index == 0)
 	{
 		// no glyph available, replace with a dot
-		glyph_index = FT_Get_Char_Index (_Face, ucchar('.'));
+		glyph_index = FT_Get_Char_Index (_Face, u32char('.'));
 	}
 	*/
 
@@ -374,7 +374,7 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 
 
 
-void CFontGenerator::getKerning (ucchar left, ucchar right, sint32 &kernx)
+void CFontGenerator::getKerning (u32char left, u32char right, sint32 &kernx)
 {
 	if (!FT_HAS_KERNING(_Face))
 	{
@@ -394,14 +394,14 @@ void CFontGenerator::getKerning (ucchar left, ucchar right, sint32 &kernx)
 
 
 
-uint32	 CFontGenerator::getCharIndex (ucchar c)
+uint32	 CFontGenerator::getCharIndex (u32char c)
 {
 	uint32 ret = FT_Get_Char_Index(_Face, c);
 
 	if (ret == 0)
 	{
 		// no glyph available, replace with a dot
-		ret = FT_Get_Char_Index (_Face, ucchar('.'));
+		ret = FT_Get_Char_Index (_Face, u32char('.'));
 	}
 
 	return ret;
@@ -475,14 +475,14 @@ CFontGenerator::~CFontGenerator ()
 	DeleteDC (hdcDib);
 }
 
-void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &height)
+void CFontGenerator::getSizes (u32char c, uint32 size, uint32 &width, uint32 &height)
 {
 }
 
 HFONT hFont = NULL;
 uint32 CurrentFontSize = 0;
 
-uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex)
+uint8 *CFontGenerator::getBitmap (u32char c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex)
 {
 	if (size == 0)
 	{
@@ -529,7 +529,7 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 	SelectObject (hdcDib, hFont);
 	SelectObject (hdcDib, Dib);
 
-	const ucchar cc = /*(char)*/ c;
+	const u32char cc = /*(char)*/ c;
 
 	// prevent outputing white glyph if char is not available in font
 	DWORD glyphIndex;
@@ -639,13 +639,13 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 
 
 
-void CFontGenerator::getKerning (ucchar left, ucchar right, sint32 &kernx)
+void CFontGenerator::getKerning (u32char left, u32char right, sint32 &kernx)
 {
 }
 
 
 
-uint32	 CFontGenerator::getCharIndex (ucchar c)
+uint32	 CFontGenerator::getCharIndex (u32char c)
 {
 	return 0;
 }
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index d00ebb8f5..d467c69d1 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -63,27 +63,8 @@ CMaterial* CFontManager::getFontMaterial()
 	return _MatFont;
 }
 
-
-// ***************************************************************************
-void CFontManager::computeString (const std::string &s,
-								  CFontGenerator *fontGen,
-								  const NLMISC::CRGBA &color,
-								  uint32 fontSize,
-								  bool embolden,
-								  bool oblique,
-								  IDriver *driver,
-								  CComputedString &output,
-								  bool	keep800x600Ratio)
-{
-	// static to avoid reallocation
-	static ucstring	ucs;
-	ucs= s;
-	computeString(ucs, fontGen, color, fontSize, embolden, oblique, driver, output, keep800x600Ratio);
-}
-
-
 // ***************************************************************************
-void CFontManager::computeString (const ucstring &s,
+void CFontManager::computeString (NLMISC::CUtfStringView sv,
 								  CFontGenerator *fontGen,
 								  const NLMISC::CRGBA &color,
 								  uint32 fontSize,
@@ -109,7 +90,7 @@ void CFontManager::computeString (const ucstring &s,
 	}
 
 	// Setting vertices format
-	output.Vertices.setNumVertices (4 * (uint32)s.size());
+	output.Vertices.setNumVertices (4 * (uint32)sv.largestSize());
 
 	// 1 character <-> 1 quad
 	sint32 penx = 0, dx;
@@ -144,7 +125,8 @@ void CFontManager::computeString (const ucstring &s,
 	output.StringHeight = 0;
 
 	// save string info for later rebuild as needed
-	output.Text = s;
+	if (sv.ptr() != output.Text.c_str()) // don't resave if rebuilding
+		output.Text = sv.toUtf8();
 	output.CacheVersion = getCacheVersion();
 
 	uint j = 0;
@@ -156,10 +138,11 @@ void CFontManager::computeString (const ucstring &s,
 		hlfPixScrH = 0.f;
 
 		// For all chars
-		for (uint i = 0; i < s.size(); i++)
+		//for (uint i = 0; i < s.size(); i++)
+		for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
 		{
 			// Creating font
-			k.Char = s[i];
+			k.Char = *it;
 			k.FontGenerator = fontGen;
 			k.Size = fontSize;
 			k.Embolden = embolden;
@@ -245,7 +228,7 @@ void CFontManager::computeString (const ucstring &s,
 
 
 // ***************************************************************************
-void CFontManager::computeStringInfo (	const ucstring &s,
+void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 										CFontGenerator *fontGen,
 										const NLMISC::CRGBA &color,
 										uint32 fontSize,
@@ -258,10 +241,11 @@ void CFontManager::computeStringInfo (	const ucstring &s,
 	output.Color = color;
 
 	// save string info for later rebuild as needed
-	output.Text = s;
+	if (sv.ptr() != output.Text.c_str()) // don't resave if rebuilding
+		output.Text = sv.toUtf8();
 	output.CacheVersion = 0;
 
-	if (s.empty())
+	if (sv.empty())
 	{
 		output.StringWidth = 0.f;
 		output.StringHeight = 0;
@@ -290,10 +274,10 @@ void CFontManager::computeStringInfo (	const ucstring &s,
 	CTextureFont::SLetterKey k;
 	CTextureFont::SLetterInfo *pLI;
 
-	for (uint i = 0; i < s.size(); i++)
+	for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
 	{
 		// Creating font
-		k.Char = s[i];
+		k.Char = *it;
 		k.FontGenerator = fontGen;
 		k.Size = fontSize;
 		k.Embolden = embolden;
diff --git a/nel/src/3d/text_context.cpp b/nel/src/3d/text_context.cpp
index 1ccb920e4..ba40904b3 100644
--- a/nel/src/3d/text_context.cpp
+++ b/nel/src/3d/text_context.cpp
@@ -77,13 +77,11 @@ uint32 CTextContext::textPush (const char *format, ...)
 	char *str;
 	NLMISC_CONVERT_VARGS (str, format, NLMISC::MaxCStringSize);
 
-	ucstring uc;
-	uc.fromUtf8((const char *)str);
-	return textPush(uc);
+	return textPush(str);
 }
 
 // ------------------------------------------------------------------------------------------------
-uint32 CTextContext::textPush (const ucstring &str)
+uint32 CTextContext::textPush (NLMISC::CUtfStringView sv)
 {
 	nlassert(_FontGen);
 
@@ -103,7 +101,7 @@ uint32 CTextContext::textPush (const ucstring &str)
 	nlassert (index < _CacheStrings.size());
 	CComputedString &strToFill = _CacheStrings[index];
 
-	_FontManager->computeString (str, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, strToFill, _Keep800x600Ratio);
+	_FontManager->computeString (sv, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, strToFill, _Keep800x600Ratio);
 	// just compute letters, glyphs are rendered on demand before first draw
 	//_FontManager->computeStringInfo(str, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, strToFill, _Keep800x600Ratio);
 
diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index 0430eae1a..6956c0df5 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -231,11 +231,11 @@ uint32 CTextContextUser::textPush(const char *format, ...)
 
 	return _TextContext.textPush(ucstring(str)) ;
 }
-uint32 CTextContextUser::textPush(const ucstring &str)
+uint32 CTextContextUser::textPush(NLMISC::CUtfStringView sv)
 {
 	H_AUTO2;
 
-	return _TextContext.textPush(str) ;
+	return _TextContext.textPush(sv) ;
 }
 void CTextContextUser::setStringColor(uint32 i, CRGBA newCol)
 {
@@ -279,11 +279,11 @@ UTextContext::CStringInfo		CTextContextUser::getStringInfo(uint32 i)
 	else
 		return	CStringInfo(cstr->StringWidth, cstr->StringHeight, cstr->StringLine);
 }
-UTextContext::CStringInfo		CTextContextUser::getStringInfo(const ucstring &str)
+UTextContext::CStringInfo		CTextContextUser::getStringInfo(NLMISC::CUtfStringView sv)
 {
 	H_AUTO2;
 
-	_TextContext.computeStringInfo(str, _CacheString);
+	_TextContext.computeStringInfo(sv, _CacheString);
 	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine);
 }
 void CTextContextUser::clear()
@@ -319,11 +319,11 @@ void CTextContextUser::printClipAtOld (float x, float y, uint32 i, float xmin, f
 	printClipAt(rdrBuffer, x, y ,i, xmin, ymin, xmax, ymax);
 	flushRenderBuffer(&rdrBuffer);
 }
-void CTextContextUser::printAt(float x, float y, const ucstring &ucstr)
+void CTextContextUser::printAt(float x, float y, NLMISC::CUtfStringView sv)
 {
 	H_AUTO2;
 
-	_TextContext.printAt(x, y, ucstr);
+	_TextContext.printAt(x, y, sv);
 	_DriverUser->restoreMatrixContext();
 }
 void CTextContextUser::printfAt(float x, float y, const char * format, ...)
@@ -337,12 +337,12 @@ void CTextContextUser::printfAt(float x, float y, const char * format, ...)
 	_DriverUser->restoreMatrixContext();
 }
 
-void CTextContextUser::render3D(const CMatrix &mat, const ucstring &ucstr)
+void CTextContextUser::render3D(const CMatrix &mat, NLMISC::CUtfStringView sv)
 {
 	NL3D_HAUTO_RENDER_3D_TEXTCONTEXT;
 
 	CComputedString computedStr;
-	_TextContext.computeString(ucstr,computedStr);
+	_TextContext.computeString(sv,computedStr);
 
 	computedStr.render3D(*_Driver,mat);
 
@@ -355,7 +355,7 @@ void CTextContextUser::render3D(const CMatrix &mat, const char *format, ...)
 	char *str;
 	NLMISC_CONVERT_VARGS (str, format, NLMISC::MaxCStringSize);
 
-	render3D(mat, ucstring(str));
+	render3D(mat, str);
 
 	_DriverUser->restoreMatrixContext();
 }

From 932a612f53a1c012379f3dbe3f16a2ffe2300d26 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 04:32:01 +0800
Subject: [PATCH 051/292] Support UTF-32 in edit box, ryzom/ryzomcore#335

---
 nel/include/nel/3d/font_manager.h             |  14 +++
 nel/include/nel/3d/text_context.h             |   5 +
 nel/include/nel/3d/text_context_user.h        |   1 +
 nel/include/nel/3d/u_text_context.h           |   5 +
 nel/include/nel/gui/group_editbox.h           |  22 ++--
 nel/include/nel/misc/utf_string_view.h        |  35 +++++-
 nel/src/3d/font_manager.cpp                   |  19 ++-
 nel/src/3d/text_context_user.cpp              |   7 ++
 nel/src/gui/group_editbox.cpp                 | 112 +++++++++++-------
 nel/src/gui/group_html.cpp                    |   3 +-
 nel/src/gui/view_text.cpp                     |  15 ++-
 ryzom/client/src/connection.cpp               |   8 +-
 .../src/interface_v3/action_handler_edit.cpp  |  17 +--
 .../src/interface_v3/action_handler_item.cpp  |  20 ++--
 .../src/interface_v3/action_phrase_faber.cpp  |   2 +-
 .../bot_chat_page_create_guild.cpp            |   4 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  |  14 +--
 ryzom/client/src/interface_v3/chat_window.cpp |   8 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |   6 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  12 +-
 .../src/interface_v3/inventory_manager.cpp    |   6 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |   2 +-
 .../src/interface_v3/macrocmd_manager.cpp     |   2 +-
 .../src/interface_v3/people_interraction.cpp  |  14 +--
 ryzom/client/src/interface_v3/people_list.cpp |   8 +-
 ryzom/client/src/login.cpp                    |  18 +--
 ryzom/client/src/r2/editor.cpp                |   4 +-
 27 files changed, 250 insertions(+), 133 deletions(-)

diff --git a/nel/include/nel/3d/font_manager.h b/nel/include/nel/3d/font_manager.h
index 53310e95a..134df26f9 100644
--- a/nel/include/nel/3d/font_manager.h
+++ b/nel/include/nel/3d/font_manager.h
@@ -137,6 +137,20 @@ public:
 						CComputedString &output,
 						bool	keep800x600Ratio= true);
 
+	/**
+	 * Same as computeString but do not make vertex buffers and primitives
+	 */
+	void computeStringInfo (NLMISC::CUtfStringView sv,
+							size_t len,
+							CFontGenerator *fontGen,
+							const NLMISC::CRGBA &color,
+							uint32 fontSize,
+							bool embolden,
+							bool oblique,
+							IDriver *driver,
+							CComputedString &output,
+							bool keep800x600Ratio= true);
+
 	/**
 	 * Same as computeString but do not make vertex buffers and primitives
 	 */
diff --git a/nel/include/nel/3d/text_context.h b/nel/include/nel/3d/text_context.h
index b18747e9a..01a711e7e 100644
--- a/nel/include/nel/3d/text_context.h
+++ b/nel/include/nel/3d/text_context.h
@@ -382,6 +382,11 @@ public:
 		_FontManager->computeStringInfo (sv, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
 	}
 
+	void computeStringInfo (NLMISC::CUtfStringView sv, CComputedString& output, size_t len)
+	{
+		_FontManager->computeStringInfo (sv, len, _FontGen, _Color, _FontSize, _Embolden, _Oblique, _Driver, output, _Keep800x600Ratio);
+	}
+
 	/// Debug : write to the disk the texture cache
 	void dumpCache (const char *filename)
 	{
diff --git a/nel/include/nel/3d/text_context_user.h b/nel/include/nel/3d/text_context_user.h
index 951f5b154..039aebcd0 100644
--- a/nel/include/nel/3d/text_context_user.h
+++ b/nel/include/nel/3d/text_context_user.h
@@ -104,6 +104,7 @@ public:
 	void erase(uint32 i)  ;
 	virtual	CStringInfo		getStringInfo (uint32 i);
 	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv);
+	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv, size_t len);
 
 	void clear()  ;
 	void printAt(float x, float y, uint32 i) ;
diff --git a/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
index 829e80844..9cf710b11 100644
--- a/nel/include/nel/3d/u_text_context.h
+++ b/nel/include/nel/3d/u_text_context.h
@@ -275,6 +275,11 @@ public:
 	 *	The returned string info is in pixel size per default.
 	 */
 	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv) = 0;
+	/**
+	* Get a string information from the ucstring
+	*	The returned string info is in pixel size per default.
+	*/
+	virtual	CStringInfo		getStringInfo (NLMISC::CUtfStringView sv, size_t len) = 0;
 	/**
 	 * empty the map
 	 */
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index dc343410b..62b78584c 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -63,16 +63,16 @@ namespace NLGUI
 		virtual bool handleEvent (const NLGUI::CEventDescriptor& eventDesc);
 
 		/// Accessors
-		ucstring getInputString() const { return _InputString; }
-		const ucstring &getInputStringRef() const { return _InputString; }
+		u32string getInputString() const { return _InputString; }
+		const u32string &getInputStringRef() const { return _InputString; }
 		const ucstring &getPrompt() const { return _Prompt; }
 
 		/** Set the prompt
 		  * NB : line returns are encoded as '\n', not '\r\n'
 		  */
 		void		setPrompt(const ucstring &s) { _Prompt = s; }
-		void		setInputString(const ucstring &str);
-		void		setInputStringRef(const ucstring &str) {_InputString = str; };
+		void		setInputString(const u32string &str);
+		void		setInputStringRef(const u32string &str) {_InputString = str; };
 		void		setInputStringAsInt(sint32 val);
 		sint32		getInputStringAsInt() const;
 		void		setInputStringAsInt64(sint64 val);
@@ -81,6 +81,8 @@ namespace NLGUI
 		float		getInputStringAsFloat() const;
 		void		setInputStringAsUtf8(const std::string &str);
 		std::string	getInputStringAsUtf8() const;
+		void		setInputStringAsUtf16(const ucstring &str);
+		ucstring    getInputStringAsUtf16() const;
 		void		setColor(NLMISC::CRGBA col);
 
 
@@ -119,7 +121,7 @@ namespace NLGUI
 		sint32	getMaxHistoric() const {return _MaxHistoric;}
 		sint32	getCurrentHistoricIndex () const {return _CurrentHistoricIndex;}
 		void	setCurrentHistoricIndex (sint32 index) {_CurrentHistoricIndex=index;}
-		const ucstring	&getHistoric(uint32 index) const {return _Historic[index];}
+		const u32string	&getHistoric(uint32 index) const {return _Historic[index];}
 		uint32	getNumHistoric() const {return (uint32)_Historic.size ();}
 
 		// Get on change action handler
@@ -188,7 +190,7 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setFocusOnText", luaSetFocusOnText);
 			REFLECT_LUA_METHOD("cancelFocusOnText", luaCancelFocusOnText);
 			REFLECT_STRING("input_string", getInputStringAsUtf8, setInputStringAsUtf8);
-			REFLECT_UCSTRING("uc_input_string", getInputString, setInputString);
+			REFLECT_UCSTRING("uc_input_string", getInputStringAsUtf16, setInputStringAsUtf16);
 		REFLECT_EXPORT_END
 
 		/** Restore the original value of the edit box.
@@ -227,16 +229,16 @@ namespace NLGUI
 
 		// Text info
 		ucstring	_Prompt;
-		ucstring	_InputString;
+		u32string	_InputString;
 		CViewText	*_ViewText;
 
 		// undo / redo
-		ucstring	_StartInputString;  // value of the input string when focus was acuired first
-		ucstring	_ModifiedInputString;
+		u32string	_StartInputString;  // value of the input string when focus was acuired first
+		u32string	_ModifiedInputString;
 
 
 		// Historic info
-		typedef std::deque<ucstring>		THistoric;
+		typedef std::deque<u32string>		THistoric;
 		THistoric	_Historic;
 		uint32		_MaxHistoric;
 		sint32		_CurrentHistoricIndex;
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index cc726bb33..a23c2abca 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -30,6 +30,8 @@ namespace NLMISC {
 class CUtfStringView
 {
 public:
+	inline CUtfStringView() : m_Str(NULL), m_Size(0), m_Iterator(utf32Iterator) {}
+
 	inline CUtfStringView(const char *utf8Str) : m_Str(utf8Str), m_Size(strlen(utf8Str)), m_Iterator(utf8Iterator) {}
 	inline CUtfStringView(const char *utf8Str, size_t len): m_Str(utf8Str), m_Size(len), m_Iterator(utf8Iterator)
 	{
@@ -68,16 +70,31 @@ public:
 	public:
 		inline void operator++()
 		{ 
-			m_Char = m_View.m_Iterator(&m_Addr); 
+			m_Char = m_View.m_Iterator(&m_Addr);
 			if ((ptrdiff_t)m_Addr > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
 			{
 				m_Addr = 0;
 				m_Char = 0;
 			}
 		}
+		inline void operator+=(ptrdiff_t a)
+		{
+			while (m_Addr)
+			{
+				++(*this);
+			}
+		}
 		inline bool operator!=(const const_iterator &o) const { return m_Addr != o.m_Addr; }
 		inline bool operator==(const const_iterator &o) const { return m_Addr == o.m_Addr; }
 		inline const u32char &operator*() const {  return m_Char; }
+		const_iterator() : m_View(*(CUtfStringView *)NULL), m_Addr(NULL), m_Char(0) { }
+
+		const_iterator &operator=(const const_iterator &other) 
+		{  
+			if(this == &other) return *this;
+			this->~const_iterator();
+			return *new(this) const_iterator(other);
+		}
 	private:
 		friend class CUtfStringView;
 		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Char(addr ? view.m_Iterator(&m_Addr) : 0) { }
@@ -98,12 +115,28 @@ public:
 	inline bool empty() const { return !m_Size; }
 	const void *ptr() const { return m_Str; }
 
+	inline CUtfStringView substr(const iterator &begin, const iterator &end) const
+	{
+		return CUtfStringView(begin.m_Addr, (ptrdiff_t)end.m_Addr - (ptrdiff_t)begin.m_Addr, m_Iterator);
+	}
+	
+	inline bool endsWith(char c) { nlassert(c < 0x80); return *((char *)m_Str + m_Size - 1) == c; }
+
+	CUtfStringView &operator=(const CUtfStringView &other) 
+	{  
+		if(this == &other) return *this;
+		this->~CUtfStringView();
+		return *new(this) CUtfStringView(other);
+	}
+
 private:
 	typedef u32char (*TIterator)(const void **addr);
 	static u32char utf8Iterator(const void **addr);
 	static u32char utf16Iterator(const void **addr);
 	static u32char utf32Iterator(const void **addr);
 
+	inline CUtfStringView(const void *str, size_t len, TIterator it) : m_Str(str), m_Size(len), m_Iterator(it) { }
+
 	const void *const m_Str; // String
 	const size_t m_Size; // Size in bytes
 	const TIterator m_Iterator;
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index d467c69d1..70fb59639 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -237,6 +237,22 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 										IDriver *driver,
 										CComputedString &output,
 										bool keep800x600Ratio	)
+{
+	computeStringInfo(sv, sv.largestSize(), fontGen, color, fontSize, embolden, oblique, driver, output, keep800x600Ratio);
+}
+
+
+// ***************************************************************************
+void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
+										size_t len,
+										CFontGenerator *fontGen,
+										const NLMISC::CRGBA &color,
+										uint32 fontSize,
+										bool embolden,
+										bool oblique,
+										IDriver *driver,
+										CComputedString &output,
+										bool keep800x600Ratio	)
 {
 	output.Color = color;
 
@@ -274,7 +290,8 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 	CTextureFont::SLetterKey k;
 	CTextureFont::SLetterInfo *pLI;
 
-	for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+	size_t idx = 0;
+	for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end && idx < len; ++it, ++idx)
 	{
 		// Creating font
 		k.Char = *it;
diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index 6956c0df5..95d9ebe1c 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -286,6 +286,13 @@ UTextContext::CStringInfo		CTextContextUser::getStringInfo(NLMISC::CUtfStringVie
 	_TextContext.computeStringInfo(sv, _CacheString);
 	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine);
 }
+UTextContext::CStringInfo		CTextContextUser::getStringInfo(NLMISC::CUtfStringView sv, size_t len)
+{
+	H_AUTO2;
+
+	_TextContext.computeStringInfo(sv, _CacheString, len);
+	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine);
+}
 void CTextContextUser::clear()
 {
 	H_AUTO2;
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 2879a62af..b9dc44895 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -21,6 +21,7 @@
 #include "stdpch.h"
 #include "nel/gui/group_editbox.h"
 #include "nel/misc/command.h"
+#include "nel/misc/utf_string_view.h"
 #include "nel/gui/view_text.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/interface_options.h"
@@ -826,11 +827,12 @@ namespace NLGUI
 	}
 
 	// ----------------------------------------------------------------------------
-	void CGroupEditBox::writeString(const ucstring &str, bool replace, bool atEnd)
+	void CGroupEditBox::writeString(const ucstring &str16, bool replace, bool atEnd)
 	{
+		u32string str = CUtfStringView(str16).toUtf32();
 		sint length = (sint)str.length();
 
-		ucstring toAppend;
+		u32string toAppend;
 		// filter character depending on the entry type
 		switch (_EntryType)
 		{
@@ -963,7 +965,7 @@ namespace NLGUI
 		{
 			length = _MaxNumChar - (sint)_InputString.length();
 		}
-		ucstring toAdd = toAppend.substr(0, length);
+		u32string toAdd = toAppend.substr(0, length);
 		sint32	minPos;
 		sint32	maxPos;
 		if (_CurrSelection == this)
@@ -1013,7 +1015,7 @@ namespace NLGUI
 				_CursorAtPreviousLineEnd = false;
 				if (_ClearOnEscape)
 				{
-					setInputString(ucstring(""));
+					setInputString(u32string());
 					triggerOnChangeAH();
 				}
 				CWidgetManager::getInstance()->setCaptureKeyboard(NULL);
@@ -1059,8 +1061,9 @@ namespace NLGUI
 					{
 						if (isKeyRETURN)
 						{
-							ucstring	copyStr= _InputString;
-							if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
+							//ucstring	copyStr= _InputString;
+							//if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
+							if ((uint)std::count(_InputString.begin(), _InputString.end(), '\n') >= _MaxNumReturn)
 								break;
 						}
 
@@ -1121,11 +1124,11 @@ namespace NLGUI
 						if(_EntryType==Integer && (_IntegerMinValue!=INT_MIN || _IntegerMaxValue!=INT_MAX))
 						{
 							// estimate new string
-							ucstring	copyStr= _InputString;
-							ucstring::iterator it = copyStr.begin() + _CursorPos;
+							u32string	copyStr= _InputString;
+							u32string::iterator it = copyStr.begin() + _CursorPos;
 							copyStr.insert(it, c);
 							sint32	value;
-							fromString(copyStr.toString(), value);
+							fromString(CUtfStringView(copyStr).toUtf8(), value);
 							// if out of bounds, abort char
 							if(value<_IntegerMinValue || value>_IntegerMaxValue)
 								return;
@@ -1134,12 +1137,12 @@ namespace NLGUI
 						if(_EntryType==PositiveInteger && (_PositiveIntegerMinValue!=0 || _PositiveIntegerMaxValue!=UINT_MAX))
 						{
 							// estimate new string
-							ucstring	copyStr= _InputString;
-							ucstring::iterator it = copyStr.begin() + _CursorPos;
+							u32string	copyStr= _InputString;
+							u32string::iterator it = copyStr.begin() + _CursorPos;
 							copyStr.insert(it, c);
 							// \todo yoyo: this doesn't really work i think....
 							uint32	value;
-							fromString(copyStr.toString(), value);
+							fromString(CUtfStringView(copyStr).toUtf8(), value);
 							// if out of bounds, abort char
 							if(value<_PositiveIntegerMinValue || value>_PositiveIntegerMaxValue)
 								return;
@@ -1148,7 +1151,7 @@ namespace NLGUI
 						if ((uint) _InputString.length() < _MaxNumChar)
 						{
 							makeTopWindow();
-							ucstring::iterator it = _InputString.begin() + _CursorPos;
+							u32string::iterator it = _InputString.begin() + _CursorPos;
 							_InputString.insert(it, c);
 							++ _CursorPos;
 							triggerOnChangeAH();
@@ -1229,11 +1232,11 @@ namespace NLGUI
 			{
 				makeTopWindow();
 				// for french, deutsch and russian, be aware of unicode
-				std::string command = _InputString.substr(1).toUtf8();
+				std::string command = CUtfStringView(_InputString.substr(1)).toUtf8();
 				ICommand::expand(command);
-				// then back to ucstring
-				_InputString.fromUtf8(command);
-				_InputString = '/' + _InputString;
+				// then back to u32string
+				_InputString = CUtfStringView('/' + command).toUtf32();
+				_InputString = _InputString;
 				_CursorPos = (sint32)_InputString.length();
 				_CursorAtPreviousLineEnd = false;
 				triggerOnChangeAH();
@@ -1260,7 +1263,7 @@ namespace NLGUI
 		// else delete last character
 		else if(_InputString.size () > 0 && _CursorPos != 0)
 		{
-			ucstring::iterator it = _InputString.begin() + (_CursorPos - 1);
+			u32string::iterator it = _InputString.begin() + (_CursorPos - 1);
 			_InputString.erase(it);
 			-- _CursorPos;
 			_CursorAtPreviousLineEnd = false;
@@ -1439,7 +1442,7 @@ namespace NLGUI
 			}
 			else
 			{
-				usTmp = _Prompt + _InputString;
+				usTmp = _Prompt + CUtfStringView(_InputString).toUtf16();
 			}
 			_ViewText->setText (usTmp);
 		}
@@ -1622,7 +1625,7 @@ namespace NLGUI
 
 
 	// ----------------------------------------------------------------------------
-	void CGroupEditBox::setInputString(const ucstring &str)
+	void CGroupEditBox::setInputString(const u32string &str)
 	{
 		_InputString = str;
 		if (_CursorPos > (sint32) str.length())
@@ -1641,7 +1644,7 @@ namespace NLGUI
 	void	CGroupEditBox::setDefaultInputString(const ucstring &str)
 	{
 		_DefaultInputString= true;
-		setInputString(str);
+		setInputString(CUtfStringView(str).toUtf32());
 	}
 
 
@@ -1649,35 +1652,35 @@ namespace NLGUI
 	sint32		CGroupEditBox::getInputStringAsInt() const
 	{
 		sint32 value;
-		fromString(_InputString.toString(), value);
+		fromString(getInputStringAsUtf8(), value);
 		return value;
 	}
 
 	// ***************************************************************************
 	void		CGroupEditBox::setInputStringAsInt(sint32 val)
 	{
-		setInputString(NLMISC::toString(val));
+		setInputStringAsUtf8(NLMISC::toString(val));
 	}
 
 	// ***************************************************************************
 	sint64		CGroupEditBox::getInputStringAsInt64() const
 	{
 		sint64 value;
-		fromString(_InputString.toString(), value);
+		fromString(getInputStringAsUtf8(), value);
 		return value;
 	}
 
 	// ***************************************************************************
 	void		CGroupEditBox::setInputStringAsInt64(sint64 val)
 	{
-		setInputString(NLMISC::toString(val));
+		setInputStringAsUtf8(NLMISC::toString(val));
 	}
 
 	// ***************************************************************************
 	float		CGroupEditBox::getInputStringAsFloat() const
 	{
 		float value;
-		fromString(_InputString.toString(), value);
+		fromString(getInputStringAsUtf8(), value);
 		return value;
 	}
 
@@ -1685,14 +1688,14 @@ namespace NLGUI
 	void		CGroupEditBox::setInputStringAsFloat(float val)
 	{
 		string	fmt= "%." + NLMISC::toString(_MaxFloatPrec) + "f";
-		setInputString(NLMISC::toString(fmt.c_str(), val));
+		setInputStringAsUtf8(NLMISC::toString(fmt.c_str(), val));
 	}
 
 	// ***************************************************************************
 	void CGroupEditBox::cutSelection()
 	{
-		sint32	minPos= min(_CursorPos, _SelectCursorPos);
-		sint32	maxPos= max(_CursorPos, _SelectCursorPos);
+		ptrdiff_t	minPos= min(_CursorPos, _SelectCursorPos);
+		ptrdiff_t	maxPos= max(_CursorPos, _SelectCursorPos);
 		// cut the selection
 		if(!_InputString.empty())
 		{
@@ -1706,10 +1709,10 @@ namespace NLGUI
 	// ***************************************************************************
 	ucstring	CGroupEditBox::getSelection()
 	{
-		sint32	minPos= min(_CursorPos, _SelectCursorPos);
-		sint32	maxPos= max(_CursorPos, _SelectCursorPos);
+		ptrdiff_t	minPos= min(_CursorPos, _SelectCursorPos);
+		ptrdiff_t	maxPos= max(_CursorPos, _SelectCursorPos);
 		// get the selection
-		return _InputString.substr(minPos, maxPos-minPos);
+		return CUtfStringView(_InputString.substr(minPos, maxPos-minPos)).toUtf16();
 	}
 
 
@@ -1738,13 +1741,25 @@ namespace NLGUI
 	// ***************************************************************************
 	void	CGroupEditBox::setInputStringAsUtf8(const std::string &str)
 	{
-		setInputString(ucstring::makeFromUtf8(str));
+		setInputString(CUtfStringView(str).toUtf32());
 	}
 
 	// ***************************************************************************
 	std::string	CGroupEditBox::getInputStringAsUtf8() const
 	{
-		return _InputString.toUtf8();
+		return CUtfStringView(_InputString).toUtf8();
+	}
+
+	// ***************************************************************************
+	void	CGroupEditBox::setInputStringAsUtf16(const ucstring &str)
+	{
+		setInputString(CUtfStringView(str).toUtf32());
+	}
+
+	// ***************************************************************************
+	ucstring	CGroupEditBox::getInputStringAsUtf16() const
+	{
+		return CUtfStringView(_InputString).toUtf16();
 	}
 
 	// ***************************************************************************
@@ -1755,7 +1770,7 @@ namespace NLGUI
 			return;
 
 		// set the string and maybe execute
-		setInputString((ucchar) '/' + command);
+		setInputString(CUtfStringView((ucchar) '/' + command).toUtf32());
 		if (execute)
 		{
 			// stop selection
@@ -1810,13 +1825,30 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupEditBox::serialConfig(NLMISC::IStream &f)
 	{
-		f.serialVersion(0);
+		uint version = f.serialVersion(1);
 		if(_DefaultInputString)		// Don't want to save the default input
 		{
 			_DefaultInputString= false;
 			_InputString.clear();
 		}
-		f.serial(_InputString);
+		if (version < 1)
+		{
+			ucstring str;
+			if (!f.isReading())
+				str = CUtfStringView(_InputString).toUtf16();
+			f.serial(str);
+			if (f.isReading())
+				_InputString = CUtfStringView(str).toUtf32();
+		}
+		else
+		{
+			std::string str;
+			if (!f.isReading())
+				str = CUtfStringView(_InputString).toUtf8();
+			f.serial(str);
+			if (f.isReading())
+				_InputString = CUtfStringView(str).toUtf32();
+		}
 		f.serial(_CursorPos);
 		f.serial(_PrevNumLine);
 		if (f.isReading())
@@ -1838,7 +1870,7 @@ namespace NLGUI
 	void CGroupEditBox::onQuit()
 	{
 		// clear the text and restore backup pos before final save
-		setInputString(ucstring(""));
+		setInputString(u32string());
 		_CurrSelection = NULL;
 	}
 
@@ -1846,7 +1878,7 @@ namespace NLGUI
 	void CGroupEditBox::onLoadConfig()
 	{
 		// config is not saved when there's an empty string, so restore that default state.
-		setInputString(ucstring(""));
+		setInputString(u32string());
 		_CurrSelection = NULL;
 		_PrevNumLine = 1;
 	}
@@ -1861,7 +1893,7 @@ namespace NLGUI
 			if (_DefaultInputString)
 			{
 				_DefaultInputString= false;
-				setInputString(ucstring());
+				setInputString(u32string());
 			}
 			_CanRedo = false;
 			_CanUndo = false;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 0c294c766..7f80405ce 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -27,6 +27,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/rgba.h"
 #include "nel/misc/algo.h"
+#include "nel/misc/utf_string_view.h"
 #include "nel/gui/libwww.h"
 #include "nel/gui/group_html.h"
 #include "nel/gui/group_list.h"
@@ -3023,7 +3024,7 @@ namespace NLGUI
 				CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(textArea->getGroup("eb"));
 				if (eb)
 				{
-					eb->setInputString(decodeHTMLEntities(content));
+					eb->setInputString(CUtfStringView(decodeHTMLEntities(content)).toUtf32());
 					if (style.hasStyle("background-color"))
 					{
 						CViewBitmap *bg = dynamic_cast<CViewBitmap*>(eb->getView("bg"));
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 1b7d3f457..7376cd39a 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -2466,9 +2466,8 @@ namespace NLGUI
 							if ((uint) (index - charIndex) > currWord.NumSpaces)
 							{
 								// get the x position
-								ucstring subStr = currWord.Text.substr(0, index - charIndex - currWord.NumSpaces);
 								// compute the size
-								UTextContext::CStringInfo si = TextContext->getStringInfo(subStr);
+								UTextContext::CStringInfo si = TextContext->getStringInfo(currWord.Text, (ptrdiff_t)index - charIndex - currWord.NumSpaces);
 								fx = px + si.StringWidth + currWord.NumSpaces * currLine.getSpaceWidth();
 
 								x = fx / _Scale;
@@ -2496,9 +2495,8 @@ namespace NLGUI
 		else
 		{
 			// get the x position
-			ucstring subStr = _Text.substr(0, index);
 			// compute the size
-			UTextContext::CStringInfo si = TextContext->getStringInfo(subStr);
+			UTextContext::CStringInfo si = TextContext->getStringInfo(_Text, index);
 			y = 0;
 			x = (sint) ceilf(si.StringWidth / _Scale);
 		}
@@ -2511,12 +2509,13 @@ namespace NLGUI
 		float px = 0.f;
 
 		UTextContext::CStringInfo si;
-		ucstring singleChar(" ");
-		uint i;
-		for (i = 0; i < textValue.length(); ++i)
+		u32string singleChar(1, ' ');
+		uint i = 0;
+		NLMISC::CUtfStringView sv(textValue);
+		for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it, ++i)
 		{
 			// get character width
-			singleChar[0] = textValue[i];
+			singleChar[0] = *it;
 			si = textContext.getStringInfo(singleChar);
 			px += si.StringWidth;
 			 // the character is at the i - 1 position
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 38a10d7e4..5aad200ae 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1686,7 +1686,7 @@ public:
 		ucstring sSurName = ucstring("NotSet");
 		CGroupEditBox *pGEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(sEditBoxPath));
 		if (pGEB != NULL)
-			sFirstName = pGEB->getInputString();
+			sFirstName = pGEB->getInputStringAsUtf16();
 		else
 			nlwarning ("can't get edit box name : %s",sEditBoxPath.c_str());
 
@@ -2562,7 +2562,7 @@ static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName
 			viewText->setText(text);
 		CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 		if(editBox)
-			editBox->setInputString(text);
+			editBox->setInputStringAsUtf16(text);
 
 	}
 }
@@ -2826,7 +2826,7 @@ class CAHScenarioControl : public IActionHandler
 					{
 						CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 						if(editBox)
-							editBox->setInputString(description);
+							editBox->setInputStringAsUtf16(description);
 					}
 				}
 			}
@@ -2977,7 +2977,7 @@ class CAHLoadScenario : public IActionHandler
 		{
 			CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 			if(editBox)
-				description = editBox->getInputString().toString();
+				description = editBox->getInputStringAsUtf8();
 		}
 
 		// races
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index 00a07dd39..81837bf4a 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -27,6 +27,7 @@ using namespace NLMISC;
 
 #include "nel/gui/action_handler.h"
 #include "nel/gui/group_editbox.h"
+#include "nel/misc/utf_string_view.h"
 #include "interface_manager.h"
 #include "../client_chat_manager.h"
 #include "people_interraction.h"
@@ -56,7 +57,7 @@ extern CClientChatManager		ChatMngr;
 // ***************************************************************************
 
 // used for character classifiction (when the user press Ctrl-arrow)
-static inline uint getCharacterCategory(ucchar c)
+static inline uint getCharacterCategory(u32char c)
 {
 	if (c == ' ') return 0;
 	if (c > 127 || isalpha((char) c)) return 1; // alpha & other characters
@@ -69,7 +70,7 @@ static inline uint getCharacterCategory(ucchar c)
 /** skip a block of character in a string, (same behaviour than when Ctrl-arrow is pressed)
   * It returns the new index
   */
-static uint skipUCCharsRight(uint startPos, const ucstring &str)
+static uint skipUCCharsRight(uint startPos, const u32string &str)
 {
 	uint pos = startPos;
 	uint endIndex = (uint)str.length();
@@ -86,7 +87,7 @@ static uint skipUCCharsRight(uint startPos, const ucstring &str)
 /** skip a block of character in a string, (same behaviour than when Ctrl-arrow is pressed)
   * It returns the new index
   */
-static uint skipUCCharsLeft(uint startPos, const ucstring &str)
+static uint skipUCCharsLeft(uint startPos, const u32string &str)
 {
 	uint pos = startPos;
 	-- pos;
@@ -362,7 +363,7 @@ class CAHEditPreviousLine : public CAHEdit
 		if (_GroupEdit->getMaxHistoric() && (! _GroupEdit->getViewText()->getMultiLine()))
 		{
 			// Get the start of the string.
-			ucstring	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
+			u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
 
 			// Search all historic string that match startStr.
 			for(sint i=_GroupEdit->getCurrentHistoricIndex()+1;i<(sint)_GroupEdit->getNumHistoric();i++)
@@ -434,7 +435,7 @@ class CAHEditNextLine : public CAHEdit
 		if( (! _GroupEdit->getViewText()->getMultiLine()) && _GroupEdit->getMaxHistoric() && _GroupEdit->getCurrentHistoricIndex()>0)
 		{
 			// Get the start of the string.
-			ucstring	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
+			u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
 
 			// Search all historic string that match startStr.
 			for(sint i=_GroupEdit->getCurrentHistoricIndex()-1;i>=0;i--)
@@ -520,8 +521,8 @@ protected:
 		// else cut forwards
 		else if(_GroupEdit->getCursorPos() < (sint32) _GroupEdit->getInputStringRef().length())
 		{
-			ucstring inputString = _GroupEdit->getInputStringRef();
-			ucstring::iterator it = inputString.begin() + _GroupEdit->getCursorPos();
+			u32string inputString = _GroupEdit->getInputStringRef();
+			u32string::iterator it = inputString.begin() + _GroupEdit->getCursorPos();
 			inputString.erase(it);
 			_GroupEdit->setInputStringRef (inputString);
 			if (!_GroupEdit->getAHOnChange().empty())
@@ -638,7 +639,7 @@ class CAHEditExpandOrCycleTell : public CAHEdit
 	void actionPart ()
 	{
 		// If the line starts with '/tell ', do not try to expand
-		static const ucstring TELL_STR("/tell ");
+		static const u32string TELL_STR(CUtfStringView("/tell ").toUtf32());
 		if (_GroupEdit->getInputString().substr(0, TELL_STR.length()) != TELL_STR)
 		{
 			if (_GroupEdit->expand()) return;
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 3d0981306..998bfcd77 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -129,7 +129,7 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 				{
 					if ( pIS->Family == ITEMFAMILY::SCROLL)
 					{
-						editBoxLarge->setInputString(itemInfo.CustomText);
+						editBoxLarge->setInputStringAsUtf16(itemInfo.CustomText);
 						editLarge->setActive(true);
 						editBoxLarge->setActive(true);
 
@@ -147,7 +147,7 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 							strFindReplace(customText, "%mfc", ucstring());
 						}
 
-						editBoxShort->setInputString(customText);
+						editBoxShort->setInputStringAsUtf16(customText);
 						editShort->setActive(true);
 						editBoxShort->setActive(true);
 
@@ -239,8 +239,8 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					closeButton->setActive(false);
 					group->setActive(true);
 
-					editBoxShort->setInputString(ucstring());
-					editBoxLarge->setInputString(ucstring());
+					editBoxShort->setInputString(u32string());
+					editBoxLarge->setInputString(u32string());
 					display->setTextFormatTaged(ucstring());
 
 
@@ -250,7 +250,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 						// If we already have item info
 						if ( pIS->Family == ITEMFAMILY::SCROLL)
 						{
-							editBoxLarge->setInputString(itemInfo.CustomText);
+							editBoxLarge->setInputStringAsUtf16(itemInfo.CustomText);
 							editLarge->setActive(true);
 							editBoxLarge->setActive(true);
 
@@ -269,7 +269,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 								strFindReplace(customText, "%mfc", ucstring());
 							}
 
-							editBoxShort->setInputString(customText);
+							editBoxShort->setInputStringAsUtf16(customText);
 							editShort->setActive(true);
 							editBoxShort->setActive(true);
 
@@ -297,8 +297,8 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					closeButton->setActive(true);
 					group->setActive(false);
 
-					editBoxShort->setInputString(ucstring());
-					editBoxLarge->setInputString(ucstring());
+					editBoxShort->setInputString(u32string());
+					editBoxLarge->setInputString(u32string());
 					display->setTextFormatTaged(ucstring());
 
 					// Finish the display or add the waiter
@@ -406,11 +406,11 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
 		if (group && editShort && editBoxShort && editLarge && editBoxLarge && display && editButtons && closeButton && background)
 		{
 			bool textValid = editShort->getActive();
-			ucstring text = editBoxShort->getInputString();
+			ucstring text = editBoxShort->getInputStringAsUtf16();
 			if (!textValid)
 			{
 				textValid = editLarge->getActive();
-				text = editBoxLarge->getInputString();
+				text = editBoxLarge->getInputStringAsUtf16();
 			}
 			 
 			if (textValid)
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 40efedac0..d039444f9 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -718,7 +718,7 @@ void		CActionPhraseFaber::startMpSelection(uint itemReqLine, uint mpSlot)
 			if (eb)
 			{
 				CWidgetManager::getInstance()->setCaptureKeyboard(eb);
-				eb->setInputString(toString(maxQuantity));
+				eb->setInputStringAsUtf8(toString(maxQuantity));
 				eb->setSelectionAll();
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
index b7ec631b9..105d4a180 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
@@ -70,10 +70,10 @@ class CHandlerGuildCreate : public IActionHandler
 
 		CGroupEditBox *pDesc = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(guildDescWin));
 
-		ucstring guildName = pGEB->getInputString();
+		ucstring guildName = pGEB->getInputStringAsUtf16();
 
 		ucstring guildDesc;
-		if (pDesc != NULL) guildDesc = pDesc->getInputString();
+		if (pDesc != NULL) guildDesc = pDesc->getInputStringAsUtf16();
 
 		uint64 icon = CGuildManager::iconMake((uint8)pCS->getGuildBack(), (uint8)pCS->getGuildSymbol(),
 								pCS->getInvertGuildSymbol(), pCS->getGuildColor1(), pCS->getGuildColor2());
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 4a59163b3..64f19214f 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -333,7 +333,7 @@ uint32 CBotChatPageTrade::getCurrItemQuantity() const
 			CGroupEditBox *ed = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:standard_price:quantity:edit:eb"));
 			if (!ed) return std::numeric_limits<uint32>::max();
 			uint32 intQuantity;
-			if (fromString(ed->getInputString().toString(), intQuantity))
+			if (fromString(ed->getInputStringAsUtf8(), intQuantity))
 			{
 				return intQuantity;
 			}
@@ -1465,7 +1465,7 @@ void	CBotChatPageTrade::setupPriceGroupQuantity(CInterfaceGroup *priceGroup, sin
 			CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(quantityGroup->getGroup("edit:eb"));
 			if (eb)
 			{
-				eb->setInputString(toString(defaultQuantity));
+				eb->setInputStringAsUtf8(toString(defaultQuantity));
 			}
 		}
 	}
@@ -1569,7 +1569,7 @@ void	CBotChatPageTrade::setupResellGroup(bool sellMode, uint defaultQuantity, CI
 			{
 				sint32	resaleMargin= NLGUI::CDBManager::getInstance()->getDbProp( "UI:SAVE:TRADE_ITEM:RESALE_MARGIN" )->getValue32();
 				clamp(resaleMargin, 0, (sint32)MaxResaleMargin);
-				eb->setInputString( toString( resaleMargin ) );
+				eb->setInputStringAsUtf8( toString( resaleMargin ) );
 				eb->setPositiveIntegerMaxValue(MaxResaleMargin);
 			}
 		}
@@ -1725,8 +1725,8 @@ void	CBotChatPageTrade::startChangeBuyFilterDialog(const std::string &dbext, con
 	sint	rangeMax= 0;
 	if(dbRangeMin)	rangeMin= dbRangeMin->getValue32();
 	if(dbRangeMax)	rangeMax= dbRangeMax->getValue32();
-	if(edMin)	edMin->setInputString(toString(rangeMin));
-	if(edMax)	edMax->setInputString(toString(rangeMax));
+	if(edMin)	edMin->setInputStringAsUtf8(toString(rangeMin));
+	if(edMax)	edMax->setInputStringAsUtf8(toString(rangeMax));
 	if(edMin)	edMin->setPositiveIntegerMaxValue(maxValue);
 	if(edMax)	edMax->setPositiveIntegerMaxValue(maxValue);
 
@@ -1754,8 +1754,8 @@ void	CBotChatPageTrade::resetBuyFilterDialog()
 	sint	rangeMin= 0;
 	sint	rangeMax= _FilterBuyDlgMaxValue;
 	// write result in EditBox, and in db
-	if(edMin)	edMin->setInputString(toString(rangeMin));
-	if(edMax)	edMax->setInputString(toString(rangeMax));
+	if(edMin)	edMin->setInputStringAsUtf8(toString(rangeMin));
+	if(edMax)	edMax->setInputStringAsUtf8(toString(rangeMax));
 	if(dbRangeMin)	dbRangeMin->setValue32(rangeMin);
 	if(dbRangeMax)	dbRangeMax->setValue32(rangeMax);
 
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 1537e7b8b..bfac81212 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -363,7 +363,7 @@ void CChatWindow::setCommand(const ucstring &command,bool execute)
 void CChatWindow::setEntry(const ucstring &entry)
 {
 	if (!_EB) return;
-	_EB->setInputString(entry);
+	_EB->setInputStringAsUtf16(entry);
 }
 
 //=================================================================================
@@ -1273,7 +1273,7 @@ public:
 	{
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(pCaller);
 		if (pEB == NULL) return;
-		ucstring text = pEB->getInputString();
+		ucstring text = pEB->getInputStringAsUtf16();
 		// If the line is empty, do nothing
 		if(text.empty())
 			return;
@@ -1289,7 +1289,7 @@ public:
 		// Parse any tokens in the text
 		if ( ! CInterfaceManager::parseTokens(text))
 		{
-			pEB->setInputString (string(""));
+			pEB->setInputString (u32string());
 			return;
 		}
 
@@ -1329,7 +1329,7 @@ public:
 			}
 		}
 		// Clear input string
-		pEB->setInputString (ucstring(""));
+		pEB->setInputString (u32string());
 		CGroupContainer *gc = static_cast< CGroupContainer* >( pEB->getEnclosingContainer() );
 
 		if (gc)
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index 3cd8e759c..8ffa62530 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -279,7 +279,7 @@ void			CDBGroupBuildPhrase::clearBuildingPhrase()
 	// Empty the name
 	if(_UserSentenceName)
 	{
-		_UserSentenceName->setInputString(ucstring());
+		_UserSentenceName->setInputString(u32string());
 	}
 
 	// update Display
@@ -373,7 +373,7 @@ void			CDBGroupBuildPhrase::startComposition(const CSPhraseCom &phrase)
 
 	// set the editable name.
 	if(_UserSentenceName)
-		_UserSentenceName->setInputString(name);
+		_UserSentenceName->setInputStringAsUtf16(name);
 }
 
 
@@ -1790,7 +1790,7 @@ void			CDBGroupBuildPhrase::buildCurrentPhrase(CSPhraseCom &newPhrase)
 	// Set the Name
 	if(_UserSentenceName)
 	{
-		newPhrase.Name= _UserSentenceName->getInputString();
+		newPhrase.Name= _UserSentenceName->getInputStringAsUtf16();
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 17e75486a..b696ae40d 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -141,12 +141,12 @@ static void popupLandMarkNameDialog()
 		const CUserLandMark userLM = map->getUserLandMark(LastSelectedLandMark);
 
 		NLGUI::CDBManager::getInstance()->getDbProp( "UI:TEMP:LANDMARKTYPE" )->setValue8(cb->getTextPos(userLM.Type));
-		eb->setInputString(userLM.Title);
+		eb->setInputStringAsUtf16(userLM.Title);
 	}
 	else
 	{
 		NLGUI::CDBManager::getInstance()->getDbProp( "UI:TEMP:LANDMARKTYPE" )->setValue8(cb->getTextPos(CUserLandMark::Misc));
-		eb->setInputString(ucstring());
+		eb->setInputStringAsUtf16(ucstring());
 	}
 
 	CWidgetManager::getInstance()->setCaptureKeyboard(eb);
@@ -3882,7 +3882,7 @@ class CAHLandMarkFilter : public IActionHandler
 			CGroupEditBox* eb = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(group));
 			if (!eb) return;
 
-			text = eb->getInputString().toUtf8();
+			text = eb->getInputStringAsUtf8();
 		}
 
 		map->setLandmarkFilter(text);
@@ -3988,7 +3988,7 @@ class CAHValidateUserLandMarkName : public IActionHandler
 			CGroupMap *map = dynamic_cast<CGroupMap *>(LastSelectedLandMark->getParent());
 			if (!map) return;
 			// update existing landmark
-			map->updateUserLandMark(LastSelectedLandMark, eb->getInputString(), landMarkType);
+			map->updateUserLandMark(LastSelectedLandMark, eb->getInputStringAsUtf16(), landMarkType);
 		}
 		else
 		{
@@ -3996,11 +3996,11 @@ class CAHValidateUserLandMarkName : public IActionHandler
 			if (!LastClickedMap) return;
 			if( UseUserPositionForLandMark )
 			{
-				LastClickedMap->addUserLandMark(LastClickedMap->getPlayerPos(), eb->getInputString(), landMarkType);
+				LastClickedMap->addUserLandMark(LastClickedMap->getPlayerPos(), eb->getInputStringAsUtf16(), landMarkType);
 			}
 			else
 			{
-				LastClickedMap->addUserLandMark(LastClickedMap->getRightClickLastPos(), eb->getInputString(), landMarkType);
+				LastClickedMap->addUserLandMark(LastClickedMap->getRightClickLastPos(), eb->getInputStringAsUtf16(), landMarkType);
 			}
 			LastClickedMap->invalidateCoords();
 		}
diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
index f84e38234..5324c6e69 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -2755,7 +2755,7 @@ class CHandlerInvSearchButton : public IActionHandler
 		{
 			CWidgetManager::getInstance()->setCaptureKeyboard(eb);
 			eb->setSelectionAll();
-			filter = eb->getInputString();
+			filter = eb->getInputStringAsUtf16();
 		}
 
 		CDBGroupListSheetBag *pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(btn->getParent()->getId() + ":bag_list"));
@@ -2805,10 +2805,10 @@ class CHandlerInvSetSearch : public IActionHandler
 		std::string id = pCaller->getParent()->getParent()->getId();
 
 		CDBGroupListSheetBag *pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(id + ":bag_list"));
-		if (pList != NULL) pList->setSearchFilter(eb->getInputString());
+		if (pList != NULL) pList->setSearchFilter(eb->getInputStringAsUtf16());
 
 		CDBGroupIconListBag *pIcons = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(id + ":bag_icons"));
-		if (pIcons != NULL) pIcons->setSearchFilter(eb->getInputString());
+		if (pIcons != NULL) pIcons->setSearchFilter(eb->getInputStringAsUtf16());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerInvSetSearch, "inv_set_search" );
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 7f4c26c08..241862ff1 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -1148,7 +1148,7 @@ void CModalContainerEditCmd::onChangeAction()
 			CGroupEditBox *pEB= dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId( sWin ));
 			if( pEB )
 			{
-				pEB->setInputString(ucstring(""));
+				pEB->setInputString(u32string());
 			}
 			NLGUI::CDBManager::getInstance()->getDbProp( sDB )->setValue32(1);
 		}
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 6aa831eac..39b2aedde 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -886,7 +886,7 @@ public:
 		if (pCS != NULL) pCS->readFromMacro(pMCM->CurrentEditMacro);
 		// Name
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(GROUP_NEWMACRO_EDIT_NAME));
-		if (pEB != NULL) pEB->setInputString(pMCM->CurrentEditMacro.Name);
+		if (pEB != NULL) pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.Name);
 		// Commands
 		CGroupList *pList = dynamic_cast<CGroupList*>(CWidgetManager::getInstance()->getElementFromId(GROUP_NEWMACRO_COMMANDS));
 		if (pList == NULL) return;
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 96f27bb6c..21cfb63cf 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2199,7 +2199,7 @@ public:
 						if (gc)
 						{
 							CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(gc->getGroup("add_contact_eb:eb"));
-							geb->setInputString(ucstring(""));
+							geb->setInputString(u32string());
 						}
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, sParams);
 					}
@@ -2250,18 +2250,18 @@ public:
 						if (peopleList)
 						{
 							// don't add if it is the player name
-							if (!ClientCfg.Local && (UserEntity->getEntityName() == geb->getInputString()))
+							if (!ClientCfg.Local && (UserEntity->getEntityName() == geb->getInputStringAsUtf16()))
 							{
 								displayVisibleSystemMsg(CI18N::get("uiCantAddYourSelfInContactList"));
 							}
 							else
 							{
-								PeopleInterraction.askAddContact(geb->getInputString(), peopleList);
-								geb->setInputString(ucstring(""));
+								PeopleInterraction.askAddContact(geb->getInputStringAsUtf16(), peopleList);
+								geb->setInputString(u32string());
 							}
 						}
 					}
-					geb->setInputString(ucstring(""));
+					geb->setInputString(u32string());
 				}
 			}
 		}
@@ -2389,7 +2389,7 @@ public:
 		if (eb)
 		{
 			CWidgetManager::getInstance()->setCaptureKeyboard(eb);
-			eb->setInputString(ucstring(""));
+			eb->setInputString(u32string());
 		}
 		//
 		if (gc->getActive())
@@ -2416,7 +2416,7 @@ class CHandlerValidatePartyChatName : public IActionHandler
 		if (!gc) return;
 		CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(gc->getGroup("eb"));
 		if (!eb) return;
-		ucstring title = eb->getInputString();
+		ucstring title = eb->getInputStringAsUtf16();
 
 		// TODO GAMEDEV : create (or join ?) a new channel. Each channel (party chat) should have a unique name in the game
 		// moreover, it should not have the name of another available chat window (for example, it shouldn't be named 'Around Me')
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 6be310d94..43ee1543c 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -876,7 +876,7 @@ class CHandlerContactEntry : public IActionHandler
 	{
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(pCaller);
 		if (pEB == NULL) return;
-		ucstring text = pEB->getInputString();
+		ucstring text = pEB->getInputStringAsUtf16();
 		// If the line is empty, do nothing
 		if(text.empty())
 			return;
@@ -884,7 +884,7 @@ class CHandlerContactEntry : public IActionHandler
 		// Parse any tokens in the text
 		if ( ! CInterfaceManager::parseTokens(text))
 		{
-			pEB->setInputString (string(""));
+			pEB->setInputString (u32string());
 			return;
 		}
 
@@ -895,7 +895,7 @@ class CHandlerContactEntry : public IActionHandler
 			// TODO : have NLMISC::ICommand accept unicode strings
 			std::string str = text.toUtf8().substr(1);
 			NLMISC::ICommand::execute( str, g_log );
-			pEB->setInputString (string(""));
+			pEB->setInputString (u32string());
 			return;
 		}
 		// Well, we could have used CChatWindow class to handle this, but CPeopleList was written earlier, so for now
@@ -908,7 +908,7 @@ class CHandlerContactEntry : public IActionHandler
 
 		// Simply do a tell on the player
 		ChatMngr.tell(playerName.toString(), text);
-		pEB->setInputString (string(""));
+		pEB->setInputString (u32string());
 		if (gc)
 		{
 			// Restore position of enclosing container if it hasn't been moved/scaled/poped by the user
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index 96922d399..6f3617286 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -808,7 +808,7 @@ void initLoginScreen()
 		CGroupEditBox *pGEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_LOGIN));
 		if (pGEB != NULL && (pGEB->getInputString().empty()))
 		{
-			pGEB->setInputString(l);
+			pGEB->setInputStringAsUtf8(l);
 		}
 		CAHManager::getInstance()->runActionHandler("set_keyboard_focus", NULL, "target=" CTRL_EDITBOX_PASSWORD "|select_all=false");
 	}
@@ -830,8 +830,8 @@ void initAutoLogin()
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CGroupEditBox *pGEBLog = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_LOGIN));
 	CGroupEditBox *pGEBPwd = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_PASSWORD));
-	pGEBLog->setInputString(LoginLogin);
-	pGEBPwd->setInputString(LoginPassword);
+	pGEBLog->setInputStringAsUtf8(LoginLogin);
+	pGEBPwd->setInputStringAsUtf8(LoginPassword);
 	CAHManager::getInstance()->runActionHandler("on_login", NULL, "");
 
 	if (ClientCfg.R2Mode)
@@ -1379,8 +1379,8 @@ class CAHOnLogin : public IActionHandler
 			return;
 		}
 
-		LoginLogin = pGEBLog->getInputString().toString(); // FIXME: Unicode login
-		LoginPassword = pGEBPwd->getInputString().toString();
+		LoginLogin = pGEBLog->getInputStringAsUtf8();
+		LoginPassword = pGEBPwd->getInputStringAsUtf8();
 
 		onlogin();
 	}
@@ -2394,7 +2394,7 @@ bool initCreateAccount()
 		{
 			CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId(editBoxes[i] + ":eb"));
 			if(eb)
-				eb->setInputString(ucstring(""));
+				eb->setInputString(u32string());
 		}
 
 		// conditions button
@@ -2581,7 +2581,7 @@ class CAHOnCreateAccountSubmit : public IActionHandler
 			{
 				CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId(editBoxes[i] + ":eb"));
 				if(eb)
-					results[i] = eb->getInputString().toUtf8();
+					results[i] = eb->getInputStringAsUtf8();
 			}
 
 			// text
@@ -2735,11 +2735,11 @@ class CAHCreateAccountLogin : public IActionHandler
 		{
 			CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId("eb_login:eb"));
 			if(eb)
-				LoginLogin = eb->getInputString().toUtf8();
+				LoginLogin = eb->getInputStringAsUtf8();
 
 			eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId("eb_password:eb"));
 			if(eb)
-				LoginPassword = eb->getInputString().toUtf8();
+				LoginPassword = eb->getInputStringAsUtf8();
 
 			onlogin(false);
 		}
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 036e77b21..e9702af28 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -7484,7 +7484,7 @@ class CAHInviteCharacter : public IActionHandler
 				CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(fatherGC->getGroup("add_contact_eb:eb"));
 				if (geb && !geb->getInputString().empty())
 				{
-					string charName = geb->getInputString().toString();
+					string charName = geb->getInputStringAsUtf8();
 					CSessionBrowserImpl & sessionBrowser = CSessionBrowserImpl::getInstance();
 					sessionBrowser.inviteCharacterByName(sessionBrowser.getCharId(), charName);
 
@@ -7506,7 +7506,7 @@ class CAHInviteCharacter : public IActionHandler
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_newcomer");
 					}
 
-					geb->setInputString(ucstring(""));
+					geb->setInputString(u32string());
 				}
 			}
 		}

From 1d696b8921a0a6f9ba692e61f1cf1a6b2d41e4d7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 04:34:18 +0800
Subject: [PATCH 052/292] Revert special handling for wchar

---
 nel/include/nel/misc/stream.h   | 7 -------
 nel/include/nel/misc/types_nl.h | 4 ----
 nel/include/nel/misc/ucstring.h | 4 ----
 nel/src/misc/system_utils.cpp   | 4 ++--
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h
index 35b6c3f26..89db78a1c 100644
--- a/nel/include/nel/misc/stream.h
+++ b/nel/include/nel/misc/stream.h
@@ -300,13 +300,6 @@ public:
 	virtual void	serial(bool &b) ;
 #ifndef NL_OS_CYGWIN
 	virtual void	serial(char &b) ;
-#endif
-#ifdef NL_OS_WINDOWS
-	inline void     serial(wchar_t &b)
-	{ 
-		nlctassert(sizeof(wchar_t) == sizeof(uint16)); 
-		serial(reinterpret_cast<uint16 &>(b));
-	}
 #endif
 	virtual void	serial(std::string &b) ;
 	virtual void	serial(ucstring &b) ;
diff --git a/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h
index b8fe8270a..bac48c3d6 100644
--- a/nel/include/nel/misc/types_nl.h
+++ b/nel/include/nel/misc/types_nl.h
@@ -546,11 +546,7 @@ template<> struct hash<uint64>
  * \typedef ucchar
  * An Unicode character (16 bits)
  */
-#if defined(NL_OS_WINDOWS)
-typedef	wchar_t ucchar;
-#else
 typedef	uint16	ucchar;
-#endif
 
 #ifdef NL_CPP14
 typedef char32_t u32char;
diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 28c83ce2f..5b7597f00 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -30,11 +30,7 @@
  * An unicode string class (16 bits per character).
  * Add features to convert and assign \c ucstring to \c string and \c string to \c ucstring.
  */
-#if defined(NL_OS_WINDOWS)
-typedef std::wstring ucstringbase;
-#else
 typedef std::basic_string<ucchar> ucstringbase;
-#endif
 
 class ucstring : public ucstringbase
 {
diff --git a/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
index 42fe63fca..63eecbf0d 100644
--- a/nel/src/misc/system_utils.cpp
+++ b/nel/src/misc/system_utils.cpp
@@ -168,7 +168,7 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 
 		// allocates a buffer to copy text in global memory
 		std::string textLocal;
-		if (!isUnicode) textLocal = NLMISC::wideToMbcs(text);
+		if (!isUnicode) textLocal = NLMISC::wideToMbcs((const wchar_t *)text.c_str(), text.size());
 		if (text.size() && !textLocal.size()) textLocal = text.toString();
 		HGLOBAL mem = GlobalAlloc(GHND | GMEM_DDESHARE, isUnicode ? ((text.size() + 1) * sizeof(wchar_t)) : textLocal.size());
 
@@ -232,7 +232,7 @@ bool CSystemUtils::pasteTextFromClipboard(ucstring &text)
 				}
 				else 
 				{
-					static_cast<std::wstring &>(text) = NLMISC::mbcsToWide((const char *)hLock);
+					reinterpret_cast<std::wstring &>(text) = NLMISC::mbcsToWide((const char *)hLock);
 					if (!text.size() && ((const char *)hLock)[0])
 						text = (const char *)hLock;
 				}

From 55d83c9486e38d70af0be93600e095bf16197859 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 05:03:51 +0800
Subject: [PATCH 053/292] Fix comment

---
 nel/include/nel/misc/utf_string_view.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index a23c2abca..eac06e0a1 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -26,7 +26,7 @@ namespace NLMISC {
 /// String view for UTF-8 and UTF-32 iteration as 32-bit codepoints.
 /// This string view keeps the string as a reference, it does not make a copy.
 /// Only use this for iterating a string's codepoints.
-/// Strings are not required to be NUL-terminated, but must have at least one character extra.
+/// String must be NUL terminated, but its size may specify a substring.
 class CUtfStringView
 {
 public:

From 993c37f56d579adab13a49bfb4b8828a570245e0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 08:24:48 +0800
Subject: [PATCH 054/292] Prefer UTF-8, cleanup, ryzom/ryzomcore#335

---
 nel/include/nel/gui/group_editbox.h           | 10 ++--
 nel/src/gui/CMakeLists.txt                    |  3 +-
 nel/src/gui/group_editbox.cpp                 | 52 +++++++++----------
 nel/src/gui/group_html.cpp                    |  2 +-
 ryzom/client/src/connection.cpp               |  2 +-
 .../src/interface_v3/action_handler_edit.cpp  |  3 +-
 .../src/interface_v3/action_handler_item.cpp  |  8 +--
 .../src/interface_v3/action_phrase_faber.cpp  |  2 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  | 14 ++---
 ryzom/client/src/interface_v3/chat_window.cpp |  4 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |  2 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  2 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  6 +--
 .../src/interface_v3/macrocmd_manager.cpp     | 12 ++---
 .../src/interface_v3/people_interraction.cpp  |  8 +--
 ryzom/client/src/interface_v3/people_list.cpp |  6 +--
 ryzom/client/src/login.cpp                    | 18 +++----
 ryzom/client/src/r2/editor.cpp                |  4 +-
 18 files changed, 77 insertions(+), 81 deletions(-)

diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 62b78584c..355c01d3c 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -63,7 +63,7 @@ namespace NLGUI
 		virtual bool handleEvent (const NLGUI::CEventDescriptor& eventDesc);
 
 		/// Accessors
-		u32string getInputString() const { return _InputString; }
+		std::string getInputString() const;
 		const u32string &getInputStringRef() const { return _InputString; }
 		const ucstring &getPrompt() const { return _Prompt; }
 
@@ -71,7 +71,7 @@ namespace NLGUI
 		  * NB : line returns are encoded as '\n', not '\r\n'
 		  */
 		void		setPrompt(const ucstring &s) { _Prompt = s; }
-		void		setInputString(const u32string &str);
+		void		setInputString(const std::string &str);
 		void		setInputStringRef(const u32string &str) {_InputString = str; };
 		void		setInputStringAsInt(sint32 val);
 		sint32		getInputStringAsInt() const;
@@ -79,10 +79,10 @@ namespace NLGUI
 		sint64		getInputStringAsInt64() const;
 		void		setInputStringAsFloat(float val);
 		float		getInputStringAsFloat() const;
-		void		setInputStringAsUtf8(const std::string &str);
-		std::string	getInputStringAsUtf8() const;
 		void		setInputStringAsUtf16(const ucstring &str);
 		ucstring    getInputStringAsUtf16() const;
+		void		setInputStringAsUtf32(const u32string &str);
+		u32string   getInputStringAsUtf32() const { return _InputString; }
 		void		setColor(NLMISC::CRGBA col);
 
 
@@ -189,7 +189,7 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setSelectionAll", luaSetSelectionAll);
 			REFLECT_LUA_METHOD("setFocusOnText", luaSetFocusOnText);
 			REFLECT_LUA_METHOD("cancelFocusOnText", luaCancelFocusOnText);
-			REFLECT_STRING("input_string", getInputStringAsUtf8, setInputStringAsUtf8);
+			REFLECT_STRING("input_string", getInputString, setInputString);
 			REFLECT_UCSTRING("uc_input_string", getInputStringAsUtf16, setInputStringAsUtf16);
 		REFLECT_EXPORT_END
 
diff --git a/nel/src/gui/CMakeLists.txt b/nel/src/gui/CMakeLists.txt
index bb5a0b7f2..4dd53e857 100644
--- a/nel/src/gui/CMakeLists.txt
+++ b/nel/src/gui/CMakeLists.txt
@@ -1,8 +1,7 @@
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../../include/nel/gui/*.h)
 
-SOURCE_GROUP("include" FILES ${HEADERS})
-SOURCE_GROUP("src" FILES ${SRC})
+SOURCE_GROUP("" FILES ${HEADERS} ${SRC})
 
 NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index b9dc44895..037ae4656 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -1015,7 +1015,7 @@ namespace NLGUI
 				_CursorAtPreviousLineEnd = false;
 				if (_ClearOnEscape)
 				{
-					setInputString(u32string());
+					setInputStringAsUtf32(u32string());
 					triggerOnChangeAH();
 				}
 				CWidgetManager::getInstance()->setCaptureKeyboard(NULL);
@@ -1179,7 +1179,7 @@ namespace NLGUI
 		if (CWidgetManager::getInstance()->getCaptureKeyboard() != this) return false;
 		if (!_CanUndo) return false;
 		_ModifiedInputString = _InputString;
-		setInputString(_StartInputString);
+		setInputStringAsUtf32(_StartInputString);
 		_CanUndo = false;
 		_CanRedo = true;
 		setCursorPos((sint32)_InputString.length());
@@ -1192,7 +1192,7 @@ namespace NLGUI
 	{
 		if (CWidgetManager::getInstance()->getCaptureKeyboard() != this) return false;
 		if (!_CanRedo) return false;
-		setInputString(_ModifiedInputString);
+		setInputStringAsUtf32(_ModifiedInputString);
 		_CanUndo = true;
 		_CanRedo = false;
 		setCursorPos((sint32)_InputString.length());
@@ -1303,7 +1303,7 @@ namespace NLGUI
 				default: break;
 			}
 			// update the text
-			setInputString(_InputString);
+			setInputStringAsUtf32(_InputString);
 
 			// if event of type char or string, consider handle all of them
 			if( rEDK.getKeyEventType()==NLGUI::CEventDescriptorKey::keychar || rEDK.getKeyEventType()==NLGUI::CEventDescriptorKey::keystring )
@@ -1624,8 +1624,13 @@ namespace NLGUI
 	}
 
 
+
 	// ----------------------------------------------------------------------------
-	void CGroupEditBox::setInputString(const u32string &str)
+	void CGroupEditBox::setInputString(const std::string &str)
+	{
+		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
+	}
+	void CGroupEditBox::setInputStringAsUtf32(const u32string &str)
 	{
 		_InputString = str;
 		if (_CursorPos > (sint32) str.length())
@@ -1644,43 +1649,42 @@ namespace NLGUI
 	void	CGroupEditBox::setDefaultInputString(const ucstring &str)
 	{
 		_DefaultInputString= true;
-		setInputString(CUtfStringView(str).toUtf32());
+		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
 	}
 
-
 	// ***************************************************************************
 	sint32		CGroupEditBox::getInputStringAsInt() const
 	{
 		sint32 value;
-		fromString(getInputStringAsUtf8(), value);
+		fromString(getInputString(), value);
 		return value;
 	}
 
 	// ***************************************************************************
 	void		CGroupEditBox::setInputStringAsInt(sint32 val)
 	{
-		setInputStringAsUtf8(NLMISC::toString(val));
+		setInputString(NLMISC::toString(val));
 	}
 
 	// ***************************************************************************
 	sint64		CGroupEditBox::getInputStringAsInt64() const
 	{
 		sint64 value;
-		fromString(getInputStringAsUtf8(), value);
+		fromString(getInputString(), value);
 		return value;
 	}
 
 	// ***************************************************************************
 	void		CGroupEditBox::setInputStringAsInt64(sint64 val)
 	{
-		setInputStringAsUtf8(NLMISC::toString(val));
+		setInputString(NLMISC::toString(val));
 	}
 
 	// ***************************************************************************
 	float		CGroupEditBox::getInputStringAsFloat() const
 	{
 		float value;
-		fromString(getInputStringAsUtf8(), value);
+		fromString(getInputString(), value);
 		return value;
 	}
 
@@ -1688,7 +1692,7 @@ namespace NLGUI
 	void		CGroupEditBox::setInputStringAsFloat(float val)
 	{
 		string	fmt= "%." + NLMISC::toString(_MaxFloatPrec) + "f";
-		setInputStringAsUtf8(NLMISC::toString(fmt.c_str(), val));
+		setInputString(NLMISC::toString(fmt.c_str(), val));
 	}
 
 	// ***************************************************************************
@@ -1739,21 +1743,15 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void	CGroupEditBox::setInputStringAsUtf8(const std::string &str)
-	{
-		setInputString(CUtfStringView(str).toUtf32());
-	}
-
-	// ***************************************************************************
-	std::string	CGroupEditBox::getInputStringAsUtf8() const
+	std::string CGroupEditBox::getInputString() const
 	{
-		return CUtfStringView(_InputString).toUtf8();
+		return NLMISC::CUtfStringView(_InputString).toUtf8();
 	}
 
 	// ***************************************************************************
 	void	CGroupEditBox::setInputStringAsUtf16(const ucstring &str)
 	{
-		setInputString(CUtfStringView(str).toUtf32());
+		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
 	}
 
 	// ***************************************************************************
@@ -1770,7 +1768,7 @@ namespace NLGUI
 			return;
 
 		// set the string and maybe execute
-		setInputString(CUtfStringView((ucchar) '/' + command).toUtf32());
+		setInputStringAsUtf16((ucchar) '/' + command);
 		if (execute)
 		{
 			// stop selection
@@ -1853,7 +1851,7 @@ namespace NLGUI
 		f.serial(_PrevNumLine);
 		if (f.isReading())
 		{
-			setInputString(_InputString);
+			setInputStringAsUtf32(_InputString);
 
 		}
 		// serial selection
@@ -1870,7 +1868,7 @@ namespace NLGUI
 	void CGroupEditBox::onQuit()
 	{
 		// clear the text and restore backup pos before final save
-		setInputString(u32string());
+		setInputStringAsUtf32(u32string());
 		_CurrSelection = NULL;
 	}
 
@@ -1878,7 +1876,7 @@ namespace NLGUI
 	void CGroupEditBox::onLoadConfig()
 	{
 		// config is not saved when there's an empty string, so restore that default state.
-		setInputString(u32string());
+		setInputStringAsUtf32(u32string());
 		_CurrSelection = NULL;
 		_PrevNumLine = 1;
 	}
@@ -1893,7 +1891,7 @@ namespace NLGUI
 			if (_DefaultInputString)
 			{
 				_DefaultInputString= false;
-				setInputString(u32string());
+				setInputStringAsUtf32(u32string());
 			}
 			_CanRedo = false;
 			_CanUndo = false;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 7f80405ce..4fab8c4bb 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -3024,7 +3024,7 @@ namespace NLGUI
 				CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(textArea->getGroup("eb"));
 				if (eb)
 				{
-					eb->setInputString(CUtfStringView(decodeHTMLEntities(content)).toUtf32());
+					eb->setInputString(CUtfStringView(decodeHTMLEntities(content)).toUtf8());
 					if (style.hasStyle("background-color"))
 					{
 						CViewBitmap *bg = dynamic_cast<CViewBitmap*>(eb->getView("bg"));
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 5aad200ae..00c663e5e 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -2977,7 +2977,7 @@ class CAHLoadScenario : public IActionHandler
 		{
 			CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 			if(editBox)
-				description = editBox->getInputStringAsUtf8();
+				description = editBox->getInputString();
 		}
 
 		// races
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index 81837bf4a..055a77422 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -639,8 +639,7 @@ class CAHEditExpandOrCycleTell : public CAHEdit
 	void actionPart ()
 	{
 		// If the line starts with '/tell ', do not try to expand
-		static const u32string TELL_STR(CUtfStringView("/tell ").toUtf32());
-		if (_GroupEdit->getInputString().substr(0, TELL_STR.length()) != TELL_STR)
+		if (!NLMISC::startsWith(_GroupEdit->getInputString(), "/tell "))
 		{
 			if (_GroupEdit->expand()) return;
 		}
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 998bfcd77..655ea084f 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -239,8 +239,8 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					closeButton->setActive(false);
 					group->setActive(true);
 
-					editBoxShort->setInputString(u32string());
-					editBoxLarge->setInputString(u32string());
+					editBoxShort->setInputString(std::string());
+					editBoxLarge->setInputString(std::string());
 					display->setTextFormatTaged(ucstring());
 
 
@@ -297,8 +297,8 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					closeButton->setActive(true);
 					group->setActive(false);
 
-					editBoxShort->setInputString(u32string());
-					editBoxLarge->setInputString(u32string());
+					editBoxShort->setInputString(std::string());
+					editBoxLarge->setInputString(std::string());
 					display->setTextFormatTaged(ucstring());
 
 					// Finish the display or add the waiter
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index d039444f9..40efedac0 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -718,7 +718,7 @@ void		CActionPhraseFaber::startMpSelection(uint itemReqLine, uint mpSlot)
 			if (eb)
 			{
 				CWidgetManager::getInstance()->setCaptureKeyboard(eb);
-				eb->setInputStringAsUtf8(toString(maxQuantity));
+				eb->setInputString(toString(maxQuantity));
 				eb->setSelectionAll();
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 64f19214f..dc2c88789 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -333,7 +333,7 @@ uint32 CBotChatPageTrade::getCurrItemQuantity() const
 			CGroupEditBox *ed = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:standard_price:quantity:edit:eb"));
 			if (!ed) return std::numeric_limits<uint32>::max();
 			uint32 intQuantity;
-			if (fromString(ed->getInputStringAsUtf8(), intQuantity))
+			if (fromString(ed->getInputString(), intQuantity))
 			{
 				return intQuantity;
 			}
@@ -1465,7 +1465,7 @@ void	CBotChatPageTrade::setupPriceGroupQuantity(CInterfaceGroup *priceGroup, sin
 			CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(quantityGroup->getGroup("edit:eb"));
 			if (eb)
 			{
-				eb->setInputStringAsUtf8(toString(defaultQuantity));
+				eb->setInputString(toString(defaultQuantity));
 			}
 		}
 	}
@@ -1569,7 +1569,7 @@ void	CBotChatPageTrade::setupResellGroup(bool sellMode, uint defaultQuantity, CI
 			{
 				sint32	resaleMargin= NLGUI::CDBManager::getInstance()->getDbProp( "UI:SAVE:TRADE_ITEM:RESALE_MARGIN" )->getValue32();
 				clamp(resaleMargin, 0, (sint32)MaxResaleMargin);
-				eb->setInputStringAsUtf8( toString( resaleMargin ) );
+				eb->setInputString( toString( resaleMargin ) );
 				eb->setPositiveIntegerMaxValue(MaxResaleMargin);
 			}
 		}
@@ -1725,8 +1725,8 @@ void	CBotChatPageTrade::startChangeBuyFilterDialog(const std::string &dbext, con
 	sint	rangeMax= 0;
 	if(dbRangeMin)	rangeMin= dbRangeMin->getValue32();
 	if(dbRangeMax)	rangeMax= dbRangeMax->getValue32();
-	if(edMin)	edMin->setInputStringAsUtf8(toString(rangeMin));
-	if(edMax)	edMax->setInputStringAsUtf8(toString(rangeMax));
+	if(edMin)	edMin->setInputString(toString(rangeMin));
+	if(edMax)	edMax->setInputString(toString(rangeMax));
 	if(edMin)	edMin->setPositiveIntegerMaxValue(maxValue);
 	if(edMax)	edMax->setPositiveIntegerMaxValue(maxValue);
 
@@ -1754,8 +1754,8 @@ void	CBotChatPageTrade::resetBuyFilterDialog()
 	sint	rangeMin= 0;
 	sint	rangeMax= _FilterBuyDlgMaxValue;
 	// write result in EditBox, and in db
-	if(edMin)	edMin->setInputStringAsUtf8(toString(rangeMin));
-	if(edMax)	edMax->setInputStringAsUtf8(toString(rangeMax));
+	if(edMin)	edMin->setInputString(toString(rangeMin));
+	if(edMax)	edMax->setInputString(toString(rangeMax));
 	if(dbRangeMin)	dbRangeMin->setValue32(rangeMin);
 	if(dbRangeMax)	dbRangeMax->setValue32(rangeMax);
 
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index bfac81212..ed1a220ca 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -1289,7 +1289,7 @@ public:
 		// Parse any tokens in the text
 		if ( ! CInterfaceManager::parseTokens(text))
 		{
-			pEB->setInputString (u32string());
+			pEB->setInputString(std::string());
 			return;
 		}
 
@@ -1329,7 +1329,7 @@ public:
 			}
 		}
 		// Clear input string
-		pEB->setInputString (u32string());
+		pEB->setInputString (std::string());
 		CGroupContainer *gc = static_cast< CGroupContainer* >( pEB->getEnclosingContainer() );
 
 		if (gc)
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index 8ffa62530..561d48235 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -279,7 +279,7 @@ void			CDBGroupBuildPhrase::clearBuildingPhrase()
 	// Empty the name
 	if(_UserSentenceName)
 	{
-		_UserSentenceName->setInputString(u32string());
+		_UserSentenceName->setInputString(std::string());
 	}
 
 	// update Display
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index b696ae40d..41b6f021e 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -3882,7 +3882,7 @@ class CAHLandMarkFilter : public IActionHandler
 			CGroupEditBox* eb = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(group));
 			if (!eb) return;
 
-			text = eb->getInputStringAsUtf8();
+			text = eb->getInputString();
 		}
 
 		map->setLandmarkFilter(text);
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 241862ff1..f97e90723 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -679,7 +679,7 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 			else				sEditBox = WinName+WIN_EDITCMD_COMBO_SECOND_PARAM_EDITBOX;
 			CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(sEditBox));
 			// sTmp is utf8
-			pEB->setInputStringAsUtf8(sTmp);
+			pEB->setInputString(sTmp);
 		}
 
 		// Setup the param name if any
@@ -863,7 +863,7 @@ void CModalContainerEditCmd::validCurrentCommand()
 			CGroupEditBox *pEB= dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId( sWin ));
 			// convert to utf8
 			if (pEB != NULL)
-				CurrentEditCmdLine.ActionName.Argu += pEB->getInputStringAsUtf8();
+				CurrentEditCmdLine.ActionName.Argu += pEB->getInputString();
 			noParam++;
 		}
 	}
@@ -1148,7 +1148,7 @@ void CModalContainerEditCmd::onChangeAction()
 			CGroupEditBox *pEB= dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId( sWin ));
 			if( pEB )
 			{
-				pEB->setInputString(u32string());
+				pEB->setInputString(std::string());
 			}
 			NLGUI::CDBManager::getInstance()->getDbProp( sDB )->setValue32(1);
 		}
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 39b2aedde..bf2197e45 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -636,7 +636,7 @@ public:
 
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getElementFromId(Params));
 		if (pCS == NULL) return;
-		pCS->setMacroText(pEB->getInputStringAsUtf8());
+		pCS->setMacroText(pEB->getInputString());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerEBUpdateMacroText, "eb_update_macro_text");
@@ -703,10 +703,10 @@ public:
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_MACROICONCREATION_EDITTEXT));
 		if (pEB != NULL)
 		{
-			pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.DispText);
+			pEB->setInputString(pMCM->CurrentEditMacro.DispText);
 			CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getElementFromId(CTRL_MACROICONCREATION_ICON));
 			if (pCS != NULL)
-				pCS->setMacroText(pEB->getInputStringAsUtf8());
+				pCS->setMacroText(pEB->getInputString());
 		}
 
 		CAHManager::getInstance()->runActionHandler("set_macro_back", NULL, string("target=")+CTRL_MACROICONCREATION_ICON+"|value="+toString(back));
@@ -862,11 +862,11 @@ public:
 		if (pEB == NULL) return;
 
 		CMacroCmdManager *pMCM = CMacroCmdManager::getInstance();
-		pMCM->CurrentEditMacro.Name = pEB->getInputStringAsUtf8();
+		pMCM->CurrentEditMacro.Name = pEB->getInputString();
 		if ((pMCM->CurrentEditMacro.Name.size() >= 2) &&
 			(pMCM->CurrentEditMacro.Name[0] == 'u') && (pMCM->CurrentEditMacro.Name[1] == 'i'))
 			pMCM->CurrentEditMacro.Name[0] = 'U';
-		pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.Name);
+		pEB->setInputString(pMCM->CurrentEditMacro.Name);
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerNewMacroEnterName, "new_macro_enter_name");
@@ -886,7 +886,7 @@ public:
 		if (pCS != NULL) pCS->readFromMacro(pMCM->CurrentEditMacro);
 		// Name
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(GROUP_NEWMACRO_EDIT_NAME));
-		if (pEB != NULL) pEB->setInputStringAsUtf8(pMCM->CurrentEditMacro.Name);
+		if (pEB != NULL) pEB->setInputString(pMCM->CurrentEditMacro.Name);
 		// Commands
 		CGroupList *pList = dynamic_cast<CGroupList*>(CWidgetManager::getInstance()->getElementFromId(GROUP_NEWMACRO_COMMANDS));
 		if (pList == NULL) return;
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 21cfb63cf..7bde7d0fc 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2199,7 +2199,7 @@ public:
 						if (gc)
 						{
 							CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(gc->getGroup("add_contact_eb:eb"));
-							geb->setInputString(u32string());
+							geb->setInputString(std::string());
 						}
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, sParams);
 					}
@@ -2257,11 +2257,11 @@ public:
 							else
 							{
 								PeopleInterraction.askAddContact(geb->getInputStringAsUtf16(), peopleList);
-								geb->setInputString(u32string());
+								geb->setInputString(std::string());
 							}
 						}
 					}
-					geb->setInputString(u32string());
+					geb->setInputString(std::string());
 				}
 			}
 		}
@@ -2389,7 +2389,7 @@ public:
 		if (eb)
 		{
 			CWidgetManager::getInstance()->setCaptureKeyboard(eb);
-			eb->setInputString(u32string());
+			eb->setInputString(std::string());
 		}
 		//
 		if (gc->getActive())
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 43ee1543c..1b4c7ea5e 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -884,7 +884,7 @@ class CHandlerContactEntry : public IActionHandler
 		// Parse any tokens in the text
 		if ( ! CInterfaceManager::parseTokens(text))
 		{
-			pEB->setInputString (u32string());
+			pEB->setInputString (std::string());
 			return;
 		}
 
@@ -895,7 +895,7 @@ class CHandlerContactEntry : public IActionHandler
 			// TODO : have NLMISC::ICommand accept unicode strings
 			std::string str = text.toUtf8().substr(1);
 			NLMISC::ICommand::execute( str, g_log );
-			pEB->setInputString (u32string());
+			pEB->setInputString (std::string());
 			return;
 		}
 		// Well, we could have used CChatWindow class to handle this, but CPeopleList was written earlier, so for now
@@ -908,7 +908,7 @@ class CHandlerContactEntry : public IActionHandler
 
 		// Simply do a tell on the player
 		ChatMngr.tell(playerName.toString(), text);
-		pEB->setInputString (u32string());
+		pEB->setInputString (std::string());
 		if (gc)
 		{
 			// Restore position of enclosing container if it hasn't been moved/scaled/poped by the user
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index 6f3617286..b134a5519 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -808,7 +808,7 @@ void initLoginScreen()
 		CGroupEditBox *pGEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_LOGIN));
 		if (pGEB != NULL && (pGEB->getInputString().empty()))
 		{
-			pGEB->setInputStringAsUtf8(l);
+			pGEB->setInputString(l);
 		}
 		CAHManager::getInstance()->runActionHandler("set_keyboard_focus", NULL, "target=" CTRL_EDITBOX_PASSWORD "|select_all=false");
 	}
@@ -830,8 +830,8 @@ void initAutoLogin()
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CGroupEditBox *pGEBLog = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_LOGIN));
 	CGroupEditBox *pGEBPwd = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_PASSWORD));
-	pGEBLog->setInputStringAsUtf8(LoginLogin);
-	pGEBPwd->setInputStringAsUtf8(LoginPassword);
+	pGEBLog->setInputString(LoginLogin);
+	pGEBPwd->setInputString(LoginPassword);
 	CAHManager::getInstance()->runActionHandler("on_login", NULL, "");
 
 	if (ClientCfg.R2Mode)
@@ -1379,8 +1379,8 @@ class CAHOnLogin : public IActionHandler
 			return;
 		}
 
-		LoginLogin = pGEBLog->getInputStringAsUtf8();
-		LoginPassword = pGEBPwd->getInputStringAsUtf8();
+		LoginLogin = pGEBLog->getInputString();
+		LoginPassword = pGEBPwd->getInputString();
 
 		onlogin();
 	}
@@ -2394,7 +2394,7 @@ bool initCreateAccount()
 		{
 			CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId(editBoxes[i] + ":eb"));
 			if(eb)
-				eb->setInputString(u32string());
+				eb->setInputString(std::string());
 		}
 
 		// conditions button
@@ -2581,7 +2581,7 @@ class CAHOnCreateAccountSubmit : public IActionHandler
 			{
 				CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId(editBoxes[i] + ":eb"));
 				if(eb)
-					results[i] = eb->getInputStringAsUtf8();
+					results[i] = eb->getInputString();
 			}
 
 			// text
@@ -2735,11 +2735,11 @@ class CAHCreateAccountLogin : public IActionHandler
 		{
 			CGroupEditBox * eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId("eb_login:eb"));
 			if(eb)
-				LoginLogin = eb->getInputStringAsUtf8();
+				LoginLogin = eb->getInputString();
 
 			eb = dynamic_cast<CGroupEditBox*>(createAccountUI->findFromShortId("eb_password:eb"));
 			if(eb)
-				LoginPassword = eb->getInputStringAsUtf8();
+				LoginPassword = eb->getInputString();
 
 			onlogin(false);
 		}
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index e9702af28..ee203d312 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -7484,7 +7484,7 @@ class CAHInviteCharacter : public IActionHandler
 				CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(fatherGC->getGroup("add_contact_eb:eb"));
 				if (geb && !geb->getInputString().empty())
 				{
-					string charName = geb->getInputStringAsUtf8();
+					string charName = geb->getInputString();
 					CSessionBrowserImpl & sessionBrowser = CSessionBrowserImpl::getInstance();
 					sessionBrowser.inviteCharacterByName(sessionBrowser.getCharId(), charName);
 
@@ -7506,7 +7506,7 @@ class CAHInviteCharacter : public IActionHandler
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_newcomer");
 					}
 
-					geb->setInputString(u32string());
+					geb->setInputString(std::string());
 				}
 			}
 		}

From 1ec9f16de45311388ee8eb215f662d49f6513997 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 08:26:53 +0800
Subject: [PATCH 055/292] Get rid of useless raw copy in ucstring, default to
 UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/misc/ucstring.h |  4 +---
 nel/src/misc/ucstring.cpp       | 22 +---------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 5b7597f00..61f7f416b 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -50,7 +50,7 @@ public:
 	ucstring(const std::string &str)
 	    : ucstringbase()
 	{
-		rawCopy(str);
+		fromUtf8(str);
 	}
 
 	~ucstring() { }
@@ -171,8 +171,6 @@ public:
 		return ret;
 	}
 
-private:
-	void rawCopy(const std::string &str);
 };
 
 inline ucstring operator+(const ucstringbase &ucstr, ucchar c)
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index 79cf78f7e..05c0d24ab 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -20,14 +20,7 @@
 
 void ucstring::toString(std::string &str) const
 {
-	str.resize(size());
-	for (uint i = 0; i < str.size(); i++)
-	{
-		if (operator[](i) > 255)
-			str[i] = '?';
-		else
-			str[i] = (char)operator[](i);
-	}
+	str = nlmove(NLMISC::CUtfStringView(*this).toUtf8());
 }
 
 std::string ucstring::toUtf8() const
@@ -40,17 +33,4 @@ void ucstring::fromUtf8(const std::string &stringUtf8)
 	*this = NLMISC::CUtfStringView(stringUtf8).toUtf16();
 }
 
-void ucstring::rawCopy(const std::string &str)
-{
-	// We need to convert the char into 8bits unsigned int before promotion to 16 bits
-	// otherwise, as char are signed on some compiler (MSCV for ex), the sign bit is extended to 16 bits.
-	resize(str.size());
-	std::string::const_iterator first(str.begin()), last(str.end());
-	iterator dest(begin());
-	for (; first != last; ++first, ++dest)
-	{
-		*dest = uint8(*first);
-	}
-}
-
 /* end of file */

From 6ff5ddd790c6d339420cae52755fc24303d7fc0b Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 08:32:17 +0800
Subject: [PATCH 056/292] Explicit function for obtaining 7-bit ascii,
 ryzom/ryzomcore#335

---
 nel/include/nel/misc/utf_string_view.h |  1 +
 nel/src/misc/utf_string_view.cpp       | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index eac06e0a1..df6bf76c8 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -60,6 +60,7 @@ public:
 	u32string toUtf32() const; // Makes a copy
 
 	std::wstring toWide() const; // Platform dependent, UTF-16 or UTF-32. Makes a copy.
+	std::string toAscii() const; // Returns only values 0-127, 7-bit ASCII. Makes a copy.
 
 	inline bool isUtf8() const { return m_Iterator == utf8Iterator; }
 	inline bool isUtf16() const { return m_Iterator == utf16Iterator; }
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index db2ea7cec..3be14f515 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -106,6 +106,21 @@ u32string CUtfStringView::toUtf32() const
 	return res;
 }
 
+std::string CUtfStringView::toAscii() const
+{
+	std::string res;
+	res.reserve(m_Size);
+	for (iterator it(begin()), end(end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x80)
+			res += c;
+		else
+			res += '_';
+	}
+	return res;
+}
+
 std::wstring CUtfStringView::toWide() const
 {
 #ifdef NL_OS_WINDOWS

From 698bfff501d481afa26d100db2db0a1ad1c5028c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 08:41:39 +0800
Subject: [PATCH 057/292] Prefer UTF-8, cleanup, ryzom/ryzomcore#335

---
 nel/include/nel/gui/group_editbox.h           |  7 ++---
 nel/src/gui/group_editbox.cpp                 | 26 ++++++++++++++-----
 .../src/interface_v3/action_handler_edit.cpp  | 26 +++++++++----------
 ryzom/client/src/interface_v3/chat_window.cpp |  2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 355c01d3c..36b8d63b4 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -64,13 +64,14 @@ namespace NLGUI
 
 		/// Accessors
 		std::string getInputString() const;
+		std::string getPrompt() const;
 		const u32string &getInputStringRef() const { return _InputString; }
-		const ucstring &getPrompt() const { return _Prompt; }
+		const u32string &getPromptRef() const { return _Prompt; }
 
 		/** Set the prompt
 		  * NB : line returns are encoded as '\n', not '\r\n'
 		  */
-		void		setPrompt(const ucstring &s) { _Prompt = s; }
+		void		setPrompt(const std::string &s);
 		void		setInputString(const std::string &str);
 		void		setInputStringRef(const u32string &str) {_InputString = str; };
 		void		setInputStringAsInt(sint32 val);
@@ -228,7 +229,7 @@ namespace NLGUI
 		NLMISC::CRGBA	_BackSelectColor;
 
 		// Text info
-		ucstring	_Prompt;
+		u32string	_Prompt;
 		u32string	_InputString;
 		CViewText	*_ViewText;
 
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 037ae4656..1453ba5fe 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -96,7 +96,7 @@ namespace NLGUI
 									_ViewTextDeltaX(0)
 
 	{
-		_Prompt = ">";
+		_Prompt = u32string(1, '>');
 		_BackSelectColor= CRGBA::White;
 		_TextSelectColor= CRGBA::Black;
 	}
@@ -170,7 +170,7 @@ namespace NLGUI
 		else
 		if( name == "prompt" )
 		{
-			return _Prompt.toString();
+			return CUtfStringView(_Prompt).toUtf8();
 		}
 		else
 		if( name == "enter_type" )
@@ -354,7 +354,7 @@ namespace NLGUI
 		else
 		if( name == "prompt" )
 		{
-			_Prompt = value;
+			_Prompt = CUtfStringView(value).toUtf32();
 			return;
 		}
 		else
@@ -477,7 +477,7 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "max_chars_size", BAD_CAST toString( _MaxCharsSize ).c_str() );
 		xmlSetProp( node, BAD_CAST "enter_loose_focus", BAD_CAST toString( _LooseFocusOnEnter ).c_str() );
 		xmlSetProp( node, BAD_CAST "enter_recover_focus", BAD_CAST toString( _RecoverFocusOnEnter ).c_str() );
-		xmlSetProp( node, BAD_CAST "prompt", BAD_CAST _Prompt.toString().c_str() );
+		xmlSetProp( node, BAD_CAST "prompt", BAD_CAST CUtfStringView(_Prompt).toUtf8().c_str() );
 
 		std::string e;
 		switch( _EntryType )
@@ -606,7 +606,7 @@ namespace NLGUI
 		if (prop) _ResetFocusOnHide = convertBool(prop);
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"prompt" );
-		if (prop) _Prompt = (const char*)prop;
+		if (prop) _Prompt = CUtfStringView((const char*)prop).toUtf32();
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"entry_type" );
 		_EntryType = Text;
@@ -1436,13 +1436,13 @@ namespace NLGUI
 			ucstring usTmp;
 			if (_EntryType == Password)
 			{
-				usTmp = _Prompt;
+				usTmp = CUtfStringView(_Prompt).toUtf16();
 				for (uint32 i = 0; i < _InputString.size(); ++i)
 					usTmp += "*";
 			}
 			else
 			{
-				usTmp = _Prompt + CUtfStringView(_InputString).toUtf16();
+				usTmp = CUtfStringView(_Prompt + _InputString).toUtf16();
 			}
 			_ViewText->setText (usTmp);
 		}
@@ -1624,6 +1624,12 @@ namespace NLGUI
 	}
 
 
+	// ----------------------------------------------------------------------------
+	void CGroupEditBox::setPrompt(const std::string &s)
+	{ 
+		_Prompt = CUtfStringView(s).toUtf32(); 
+	}
+
 
 	// ----------------------------------------------------------------------------
 	void CGroupEditBox::setInputString(const std::string &str)
@@ -1742,6 +1748,12 @@ namespace NLGUI
 		CInterfaceGroup::setActive(active);
 	}
 
+	// ***************************************************************************
+	std::string CGroupEditBox::getPrompt() const
+	{
+		return NLMISC::CUtfStringView(_Prompt).toUtf8();
+	}
+
 	// ***************************************************************************
 	std::string CGroupEditBox::getInputString() const
 	{
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index 055a77422..bde8f5389 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -288,11 +288,11 @@ class CAHEditGotoLineBegin : public CAHEdit
 		// go to the start of line
 		if (_GroupEdit->getViewText())
 		{
-			sint line = _GroupEdit->getViewText()->getLineFromIndex(_GroupEdit->getCursorPos() + (uint)_GroupEdit->getPrompt().length());
+			sint line = _GroupEdit->getViewText()->getLineFromIndex(_GroupEdit->getCursorPos() + (uint)_GroupEdit->getPromptRef().length());
 			if (line == -1) return;
-			sint newPos = std::max(_GroupEdit->getViewText()->getLineStartIndex(line), (sint) _GroupEdit->getPrompt().length());
+			sint newPos = std::max(_GroupEdit->getViewText()->getLineStartIndex(line), (sint) _GroupEdit->getPromptRef().length());
 			if (newPos == -1) return;
-			_GroupEdit->setCursorPos(newPos - (sint32)_GroupEdit->getPrompt().length());
+			_GroupEdit->setCursorPos(newPos - (sint32)_GroupEdit->getPromptRef().length());
 			_GroupEdit->setCursorAtPreviousLineEnd(false);
 		}
 	}
@@ -310,20 +310,20 @@ class CAHEditGotoLineEnd : public CAHEdit
 		{
 			if (_GroupEdit->getViewText()->getMultiLine())
 			{
-				sint line = _GroupEdit->getViewText()->getLineFromIndex(_GroupEdit->getCursorPos() + (uint)_GroupEdit->getPrompt().length(), _GroupEdit->isCursorAtPreviousLineEnd());
+				sint line = _GroupEdit->getViewText()->getLineFromIndex(_GroupEdit->getCursorPos() + (uint)_GroupEdit->getPromptRef().length(), _GroupEdit->isCursorAtPreviousLineEnd());
 				if (line == -1) return;
 				sint newPos;
 				bool endOfPreviousLine;
 				_GroupEdit->getViewText()->getLineEndIndex(line, newPos, endOfPreviousLine);
 				if (newPos != -1)
 				{
-					_GroupEdit->setCursorPos(newPos - (sint32)_GroupEdit->getPrompt().length());
+					_GroupEdit->setCursorPos(newPos - (sint32)_GroupEdit->getPromptRef().length());
 					_GroupEdit->setCursorAtPreviousLineEnd(endOfPreviousLine);
 				}
 			}
 			else
 			{
-				_GroupEdit->setCursorPos((sint32)_GroupEdit->getPrompt().length() + (sint32)_GroupEdit->getInputString().length());
+				_GroupEdit->setCursorPos((sint32)_GroupEdit->getPromptRef().length() + (sint32)_GroupEdit->getInputString().length());
 			}
 		}
 	}
@@ -378,7 +378,7 @@ class CAHEditPreviousLine : public CAHEdit
 		}
 		else if (_GroupEdit->getViewText()->getMultiLine())
 		{
-			uint cursorPosInText = _GroupEdit->getCursorPos() + (uint)_GroupEdit->getPrompt().length();
+			uint cursorPosInText = _GroupEdit->getCursorPos() + (uint)_GroupEdit->getPromptRef().length();
 			if (
 				(_GroupEdit->getCursorPos() == (sint32) _GroupEdit->getInputStringRef().length() && _GroupEdit->getViewText()->getNumLine() == 1) ||
 				_GroupEdit->getViewText()->getLineFromIndex(cursorPosInText, _GroupEdit->isCursorAtPreviousLineEnd()) == 0
@@ -396,7 +396,7 @@ class CAHEditPreviousLine : public CAHEdit
 			_GroupEdit->getViewText()->getCharacterIndexFromPosition(cx, cy, newCharIndex, newLineEnd);
 			if (newLineEnd)
 			{
-				_GroupEdit->setCursorPos(newCharIndex - (sint32)_GroupEdit->getPrompt().length());
+				_GroupEdit->setCursorPos(newCharIndex - (sint32)_GroupEdit->getPromptRef().length());
 				_GroupEdit->setCursorAtPreviousLineEnd(true);
 				sint32 newPos = _GroupEdit->getCursorPos();
 				clamp(newPos, (sint32) 0, (sint32) _GroupEdit->getInputStringRef().size());
@@ -417,7 +417,7 @@ class CAHEditPreviousLine : public CAHEdit
 			{
 				_GroupEdit->setCursorPos(newCharIndex + 1);
 			}
-			_GroupEdit->setCursorPos(_GroupEdit->getCursorPos()-(sint32)_GroupEdit->getPrompt().length());
+			_GroupEdit->setCursorPos(_GroupEdit->getCursorPos()-(sint32)_GroupEdit->getPromptRef().length());
 			sint32 newpos = _GroupEdit->getCursorPos();
 			clamp(newpos, (sint32) 0, (sint32)_GroupEdit->getInputStringRef().size());
 			_GroupEdit->setCursorPos(newpos);
@@ -452,7 +452,7 @@ class CAHEditNextLine : public CAHEdit
 		{
 			float cx, cy;
 			float height;
-			_GroupEdit->getViewText()->getCharacterPositionFromIndex(_GroupEdit->getCursorPos() + (sint)_GroupEdit->getPrompt().length(), _GroupEdit->isCursorAtPreviousLineEnd(), cx, cy, height);
+			_GroupEdit->getViewText()->getCharacterPositionFromIndex(_GroupEdit->getCursorPos() + (sint)_GroupEdit->getPromptRef().length(), _GroupEdit->isCursorAtPreviousLineEnd(), cx, cy, height);
 			if (cy != 0)
 			{
 				cy -= height;
@@ -461,7 +461,7 @@ class CAHEditNextLine : public CAHEdit
 				_GroupEdit->getViewText()->getCharacterIndexFromPosition(cx, cy, newCharIndex, newLineEnd);
 				if (newLineEnd)
 				{
-					_GroupEdit->setCursorPos(newCharIndex - (sint32)_GroupEdit->getPrompt().length());
+					_GroupEdit->setCursorPos(newCharIndex - (sint32)_GroupEdit->getPromptRef().length());
 					_GroupEdit->setCursorAtPreviousLineEnd(true);
 					sint32 newPos = _GroupEdit->getCursorPos();
 					clamp(newPos, (sint32) 0, (sint32) _GroupEdit->getInputStringRef().size());
@@ -480,9 +480,9 @@ class CAHEditNextLine : public CAHEdit
 				}
 				else
 				{
-					_GroupEdit->setCursorPos(min(sint32(newCharIndex + 1), sint32(_GroupEdit->getInputStringRef().length() + _GroupEdit->getPrompt().length())));
+					_GroupEdit->setCursorPos(min(sint32(newCharIndex + 1), sint32(_GroupEdit->getInputStringRef().length() + _GroupEdit->getPromptRef().length())));
 				}
-				_GroupEdit->setCursorPos(_GroupEdit->getCursorPos()-(sint32)_GroupEdit->getPrompt().length());
+				_GroupEdit->setCursorPos(_GroupEdit->getCursorPos()-(sint32)_GroupEdit->getPromptRef().length());
 				sint32 newPos = _GroupEdit->getCursorPos();
 				clamp(newPos, (sint32) 0, (sint32) _GroupEdit->getInputStringRef().size());
 				_GroupEdit->setCursorPos(newPos);
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index ed1a220ca..72a877cb7 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -262,7 +262,7 @@ void CChatWindow::setPrompt(const ucstring &prompt)
 	if (!_Chat) return;
 	CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(_Chat->getGroup("eb"));
 	if (!eb) return;
-	eb->setPrompt(prompt);
+	eb->setPrompt(prompt.toUtf8());
 }
 
 void CChatWindow::setPromptColor(NLMISC::CRGBA col)

From 9021ce465f09577ea5a4acf3ce0a8254aff159fa Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 11:24:30 +0800
Subject: [PATCH 058/292] Change CViewText to UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/3d/computed_string.h          |  1 +
 nel/include/nel/3d/u_text_context.h           |  7 +-
 nel/include/nel/gui/dbview_quantity.h         |  2 +-
 nel/include/nel/gui/group_html.h              |  2 +-
 nel/include/nel/gui/view_text.h               | 49 +++++++------
 nel/include/nel/misc/utf_string_view.h        | 18 ++++-
 nel/src/3d/font_manager.cpp                   |  2 +
 nel/src/3d/text_context_user.cpp              |  8 +--
 nel/src/gui/ctrl_text_button.cpp              | 18 ++---
 nel/src/gui/dbgroup_combo_box.cpp             | 10 +--
 nel/src/gui/dbview_number.cpp                 | 10 +--
 nel/src/gui/dbview_quantity.cpp               |  8 +--
 nel/src/gui/group_container.cpp               |  8 +--
 nel/src/gui/group_editbox.cpp                 | 12 ++--
 nel/src/gui/group_html.cpp                    | 12 ++--
 nel/src/gui/group_list.cpp                    |  4 +-
 nel/src/gui/group_menu.cpp                    | 10 +--
 nel/src/gui/group_paragraph.cpp               |  6 +-
 nel/src/gui/group_tree.cpp                    |  2 +-
 nel/src/gui/view_pointer.cpp                  |  4 +-
 nel/src/gui/view_text_formated.cpp            |  2 +-
 nel/src/gui/view_text_id.cpp                  |  4 +-
 nel/src/gui/view_text_id_formated.cpp         |  2 +-
 nel/src/gui/widget_manager.cpp                |  2 +-
 nel/src/misc/diff_tool.cpp                    | 29 ++++----
 nel/src/misc/utf_string_view.cpp              | 71 ++++++++++++-------
 ryzom/client/src/connection.cpp               | 32 ++++-----
 ryzom/client/src/entity_cl.cpp                |  2 +-
 ryzom/client/src/game_context_menu.cpp        | 18 ++---
 .../src/interface_v3/action_handler_game.cpp  |  2 +-
 .../src/interface_v3/action_handler_help.cpp  |  8 +--
 .../src/interface_v3/action_phrase_faber.cpp  |  6 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  | 10 +--
 .../src/interface_v3/chat_text_manager.cpp    |  8 +--
 .../client/src/interface_v3/dbctrl_sheet.cpp  |  2 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |  8 +--
 .../dbgroup_list_sheet_icon_phrase.cpp        |  2 +-
 .../interface_v3/dbgroup_list_sheet_text.cpp  |  2 +-
 .../interface_v3/dbgroup_list_sheet_text.h    |  2 +-
 ...roup_list_sheet_text_brick_composition.cpp |  6 +-
 .../dbgroup_list_sheet_text_phrase.cpp        |  4 +-
 .../dbgroup_list_sheet_text_phrase_id.cpp     |  2 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  2 +-
 .../src/interface_v3/encyclopedia_manager.cpp | 16 ++---
 .../src/interface_v3/flying_text_manager.cpp  |  2 +-
 .../client/src/interface_v3/group_compas.cpp  |  2 +-
 .../interface_v3/group_in_scene_bubble.cpp    | 16 ++---
 .../interface_v3/group_in_scene_user_info.cpp | 12 ++--
 ryzom/client/src/interface_v3/group_map.cpp   | 10 +--
 .../src/interface_v3/group_modal_get_key.cpp  |  6 +-
 .../client/src/interface_v3/group_skills.cpp  |  2 +-
 .../client/src/interface_v3/guild_manager.cpp | 16 ++---
 .../client/src/interface_v3/interface_ddx.cpp |  4 +-
 .../src/interface_v3/interface_manager.cpp    | 10 +--
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  2 +-
 .../client/src/interface_v3/macrocmd_key.cpp  | 32 ++++-----
 .../src/interface_v3/macrocmd_manager.cpp     | 10 +--
 .../client/src/interface_v3/music_player.cpp  |  4 +-
 .../src/interface_v3/people_interraction.cpp  |  2 +-
 .../src/interface_v3/task_bar_manager.cpp     |  4 +-
 ryzom/client/src/login.cpp                    | 18 ++---
 ryzom/client/src/net_manager.cpp              |  2 +-
 ryzom/client/src/player_cl.cpp                |  2 +-
 ryzom/client/src/r2/editor.cpp                | 10 +--
 ryzom/client/src/session_browser_impl.cpp     |  2 +-
 65 files changed, 323 insertions(+), 280 deletions(-)

diff --git a/nel/include/nel/3d/computed_string.h b/nel/include/nel/3d/computed_string.h
index c4404f661..35bfb692c 100644
--- a/nel/include/nel/3d/computed_string.h
+++ b/nel/include/nel/3d/computed_string.h
@@ -182,6 +182,7 @@ public:
 	CMaterial	*Material;
 	CRGBA Color;
 	std::string Text;
+	size_t Length;
 
 	uint32 CacheVersion;
 
diff --git a/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
index 9cf710b11..c5d31b886 100644
--- a/nel/include/nel/3d/u_text_context.h
+++ b/nel/include/nel/3d/u_text_context.h
@@ -104,8 +104,11 @@ public:
 		 */
 		float StringLine;
 
-		CStringInfo() {StringWidth= StringHeight= StringLine= 0;}
-		CStringInfo(float w, float h, float l)  {StringWidth= w; StringHeight= h; StringLine = l;}
+		/// The length in characters
+		size_t StringLength;
+
+		CStringInfo() { StringWidth = StringHeight = StringLine = 0; StringLength = 0; }
+		CStringInfo(float w, float h, float l, size_t len) { StringWidth = w; StringHeight = h; StringLine = l; StringLength = len; }
 
 		/**
 		 *	Get the string's origin
diff --git a/nel/include/nel/gui/dbview_quantity.h b/nel/include/nel/gui/dbview_quantity.h
index 16a11f5a0..c23b394ab 100644
--- a/nel/include/nel/gui/dbview_quantity.h
+++ b/nel/include/nel/gui/dbview_quantity.h
@@ -57,7 +57,7 @@ namespace NLGUI
 		CInterfaceProperty		_NumberMax;
 		sint32					_Cache;
 		sint32					_CacheMax;
-		ucstring			_EmptyText;
+		std::string			_EmptyText;
 
 		void	buildTextFromCache();
 	};
diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 590c43a89..1013a8b10 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -765,7 +765,7 @@ namespace NLGUI
 		std::string		_TextAreaScript;
 
 		// Get last char
-		ucchar getLastChar() const;
+		u32char getLastChar() const;
 
 		// Current link view
 		class CViewLink			*_CurrentViewLink;
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 57ab6a096..959c82855 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -84,7 +84,8 @@ namespace NLGUI
 
 		/// Set
 
-		void setText (const ucstring &text);
+		void setText(const std::string &text);
+		void setTextAsUtf16 (const ucstring &text);
 		void setFontName (const std::string &name);
 		void setFontSize (sint nFontSize, bool coef = true);
 		void setEmbolden (bool nEmbolden);
@@ -95,7 +96,8 @@ namespace NLGUI
 		void setShadowColor (const NLMISC::CRGBA &color);
 		void setShadowOffset (sint x, sint y);
 		void setLineMaxW (sint nMaxW, bool invalidate=true);
-		void setOverflowText(const ucstring &text) { _OverflowText = text; }
+		void setOverflowText(const std::string &text) { _OverflowText = text; }
+		void setOverflowTextAsUtf16(const ucstring &text) { _OverflowText = text.toUtf8(); }
 		void setMultiLine (bool bMultiLine);
 		void setMultiLineSpace (sint nMultiLineSpace);
 		void setMultiLineMaxWOnly (bool state);
@@ -112,8 +114,9 @@ namespace NLGUI
 		void disableStringSelection();
 
 		/// Get
-
-		ucstring		getText() const		{ return _Text; }
+		std::string		getText() const { return _Text; }
+		ucstring		getTextAsUtf16() const;
+		ucstring		getHardTextAsUtf16() const;
 		sint			getFontSize() const;
 		std::string		getFontName() const { return _FontName; }
 		bool			getEmbolden() 		{ return _Embolden; }
@@ -124,7 +127,7 @@ namespace NLGUI
 		NLMISC::CRGBA	getShadowColor()	{ return _ShadowColor; }
 		void			getShadowOffset(sint &x, sint &y) { x = _ShadowX; y = _ShadowY; }
 		sint			getLineMaxW()		const { return _LineMaxW; }
-		ucstring		getOverflowText()	const { return _OverflowText; }
+		ucstring		getOverflowTextAsUtf16()	const { return _OverflowText; }
 		bool			getMultiLine() const		{ return _MultiLine; }
 		sint			getMultiLineSpace()	const	{ return _MultiLineSpace; }
 		bool			getMultiLineMaxWOnly()	const	{ return _MultiLineMaxWOnly; }
@@ -174,8 +177,9 @@ namespace NLGUI
 		/// From a line number, get the character at which it ends (not including any '\n' ), or -1 if invalid
 		void getLineEndIndex(uint line, sint &index, bool &endOfPreviousLine) const;
 
-		std::string getHardText() const { std::string result; _Text.toString (result); return result; }
+		std::string getHardText() const { return _HardText.empty() ? _Text : _HardText; }
 		void        setHardText (const std::string &ht);
+		void		setHardTextAsUtf16(const ucstring &ht);
 
 		std::string getColorAsString() const;
 		void        setColorAsString(const std::string &ht);
@@ -188,9 +192,11 @@ namespace NLGUI
 
 		/** Setup a Text with Format Tags. Text is store without color/format tags, and special array is allocated for Format association
 		 */
-		void	setTextFormatTaged(const ucstring &text);
+		void	setTextFormatTaged(const std::string &text);
+		void	setTextFormatTagedAsUtf16(const ucstring &text);
 
-		void	setSingleLineTextFormatTaged(const ucstring &text);
+		void	setSingleLineTextFormatTaged(const std::string &text);
+		void	setSingleLineTextFormatTagedAsUtf16(const ucstring &text);
 
 		// Remove end space
 		void removeEndSpaces();
@@ -216,10 +222,12 @@ namespace NLGUI
 		int luaSetLineMaxW(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CViewText, CViewBase)
+			REFLECT_STRING("text", getText, setText);
 			REFLECT_STRING("hardtext", getHardText, setHardText);
-			REFLECT_UCSTRING("uc_hardtext", getText, setText);
-			REFLECT_UCSTRING("uc_hardtext_format", getText, setTextFormatTaged);
-			REFLECT_UCSTRING("uc_hardtext_single_line_format", getText, setSingleLineTextFormatTaged);
+			// REFLECT_UCSTRING("uc_text", getTextAsUtf16, setTextAsUtf16); // Deprecate uc_ functions
+			REFLECT_UCSTRING("uc_hardtext", getHardTextAsUtf16, setHardTextAsUtf16);
+			REFLECT_UCSTRING("uc_hardtext_format", getTextAsUtf16, setTextFormatTagedAsUtf16); // FIXME: Name doesn't make sense
+			REFLECT_UCSTRING("uc_hardtext_single_line_format", getTextAsUtf16, setSingleLineTextFormatTagedAsUtf16); // FIXME: Name doesn't make sense
 			REFLECT_STRING ("color", getColorAsString, setColorAsString);
 			REFLECT_RGBA ("color_rgba", getColorRGBA, setColorRGBA);
 			REFLECT_SINT32 ("alpha", getAlpha, setAlpha);
@@ -228,7 +236,6 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setLineMaxW", luaSetLineMaxW);
 		REFLECT_EXPORT_END
 
-
 		virtual void serial(NLMISC::IStream &f);
 
 		// Sets the parent element
@@ -236,9 +243,11 @@ namespace NLGUI
 		void setParentElm( CInterfaceElement *parent ){ _ParentElm = parent; }
 
 	protected:
-		std::string _HardtextFormat;
 		/// Text to display.
-		ucstring _Text;
+		std::string _HardTextFormat;
+		std::string _HardText;
+		std::string _Text;
+		size_t _TextLength;
 		/// index of the computed String associated to this text control
 		uint _Index;
 		/// info on the computed String associated to this text control
@@ -278,7 +287,7 @@ namespace NLGUI
 		sint32		_LineMaxW;
 		/// For single line, true if the text is clamped (ie displayed with "...")
 		bool		_SingleLineTextClamped;
-		ucstring	_OverflowText;
+		std::string	_OverflowText;
 
 		/// Multiple lines handling
 		bool		 _MultiLine;
@@ -339,7 +348,7 @@ namespace NLGUI
 			public:
 				// default ctor
 				CWord(uint numSpaces = 0) : Index(0), NumSpaces(numSpaces) {}
-				ucstring							Text;
+				std::string							Text;
 				uint								Index; // index of the info for this word
 				NL3D::UTextContext::CStringInfo		Info;
 				uint								NumSpaces; // number of spaces before this word
@@ -347,7 +356,7 @@ namespace NLGUI
 				CFormatInfo							Format;
 			public:
 				// build from a string, using the current text context
-				void build(const ucstring &text, NL3D::UTextContext &textContext, uint numSpaces= 0);
+				void build(const std::string &text, NL3D::UTextContext &textContext, uint numSpaces= 0);
 		};
 		typedef std::vector<CWord> TWordVect;
 
@@ -360,7 +369,7 @@ namespace NLGUI
 				// Clear the line & remove text contexts
 				void clear(NL3D::UTextContext &textContext);
 				// Add a new word (and its context) in the line + a number of spaces to append at the end of the line
-				void	addWord(const ucstring &word, uint numSpaces, const CFormatInfo &wordFormat, float fontWidth, NL3D::UTextContext &textContext);
+				void	addWord(const std::string &word, uint numSpaces, const CFormatInfo &wordFormat, float fontWidth, NL3D::UTextContext &textContext);
 				void    addWord(const CWord &word, float fontWidth);
 				uint	getNumWords() const { return (uint)_Words.size(); }
 				CWord   &getWord(uint index) { return _Words[index]; }
@@ -442,7 +451,7 @@ namespace NLGUI
 		void onInvalidateContent();
 
 		// may append a new line, and append a word to the last line (no spaces)
-		void flushWordInLine(ucstring &ucCurrentWord, bool &linePushed, const CFormatInfo &wordFormat);
+		void flushWordInLine(std::string &ucCurrentWord, bool &linePushed, const CFormatInfo &wordFormat);
 		// Clear all the lines and free their datas
 		void clearLines();
 		// Update in the case of a multiline text
@@ -456,7 +465,7 @@ namespace NLGUI
 		void	addDontClipWordLine(std::vector<CWord> &currLine);
 
 		// FormatTag build.
-		static void		buildFormatTagText(const ucstring &text, ucstring &textBuild, std::vector<CFormatTag> &formatTags, std::vector<ucstring> &tooltips);
+		static void		buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CFormatTag> &formatTags, std::vector<ucstring> &tooltips);
 		// FormatTag parsing.
 		bool			isFormatTagChange(uint textIndex, uint ctIndex) const;
 		void			getFormatTagChange(uint textIndex, uint &ctIndex, CFormatInfo &wordFormat) const;
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index df6bf76c8..61291f421 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -32,6 +32,7 @@ class CUtfStringView
 public:
 	inline CUtfStringView() : m_Str(NULL), m_Size(0), m_Iterator(utf32Iterator) {}
 
+	inline CUtfStringView(const std::string &utf8Str) : m_Str(utf8Str.c_str()), m_Size(utf8Str.size()), m_Iterator(utf8Iterator) {}
 	inline CUtfStringView(const char *utf8Str) : m_Str(utf8Str), m_Size(strlen(utf8Str)), m_Iterator(utf8Iterator) {}
 	inline CUtfStringView(const char *utf8Str, size_t len): m_Str(utf8Str), m_Size(len), m_Iterator(utf8Iterator)
 	{
@@ -51,8 +52,8 @@ public:
 	}
 #endif
 
-	inline CUtfStringView(const std::string &utf8Str) : m_Str(utf8Str.c_str()), m_Size(utf8Str.size()), m_Iterator(utf8Iterator) {}
 	inline CUtfStringView(const ucstring &utf16Str) : m_Str(utf16Str.c_str()), m_Size(utf16Str.size() << 1), m_Iterator(utf16Iterator) {}
+	inline CUtfStringView(const ucchar *utf16Str) : m_Str(utf16Str), m_Size(strlen((const char *)utf16Str) & (ptrdiff_t)(-2)), m_Iterator(utf16Iterator) {}
 	inline CUtfStringView(const u32string &utf32Str) : m_Str(utf32Str.c_str()), m_Size(utf32Str.size() << 2), m_Iterator(utf32Iterator) {}
 
 	std::string toUtf8(bool reEncode = false) const; // Makes a copy
@@ -96,9 +97,18 @@ public:
 			this->~const_iterator();
 			return *new(this) const_iterator(other);
 		}
+
+		const void *ptr() const { return m_Addr; }
 	private:
 		friend class CUtfStringView;
-		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Char(addr ? view.m_Iterator(&m_Addr) : 0) { }
+		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Char(addr ? view.m_Iterator(&m_Addr) : 0)
+		{ 
+			if ((ptrdiff_t)m_Addr > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
+			{
+				m_Addr = 0;
+				m_Char = 0;
+			}
+		}
 		const CUtfStringView &m_View;
 		const void *m_Addr; // Next address
 		u32char m_Char;
@@ -116,6 +126,8 @@ public:
 	inline bool empty() const { return !m_Size; }
 	const void *ptr() const { return m_Str; }
 
+	size_t count() const; // Slow count of UTF-32 characters
+
 	inline CUtfStringView substr(const iterator &begin, const iterator &end) const
 	{
 		return CUtfStringView(begin.m_Addr, (ptrdiff_t)end.m_Addr - (ptrdiff_t)begin.m_Addr, m_Iterator);
@@ -130,6 +142,8 @@ public:
 		return *new(this) CUtfStringView(other);
 	}
 
+	static void append(std::string &str, u32char c);
+
 private:
 	typedef u32char (*TIterator)(const void **addr);
 	static u32char utf8Iterator(const void **addr);
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index 70fb59639..4a8162f51 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -211,6 +211,7 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		}
 	}
 	output.Vertices.setNumVertices (j);
+	output.Length = j >> 2;
 
 	// compile string info
 	output.StringWidth = (float)penx;
@@ -314,6 +315,7 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 			penx += pLI->AdvX;
 		}
 	}
+	output.Length = idx;
 
 	// compile string info
 	output.StringWidth = (float)penx;
diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index 95d9ebe1c..447122293 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -275,23 +275,23 @@ UTextContext::CStringInfo		CTextContextUser::getStringInfo(uint32 i)
 
 	CComputedString		*cstr= _TextContext.getComputedString(i);
 	if(!cstr)
-		return CStringInfo(0, 0, 0);
+		return CStringInfo(0, 0, 0, 0);
 	else
-		return	CStringInfo(cstr->StringWidth, cstr->StringHeight, cstr->StringLine);
+		return	CStringInfo(cstr->StringWidth, cstr->StringHeight, cstr->StringLine, cstr->Length);
 }
 UTextContext::CStringInfo		CTextContextUser::getStringInfo(NLMISC::CUtfStringView sv)
 {
 	H_AUTO2;
 
 	_TextContext.computeStringInfo(sv, _CacheString);
-	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine);
+	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine, _CacheString.Length);
 }
 UTextContext::CStringInfo		CTextContextUser::getStringInfo(NLMISC::CUtfStringView sv, size_t len)
 {
 	H_AUTO2;
 
 	_TextContext.computeStringInfo(sv, _CacheString, len);
-	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine);
+	return CStringInfo (_CacheString.StringWidth, _CacheString.StringHeight, _CacheString.StringLine, _CacheString.Length);
 }
 void CTextContextUser::clear()
 {
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 942dd11f8..1bd32be27 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -136,7 +136,7 @@ namespace NLGUI
 		if( name == "hardtext" )
 		{
 			if( _ViewText != NULL )
-				return _ViewText->getText().toString();
+				return _ViewText->getText();
 			else
 				return std::string( "" );
 		}
@@ -316,7 +316,7 @@ namespace NLGUI
 		if( name == "hardtext" )
 		{
 			if( _ViewText != NULL )
-				_ViewText->setText( value );
+				_ViewText->setHardText( value );
 			return;
 		}
 		else
@@ -487,7 +487,7 @@ namespace NLGUI
 		xmlNewProp( node, BAD_CAST "wmargin", BAD_CAST toString( _WMargin ).c_str() );
 		xmlNewProp( node, BAD_CAST "wmin", BAD_CAST toString( _WMin ).c_str() );
 		xmlNewProp( node, BAD_CAST "hmin", BAD_CAST toString( _HMin ).c_str() );
-		xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getText().toString().c_str() );
+		xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getText().c_str() );
 		xmlNewProp( node, BAD_CAST "text_y", BAD_CAST toString( _TextY ).c_str() );
 		xmlNewProp( node, BAD_CAST "text_x", BAD_CAST toString( _TextX ).c_str() );
 		xmlNewProp( node, BAD_CAST "text_underlined", BAD_CAST toString( _ViewText->getUnderlined() ).c_str() );
@@ -596,11 +596,11 @@ namespace NLGUI
 			if (prop)
 			{
 				const char *propPtr = prop;
-				ucstring text;
+				std::string text;
 				if (NLMISC::startsWith(propPtr, "ui"))
-					text = CI18N::get(propPtr);
+					text = CI18N::get(propPtr).toUtf8();
 				else
-					text.fromUtf8(propPtr);
+					text = propPtr;
 				_ViewText->setText(text);
 			}
 		}
@@ -990,7 +990,7 @@ namespace NLGUI
 			nlassert( v != NULL );
 			_ViewText = dynamic_cast< CViewText* >( v );
 			_ViewText->setId( _Id + "_text" );
-			_ViewText->setText( ucstring( "text" ) );
+			_ViewText->setText( "text" );
 			_ViewText->setSerializable( false );
 		}
 
@@ -1044,14 +1044,14 @@ namespace NLGUI
 	void CCtrlTextButton::setText (const ucstring &text)
 	{
 		if (_ViewText && !_IsViewTextId)
-			_ViewText->setText(text);
+			_ViewText->setText(text.toUtf8());
 	}
 
 	// ***************************************************************************
 	ucstring CCtrlTextButton::getText () const
 	{
 		if (_ViewText && !_IsViewTextId)
-			return _ViewText->getText();
+			return CUtfStringView(_ViewText->getText()).toUtf16();
 		return ucstring("");
 	}
 
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 59a8b03c8..f7c49fee8 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -236,15 +236,15 @@ namespace NLGUI
 			// change selected text
 			if(_CacheSelection<0 || _CacheSelection>=(sint32)_Texts.size() )
 			{
-				_ViewText->setText(ucstring());
+				_ViewText->setText(std::string());
 			}
 			else if(_IsExternViewText)
 			{
-				_ViewText->setText(_ExternViewText);
+				_ViewText->setText(_ExternViewText.toUtf8());
 			}
 			else
 			{
-				_ViewText->setText(_Texts[_CacheSelection].second);
+				_ViewText->setText(_Texts[_CacheSelection].second.toUtf8());
 			}
 		}
 	}
@@ -468,13 +468,13 @@ namespace NLGUI
 	{
 		_IsExternViewText = true;
 		_ExternViewText = text;
-		_ViewText->setText(_ExternViewText);
+		_ViewText->setText(_ExternViewText.toUtf8());
 	}
 
 	// ***************************************************************************
 	ucstring CDBGroupComboBox::getViewText() const
 	{
-		return  _ViewText->getText();
+		return  CUtfStringView(_ViewText->getText()).toUtf16();
 	}
 
 	// ***************************************************************************
diff --git a/nel/src/gui/dbview_number.cpp b/nel/src/gui/dbview_number.cpp
index af768140c..7ba4c17ba 100644
--- a/nel/src/gui/dbview_number.cpp
+++ b/nel/src/gui/dbview_number.cpp
@@ -43,7 +43,7 @@ namespace NLGUI
 	{
 		_Positive = false;
 		_Cache= 0;
-		setText(ucstring("0"));
+		setText(std::string("0"));
 		_Divisor = 1;
 		_Modulo = 0;
 	}
@@ -225,7 +225,7 @@ namespace NLGUI
 
 		// init cache.
 		_Cache= 0;
-		setText(ucstring("0"));
+		setText(std::string("0"));
 
 		return true;
 	}
@@ -238,9 +238,9 @@ namespace NLGUI
 		if (_Cache != val)
 		{
 			_Cache= val;
-			ucstring value = _Format ? NLMISC::formatThousands(toString(val)) : toString(val);
-			if (_Positive) setText(val >= 0 ? ( ucstring(_Prefix) + value + ucstring(_Suffix) ) : ucstring("?"));
-			else setText( ucstring(_Prefix) + value + ucstring(_Suffix) );
+			std::string value = _Format ? NLMISC::formatThousands(toString(val)) : toString(val);
+			if (_Positive) setText(val >= 0 ? ( _Prefix.toString() + value + _Suffix.toString() ) : "?");
+			else setText( _Prefix.toString() + value + _Suffix.toString() );
 		}
 	}
 
diff --git a/nel/src/gui/dbview_quantity.cpp b/nel/src/gui/dbview_quantity.cpp
index 0b01f14f0..0f90d598e 100644
--- a/nel/src/gui/dbview_quantity.cpp
+++ b/nel/src/gui/dbview_quantity.cpp
@@ -63,7 +63,7 @@ namespace NLGUI
 		else
 		if( name == "emptytext" )
 		{
-			return _EmptyText.toString();
+			return _EmptyText;
 		}
 		else
 			return CViewText::getProperty( name );
@@ -112,7 +112,7 @@ namespace NLGUI
 		else
 			xmlSetProp( node, BAD_CAST "valuemax", BAD_CAST "" );
 
-		xmlSetProp( node, BAD_CAST "emptytext", BAD_CAST _EmptyText.toString().c_str() );
+		xmlSetProp( node, BAD_CAST "emptytext", BAD_CAST _EmptyText.c_str() );
 
 		return node;
 	}
@@ -148,9 +148,9 @@ namespace NLGUI
 		{
 			const char *propPtr = ptr;
 			if (NLMISC::startsWith(propPtr, "ui"))
-				_EmptyText = CI18N::get(propPtr);
+				_EmptyText = CI18N::get(propPtr).toUtf8();
 			else
-				_EmptyText.fromUtf8(propPtr);
+				_EmptyText = propPtr;
 		}
 
 		// init cache.
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 87fb59c38..7bab62820 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3744,7 +3744,7 @@ namespace NLGUI
 			_TitleOpened->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleOpened->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleOpened->setText (_TitleTextOpened);
+		if (_TitleClass==TitleText) _TitleOpened->setText (_TitleTextOpened.toUtf8());
 		_TitleOpened->setActive (_Opened);
 
 		// Title when the container is closed
@@ -3796,7 +3796,7 @@ namespace NLGUI
 			_TitleClosed->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleClosed->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleClosed->setText (_TitleTextClosed);
+		if (_TitleClass==TitleText) _TitleClosed->setText (_TitleTextClosed.toUtf8());
 		_TitleClosed->setActive(!_Opened);
 
 
@@ -3990,7 +3990,7 @@ namespace NLGUI
 	{
 		_TitleTextOpened = title;
 		if (_TitleOpened != NULL)
-			_TitleOpened->setText (title);
+			_TitleOpened->setText (title.toUtf8());
 		invalidateCoords();
 	}
 
@@ -3999,7 +3999,7 @@ namespace NLGUI
 	{
 		_TitleTextClosed = title;
 		if (_TitleClosed != NULL)
-			_TitleClosed->setText (_TitleTextClosed);
+			_TitleClosed->setText (_TitleTextClosed.toUtf8());
 		invalidateCoords();
 	}
 
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 1453ba5fe..768c69066 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -96,7 +96,7 @@ namespace NLGUI
 									_ViewTextDeltaX(0)
 
 	{
-		_Prompt = u32string(1, '>');
+		_Prompt = u32string(1, (u32char)'>');
 		_BackSelectColor= CRGBA::White;
 		_TextSelectColor= CRGBA::Black;
 	}
@@ -1433,16 +1433,14 @@ namespace NLGUI
 	{
 		if (_ViewText)
 		{
-			ucstring usTmp;
+			std::string usTmp;
 			if (_EntryType == Password)
 			{
-				usTmp = CUtfStringView(_Prompt).toUtf16();
-				for (uint32 i = 0; i < _InputString.size(); ++i)
-					usTmp += "*";
+				usTmp = CUtfStringView(_Prompt + u32string(_InputString.size(), 0x2022)).toUtf8();
 			}
 			else
 			{
-				usTmp = CUtfStringView(_Prompt + _InputString).toUtf16();
+				usTmp = CUtfStringView(_Prompt + _InputString).toUtf8();
 			}
 			_ViewText->setText (usTmp);
 		}
@@ -1585,7 +1583,7 @@ namespace NLGUI
 		addView( _ViewText );
 
 		sint32 w,h;
-		w = std::max( sint32( _ViewText->getFontWidth() * _ViewText->getText().size() ), getW() );
+		w = std::max( sint32( _ViewText->getFontWidth() * CUtfStringView(_ViewText->getText()).count() ), getW() );
 		h = std::max( sint32(  _ViewText->getFontHeight() ), getH() );
 					
 		setH( h );
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 4fab8c4bb..7d9e48baf 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2830,7 +2830,7 @@ namespace NLGUI
 			// Number of child in this paragraph
 			if (_CurrentViewLink)
 			{
-				bool skipLine = !_CurrentViewLink->getText().empty() && *(_CurrentViewLink->getText().rbegin()) == (ucchar) '\n';
+				bool skipLine = !_CurrentViewLink->getText().empty() && *(_CurrentViewLink->getText().rbegin()) == '\n';
 				bool sameShadow = style.TextShadow.Enabled && _CurrentViewLink->getShadow();
 				if (sameShadow && style.TextShadow.Enabled)
 				{
@@ -2853,7 +2853,7 @@ namespace NLGUI
 					(style.GlobalColor == _CurrentViewLink->getModulateGlobalColor()))
 				{
 					// Concat the text
-					_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr);
+					_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr.toUtf8());
 					_CurrentViewLink->invalidateContent();
 					added = true;
 				}
@@ -2916,7 +2916,7 @@ namespace NLGUI
 							newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
 						}
 					}
-					newLink->setText(tmpStr);
+					newLink->setText(tmpStr.toUtf8());
 					newLink->setMultiLineSpace((uint)((float)(style.FontSize)*LineSpaceFontFactor));
 					newLink->setMultiLine(true);
 					newLink->setModulateGlobalColor(style.GlobalColor);
@@ -3306,11 +3306,11 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	ucchar CGroupHTML::getLastChar() const
+	u32char CGroupHTML::getLastChar() const
 	{
 		if (_CurrentViewLink)
 		{
-			const ucstring &str = _CurrentViewLink->getText();
+			u32string str = CUtfStringView(_CurrentViewLink->getText()).toUtf32(); // FIXME: Optimize reverse UTF iteration
 			if (!str.empty())
 				return str[str.length()-1];
 		}
@@ -3710,7 +3710,7 @@ namespace NLGUI
 					CGroupEditBox *editBox = dynamic_cast<CGroupEditBox*>(group);
 					if (editBox)
 					{
-						entryData = editBox->getViewText()->getText();
+						entryData = CUtfStringView(editBox->getViewText()->getText()).toUtf16();
 						addEntry = true;
 					}
 				}
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index d619a8146..4e04501a8 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -548,7 +548,7 @@ namespace NLGUI
 		view->setMultiLine (multiLine);
 		view->setTextMode(_Templ.getTextMode());
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line);
+		view->setText (line.toUtf8());
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
 		addChild(view);
@@ -566,7 +566,7 @@ namespace NLGUI
 		view->_Parent = this;
 		view->setMultiLine (multiLine);
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line);
+		view->setText (line.toUtf8());
 		view->setColor (textColor);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index 830b74fb9..109baf278 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -1231,11 +1231,11 @@ namespace NLGUI
 		{
 			pV->setMultiLine (true);
 			pV->setMultiLineMaxWOnly (true);
-			pV->setTextFormatTaged (name);
+			pV->setTextFormatTaged (name.toUtf8());
 		}
 		else
 		{
-			pV->setText (name);
+			pV->setText (name.toUtf8());
 		}
 		pV->setColor (_GroupMenu->_Color);
 		pV->setFontSize (_GroupMenu->_FontSize, _GroupMenu->_FontSizeCoef);
@@ -1319,11 +1319,11 @@ namespace NLGUI
 		{
 			pV->setMultiLine (true);
 			pV->setMultiLineMaxWOnly (true);
-			pV->setTextFormatTaged (name);
+			pV->setTextFormatTaged (name.toUtf8());
 		}
 		else
 		{
-			pV->setText (name);
+			pV->setText (name.toUtf8());
 		}
 
 		pV->setColor (_GroupMenu->_Color);
@@ -1602,7 +1602,7 @@ namespace NLGUI
 					texture = _Lines[k].ViewText->getCheckBox()->getTexture();
 				}
 				CViewTextMenu *pV = NULL;
-				pV = copyMenu->addLine (_Lines[k].ViewText->getText(),  _Lines[k].AHName,  _Lines[k].AHParams,  _Lines[k].Id,  _Lines[k].Cond,
+				pV = copyMenu->addLine (CUtfStringView(_Lines[k].ViewText->getText()).toUtf16(),  _Lines[k].AHName,  _Lines[k].AHParams,  _Lines[k].Id,  _Lines[k].Cond,
 						 texture, _Lines[k].ViewText->getCheckable(),  _Lines[k].ViewText->getChecked(), _Lines[k].ViewText->getFormatted ());
 				copyMenu->_Lines[k].Selectable = _Lines[k].Selectable;
 				pV->setGrayed(_Lines[k].ViewText->getGrayed());
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index f772309a6..f2027a404 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -503,7 +503,7 @@ namespace NLGUI
 		view->setMultiLine (multiLine);
 		view->setTextMode(_Templ.getTextMode());
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line);
+		view->setText (line.toUtf8());
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
 		addChild (view);
@@ -520,7 +520,7 @@ namespace NLGUI
 		view->_Parent = this;
 		view->setMultiLine (multiLine);
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line);
+		view->setText (line.toUtf8());
 		view->setColor (textColor);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
@@ -730,7 +730,7 @@ namespace NLGUI
 							if (viewText)
 							{
 								changeLine = viewText->getNumLine() > 1;
-								if (!viewText->getText().empty() && *(viewText->getText().rbegin()) == (ucchar) '\n')
+								if (!viewText->getText().empty() && *(viewText->getText().rbegin()) == '\n')
 								{
 									changeLine = true;
 								}
diff --git a/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
index 9fad363f0..93e9880bb 100644
--- a/nel/src/gui/group_tree.cpp
+++ b/nel/src/gui/group_tree.cpp
@@ -1292,7 +1292,7 @@ namespace NLGUI
 				CViewText *pVT = new CViewText(TCtorParam());
 				line.TextOrTemplate = pVT;
 				pVT->setId("t"+toString(_Lines.size()));
-				pVT->setText(pNode->Text);
+				pVT->setText(pNode->Text.toUtf8());
 				pVT->setColor(pNode->Color);
 				if(pNode->FontSize==-1)
 					pVT->setFontSize(_FontSize);
diff --git a/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
index 82c0174f5..973708aa6 100644
--- a/nel/src/gui/view_pointer.cpp
+++ b/nel/src/gui/view_pointer.cpp
@@ -458,14 +458,14 @@ namespace NLGUI
 			{
 				CViewText *text = dynamic_cast<CViewText*> (element);
 				if (text)
-					text->setText(str);
+					text->setText(str.toUtf8());
 			}
 			element = target->getView ("real_txt");
 			if (element)
 			{
 				CViewText *text = dynamic_cast<CViewText*> (element);
 				if (text)
-					text->setText(str);
+					text->setText(str.toUtf8());
 			}
 			target->updateCoords();
 			target->updateCoords();
diff --git a/nel/src/gui/view_text_formated.cpp b/nel/src/gui/view_text_formated.cpp
index aa948e986..87cfc12bb 100644
--- a/nel/src/gui/view_text_formated.cpp
+++ b/nel/src/gui/view_text_formated.cpp
@@ -87,7 +87,7 @@ namespace NLGUI
 		formatedResult = formatString(_FormatString, ucstring(""));
 
 		//
-		setText (formatedResult);
+		setText (formatedResult.toUtf8());
 		CViewText::checkCoords();
 	}
 
diff --git a/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
index 562ba881a..065d02e71 100644
--- a/nel/src/gui/view_text_id.cpp
+++ b/nel/src/gui/view_text_id.cpp
@@ -233,9 +233,9 @@ namespace NLGUI
 
 			// Set the Text
 			if(_IsTextFormatTaged)
-				setTextFormatTaged(result);
+				setTextFormatTaged(result.toUtf8());
 			else
-				setText (result);
+				setText (result.toUtf8());
 		}
 		CViewText::checkCoords();
 	}
diff --git a/nel/src/gui/view_text_id_formated.cpp b/nel/src/gui/view_text_id_formated.cpp
index 5304e9e5c..5b1dd2a14 100644
--- a/nel/src/gui/view_text_id_formated.cpp
+++ b/nel/src/gui/view_text_id_formated.cpp
@@ -106,7 +106,7 @@ namespace NLGUI
 			}
 			formatedResult = CViewTextFormated::formatString(_FormatString, result);
 			//
-			setText (formatedResult);
+			setText (formatedResult.toUtf8());
 			//
 			if (bValid)
 			{
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index 864e4ef5b..2da9f9bdf 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -1516,7 +1516,7 @@ namespace NLGUI
 			CViewText *pTxt = (CViewText*)groupContextHelp->getView("text");
 			if (pTxt != NULL)
 			{
-				pTxt->setTextFormatTaged(_ContextHelpText);
+				pTxt->setTextFormatTaged(_ContextHelpText.toUtf8());
 				// update only to get correct W/H
 				groupContextHelp->updateCoords ();
 
diff --git a/nel/src/misc/diff_tool.cpp b/nel/src/misc/diff_tool.cpp
index 2b2a490bc..3cbaea5a6 100644
--- a/nel/src/misc/diff_tool.cpp
+++ b/nel/src/misc/diff_tool.cpp
@@ -232,15 +232,15 @@ bool loadStringFile(const std::string filename, vector<TStringInfo> &stringInfos
 
 ucstring prepareStringFile(const vector<TStringInfo> &strings, bool removeDiffComments, bool noDiffInfo)
 {
-	ucstring diff;
+	string diff;
 
 	vector<TStringInfo>::const_iterator first(strings.begin()), last(strings.end());
 	for (; first != last; ++first)
 	{
-		ucstring str;
+		string str;
 		const TStringInfo &si = *first;
-		string comment = si.Comments.toString();
-		vector<string>	lines;
+		string comment = si.Comments.toUtf8();
+		vector<string> lines;
 		explode(comment, string("\n"), lines, true);
 
 		uint i;
@@ -274,30 +274,29 @@ ucstring prepareStringFile(const vector<TStringInfo> &strings, bool removeDiffCo
 		}
 		si.Comments = ucstring(comment);
 
-		str = si.Comments;
+		str = comment;
 		if (!si.Identifier.empty() || !si.Text.empty())
 		{
 			// add hash value comment if needed
 //			if (si.Comments.find(ucstring("// HASH_VALUE ")) == ucstring::npos)
 			if (!noDiffInfo)
 			{
-			str += ucstring("// HASH_VALUE ") + CI18N::hashToString(si.HashValue)+ nl;
-			str += ucstring("// INDEX ") + NLMISC::toString("%u", first-strings.begin())+ nl;
+				str += "// HASH_VALUE " + CI18N::hashToString(si.HashValue) + "\n";
+				str += "// INDEX " + NLMISC::toString("%u", first-strings.begin()) + "\n";
 			}
 			str += si.Identifier + '\t';
 
-			ucstring text = CI18N::makeMarkedString('[', ']', si.Text);;
-			ucstring text2;
+			string text = CI18N::makeMarkedString('[', ']', si.Text).toUtf8();
+			string text2;
 			// add new line and tab after each \n tag
-			ucstring::size_type pos;
-			const ucstring nlTag("\\n");
-			while ((pos = text.find(nlTag)) != ucstring::npos)
+			string::size_type pos;
+			while ((pos = text.find("\\n")) != string::npos)
 			{
-				text2 += text.substr(0, pos+2) + nl + "\t";
+				text2 += text.substr(0, pos+2) + "\n\t";
 				text = text.substr(pos+2);
 			}
 			text2 += text;//.substr(0, pos+2);
-			str += text2 + nl + nl;
+			str += text2 + "\n\n";
 //			str += CI18N::makeMarkedString('[', ']', si.Text) + nl + nl;
 		}
 
@@ -305,7 +304,7 @@ ucstring prepareStringFile(const vector<TStringInfo> &strings, bool removeDiffCo
 		diff += str;
 	}
 
-	return diff;
+	return ucstring::makeFromUtf8(diff);
 }
 
 
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 3be14f515..9f4057b66 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -29,6 +29,41 @@
 namespace NLMISC
 {
 
+NL_FORCE_INLINE void appendUtf8(std::string &str, u32char c)
+{
+	if (c < 0x80)
+	{
+		// Encode as 1 byte
+		str += (char)c;
+	}
+	else if (c < 0x0800)
+	{
+		// Encode as 2 bytes
+		str += (char)((c & 0x07C0) >> 6) | 0xC0;
+		str += (char)(c & 0x3F) | 0x80;
+	}
+	else if (c < 0x010000)
+	{
+		// Encode as 3 bytes
+		str += (char)((c & 0xF000) >> 12) | 0xE0;
+		str += (char)((c & 0x0FC0) >> 6) | 0x80;
+		str += (char)(c & 0x3F) | 0x80;
+	}
+	else
+	{
+		// Encode as 4 bytes
+		str += (char)((c & 0x1C0000) >> 18) | 0xF0;
+		str += (char)((c & 0x03F000) >> 12) | 0x80;
+		str += (char)((c & 0x0FC0) >> 6) | 0x80;
+		str += (char)(c & 0x3F) | 0x80;
+	}
+}
+
+void CUtfStringView::append(std::string &str, u32char c)
+{
+	appendUtf8(str, c);
+}
+
 std::string CUtfStringView::toUtf8(bool reEncode) const
 {
 	// Decode UTF and encode UTF-8
@@ -39,33 +74,7 @@ std::string CUtfStringView::toUtf8(bool reEncode) const
 	res.reserve(m_Size);
 	for (iterator it(begin()), end(end()); it != end; ++it)
 	{
-		u32char c = *it;
-		if (c < 0x80)
-		{
-			// Encode as 1 byte
-			res += (char)c;
-		}
-		else if (c < 0x0800)
-		{
-			// Encode as 2 bytes
-			res += (char)((c & 0x07C0) >> 6) | 0xC0;
-			res += (char)(c & 0x3F) | 0x80;
-		}
-		else if (c < 0x010000)
-		{
-			// Encode as 3 bytes
-			res += (char)((c & 0xF000) >> 12) | 0xE0;
-			res += (char)((c & 0x0FC0) >> 6) | 0x80;
-			res += (char)(c & 0x3F) | 0x80;
-		}
-		else
-		{
-			// Encode as 4 bytes
-			res += (char)((c & 0x1C0000) >> 18) | 0xF0;
-			res += (char)((c & 0x03F000) >> 12) | 0x80;
-			res += (char)((c & 0x0FC0) >> 6) | 0x80;
-			res += (char)(c & 0x3F) | 0x80;
-		}
+		appendUtf8(res, *it);
 	}
 	return res;
 }
@@ -154,6 +163,14 @@ std::wstring CUtfStringView::toWide() const
 #endif
 }
 
+size_t CUtfStringView::count() const
+{
+	size_t res = 0;
+	for (iterator it(begin()), end(end()); it != end; ++it)
+		++res;
+	return res;
+}
+
 u32char CUtfStringView::utf8Iterator(const void **addr)
 {
 	// Decode UTF-8
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 00c663e5e..36df595bf 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1021,7 +1021,7 @@ TInterfaceState globalMenu()
 				// Display the firewall alert string
 				CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:outgame:connecting:title"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiFirewallAlert")+ucstring("..."));
+					pVT->setText(CI18N::get("uiFirewallAlert").toUtf8() + "...");
 
 				// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
 				nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@@ -1237,8 +1237,8 @@ TInterfaceState globalMenu()
 					if (pVT != NULL)
 					{
 						pVT->setMultiLine( true );
-						pVT->setText(CI18N::get("uiFirewallFail")+ucstring(".\n")+
-									  CI18N::get("uiFirewallAlert")+ucstring("."));
+						pVT->setText(CI18N::get("uiFirewallFail").toUtf8()+".\n"+
+									  CI18N::get("uiFirewallAlert").toUtf8()+".");
 					}
 				}
 			}
@@ -1319,16 +1319,16 @@ public:
 			if (pVT == NULL) return;
 
 			if (rCS.Name.empty())
-				pVT->setText(CI18N::get("uiEmptySlot"));
+				pVT->setText(CI18N::get("uiEmptySlot").toUtf8());
 			else
-				pVT->setText(rCS.Name);
+				pVT->setText(rCS.Name.toUtf8());
 		}
 		// 5 slots
 		for (; i < 5; ++i)
 		{
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sPath+":text"+NLMISC::toString(i)));
 			if (pVT == NULL) return;
-			pVT->setText(CI18N::get("uiEmptySlot"));
+			pVT->setText(CI18N::get("uiEmptySlot").toUtf8());
 		}
 	}
 };
@@ -2170,8 +2170,8 @@ public:
 				CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name"));
 				if (pVT != NULL)
 				{
-					ucstring ucstr = Mainlands[i].Name + ucstring(" ") + Mainlands[i].Description;
-					pVT->setText(ucstr);
+					std::string str = Mainlands[i].Name.toUtf8() + " " + Mainlands[i].Description.toUtf8();
+					pVT->setText(str);
 				}
 
 				// Add to the list
@@ -2311,7 +2311,7 @@ public:
 			CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name"));
 			if (pVT != NULL)
 			{
-				pVT->setText(name);
+				pVT->setText(name.toUtf8());
 			}
 
 			CCtrlBase *pBut = pNewLine->getCtrl("but");
@@ -2559,7 +2559,7 @@ static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName
 	{
 		CViewText* viewText = dynamic_cast<CViewText*>(result);
 		if(viewText)
-			viewText->setText(text);
+			viewText->setText(text.toUtf8());
 		CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 		if(editBox)
 			editBox->setInputStringAsUtf16(text);
@@ -2682,7 +2682,7 @@ class CAHScenarioControl : public IActionHandler
 			CViewText* viewText = dynamic_cast<CViewText*>(result);
 			if(viewText)
 			{
-				viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName"):CI18N::get("uiR2EDScenarioFileName"));
+				viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName").toUtf8():CI18N::get("uiR2EDScenarioFileName").toUtf8());
 			}
 		}
 
@@ -2712,7 +2712,7 @@ class CAHScenarioControl : public IActionHandler
 				CViewText* viewText= dynamic_cast<CViewText*>(result);
 
 				if(viewText)
-					viewText->setText(ucstring(""));
+					viewText->setText("");
 			}
 		}
 		setScenarioInformation(scenarioWnd, "");
@@ -2748,7 +2748,7 @@ class CAHScenarioControl : public IActionHandler
 					CViewText *shardName = dynamic_cast<CViewText *>(toggleGr->getView("button_text"));
 					if (shardName)
 					{
-						shardName->setText(Mainlands[i].Name);
+						shardName->setText(Mainlands[i].Name.toUtf8());
 					}
 				}
 			}
@@ -3250,7 +3250,7 @@ class CAHLoadScenario : public IActionHandler
 			{
 				CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
+					pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
 				CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 
 				return;
@@ -3331,7 +3331,7 @@ class CAHLoadScenario : public IActionHandler
 						{
 							CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 							if (pVT != NULL)
-								pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
+								pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
 							CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 						}
 
@@ -3360,7 +3360,7 @@ class CAHLoadScenario : public IActionHandler
 										{
 											CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 											if (pVT != NULL)
-												pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial"));
+												pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial").toUtf8());
 											CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 										}
 									}
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 10d1573cf..506069426 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2353,7 +2353,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player:header_opened:player_title"));
-		if (pVT != NULL) pVT->setText(_Title);
+		if (pVT != NULL) pVT->setText(_Title.toUtf8());
 
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player"));
 		if (pGC != NULL) pGC->setUCTitle(_EntityName);
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index d4a152392..2b46d33dd 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -718,18 +718,18 @@ void CGameContextMenu::updateContextMenuMissionsOptions( bool forceHide )
 					{
 						result = NLMISC::CI18N::get("uiMissionOptionNotReceived");
 					}
-					pVTM->setText(result);
+					pVTM->setText(result.toUtf8());
 					pVTM->setActive(true);
 				}
 				else
 				{
-					pVTM->setText(ucstring(""));
+					pVTM->setText("");
 					pVTM->setActive(false);
 				}
 			}
 			else
 			{
-				pVTM->setText(ucstring(""));
+				pVTM->setText("");
 				pVTM->setActive(false);
 			}
 		}
@@ -759,16 +759,16 @@ void CGameContextMenu::updateContextMenuWebPage(uint options)
 				{
 					result = NLMISC::CI18N::get("uiWebPageNameNotReceived");
 				}
-				pVTM->setText(result);
+				pVTM->setText(result.toUtf8());
 			}
 			else
 			{
-				pVTM->setText(ucstring(""));
+				pVTM->setText("");
 			}
 		}
 		else
 		{
-			pVTM->setText(ucstring(""));
+			pVTM->setText("");
 		}
 	}
 
@@ -797,7 +797,7 @@ void CGameContextMenu::updateContextMenuOutpostState(uint options)
 	{
 		CViewTextMenu *pVTM = _TextOutpostState;
 		if (pVTM)
-			pVTM->setText(ucstring(STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet)));
+			pVTM->setText(CUtfStringView(STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet)).toUtf8());
 	}
 
 	// apply the active
@@ -839,12 +839,12 @@ void CGameContextMenu::updateContextMenuMissionRing()
 				{
 					result = NLMISC::CI18N::get("uiMissionRingNameNotReceived");
 				}
-				pVTM->setText(result);
+				pVTM->setText(result.toUtf8());
 				pVTM->setActive(true);
 			}
 			else
 			{
-				pVTM->setText(ucstring(""));
+				pVTM->setText("");
 				pVTM->setActive(false);
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index bbb392131..19820be99 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -4606,7 +4606,7 @@ public:
 				CViewText *pVT = dynamic_cast<CViewText *>(pIG->getView("t"));
 				if (!pVT) break;
 
-				names.push_back(toUpper(pVT->getText().toUtf8()));
+				names.push_back(toUpper(pVT->getText()));
 			}
 
 			if (names.size() != nbChilds)
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 77f5f5552..030d34bfe 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -1167,7 +1167,7 @@ void setHelpText(CSheetHelpSetup &setup, const ucstring &text)
 	CViewText *viewText= dynamic_cast<CViewText *>(setup.HelpWindow->getView(setup.ViewText));
 	if(viewText)
 	{
-		viewText->setTextFormatTaged(copyStr);
+		viewText->setTextFormatTaged(copyStr.toUtf8());
 	}
 	CInterfaceGroup *viewTextGroup = setup.HelpWindow->getGroup(setup.ScrollTextGroup);
 	if (viewTextGroup) viewTextGroup->setActive(true);
@@ -3165,7 +3165,7 @@ void setupListBrickHeader(CSheetHelpSetup &setup)
 	if(view)
 	{
 		view->setActive(true);
-		view->setTextFormatTaged(CI18N::get("uihelpPhraseHeaderBricks"));
+		view->setTextFormatTaged(CI18N::get("uihelpPhraseHeaderBricks").toUtf8());
 	}
 }
 
@@ -3806,7 +3806,7 @@ static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const s
 		string	originFilterKey= "iompf" + ITEM_ORIGIN::enumToString((ITEM_ORIGIN::EItemOrigin)itemPart.OriginFilter);
 		mpCraft+= CI18N::get(originFilterKey);
 
-		viewText->setText(mpCraft);
+		viewText->setText(mpCraft.toUtf8());
 	}
 
 
@@ -3838,7 +3838,7 @@ static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const s
 			CViewText	*statTitle= dynamic_cast<CViewText*>(groupStat->getElement(groupStat->getId()+":text" ));
 			CDBViewBar	*statValue= dynamic_cast<CDBViewBar*>(groupStat->getElement(groupStat->getId()+":bar" ));
 			if(statTitle)
-				statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType));
+				statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType).toUtf8());
 			if(statValue)
 				statValue->setValue(itemPart.Stats[i]);
 		}
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 40efedac0..fcef685c5 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -523,7 +523,7 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 					{
 						nlstop;
 					}
-					viewText->setText( text );
+					viewText->setText( text.toUtf8() );
 				}
 
 				// Set as Icon the required MP FaberType / or Sheet Texture (directly...)
@@ -1724,7 +1724,7 @@ void	CActionPhraseFaber::updateItemResult()
 				+ "@{FFFF})";
 		}
 		strFindReplace(text, "%success", successStr );
-		successView->setTextFormatTaged(text);
+		successView->setTextFormatTaged(text.toUtf8());
 	}
 
 
@@ -1790,7 +1790,7 @@ void	CActionPhraseFaber::updateItemResult()
 				uint	sv= uint(statArray[i]*100);
 				if(statTitle)
 				{
-					statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType));
+					statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType).toUtf8());
 					statTitle->setColor(usageColor);
 				}
 				if(statValueBar)
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index dc2c88789..352ff65f4 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -865,7 +865,7 @@ void CBotChatPageTrade::startBuyDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCall
 	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
 	if ( _BuyMean == Money && priceLabel )
 	{
-		priceLabel->setText( CI18N::get( "uiPrice" ) );
+		priceLabel->setText( CI18N::get( "uiPrice" ).toUtf8() );
 		priceLabel->setActive(true);
 	}
 	else
@@ -977,7 +977,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
 	if ( priceLabel )
 	{
-		priceLabel->setText( CI18N::get( "uiImmediatePrice" ) );
+		priceLabel->setText( CI18N::get( "uiImmediatePrice" ).toUtf8() );
 		priceLabel->setActive(true);
 	}
 
@@ -1012,7 +1012,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	{
 		ucstring itemName;
 		itemName = sheet->getItemActualName();
-		itemNameView->setText(itemName);
+		itemNameView->setText(itemName.toUtf8());
 	}
 
 	// set help for item
@@ -1679,14 +1679,14 @@ void	CBotChatPageTrade::setupFactionPointPrice(bool /* sellMode */, uint default
 		{
 			ucstring	fmt= CI18N::get("uiUnitFPPrice");
 			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt);
+			vt->setText(fmt.toUtf8());
 		}
 		vt= dynamic_cast<CViewText*>(fpGroup->getView("total_price_header"));
 		if(vt)
 		{
 			ucstring	fmt= CI18N::get("uiTotalFPPrice");
 			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt);
+			vt->setText(fmt.toUtf8());
 		}
 
 		// setup icon according to pvp clan
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 3b11d17a5..6fae6a29b 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -380,12 +380,12 @@ CViewBase *CChatTextManager::createMsgTextSimple(const ucstring &msg, NLMISC::CR
 	// otherwise, set text normal and apply global color
 	if (msg.find(ucstring("@{")) != ucstring::npos)
 	{
-		vt->setTextFormatTaged(msg);
+		vt->setTextFormatTaged(msg.toUtf8());
 		vt->setColor(NLMISC::CRGBA::White);
 	}
 	else
 	{
-		vt->setText(msg);
+		vt->setText(msg.toUtf8());
 		vt->setColor(col);
 	}
 
@@ -465,12 +465,12 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 				if (title.size() > 0)
 				{
 					vt->LinkTitle = title.toUtf8();
-					vt->setText(title);
+					vt->setText(vt->LinkTitle);
 				}
 				else
 				{
 					vt->LinkTitle = url.toUtf8();
-					vt->setText(url);
+					vt->setText(vt->LinkTitle);
 				}
 
 				if (url.find_first_of('\'') != string::npos)
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index e0e5f2e74..81d34447d 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -2090,7 +2090,7 @@ void CDBCtrlSheet::draw()
 				_RegenText = new CViewText(CViewBase::TCtorParam());
 				_RegenText->setId(getId() + ":regen");
 				_RegenText->setParent(_Parent);
-				_RegenText->setOverflowText(ucstring(""));
+				_RegenText->setOverflowText(std::string());
 				_RegenText->setModulateGlobalColor(false);
 				_RegenText->setMultiLine(false);
 				_RegenText->setTextMode(CViewText::ClipWord);
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index 561d48235..c75dc3af3 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -1074,7 +1074,7 @@ void			CDBGroupBuildPhrase::updateAllDisplay(const CSPhraseCom &phrase)
 				float relative_cost;
 				cost= pBM->getSabrinaCom().getPhraseBrickAndParamCost(phrase.Bricks, i);
 				relative_cost = pBM->getSabrinaCom().getPhraseBrickAndParamRelativeCost(phrase.Bricks, i);
-				ucstring	costText;
+				std::string	costText;
 				if( cost == 0 && relative_cost != 0.f )
 				{
 					cost = (sint32)(relative_cost * 100.f);
@@ -1119,10 +1119,10 @@ void			CDBGroupBuildPhrase::updateAllDisplay(const CSPhraseCom &phrase)
 		{
 			word.InfoView->setActive(true);
 			if(i==0)
-				word.InfoView->setText( CI18N::get("uiTextHelpSelectRootBrick") );
+				word.InfoView->setText( CI18N::get("uiTextHelpSelectRootBrick").toUtf8() );
 			else
 				// start effect index at 1 (human readable :) )
-				word.InfoView->setText( CI18N::get("uiTextHelpSelectEffectBrick") + toString(i) );
+				word.InfoView->setText( CI18N::get("uiTextHelpSelectEffectBrick").toUtf8() + toString(i) );
 		}
 	}
 
@@ -1243,7 +1243,7 @@ void			CDBGroupBuildPhrase::updateAllDisplay(const CSPhraseCom &phrase)
 	{
 		ucstring	text;
 		pPM->buildPhraseDesc(text, phrase, 0, false, "composition");
-		_TextPhraseDesc->setTextFormatTaged(text);
+		_TextPhraseDesc->setTextFormatTaged(text.toUtf8());
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
index be89ead3d..9a8efa4ae 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
@@ -141,7 +141,7 @@ void				CDBGroupListSheetIconPhrase::setSectionGroupId(CInterfaceGroup	*pIG, uin
 		pPM->getPhraseLevelFromSection(sectionId, minLevel, maxLevel);
 		strFindReplace(sectionText, "%min", toString(minLevel));
 		strFindReplace(sectionText, "%max", toString(maxLevel));
-		name->setText (sectionText);
+		name->setText (sectionText.toUtf8());
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index f34053396..8483e9925 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -1086,7 +1086,7 @@ void		CDBGroupListSheetText::CSheetChild::updateViewTextAsItem()
 		}
 
 		// set text
-		Text->setTextFormatTaged(text);
+		Text->setTextFormatTaged(text.toUtf8());
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
index 2486bfc29..d9a495635 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
@@ -135,7 +135,7 @@ public:
 		{
 			ucstring text;
 			Ctrl->getContextHelp(text);
-			Text->setText(text);
+			Text->setText(text.toUtf8());
 		}
 
 		// create a CViewText object that is displayed next to the item. This is the opportunnity to create
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
index 490c36b85..8e21b7f26 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
@@ -137,11 +137,11 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::updateViewText(CDB
 	// Temp if the Desc2 is empty, set Name
 	ucstring desc2(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(brickSheetId));
 	if( !desc2.empty() && !hasOnlyBlankChars(desc2))	// tolerate Blank error in translation
-		Text->setText(desc2);
+		Text->setText(desc2.toUtf8());
 	else
 	{
 		desc2 = STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brickSheetId);
-		Text->setText(desc2);
+		Text->setText(desc2.toUtf8());
 	}
 
 
@@ -159,7 +159,7 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::updateViewText(CDB
 		{
 			// Special Case for the "Remove Brick" brick. No Cost (not revelant)
 			if( brick->Id==pBM->getInterfaceRemoveBrick() )
-				CostView->setText( ucstring() );
+				CostView->setText( std::string() );
 			else if( brick->SabrinaCost == 0 && brick->SabrinaRelativeCost != 0.f )
 				CostView->setText( toString("%+d", (sint32)(brick->SabrinaRelativeCost * 100.f) ) + string("%") );
 			else
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
index ec1bfbaed..3cdf24ca8 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
@@ -94,7 +94,7 @@ void CDBGroupListSheetTextPhrase::CSheetChildPhrase::updateViewText(CDBGroupList
 #endif
 
 	// set
-	Text->setText(text);
+	Text->setText(text.toUtf8());
 }
 
 
@@ -173,7 +173,7 @@ void				CDBGroupListSheetTextPhrase::setSectionGroupId(CInterfaceGroup	*pIG, uin
 		pPM->getPhraseLevelFromSection(sectionId, minLevel, maxLevel);
 		strFindReplace(sectionText, "%min", toString(minLevel));
 		strFindReplace(sectionText, "%max", toString(maxLevel));
-		name->setText (sectionText);
+		name->setText (sectionText.toUtf8());
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
index 45a78980e..6e98afc5c 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
@@ -48,7 +48,7 @@ void CDBGroupListSheetTextPhraseId::CSheetChildPhrase::updateViewText(CDBGroupLi
 	// Get the User Name of the phrase
 	Ctrl->getContextHelp(text);
 
-	Text->setText(text);
+	Text->setText(text.toUtf8());
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index ce7f2fcf5..b0924f0af 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -457,7 +457,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 
 	// setup color and text
 	text= colorTag + text;
-	Text->setTextFormatTaged(text);
+	Text->setTextFormatTaged(text.toUtf8());
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index ec82b5c8d..6ab68522d 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -303,8 +303,8 @@ void CEncyclopediaManager::rebuildAlbumPage(uint32 albumName)
 	if (pRBVT != NULL)
 	{
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-		const ucstring desc(pSMC->getSBrickLocalizedDescription(CSheetId(pAlbum->RewardBrick)));
-		pRBVT->setText(desc);
+		CUtfStringView desc(pSMC->getSBrickLocalizedDescription(CSheetId(pAlbum->RewardBrick)));
+		pRBVT->setText(desc.toUtf8());
 	}
 }
 
@@ -359,18 +359,18 @@ void CEncyclopediaManager::rebuildThemaPage(uint32 themaName)
 	{
 		if (pES->type() == CEntitySheet::ITEM)
 		{
-			const ucstring desc(pSMC->getItemLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc);
+			CUtfStringView desc(pSMC->getItemLocalizedDescription(CSheetId(pThema->RewardSheet)));
+			pRBVT->setText(desc.toUtf8());
 		}
 		else if (pES->type() == CEntitySheet::SBRICK)
 		{
-			const ucstring desc(pSMC->getSBrickLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc);
+			CUtfStringView desc(pSMC->getSBrickLocalizedDescription(CSheetId(pThema->RewardSheet)));
+			pRBVT->setText(desc.toUtf8());
 		}
 		else if (pES->type() == CEntitySheet::SPHRASE)
 		{
-			const ucstring desc(pSMC->getSPhraseLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc);
+			CUtfStringView desc(pSMC->getSPhraseLocalizedDescription(CSheetId(pThema->RewardSheet)));
+			pRBVT->setText(desc.toUtf8());
 		}
 	}
 
diff --git a/ryzom/client/src/interface_v3/flying_text_manager.cpp b/ryzom/client/src/interface_v3/flying_text_manager.cpp
index 23e6e963e..f577d41e2 100644
--- a/ryzom/client/src/interface_v3/flying_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/flying_text_manager.cpp
@@ -143,7 +143,7 @@ void	CFlyingTextManager::addFlyingText(void *key, const ucstring &text, const NL
 	gi.UsedThisFrame= true;
 
 	// update infos
-	gi.ViewText->setText(text);
+	gi.ViewText->setText(text.toUtf8());
 	gi.ViewText->setColor(color);
 	gi.GroupInScene->Position= pos;
 	gi.GroupInScene->Scale= scale;
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index 87fcec6ce..3c18eb22c 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -414,7 +414,7 @@ void CGroupCompas::draw()
 				}
 				if (_DistViewText != distText)
 				{
-					_DistView->setText(distText);
+					_DistView->setText(distText.toUtf8());
 					_DistViewText = distText;
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 86ccd8e95..f070d3224 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -530,10 +530,10 @@ void CGroupInSceneBubbleManager::addSkillPopup (uint skillId, sint delta, uint t
 	if (group)
 	{
 		// Skill name
-		const ucstring sSkillName(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId));
+		CUtfStringView sSkillName(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId));
 		CViewText *pViewSkillName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewSkillName != NULL)
-			pViewSkillName->setText (sSkillName);
+			pViewSkillName->setText (sSkillName.toUtf8());
 
 		// Skill value
 		CCDBNodeLeaf *skillLeaf = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SKILLS:"+toString(skillId)+":BaseSKILL", false);
@@ -599,7 +599,7 @@ void CGroupInSceneBubbleManager::addMessagePopup (const ucstring &message, CRGBA
 		CViewText *pViewName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewName != NULL)
 		{
-			pViewName->setText (message);
+			pViewName->setText (message.toUtf8());
 			pViewName->setColor (color);
 		}
 
@@ -648,7 +648,7 @@ void CGroupInSceneBubbleManager::addMessagePopupCenter (const ucstring &message,
 		CViewText *pViewName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewName != NULL)
 		{
-			pViewName->setTextFormatTaged(message);
+			pViewName->setTextFormatTaged(message.toUtf8());
 			pViewName->setColor (color);
 		}
 
@@ -787,7 +787,7 @@ void CGroupInSceneBubbleManager::addContextHelp (const ucstring &message, const
 					}
 				}
 
-				text->setText(finalMessage);
+				text->setText(finalMessage.toUtf8());
 			}
 		}
 		context->Group->setActive(true);
@@ -1080,7 +1080,7 @@ void CGroupInSceneBubbleManager::webIgChatOpen (uint32 nBotUID, string text, con
 		if (pVT != NULL)
 		{
 			pVT->setActive(false);
-			pVT->setText(ucstring(""));
+			pVT->setText(std::string());
 		}
 		pCL = dynamic_cast<CCtrlLink*>(bubble->getElement(id+"optb"+toString(j)));
 		if (pCL != NULL) pCL->setActive(false);
@@ -1094,7 +1094,7 @@ void CGroupInSceneBubbleManager::webIgChatOpen (uint32 nBotUID, string text, con
 			pVT->setActive(true);
 			ucstring optionText;
 			optionText.fromUtf8(strs[j]);
-			pVT->setText(optionText);
+			pVT->setText(optionText.toUtf8());
 			pCL = dynamic_cast<CCtrlLink*>(bubble->getElement(id+"optb"+toString(j)));
 			if (pCL != NULL)
 			{
@@ -1485,7 +1485,7 @@ void CGroupInSceneBubble::setRawText (const ucstring &text)
 	CInterfaceElement *pVTIE = CWidgetManager::getInstance()->getElementFromId(getId()+":header_opened:window:text");
 	CViewText *pVT= dynamic_cast<CViewText*>(pVTIE);
 	if (pVT != NULL)
-		pVT->setText(text);
+		pVT->setText(text.toUtf8());
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index 8c853b191..fe846038c 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -780,19 +780,19 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			// Set player name
 			if (info->_Name)
 			{
-				info->_Name->setText(entityName);
+				info->_Name->setText(entityName.toUtf8());
 				info->_Name->setModulateGlobalColor(false);
 			}
 
 			// Set player title
 			if (info->_Title)
-				info->_Title->setText(entityTitle);
+				info->_Title->setText(entityTitle.toUtf8());
 
 			// Set tribe name
 			if (info->_TribeName)
 			{
 				nlassert(info->_GuildName == NULL);
-				info->_TribeName->setText(theTribeName);
+				info->_TribeName->setText(theTribeName.toUtf8());
 			}
 
 			// Init user leaf nodes
@@ -966,7 +966,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 		if (pPlayer != NULL)
 			if (pPlayer->isAFK())
 				entityName += CI18N::get("uiAFK");
-		_Name->setText(entityName);
+		_Name->setText(entityName.toUtf8());
 
 		// Title color get the PVP color
 		if (_Title)
@@ -994,7 +994,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 		ucstring ucsTmp;
 		if (pSMC->getString (_Entity->getGuildNameID(), ucsTmp))
-			_GuildName->setText(ucsTmp);
+			_GuildName->setText(ucsTmp.toUtf8());
 
 		// guildname color is the pvp color
 		_GuildName->setColor(entityColor);
@@ -1020,7 +1020,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 		ucstring ucsTmp;
 		if (pSMC->getString (_Entity->getEventFactionID(), ucsTmp))
-			_EventFaction->setText(ucsTmp);
+			_EventFaction->setText(ucsTmp.toUtf8());
 
 		// guildname color depends of PVP faction or not
 		_EventFaction->setColor(entityColor);
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 41b6f021e..4315b1b8b 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -2483,7 +2483,7 @@ void CGroupMap::updateMatchedLandmarks()
 			CViewText* t = dynamic_cast<CViewText *>(g->getView("title"));
 			if (t)
 			{
-				t->setSingleLineTextFormatTaged(_MatchedLandmarks[k].Title);
+				t->setSingleLineTextFormatTaged(_MatchedLandmarks[k].Title.toUtf8());
 			}
 
 			CViewBitmap* b = dynamic_cast<CViewBitmap *>(g->getView("icon"));
@@ -2553,7 +2553,7 @@ void CGroupMap::createLMWidgets(const std::vector<CContLandMark> &lms)
 		else // just add a text
 		{
 			CLandMarkText *pNewText = new CLandMarkText(CViewBase::TCtorParam());
-			pNewText->setText(ucsTmp);
+			pNewText->setText(ucsTmp.toUtf8());
 			pNewText->Pos = mapPos;
 			pNewText->setParent(this);
 			pNewText->setParentPosRef(Hotspot_BL);
@@ -3411,7 +3411,7 @@ CGroupMap::CLandMarkText* CGroupMap::findClosestLandmark(const CVector2f &center
 	for(TLandMarkTextVect::const_iterator it = landmarks.begin(); it != landmarks.end(); ++it)
 	{
 		ucstring lc;
-		lc = (*it)->getText();
+		lc = CUtfStringView((*it)->getText()).toUtf16();
 		if(filterLandmark(lc, keywords, startsWith)) {
 			CVector2f pos;
 			mapToWorld(pos, (*it)->Pos);
@@ -3466,7 +3466,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
 			mapToWorld(ct.Pos, lmt->Pos);
-			ct.Name = lmt->getText();
+			ct.Name = CUtfStringView(lmt->getText()).toUtf16();
 			closest = dist;
 			found = true;
 		}
@@ -3814,7 +3814,7 @@ void CGroupMap::updateClosestLandMarkMenu(const std::string &menu, const NLMISC:
 		CViewTextMenu* vt = rootMenu->addLine(ucstring(""), "map_landmark_by_index", ahParams, lineId.c_str(), "", "", false, false, false);
 		if (!vt) break;
 
-		vt->setSingleLineTextFormatTaged(name);
+		vt->setSingleLineTextFormatTaged(name.toUtf8());
 		// TODO: should calculate from mouse pos and client width
 		vt->setLineMaxW(800);
 
diff --git a/ryzom/client/src/interface_v3/group_modal_get_key.cpp b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
index c2d29df78..e3791cf8e 100644
--- a/ryzom/client/src/interface_v3/group_modal_get_key.cpp
+++ b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
@@ -89,7 +89,7 @@ bool CGroupModalGetKey::handleEvent (const NLGUI::CEventDescriptor &event)
 				// Setup the text !
 				CInterfaceManager *pIM = CInterfaceManager::getInstance();
 				CViewText *pVT= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId( VIEW_TEXT_KEY ));
-				if (pVT != NULL) pVT->setText(Combo.toUCString());
+				if (pVT != NULL) pVT->setText(Combo.toUCString().toUtf8());
 
 				// Check if in use
 				CActionsManager *pCurAM = NULL;
@@ -111,12 +111,12 @@ bool CGroupModalGetKey::handleEvent (const NLGUI::CEventDescriptor &event)
 						if (baseAction && pCurAM->isActionPresentInContext(it->second))
 						{
 							ucstring shortcutName = baseAction->getActionLocalizedText(it->second);
-							if (pVT != NULL) pVT->setText(shortcutName);
+							if (pVT != NULL) pVT->setText(shortcutName.toUtf8());
 						}
 					}
 					else
 					{
-						if (pVT != NULL) pVT->setText(string(""));
+						if (pVT != NULL) pVT->setText(string());
 					}
 				}
 
diff --git a/ryzom/client/src/interface_v3/group_skills.cpp b/ryzom/client/src/interface_v3/group_skills.cpp
index f2586401a..053bddf86 100644
--- a/ryzom/client/src/interface_v3/group_skills.cpp
+++ b/ryzom/client/src/interface_v3/group_skills.cpp
@@ -387,7 +387,7 @@ void CGroupSkills::createAllTreeNodes()
 				// Set Skill Name
 				CViewText *pViewSkillName = dynamic_cast<CViewText*>(pIG->getView("name"));
 				if (pViewSkillName != NULL)
-					pViewSkillName->setText (sSkillName);
+					pViewSkillName->setText (sSkillName.toUtf8());
 				// Set Skill Max Value
 				CViewText *pViewSkillMax = dynamic_cast<CViewText*>(pIG->getView("max"));
 				if (pViewSkillMax != NULL)
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index d00661357..3a25c0198 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -470,7 +470,7 @@ void CGuildManager::update()
 			{
 				CViewText *pJoinPropPhraseView = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_JOIN_PROPOSAL_PHRASE));
 				if (pJoinPropPhraseView != NULL)
-					pJoinPropPhraseView->setText(_JoinPropPhrase);
+					pJoinPropPhraseView->setText(_JoinPropPhrase.toUtf8());
 
 				pJoinProp->setActive(true);
 				CWidgetManager::getInstance()->setTopWindow(pJoinProp);
@@ -724,7 +724,7 @@ bool CDBGroupListAscensor::CSheetChildAscensor::isInvalidated(CDBGroupListSheetT
 		ucstring name;
 		if (nameID && pSMC->getDynString(nameID, name))
 		{
-			Text->setText(name);
+			Text->setText(name.toUtf8());
 
 			uint64 icon = NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:ASCENSOR:" + toString(Index) + ":ICON")->getValue64();
 
@@ -830,20 +830,20 @@ class CAHGuildSheetOpen : public IActionHandler
 				// Set name
 				CViewText *pViewName = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_NAME));
 				if (pViewName != NULL)
-					pViewName->setText (rGuildMembers[i].Name);
+					pViewName->setText (rGuildMembers[i].Name.toUtf8());
 
 				// Set Grade
 				CViewText *pViewGrade = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_GRADE));
 				if (pViewGrade != NULL)
 				{
 					if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::Leader)
-						pViewGrade->setText (CI18N::get("uiGuildLeader"));
+						pViewGrade->setText (CI18N::get("uiGuildLeader").toUtf8());
 					else if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::HighOfficer)
-						pViewGrade->setText (CI18N::get("uiGuildHighOfficer"));
+						pViewGrade->setText (CI18N::get("uiGuildHighOfficer").toUtf8());
 					else if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::Officer)
-						pViewGrade->setText (CI18N::get("uiGuildOfficer"));
+						pViewGrade->setText (CI18N::get("uiGuildOfficer").toUtf8());
 					else
-						pViewGrade->setText (CI18N::get("uiGuildMember"));
+						pViewGrade->setText (CI18N::get("uiGuildMember").toUtf8());
 				}
 
 				// online?
@@ -888,7 +888,7 @@ class CAHGuildSheetOpen : public IActionHandler
 					str += toString("%01d", rt.getRyzomCycle()+1) +", ";
 					str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)rt.getRyzomMonthInCurrentCycle() )) + ", ";
 					str += toString("%02d", rt.getRyzomDayOfMonth()+1);
-					pViewEnterDate->setText(str);
+					pViewEnterDate->setText(str.toUtf8());
 				}
 
 				// Add to the list
diff --git a/ryzom/client/src/interface_v3/interface_ddx.cpp b/ryzom/client/src/interface_v3/interface_ddx.cpp
index 347a0d94d..caa394723 100644
--- a/ryzom/client/src/interface_v3/interface_ddx.cpp
+++ b/ryzom/client/src/interface_v3/interface_ddx.cpp
@@ -350,7 +350,7 @@ void CInterfaceDDX::CParam::updateScrollView(sint32 nVal)
 {
 	if(ResultView)
 	{
-		ResultView->setText(ucstring(toString(nVal)) + ResultUnit);
+		ResultView->setText(toString(nVal) + ResultUnit.toUtf8());
 	}
 }
 
@@ -361,7 +361,7 @@ void CInterfaceDDX::CParam::updateScrollView(double nVal)
 	{
 		// allow N digits
 		string	fmt= toString("%%.%df", ResultDecimal);
-		ResultView->setText(ucstring(toString(fmt.c_str(), nVal)) + ResultUnit);
+		ResultView->setText(toString(fmt.c_str(), nVal) + ResultUnit.toUtf8());
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 5737e50a0..fdc132030 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1530,7 +1530,7 @@ void CInterfaceManager::updateFrameEvents()
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather"));
 			if (pVT != NULL)
-				pVT->setText(str);
+				pVT->setText(str.toUtf8());
 
 			CCtrlBase *pTooltip= dynamic_cast<CCtrlBase*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather_tt"));
 			if (pTooltip != NULL)
@@ -1564,7 +1564,7 @@ void CInterfaceManager::updateFrameEvents()
 
 			pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time"));
 			if (pVT != NULL)
-				pVT->setText(str);
+				pVT->setText(str.toUtf8());
 
 			str.clear();
 			// Update the clock in the compass if enabled.
@@ -1577,7 +1577,7 @@ void CInterfaceManager::updateFrameEvents()
 						str = getTimestampHuman("%I:%M %p");
 					else
 						str = getTimestampHuman("%H:%M");
-					pVT->setText(str);
+					pVT->setText(str.toUtf8());
 				}
 			}
 		}
@@ -2388,7 +2388,7 @@ void CInterfaceManager::messageBoxInternal(const string &msgBoxGroup, const ucst
 	if (group && viewText)
 	{
 		viewText->setCaseMode(caseMode);
-		viewText->setText(text);
+		viewText->setText(text.toUtf8());
 		CWidgetManager::getInstance()->enableModalWindow(NULL, group);
 		// don't understand why but need to update coords here
 		group->updateCoords();
@@ -2441,7 +2441,7 @@ void	CInterfaceManager::validMessageBox(TValidMessageIcon icon, const ucstring &
 		CWidgetManager::getInstance()->setProcedureAction("proc_valid_message_box_cancel", 1, ahOnCancel, paramsOnCancel);
 
 		// set text and icon
-		viewText->setText(text);
+		viewText->setText(text.toUtf8());
 		if(viewBitmap)
 		{
 			bool	active= true;
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 119ce44b2..ec754de33 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -884,7 +884,7 @@ int	CLuaIHMRyzom::setTextFormatTaged(CLuaState &ls)
 		throw ELuaIHMException("setTextFormatTaged(): '%s' is not a CViewText",    pIE->getId().c_str());
 
 	// Set the text as format
-	vt->setTextFormatTaged(text);
+	vt->setTextFormatTaged(text.toUtf8());
 
 	return 0;
 }
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index f97e90723..d9dfce119 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -103,14 +103,14 @@ void addKeyLine (CGroupList *pParent, const ucstring &keyName, const ucstring &s
 	CViewText *pViewKeyName = dynamic_cast<CViewText*>(pKeysLine->getView(TEMPLATE_KEYS_KEY_NAME));
 	if (pViewKeyName != NULL)
 	{
-		pViewKeyName->setText (keyName);
+		pViewKeyName->setText (keyName.toUtf8());
 		pViewKeyName->setColor(grayed?CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionCtrlTextGrayColor).getValColor():CRGBA::White);
 	}
 
 	CViewText *pViewShortcutName = dynamic_cast<CViewText*>(pKeysLine->getView(TEMPLATE_KEYS_SHORTCUT_NAME));
 	if (pViewShortcutName != NULL)
 	{
-		pViewShortcutName->setText (shortcutName);
+		pViewShortcutName->setText (shortcutName.toUtf8());
 		pViewShortcutName->setColor(grayed?CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionCtrlTextGrayColor).getValColor():CRGBA::White);
 	}
 
@@ -512,9 +512,9 @@ void CModalContainerEditCmd::activate()
 	NLGUI::CDBManager::getInstance()->getDbProp( DbComboDisp2P )->setValue32(-1);
 	// reset name of params
 	CViewText *pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_FIRST_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 	pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_SECOND_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 	invalidCurrentCommand();
 }
 
@@ -689,7 +689,7 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 			if (noParam == 0)	sText = WinName+VIEW_EDITCMD_FIRST_PARAM_NAME;
 			else				sText = WinName+VIEW_EDITCMD_SECOND_PARAM_NAME;
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sText));
-			if (pVT != NULL) pVT->setText(CI18N::get(pBA->Parameters[i].LocalizedName));
+			if (pVT != NULL) pVT->setText(CI18N::get(pBA->Parameters[i].LocalizedName).toUtf8());
 			noParam++;
 		}
 	}
@@ -711,7 +711,7 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_TEXT_KEY));
 		if (pVT != NULL) pVT->setActive(true);
 		// setup the text of the key
-		pVT->setText(it->second.toUCString());
+		pVT->setText(it->second.toUCString().toUtf8());
 
 		// There is already a shortcut so we can display ok button
 		pBut = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
@@ -778,7 +778,7 @@ void CModalContainerEditCmd::invalidCurrentCommand()
 	{
 		// Dont display key shortcut if we are in creation mode
 		pVT= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId( WinName+VIEW_EDITCMD_TEXT_KEY ));
-		if (pVT != NULL) pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
+		if (pVT != NULL) pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
 
 		// Deactivate the key definer text
 		pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_TEXT_KEY));
@@ -887,7 +887,7 @@ void CModalContainerEditCmd::validCurrentCommand()
 			{
 				CurrentEditCmdLine.Combo = it->second;
 				// Yes ok let setup the text of the key
-				pVT->setText(it->second.toUCString());
+				pVT->setText(it->second.toUCString().toUtf8());
 				// There is already a shortcut so we can display ok button
 				CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
 				if (pCB != NULL) pCB->setFrozen (false);
@@ -897,7 +897,7 @@ void CModalContainerEditCmd::validCurrentCommand()
 				CurrentEditCmdLine.Combo.Key = KeyCount;
 				CurrentEditCmdLine.Combo.KeyButtons = noKeyButton;
 				// Display not assigned text
-				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
+				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
 				// Do not display the ok button
 				CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
 				if (pCB != NULL) pCB->setFrozen (true);
@@ -1048,9 +1048,9 @@ void CModalContainerEditCmd::onChangeCategory()
 	// reset name of params
 	CViewText *pViewParamName;
 	pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_FIRST_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 	pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_SECOND_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 	// Reset key
 	invalidCurrentCommand();
 }
@@ -1086,9 +1086,9 @@ void CModalContainerEditCmd::onChangeAction()
 	// reset name of params
 	CViewText *pViewParamName;
 	pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_FIRST_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 	pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_SECOND_PARAM_NAME));
-	if (pViewParamName != NULL) pViewParamName->setText (string(""));
+	if (pViewParamName != NULL) pViewParamName->setText (string());
 
 	uint noParam = 0;
 	for (uint i = 0; i < rVParams.size(); ++i)
@@ -1111,7 +1111,7 @@ void CModalContainerEditCmd::onChangeAction()
 
 			pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sViewText));
 			if (pViewParamName != NULL)
-				pViewParamName->setText (CI18N::get(rP.LocalizedName));
+				pViewParamName->setText (CI18N::get(rP.LocalizedName).toUtf8());
 		}
 
 		if (rP.Type == CBaseAction::CParameter::Constant)
@@ -1354,7 +1354,7 @@ public:
 			pMCM->NewKey->CurrentEditCmdLine.Combo = pGetKey->Combo;
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(pMCM->NewKey->WinName+VIEW_EDITCMD_TEXT_KEY));
-			if (pVT != NULL) pVT->setText(pMCM->NewKey->CurrentEditCmdLine.Combo.toUCString());
+			if (pVT != NULL) pVT->setText(pMCM->NewKey->CurrentEditCmdLine.Combo.toUCString().toUtf8());
 
 			CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(pMCM->NewKey->WinName+CTRL_EDITCMD_BUTTON_OK));
 			if (pCB != NULL) pCB->setFrozen (false);
@@ -1366,7 +1366,7 @@ public:
 			pMCM->EditCmd->CurrentEditCmdLine.Combo = pGetKey->Combo;
 			pMCM->CurrentEditMacro.Combo = pMCM->EditCmd->CurrentEditCmdLine.Combo;
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_NEWMACRO_KEY));
-			if (pVT != NULL) pVT->setText(pMCM->EditCmd->CurrentEditCmdLine.Combo.toUCString());
+			if (pVT != NULL) pVT->setText(pMCM->EditCmd->CurrentEditCmdLine.Combo.toUCString().toUtf8());
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index bf2197e45..12b066fff 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -827,7 +827,7 @@ void addCommandLine (CGroupList *pParent, uint cmdNb, const ucstring &cmdName)
 	if (pNewCmd == NULL) return;
 
 	CViewText *pVT = dynamic_cast<CViewText*>(pNewCmd->getView(TEMPLATE_NEWMACRO_COMMAND_TEXT));
-	if (pVT != NULL) pVT->setText(cmdName);
+	if (pVT != NULL) pVT->setText(cmdName.toUtf8());
 
 	pNewCmd->setParent (pParent);
 	pParent->addChild (pNewCmd);
@@ -895,9 +895,9 @@ public:
 		if (pVT != NULL)
 		{
 			if (pMCM->CurrentEditMacro.Combo.Key == KeyCount)
-				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
+				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
 			else
-				pVT->setText(pMCM->CurrentEditMacro.Combo.toUCString());
+				pVT->setText(pMCM->CurrentEditMacro.Combo.toUCString().toUtf8());
 		}
 
 		pList->clearGroups();
@@ -1003,9 +1003,9 @@ void addMacroLine (CGroupList *pParent, uint macNb, const CMacroCmd &macro)
 	if (pVT != NULL)
 	{
 		if (macro.Combo.Key != KeyCount)
-			pVT->setText(macro.Combo.toUCString());
+			pVT->setText(macro.Combo.toUCString().toUtf8());
 		else
-			pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
+			pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
 	}
 
 	pNewMacro->setParent (pParent);
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 56f97b554..a0a7aed66 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -328,7 +328,7 @@ void CMusicPlayer::rebuildPlaylist()
 				{
 					ucstring title;
 					title.fromUtf8(_Songs[i].Title);
-					pVT->setText(title);
+					pVT->setText(title.toUtf8());
 				}
 
 				pVT = dynamic_cast<CViewText *>(pNew->getView(TEMPLATE_PLAYLIST_SONG_DURATION));
@@ -483,7 +483,7 @@ void CMusicPlayer::updatePlayingInfo(const std::string info)
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
 	if (pVT)
 	{
-		pVT->setText(ucstring::makeFromUtf8(info));
+		pVT->setText(info);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 7bde7d0fc..e285bbaf9 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2831,7 +2831,7 @@ class CHandlerSelectChatSource : public IActionHandler
 					{
 						ucstring title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-						pVTM->setText("["+s+"] " + title);
+						pVTM->setText("["+s+"] " + title.toUtf8());
 					}
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/task_bar_manager.cpp b/ryzom/client/src/interface_v3/task_bar_manager.cpp
index 70d2d9fe7..7c9bb2a45 100644
--- a/ryzom/client/src/interface_v3/task_bar_manager.cpp
+++ b/ryzom/client/src/interface_v3/task_bar_manager.cpp
@@ -180,9 +180,9 @@ public:
 			if (pVT != NULL)
 			{
 				if (it != acmap.end())
-					pVT->setText(it->second.toUCString());
+					pVT->setText(it->second.toUCString().toUtf8());
 				else
-					pVT->setText(CI18N::get("uiNotAssigned"));
+					pVT->setText(CI18N::get("uiNotAssigned").toUtf8());
 			}
 		}
 	}
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index b134a5519..9e0fb7f12 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -243,7 +243,7 @@ void createOptionalCatUI()
 			pVT = dynamic_cast<CViewText*>(pNewLine->getView("size"));
 			if (pVT != NULL)
 			{
-				pVT->setText(BGDownloader::getWrittenSize(InfoOnPatch.OptCat[i].Size));
+				pVT->setText(BGDownloader::getWrittenSize(InfoOnPatch.OptCat[i].Size).toUtf8());
 			}
 
 			// Add to the list
@@ -287,7 +287,7 @@ static void setDataScanLog(const ucstring &text)
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:log_txt:log"));
 	if (pVT != NULL)
 	{
-		pVT->setText(text);
+		pVT->setText(text.toUtf8());
 	}
 }
 
@@ -296,10 +296,10 @@ static void setDataScanState(const ucstring &text, ucstring progress= ucstring()
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:state"));
-	if (pVT != NULL) pVT->setText(text);
+	if (pVT != NULL) pVT->setText(text.toUtf8());
 
 	pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:progress"));
-	if (pVT != NULL) pVT->setText(progress);
+	if (pVT != NULL) pVT->setText(progress.toUtf8());
 }
 
 void initCatDisplay()
@@ -338,7 +338,7 @@ static void setPatcherStateText(const std::string &baseUIPath, const ucstring &s
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:state"));
 	if (pVT != NULL)
 	{
-		pVT->setText(str);
+		pVT->setText(str.toUtf8());
 	}
 }
 
@@ -349,7 +349,7 @@ static void setPatcherProgressText(const std::string &baseUIPath, const ucstring
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:progress"));
 	if (pVT != NULL)
 	{
-		pVT->setText(str);
+		pVT->setText(str.toUtf8());
 	}
 }
 
@@ -717,7 +717,7 @@ void loginMainLoop()
 			ucstring sTmp;
 			sTmp = BGDownloader::getWrittenSize(currentPatchingSize);
 			sTmp += " / " + BGDownloader::getWrittenSize(totalPatchSize);
-			if (pVT != NULL) pVT->setText(sTmp);
+			if (pVT != NULL) pVT->setText(sTmp.toUtf8());
 		}
 //		else if (screen == UI_VARIABLES_SCREEN_CATDISP) // If we are displaying patch info
 		else if (LoginSM.getCurrentState() == CLoginStateMachine::st_display_cat)
@@ -766,10 +766,10 @@ void loginMainLoop()
 			// Total size of the patches is optional cats + required cat (f(optCat)) + non opt cat
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_TOTAL_SIZE));
-			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(TotalPatchSize));
+			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(TotalPatchSize).toUtf8());
 
 			pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_NON_OPTIONAL_SIZE));
-			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(nNonOptSize));
+			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(nNonOptSize).toUtf8());
 		}
 	}
 }
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 642935869..d1744f3ff 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -3374,7 +3374,7 @@ private:
 				// must set the text by hand
 				CViewText	*vt= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(CWidgetManager::getInstance()->getParser()->getDefine("server_message_box_content_view_text")));
 				if(vt)
-					vt->setTextFormatTaged(contentStr);
+					vt->setTextFormatTaged(contentStr.toUtf8());
 
 				// open
 				CWidgetManager::getInstance()->setTopWindow(pGC);
diff --git a/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
index eafdec032..15e8209db 100644
--- a/ryzom/client/src/player_cl.cpp
+++ b/ryzom/client/src/player_cl.cpp
@@ -753,7 +753,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 		if (_Slot == 0)
 		{
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player:header_opened:player_title"));
-			if (pVT != NULL) pVT->setText(_Title);
+			if (pVT != NULL) pVT->setText(_Title.toUtf8());
 		}
 
 		// rebuild in scene interface
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index ee203d312..a708bc2a4 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -1761,7 +1761,7 @@ void CEditor::waitScenarioScreen()
 				// Display the firewall alert string
 				CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:r2ed_connecting:title"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiFirewallAlert")+ucstring("..."));
+					pVT->setText(CI18N::get("uiFirewallAlert").toUtf8()+"...");
 
 				// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
 				nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@@ -1853,8 +1853,8 @@ void CEditor::waitScenarioScreen()
 				if (pVT != NULL)
 				{
 					pVT->setMultiLine( true );
-					pVT->setText(CI18N::get("uiFirewallFail")+ucstring(".\n")+
-								  CI18N::get("uiFirewallAlert")+ucstring("."));
+					pVT->setText(CI18N::get("uiFirewallFail").toUtf8()+".\n"+
+								  CI18N::get("uiFirewallAlert").toUtf8()+".");
 				}
 			}
 		}
@@ -6468,7 +6468,7 @@ void CEditor::connectionMsg(const std::string &stringId)
 		CViewText *vt = dynamic_cast<CViewText *>(r2ConnectWindow->getView("connexionMsg"));
 		if (vt)
 		{
-			vt->setText(CI18N::get(stringId));
+			vt->setText(CI18N::get(stringId).toUtf8());
 		}
 	}
 }
@@ -7497,7 +7497,7 @@ class CAHInviteCharacter : public IActionHandler
 					{
 						CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 						if (pVT != NULL)
-							pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial"));
+							pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial").toUtf8());
 
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 					}
diff --git a/ryzom/client/src/session_browser_impl.cpp b/ryzom/client/src/session_browser_impl.cpp
index 9f3cc77a9..f11c24a54 100644
--- a/ryzom/client/src/session_browser_impl.cpp
+++ b/ryzom/client/src/session_browser_impl.cpp
@@ -230,7 +230,7 @@ int CSessionBrowserImpl::luaJoinRingSession(CLuaState &ls)
 	{
 		CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 		if (pVT != NULL)
-			pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
+			pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
 		CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:warning_free_trial");
 	}
 

From c129ce87df3838ee5d6d49cea213901e6194a7e0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 13:51:18 +0800
Subject: [PATCH 059/292] Change CViewText to UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/gui/view_text.h | 4 ++--
 nel/src/3d/font_manager.cpp     | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 959c82855..2ffaa8d49 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -247,7 +247,7 @@ namespace NLGUI
 		std::string _HardTextFormat;
 		std::string _HardText;
 		std::string _Text;
-		size_t _TextLength;
+		mutable sint _TextLength;
 		/// index of the computed String associated to this text control
 		uint _Index;
 		/// info on the computed String associated to this text control
@@ -443,7 +443,7 @@ namespace NLGUI
 		void setup ();
 		void setupDefault ();
 
-		void setStringSelectionSkipingSpace(uint stringId, const ucstring &text, sint charStart, sint charEnd);
+		void setStringSelectionSkipingSpace(uint stringId, const std::string &text, sint charStart, sint charEnd);
 
 	//	void pushString(const ucstring &str, bool deleteSpaceAtStart = false);
 
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index 4a8162f51..872c1fd3d 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -130,6 +130,7 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 	output.CacheVersion = getCacheVersion();
 
 	uint j = 0;
+	size_t idx = 0;
 	{
 		CVertexBufferReadWrite vba;
 		output.Vertices.lock (vba);
@@ -138,8 +139,7 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		hlfPixScrH = 0.f;
 
 		// For all chars
-		//for (uint i = 0; i < s.size(); i++)
-		for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+		for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it, ++idx)
 		{
 			// Creating font
 			k.Char = *it;
@@ -211,7 +211,8 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		}
 	}
 	output.Vertices.setNumVertices (j);
-	output.Length = j >> 2;
+	output.Length = idx;
+	nlassert(output.Length == NLMISC::CUtfStringView(output.Text).count());
 
 	// compile string info
 	output.StringWidth = (float)penx;
@@ -316,6 +317,7 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 		}
 	}
 	output.Length = idx;
+	nlassert(output.Length == std::min(len, NLMISC::CUtfStringView(output.Text).count()));
 
 	// compile string info
 	output.StringWidth = (float)penx;

From c3ef0fc91c2cd0a993aeda88248ab7780ae455d8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 14:21:13 +0800
Subject: [PATCH 060/292] Change CViewText to UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/gui/string_case.h |   1 +
 nel/include/nel/misc/common.h     |  11 +--
 nel/src/gui/string_case.cpp       | 124 ++++++++++++++++++++++++++++++
 nel/src/misc/common.cpp           |   4 +
 nel/src/misc/unicode.cpp          |  67 ++++++++++++++++
 5 files changed, 202 insertions(+), 5 deletions(-)

diff --git a/nel/include/nel/gui/string_case.h b/nel/include/nel/gui/string_case.h
index ec8fa2925..300d72c76 100644
--- a/nel/include/nel/gui/string_case.h
+++ b/nel/include/nel/gui/string_case.h
@@ -39,6 +39,7 @@ namespace NLGUI
 
 
 	void setCase( ucstring &str, TCaseMode mode );
+	void setCase( std::string &str, TCaseMode mode );
 
 
 }
diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index a5d1b2f27..7b89bae3b 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -227,17 +227,18 @@ inline double	isValidDouble (double v)
  * \param str a string to transform to lower case
  */
 
-std::string toLower ( const char *str );
-std::string	toLower ( const std::string &str );
-void		toLower ( char *str );
+std::string toLower ( const char *str ); // UTF-8
+std::string	toLower ( const std::string &str ); // UTF-8
+void		toLower ( char *str ); // Ascii only
 char		toLower ( const char ch );	// convert only one character
 
 /** Convert a string in upper case.
  * \param a string to transform to upper case
  */
 
-std::string	toUpper ( const std::string &str);
-void		toUpper ( char *str);
+std::string toUpper ( const char *str ); // UTF-8
+std::string	toUpper ( const std::string &str); // UTF-8
+void		toUpper ( char *str); // Ascii only
 
 
 /**
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index c96e2cc7f..f6218d39a 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -19,6 +19,7 @@
 
 #include "stdpch.h"
 #include "nel/gui/string_case.h"
+#include "nel/misc/utf_string_view.h"
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
@@ -26,13 +27,33 @@
 
 namespace NLGUI
 {
+	inline bool isSeparator (u32char c)
+	{
+		return (c == (u32char)' ') || (c == (u32char)'\t') || (c == (u32char)'\n') || (c == (u32char)'\r');
+	}
+
 	inline bool isSeparator (ucchar c)
 	{
 		return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r');
 	}
 
+	inline bool isSeparator (char c)
+	{
+		return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r');
+	}
+
 	// ***************************************************************************
 
+	inline bool isEndSentence (u32char c, u32char lastChar)
+	{
+		// Ex: One sentence. Another sentence.
+		//                  ^
+		// Counterexample: nevrax.com
+		//                       ^
+		return ((c == (u32char)' ') || (c == (u32char)'\n'))
+			&& (lastChar == (u32char)'.') || (lastChar == (u32char)'!') || (lastChar == (u32char)'?');
+	}
+
 	inline bool isEndSentence (ucstring& str, uint index)
 	{
 		// Ex: One sentence. Another sentence.
@@ -117,6 +138,109 @@ namespace NLGUI
 		}
 	}
 
+	void setCase(std::string &str, TCaseMode mode)
+	{
+		const uint length = (uint)str.length();
+		uint i;
+		bool newString = true;
+		bool newSentence = true;
+		bool newWord = true;
+		switch (mode)
+		{
+		case CaseLower:
+			str = NLMISC::toLower(str);
+			break;
+		case CaseUpper:
+			str = NLMISC::toUpper(str);
+			break;
+		case CaseFirstStringLetterUp:
+		{
+			NLMISC::CUtfStringView sv(str);
+			std::string res;
+			res.reserve(sv.largestSize());
+			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			{
+				u32char c = *it;
+				if (c < 0x10000)
+				{
+					if (!isSeparator(c))
+					{
+						if (newString)
+							c = NLMISC::toUpper((ucchar)c);
+						else
+							c = NLMISC::toLower((ucchar)c);
+						newString = false;
+					}
+				}
+				NLMISC::CUtfStringView::append(res, c);
+			}
+			str = nlmove(res);
+			break;
+		}
+		case CaseFirstSentenceLetterUp:
+		{
+			NLMISC::CUtfStringView sv(str);
+			std::string res;
+			res.reserve(sv.largestSize());
+			u32char lastChar = 0;
+			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			{
+				u32char c = *it;
+				if (c < 0x10000)
+				{
+					if (isEndSentence(c, lastChar))
+						newSentence = true;
+					else
+					{
+						if (newSentence)
+							c = NLMISC::toUpper((ucchar)c);
+						else
+							c = NLMISC::toLower((ucchar)c);
+
+						if (!isSeparator(c))
+							newSentence = false;
+					}
+				}
+				NLMISC::CUtfStringView::append(res, c);
+				lastChar = c;
+			}
+			str = nlmove(res);
+			break;
+		}
+		case CaseFirstWordLetterUp:
+		{
+			NLMISC::CUtfStringView sv(str);
+			std::string res;
+			res.reserve(sv.largestSize());
+			u32char lastChar = 0;
+			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			{
+				u32char c = *it;
+				if (c < 0x10000)
+				{
+					if (isSeparator(c) || isEndSentence(c, lastChar))
+						newWord = true;
+					else
+					{
+						if (newWord)
+							c = NLMISC::toUpper((ucchar)c);
+						else
+							c = NLMISC::toLower((ucchar)c);
+
+						newWord = false;
+					}
+				}
+				NLMISC::CUtfStringView::append(res, c);
+				lastChar = c;
+			}
+			str = nlmove(res);
+			break;
+		}
+		default:
+			break;
+		}
+	}
+
 }
 
 
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index b9e9a7d85..c1bf67efa 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -594,6 +594,7 @@ NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human rea
 	return true;
 }
 
+/*
 std::string toLower(const char *str)
 {
 	if (!str) return "";
@@ -624,6 +625,7 @@ std::string	toLower(const std::string &str)
 	}
 	return res;
 }
+*/
 
 char toLower(const char ch)
 {
@@ -652,6 +654,7 @@ void toLower(char *str)
 	}
 }
 
+/*
 std::string toUpper(const std::string &str)
 {
 	string res;
@@ -665,6 +668,7 @@ std::string toUpper(const std::string &str)
 	}
 	return res;
 }
+*/
 
 void toUpper(char *str)
 {
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 47a4cdfde..12dfdcad4 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -16,6 +16,7 @@
 
 #include "stdmisc.h"
 #include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
 
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
@@ -1949,6 +1950,39 @@ ucchar		toLower (ucchar c)
 
 // ***************************************************************************
 
+static std::string toLower(CUtfStringView sv)
+{
+	std::string res;
+	res.reserve(sv.largestSize());
+	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x10000)
+		{
+			ucchar uc = c;
+			ucchar *result = toLowerUpperSearch(&uc, UnicodeUpperToLower);
+			if (result)
+				c = uc;
+		}
+		CUtfStringView::append(res, c);
+	}
+	return res;
+}
+
+std::string toLower(const char *str)
+{
+	return toLower(CUtfStringView(str));
+}
+
+// ***************************************************************************
+
+std::string	toLower(const std::string &str)
+{
+	return toLower(CUtfStringView(str));
+}
+
+// ***************************************************************************
+
 ucstring	toUpper (const ucstring &str)
 {
 	uint i;
@@ -1991,4 +2025,37 @@ ucchar		toUpper (ucchar c)
 
 // ***************************************************************************
 
+static std::string toUpper(CUtfStringView sv)
+{
+	std::string res;
+	res.reserve(sv.largestSize());
+	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x10000)
+		{
+			ucchar uc = c;
+			ucchar *result = toLowerUpperSearch(&uc, UnicodeLowerToUpper);
+			if (result)
+				c = uc;
+		}
+		CUtfStringView::append(res, c);
+	}
+	return res;
+}
+
+std::string toUpper(const char *str)
+{
+	return toUpper(CUtfStringView(str));
+}
+
+// ***************************************************************************
+
+std::string	toUpper(const std::string &str)
+{
+	return toUpper(CUtfStringView(str));
+}
+
+// ***************************************************************************
+
 } // NLMISC

From 506f9f26bde74fe3c82f71bb4aaaf5e493c1fcdf Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 15:07:41 +0800
Subject: [PATCH 061/292] Change CViewText to UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/misc/common.h   |  8 ++++----
 nel/include/nel/misc/ucstring.h |  6 ++++++
 nel/src/gui/string_case.cpp     |  4 ++--
 nel/src/misc/common.cpp         |  4 ----
 nel/src/misc/unicode.cpp        | 24 ++++++++++++------------
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 7b89bae3b..2f678acef 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -227,8 +227,8 @@ inline double	isValidDouble (double v)
  * \param str a string to transform to lower case
  */
 
-std::string toLower ( const char *str ); // UTF-8
-std::string	toLower ( const std::string &str ); // UTF-8
+std::string toLower ( const char *str ); // Ascii only
+std::string	toLower ( const std::string &str ); // Ascii only
 void		toLower ( char *str ); // Ascii only
 char		toLower ( const char ch );	// convert only one character
 
@@ -236,8 +236,8 @@ char		toLower ( const char ch );	// convert only one character
  * \param a string to transform to upper case
  */
 
-std::string toUpper ( const char *str ); // UTF-8
-std::string	toUpper ( const std::string &str); // UTF-8
+// std::string toUpper ( const char *str ); // Ascii only
+std::string	toUpper ( const std::string &str); // Ascii only
 void		toUpper ( char *str); // Ascii only
 
 
diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 61f7f416b..8bbcd828d 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -260,6 +260,12 @@ ucstring toUpper(const ucstring &str);
 void toUpper(ucchar *str);
 ucchar toUpper(ucchar c);
 
+std::string toLowerAsUtf8(const char *str);
+std::string	toLowerAsUtf8(const std::string &str);
+
+std::string toUpperAsUtf8(const char *str);
+std::string	toUpperAsUtf8(const std::string &str);
+
 };
 
 #endif // NL_UCSTRING_H
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index f6218d39a..d970d1e03 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -148,10 +148,10 @@ namespace NLGUI
 		switch (mode)
 		{
 		case CaseLower:
-			str = NLMISC::toLower(str);
+			str = NLMISC::toLowerAsUtf8(str);
 			break;
 		case CaseUpper:
-			str = NLMISC::toUpper(str);
+			str = NLMISC::toUpperAsUtf8(str);
 			break;
 		case CaseFirstStringLetterUp:
 		{
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index c1bf67efa..b9e9a7d85 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -594,7 +594,6 @@ NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human rea
 	return true;
 }
 
-/*
 std::string toLower(const char *str)
 {
 	if (!str) return "";
@@ -625,7 +624,6 @@ std::string	toLower(const std::string &str)
 	}
 	return res;
 }
-*/
 
 char toLower(const char ch)
 {
@@ -654,7 +652,6 @@ void toLower(char *str)
 	}
 }
 
-/*
 std::string toUpper(const std::string &str)
 {
 	string res;
@@ -668,7 +665,6 @@ std::string toUpper(const std::string &str)
 	}
 	return res;
 }
-*/
 
 void toUpper(char *str)
 {
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 12dfdcad4..6a0bf25c0 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -1950,7 +1950,7 @@ ucchar		toLower (ucchar c)
 
 // ***************************************************************************
 
-static std::string toLower(CUtfStringView sv)
+static std::string toLowerAsUtf8(CUtfStringView sv)
 {
 	std::string res;
 	res.reserve(sv.largestSize());
@@ -1962,23 +1962,23 @@ static std::string toLower(CUtfStringView sv)
 			ucchar uc = c;
 			ucchar *result = toLowerUpperSearch(&uc, UnicodeUpperToLower);
 			if (result)
-				c = uc;
+				c = result[1];
 		}
 		CUtfStringView::append(res, c);
 	}
 	return res;
 }
 
-std::string toLower(const char *str)
+std::string toLowerAsUtf8(const char *str)
 {
-	return toLower(CUtfStringView(str));
+	return toLowerAsUtf8(CUtfStringView(str));
 }
 
 // ***************************************************************************
 
-std::string	toLower(const std::string &str)
+std::string	toLowerAsUtf8(const std::string &str)
 {
-	return toLower(CUtfStringView(str));
+	return toLowerAsUtf8(CUtfStringView(str));
 }
 
 // ***************************************************************************
@@ -2025,7 +2025,7 @@ ucchar		toUpper (ucchar c)
 
 // ***************************************************************************
 
-static std::string toUpper(CUtfStringView sv)
+static std::string toUpperAsUtf8(CUtfStringView sv)
 {
 	std::string res;
 	res.reserve(sv.largestSize());
@@ -2037,23 +2037,23 @@ static std::string toUpper(CUtfStringView sv)
 			ucchar uc = c;
 			ucchar *result = toLowerUpperSearch(&uc, UnicodeLowerToUpper);
 			if (result)
-				c = uc;
+				c = result[1];
 		}
 		CUtfStringView::append(res, c);
 	}
 	return res;
 }
 
-std::string toUpper(const char *str)
+std::string toUpperAsUtf8(const char *str)
 {
-	return toUpper(CUtfStringView(str));
+	return toUpperAsUtf8(CUtfStringView(str));
 }
 
 // ***************************************************************************
 
-std::string	toUpper(const std::string &str)
+std::string	toUpperAsUtf8(const std::string &str)
 {
-	return toUpper(CUtfStringView(str));
+	return toUpperAsUtf8(CUtfStringView(str));
 }
 
 // ***************************************************************************

From e1195fe34e2d39a6cce0d1a2a42f2138c1717e74 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 15:30:17 +0800
Subject: [PATCH 062/292] Change CDBGroupComboBox to UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/gui/dbgroup_combo_box.h       | 28 +++---
 nel/src/gui/dbgroup_combo_box.cpp             | 96 +++++++++++--------
 nel/src/gui/group_html.cpp                    |  2 +-
 .../src/interface_v3/action_handler_game.cpp  | 26 ++---
 .../src/interface_v3/action_handler_help.cpp  |  2 +-
 .../bot_chat_page_dynamic_mission.cpp         |  8 +-
 .../client/src/interface_v3/macrocmd_key.cpp  | 11 +--
 .../client/src/interface_v3/skill_manager.cpp |  2 +-
 8 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/nel/include/nel/gui/dbgroup_combo_box.h b/nel/include/nel/gui/dbgroup_combo_box.h
index 6f42572bb..61e447f4e 100644
--- a/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/nel/include/nel/gui/dbgroup_combo_box.h
@@ -60,13 +60,15 @@ namespace NLGUI
 
 		// Combo Texts
 		void			resetTexts();
-		void			addText(const ucstring &text);
-		void			setText(uint i, const ucstring &text);
-		void			insertText(uint i, const ucstring &text);
-		const ucstring	&getText(uint i) const;
+		void			addText(const std::string &text);
+		void			setText(uint i, const std::string &text);
+		void			insertText(uint i, const std::string &text);
+		const std::string	&getText(uint i) const;
+		ucstring	getTextAsUtf16(uint i) const;
 		uint			getTextId(uint i) const;
 		uint			getTextPos(uint nId) const;
-		const ucstring	&getTexture(uint i) const;
+		const std::string	&getTexture(uint i) const;
+		ucstring	getTextureAsUtf16(uint i) const;
 		void			setGrayed(uint i, bool g);
 		bool			getGrayed(uint i) const;
 		void			removeText(uint nPos);
@@ -87,11 +89,13 @@ namespace NLGUI
 		std::string		getSelectionText() const;
 
 		// view text
-		void			setViewText(const ucstring & text);
-		ucstring		getViewText() const;
+		void			setViewText(const std::string & text);
+		std::string		getViewText() const;
+		void			setViewTextAsUtf16(const ucstring &text) { setViewText(text.toUtf8()); }
+		ucstring		getViewTextAsUtf16() const;
 		CViewText		*getViewText();
 
-		void			setTexture(uint i, const ucstring &texture);
+		void			setTexture(uint i, const std::string &texture);
 
 		sint32	evalContentWidth() const;
 
@@ -122,7 +126,7 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("resetTexts", luaResetTexts)
 			REFLECT_SINT32 ("selectionNb", getSelectionNb, setSelectionNb)
 			REFLECT_STRING ("selection_text", getSelectionText, setSelectionText)
-			REFLECT_UCSTRING ("view_text", getViewText, setViewText)
+			REFLECT_UCSTRING ("view_text", getViewTextAsUtf16, setViewTextAsUtf16) // FIXME: Better to have UTF-8
 		REFLECT_EXPORT_END
 
 
@@ -137,8 +141,8 @@ namespace NLGUI
 		// sint32
 		CInterfaceProperty		_Selection;
 		sint32					_NotLinkedToDBSelection;
-		std::vector<std::pair<uint, ucstring> >	_Texts;
-		std::vector<ucstring>	_Textures;
+		std::vector<std::pair<uint, std::string> >	_Texts;
+		std::vector<std::string>	_Textures;
 		std::vector<bool>	_Grayed;
 
 		// Action Handler called on combo click
@@ -155,7 +159,7 @@ namespace NLGUI
 		CCtrlBaseButton			*_SelectButton;
 
 		bool					_IsExternViewText;
-		ucstring				_ExternViewText;
+		std::string				_ExternViewText;
 
 
 	private:
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index f7c49fee8..dd7f2154d 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -43,9 +43,9 @@ namespace NLGUI
 	void force_link_dbgroup_combo_box_cpp() { }
 
 	// Compare strings
-	static inline bool lt_text(const std::pair<int,ucstring> &s1, const std::pair<int,ucstring> &s2)
+	static inline bool lt_text(const std::pair<int,std::string> &s1, const std::pair<int,std::string> &s2)
 	{
-		return toLower(s1.second) < toLower(s2.second);
+		return toLowerAsUtf8(s1.second) < toLowerAsUtf8(s2.second);
 	}
 
 	std::string CDBGroupComboBox::measureMenu;
@@ -183,10 +183,10 @@ namespace NLGUI
 				if (name)
 				{
 					const char *propPtr = name;
-					ucstring Text = ucstring::makeFromUtf8(propPtr);
-					if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))
-						Text = CI18N::get (propPtr);
-					addText(Text);
+					if (NLMISC::startsWith(propPtr, "ui"))
+						addText(CI18N::get(propPtr).toUtf8());
+					else
+						addText(propPtr);
 				}
 			}
 			child = child->next;
@@ -240,11 +240,11 @@ namespace NLGUI
 			}
 			else if(_IsExternViewText)
 			{
-				_ViewText->setText(_ExternViewText.toUtf8());
+				_ViewText->setText(_ExternViewText);
 			}
 			else
 			{
-				_ViewText->setText(_Texts[_CacheSelection].second.toUtf8());
+				_ViewText->setText(_Texts[_CacheSelection].second);
 			}
 		}
 	}
@@ -274,7 +274,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void	CDBGroupComboBox::addText(const ucstring &text)
+	void	CDBGroupComboBox::addText(const std::string &text)
 	{
 		dirt();
 		_Texts.push_back(make_pair((uint)_Texts.size(), text));
@@ -283,7 +283,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void	CDBGroupComboBox::setText(uint i, const ucstring &text)
+	void	CDBGroupComboBox::setText(uint i, const std::string &text)
 	{
 		dirt();
 		if(i<_Texts.size())
@@ -291,7 +291,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void	CDBGroupComboBox::insertText(uint i, const ucstring &text)
+	void	CDBGroupComboBox::insertText(uint i, const std::string &text)
 	{
 		dirt();
 		if(i<_Texts.size())
@@ -313,7 +313,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void	CDBGroupComboBox::setTexture(uint i, const ucstring &texture)
+	void	CDBGroupComboBox::setTexture(uint i, const std::string &texture)
 	{
 		dirt();
 		if(i<_Textures.size())
@@ -351,13 +351,19 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	const ucstring	&CDBGroupComboBox::getText(uint i) const
+	const std::string &CDBGroupComboBox::getText(uint i) const
 	{
-		static	ucstring	null;
-		if(i<_Texts.size())
+		static const std::string empty;
+		if (i < _Texts.size())
 			return _Texts[i].second;
 		else
-			return null;
+			return empty;
+	}
+
+	// ***************************************************************************
+	ucstring CDBGroupComboBox::getTextAsUtf16(uint i) const
+	{
+		return ucstring::makeFromUtf8(getText(i));
 	}
 
 	// ***************************************************************************
@@ -385,15 +391,21 @@ namespace NLGUI
 	{
 		sort(_Texts.begin(), _Texts.end(), lt_text);
 	}
-	
+
 	// ***************************************************************************
-	const ucstring	&CDBGroupComboBox::getTexture(uint i) const
+	const std::string &CDBGroupComboBox::getTexture(uint i) const
 	{
-		static	ucstring	null;
-		if(i<_Textures.size())
+		static const std::string empty;
+		if (i < _Textures.size())
 			return _Textures[i];
 		else
-			return null;
+			return empty;
+	}
+	
+	// ***************************************************************************
+	ucstring CDBGroupComboBox::getTextureAsUtf16(uint i) const
+	{
+		return ucstring::makeFromUtf8(getTexture(i));
 	}
 
 	// ***************************************************************************
@@ -452,8 +464,7 @@ namespace NLGUI
 		sint32 value;
 		for(uint i=0; i<getNumTexts(); i++)
 		{
-			std::string sText;
-			getText(i).toString(sText);
+			std::string sText = getText(i);
 			if(sText == val)
 			{
 				value = i;
@@ -464,15 +475,21 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CDBGroupComboBox::setViewText(const ucstring & text)
+	void CDBGroupComboBox::setViewText(const std::string &text)
 	{
 		_IsExternViewText = true;
 		_ExternViewText = text;
-		_ViewText->setText(_ExternViewText.toUtf8());
+		_ViewText->setText(_ExternViewText);
 	}
 
 	// ***************************************************************************
-	ucstring CDBGroupComboBox::getViewText() const
+	std::string CDBGroupComboBox::getViewText() const
+	{
+		return _ViewText->getText();
+	}
+
+	// ***************************************************************************
+	ucstring CDBGroupComboBox::getViewTextAsUtf16() const
 	{
 		return  CUtfStringView(_ViewText->getText()).toUtf16();
 	}
@@ -486,18 +503,14 @@ namespace NLGUI
 	// ***************************************************************************
 	std::string CDBGroupComboBox::getSelectionText() const
 	{
-		ucstring text;
 		if (_LinkedToDB)
 		{
-			text = getText(_Selection.getSInt32());
+			return getText(_Selection.getSInt32());
 		}
 		else
 		{
-			text = getText(_NotLinkedToDBSelection);
+			return getText(_NotLinkedToDBSelection);
 		}
-		std::string texteS;
-		text.toString(texteS);
-		return texteS;
 	}
 
 	// ***************************************************************************
@@ -538,8 +551,7 @@ namespace NLGUI
 		sint32 value;
 		for(uint i=0; i<getNumTexts(); i++)
 		{
-			std::string sText;
-			getText(i).toString(sText);
+			std::string sText = getText(i);
 			if(sText == text)
 			{
 				value = i;
@@ -566,7 +578,7 @@ namespace NLGUI
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 1);
 		ucstring text;
 		nlverify(CLuaIHM::pop(ls, text));
-		addText(text);
+		addText(text.toUtf8()); // FIXME: Lua should just do UTF-8!
 		return 0;
 	}
 
@@ -579,7 +591,7 @@ namespace NLGUI
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
 		ucstring text;
 		nlverify(CLuaIHM::pop(ls, text));
-		setText((uint) ls.toInteger(1), text);
+		setText((uint) ls.toInteger(1), text.toUtf8()); // FIXME: Lua should just do UTF-8!
 		return 0;
 	}
 
@@ -592,7 +604,7 @@ namespace NLGUI
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
 		ucstring text;
 		nlverify(CLuaIHM::pop(ls, text));
-		insertText((uint) ls.toInteger(1), text);
+		insertText((uint) ls.toInteger(1), text.toUtf8()); // FIXME: Lua should just do UTF-8!
 		return 0;
 	}
 
@@ -605,7 +617,7 @@ namespace NLGUI
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
 		ucstring texture;
 		nlverify(CLuaIHM::pop(ls, texture));
-		setTexture((uint) ls.toInteger(1), texture);
+		setTexture((uint) ls.toInteger(1), texture.toUtf8()); // FIXME: Lua should just do UTF-8!
 		return 0;
 	}
 
@@ -625,7 +637,7 @@ namespace NLGUI
 		const char *funcName = "removeText";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
-		removeText((uint) ls.toInteger(1));
+		removeText((uint)ls.toInteger(1));
 		return 0;
 	}
 
@@ -652,12 +664,12 @@ namespace NLGUI
 			{
 				// set the id as the parameter
 				bool checkable = false;
-				if(getTexture(i).toString() != std::string())
+				if (getTexture(i) != std::string())
 				{
 					checkable = true;
 				}
-				groupMenu->addLine(getText(i), "combo_box_select_end", toString(i),
-					"", std::string(), getTexture(i).toString(), checkable);
+				groupMenu->addLine(ucstring::makeFromUtf8(getText(i)), "combo_box_select_end", toString(i),
+					"", std::string(), getTexture(i), checkable);
 				groupMenu->setGrayedLine(i, getGrayed(i));
 			}
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 7d9e48baf..e6b1ba473 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -6437,7 +6437,7 @@ namespace NLGUI
 		if (cb)
 		{
 			uint lineIndex = cb->getNumTexts();
-			cb->addText(_SelectOptionStr);
+			cb->addText(_SelectOptionStr.toUtf8());
 			if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
 			{
 				cb->setGrayed(lineIndex, true);
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 19820be99..44c6e64fb 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -3013,7 +3013,7 @@ void updateVRDevicesComboUI(bool enable)
 			{
 				std::stringstream displayname;
 				displayname << std::string("[") << VRDeviceCache[i].first << "] [" << VRDeviceCache[i].second << "]";
-				pCB->addText(ucstring(displayname.str()));
+				pCB->addText(displayname.str());
 				if (ClientCfg.VRDisplayDevice == VRDeviceCache[i].first)
 				{
 					if (selectedDevice == -1 || ClientCfg.VRDisplayDeviceId == VRDeviceCache[i].second)
@@ -3027,7 +3027,7 @@ void updateVRDevicesComboUI(bool enable)
 				// configured device not found, add a dummy
 				std::stringstream displayname;
 				displayname << std::string("[") << ClientCfg.VRDisplayDevice << "] [" << ClientCfg.VRDisplayDeviceId<< "] [DEVICE NOT FOUND]";
-				pCB->addText(ucstring(displayname.str()));
+				pCB->addText(displayname.str());
 				selectedDevice = VRDeviceCache.size();
 			}
 			NLGUI::CDBManager::getInstance()->getDbProp(GAME_CONFIG_VR_DEVICE_DB)->setValue32(-1);
@@ -3062,7 +3062,7 @@ public:
 		{
 			pCB->resetTexts();
 			for (sint j = 0; j < (sint)stringModeList.size(); j++)
-				pCB->addText(ucstring(stringModeList[j]));
+				pCB->addText(stringModeList[j]);
 		}
 
 		// frequencies
@@ -3071,7 +3071,7 @@ public:
 		{
 			pCB->resetTexts();
 			for (sint j = 0; j < (sint)stringFreqList.size(); j++)
-				pCB->addText(ucstring(stringFreqList[j]));
+				pCB->addText(stringFreqList[j]);
 		}
 
 		// -1 is important to indicate we set this value in edit mode
@@ -3094,10 +3094,10 @@ public:
 		if( pCB )
 		{
 			pCB->resetTexts();
-			pCB->addText(CI18N::get("uigcLowTextureMode"));
-			pCB->addText(CI18N::get("uigcNormalTextureMode"));
+			pCB->addText(CI18N::get("uigcLowTextureMode").toUtf8());
+			pCB->addText(CI18N::get("uigcNormalTextureMode").toUtf8());
 			if(ClientCfg.HDTextureInstalled)
-				pCB->addText(CI18N::get("uigcHighTextureMode"));
+				pCB->addText(CI18N::get("uigcHighTextureMode").toUtf8());
 		}
 
 		// Anisotropic Filtering
@@ -3110,14 +3110,14 @@ public:
 			sint maxAnisotropic = (sint)Driver->getAnisotropicFilterMaximum();
 
 			pCB->resetTexts();
-			pCB->addText(CI18N::get("uigcFxAnisotropicFilterNone"));
+			pCB->addText(CI18N::get("uigcFxAnisotropicFilterNone").toUtf8());
 
 			sint anisotropic = 2;
 			uint i = 1;
 
 			while (anisotropic <= maxAnisotropic)
 			{
-				pCB->addText(ucstring(NLMISC::toString("%dx", anisotropic)));
+				pCB->addText(NLMISC::toString("%dx", anisotropic));
 
 				if (ClientCfg.AnisotropicFilter == anisotropic)
 					nAnisotropic = i;
@@ -3222,7 +3222,7 @@ class CHandlerGameConfigMode : public IActionHandler
 		// Get W, H
 		sint w,h;
 		{
-			string vidModeStr = pCB->getText(nVideModeNb).toString();
+			string vidModeStr = pCB->getText(nVideModeNb);
 			string tmp = vidModeStr.substr(0,vidModeStr.find('x')-1);
 			fromString(tmp, w);
 			tmp = vidModeStr.substr(vidModeStr.find('x')+2,vidModeStr.size());
@@ -3262,7 +3262,7 @@ class CHandlerGameConfigMode : public IActionHandler
 		{
 			pCB->resetTexts();
 			for (j = 0; j < (sint)stringFreqList.size(); j++)
-				pCB->addText(ucstring(stringFreqList[j]) + " Hz");
+				pCB->addText(stringFreqList[j] + " Hz");
 		}
 		NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_VIDEO_FREQ_DB )->setValue32(nFoundFreq);
 
@@ -3464,7 +3464,7 @@ class CHandlerGameConfigApply : public IActionHandler
 					CDBGroupComboBox *pCB = dynamic_cast<CDBGroupComboBox*>(CWidgetManager::getInstance()->getElementFromId( GAME_CONFIG_VIDEO_MODES_COMBO ));
 					if( pCB != NULL )
 					{
-						string vidModeStr = pCB->getText(nVideModeNb).toString();
+						string vidModeStr = pCB->getText(nVideModeNb);
 						string tmp = vidModeStr.substr(0,vidModeStr.find('x')-1);
 						fromString(tmp, w);
 						tmp = vidModeStr.substr(vidModeStr.find('x')+2,vidModeStr.size());
@@ -3478,7 +3478,7 @@ class CHandlerGameConfigApply : public IActionHandler
 					CDBGroupComboBox *pCB = dynamic_cast<CDBGroupComboBox*>(CWidgetManager::getInstance()->getElementFromId( GAME_CONFIG_VIDEO_FREQS_COMBO ));
 					if( pCB != NULL )
 					{
-						string vidFreqStr = pCB->getText(nVideoFreqNb).toString();
+						string vidFreqStr = pCB->getText(nVideoFreqNb);
 						fromString(vidFreqStr, freq);
 					}
 				}
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 030d34bfe..6b699f8ee 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -2200,7 +2200,7 @@ static void	setupRawMaterialStats(CSheetHelpSetup &setup)
 
 					if(pIS->canBuildItemPart(faberType))
 					{
-						pCB->addText(RM_FABER_TYPE::toLocalString(faberType));
+						pCB->addText(RM_FABER_TYPE::toLocalString(faberType).toUtf8());
 					}
 				}
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
index 1e9d56dc3..0fc03124a 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
@@ -156,7 +156,7 @@ void CBotChatPageDynamicMission::update()
 				{
 					if (ClientCfg.Local)
 					{
-						_ChoiceCB[k]->setText(l, ucstring(toString("Dynamic mission %d:%d", (int) k, (int) l)));
+						_ChoiceCB[k]->setText(l, toString("Dynamic mission %d:%d", (int) k, (int) l));
 						_TextReceived[k][l] = true;
 					}
 					else
@@ -167,7 +167,7 @@ void CBotChatPageDynamicMission::update()
 						bool received = CStringManagerClient::instance()->getDynString(textID, result);
 						if (received)
 						{
-							_ChoiceCB[k]->setText(l, result);
+							_ChoiceCB[k]->setText(l, result.toUtf8());
 							_TextReceived[k][l] = true;
 						}
 					}
@@ -183,13 +183,13 @@ void CBotChatPageDynamicMission::update()
 				bool received = CStringManagerClient::instance()->getDynString(textID, result);
 				if (received)
 				{
-					_ChoiceCB[k]->addText(result);
+					_ChoiceCB[k]->addText(result.toUtf8());
 					_TextReceived[k][l] = true;
 				}
 				else
 				{
 					// add a text to show the player that the text is being received
-					_ChoiceCB[k]->addText(NLMISC::CI18N::get("uiWaitingChoiceFromServer"));
+					_ChoiceCB[k]->addText(NLMISC::CI18N::get("uiWaitingChoiceFromServer").toUtf8());
 				}
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index d9dfce119..9fce02ef8 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -492,7 +492,7 @@ void CModalContainerEditCmd::activate()
 					}
 					if (found)
 					{
-						pCB->addText( CI18N::get(rVCat[i].LocalizedName) );
+						pCB->addText(CI18N::get(rVCat[i].LocalizedName).toUtf8());
 						CurrentEditCmdCategories.push_back(rVCat[i].Name);
 					}
 				}
@@ -1033,7 +1033,7 @@ void CModalContainerEditCmd::onChangeCategory()
 			{
 				if (rBA.isUsableInCurrentContext())
 				{
-					pCB->addText( CI18N::get(rBA.LocalizedName) );
+					pCB->addText(CI18N::get(rBA.LocalizedName).toUtf8());
 				}
 			}
 		}
@@ -1130,11 +1130,10 @@ void CModalContainerEditCmd::onChangeAction()
 
 					if (ActionsContext.matchContext(rVal.Contexts))
 					{
-						if ((rVal.LocalizedValue.size() >= 2) &&
-							(rVal.LocalizedValue[0] == 'u') && (rVal.LocalizedValue[1] == 'i'))
-							pCB->addText(CI18N::get(rVal.LocalizedValue));
+						if (NLMISC::startsWith(rVal.LocalizedValue, "ui"))
+							pCB->addText(CI18N::get(rVal.LocalizedValue).toUtf8());
 						else
-							pCB->addText(ucstring(rVal.LocalizedValue));
+							pCB->addText(rVal.LocalizedValue);
 					}
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/skill_manager.cpp b/ryzom/client/src/interface_v3/skill_manager.cpp
index c2f242921..5e91f6f6e 100644
--- a/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -1097,7 +1097,7 @@ public:
 					string titleStr = CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)i);
 					bool womenTitle = (UserEntity && UserEntity->getGender() == GSGENDER::female);
 					const ucstring s(CStringManagerClient::getTitleLocalizedName(titleStr,womenTitle));
-					pCB->addText(s);
+					pCB->addText(s.toUtf8());
 					pSM->_UIUnblockedTitles.push_back((CHARACTER_TITLE::ECharacterTitle)i);
 				}
 			}

From 54337b757bfa415bbf83d23a690e651a01456f37 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 28 Oct 2020 15:55:42 +0800
Subject: [PATCH 063/292] Fix merge

---
 nel/src/gui/view_text.cpp                     | 320 +++++++++++-------
 .../src/interface_v3/action_handler_item.cpp  | 167 ++-------
 2 files changed, 223 insertions(+), 264 deletions(-)

diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 7376cd39a..367a3182b 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -150,7 +150,7 @@ namespace NLGUI
 		_Color = Color;
 		_Shadow = Shadow;
 		_ShadowOutline = ShadowOutline;
-		setText(Text);
+		setHardText(Text);
 		computeFontSize ();
 
 		CWidgetManager::getInstance()->registerInterfaceScaleWatcher(this);
@@ -229,12 +229,12 @@ namespace NLGUI
 		else
 		if( name == "hardtext" )
 		{
-			return _Text.toString();
+			return getHardText();
 		}
 		else
 		if( name == "hardtext_format" )
 		{
-			return _HardtextFormat;
+			return _HardTextFormat;
 		}
 		else
 			return CViewBase::getProperty( name );
@@ -650,20 +650,38 @@ namespace NLGUI
 		else
 		if( name == "hardtext" )
 		{
+#if 1
+			if (NLMISC::startsWith(value, "ui"))
+			{
+				_Text = CI18N::get(value).toUtf8();
+				_TextLength = 0;
+				_HardText = value;
+			}
+			else
+			{
+				_Text = value;
+				_TextLength = 0;
+				_HardText.clear();
+			}
+#else
 			_Text = value;
-			setCase( _Text, _CaseMode );
+			_TextLength = 0;
+			_HardText.clear();
+			if (NLMISC::startsWith(value, "ui"))
+				_HardText = _Text;
+#endif
 			invalidateContent();
 			return true;
 		}
 		else
 		if( name == "hardtext_format" )
 		{
-			_HardtextFormat = value;
+			_HardTextFormat = value;
 
 			if( _MultiLine )
-				setTextFormatTaged( _HardtextFormat );
+				setTextFormatTaged( _HardTextFormat );
 			else
-				setSingleLineTextFormatTaged( _HardtextFormat );
+				setSingleLineTextFormatTaged( _HardTextFormat );
 
 			return true;
 		}
@@ -764,11 +782,9 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "text" );
 
 		serializeTextOptions( node );
-		
-		std::string hs = _Text.toString();
 
-		xmlSetProp( node, BAD_CAST "hardtext", BAD_CAST hs.c_str() );
-		xmlSetProp( node, BAD_CAST "hardtext_format", BAD_CAST _HardtextFormat.c_str() );
+		xmlSetProp( node, BAD_CAST "hardtext", BAD_CAST _Text.c_str() );
+		xmlSetProp( node, BAD_CAST "hardtext_format", BAD_CAST _HardTextFormat.c_str() );
 
 		return node;
 	}
@@ -962,7 +978,6 @@ namespace NLGUI
 	bool CViewText::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	{
 
-	//	const ucstring* tmp;
 		CXMLAutoPtr prop;
 		//try to get props that can be inherited from groups
 		//if a property is not defined, try to find it in the parent group.
@@ -983,28 +998,34 @@ namespace NLGUI
 		{
 			const char *propPtr = prop;
 			if (NLMISC::startsWith(propPtr, "ui"))
-				_Text = CI18N::get(propPtr);
+			{
+				_HardText = propPtr;
+				_Text = CI18N::get(propPtr).toUtf8();
+				_TextLength = 0;
+			}
 			else
-				_Text.fromUtf8(propPtr);
+			{
+				_HardText.clear();
+				_Text = propPtr;
+				_TextLength = 0;
+			}
 			setCase(_Text, _CaseMode);
+			_TextLength = 0;
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"hardtext_format" );
 		if (prop)
 		{
 			const char *propPtr = prop;
-			_HardtextFormat = propPtr;
+			_HardTextFormat = propPtr;
 
 			if (_MultiLine)
 			{
-				if (strlen(propPtr) > 2 && propPtr[0] == 'u' && propPtr[1] == ':')
-					setTextFormatTaged(ucstring::makeFromUtf8(std::string(propPtr).substr(2)));
-				else
-					setTextFormatTaged(CI18N::get(propPtr));
+				setTextFormatTaged(CI18N::get(propPtr).toUtf8());
 			}
 			else
 			{
-				setSingleLineTextFormatTaged(CI18N::get(propPtr));
+				setSingleLineTextFormatTaged(CI18N::get(propPtr).toUtf8());
 			}
 		}
 
@@ -1188,7 +1209,7 @@ namespace NLGUI
 						CWord &currWord = currLine.getWord(k);
 						charIndex += currWord.NumSpaces;
 						sint	cStart= max(charIndex, (sint)_TextSelectionStart);
-						sint	cEnd= min(charIndex+(sint)currWord.Text.length(), (sint)_TextSelectionEnd);
+						sint	cEnd= min(charIndex+(sint)currWord.Info.StringLength, (sint)_TextSelectionEnd);
 
 						// range must be valid
 						if(cStart<cEnd)
@@ -1203,7 +1224,7 @@ namespace NLGUI
 						}
 
 						// next word
-						charIndex+= (sint)currWord.Text.length();
+						charIndex+= (sint)currWord.Info.StringLength;
 					}
 					charIndex += currLine.getEndSpaces() + (currLine.getLF() ? 1 : 0);
 				}
@@ -1394,14 +1415,22 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::setText(const ucstring & text)
+	void CViewText::setTextAsUtf16(const ucstring &text)
+	{
+		setText(text.toUtf8());
+	}
+
+	// ***************************************************************************
+	void CViewText::setText(const std::string &text)
 	{
+		_HardText.clear();
 		// common case: no special format, no case mode => easy cache test
 		if (_FormatTags.empty() && _CaseMode==CaseNormal)
 		{
 			if (text != _Text)
 			{
 				_Text = text;
+				_TextLength = 0;
 				// no need to call  "setCase (_Text, _CaseMode);"  since CaseNormal:
 				invalidateContent ();
 			}
@@ -1409,22 +1438,24 @@ namespace NLGUI
 		else
 		{
 			// if the view text had some format before, no choice, must recompute all
-			if(!_FormatTags.empty())
+			if (!_FormatTags.empty())
 			{
 				_Text = text;
 				setCase (_Text, _CaseMode);
+				_TextLength = 0;
 				invalidateContent ();
 			}
 			// else test if after the case change the cache succeed
 			else
 			{
 				// compute the temp cased text
-				ucstring	tempText= text;
-				setCase(tempText, _CaseMode);
-				if(tempText!=_Text)
+				std::string tempText = text;
+				setCase (tempText, _CaseMode);
+				if (tempText != _Text)
 				{
 					_Text = tempText;
-					invalidateContent ();
+					_TextLength = 0;
+					invalidateContent();
 				}
 			}
 		}
@@ -1618,7 +1649,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::flushWordInLine(ucstring &ucCurrentWord, bool &linePushed, const CFormatInfo &wordFormat)
+	void CViewText::flushWordInLine(std::string &ucCurrentWord, bool &linePushed, const CFormatInfo &wordFormat)
 	{
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
 		// create a new line?
@@ -1637,20 +1668,23 @@ namespace NLGUI
 	// ***************************************************************************
 	void CViewText::updateTextContextMultiLine(float nMaxWidth)
 	{
-		ucchar ucLetter;
+		// ucchar ucLetter;
 		UTextContext::CStringInfo si;
-		uint i;
+		uint i = 0;
 		// word state
-		ucstring ucCurrentWord;
+		std::string ucCurrentWord;
 		CFormatInfo		wordFormat;
 		// line state
 		float	rWidthCurrentLine = 0;
 		bool	linePushed= false;
 		// for all the text
-		uint	textSize= (uint)_Text.size();
+		// uint	textSize= (uint)_Text.size();
 		uint	formatTagIndex= 0;
 		nMaxWidth *= _Scale;
-		for (i = 0; i < textSize; ++i)
+		//for (i = 0; i < textSize; ++i)
+		CUtfStringView sv(_Text);
+		u32string ucStrLetter(1, ' ');
+		for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it, ++i)
 		{
 			if(isFormatTagChange(i, formatTagIndex))
 			{
@@ -1669,8 +1703,7 @@ namespace NLGUI
 
 			// Parse the letter
 			{
-				ucLetter = _Text[i];
-				if (ucLetter == ucchar('\n'))
+				if (*it == '\n')
 				{
 					flushWordInLine(ucCurrentWord, linePushed, wordFormat);
 					// reset line state
@@ -1679,8 +1712,7 @@ namespace NLGUI
 				}
 				else
 				{
-					ucstring ucStrLetter;
-					ucStrLetter= ucLetter;
+					ucStrLetter[0] = *it;
 					si = TextContext->getStringInfo (ucStrLetter);
 					if ((rWidthCurrentLine + si.StringWidth) > nMaxWidth)
 					{
@@ -1689,12 +1721,13 @@ namespace NLGUI
 						// reset line state, and begin with the cut letter
 						linePushed= false;
 						rWidthCurrentLine = si.StringWidth;
-						ucCurrentWord = ucLetter;
+						ucCurrentWord.clear();
+						CUtfStringView::append(ucCurrentWord, *it);
 					}
 					else
 					{
 						// Grow the current word
-						ucCurrentWord += ucLetter;
+						CUtfStringView::append(ucCurrentWord, *it);
 						rWidthCurrentLine += si.StringWidth;
 					}
 				}
@@ -1718,7 +1751,7 @@ namespace NLGUI
 		if (!currLine.empty())
 		{
 			CFormatInfo	lineWordFormat= currLine[0].Format;
-			ucstring	lineWord;
+			std::string	lineWord;
 			for(uint i=0;i<currLine.size();i++)
 			{
 				// If different from last, flush
@@ -1733,8 +1766,7 @@ namespace NLGUI
 				}
 
 				// Append the word with space to the lineWord.
-				ucstring blank;
-				blank.resize(currLine[i].NumSpaces, (ucchar) ' ');
+				std::string blank(currLine[i].NumSpaces, ' ');
 				lineWord += blank;
 				lineWord += currLine[i].Text;
 			}
@@ -1755,7 +1787,6 @@ namespace NLGUI
 		//
 		TCharPos currPos = 0;
 		//
-		static const ucstring spaceStr(" ");
 		// precLineWidth valid only id precedent line is part of same paragraph.
 		float precLineWidth= 0;
 		float lineWidth = (float)_FirstLineX; // width of the current line
@@ -1765,7 +1796,7 @@ namespace NLGUI
 		bool  breakLine;
 		//
 		vector<CWord>	currLine; // if spaces are not expanded, all words of a line are inserted here (NB: index and stringInfo not filled)
-		ucstring	wordValue;
+		std::string	wordValue;
 		CFormatInfo	wordFormat;
 		uint		formatTagIndex= 0;
 		//
@@ -1778,7 +1809,7 @@ namespace NLGUI
 			float newLineWidth = 0;
 			breakLine = false;
 			//
-			if (_Text[currPos] == (ucchar) '\n')
+			if (_Text[currPos] == '\n')
 			{
 				lineFeed = true;
 			}
@@ -1786,7 +1817,7 @@ namespace NLGUI
 			{
 				lineFeed = false;
 				// Skip spaces and count them
-				spaceEnd = _Text.find_first_not_of(spaceStr, currPos);
+				spaceEnd = _Text.find_first_not_of(" ", currPos);
 				if (spaceEnd == std::string::npos)
 				{
 					spaceEnd = _Text.length();
@@ -1902,7 +1933,7 @@ namespace NLGUI
 					{
 						uint maxNumSpaces = std::max(1U, (uint) (nMaxWidth / _SpaceWidth));
 						CWord spaceWord; // a word with only spaces in it
-						spaceWord.build (ucstring (""), *TextContext, maxNumSpaces);
+						spaceWord.build ("", *TextContext, maxNumSpaces);
 						spaceWord.Format= wordFormat;
 						_Lines.push_back(TLineSPtr(new CLine));
 						_Lines.back()->addWord(spaceWord, _FontWidth);
@@ -1919,16 +1950,17 @@ namespace NLGUI
 					else
 					{
 						float px = numSpaces * _SpaceWidth;
-						uint currChar = 0;
-						ucstring oneChar(" ");
-						for(currChar = 0; currChar < wordValue.length(); ++currChar)
+						u32string oneChar(1, ' ');
+						CUtfStringView wsv(wordValue);
+						CUtfStringView::iterator wit(wsv.begin()), wend(wsv.end());
+						for (; wit != wend; ++wit)
 						{
-							oneChar = wordValue[currChar];
+							oneChar[0] = *wit;
 							si = TextContext->getStringInfo(oneChar);
 							if ((uint) (px + si.StringWidth) > nMaxWidth) break;
 							px += si.StringWidth;
 						}
-						currChar = std::max((uint) 1, currChar); // must fit at least one character otherwise there's an infinite loop
+						ptrdiff_t currChar = std::max((ptrdiff_t)1, (ptrdiff_t)wit.ptr() - (ptrdiff_t)wsv.ptr()); // must fit at least one character otherwise there's an infinite loop
 						wordValue = _Text.substr(spaceEnd, currChar);
 						CWord word;
 						word.build(wordValue, *TextContext, numSpaces);
@@ -2033,7 +2065,7 @@ namespace NLGUI
 		}
 
 		// if the text ends with \n, must insert the last line ourself
-		if (!_Text.empty() && _Text[_Text.length() - 1] == (ucchar) '\n')
+		if (!_Text.empty() && _Text[_Text.length() - 1] == '\n')
 		{
 			_Lines.push_back(TLineSPtr(new CLine));
 		}
@@ -2146,9 +2178,9 @@ namespace NLGUI
 			{
 				TextContext->erase (_Index);
 
-				ucchar ucLetter;
+				// char ucLetter;
 				UTextContext::CStringInfo si;
-				ucstring	ucCurrentLine;
+				std::string	ucCurrentLine;
 				ucCurrentLine.reserve(_Text.size());
 
 				// Append ... to the end of line
@@ -2165,11 +2197,11 @@ namespace NLGUI
 				// for all the text
 				if (_ClampRight)
 				{
-					for (uint i = 0; i < _Text.size(); ++i)
+					CUtfStringView sv(_Text);
+					u32string ucStrLetter = u32string(1, (u32char)' ');
+					for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
 					{
-						ucLetter= _Text[i];
-						ucstring ucStrLetter;
-						ucStrLetter= ucLetter;
+						ucStrLetter[0] = *it;
 						si = TextContext->getStringInfo (ucStrLetter);
 						if ((rWidthCurrentLine + si.StringWidth + dotWidth) > fLineMaxW)
 						{
@@ -2178,7 +2210,7 @@ namespace NLGUI
 						else
 						{
 							// Grow the current line
-							ucCurrentLine += ucLetter;
+							CUtfStringView::append(ucCurrentLine, *it);
 							rWidthCurrentLine += si.StringWidth;
 						}
 					}
@@ -2191,11 +2223,12 @@ namespace NLGUI
 				}
 				else
 				{
-					for (sint i = (sint)_Text.size() - 1; i >= 0; --i)
+					// FIXME: Optimize reverse UTF iteration
+					u32string uctext = CUtfStringView(_Text).toUtf32();
+					u32string ucStrLetter = u32string(1, (u32char)' ');
+					for (sint i = (sint)uctext.size() - 1; i >= 0; --i)
 					{
-						ucLetter= _Text[i];
-						ucstring ucStrLetter;
-						ucStrLetter= ucLetter;
+						ucStrLetter[0] = uctext[i];
 						si = TextContext->getStringInfo (ucStrLetter);
 						if ((rWidthCurrentLine + si.StringWidth + dotWidth) > fLineMaxW)
 						{
@@ -2204,7 +2237,9 @@ namespace NLGUI
 						else
 						{
 							// Grow the current line
-							ucCurrentLine = ucLetter + ucCurrentLine;
+							std::string tmp;
+							CUtfStringView::append(tmp, uctext[i]);
+							ucCurrentLine = tmp + ucCurrentLine;
 							rWidthCurrentLine += si.StringWidth;
 						}
 					}
@@ -2303,7 +2338,8 @@ namespace NLGUI
 				}
 				charIndex = newCharIndex;
 			}
-			return (sint)_Lines.size() - 1;
+			// return (sint)_Lines.size() - 1;
+			return -1;
 		}
 		else
 		{
@@ -2347,16 +2383,36 @@ namespace NLGUI
 		endOfPreviousLine = !_Lines[line]->getLF();
 	}
 
+	// ***************************************************************************
+	void CViewText::setHardTextAsUtf16(const ucstring &ht)
+	{
+		setHardText(ht.toUtf8());
+	}
+
 	// ***************************************************************************
 	void CViewText::setHardText (const std::string &ht)
 	{
-	//	ucstring Text = ucstring(ht);
-		ucstring Text;
-		if ((ht.size()>2) && (ht[0] == 'u') && (ht[1] == 'i'))
-			Text = CI18N::get (ht);
+		if (NLMISC::startsWith(ht, "ui"))
+		{
+			setText(CI18N::get(ht).toUtf8());
+			_HardText = ht;
+		}
 		else
-			Text.fromUtf8(ht);
-		setText(Text);
+		{
+			setText(ht);
+		}
+	}
+
+	// ***************************************************************************
+	ucstring CViewText::getTextAsUtf16() const
+	{
+		return CUtfStringView(getText()).toUtf16();
+	}
+
+	// ***************************************************************************
+	ucstring CViewText::getHardTextAsUtf16() const
+	{
+		return CUtfStringView(getHardText()).toUtf16();
 	}
 
 	// ***************************************************************************
@@ -2386,7 +2442,9 @@ namespace NLGUI
 	// ***************************************************************************
 	void CViewText::getCharacterPositionFromIndex(sint index, bool cursorAtPreviousLineEnd, float &x, float &y, float &height) const
 	{
-		NLMISC::clamp(index, 0, (sint) _Text.length());
+		if (!_TextLength && _Text.size())
+			_TextLength = CUtfStringView(_Text).count();
+		NLMISC::clamp(index, 0, (sint)_TextLength);
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
 		TextContext->setHotSpot (UTextContext::BottomLeft);
 		TextContext->setShaded (_Shadow);
@@ -2404,7 +2462,7 @@ namespace NLGUI
 
 			uint charIndex = 0;
 			// special case for end of text
-			if (index == (sint) _Text.length())
+			if (index >= (sint)_TextLength)
 			{
 				fy = dy;
 				if (_Lines.empty())
@@ -2459,7 +2517,7 @@ namespace NLGUI
 					for(uint k = 0; k < currLine.getNumWords(); ++k)
 					{
 						CWord &currWord = currLine.getWord(k);
-						if ((sint) (charIndex + currWord.NumSpaces + currWord.Text.length()) >= index)
+						if ((sint) (charIndex + currWord.NumSpaces + currWord.Info.StringLength) >= index)
 						{
 							// character is in currWord or the in spaces preceding it
 							// check if the character is in the word
@@ -2484,7 +2542,7 @@ namespace NLGUI
 								return;
 							}
 						}
-						charIndex += (uint)currWord.Text.length() + currWord.NumSpaces;
+						charIndex += (uint)currWord.Info.StringLength + currWord.NumSpaces;
 						px += currWord.NumSpaces * currLine.getSpaceWidth() + currWord.Info.StringWidth;
 					}
 				}
@@ -2504,7 +2562,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 	// Tool fct : From a word and a x coordinate (font scale), give the matching character index
-	static uint getCharacterIndex(const ucstring &textValue, float x, NL3D::UTextContext &textContext)
+	static uint getCharacterIndex(const std::string &textValue, float x, NL3D::UTextContext &textContext)
 	{
 		float px = 0.f;
 
@@ -2535,6 +2593,9 @@ namespace NLGUI
 	{
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
 
+		if (!_TextLength && _Text.size())
+			_TextLength = CUtfStringView(_Text).count();
+
 		x *= _Scale;
 		y = roundf(y * _Scale);
 
@@ -2555,7 +2616,7 @@ namespace NLGUI
 			float py = 0.f;
 			if (py > y)
 			{
-				index = (uint)_Text.length();
+				index = (uint)_TextLength;
 				cursorAtPreviousLineEnd = false;
 				return;
 			}
@@ -2622,7 +2683,7 @@ namespace NLGUI
 					}
 				}
 				px = newPx;
-				charPos += (uint)currWord.Text.length() + currWord.NumSpaces;
+				charPos += (uint)currWord.Info.StringLength + currWord.NumSpaces;
 			}
 			index =  charPos;
 			return;
@@ -2632,7 +2693,7 @@ namespace NLGUI
 			cursorAtPreviousLineEnd = false;
 			if (y < 0)
 			{
-				index = (uint)_Text.length();
+				index = (uint)_TextLength;
 				return;
 			}
 			if (y > (sint) _FontHeight)
@@ -2662,23 +2723,25 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::setStringSelectionSkipingSpace(uint stringId, const ucstring &text, sint charStart, sint charEnd)
+	void CViewText::setStringSelectionSkipingSpace(uint stringId, const std::string &text, sint charStart, sint charEnd)
 	{
 		sint	quadStart= charStart;
 		sint	quadSize= charEnd-charStart;
 		sint j;
-		for(j=0;j<charStart;j++)
+		CUtfStringView sv(text);
+		CUtfStringView::iterator it(sv.begin()), end(sv.end());
+		for (j = 0; it != end && j < charStart; ++j, ++it)
 		{
-			if(text[j]==' ')
+			if(*it == (u32char)' ')
 				quadStart--;
 		}
-		for(j=charStart;j<charEnd;j++)
+		for (j = charStart; it != end && j < charEnd; ++j, ++it)
 		{
-			if(text[j]==' ')
+			if(*it == (u32char)' ')
 				quadSize--;
 		}
 		// select what quad to skip
-		CViewRenderer::getTextContext(_FontName)->setStringSelection(stringId, quadStart, quadSize);
+		CViewRenderer::getTextContext(_FontName)->setStringSelection(stringId, quadStart, quadSize); // FIXME: This assumes spaces are the only empty glyphs!
 	}
 
 	// ***************************************************************************
@@ -2741,7 +2804,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::CLine::addWord(const ucstring &text, uint numSpaces, const CFormatInfo &wordFormat, float fontWidth, NL3D::UTextContext &textContext)
+	void CViewText::CLine::addWord(const std::string &text, uint numSpaces, const CFormatInfo &wordFormat, float fontWidth, NL3D::UTextContext &textContext)
 	{
 		CWord word;
 		word.build(text, textContext, numSpaces);
@@ -2753,7 +2816,7 @@ namespace NLGUI
 	void CViewText::CLine::addWord(const CWord &word, float fontWidth)
 	{
 		_Words.push_back(word);
-		_NumChars += word.NumSpaces + uint(word.Text.length());
+		_NumChars += word.NumSpaces + uint(word.Info.StringLength);
 		_NumSpaces += word.NumSpaces;
 		if (fabsf(word.Info.StringLine) > fabsf(_StringLine))
 		{
@@ -2788,12 +2851,13 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::CWord::build(const ucstring &text, NL3D::UTextContext &textContext, uint numSpaces)
+	void CViewText::CWord::build(const std::string &text, NL3D::UTextContext &textContext, uint numSpaces)
 	{
 		Text = text;
 		NumSpaces = numSpaces;
 		Index = textContext.textPush(text);
 		Info = textContext.getStringInfo(Index);
+		nlassert(Info.StringLength == CUtfStringView(text).count());
 	}
 
 	// ***************************************************************************
@@ -2810,8 +2874,8 @@ namespace NLGUI
 	// ***************************************************************************
 	sint32 CViewText::getMaxUsedW() const
 	{
-		static const ucstring spaceStr(" \t");
-		static const ucstring lineFeedStr("\n");
+		static const char *spaceStr(" \t");
+		static const char *lineFeedStr("\n");
 		float maxWidth = 0;
 
 		NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
@@ -2828,13 +2892,13 @@ namespace NLGUI
 			// Get the end of the line
 			float lineWidth = 0;
 			TCharPos lineEnd;
-			lineEnd = _Text.find_first_of(lineFeedStr, linePos);
+			lineEnd = _Text.find_first_of("\n", linePos);
 			if (lineEnd == std::string::npos)
 			{
 				lineEnd = _Text.length();
 			}
 
-			ucstring lineValue;
+			std::string lineValue;
 			lineValue = _Text.substr(linePos, lineEnd - linePos);
 
 			TCharPos currPos = 0;
@@ -2859,7 +2923,7 @@ namespace NLGUI
 					wordEnd = lineValue.length();
 				}
 
-				ucstring wordValue;
+				std::string wordValue;
 				wordValue = lineValue.substr(spaceEnd, wordEnd - spaceEnd);
 
 				// compute width of word
@@ -2885,7 +2949,7 @@ namespace NLGUI
 	// ***************************************************************************
 	sint32 CViewText::getMinUsedW() const
 	{
-		static const ucstring spaceOrLineFeedStr(" \n\t");
+		static const char *spaceOrLineFeedStr(" \n\t");
 		float maxWidth = 0.0f;
 
 		// Not multi line ? Same size than min
@@ -2914,7 +2978,7 @@ namespace NLGUI
 			while (currPos < _Text.length())
 			{
 				// Current word
-				ucstring wordValue;
+				std::string wordValue;
 				UTextContext::CStringInfo si;
 				TCharPos wordEnd;
 
@@ -2991,17 +3055,17 @@ namespace NLGUI
 		_FontLegHeight = si.StringLine;
 
 		// Space width
-		si = TextContext->getStringInfo(ucstring(" "));
+		si = TextContext->getStringInfo(" ");
 		_SpaceWidth = si.StringWidth;
 
 		// Font Width (used for <tab>)
-		si = TextContext->getStringInfo(ucstring("_"));
+		si = TextContext->getStringInfo("_");
 		_FontWidth = si.StringWidth;
 	}
 
 
 	// ***************************************************************************
-	static inline bool	isColorTag(const ucstring &s, uint index, uint textSize)
+	static inline bool	isColorTag(const std::string &s, uint index, uint textSize)
 	{
 		// Format is @{RGBA}
 		if(s[index]=='@')
@@ -3025,7 +3089,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 	// isColorTag must be ok.
-	static inline CRGBA	getColorTag(const ucstring &s, uint &index)
+	static inline CRGBA	getColorTag(const std::string &s, uint &index)
 	{
 		// extract the color string: "FABC"
 		char	tmpCol[5];
@@ -3052,7 +3116,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 	const	uint	MaxTabDigit= 3;
-	static inline bool	isTabTag(const ucstring &s, uint index, uint textSize)
+	static inline bool	isTabTag(const std::string &s, uint index, uint textSize)
 	{
 		// Format is @{Tvalue}, where value ,1,2,3 digit.
 		if(s[index]=='@')
@@ -3078,7 +3142,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 	// isTabTag must be ok.
-	static inline sint	getTabTag(const ucstring &s, uint &index)
+	static inline sint	getTabTag(const std::string &s, uint &index)
 	{
 		// extract the tab min X value
 		char	tmpTab[MaxTabDigit+1];
@@ -3101,7 +3165,7 @@ namespace NLGUI
 
 
 	// ***************************************************************************
-	static inline bool	isTooltipTag(const ucstring &s, uint index, uint textSize)
+	static inline bool	isTooltipTag(const std::string &s, uint index, uint textSize)
 	{
 		// Format is @{Huitt*}
 		if(s[index]=='@')
@@ -3125,9 +3189,9 @@ namespace NLGUI
 
 	// ***************************************************************************
 	// isTooltipTag must be ok.
-	static inline ucstring	getTooltipTag(const ucstring &s, uint &index)
+	static inline std::string	getTooltipTag(const std::string &s, uint &index)
 	{
-		ucstring result;
+		std::string result;
 		uint i = 3;
 		while (s[index+i] != '}')
 		{
@@ -3143,7 +3207,7 @@ namespace NLGUI
 
 
 	// ***************************************************************************
-	void		CViewText::buildFormatTagText(const ucstring &text, ucstring &textBuild, std::vector<CViewText::CFormatTag> &formatTags, std::vector<ucstring> &tooltips)
+	void		CViewText::buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CViewText::CFormatTag> &formatTags, std::vector<ucstring> &tooltips)
 	{
 		formatTags.clear();
 		tooltips.clear();
@@ -3216,15 +3280,20 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	void	CViewText::setTextFormatTagedAsUtf16(const ucstring &text)
+	{
+		setTextFormatTaged(text.toUtf8());
+	}
 
 	// ***************************************************************************
-	void	CViewText::setTextFormatTaged(const ucstring &text)
+	void	CViewText::setTextFormatTaged(const std::string &text)
 	{
 		if( text.empty() )
 			return;
 
 		// to allow cache (avoid infinite recurse in updateCoords() in some case), compute in temp
-		ucstring					tempText;
+		std::string							tempText;
 		// static to avoid reallocation
 		static std::vector<CFormatTag>		tempFormatTags;
 		static std::vector<ucstring>		tempTooltips;
@@ -3253,7 +3322,8 @@ namespace NLGUI
 			_FormatTags= tempFormatTags;
 			// Copy to Text (preserve Memory)
 			contReset(_Text);
-			_Text= tempText;
+			_Text = tempText;
+			_TextLength = 0;
 
 			CInterfaceGroup *parent = getParent();
 
@@ -3274,8 +3344,9 @@ namespace NLGUI
 				pTooltip->setId(_Id+"_tt"+toString(i));
 				pTooltip->setAvoidResizeParent(avoidResizeParent());
 				pTooltip->setRenderLayer(getRenderLayer());
-				bool isI18N = tempTooltips[i].size() >= 2 && tempTooltips[i][0] == 'u' && tempTooltips[i][1] == 'i';
-				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltips[i].toString()) : tempTooltips[i]);
+				std::string tempTooltipStr = tempTooltips[i].toUtf8();
+				bool isI18N = NLMISC::startsWith(tempTooltipStr, "ui");
+				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr) : ucstring::makeFromUtf8(tempTooltipStr));
 				pTooltip->setParentPos(this);
 				pTooltip->setParentPosRef(Hotspot_BR);
 				pTooltip->setPosRef(Hotspot_BR);
@@ -3303,17 +3374,21 @@ namespace NLGUI
 
 		// color format is available only if multilined
 		if (!_MultiLine)
-			nlwarning( toString("ViewText isn't multilined : uc_hardtext_format will not act as wanted !\n%s", text.toString().c_str()).c_str() );
+			nlwarning("ViewText isn't multilined : uc_hardtext_format will not act as wanted !\n%s", text.c_str());
 	}
 
+	void CViewText::setSingleLineTextFormatTagedAsUtf16(const ucstring &text)
+	{
+		setSingleLineTextFormatTaged(text.toUtf8());
+	}
 
-	void CViewText::setSingleLineTextFormatTaged(const ucstring &text)
+	void CViewText::setSingleLineTextFormatTaged(const std::string &text)
 	{
 		if( text.empty() )
 			return;
 
 		// to allow cache (avoid infinite recurse in updateCoords() in some case), compute in temp
-		ucstring					tempText;
+		std::string							tempText;
 		static std::vector<CFormatTag>		tempLetterColors;
 		static std::vector<ucstring>		tempTooltips;
 
@@ -3357,13 +3432,14 @@ namespace NLGUI
 
 			// Copy to Text (preserve Memory)
 			contReset(_Text);
-			_Text= tempText;
+			_Text = tempText;
+			_TextLength = 0;
 			invalidateContent ();
 		}
 
 		// this color format is available only if not multilined
 		if (_MultiLine)
-			nlwarning( toString("ViewText is multilined : uc_hardtext_single_line_format will not act as wanted !\n%s", text.toString().c_str()).c_str() );
+			nlwarning("ViewText is multilined : uc_hardtext_single_line_format will not act as wanted !\n%s", text.c_str());
 	}
 
 
@@ -3398,6 +3474,7 @@ namespace NLGUI
 	{
 		_CaseMode = caseMode;
 		setCase (_Text, _CaseMode);
+		_TextLength = 0;
 	}
 
 	// ***************************************************************************
@@ -3470,21 +3547,22 @@ namespace NLGUI
 			{
 				if (_MultiLine)
 				{
-					setTextFormatTaged(text);
+					setTextFormatTaged(text.toUtf8());
 				}
 				else
 				{
-					setSingleLineTextFormatTaged(text);
+					setSingleLineTextFormatTaged(text.toUtf8());
 				}
 			}
 			else
 			{
-				setText(text);
+				setText(text.toUtf8());
 			}
 		}
 		else
 		{
-			f.serial(_Text);
+			ucstring text = CUtfStringView(_Text).toUtf16();
+			f.serial(text);
 		}
 
 		#undef SERIAL_UINT
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 655ea084f..2d6a7e6f5 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -156,35 +156,27 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 						// Select all the text for easier selection
 						editBoxShort->setSelectionAll();
 					}
-					group->setActive(true);
 				}
 				else
 				{
-					ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 					if (itemInfo.CustomText.empty())
-						display->setTextFormatTaged(localDesc);
+						display->setTextFormatTaged(CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)).toUtf8());
 					else
 					{
 						ucstring text = itemInfo.CustomText;
-						if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+						string::size_type delimiter = text.find(' ');
+						if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 						{
 							CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 							if (pGH)
-								pGH->browse(text.substr(4, text.size()-4).toString().c_str());
-							text = localDesc;
-						}
-						else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
-						{
-							string code = text.substr(4, text.size()-4).toString();
-							if (!code.empty())
-								CLuaManager::getInstance().executeLuaScript(code);
-							text = localDesc;
-						}
-						if (!text.empty())
-						{
-							display->setTextFormatTaged(text);
-							group->setActive(true);
+								pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
+							if (delimiter == string::npos)
+								group->setActive(false);
+							else
+								text = text.substr(delimiter, text.size()-delimiter);
 						}
+						
+						display->setTextFormatTaged(text.toUtf8());		
 					}
 				}
 			}
@@ -241,7 +233,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 
 					editBoxShort->setInputString(std::string());
 					editBoxLarge->setInputString(std::string());
-					display->setTextFormatTaged(ucstring());
+					display->setTextFormatTaged(std::string());
 
 
 					// Finish the display or add the waiter
@@ -295,37 +287,33 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					display->setActive(true);
 					editButtons->setActive(false);
 					closeButton->setActive(true);
-					group->setActive(false);
+					group->setActive(true);
 
 					editBoxShort->setInputString(std::string());
 					editBoxLarge->setInputString(std::string());
-					display->setTextFormatTaged(ucstring());
+					display->setTextFormatTaged(std::string());
 
 					// Finish the display or add the waiter
 					if (getInventory().isItemInfoUpToDate(ItemSlotId))
 					{
-						ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
+						// If we already have item info
 						if (itemInfo.CustomText.empty())
-							display->setTextFormatTaged(localDesc);
+							display->setTextFormatTaged(CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)).toUtf8());
 						else
 						{
 							ucstring text = itemInfo.CustomText;
-							if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+							string::size_type delimiter = text.find(' ');
+							if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 							{
 								CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 								if (pGH)
-									pGH->browse(text.substr(4, text.size()-4).toString().c_str());
-								text = localDesc;
+									pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
+								if (delimiter == string::npos)
+									group->setActive(false);
+								else
+									text = text.substr(delimiter, text.size()-delimiter);
 							}
-							else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
-							{
-								string code = text.substr(4, text.size()-4).toString();
-								if (!code.empty())
-									CLuaManager::getInstance().executeLuaScript(code);
-								text = localDesc;
-							}
-							if (!text.empty())
-								display->setTextFormatTaged(text);
+							display->setTextFormatTaged(text.toUtf8());
 						}
 					}
 					else
@@ -446,7 +434,7 @@ static	TStackMode		CurrentStackMode;
 
 
 static void validateStackItem(CDBCtrlSheet *src, CDBCtrlSheet *dest, sint32 quantity, TStackMode stackMode);
-static void checkItemCommand(const CItemSheet *itemSheet);
+
 
 //=====================================================================================================================
 /** Send a swap item msg to the server
@@ -1688,10 +1676,6 @@ class CHandlerItemCristalReload : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
-		const CItemSheet *pIS = pCS->asItemSheet();
-		if (pIS && pIS->Scroll.Label.empty())
-			checkItemCommand(pIS);
-
 		sendToServerEnchantMessage((uint8)pCS->getInventoryIndex(), (uint16)pCS->getIndexInDB());
 	}
 };
@@ -1769,7 +1753,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 		CViewTextMenu	*pCrisReload = dynamic_cast<CViewTextMenu*>(pMenu->getView("cris_reload"));
 		CViewTextMenu	*pTeleportUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("teleport_use"));
 		CViewTextMenu	*pItemConsume = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_consume"));
-		CViewTextMenu	*pItemExecute = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_execute"));
 		CViewTextMenu	*pXpCatalyserUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("xp_catalyser_use"));
 		CViewTextMenu	*pDrop = dynamic_cast<CViewTextMenu*>(pMenu->getView("drop"));
 		CViewTextMenu	*pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
@@ -1797,7 +1780,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 		if(pCrisReload)	pCrisReload->setActive(false);
 		if(pTeleportUse) pTeleportUse->setActive(false);
 		if(pItemConsume) pItemConsume->setActive(false);
-		if(pItemExecute) pItemExecute->setActive(false);
 		if(pXpCatalyserUse) pXpCatalyserUse->setActive(false);
 		if(pItemTextDisplay) pItemTextDisplay->setActive(false);
 		if(pItemTextEdition) pItemTextEdition->setActive(false);
@@ -1872,61 +1854,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 			{
 				pItemInfos->setActive(true);
 			}
-			// item has a label?
-			if (!pIS->Scroll.Label.empty())
-			{
-				CGroupMenu *menu = dynamic_cast<CGroupMenu *>(
-					CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag")
-				);
-				// add the label to default menu
-				if (!pIS->Scroll.LuaCommand.empty() || !pIS->Scroll.WebCommand.empty())
-					menu->setActionHandler(4, menu->getActionHandler(4));
-				else
-				{
-					// replace default menu and redirect action handler
-					if (pCrisEnchant && pCrisEnchant->getActive())
-					{
-						pCrisEnchant->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(0));
-					}
-					if (pCrisReload && pCrisReload->getActive())
-					{
-						pCrisReload->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(1));
-					}
-					if (pTeleportUse && pTeleportUse->getActive())
-					{
-						pTeleportUse->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(2));
-					}
-					if (pItemConsume && pItemConsume->getActive())
-					{
-						pItemConsume->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(3));
-					}
-					if (pXpCatalyserUse && pXpCatalyserUse->getActive())
-					{
-						pXpCatalyserUse->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(5));
-					}
-					if (pItemTextDisplay && pItemTextDisplay->getActive())
-					{
-						pItemTextDisplay->setActive(false);
-						menu->setActionHandler(4, menu->getActionHandler(6));
-						menu->setActionHandlerParam(4, menu->getActionHandlerParam(6));
-					}
-				}
-				if (!bIsLockedByOwner)
-				{
-					if (pCS->getInventoryIndex() == INVENTORIES::bag)
-						pItemExecute->setActive(true);
-					// enchant and reload can be used from anywhere
-					if (pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL || pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE)
-						pItemExecute->setActive(true);
-
-					pItemExecute->setText(CI18N::get(pIS->Scroll.Label));
-				}
-			}
 		}
 
 		CInventoryManager	&invMngr= getInventory();
@@ -2057,7 +1984,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pCrisReload)		pCrisReload->setGrayed(true);
 			if(pTeleportUse)	pTeleportUse->setGrayed(true);
 			if(pItemConsume)	pItemConsume->setGrayed(true);
-			if(pItemExecute)	pItemExecute->setGrayed(true);
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(true);
 			if(pDrop)			pDrop->setGrayed(true);
 			if(pDestroy)		pDestroy->setGrayed(true);
@@ -2077,7 +2003,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pCrisReload)		pCrisReload->setGrayed(false);
 			if(pTeleportUse)	pTeleportUse->setGrayed(false);
 			if(pItemConsume)	pItemConsume->setGrayed(false);
-			if(pItemExecute)	pItemExecute->setGrayed(false);
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(false);
 			if(pDrop)			pDrop->setGrayed(false);
 			if(pDestroy)		pDestroy->setGrayed(false);
@@ -2258,24 +2183,6 @@ static void sendMsgStopUseXpCat( bool isRingCatalyser )
 	}
 }
 
-// ***************************************************************************
-static void checkItemCommand(const CItemSheet *itemSheet)
-{
-	if (itemSheet)
-	{
-		if (!itemSheet->Scroll.LuaCommand.empty())
-			CLuaManager::getInstance().executeLuaScript(itemSheet->Scroll.LuaCommand);
-		// webig
-		if (!itemSheet->Scroll.WebCommand.empty())
-		{
-			CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(
-				CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html")
-			);
-			if (pGH) pGH->browse(itemSheet->Scroll.WebCommand.c_str());
-		}
-	}
-	return;
-}
 
 // ***************************************************************************
 class CHandlerTeleportUse : public IActionHandler
@@ -2304,8 +2211,6 @@ class CHandlerTeleportUse : public IActionHandler
 					LoadingBackground = TeleportKaravanBackground;
 				break;
 			}
-			if (pIS->Scroll.Label.empty())
-				checkItemCommand(pIS);
 		}
 	}
 };
@@ -2320,28 +2225,12 @@ class CHandlerItemConsume : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
-		const CItemSheet *pIS = pCS->asItemSheet();
-		if (pIS && pIS->Scroll.Label.empty())
-			checkItemCommand(pIS);
-
 		// use the item
 		sendMsgUseItem(uint16(pCS->getIndexInDB()));
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerItemConsume, "item_consume" );
 
-// ***************************************************************************
-class CHandlerItemExecute : public IActionHandler
-{
-	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
-		if (pCS)
-			checkItemCommand(pCS->asItemSheet());
-		return;
-	}
-};
-REGISTER_ACTION_HANDLER( CHandlerItemExecute, "item_execute" );
 
 // ***************************************************************************
 class CHandlerValidateItemTextEdition : public IActionHandler
@@ -2365,10 +2254,6 @@ class CHandlerItemTextDisplay : public IActionHandler
 		if (pCSItem == NULL || windowName.empty()) 
 			return;
 
-		const CItemSheet *pIS = pCSItem->asItemSheet();
-		if (pIS && pIS->Scroll.Label.empty())
-			checkItemCommand(pIS);
-
 		CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, false);
 	}
 };
@@ -2410,10 +2295,6 @@ class CHandlerXpCatalyserUse : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
-		const CItemSheet *pIS = pCS->asItemSheet();
-		if (pIS && pIS->Scroll.Label.empty())
-			checkItemCommand(pIS);
-
 		// use the item
 		sendMsgUseItem(uint16(pCS->getIndexInDB()));
 	}

From 2de4907b83f6015d8ad81ef661806675b40165d9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 01:54:14 +0800
Subject: [PATCH 064/292] Reimplement toLower and toUpper as UTF-8,
 ryzom/ryzomcore#335

---
 nel/include/nel/misc/common.h     |    8 +-
 nel/include/nel/misc/ucstring.h   |    6 -
 nel/src/gui/dbgroup_combo_box.cpp |    2 +-
 nel/src/gui/string_case.cpp       |    4 +-
 nel/src/misc/common.cpp           |    8 +
 nel/src/misc/unicode.cpp          | 3164 ++++++++++++++++++++++++++++-
 6 files changed, 3146 insertions(+), 46 deletions(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 2f678acef..7b89bae3b 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -227,8 +227,8 @@ inline double	isValidDouble (double v)
  * \param str a string to transform to lower case
  */
 
-std::string toLower ( const char *str ); // Ascii only
-std::string	toLower ( const std::string &str ); // Ascii only
+std::string toLower ( const char *str ); // UTF-8
+std::string	toLower ( const std::string &str ); // UTF-8
 void		toLower ( char *str ); // Ascii only
 char		toLower ( const char ch );	// convert only one character
 
@@ -236,8 +236,8 @@ char		toLower ( const char ch );	// convert only one character
  * \param a string to transform to upper case
  */
 
-// std::string toUpper ( const char *str ); // Ascii only
-std::string	toUpper ( const std::string &str); // Ascii only
+std::string toUpper ( const char *str ); // UTF-8
+std::string	toUpper ( const std::string &str); // UTF-8
 void		toUpper ( char *str); // Ascii only
 
 
diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 8bbcd828d..61f7f416b 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -260,12 +260,6 @@ ucstring toUpper(const ucstring &str);
 void toUpper(ucchar *str);
 ucchar toUpper(ucchar c);
 
-std::string toLowerAsUtf8(const char *str);
-std::string	toLowerAsUtf8(const std::string &str);
-
-std::string toUpperAsUtf8(const char *str);
-std::string	toUpperAsUtf8(const std::string &str);
-
 };
 
 #endif // NL_UCSTRING_H
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index dd7f2154d..6cf911399 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -45,7 +45,7 @@ namespace NLGUI
 	// Compare strings
 	static inline bool lt_text(const std::pair<int,std::string> &s1, const std::pair<int,std::string> &s2)
 	{
-		return toLowerAsUtf8(s1.second) < toLowerAsUtf8(s2.second);
+		return toLower(s1.second) < toLower(s2.second);
 	}
 
 	std::string CDBGroupComboBox::measureMenu;
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index d970d1e03..f6218d39a 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -148,10 +148,10 @@ namespace NLGUI
 		switch (mode)
 		{
 		case CaseLower:
-			str = NLMISC::toLowerAsUtf8(str);
+			str = NLMISC::toLower(str);
 			break;
 		case CaseUpper:
-			str = NLMISC::toUpperAsUtf8(str);
+			str = NLMISC::toUpper(str);
 			break;
 		case CaseFirstStringLetterUp:
 		{
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index b9e9a7d85..184f550d5 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -594,6 +594,8 @@ NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human rea
 	return true;
 }
 
+#if 0
+
 std::string toLower(const char *str)
 {
 	if (!str) return "";
@@ -625,6 +627,8 @@ std::string	toLower(const std::string &str)
 	return res;
 }
 
+#endif
+
 char toLower(const char ch)
 {
 	if( (ch >= 'A') && (ch <= 'Z') )
@@ -652,6 +656,8 @@ void toLower(char *str)
 	}
 }
 
+#if 0
+
 std::string toUpper(const std::string &str)
 {
 	string res;
@@ -666,6 +672,8 @@ std::string toUpper(const std::string &str)
 	return res;
 }
 
+#endif
+
 void toUpper(char *str)
 {
 	if (str == 0)
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 6a0bf25c0..50cefbf71 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -1950,39 +1950,6 @@ ucchar		toLower (ucchar c)
 
 // ***************************************************************************
 
-static std::string toLowerAsUtf8(CUtfStringView sv)
-{
-	std::string res;
-	res.reserve(sv.largestSize());
-	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
-	{
-		u32char c = *it;
-		if (c < 0x10000)
-		{
-			ucchar uc = c;
-			ucchar *result = toLowerUpperSearch(&uc, UnicodeUpperToLower);
-			if (result)
-				c = result[1];
-		}
-		CUtfStringView::append(res, c);
-	}
-	return res;
-}
-
-std::string toLowerAsUtf8(const char *str)
-{
-	return toLowerAsUtf8(CUtfStringView(str));
-}
-
-// ***************************************************************************
-
-std::string	toLowerAsUtf8(const std::string &str)
-{
-	return toLowerAsUtf8(CUtfStringView(str));
-}
-
-// ***************************************************************************
-
 ucstring	toUpper (const ucstring &str)
 {
 	uint i;
@@ -2023,6 +1990,2922 @@ ucchar		toUpper (ucchar c)
 	return c;
 }
 
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+static const char s_Utf8UpperToLowerC2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xBC', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerC3[64 * 4] = {
+	'\xC3', '\xA0', '\x00', 0,
+	'\xC3', '\xA1', '\x00', 0,
+	'\xC3', '\xA2', '\x00', 0,
+	'\xC3', '\xA3', '\x00', 0,
+	'\xC3', '\xA4', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	'\xC3', '\xA6', '\x00', 0,
+	'\xC3', '\xA7', '\x00', 0,
+	'\xC3', '\xA8', '\x00', 0,
+	'\xC3', '\xA9', '\x00', 0,
+	'\xC3', '\xAA', '\x00', 0,
+	'\xC3', '\xAB', '\x00', 0,
+	'\xC3', '\xAC', '\x00', 0,
+	'\xC3', '\xAD', '\x00', 0,
+	'\xC3', '\xAE', '\x00', 0,
+	'\xC3', '\xAF', '\x00', 0,
+	'\xC3', '\xB0', '\x00', 0,
+	'\xC3', '\xB1', '\x00', 0,
+	'\xC3', '\xB2', '\x00', 0,
+	'\xC3', '\xB3', '\x00', 0,
+	'\xC3', '\xB4', '\x00', 0,
+	'\xC3', '\xB5', '\x00', 0,
+	'\xC3', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xB8', '\x00', 0,
+	'\xC3', '\xB9', '\x00', 0,
+	'\xC3', '\xBA', '\x00', 0,
+	'\xC3', '\xBB', '\x00', 0,
+	'\xC3', '\xBC', '\x00', 0,
+	'\xC3', '\xBD', '\x00', 0,
+	'\xC3', '\xBE', '\x00', 0,
+	'\xC3', '\x9F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerC4[64 * 4] = {
+	'\xC4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\x69', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x80', '\x00', 0,
+};
+
+static const char s_Utf8UpperToLowerC5[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC5', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\xBC', '\x00', 0,
+	'\xC5', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xBF', '\x00', 0,
+	'\xC5', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\x73', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8UpperToLowerC6[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC9', '\x93', '\x00', 0,
+	'\xC6', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x94', '\x00', 0,
+	'\xC6', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x96', '\x00', 0,
+	'\xC9', '\x97', '\x00', 0,
+	'\xC6', '\x8C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9D', '\x00', 0,
+	'\xC9', '\x99', '\x00', 0,
+	'\xC9', '\x9B', '\x00', 0,
+	'\xC6', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA0', '\x00', 0,
+	'\xC9', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA9', '\x00', 0,
+	'\xC9', '\xA8', '\x00', 0,
+	'\xC6', '\x99', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC9', '\xAF', '\x00', 0,
+	'\xC9', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xB5', '\x00', 0,
+	'\xC6', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x80', '\x00', 0,
+	'\xC6', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x88', '\x00', 0,
+	'\xC6', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x8A', '\x00', 0,
+	'\xCA', '\x8B', '\x00', 0,
+	'\xC6', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x92', '\x00', 0,
+	'\xC6', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x86', '\x00', 0,
+	'\xC7', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x89', '\x00', 0,
+	'\xC7', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8C', '\x00', 0,
+	'\xC7', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\x6A', '\x00', '\x00', 0,
+	'\xC7', '\xB3', '\x00', 0,
+	'\xC7', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x95', '\x00', 0,
+	'\xC6', '\xBF', '\x00', 0,
+	'\xC7', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerC8[64 * 4] = {
+	'\xC8', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB3', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerCD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xAD', '\x00', 0,
+	'\xCE', '\xAE', '\x00', 0,
+	'\xCE', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8D', '\x00', 0,
+	'\xCF', '\x8E', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xCE', '\xB2', '\x00', 0,
+	'\xCE', '\xB3', '\x00', 0,
+	'\xCE', '\xB4', '\x00', 0,
+	'\xCE', '\xB5', '\x00', 0,
+	'\xCE', '\xB6', '\x00', 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xCE', '\xB8', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xBA', '\x00', 0,
+	'\xCE', '\xBB', '\x00', 0,
+	'\xCE', '\xBC', '\x00', 0,
+	'\xCE', '\xBD', '\x00', 0,
+	'\xCE', '\xBE', '\x00', 0,
+	'\xCE', '\xBF', '\x00', 0,
+	'\xCF', '\x80', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x83', '\x00', 0,
+	'\xCF', '\x84', '\x00', 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x86', '\x00', 0,
+	'\xCF', '\x87', '\x00', 0,
+	'\xCF', '\x88', '\x00', 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xCF', '\x8A', '\x00', 0,
+	'\xCF', '\x8B', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerCF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB2', '\x00', 0,
+	'\xCE', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x86', '\x00', 0,
+	'\xCF', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xBA', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB8', '\x00', 0,
+	'\xCE', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xB2', '\x00', 0,
+	'\xCF', '\xBB', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD0[64 * 4] = {
+	'\xD1', '\x90', '\x00', 0,
+	'\xD1', '\x91', '\x00', 0,
+	'\xD1', '\x92', '\x00', 0,
+	'\xD1', '\x93', '\x00', 0,
+	'\xD1', '\x94', '\x00', 0,
+	'\xD1', '\x95', '\x00', 0,
+	'\xD1', '\x96', '\x00', 0,
+	'\xD1', '\x97', '\x00', 0,
+	'\xD1', '\x98', '\x00', 0,
+	'\xD1', '\x99', '\x00', 0,
+	'\xD1', '\x9A', '\x00', 0,
+	'\xD1', '\x9B', '\x00', 0,
+	'\xD1', '\x9C', '\x00', 0,
+	'\xD1', '\x9D', '\x00', 0,
+	'\xD1', '\x9E', '\x00', 0,
+	'\xD1', '\x9F', '\x00', 0,
+	'\xD0', '\xB0', '\x00', 0,
+	'\xD0', '\xB1', '\x00', 0,
+	'\xD0', '\xB2', '\x00', 0,
+	'\xD0', '\xB3', '\x00', 0,
+	'\xD0', '\xB4', '\x00', 0,
+	'\xD0', '\xB5', '\x00', 0,
+	'\xD0', '\xB6', '\x00', 0,
+	'\xD0', '\xB7', '\x00', 0,
+	'\xD0', '\xB8', '\x00', 0,
+	'\xD0', '\xB9', '\x00', 0,
+	'\xD0', '\xBA', '\x00', 0,
+	'\xD0', '\xBB', '\x00', 0,
+	'\xD0', '\xBC', '\x00', 0,
+	'\xD0', '\xBD', '\x00', 0,
+	'\xD0', '\xBE', '\x00', 0,
+	'\xD0', '\xBF', '\x00', 0,
+	'\xD1', '\x80', '\x00', 0,
+	'\xD1', '\x81', '\x00', 0,
+	'\xD1', '\x82', '\x00', 0,
+	'\xD1', '\x83', '\x00', 0,
+	'\xD1', '\x84', '\x00', 0,
+	'\xD1', '\x85', '\x00', 0,
+	'\xD1', '\x86', '\x00', 0,
+	'\xD1', '\x87', '\x00', 0,
+	'\xD1', '\x88', '\x00', 0,
+	'\xD1', '\x89', '\x00', 0,
+	'\xD1', '\x8A', '\x00', 0,
+	'\xD1', '\x8B', '\x00', 0,
+	'\xD1', '\x8C', '\x00', 0,
+	'\xD1', '\x8D', '\x00', 0,
+	'\xD1', '\x8E', '\x00', 0,
+	'\xD1', '\x8F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD1[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD1', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD2[64 * 4] = {
+	'\xD2', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD3[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD3', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD4[64 * 4] = {
+	'\xD4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD5', '\xA1', '\x00', 0,
+	'\xD5', '\xA2', '\x00', 0,
+	'\xD5', '\xA3', '\x00', 0,
+	'\xD5', '\xA4', '\x00', 0,
+	'\xD5', '\xA5', '\x00', 0,
+	'\xD5', '\xA6', '\x00', 0,
+	'\xD5', '\xA7', '\x00', 0,
+	'\xD5', '\xA8', '\x00', 0,
+	'\xD5', '\xA9', '\x00', 0,
+	'\xD5', '\xAA', '\x00', 0,
+	'\xD5', '\xAB', '\x00', 0,
+	'\xD5', '\xAC', '\x00', 0,
+	'\xD5', '\xAD', '\x00', 0,
+	'\xD5', '\xAE', '\x00', 0,
+	'\xD5', '\xAF', '\x00', 0,
+};
+
+static const char s_Utf8UpperToLowerD5[64 * 4] = {
+	'\xD5', '\xB0', '\x00', 0,
+	'\xD5', '\xB1', '\x00', 0,
+	'\xD5', '\xB2', '\x00', 0,
+	'\xD5', '\xB3', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xB5', '\x00', 0,
+	'\xD5', '\xB6', '\x00', 0,
+	'\xD5', '\xB7', '\x00', 0,
+	'\xD5', '\xB8', '\x00', 0,
+	'\xD5', '\xB9', '\x00', 0,
+	'\xD5', '\xBA', '\x00', 0,
+	'\xD5', '\xBB', '\x00', 0,
+	'\xD5', '\xBC', '\x00', 0,
+	'\xD5', '\xBD', '\x00', 0,
+	'\xD5', '\xBE', '\x00', 0,
+	'\xD5', '\xBF', '\x00', 0,
+	'\xD6', '\x80', '\x00', 0,
+	'\xD6', '\x81', '\x00', 0,
+	'\xD6', '\x82', '\x00', 0,
+	'\xD6', '\x83', '\x00', 0,
+	'\xD6', '\x84', '\x00', 0,
+	'\xD6', '\x85', '\x00', 0,
+	'\xD6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerD6[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD5', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1B8[64 * 4] = {
+	'\xE1', '\xB8', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1B9[64 * 4] = {
+	'\xE1', '\xB9', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1BA[64 * 4] = {
+	'\xE1', '\xBA', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x95', 0,
+	0, 0, 0, 0,
+	'\x68', '\x00', '\x00', 0,
+	'\x74', '\x00', '\x00', 0,
+	'\x77', '\x00', '\x00', 0,
+	'\x79', '\x00', '\x00', 0,
+	'\x61', '\x00', '\x00', 0,
+	'\xE1', '\xB9', '\xA1', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1BB[64 * 4] = {
+	'\xE1', '\xBB', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1BC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x80', 0,
+	'\xE1', '\xBC', '\x81', 0,
+	'\xE1', '\xBC', '\x82', 0,
+	'\xE1', '\xBC', '\x83', 0,
+	'\xE1', '\xBC', '\x84', 0,
+	'\xE1', '\xBC', '\x85', 0,
+	'\xE1', '\xBC', '\x86', 0,
+	'\xE1', '\xBC', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x90', 0,
+	'\xE1', '\xBC', '\x91', 0,
+	'\xE1', '\xBC', '\x92', 0,
+	'\xE1', '\xBC', '\x93', 0,
+	'\xE1', '\xBC', '\x94', 0,
+	'\xE1', '\xBC', '\x95', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA0', 0,
+	'\xE1', '\xBC', '\xA1', 0,
+	'\xE1', '\xBC', '\xA2', 0,
+	'\xE1', '\xBC', '\xA3', 0,
+	'\xE1', '\xBC', '\xA4', 0,
+	'\xE1', '\xBC', '\xA5', 0,
+	'\xE1', '\xBC', '\xA6', 0,
+	'\xE1', '\xBC', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB0', 0,
+	'\xE1', '\xBC', '\xB1', 0,
+	'\xE1', '\xBC', '\xB2', 0,
+	'\xE1', '\xBC', '\xB3', 0,
+	'\xE1', '\xBC', '\xB4', 0,
+	'\xE1', '\xBC', '\xB5', 0,
+	'\xE1', '\xBC', '\xB6', 0,
+	'\xE1', '\xBC', '\xB7', 0,
+};
+
+static const char s_Utf8UpperToLowerE1BD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\x80', 0,
+	'\xE1', '\xBD', '\x81', 0,
+	'\xE1', '\xBD', '\x82', 0,
+	'\xE1', '\xBD', '\x83', 0,
+	'\xE1', '\xBD', '\x84', 0,
+	'\xE1', '\xBD', '\x85', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x97', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA0', 0,
+	'\xE1', '\xBD', '\xA1', 0,
+	'\xE1', '\xBD', '\xA2', 0,
+	'\xE1', '\xBD', '\xA3', 0,
+	'\xE1', '\xBD', '\xA4', 0,
+	'\xE1', '\xBD', '\xA5', 0,
+	'\xE1', '\xBD', '\xA6', 0,
+	'\xE1', '\xBD', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1BE[64 * 4] = {
+	'\xE1', '\xBC', '\x80', 0,
+	'\xE1', '\xBC', '\x81', 0,
+	'\xE1', '\xBC', '\x82', 0,
+	'\xE1', '\xBC', '\x83', 0,
+	'\xE1', '\xBC', '\x84', 0,
+	'\xE1', '\xBC', '\x85', 0,
+	'\xE1', '\xBC', '\x86', 0,
+	'\xE1', '\xBC', '\x87', 0,
+	'\xE1', '\xBE', '\x80', 0,
+	'\xE1', '\xBE', '\x81', 0,
+	'\xE1', '\xBE', '\x82', 0,
+	'\xE1', '\xBE', '\x83', 0,
+	'\xE1', '\xBE', '\x84', 0,
+	'\xE1', '\xBE', '\x85', 0,
+	'\xE1', '\xBE', '\x86', 0,
+	'\xE1', '\xBE', '\x87', 0,
+	'\xE1', '\xBC', '\xA0', 0,
+	'\xE1', '\xBC', '\xA1', 0,
+	'\xE1', '\xBC', '\xA2', 0,
+	'\xE1', '\xBC', '\xA3', 0,
+	'\xE1', '\xBC', '\xA4', 0,
+	'\xE1', '\xBC', '\xA5', 0,
+	'\xE1', '\xBC', '\xA6', 0,
+	'\xE1', '\xBC', '\xA7', 0,
+	'\xE1', '\xBE', '\x90', 0,
+	'\xE1', '\xBE', '\x91', 0,
+	'\xE1', '\xBE', '\x92', 0,
+	'\xE1', '\xBE', '\x93', 0,
+	'\xE1', '\xBE', '\x94', 0,
+	'\xE1', '\xBE', '\x95', 0,
+	'\xE1', '\xBE', '\x96', 0,
+	'\xE1', '\xBE', '\x97', 0,
+	'\xE1', '\xBD', '\xA0', 0,
+	'\xE1', '\xBD', '\xA1', 0,
+	'\xE1', '\xBD', '\xA2', 0,
+	'\xE1', '\xBD', '\xA3', 0,
+	'\xE1', '\xBD', '\xA4', 0,
+	'\xE1', '\xBD', '\xA5', 0,
+	'\xE1', '\xBD', '\xA6', 0,
+	'\xE1', '\xBD', '\xA7', 0,
+	'\xE1', '\xBE', '\xA0', 0,
+	'\xE1', '\xBE', '\xA1', 0,
+	'\xE1', '\xBE', '\xA2', 0,
+	'\xE1', '\xBE', '\xA3', 0,
+	'\xE1', '\xBE', '\xA4', 0,
+	'\xE1', '\xBE', '\xA5', 0,
+	'\xE1', '\xBE', '\xA6', 0,
+	'\xE1', '\xBE', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB0', 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xCE', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xE1', '\xBE', '\xB0', 0,
+	'\xE1', '\xBE', '\xB1', 0,
+	'\xE1', '\xBD', '\xB0', 0,
+	'\xE1', '\xBD', '\xB1', 0,
+	'\xE1', '\xBE', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB4', 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xCE', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xE1', '\xBD', '\xB2', 0,
+	'\xE1', '\xBD', '\xB3', 0,
+	'\xE1', '\xBD', '\xB4', 0,
+	'\xE1', '\xBD', '\xB5', 0,
+	'\xE1', '\xBF', '\x83', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xE1', '\xBF', '\x90', 0,
+	'\xE1', '\xBF', '\x91', 0,
+	'\xE1', '\xBD', '\xB6', 0,
+	'\xE1', '\xBD', '\xB7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xE1', '\xBF', '\xA0', 0,
+	'\xE1', '\xBF', '\xA1', 0,
+	'\xE1', '\xBD', '\xBA', 0,
+	'\xE1', '\xBD', '\xBB', 0,
+	'\xE1', '\xBF', '\xA5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xBC', 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xCF', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xE1', '\xBD', '\xB8', 0,
+	'\xE1', '\xBD', '\xB9', 0,
+	'\xE1', '\xBD', '\xBC', 0,
+	'\xE1', '\xBD', '\xBD', 0,
+	'\xE1', '\xBF', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE284[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x6B', '\x00', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xB0', 0,
+	'\xE2', '\x85', '\xB1', 0,
+	'\xE2', '\x85', '\xB2', 0,
+	'\xE2', '\x85', '\xB3', 0,
+	'\xE2', '\x85', '\xB4', 0,
+	'\xE2', '\x85', '\xB5', 0,
+	'\xE2', '\x85', '\xB6', 0,
+	'\xE2', '\x85', '\xB7', 0,
+	'\xE2', '\x85', '\xB8', 0,
+	'\xE2', '\x85', '\xB9', 0,
+	'\xE2', '\x85', '\xBA', 0,
+	'\xE2', '\x85', '\xBB', 0,
+	'\xE2', '\x85', '\xBC', 0,
+	'\xE2', '\x85', '\xBD', 0,
+	'\xE2', '\x85', '\xBE', 0,
+	'\xE2', '\x85', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerE292[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x93', '\x90', 0,
+	'\xE2', '\x93', '\x91', 0,
+	'\xE2', '\x93', '\x92', 0,
+	'\xE2', '\x93', '\x93', 0,
+	'\xE2', '\x93', '\x94', 0,
+	'\xE2', '\x93', '\x95', 0,
+	'\xE2', '\x93', '\x96', 0,
+	'\xE2', '\x93', '\x97', 0,
+	'\xE2', '\x93', '\x98', 0,
+	'\xE2', '\x93', '\x99', 0,
+};
+
+static const char s_Utf8UpperToLowerE293[64 * 4] = {
+	'\xE2', '\x93', '\x9A', 0,
+	'\xE2', '\x93', '\x9B', 0,
+	'\xE2', '\x93', '\x9C', 0,
+	'\xE2', '\x93', '\x9D', 0,
+	'\xE2', '\x93', '\x9E', 0,
+	'\xE2', '\x93', '\x9F', 0,
+	'\xE2', '\x93', '\xA0', 0,
+	'\xE2', '\x93', '\xA1', 0,
+	'\xE2', '\x93', '\xA2', 0,
+	'\xE2', '\x93', '\xA3', 0,
+	'\xE2', '\x93', '\xA4', 0,
+	'\xE2', '\x93', '\xA5', 0,
+	'\xE2', '\x93', '\xA6', 0,
+	'\xE2', '\x93', '\xA7', 0,
+	'\xE2', '\x93', '\xA8', 0,
+	'\xE2', '\x93', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerEFAC[64 * 4] = {
+	'\x66', '\x00', '\x00', 0,
+	'\x66', '\x00', '\x00', 0,
+	'\x66', '\x00', '\x00', 0,
+	'\x66', '\x00', '\x00', 0,
+	'\x66', '\x00', '\x00', 0,
+	'\x73', '\x00', '\x00', 0,
+	'\x73', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xBE', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8UpperToLowerEFBC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEF', '\xBD', '\x81', 0,
+	'\xEF', '\xBD', '\x82', 0,
+	'\xEF', '\xBD', '\x83', 0,
+	'\xEF', '\xBD', '\x84', 0,
+	'\xEF', '\xBD', '\x85', 0,
+	'\xEF', '\xBD', '\x86', 0,
+	'\xEF', '\xBD', '\x87', 0,
+	'\xEF', '\xBD', '\x88', 0,
+	'\xEF', '\xBD', '\x89', 0,
+	'\xEF', '\xBD', '\x8A', 0,
+	'\xEF', '\xBD', '\x8B', 0,
+	'\xEF', '\xBD', '\x8C', 0,
+	'\xEF', '\xBD', '\x8D', 0,
+	'\xEF', '\xBD', '\x8E', 0,
+	'\xEF', '\xBD', '\x8F', 0,
+	'\xEF', '\xBD', '\x90', 0,
+	'\xEF', '\xBD', '\x91', 0,
+	'\xEF', '\xBD', '\x92', 0,
+	'\xEF', '\xBD', '\x93', 0,
+	'\xEF', '\xBD', '\x94', 0,
+	'\xEF', '\xBD', '\x95', 0,
+	'\xEF', '\xBD', '\x96', 0,
+	'\xEF', '\xBD', '\x97', 0,
+	'\xEF', '\xBD', '\x98', 0,
+	'\xEF', '\xBD', '\x99', 0,
+	'\xEF', '\xBD', '\x9A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_Utf8UpperToLowerTables[32] = {
+	0, 0,
+	s_Utf8UpperToLowerC2,
+	s_Utf8UpperToLowerC3,
+	s_Utf8UpperToLowerC4,
+	s_Utf8UpperToLowerC5,
+	s_Utf8UpperToLowerC6,
+	s_Utf8UpperToLowerC7,
+	s_Utf8UpperToLowerC8,
+	0, 0, 0, 0,
+	s_Utf8UpperToLowerCD,
+	s_Utf8UpperToLowerCE,
+	s_Utf8UpperToLowerCF,
+	s_Utf8UpperToLowerD0,
+	s_Utf8UpperToLowerD1,
+	s_Utf8UpperToLowerD2,
+	s_Utf8UpperToLowerD3,
+	s_Utf8UpperToLowerD4,
+	s_Utf8UpperToLowerD5,
+	s_Utf8UpperToLowerD6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_Utf8UpperToLowerTablesE1[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8UpperToLowerE1B8,
+	s_Utf8UpperToLowerE1B9,
+	s_Utf8UpperToLowerE1BA,
+	s_Utf8UpperToLowerE1BB,
+	s_Utf8UpperToLowerE1BC,
+	s_Utf8UpperToLowerE1BD,
+	s_Utf8UpperToLowerE1BE,
+	s_Utf8UpperToLowerE1BF,
+};
+
+static const char *s_Utf8UpperToLowerTablesE2[64] = {
+	0, 0, 0, 0,
+	s_Utf8UpperToLowerE284,
+	s_Utf8UpperToLowerE285,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8UpperToLowerE292,
+	s_Utf8UpperToLowerE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_Utf8UpperToLowerTablesEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8UpperToLowerEFAC,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8UpperToLowerEFBC,
+	0, 0, 0,
+};
+
+static const char **s_UtfUpperToLowerMap[16] = {
+	0,
+	s_Utf8UpperToLowerTablesE1,
+	s_Utf8UpperToLowerTablesE2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8UpperToLowerTablesEF,
+};
+
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+static const char s_Utf8LowerToUpperC3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x41', '\x00', '\x00', 0,
+	'\xC3', '\x86', '\x00', 0,
+	'\x43', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\xC3', '\x90', '\x00', 0,
+	'\x4E', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x59', '\x00', '\x00', 0,
+	'\xC3', '\x9E', '\x00', 0,
+	'\x59', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperC4[64 * 4] = {
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperC5[64 * 4] = {
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperC6[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x42', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x84', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x46', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\x50', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xA7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB7', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC7', '\x87', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	'\xC6', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperC8[64 * 4] = {
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperC9[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x42', '\x00', '\x00', 0,
+	'\xC6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x89', '\x00', 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x90', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x94', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	'\xC6', '\x96', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperCA[64 * 4] = {
+	'\xC6', '\xA6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xA9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB1', '\x00', 0,
+	'\x56', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x86', '\x00', 0,
+	'\xCE', '\x88', '\x00', 0,
+	'\xCE', '\x89', '\x00', 0,
+	'\xCE', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x91', '\x00', 0,
+	'\xCE', '\x92', '\x00', 0,
+	'\xCE', '\x93', '\x00', 0,
+	'\xCE', '\x94', '\x00', 0,
+	'\xCE', '\x95', '\x00', 0,
+	'\xCE', '\x96', '\x00', 0,
+	'\xCE', '\x97', '\x00', 0,
+	'\xCE', '\x98', '\x00', 0,
+	'\xCD', '\x85', '\x00', 0,
+	'\xCE', '\x9A', '\x00', 0,
+	'\xCE', '\x9B', '\x00', 0,
+	'\xCE', '\x9C', '\x00', 0,
+	'\xCE', '\x9D', '\x00', 0,
+	'\xCE', '\x9E', '\x00', 0,
+	'\xCE', '\x9F', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperCF[64 * 4] = {
+	'\xCE', '\xA0', '\x00', 0,
+	'\xCE', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xA3', '\x00', 0,
+	'\xCE', '\xA4', '\x00', 0,
+	'\xCE', '\xA5', '\x00', 0,
+	'\xCE', '\xA6', '\x00', 0,
+	'\xCE', '\xA7', '\x00', 0,
+	'\xCE', '\xA8', '\x00', 0,
+	'\xCE', '\xA9', '\x00', 0,
+	'\xCE', '\xAA', '\x00', 0,
+	'\xCE', '\xAB', '\x00', 0,
+	'\xCE', '\x8C', '\x00', 0,
+	'\xCE', '\x8E', '\x00', 0,
+	'\xCE', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xCF', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xBA', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperD0[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD0', '\x90', '\x00', 0,
+	'\xD0', '\x91', '\x00', 0,
+	'\xD0', '\x92', '\x00', 0,
+	'\xD0', '\x93', '\x00', 0,
+	'\xD0', '\x94', '\x00', 0,
+	'\xD0', '\x95', '\x00', 0,
+	'\xD0', '\x96', '\x00', 0,
+	'\xD0', '\x97', '\x00', 0,
+	'\xD0', '\x98', '\x00', 0,
+	'\xD0', '\x99', '\x00', 0,
+	'\xD0', '\x9A', '\x00', 0,
+	'\xD0', '\x9B', '\x00', 0,
+	'\xD0', '\x9C', '\x00', 0,
+	'\xD0', '\x9D', '\x00', 0,
+	'\xD0', '\x9E', '\x00', 0,
+	'\xD0', '\x9F', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperD1[64 * 4] = {
+	'\xD0', '\xA0', '\x00', 0,
+	'\xD0', '\xA1', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xA3', '\x00', 0,
+	'\xD0', '\xA4', '\x00', 0,
+	'\xD0', '\xA5', '\x00', 0,
+	'\xD0', '\xA6', '\x00', 0,
+	'\xD0', '\xA7', '\x00', 0,
+	'\xD0', '\xA8', '\x00', 0,
+	'\xD0', '\xA9', '\x00', 0,
+	'\xD0', '\xAA', '\x00', 0,
+	'\xD0', '\xAB', '\x00', 0,
+	'\xD0', '\xAC', '\x00', 0,
+	'\xD0', '\xAD', '\x00', 0,
+	'\xD0', '\xAE', '\x00', 0,
+	'\xD0', '\xAF', '\x00', 0,
+	'\xD0', '\x80', '\x00', 0,
+	'\xD0', '\x81', '\x00', 0,
+	'\xD0', '\x82', '\x00', 0,
+	'\xD0', '\x83', '\x00', 0,
+	'\xD0', '\x84', '\x00', 0,
+	'\xD0', '\x85', '\x00', 0,
+	'\xD0', '\x86', '\x00', 0,
+	'\xD0', '\x87', '\x00', 0,
+	'\xD0', '\x88', '\x00', 0,
+	'\xD0', '\x89', '\x00', 0,
+	'\xD0', '\x8A', '\x00', 0,
+	'\xD0', '\x8B', '\x00', 0,
+	'\xD0', '\x8C', '\x00', 0,
+	'\xD0', '\x8D', '\x00', 0,
+	'\xD0', '\x8E', '\x00', 0,
+	'\xD0', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBE', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperD2[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD2', '\x80', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBE', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperD3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD3', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperD4[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD4', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperD5[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD4', '\xB1', '\x00', 0,
+	'\xD4', '\xB2', '\x00', 0,
+	'\xD4', '\xB3', '\x00', 0,
+	'\xD4', '\xB4', '\x00', 0,
+	'\xD4', '\xB5', '\x00', 0,
+	'\xD4', '\xB6', '\x00', 0,
+	'\xD4', '\xB7', '\x00', 0,
+	'\xD4', '\xB8', '\x00', 0,
+	'\xD4', '\xB9', '\x00', 0,
+	'\xD4', '\xBA', '\x00', 0,
+	'\xD4', '\xBB', '\x00', 0,
+	'\xD4', '\xBC', '\x00', 0,
+	'\xD4', '\xBD', '\x00', 0,
+	'\xD4', '\xBE', '\x00', 0,
+	'\xD4', '\xBF', '\x00', 0,
+	'\xD5', '\x80', '\x00', 0,
+	'\xD5', '\x81', '\x00', 0,
+	'\xD5', '\x82', '\x00', 0,
+	'\xD5', '\x83', '\x00', 0,
+	'\xD5', '\x84', '\x00', 0,
+	'\xD5', '\x85', '\x00', 0,
+	'\xD5', '\x86', '\x00', 0,
+	'\xD5', '\x87', '\x00', 0,
+	'\xD5', '\x88', '\x00', 0,
+	'\xD5', '\x89', '\x00', 0,
+	'\xD5', '\x8A', '\x00', 0,
+	'\xD5', '\x8B', '\x00', 0,
+	'\xD5', '\x8C', '\x00', 0,
+	'\xD5', '\x8D', '\x00', 0,
+	'\xD5', '\x8E', '\x00', 0,
+	'\xD5', '\x8F', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperD6[64 * 4] = {
+	'\xD5', '\x90', '\x00', 0,
+	'\xD5', '\x91', '\x00', 0,
+	'\xD5', '\x92', '\x00', 0,
+	'\xD5', '\x93', '\x00', 0,
+	'\xD5', '\x94', '\x00', 0,
+	'\xD5', '\x95', '\x00', 0,
+	'\xD5', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE1B8[64 * 4] = {
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x42', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x42', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x42', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x43', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x44', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x46', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x47', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x48', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4B', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4C', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4D', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperE1B9[64 * 4] = {
+	0, 0, 0, 0,
+	'\x4D', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4D', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4E', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x50', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x50', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x52', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x53', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x54', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x56', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x56', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperE1BA[64 * 4] = {
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x57', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x58', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x58', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+};
+
+static const char s_Utf8LowerToUpperE1BB[64 * 4] = {
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x45', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x4F', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x55', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\x59', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE1BC[64 * 4] = {
+	'\xE1', '\xBC', '\x88', 0,
+	'\xE1', '\xBC', '\x89', 0,
+	'\xE1', '\xBC', '\x8A', 0,
+	'\xE1', '\xBC', '\x8B', 0,
+	'\xE1', '\xBC', '\x8C', 0,
+	'\xE1', '\xBC', '\x8D', 0,
+	'\xE1', '\xBC', '\x8E', 0,
+	'\xE1', '\xBC', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x98', 0,
+	'\xE1', '\xBC', '\x99', 0,
+	'\xE1', '\xBC', '\x9A', 0,
+	'\xE1', '\xBC', '\x9B', 0,
+	'\xE1', '\xBC', '\x9C', 0,
+	'\xE1', '\xBC', '\x9D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA8', 0,
+	'\xE1', '\xBC', '\xA9', 0,
+	'\xE1', '\xBC', '\xAA', 0,
+	'\xE1', '\xBC', '\xAB', 0,
+	'\xE1', '\xBC', '\xAC', 0,
+	'\xE1', '\xBC', '\xAD', 0,
+	'\xE1', '\xBC', '\xAE', 0,
+	'\xE1', '\xBC', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB8', 0,
+	'\xE1', '\xBC', '\xB9', 0,
+	'\xE1', '\xBC', '\xBA', 0,
+	'\xE1', '\xBC', '\xBB', 0,
+	'\xE1', '\xBC', '\xBC', 0,
+	'\xE1', '\xBC', '\xBD', 0,
+	'\xE1', '\xBC', '\xBE', 0,
+	'\xE1', '\xBC', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE1BD[64 * 4] = {
+	'\xE1', '\xBD', '\x88', 0,
+	'\xE1', '\xBD', '\x89', 0,
+	'\xE1', '\xBD', '\x8A', 0,
+	'\xE1', '\xBD', '\x8B', 0,
+	'\xE1', '\xBD', '\x8C', 0,
+	'\xE1', '\xBD', '\x8D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA8', 0,
+	'\xE1', '\xBD', '\xA9', 0,
+	'\xE1', '\xBD', '\xAA', 0,
+	'\xE1', '\xBD', '\xAB', 0,
+	'\xE1', '\xBD', '\xAC', 0,
+	'\xE1', '\xBD', '\xAD', 0,
+	'\xE1', '\xBD', '\xAE', 0,
+	'\xE1', '\xBD', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBA', 0,
+	'\xE1', '\xBE', '\xBB', 0,
+	'\xE1', '\xBF', '\x88', 0,
+	'\xE1', '\xBF', '\x89', 0,
+	'\xE1', '\xBF', '\x8A', 0,
+	'\xE1', '\xBF', '\x8B', 0,
+	'\xE1', '\xBF', '\x9A', 0,
+	'\xE1', '\xBF', '\x9B', 0,
+	'\xE1', '\xBF', '\xB8', 0,
+	'\xE1', '\xBF', '\xB9', 0,
+	'\xE1', '\xBF', '\xAA', 0,
+	'\xE1', '\xBF', '\xAB', 0,
+	'\xE1', '\xBF', '\xBA', 0,
+	'\xE1', '\xBF', '\xBB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE1BE[64 * 4] = {
+	'\xE1', '\xBE', '\x88', 0,
+	'\xE1', '\xBE', '\x89', 0,
+	'\xE1', '\xBE', '\x8A', 0,
+	'\xE1', '\xBE', '\x8B', 0,
+	'\xE1', '\xBE', '\x8C', 0,
+	'\xE1', '\xBE', '\x8D', 0,
+	'\xE1', '\xBE', '\x8E', 0,
+	'\xE1', '\xBE', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x98', 0,
+	'\xE1', '\xBE', '\x99', 0,
+	'\xE1', '\xBE', '\x9A', 0,
+	'\xE1', '\xBE', '\x9B', 0,
+	'\xE1', '\xBE', '\x9C', 0,
+	'\xE1', '\xBE', '\x9D', 0,
+	'\xE1', '\xBE', '\x9E', 0,
+	'\xE1', '\xBE', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xA8', 0,
+	'\xE1', '\xBE', '\xA9', 0,
+	'\xE1', '\xBE', '\xAA', 0,
+	'\xE1', '\xBE', '\xAB', 0,
+	'\xE1', '\xBE', '\xAC', 0,
+	'\xE1', '\xBE', '\xAD', 0,
+	'\xE1', '\xBE', '\xAE', 0,
+	'\xE1', '\xBE', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xB8', 0,
+	'\xE1', '\xBE', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x8C', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x98', 0,
+	'\xE1', '\xBF', '\x99', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xA8', 0,
+	'\xE1', '\xBF', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xAC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xA0', 0,
+	'\xE2', '\x85', '\xA1', 0,
+	'\xE2', '\x85', '\xA2', 0,
+	'\xE2', '\x85', '\xA3', 0,
+	'\xE2', '\x85', '\xA4', 0,
+	'\xE2', '\x85', '\xA5', 0,
+	'\xE2', '\x85', '\xA6', 0,
+	'\xE2', '\x85', '\xA7', 0,
+	'\xE2', '\x85', '\xA8', 0,
+	'\xE2', '\x85', '\xA9', 0,
+	'\xE2', '\x85', '\xAA', 0,
+	'\xE2', '\x85', '\xAB', 0,
+	'\xE2', '\x85', '\xAC', 0,
+	'\xE2', '\x85', '\xAD', 0,
+	'\xE2', '\x85', '\xAE', 0,
+	'\xE2', '\x85', '\xAF', 0,
+};
+
+static const char s_Utf8LowerToUpperE293[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x42', '\x00', '\x00', 0,
+	'\x43', '\x00', '\x00', 0,
+	'\x44', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x46', '\x00', '\x00', 0,
+	'\x47', '\x00', '\x00', 0,
+	'\x48', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\x4A', '\x00', '\x00', 0,
+	'\x4B', '\x00', '\x00', 0,
+	'\x4C', '\x00', '\x00', 0,
+	'\x4D', '\x00', '\x00', 0,
+	'\x4E', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x50', '\x00', '\x00', 0,
+	'\x51', '\x00', '\x00', 0,
+	'\x52', '\x00', '\x00', 0,
+	'\x53', '\x00', '\x00', 0,
+	'\x54', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x56', '\x00', '\x00', 0,
+	'\x57', '\x00', '\x00', 0,
+	'\x58', '\x00', '\x00', 0,
+	'\x59', '\x00', '\x00', 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_Utf8LowerToUpperEFBD[64 * 4] = {
+	0, 0, 0, 0,
+	'\x41', '\x00', '\x00', 0,
+	'\x42', '\x00', '\x00', 0,
+	'\x43', '\x00', '\x00', 0,
+	'\x44', '\x00', '\x00', 0,
+	'\x45', '\x00', '\x00', 0,
+	'\x46', '\x00', '\x00', 0,
+	'\x47', '\x00', '\x00', 0,
+	'\x48', '\x00', '\x00', 0,
+	'\x49', '\x00', '\x00', 0,
+	'\x4A', '\x00', '\x00', 0,
+	'\x4B', '\x00', '\x00', 0,
+	'\x4C', '\x00', '\x00', 0,
+	'\x4D', '\x00', '\x00', 0,
+	'\x4E', '\x00', '\x00', 0,
+	'\x4F', '\x00', '\x00', 0,
+	'\x50', '\x00', '\x00', 0,
+	'\x51', '\x00', '\x00', 0,
+	'\x52', '\x00', '\x00', 0,
+	'\x53', '\x00', '\x00', 0,
+	'\x54', '\x00', '\x00', 0,
+	'\x55', '\x00', '\x00', 0,
+	'\x56', '\x00', '\x00', 0,
+	'\x57', '\x00', '\x00', 0,
+	'\x58', '\x00', '\x00', 0,
+	'\x59', '\x00', '\x00', 0,
+	'\x5A', '\x00', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_Utf8LowerToUpperTables[32] = {
+	0, 0, 0,
+	s_Utf8LowerToUpperC3,
+	s_Utf8LowerToUpperC4,
+	s_Utf8LowerToUpperC5,
+	s_Utf8LowerToUpperC6,
+	s_Utf8LowerToUpperC7,
+	s_Utf8LowerToUpperC8,
+	s_Utf8LowerToUpperC9,
+	s_Utf8LowerToUpperCA,
+	0, 0, 0,
+	s_Utf8LowerToUpperCE,
+	s_Utf8LowerToUpperCF,
+	s_Utf8LowerToUpperD0,
+	s_Utf8LowerToUpperD1,
+	s_Utf8LowerToUpperD2,
+	s_Utf8LowerToUpperD3,
+	s_Utf8LowerToUpperD4,
+	s_Utf8LowerToUpperD5,
+	s_Utf8LowerToUpperD6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 
+};
+
+static const char *s_Utf8LowerToUpperTablesE1[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8LowerToUpperE1B8,
+	s_Utf8LowerToUpperE1B9,
+	s_Utf8LowerToUpperE1BA,
+	s_Utf8LowerToUpperE1BB,
+	s_Utf8LowerToUpperE1BC,
+	s_Utf8LowerToUpperE1BD,
+	s_Utf8LowerToUpperE1BE,
+	s_Utf8LowerToUpperE1BF,
+};
+
+static const char *s_Utf8LowerToUpperTablesE2[64] = {
+	0, 0, 0, 0, 0,
+	s_Utf8LowerToUpperE285,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8LowerToUpperE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_Utf8LowerToUpperTablesEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8LowerToUpperEFBD,
+	0, 0,
+};
+
+static const char **s_UtfLowerToUpperMap[16] = {
+	0,
+	s_Utf8LowerToUpperTablesE1,
+	s_Utf8LowerToUpperTablesE2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_Utf8LowerToUpperTablesEF,
+};
+
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+#if 1
+
+NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	char c = str[i];
+	char d, e;
+	if (c >= 'A' && c <= 'Z')
+	{
+		// 1-byte UTF-8
+		c += 'a' - 'A';
+	}
+	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
+	{
+		// 2-byte UTF-8
+		const char *table = s_Utf8UpperToLowerTables[c & 0x1F];
+		if (table)
+		{
+			unsigned char idx = (d & 0x3F) << 2;
+			if (table[idx])
+			{
+				res += &table[idx];
+				++i;
+				return;
+			}
+		}
+	}
+	else if ((c & 0xF0) == 0xE0 && ((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+	{
+		// 3-byte UTF-8
+		const char **map = s_UtfUpperToLowerMap[c & 0x0F];
+		if (map)
+		{
+			const char *table = map[d & 0x3F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	res += c;
+}
+
+std::string toLower(const char *str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	for (ptrdiff_t i = 0; str[i]; ++i)
+		appendToLowerAsUtf8(res, str, i);
+	return res;
+}
+
+// ***************************************************************************
+
+std::string	toLower(const std::string &str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	res.reserve(str.size() + (str.size() >> 2));
+	const char *cstr = &str[0];
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size(); ++i)
+		appendToLowerAsUtf8(res, cstr, i);
+	return res;
+}
+
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	char c = str[i];
+	char d, e;
+	if (c >= 'a' && c <= 'z')
+	{
+		// 1-byte UTF-8
+		c -= 'a' - 'A';
+	}
+	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
+	{
+		// 2-byte UTF-8
+		const char *table = s_Utf8LowerToUpperTables[c & 0x1F];
+		if (table)
+		{
+			unsigned char idx = (d & 0x3F) << 2;
+			if (table[idx])
+			{
+				res += &table[idx];
+				++i;
+				return;
+			}
+		}
+	}
+	else if ((c & 0xF0) == 0xE0 && ((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+	{
+		// 3-byte UTF-8
+		const char **map = s_UtfLowerToUpperMap[c & 0x0F];
+		if (map)
+		{
+			const char *table = map[d & 0x3F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	res += c;
+}
+
+// ***************************************************************************
+
+std::string toUpper(const char *str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	for (ptrdiff_t i = 0; str[i]; ++i)
+		appendToUpperAsUtf8(res, str, i);
+	return res;
+}
+
+// ***************************************************************************
+
+std::string	toUpper(const std::string &str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	res.reserve(str.size() + (str.size() >> 2));
+	const char *cstr = &str[0];
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size(); ++i)
+		appendToUpperAsUtf8(res, cstr, i);
+	return res;
+}
+
+// ***************************************************************************
+
+#else
+
+// ***************************************************************************
+
+static std::string toLowerAsUtf8(CUtfStringView sv)
+{
+	// UTF-16 implementation-based
+	std::string res;
+	res.reserve(sv.largestSize());
+	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+	{
+		u32char c = *it;
+		if (c < 0x10000)
+		{
+			ucchar uc = c;
+			ucchar *result = toLowerUpperSearch(&uc, UnicodeUpperToLower);
+			if (result)
+				c = result[1];
+		}
+		CUtfStringView::append(res, c);
+	}
+	return res;
+}
+
+std::string toLowerAsUtf8(const char *str)
+{
+	return toLowerAsUtf8(CUtfStringView(str));
+}
+
+// ***************************************************************************
+
+std::string	toLowerAsUtf8(const std::string &str)
+{
+	return toLowerAsUtf8(CUtfStringView(str));
+}
+
+// ***************************************************************************
+// ***************************************************************************
 // ***************************************************************************
 
 static std::string toUpperAsUtf8(CUtfStringView sv)
@@ -2044,6 +4927,8 @@ static std::string toUpperAsUtf8(CUtfStringView sv)
 	return res;
 }
 
+// ***************************************************************************
+
 std::string toUpperAsUtf8(const char *str)
 {
 	return toUpperAsUtf8(CUtfStringView(str));
@@ -2056,6 +4941,219 @@ std::string	toUpperAsUtf8(const std::string &str)
 	return toUpperAsUtf8(CUtfStringView(str));
 }
 
+#endif
+
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+#if 0
+
+std::string getUtf8(char32_t c)
+{
+	std::string res;
+	if (c < 0x80)
+	{
+		// Encode as 1 byte
+		res += (char)c;
+	}
+	else if (c < 0x0800)
+	{
+		// Encode as 2 bytes
+		res += (char)((c & 0x07C0) >> 6) | 0xC0;
+		res += (char)(c & 0x3F) | 0x80;
+	}
+	else
+	{
+		// Encode as 3 bytes
+		res += (char)((c & 0xF000) >> 12) | 0xE0;
+		res += (char)((c & 0x0FC0) >> 6) | 0x80;
+		res += (char)(c & 0x3F) | 0x80;
+	}
+	return res;
+}
+
+void printStringMap(const std::string &name, std::map<char, std::string> &m, bool trim)
+{
+	std::cout << "static const char " << name << "[" << (trim ? "64" : "256") << " * 4] = {\n";
+	bool zero = false;
+	for (int i = 0; i < (trim ? 64 : 256); ++i)
+	{
+		int x = trim ? i + 0x80 : i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 8 == 7)
+			{
+				zero = false;
+				std::cout << "0, 0, 0, 0,\n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, 0, 0, 0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::cout << "'\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 0 ? (unsigned char)m[x][0] : 0)
+				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 1 ? (unsigned char)m[x][1] : 0)
+				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 2 ? (unsigned char)m[x][2] : 0)
+				<< "', 0,\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void printMapMap(const std::string &name, const std::string &strName, std::map<char, std::map<char, std::string>> &m, bool trim)
+{
+	std::cout << "static const char *" << name << "[" << (trim ? "64" : "256") << " * 2] = {\n";
+	bool zero = false;
+	for (int i = 0; i < (trim ? 64 : 256); ++i)
+	{
+		int x = trim ? (i + 0x80) : i;
+		if (m.find(x) == m.end())
+			x = trim ? (i + 0xC0) : i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 32 == 1315)
+			{
+				zero = false;
+				std::cout << "0, \n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream n;
+			n << strName;
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
+			std::cout << n.str() << ",\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void printMapMapMap(const std::string &name, const std::string &mapName, std::map<char, std::map<char, std::map<char, std::string>>> &m, bool trim)
+{
+	std::cout << "static const char **" << name << "[" << (trim ? "64" : "256") << " * 2] = {\n";
+	bool zero = false;
+	for (int i = 0; i < (trim ? 64 : 256); ++i)
+	{
+		int x = trim ? (i + 0x80) : i;
+		if (m.find(x) == m.end())
+			x = trim ? (i + 0xC0) : i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 32 == 1315)
+			{
+				zero = false;
+				std::cout << "0, \n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream n;
+			n << mapName;
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
+			std::cout << n.str() << ",\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void generate()
+{
+	std::map<char, std::string> m1;
+	std::map<char, std::map<char, std::string>> m2;
+	std::map<char, std::map<char, std::map<char, std::string>>> m3;
+	for (int i = 0; i < sizeof(UnicodeLowerToUpper) / sizeof(UnicodeLowerToUpper[0]); i += 2)
+	{
+		std::string from = getUtf8(UnicodeLowerToUpper[i]);
+		std::string to = getUtf8(UnicodeLowerToUpper[i + 1]);
+		// assert(from.size() == to.size());
+		if (from.length() == 1)
+		{
+			m1[from[0]] = to;
+		}
+		else if (from.length() == 2)
+		{
+			if (m2.find(from[0]) == m2.end())
+				m2[from[0]] = std::map<char, std::string>();
+			m2[from[0]][from[1]] = to;
+		}
+		else if (from.length() == 3)
+		{
+			if (m3.find(from[0]) == m3.end())
+				m3[from[0]] = std::map<char, std::map<char, std::string>>();
+			if (m3[from[0]].find(from[1]) == m3[from[0]].end())
+				m3[from[0]][from[1]] = std::map<char, std::string>();
+			m3[from[0]][from[1]][from[2]] = to;
+		}
+	}
+	printStringMap("s_Utf8LowerToUpper", m1, false);
+	for (int i = 0; i < 256; ++i)
+	{
+		std::stringstream n;
+		n << "s_Utf8LowerToUpper";
+		if (m2.find(i) != m2.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			printStringMap(n.str(), m2[i], true);
+		}
+		else if (m3.find(i) != m3.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			for (int j = 0; j < 256; ++j)
+			{
+				if (m3[i].find(j) != m3[i].end())
+				{
+					std::stringstream nn;
+					nn << n.str();
+					nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
+					printStringMap(nn.str(), m3[i][j], true);
+				}
+			}
+		}
+	}
+	printMapMap("s_Utf8LowerToUpperTables", "s_Utf8LowerToUpper", m2, true);
+	for (int i = 0; i < 256; ++i)
+	{
+		std::stringstream n;
+		n << "s_Utf8LowerToUpperTables";
+		std::stringstream nn;
+		nn << "s_Utf8LowerToUpper";
+		if (m3.find(i) != m3.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			printMapMap(n.str(), nn.str(), m3[i], true);
+		}
+	}
+	printMapMapMap("s_UtfLowerToUpperMap", "s_Utf8LowerToUpperTables", m3, true);
+}
+
+#endif
+
+// ***************************************************************************
+// ***************************************************************************
 // ***************************************************************************
 
 } // NLMISC

From 2eb088ef1cc5d71ac20a3ef178ee02e3f3e14506 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 01:58:24 +0800
Subject: [PATCH 065/292] Cleanup, ryzom/ryzomcore#335

---
 nel/include/nel/gui/string_case.h |   5 --
 nel/src/gui/string_case.cpp       | 100 +-----------------------------
 2 files changed, 1 insertion(+), 104 deletions(-)

diff --git a/nel/include/nel/gui/string_case.h b/nel/include/nel/gui/string_case.h
index 300d72c76..bd56c7998 100644
--- a/nel/include/nel/gui/string_case.h
+++ b/nel/include/nel/gui/string_case.h
@@ -25,7 +25,6 @@
 
 namespace NLGUI
 {
-
 	enum TCaseMode
 	{
 		CaseNormal = 0,					// Nothing done
@@ -37,11 +36,7 @@ namespace NLGUI
 		CaseCount
 	};
 
-
-	void setCase( ucstring &str, TCaseMode mode );
 	void setCase( std::string &str, TCaseMode mode );
-
-
 }
 
 #endif
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index f6218d39a..8946a5d1d 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -32,18 +32,6 @@ namespace NLGUI
 		return (c == (u32char)' ') || (c == (u32char)'\t') || (c == (u32char)'\n') || (c == (u32char)'\r');
 	}
 
-	inline bool isSeparator (ucchar c)
-	{
-		return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r');
-	}
-
-	inline bool isSeparator (char c)
-	{
-		return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r');
-	}
-
-	// ***************************************************************************
-
 	inline bool isEndSentence (u32char c, u32char lastChar)
 	{
 		// Ex: One sentence. Another sentence.
@@ -54,90 +42,6 @@ namespace NLGUI
 			&& (lastChar == (u32char)'.') || (lastChar == (u32char)'!') || (lastChar == (u32char)'?');
 	}
 
-	inline bool isEndSentence (ucstring& str, uint index)
-	{
-		// Ex: One sentence. Another sentence.
-		//                  ^
-		// Counterexample: nevrax.com
-		//                       ^
-		ucchar c = str[index];
-		if ((str[index] == ' ') || (str[index] == '\n'))
-		{
-			if (index < 1)
-				return false;
-			c = str[index-1];
-			return (c == '.') || (c == '!') || (c == '?');
-		}
-		return false;
-	}
-
-
-	void setCase( ucstring &str, TCaseMode mode )
-	{
-		const uint length = (uint)str.length();
-		uint i;
-		bool newString = true;
-		bool newSentence = true;
-		bool newWord = true;
-		switch (mode)
-		{
-		case CaseLower:
-			str = NLMISC::toLower (str);
-			break;
-		case CaseUpper:
-			str = NLMISC::toUpper (str);
-			break;
-		case CaseFirstStringLetterUp:
-			for (i=0; i<length; i++)
-			{
-				if (!isSeparator (str[i]))
-				{
-					if (newString)
-						str[i] = NLMISC::toUpper (str[i]);
-					else
-						str[i] = NLMISC::toLower (str[i]);
-					newString = false;
-				}
-			}
-			break;
-		case CaseFirstSentenceLetterUp:
-			for (i=0; i<length; i++)
-			{
-				if (isEndSentence (str, i))
-					newSentence = true;
-				else
-				{
-					if (newSentence)
-						str[i] = NLMISC::toUpper (str[i]);
-					else
-						str[i] = NLMISC::toLower (str[i]);
-
-					if (!isSeparator (str[i]))
-						newSentence = false;
-				}
-			}
-			break;
-		case CaseFirstWordLetterUp:
-			for (i=0; i<length; i++)
-			{
-				if (isSeparator (str[i]) || isEndSentence (str, i))
-					newWord = true;
-				else
-				{
-					if (newWord)
-						str[i] = NLMISC::toUpper (str[i]);
-					else
-						str[i] = NLMISC::toLower (str[i]);
-
-					newWord = false;
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
 	void setCase(std::string &str, TCaseMode mode)
 	{
 		const uint length = (uint)str.length();
@@ -240,8 +144,6 @@ namespace NLGUI
 			break;
 		}
 	}
-
 }
 
-
-
+/* end of file */

From f8ef5743e32b927160018b1b52e3d95202674583 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 02:15:10 +0800
Subject: [PATCH 066/292] Fix bad value in toUpper table

---
 nel/src/misc/unicode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 50cefbf71..5597fb68d 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -1233,7 +1233,7 @@ static const ucchar UnicodeLowerToUpper[]=
 	0x03B6, 0x0396, // GREEK CAPITAL LETTER ZETA
 	0x03B7, 0x0397, // GREEK CAPITAL LETTER ETA
 	0x03B8, 0x0398, // GREEK CAPITAL LETTER THETA
-	0x03B9, 0x0345, // COMBINING GREEK YPOGEGRAMMENI
+	0x03B9, 0x0399, // GREEK CAPITAL LETTER IOTA
 	0x03BA, 0x039A, // GREEK CAPITAL LETTER KAPPA
 	0x03BB, 0x039B, // GREEK CAPITAL LETTER LAMDA
 	0x03BC, 0x039C, // GREEK CAPITAL LETTER MU
@@ -3819,7 +3819,7 @@ static const char s_Utf8LowerToUpperCE[64 * 4] = {
 	'\xCE', '\x96', '\x00', 0,
 	'\xCE', '\x97', '\x00', 0,
 	'\xCE', '\x98', '\x00', 0,
-	'\xCD', '\x85', '\x00', 0,
+	'\xCE', '\x99', '\x00', 0,
 	'\xCE', '\x9A', '\x00', 0,
 	'\xCE', '\x9B', '\x00', 0,
 	'\xCE', '\x9C', '\x00', 0,

From 6cd52d7871a86089057ffac3c6aae1339cbf109a Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 02:24:14 +0800
Subject: [PATCH 067/292] Note

---
 nel/src/misc/unicode.cpp                            | 3 +++
 ryzom/client/src/interface_v3/interface_manager.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 5597fb68d..d28a7c56e 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -25,6 +25,9 @@
 namespace	NLMISC
 {
 
+// TODO / FIXME: Write tool to regenerate the unicode tables in this file
+//   See: ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt
+
 // Uppercase to lowercase 16 bits unicode. This table must be sorted. First entry must be unique.
 static const ucchar UnicodeUpperToLower[]=
 {
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index fdc132030..8a87c7cd4 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -354,7 +354,7 @@ public:
 						if(UserEntity)
 						{
 							ucstring name = UserEntity->getEntityName();
-							if (*it == 'P') setCase(name, CaseUpper);
+							if (*it == 'P') name = toUpper(name);
 							formatedResult += name;
 						}
 					}

From 1963bdedcc160cab9ef62da5b15add456eae8afc Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 02:55:15 +0800
Subject: [PATCH 068/292] UTF-8 context help, ryzom/ryzomcore#335

---
 nel/include/nel/gui/ctrl_base.h               | 15 ++--
 nel/include/nel/gui/widget_manager.h          |  6 +-
 nel/src/gui/ctrl_base.cpp                     | 35 +++++-----
 nel/src/gui/group_container.cpp               |  8 +--
 nel/src/gui/group_html.cpp                    | 10 +--
 nel/src/gui/view_text.cpp                     |  2 +-
 nel/src/gui/widget_manager.cpp                |  2 +-
 ryzom/client/src/connection.cpp               |  2 +-
 ryzom/client/src/init_main_loop.cpp           |  4 +-
 .../src/interface_v3/action_handler_game.cpp  | 26 +++----
 .../src/interface_v3/action_handler_help.cpp  | 44 ++++++------
 .../interface_v3/action_handler_phrase.cpp    |  2 +-
 .../src/interface_v3/action_phrase_faber.cpp  |  6 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  | 30 ++++----
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 29 ++++----
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  4 +-
 .../interface_v3/dbgroup_list_sheet_text.cpp  | 12 ++--
 .../interface_v3/dbgroup_list_sheet_text.h    |  4 +-
 .../dbgroup_list_sheet_text_phrase.cpp        |  6 +-
 .../dbgroup_list_sheet_text_phrase_id.cpp     |  4 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp | 68 +++++++++----------
 .../client/src/interface_v3/group_compas.cpp  |  5 +-
 .../interface_v3/group_in_scene_bubble.cpp    |  4 +-
 .../interface_v3/group_in_scene_user_info.cpp |  2 +-
 ryzom/client/src/interface_v3/group_map.cpp   | 36 +++++-----
 .../client/src/interface_v3/guild_manager.cpp |  6 +-
 .../src/interface_v3/interface_manager.cpp    |  4 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  2 +-
 ryzom/client/src/interface_v3/people_list.cpp |  6 +-
 .../client/src/r2/displayer_visual_group.cpp  | 12 ++--
 ryzom/client/src/r2/instance_map_deco.cpp     |  7 +-
 ryzom/client/src/r2/instance_map_deco.h       |  2 +-
 32 files changed, 206 insertions(+), 199 deletions(-)

diff --git a/nel/include/nel/gui/ctrl_base.h b/nel/include/nel/gui/ctrl_base.h
index a8bdef85f..39b795252 100644
--- a/nel/include/nel/gui/ctrl_base.h
+++ b/nel/include/nel/gui/ctrl_base.h
@@ -85,9 +85,10 @@ namespace NLGUI
 
 
 		/// Get the ContextHelp for this control. Default is to return _ContextHelp
-		virtual void		getContextHelp(ucstring &help) const {help= _ContextHelp;}
+		virtual void		getContextHelp(std::string &help) const {help= _ContextHelp;}
+		virtual void		getContextHelpAsUtf16(ucstring &help) const {help.fromUtf8(_ContextHelp);}
 		/// Get the ContextHelp for this control, with tooltip specific code. Default behaviour is identical to getContextHelp.
-		virtual void		getContextHelpToolTip(ucstring &help) const { getContextHelp(help); }
+		virtual void		getContextHelpToolTip(std::string &help) const { getContextHelp(help); }
 		// Get the name of the context help window. Default to "context_help"
 		virtual std::string getContextHelpWindowName() const;
 		/// Get the ContextHelp ActionHandler. If "", noop
@@ -123,8 +124,10 @@ namespace NLGUI
 		void				setToolTipPosRef(THotSpot pos) { _ToolTipPosRef = pos;}
 
 		/// replace the default contextHelp
-		ucstring			getDefaultContextHelp() const {return _ContextHelp;}
-		void				setDefaultContextHelp(const ucstring &help) {_ContextHelp= help;}
+		std::string			getDefaultContextHelp() const {return _ContextHelp;}
+		void				setDefaultContextHelp(const std::string &help) {_ContextHelp= help;}
+		ucstring			getDefaultContextHelpAsUtf16() const {return ucstring::makeFromUtf8(_ContextHelp);}
+		void				setDefaultContextHelpAsUtf16(const ucstring &help) {_ContextHelp= help.toUtf8();}
 		void				setOnContextHelp(const std::string &help) {_OnContextHelp= help;}
 		void				setOnContextHelpAHParams(const std::string &p) {_OnContextHelpParams= p;}
 
@@ -158,7 +161,7 @@ namespace NLGUI
 		int luaSetTooltipUtf8(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CCtrlBase, CViewBase)
-			REFLECT_UCSTRING("tooltip", getDefaultContextHelp, setDefaultContextHelp);
+			REFLECT_UCSTRING("tooltip", getDefaultContextHelpAsUtf16, setDefaultContextHelpAsUtf16); // FIXME: Lua UTF-8
 			REFLECT_LUA_METHOD("setTooltipUtf8", luaSetTooltipUtf8);
 		REFLECT_EXPORT_END
 
@@ -171,7 +174,7 @@ namespace NLGUI
 
 	protected:
 		// This is the ContextHelp filled by default in parse()
-		ucstring			_ContextHelp;
+		std::string			_ContextHelp;
 		CStringShared		_OnContextHelp;
 		CStringShared		_OnContextHelpParams;
 		CStringShared		_ToolTipSpecialParent;
diff --git a/nel/include/nel/gui/widget_manager.h b/nel/include/nel/gui/widget_manager.h
index fced74024..e8b4e376c 100644
--- a/nel/include/nel/gui/widget_manager.h
+++ b/nel/include/nel/gui/widget_manager.h
@@ -333,8 +333,8 @@ namespace NLGUI
 		void updateTooltipCoords(CCtrlBase *newCtrl);
 		
 		/// for ContextHelp action handler only: set the result name
-		void setContextHelpText( const ucstring &text ){ _ContextHelpText = text; }
-		ucstring& getContextHelpText(){ return _ContextHelpText; }
+		void setContextHelpText( const std::string &text ){ _ContextHelpText = text; }
+		std::string& getContextHelpText(){ return _ContextHelpText; }
 		
 		/// force disable the context help
 		void disableContextHelp();
@@ -626,7 +626,7 @@ namespace NLGUI
 
 		SInterfaceTimes interfaceTimes;
 
-		ucstring _ContextHelpText;
+		std::string _ContextHelpText;
 		bool _ContextHelpActive;
 
 		bool inGame;
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index 0124bfdee..75c3024f3 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -127,9 +127,9 @@ namespace NLGUI
 		{
 			// Force I18N tooltip
 			if (!editorMode)
-				_ContextHelp = CI18N::get((const char *)prop);
+				_ContextHelp = CI18N::get((const char *)prop).toUtf8();
 			else
-				_ContextHelp.fromUtf8((const char *)prop);
+				_ContextHelp = (const char *)prop;
 		}
 		else
 		{
@@ -138,9 +138,9 @@ namespace NLGUI
 			if (prop)
 			{
 				if (!editorMode && NLMISC::startsWith((const char *)prop, "ui"))
-					_ContextHelp = CI18N::get((const char *)prop);
+					_ContextHelp = CI18N::get((const char *)prop).toUtf8();
 				else
-					_ContextHelp.fromUtf8((const char *)prop);
+					_ContextHelp = (const char *)prop;
 			}
 		}
 
@@ -197,12 +197,12 @@ namespace NLGUI
 	{
 		if( name == "tooltip" )
 		{
-			return _ContextHelp.toUtf8();
+			return _ContextHelp;
 		}
 		else
 		if( name == "tooltip_i18n" )
 		{
-			return _ContextHelp.toUtf8();
+			return _ContextHelp;
 		}
 		else
 		if( name == "on_tooltip" )
@@ -259,18 +259,18 @@ namespace NLGUI
 		if( name == "tooltip" )
 		{
 			if (!editorMode && NLMISC::startsWith(value, "ui"))
-				_ContextHelp = CI18N::get(value);
+				_ContextHelp = CI18N::get(value).toUtf8();
 			else
-				_ContextHelp.fromUtf8(value);
+				_ContextHelp = value;
 			return;
 		}
 		else
 		if( name == "tooltip_i18n" )
 		{
 			if (!editorMode)
-				_ContextHelp = CI18N::get(value);
+				_ContextHelp = CI18N::get(value).toUtf8();
 			else
-				_ContextHelp.fromUtf8(value);
+				_ContextHelp = value;
 			return;
 		}
 		else
@@ -382,8 +382,8 @@ namespace NLGUI
 		if( node == NULL )
 			return NULL;
 
-		xmlNewProp( node, BAD_CAST "tooltip", BAD_CAST _ContextHelp.toString().c_str() );
-		xmlNewProp( node, BAD_CAST "tooltip_i18n", BAD_CAST _ContextHelp.toString().c_str() );
+		xmlNewProp( node, BAD_CAST "tooltip", BAD_CAST _ContextHelp.c_str() );
+		xmlNewProp( node, BAD_CAST "tooltip_i18n", BAD_CAST _ContextHelp.c_str() );
 		xmlNewProp( node, BAD_CAST "on_tooltip", BAD_CAST _OnContextHelp.toString().c_str() );
 		xmlNewProp( node, BAD_CAST "on_tooltip_params", BAD_CAST _OnContextHelpParams.toString().c_str() );
 		xmlNewProp( node, BAD_CAST "tooltip_parent", BAD_CAST tooltipParentToString( _ToolTipParent ).c_str() );
@@ -476,7 +476,7 @@ namespace NLGUI
 	// ***************************************************************************
 	bool CCtrlBase::emptyContextHelp() const
 	{
-		ucstring help;
+		std::string help;
 		getContextHelp(help);
 		std::string sTmp = _OnContextHelp;
 		return help.empty() && sTmp.empty();
@@ -494,12 +494,15 @@ namespace NLGUI
 	void CCtrlBase::serial(NLMISC::IStream &f)
 	{
 		CViewBase::serial(f);
+
+		uint version = f.serialVersion(1);
+		nlassert(version);
+
 		f.serial(_ContextHelp);
 		f.serial(_OnContextHelp);
 		f.serial(_OnContextHelpParams);
 		f.serial(_ToolTipSpecialParent);
 		f.serialEnum(_ToolTipParent);
-		//
 
 		THotSpot tmpToolTipParentPosRef = _ToolTipParentPosRef;
 		THotSpot tmpToolTipPosRef = _ToolTipPosRef;
@@ -515,7 +518,7 @@ namespace NLGUI
 		_ToolTipPosRef = tmpToolTipPosRef;
 		_ToolTipParentPosRefAlt = tmpToolTipParentPosRefAlt;
 		_ToolTipPosRefAlt = tmpToolTipPosRefAlt;	
-		//
+		
 		nlSerialBitBool(f, _ToolTipInstant);	
 	}
 
@@ -577,7 +580,7 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
 		std::string tooltip = ls.toString(1);
 
-		setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
+		setDefaultContextHelp(tooltip);
 
 		return 0;
 	}
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 7bab62820..f0a023c39 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3538,7 +3538,7 @@ namespace NLGUI
 						_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_popin"));
 						_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 						_RightButton->setActionOnLeftClick ("ic_popin");
-						_RightButton->setDefaultContextHelp(CI18N::get("uiPopinWindow"));
+						_RightButton->setDefaultContextHelp(CI18N::get("uiPopinWindow").toUtf8());
 					}
 					else // else the container can be deactivated ? deactivate button
 					{
@@ -3546,7 +3546,7 @@ namespace NLGUI
 						_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_deactive"));
 						_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 						_RightButton->setActionOnLeftClick ("ic_deactive");
-						_RightButton->setDefaultContextHelp(CI18N::get("uiClose"));
+						_RightButton->setDefaultContextHelp(CI18N::get("uiClose").toUtf8());
 					}
 				}
 			}
@@ -3559,7 +3559,7 @@ namespace NLGUI
 					_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_popup"));
 					_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 					_RightButton->setActionOnLeftClick ("ic_popup");
-					_RightButton->setDefaultContextHelp(CI18N::get("uiPopupWindow"));
+					_RightButton->setDefaultContextHelp(CI18N::get("uiPopupWindow").toUtf8());
 				}
 				_RightButton->setActive(!_Locked);
 			}
@@ -3602,7 +3602,7 @@ namespace NLGUI
 				_HelpButton->setTexturePushed (pLayer->getValStr ("help_button_tx"));
 				_HelpButton->setTextureOver (pLayer->getValStr ("help_button_tx_over"));
 				_HelpButton->setActionOnLeftClick ("ic_help");
-				_HelpButton->setDefaultContextHelp(CI18N::get("uiHelp"));
+				_HelpButton->setDefaultContextHelp(CI18N::get("uiHelp").toUtf8());
 			}
 
 			// if not layer 0
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index e6b1ba473..08bf1b7c1 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2888,7 +2888,7 @@ namespace NLGUI
 							ctrlButton->setModulateGlobalColorAll (false);
 
 							// Translate the tooltip
-							ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(getLinkTitle()));
+							ctrlButton->setDefaultContextHelp(getLinkTitle());
 							ctrlButton->setText(tmpStr);
 							// empty url / button disabled
 							bool disabled = string(getLink()).empty();
@@ -3229,12 +3229,12 @@ namespace NLGUI
 		{
 			if (CI18N::hasTranslation(tooltip))
 			{
-				ctrlButton->setDefaultContextHelp(CI18N::get(tooltip));
+				ctrlButton->setDefaultContextHelp(CI18N::get(tooltip).toUtf8());
 				//ctrlButton->setOnContextHelp(CI18N::get(tooltip).toString());
 			}
 			else
 			{
-				ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
+				ctrlButton->setDefaultContextHelp(tooltip);
 				//ctrlButton->setOnContextHelp(string(tooltip));
 			}
 
@@ -5467,11 +5467,11 @@ namespace NLGUI
 				{
 					if (CI18N::hasTranslation(tooltip))
 					{
-						ctrlButton->setDefaultContextHelp(CI18N::get(tooltip));
+						ctrlButton->setDefaultContextHelp(CI18N::get(tooltip).toUtf8());
 					}
 					else
 					{
-						ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
+						ctrlButton->setDefaultContextHelp(tooltip);
 					}
 				}
 
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 367a3182b..d23d89f87 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -3346,7 +3346,7 @@ namespace NLGUI
 				pTooltip->setRenderLayer(getRenderLayer());
 				std::string tempTooltipStr = tempTooltips[i].toUtf8();
 				bool isI18N = NLMISC::startsWith(tempTooltipStr, "ui");
-				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr) : ucstring::makeFromUtf8(tempTooltipStr));
+				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr).toUtf8() : tempTooltipStr);
 				pTooltip->setParentPos(this);
 				pTooltip->setParentPosRef(Hotspot_BR);
 				pTooltip->setPosRef(Hotspot_BR);
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index 2da9f9bdf..864e4ef5b 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -1516,7 +1516,7 @@ namespace NLGUI
 			CViewText *pTxt = (CViewText*)groupContextHelp->getView("text");
 			if (pTxt != NULL)
 			{
-				pTxt->setTextFormatTaged(_ContextHelpText.toUtf8());
+				pTxt->setTextFormatTaged(_ContextHelpText);
 				// update only to get correct W/H
 				groupContextHelp->updateCoords ();
 
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 36df595bf..1ce257f2c 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -2317,7 +2317,7 @@ public:
 			CCtrlBase *pBut = pNewLine->getCtrl("but");
 			if (pBut != NULL)
 			{
-				pBut->setDefaultContextHelp(tooltip);
+				pBut->setDefaultContextHelp(tooltip.toUtf8());
 			}
 			addGroupInList(pNewLine);
 		}
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index deeda2149..9c8890775 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -1692,7 +1692,7 @@ void initBloomConfigUI()
 	if(!supportBloom)
 	{
 		if(group)
-			group->setDefaultContextHelp(CI18N::get("uiFxTooltipBloom"));
+			group->setDefaultContextHelp(CI18N::get("uiFxTooltipBloom").toUtf8());
 
 		ClientCfg.writeBool("FXAA", false);
 		ClientCfg.writeBool("Bloom", false);
@@ -1702,6 +1702,6 @@ void initBloomConfigUI()
 	else
 	{
 		if(group)
-			group->setDefaultContextHelp(ucstring(""));
+			group->setDefaultContextHelp(std::string());
 	}
 }
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 44c6e64fb..2901bb261 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2116,7 +2116,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 			pVBR->setColor(CRGBA(0,0,0,0));
 
 			if (pTooltip)
-				pTooltip->setDefaultContextHelp(ucstring(""));
+				pTooltip->setDefaultContextHelp(std::string());
 
 			return;
 		}
@@ -2140,7 +2140,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 				pVBR->setColor(CRGBA(0,0,0,0));
 
 				if (pTooltip)
-					pTooltip->setDefaultContextHelp(CI18N::get("uittTargetUnknown"));
+					pTooltip->setDefaultContextHelp(CI18N::get("uittTargetUnknown").toUtf8());
 
 				return;
 			}
@@ -2169,7 +2169,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 				pVBR->setColor(CRGBA(0,0,0,0));
 
 				if (pTooltip)
-					pTooltip->setDefaultContextHelp(ucstring(""));
+					pTooltip->setDefaultContextHelp(std::string());
 
 				return;
 			}
@@ -2194,7 +2194,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 		CCtrlBase *tooltip = dynamic_cast<CCtrlBase*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:target:header_opened:force"));
 		if (tooltip)
 		{
-			ucstring str;
+			string str;
 
 			if (nForceRegion == 1)
 				nForceRegion = 2;
@@ -2205,7 +2205,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 				sint min = (nForceRegion-2) * 50 + (nLevelForce-1) * 10 + 1;
 				sint max = (nForceRegion-2) * 50 + nLevelForce * 10;
 
-				str= CI18N::get("uittTargetLevel");
+				str= CI18N::get("uittTargetLevel").toUtf8();
 				strFindReplace(str, "%min", toString(min));
 				strFindReplace(str, "%max", toString(max));
 			}
@@ -2214,16 +2214,16 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 			{
 				sint n = (nForceRegion-1) * 50;
 				if (pE->isNPC())
-					str= CI18N::get("uittTargetGuardBoss");
+					str= CI18N::get("uittTargetGuardBoss").toUtf8();
 				else
-					str= CI18N::get("uittTargetBoss");
+					str= CI18N::get("uittTargetBoss").toUtf8();
 				strFindReplace(str, "%n", toString("%d", n) );
 			}
 			// Named
 			else
 			{
 				sint n = (nForceRegion-1) * 50;
-				str= CI18N::get("uittTargetNamed");
+				str= CI18N::get("uittTargetNamed").toUtf8();
 				strFindReplace(str, "%n", toString("%d", n) );
 			}
 
@@ -4059,7 +4059,7 @@ public:
 		ucstring	str;
 		fillPlayerBarText(str, "HP", SCORES::hit_points, "uittPlayerLifeFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTLife, "player_tt_life");
@@ -4076,7 +4076,7 @@ public:
 		ucstring	str;
 		fillPlayerBarText(str, "STA", SCORES::stamina, "uittPlayerStaminaFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTStamina, "player_tt_stamina");
@@ -4093,7 +4093,7 @@ public:
 		ucstring	str;
 		fillPlayerBarText(str, "SAP", SCORES::sap, "uittPlayerSapFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTSap, "player_tt_sap");
@@ -4110,7 +4110,7 @@ public:
 		ucstring	str;
 		fillPlayerBarText(str, "FOCUS", SCORES::focus, "uittPlayerFocusFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTFocus, "player_tt_focus");
@@ -4140,7 +4140,7 @@ public:
 		ucstring	str= CI18N::get("uittBulkFormat");
 		strFindReplace(str, "%v", toString("%.2f", val) );
 		strFindReplace(str, "%m", toString(maxVal) );
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerGetTTBulk, "get_tt_bulk");
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 6b699f8ee..4e92c67fb 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -3473,76 +3473,76 @@ void setConsoModSuccessTooltip( CDBCtrlSheet *cs )
 	CInterfaceManager * pIM = CInterfaceManager::getInstance();
 
 	CCDBNodeLeaf * nodeSM = NULL;
-	ucstring ustr;
+	string ustr;
 	if( CSheetId(cs->getSheetId()).toString() == "mod_melee_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModMeleeSuccess");
+		ustr = CI18N::get("uittModMeleeSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:MELEE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_range_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModRangeSuccess");
+		ustr = CI18N::get("uittModRangeSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:RANGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_craft_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModCraftSuccess");
+		ustr = CI18N::get("uittModCraftSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:CRAFT", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_defense_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDefenseSuccess");
+		ustr = CI18N::get("uittModDefenseSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:DODGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_dodge_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDodgeSuccess");
+		ustr = CI18N::get("uittModDodgeSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:DODGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_parry_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModParrySuccess");
+		ustr = CI18N::get("uittModParrySuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:PARRY", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModForageSuccess");
+		ustr = CI18N::get("uittModForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::common_ecosystem)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_desert_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDesertForageSuccess");
+		ustr = CI18N::get("uittModDesertForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::desert)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_forest_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModForestForageSuccess");
+		ustr = CI18N::get("uittModForestForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::forest)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_lacustre_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModLacustreForageSuccess");
+		ustr = CI18N::get("uittModLacustreForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::lacustre)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_jungle_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModJungleForageSuccess");
+		ustr = CI18N::get("uittModJungleForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::jungle)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_primary_root_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModPrimaryRootForageSuccess");
+		ustr = CI18N::get("uittModPrimaryRootForageSuccess").toUtf8();
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::primary_root)+":FORAGE", false);
 	}
 
@@ -3576,19 +3576,19 @@ public:
 		// special tooltip? (pvp outpost and xp catalyzer)
 		sint	specialTTId= getBonusMalusSpecialTT(cs);
 		if(specialTTId==BONUS_MALUS::XpCatalyser)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittXpBonus"));
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittXpBonus").toUtf8());
 		else if(specialTTId==BONUS_MALUS::OutpostPVPOn)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOn"));
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOn").toUtf8());
 		else if(specialTTId==BONUS_MALUS::OutpostPVPOutOfZone)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOutOfZone"));
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOutOfZone").toUtf8());
 		else if(specialTTId==BONUS_MALUS::OutpostPVPInRound)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostInRound"));
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostInRound").toUtf8());
 		else if(specialTTId==BONUS_MALUS::DeathPenalty)
 		{
 			CCDBNodeLeaf * node = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:USER:DEATH_XP_MALUS", false);
 			if( node )
 			{
-				ucstring txt = CI18N::get("uittDeathPenalty");
+				string txt = CI18N::get("uittDeathPenalty").toUtf8();
 				strFindReplace(txt, "%dp", toString((100*node->getValue16())/254));
 				CWidgetManager::getInstance()->setContextHelpText(txt);
 			}
@@ -3597,10 +3597,10 @@ public:
 		else if( getAuraDisabledState(cs) )
 		{
 			// get the normal string, and append a short info.
-			ucstring	str;
+			std::string	str;
 			cs->getContextHelp(str);
 
-			str+= CI18N::get("uittAuraDisabled");
+			str+= CI18N::get("uittAuraDisabled").toUtf8();
 
 			// and replace the context help that is required.
 			CWidgetManager::getInstance()->setContextHelpText(str);
@@ -3630,7 +3630,7 @@ public:
 		CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:PACK_ANIMAL:BEAST%d:NAME", index));
 		if (node && CStringManagerClient::instance()->getDynString(node->getValue32(), txt))
 		{
-			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt));
+			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt).toUtf8());
 		}
 	}
 };
@@ -3676,7 +3676,7 @@ public:
 		str += toString(minTimeRemaining);
 
 		// replace the context help that is required.
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerAnimalDeadPopupTooltip, "animal_dead_popup_tooltip");
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index dcc55f9ea..a73d884e8 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1699,7 +1699,7 @@ public:
 		else
 			strFindReplace(str, "%comp", CI18N::get("uittPhraseCombatRestrictOK"));
 
-		CWidgetManager::getInstance()->setContextHelpText(str);
+		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerCombatRestrictTooltip, "phrase_combat_restrict_tooltip");
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index fcef685c5..22a30b424 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -1810,12 +1810,12 @@ void	CActionPhraseFaber::updateItemResult()
 						// display something only for magic/protect stat
 						if( RM_FABER_STAT_TYPE::isMagicResistStat(RM_FABER_STAT_TYPE::TRMStatType(i)) ||
 							RM_FABER_STAT_TYPE::isMagicProtectStat(RM_FABER_STAT_TYPE::TRMStatType(i)) )
-							statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatActive"));
+							statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatActive").toUtf8());
 						else
-							statToolTip->setDefaultContextHelp(ucstring());
+							statToolTip->setDefaultContextHelp(std::string());
 					}
 					else
-						statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatGrayed"));
+						statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatGrayed").toUtf8());
 				}
 			}
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 352ff65f4..913e47c2e 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -600,12 +600,12 @@ void CBotChatPageTrade::updateTradeModal()
 					if (_BuyMean == MoneyGuildXP)
 					{
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney").toUtf8());
 					}
 					else
 					{
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildMoney"));
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildMoney").toUtf8());
 					}
 					return;
 				}
@@ -616,7 +616,7 @@ void CBotChatPageTrade::updateTradeModal()
 						if (confirmTradeGroup)	confirmTradeGroup->setActive(false);
 						if (cantTradeGroup)		cantTradeGroup->setActive(true);
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP").toUtf8());
 						return;
 					}
 				}
@@ -677,7 +677,7 @@ void CBotChatPageTrade::updateTradeModal()
 					if (cantTradeGroup) cantTradeGroup->setActive(true);
 					// can't sell more than what is in inventory
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBCNotAvailable"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBCNotAvailable"));
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBCNotAvailable").toUtf8());
 					ok= false;
 				}
 
@@ -692,7 +692,7 @@ void CBotChatPageTrade::updateTradeModal()
 						if (cantTradeGroup) cantTradeGroup->setActive(true);
 						// can't sell more than what is in inventory
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity").toUtf8());
 						ok= false;
 					}
 				}
@@ -710,7 +710,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney").toUtf8());
 							}
 							else if (_BuyMean == MoneyFactionPoints)
 							{
@@ -722,7 +722,7 @@ void CBotChatPageTrade::updateTradeModal()
 										confirmTradeGroup->setActive(false);
 										cantTradeGroup->setActive(true);
 										cantTradeButton->setText(CI18N::get("uiNotEnoughFP_"+PVP_CLAN::toString(fpType)));
-										cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughFP_"+PVP_CLAN::toString(fpType)));
+										cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughFP_"+PVP_CLAN::toString(fpType)).toUtf8());
 									}
 									else
 									{
@@ -745,7 +745,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughSkillPoints"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughSkillPoints"));
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughSkillPoints").toUtf8());
 							}
 							else
 							{
@@ -761,7 +761,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP").toUtf8());
 							}
 							else
 							{
@@ -780,7 +780,7 @@ void CBotChatPageTrade::updateTradeModal()
 							if (cantTradeGroup) cantTradeGroup->setActive(true);
 							// can't sell less than the basic price
 							if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadResalePrice"));
-							if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadResalePrice"));
+							if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadResalePrice").toUtf8());
 						}
 						// else ok, can resell
 						else
@@ -812,7 +812,7 @@ void CBotChatPageTrade::updateTradeModal()
 				if (_SellDlgOn && priceWithoutFame == 0)
 				{
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiWontBuyThis"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittWontBuyThis"));
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittWontBuyThis").toUtf8());
 				}
 				else if (_SellDlgOn && priceWithoutFame == std::numeric_limits<uint64>::max())
 				{
@@ -821,7 +821,7 @@ void CBotChatPageTrade::updateTradeModal()
 				else if (quantity == 0 || quantity == std::numeric_limits<uint32>::max())
 				{
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity").toUtf8());
 				}
 			}
 		}
@@ -893,7 +893,7 @@ void CBotChatPageTrade::startBuyDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCall
 	{
 		confirmButton->setActive( true );
 		// no need any context help because too simple
-		confirmButton->setDefaultContextHelp(ucstring());
+		confirmButton->setDefaultContextHelp(std::string());
 		if(isItem)
 		{
 			CItemSheet * itemSheet = dynamic_cast<CItemSheet*> ( SheetMngr.get( CSheetId( sheet->getSheetId() ) ) );
@@ -1003,7 +1003,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	{
 		confirmButton->setActive( !sheet->getLockedByOwner() );
 		confirmButton->setText(CI18N::get("uiSellImmediately"));
-		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
+		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton").toUtf8());
 	}
 
 	// set item or skill name
@@ -2428,7 +2428,7 @@ public:
 	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
 	{
 		// \todo yoyo: for now disable tooltip
-		CWidgetManager::getInstance()->setContextHelpText(ucstring());
+		CWidgetManager::getInstance()->setContextHelpText(std::string());
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerBotChatTTItemType, "botchat_tt_item_type");
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 81d34447d..669ee62c2 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -3379,13 +3379,13 @@ void	CDBCtrlSheet::setupItemInfoWaiter()
 }
 
 // ***************************************************************************
-void	CDBCtrlSheet::getContextHelp(ucstring &help) const
+void	CDBCtrlSheet::getContextHelp(std::string &help) const
 {
 	if (getType() == CCtrlSheetInfo::SheetType_Skill)
 	{
 		// just show the name of the skill
 		// the sheet id is interpreted as a skill enum
-		help= STRING_MANAGER::CStringManagerClient::getSkillLocalizedName( (SKILLS::ESkills)_SheetId.getSInt32() );
+		help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName( (SKILLS::ESkills)_SheetId.getSInt32() )).toUtf8();
 	}
 	else if(getType() == CCtrlSheetInfo::SheetType_Macro)
 	{
@@ -3432,7 +3432,7 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 		strFindReplace(dispText, ucstring("%n"), macroName);
 		strFindReplace(dispText, ucstring("%k"), assignedTo);
 		strFindReplace(dispText, ucstring("%c"), dispCommands);
-		help = dispText;
+		help = dispText.toUtf8();
 	}
 	else if(getType() == CCtrlSheetInfo::SheetType_Item)
 	{
@@ -3443,10 +3443,10 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 			{
 				// call lua function to update tooltip window
 				_ItemInfoWaiter.sendRequest();
-				help = _ItemInfoWaiter.infoValidated();
+				help = _ItemInfoWaiter.infoValidated().toUtf8();
 				// its expected to get at least item name back
 				if (help.empty())
-					help = getItemActualName();
+					help = getItemActualName().toUtf8();
 			}
 			else if (!_ContextHelp.empty())
 			{
@@ -3454,7 +3454,7 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 			}
 			else
 			{
-				help = getItemActualName();
+				help = getItemActualName().toUtf8();;
 			}
 		}
 		else
@@ -3485,7 +3485,7 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 		CSBrickManager	*pBM= CSBrickManager::getInstance();
 		CSBrickSheet	*brick= pBM->getBrick(CSheetId(getSheetId()));
 		if(brick)
-			help= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brick->Id);
+			help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brick->Id)).toUtf8();
 		else
 			help= _ContextHelp;
 	}
@@ -3494,7 +3494,7 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 		sint32	phraseId= getSheetId();
 		if (phraseId == 0)
 		{
-			help = ucstring();
+			help = std::string();
 		}
 		else
 		{
@@ -3512,10 +3512,11 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 				game = game["game"];
 				game.callMethodByNameNoThrow("updatePhraseTooltip", 1, 1);
 				// retrieve result from stack
-				help = ucstring();
+				ucstring tmpHelp;
 				if (!ls->empty())
 				{
-					CLuaIHM::pop(*ls, help);
+					CLuaIHM::pop(*ls, tmpHelp); // FIXME: Lua UTF-8
+					help = tmpHelp.toUtf8();
 				}
 				else
 				{
@@ -3548,7 +3549,7 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 	{
 		CSPhraseSheet	*phrase= dynamic_cast<CSPhraseSheet*>(SheetMngr.get(CSheetId(getSheetId())));
 		if(phrase)
-			help= STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(phrase->Id);
+			help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(phrase->Id)).toUtf8();
 		else
 			help= _ContextHelp;
 	}
@@ -3556,14 +3557,14 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 	{
 		const COutpostBuildingSheet *outpost = asOutpostBuildingSheet();
 		if (outpost)
-			help = CStringManagerClient::getOutpostBuildingLocalizedName(CSheetId(_SheetId.getSInt32()));
+			help = CUtfStringView(CStringManagerClient::getOutpostBuildingLocalizedName(CSheetId(_SheetId.getSInt32()))).toUtf8();
 		else
 			help = _ContextHelp;
 	}
 }
 
 // ***************************************************************************
-void	CDBCtrlSheet::getContextHelpToolTip(ucstring &help) const
+void	CDBCtrlSheet::getContextHelpToolTip(std::string &help) const
 {
 	// Special case for buff items and spell crystals, only for tooltips
 	if (getType() == CCtrlSheetInfo::SheetType_Item)
@@ -3574,7 +3575,7 @@ void	CDBCtrlSheet::getContextHelpToolTip(ucstring &help) const
 			if (useItemInfoForFamily(item->Family))
 			{
 				_ItemInfoWaiter.sendRequest();
-				help = _ItemInfoWaiter.infoValidated();
+				help = _ItemInfoWaiter.infoValidated().toUtf8();
 				return;
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index e6ed7587b..b662d86af 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -393,9 +393,9 @@ public:
 	NLMISC::CRGBA			getSheetColor() const {return _SheetColor;}
 
 	/// Special ContextHelp for ctrl sheet.
-	virtual void			getContextHelp(ucstring &help) const;
+	virtual void			getContextHelp(std::string &help) const;
 
-	virtual void			getContextHelpToolTip(ucstring &help) const;
+	virtual void			getContextHelpToolTip(std::string &help) const;
 
 
 	/** true if an item of another ctrlSheet can be dropped on this slot.
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index 8483e9925..fed48d1ac 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -1051,14 +1051,14 @@ void		CDBGroupListSheetText::CSheetChild::updateViewTextAsItem()
 	if(Ctrl && Text && Ctrl->getSheetCategory() == CDBCtrlSheet::Item)
 	{
 		// get the text
-		ucstring text;
+		std::string text;
 		Ctrl->getContextHelp(text);
 
 		// Text color red if requirement not met
 		if(Ctrl->getType() == CCtrlSheetInfo::SheetType_Item)
 		{
 			if(!Ctrl->checkItemRequirement())
-				text= CI18N::get("uiItemCannotUseColor") + text;
+				text= CI18N::get("uiItemCannotUseColor").toUtf8() + text;
 		}
 
 		// For item, add some information
@@ -1075,18 +1075,18 @@ void		CDBGroupListSheetText::CSheetChild::updateViewTextAsItem()
 					if(ipList.empty())
 					{
 						if(pIS->isUsedAsCraftRequirement())
-							text+= "\n" + CI18N::get("uiItemMpCraftRequirement");
+							text+= "\n" + CI18N::get("uiItemMpCraftRequirement").toUtf8();
 						else
-							text+= "\n" + CI18N::get("uiItemMpNoCraft");
+							text+= "\n" + CI18N::get("uiItemMpNoCraft").toUtf8();
 					}
 					else
-						text+= "\n" + CI18N::get("uiItemMpCanCraft") + ipList;
+						text+= "\n" + CI18N::get("uiItemMpCanCraft").toUtf8() + ipList.toUtf8();
 				}
 			}
 		}
 
 		// set text
-		Text->setTextFormatTaged(text.toUtf8());
+		Text->setTextFormatTaged(text);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
index d9a495635..3d308d582 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
@@ -133,9 +133,9 @@ public:
 		// Called at updateCoords to remake the text
 		virtual void updateViewText(CDBGroupListSheetText * /* pFather */)
 		{
-			ucstring text;
+			std::string text;
 			Ctrl->getContextHelp(text);
-			Text->setText(text.toUtf8());
+			Text->setText(text);
 		}
 
 		// create a CViewText object that is displayed next to the item. This is the opportunnity to create
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
index 3cdf24ca8..02f8fb6ae 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
@@ -77,7 +77,7 @@ void CDBGroupListSheetTextPhrase::CSheetChildPhrase::init(CDBGroupListSheetText
 // ***************************************************************************
 void CDBGroupListSheetTextPhrase::CSheetChildPhrase::updateViewText(CDBGroupListSheetText * /* pFather */)
 {
-	ucstring	text;
+	std::string	text;
 	if(Ctrl->getType()!=CCtrlSheetInfo::SheetType_SPhrase)
 		return;
 
@@ -87,14 +87,14 @@ void CDBGroupListSheetTextPhrase::CSheetChildPhrase::updateViewText(CDBGroupList
 	// append the level if possible
 	if(LevelDB)
 	{
-		ucstring	fmt= CI18N::get("uiPhraseLevelFmt");
+		std::string	fmt= CI18N::get("uiPhraseLevelFmt").toUtf8();
 		strFindReplace(fmt, "%d", toString(LevelCache));
 		text+= "\n" + fmt;
 	}
 #endif
 
 	// set
-	Text->setText(text.toUtf8());
+	Text->setText(text);
 }
 
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
index 6e98afc5c..bc812bbc5 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
@@ -41,14 +41,14 @@ CDBGroupListSheetTextPhraseId::CSheetChildPhrase::CSheetChildPhrase()
 // ***************************************************************************
 void CDBGroupListSheetTextPhraseId::CSheetChildPhrase::updateViewText(CDBGroupListSheetText * /* pFather */)
 {
-	ucstring	text;
+	std::string	text;
 	if(Ctrl->getType()!=CCtrlSheetInfo::SheetType_SPhraseId)
 		return;
 
 	// Get the User Name of the phrase
 	Ctrl->getContextHelp(text);
 
-	Text->setText(text.toUtf8());
+	Text->setText(text);
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index b0924f0af..0005d80f4 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -248,16 +248,16 @@ void CDBGroupListSheetTrade::CSheetChildTrade::update(CDBGroupListSheetText *pFa
 void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetText *pFather)
 {
 	H_AUTO(CDBGroupListSheetTrade_updateViewText);
-	ucstring text;
+	std::string text;
 	Ctrl->getContextHelp(text);
 	// Append first the type of the sheet to select
 	switch ( Ctrl->getSheetCategory() )
 	{
 		case CDBCtrlSheet::Item:		break;		// none for item. consider useless
-		case CDBCtrlSheet::Pact:		text= CI18N::get("uiBotChatPact") + text; break;
-		case CDBCtrlSheet::Skill:		text= CI18N::get("uiBotChatSkill") + text; break;
-		case CDBCtrlSheet::GuildFlag:	text= CI18N::get("uiBotChatSkill") + text; break;
-		case CDBCtrlSheet::Phrase:		text= CI18N::get("uiBotChatPhrase") + text; break;
+		case CDBCtrlSheet::Pact:		text= CI18N::get("uiBotChatPact").toUtf8() + text; break;
+		case CDBCtrlSheet::Skill:		text= CI18N::get("uiBotChatSkill").toUtf8() + text; break;
+		case CDBCtrlSheet::GuildFlag:	text= CI18N::get("uiBotChatSkill").toUtf8() + text; break;
+		case CDBCtrlSheet::Phrase:		text= CI18N::get("uiBotChatPhrase").toUtf8() + text; break;
 		default: break;
 	}
 
@@ -268,11 +268,11 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		if (pOBS != NULL)
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-			text += string("\n") + pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()));
-			text += "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pOBS->CostDapper));
-			text += CI18N::get("uiBotChatTime") + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute");
+			text += string("\n") + CUtfStringView(pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()))).toUtf8();
+			text += "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(pOBS->CostDapper));
+			text += CI18N::get("uiBotChatTime").toUtf8() + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute").toUtf8();
 			if ((pOBS->CostTime % 60) != 0)
-				text += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond");
+				text += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond").toUtf8();
 		}
 	}
 
@@ -288,16 +288,16 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		if(!weaponRestriction.empty() && weaponRestriction!=CI18N::get("uiawrSF"))
 		{
 			weaponRestriction= CI18N::get("uiPhraseWRHeader") + weaponRestriction;
-			text+= "\n" + weaponRestriction;
+			text+= "\n" + weaponRestriction.toUtf8();
 		}
 	}
 
 	// Get the Text color
-	ucstring colorTag("@{FFFF}");
+	std::string colorTag("@{FFFF}");
 	if(Ctrl->getType() == CCtrlSheetInfo::SheetType_Item)
 	{
 		if(!Ctrl->checkItemRequirement())
-			colorTag= CI18N::get("uiItemCannotUseColor");
+			colorTag= CI18N::get("uiItemCannotUseColor").toUtf8();
 	}
 
 	// For item, add some information
@@ -314,12 +314,12 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 				if(ipList.empty())
 				{
 					if(pIS->isUsedAsCraftRequirement())
-						text+= "\n" + CI18N::get("uiItemMpCraftRequirement");
+						text+= "\n" + CI18N::get("uiItemMpCraftRequirement").toUtf8();
 					else
-						text+= "\n" + CI18N::get("uiItemMpNoCraft");
+						text+= "\n" + CI18N::get("uiItemMpNoCraft").toUtf8();
 				}
 				else
-					text+= "\n" + CI18N::get("uiItemMpCanCraft") + ipList;
+					text+= "\n" + CI18N::get("uiItemMpCanCraft").toUtf8() + ipList.toUtf8();
 			}
 		}
 	}
@@ -331,9 +331,9 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		if(Ctrl->getSheetCategory() == CDBCtrlSheet::Phrase)
 		{
 			if (LastPrice != -1)
-				text+= "\n" + CI18N::get("uiBotChatSkillPointCost") + toString(LastPrice);
+				text+= "\n" + CI18N::get("uiBotChatSkillPointCost").toUtf8() + toString(LastPrice);
 			else
-				text+= "\n" + CI18N::get("uiBotChatSkillPointCostNotReceived");
+				text+= "\n" + CI18N::get("uiBotChatSkillPointCostNotReceived").toUtf8();
 		}
 		else
 		{
@@ -345,8 +345,8 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 				const CItemSheet *pIS = Ctrl->asItemSheet();
 				if (pIS && pIS->Family == ITEMFAMILY::GUILD_OPTION)
 				{
-					text+= "\n" + CI18N::get("uiBotChatSkillPointCost") + toString(pIS->GuildOption.XPCost);
-					text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pIS->GuildOption.MoneyCost));
+					text+= "\n" + CI18N::get("uiBotChatSkillPointCost").toUtf8() + toString(pIS->GuildOption.XPCost);
+					text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(pIS->GuildOption.MoneyCost));
 					guildOption= true;
 				}
 			}
@@ -381,10 +381,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 					if (LastPrice > 0)
 					{
 						if(displayMulPrice)
-							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(sint32(LastPrice * priceFactor))) + " ("
+							text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(sint32(LastPrice * priceFactor))) + " ("
 								+ NLMISC::formatThousands(toString( sint32(factor) * sint32(LastPrice * priceFactor) )) + ")";
 						else
-							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString( sint32(factor * LastPrice * priceFactor) ));
+							text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString( sint32(factor * LastPrice * priceFactor) ));
 					}
 
 					if ((LastFactionPointPrice != 0) && (LastFactionType >= PVP_CLAN::BeginClans) && (LastFactionType <= PVP_CLAN::EndClans))
@@ -394,8 +394,8 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						else
 							text+= "\n";
 
-						text+= CI18N::get("uiBotChatFactionType") + PVP_CLAN::toString((PVP_CLAN::TPVPClan)LastFactionType)
-							+  CI18N::get("uiBotChatFactionPointPrice") + NLMISC::formatThousands(toString(LastFactionPointPrice));
+						text+= CI18N::get("uiBotChatFactionType").toUtf8() + PVP_CLAN::toString((PVP_CLAN::TPVPClan)LastFactionType)
+							+  CI18N::get("uiBotChatFactionPointPrice").toUtf8() + NLMISC::formatThousands(toString(LastFactionPointPrice));
 					}
 
 					// some additional info for resale
@@ -407,31 +407,31 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						{
 							// append price
 							if(pIS && pIS->Stackable>1 && zeFather->getMultiplyPriceByQuantityFlag())
-								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(LastPriceRetire)) + " ("
+								text+= CI18N::get("uiBotChatRetirePrice").toUtf8() + NLMISC::formatThousands(toString(LastPriceRetire)) + " ("
 									+ NLMISC::formatThousands(toString(factor * LastPriceRetire)) + ")";
 							else
-								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(factor * LastPriceRetire));
+								text+= CI18N::get("uiBotChatRetirePrice").toUtf8() + NLMISC::formatThousands(toString(factor * LastPriceRetire));
 							// set resale time left
-							ucstring	fmt= CI18N::get("uiBotChatResaleTimeLeft");
+							std::string	fmt= CI18N::get("uiBotChatResaleTimeLeft").toUtf8();
 							strFindReplace(fmt, "%d", toString(LastResaleTimeLeft/RYZOM_DAY_IN_HOUR));
 							strFindReplace(fmt, "%h", toString(LastResaleTimeLeft%RYZOM_DAY_IN_HOUR));
 							text+= "\n" + fmt;
 							// force special color (according if retirable or not)
 							if(LastSellerType == BOTCHATTYPE::UserRetirable || LastSellerType == BOTCHATTYPE::ResaleAndUserRetirable)
-								colorTag= CI18N::get("uiItemUserSellColor");
+								colorTag= CI18N::get("uiItemUserSellColor").toUtf8();
 							else
-								colorTag= CI18N::get("uiItemUserSellColorNotRetirable");
+								colorTag= CI18N::get("uiItemUserSellColorNotRetirable").toUtf8();
 						}
 
 						// Append (NPC) tag if NPC item
 						if(LastSellerType == BOTCHATTYPE::NPC)
 						{
-							text+= "\n" + CI18N::get("uiBotChatNPCTag");
+							text+= "\n" + CI18N::get("uiBotChatNPCTag").toUtf8();
 						}
 						// else display the name of the vendor (not if this is the player himself, to avoid flood)
 						else if (LastSellerType == BOTCHATTYPE::Resale)
 						{
-							text+= "\n" + CI18N::get("uiBotChatVendorTag") + VendorNameString;
+							text+= "\n" + CI18N::get("uiBotChatVendorTag").toUtf8() + VendorNameString.toUtf8();
 						}
 					}
 				}
@@ -441,14 +441,14 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 					if(zeFather->sellerTypeWanted() &&
 						(LastSellerType == BOTCHATTYPE::User || LastSellerType == BOTCHATTYPE::UserRetirable) )
 					{
-						text+= "\n" + CI18N::get("uiItemSold");
+						text+= "\n" + CI18N::get("uiItemSold").toUtf8();
 						// force special color
-						colorTag= CI18N::get("uiItemSoldColor");
+						colorTag= CI18N::get("uiItemSoldColor").toUtf8();
 					}
 					// error case
 					else
 					{
-						text+= "\n" + CI18N::get("uiPriceNotReceived");
+						text+= "\n" + CI18N::get("uiPriceNotReceived").toUtf8();
 					}
 				}
 			}
@@ -457,7 +457,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 
 	// setup color and text
 	text= colorTag + text;
-	Text->setTextFormatTaged(text.toUtf8());
+	Text->setTextFormatTaged(text);
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index 3c18eb22c..f00b72cb2 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -424,11 +424,10 @@ void CGroupCompas::draw()
 	CCtrlBase *toolTip = getCtrl("tt");
 	if (toolTip)
 	{
-		ucstring text;
 		if (displayedTarget.getType() != CCompassTarget::North)
-			toolTip->setDefaultContextHelp(CI18N::get("uittCompassDistance"));
+			toolTip->setDefaultContextHelp(CI18N::get("uittCompassDistance").toUtf8());
 		else
-			toolTip->setDefaultContextHelp(text);
+			toolTip->setDefaultContextHelp(std::string());
 	}
 
 	if (displayedTarget.Name != _CurrTargetName)
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index f070d3224..b6b0195ef 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -759,7 +759,7 @@ CGroupInSceneBubbleManager::CPopupContext *CGroupInSceneBubbleManager::buildCont
 
 void CGroupInSceneBubbleManager::addContextHelp (const ucstring &message, const string &targetName, uint time)
 {
-	ucstring finalMessage = message;
+	std::string finalMessage = message.toUtf8();
 	CInterfaceElement *target;
 	CPopupContext *context = CGroupInSceneBubbleManager::buildContextHelp ("context_help_", targetName, target, time);
 	if (context)
@@ -787,7 +787,7 @@ void CGroupInSceneBubbleManager::addContextHelp (const ucstring &message, const
 					}
 				}
 
-				text->setText(finalMessage.toUtf8());
+				text->setText(finalMessage);
 			}
 		}
 		context->Group->setActive(true);
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index fe846038c..e18cf0cc9 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -1122,7 +1122,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 			{
 				CInterfaceGroup *group = getGroup ("right");
 				CForageSourceCL *forageSource = static_cast<CForageSourceCL*>(_Entity);
-				ucstring txt( CI18N::get( "uittForageContent" ) + toString( ": %u", forageSource->getCurrentQuantity() ) );
+				string txt( CI18N::get( "uittForageContent" ).toUtf8() + toString( ": %u", forageSource->getCurrentQuantity() ) );
 				CCtrlBase *toolTip = group->getCtrl ("tt1");
 				if ( toolTip )
 					toolTip->setDefaultContextHelp( txt );
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 4315b1b8b..cdda9e915 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -697,7 +697,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 		{
 			_HomeLM->setParent(this);
 			addCtrl(_HomeLM);
-			_HomeLM->setDefaultContextHelp(NLMISC::CI18N::get("uiHome"));
+			_HomeLM->setDefaultContextHelp(NLMISC::CI18N::get("uiHome").toUtf8());
 		}
 
 		// create animals Landmark: pack Animals.
@@ -709,7 +709,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 			{
 				_AnimalLM[i]->setParent(this);
 				addCtrl(_AnimalLM[i]);
-				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uiPATitleMount%d", i+1)));
+				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uiPATitleMount%d", i+1)).toUtf8());
 			}
 		}
 
@@ -722,7 +722,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 			{
 				_TeammateLM[i]->setParent(this);
 				addCtrl(_TeammateLM[i]);
-				_TeammateLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uittLMTeam%d",i)));
+				_TeammateLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uittLMTeam%d",i)).toUtf8());
 			}
 		}
 	}
@@ -1179,7 +1179,7 @@ void CGroupMap::checkCoords()
 				ucstring result;
 				if (STRING_MANAGER::CStringManagerClient::instance()->getDynString(_MissionTargetTextIDs[k], result))
 				{
-					_MissionLM[k]->setDefaultContextHelp(result);
+					_MissionLM[k]->setDefaultContextHelp(result.toUtf8());
 					_MissionTargetTextReceived[k] = true;
 				}
 			}
@@ -1201,7 +1201,7 @@ void CGroupMap::checkCoords()
 					CEntityCL *sel = EntitiesMngr.entity(UserEntity->selection());
 					if (sel)
 					{
-						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint") + sel->removeTitleAndShardFromName(sel->getEntityName()));
+						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint").toUtf8() + sel->removeTitleAndShardFromName(sel->getEntityName()).toUtf8());
 					}
 				}
 			}
@@ -1374,7 +1374,7 @@ void CGroupMap::checkCoords()
 					case ANIMAL_TYPE::Packer: sPrefix = "uiPATitlePacker"; break;
 					case ANIMAL_TYPE::Demon:  sPrefix = "uiPATitleDemon";  break;
 				}
-				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(sPrefix+toString(i+1)));
+				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(sPrefix+toString(i+1)).toUtf8());
 			}
 		}
 	}
@@ -1408,7 +1408,7 @@ void CGroupMap::checkCoords()
 				if (pSMC->getString(val,res))
 				{
 						res = CEntityCL::removeTitleAndShardFromName(res);
-						_TeammateLM[i]->setDefaultContextHelp(res);
+						_TeammateLM[i]->setDefaultContextHelp(res.toUtf8());
 				}
 			}
 			updateLMPosFromDBPos(_TeammateLM[i], px, py);
@@ -2811,7 +2811,7 @@ void CGroupMap::addLandMark(TLandMarkButtonVect &destList, const NLMISC::CVector
 	CLandMarkButton *lmb = createLandMarkButton(options);
 	lmb->setParent(this);
 	lmb->Pos = pos;
-	lmb->setDefaultContextHelp(title);
+	lmb->setDefaultContextHelp(title.toUtf8());
 	destList.push_back(lmb);
 	addCtrl(lmb);
 }
@@ -2937,7 +2937,7 @@ void CGroupMap::updateUserLandMark(CCtrlButton *button, const ucstring &newTitle
 			_CurContinent->UserLandMarks[k].Type =  (uint8)lmType;
 
 			updateLandMarkButton(_UserLM[k], getUserLandMarkOptions(k));
-			button->setDefaultContextHelp(newTitle);
+			button->setDefaultContextHelp(newTitle.toUtf8());
 
 			CInterfaceManager::getInstance()->saveLandmarks();
 			return;
@@ -3199,7 +3199,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 		if (it != _ContinentLM.end())
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
-			(*it)->getContextHelp(ct.Name);
+			(*it)->getContextHelpAsUtf16(ct.Name);
 			mapToWorld(ct.Pos, (*it)->Pos);
 			found = true;
 		}
@@ -3212,7 +3212,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			if (it != _MissionLM.end())
 			{
 				ct.setPositionState(_MissionPosStates[it - _MissionLM.begin()]);
-				(*it)->getContextHelp(ct.Name);
+				(*it)->getContextHelpAsUtf16(ct.Name);
 				mapToWorld(ct.Pos, (*it)->Pos);
 				found = true;
 			}
@@ -3226,7 +3226,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			if (it != _UserLM.end())
 			{
 				ct.setType(CCompassTarget::UserLandMark);
-				(*it)->getContextHelp(ct.Name);
+				(*it)->getContextHelpAsUtf16(ct.Name);
 				mapToWorld(ct.Pos, (*it)->Pos);
 				found = true;
 			}
@@ -3254,7 +3254,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 				if (!isIsland())
 				{
 					ct.setType(CCompassTarget::Respawn);
-					(*it)->getContextHelp(ct.Name);
+					(*it)->getContextHelpAsUtf16(ct.Name);
 					mapToWorld(ct.Pos, (*it)->Pos);
 					found = true;
 				}
@@ -3300,7 +3300,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			{
 				if(_AnimalLM[i]==lm)
 				{
-					_AnimalLM[i]->getContextHelp(ct.Name);
+					_AnimalLM[i]->getContextHelpAsUtf16(ct.Name);
 					// copy The Animal Pos retriever into the compass
 					ct.setPositionState(_AnimalPosStates[i]);
 					found = true;
@@ -3318,7 +3318,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			{
 				if(_TeammateLM[i]==lm)
 				{
-					_TeammateLM[i]->getContextHelp(ct.Name);
+					_TeammateLM[i]->getContextHelpAsUtf16(ct.Name);
 					// copy The Animal Pos retriever into the compass
 					ct.setPositionState(_TeammatePosStates[i]);
 					found = true;
@@ -3380,7 +3380,7 @@ CGroupMap::CLandMarkButton* CGroupMap::findClosestLandmark(const CVector2f &cent
 	for(TLandMarkButtonVect::const_iterator it = landmarks.begin(); it != landmarks.end(); ++it)
 	{
 		ucstring lc;
-		(*it)->getContextHelp(lc);
+		(*it)->getContextHelpAsUtf16(lc);
 		if(filterLandmark(lc, keywords, startsWith)) {
 			CVector2f pos;
 			mapToWorld(pos, (*it)->Pos);
@@ -3442,7 +3442,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 	{
 		ct.setType(CCompassTarget::UserLandMark);
 		mapToWorld(ct.Pos, lm->Pos);
-		lm->getContextHelp(ct.Name);
+		lm->getContextHelpAsUtf16(ct.Name);
 		closest = dist;
 		found = true;
 	}
@@ -3455,7 +3455,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
 			mapToWorld(ct.Pos, lm->Pos);
-			lm->getContextHelp(ct.Name);
+			lm->getContextHelpAsUtf16(ct.Name);
 			closest = dist;
 			found = true;
 		}
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 3a25c0198..a6b24e670 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -857,17 +857,17 @@ class CAHGuildSheetOpen : public IActionHandler
 					case ccs_online:
 						onlineView->setTexture("w_online.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnline"));
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnline").toUtf8());
 						break;
 					case ccs_online_abroad:
 						onlineView->setTexture("w_online_abroad.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnlineAbroad"));
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnlineAbroad").toUtf8());
 						break;
 					default:
 						onlineView->setTexture("w_offline.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOffline"));
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOffline").toUtf8());
 						break;
 					}
 				}
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 8a87c7cd4..949a599b4 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1535,8 +1535,8 @@ void CInterfaceManager::updateFrameEvents()
 			CCtrlBase *pTooltip= dynamic_cast<CCtrlBase*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather_tt"));
 			if (pTooltip != NULL)
 			{
-				ucstring tt =	toString("%02d", WeatherManager.getNextWeatherHour()) + CI18N::get("uiMissionTimerHour") +
-								" - " + CI18N::get("uiHumidity") + " " +
+				string tt =	toString("%02d", WeatherManager.getNextWeatherHour()) + CI18N::get("uiMissionTimerHour").toUtf8() +
+								" - " + CI18N::get("uiHumidity").toUtf8() + " " +
 								toString("%d", (uint)(roundWeatherValue(WeatherManager.getNextWeatherValue()) * 100.f)) + "%";
 				pTooltip->setDefaultContextHelp(tt);
 			}
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index ec754de33..e4dbb0f44 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -2879,7 +2879,7 @@ std::string	CLuaIHMRyzom::getDefine(const std::string &def)
 // ***************************************************************************
 void		CLuaIHMRyzom::setContextHelpText(const ucstring &text)
 {
-	CWidgetManager::getInstance()->setContextHelpText(text);
+	CWidgetManager::getInstance()->setContextHelpText(text.toUtf8());
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 1b4c7ea5e..b380c12b0 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -759,17 +759,17 @@ void CPeopleList::setOnline(uint index, TCharConnectionState online)
 			case ccs_online:
 				onlineView->setTexture("w_online.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnline"));
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnline").toUtf8());
 				break;
 			case ccs_online_abroad:
 				onlineView->setTexture("w_online_abroad.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnlineAbroad"));
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnlineAbroad").toUtf8());
 				break;
 			default:
 				onlineView->setTexture("w_offline.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOffline"));
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOffline").toUtf8());
 				break;
 			}
 		}
diff --git a/ryzom/client/src/r2/displayer_visual_group.cpp b/ryzom/client/src/r2/displayer_visual_group.cpp
index 0edc18880..a84c6bfa4 100644
--- a/ryzom/client/src/r2/displayer_visual_group.cpp
+++ b/ryzom/client/src/r2/displayer_visual_group.cpp
@@ -73,10 +73,10 @@ public:
 		return CCtrlPolygon::contains(CVector2f(mouseXInWindow + 0.5f, mouseYInWindow + 0.5f));
 	}
 	// tooltip
-	virtual void		getContextHelp(::ucstring &help) const
+	virtual void		getContextHelp(std::string &help) const
 	{
-		help = Instance.getDisplayName();
-		if (std::operator==(help, NLMISC::CI18N::get("uiR2EDNoName") ))
+		help = Instance.getDisplayName().toUtf8();
+		if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
 			help.clear();
 	}
 	bool				emptyContextHelp() const { return true; }
@@ -122,10 +122,10 @@ public:
 		return CCtrlQuad::contains(CVector2f(mouseXInWindow + 0.5f, mouseYInWindow + 0.5f));
 	}
 	// tooltip
-	virtual void		getContextHelp(ucstring &help) const
+	virtual void		getContextHelp(std::string &help) const
 	{
-		help = Instance.getDisplayName();
-		if (std::operator==(help, NLMISC::CI18N::get("uiR2EDNoName")))
+		help = Instance.getDisplayName().toUtf8();
+		if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
 			help.clear();
 	}
 	bool				emptyContextHelp() const { return true; }
diff --git a/ryzom/client/src/r2/instance_map_deco.cpp b/ryzom/client/src/r2/instance_map_deco.cpp
index cdc792dc5..8ec630686 100644
--- a/ryzom/client/src/r2/instance_map_deco.cpp
+++ b/ryzom/client/src/r2/instance_map_deco.cpp
@@ -40,11 +40,12 @@ namespace R2
 {
 
 // *********************************************************************************************************
-void CInstanceMapDeco::CCtrlButtonEntity::getContextHelp(ucstring &help) const
+void CInstanceMapDeco::CCtrlButtonEntity::getContextHelp(std::string &help) const
 {
 	//H_AUTO(R2_CCtrlButtonEntity_getContextHelp)
-	help = _Instance.getDisplayName();
-	if (help == NLMISC::CI18N::get("uiR2EDNoName")) help.clear();
+	help = _Instance.getDisplayName().toUtf8();
+	if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
+		help.clear();
 }
 
 // *********************************************************************************************************
diff --git a/ryzom/client/src/r2/instance_map_deco.h b/ryzom/client/src/r2/instance_map_deco.h
index cf1a2352c..9be099c19 100644
--- a/ryzom/client/src/r2/instance_map_deco.h
+++ b/ryzom/client/src/r2/instance_map_deco.h
@@ -91,7 +91,7 @@ private:
 	private:
 		CInstance			&_Instance;
 	protected:
-		virtual void		getContextHelp(ucstring &help) const;
+		virtual void		getContextHelp(std::string &help) const;
 		bool				emptyContextHelp() const { return true; }
 		bool				wantInstantContextHelp() const { return true; }
 		virtual	bool		isCapturable() const { return false; }

From 051c46b95a8b34cfefae37e6fcb11eee26f511c7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 03:55:30 +0800
Subject: [PATCH 069/292] UTF-8 CI18N, ryzom/ryzomcore#335

---
 nel/include/nel/misc/i18n.h                   |  21 ++--
 nel/src/gui/ctrl_base.cpp                     |   8 +-
 nel/src/gui/ctrl_text_button.cpp              |   2 +-
 nel/src/gui/dbgroup_combo_box.cpp             |   2 +-
 nel/src/gui/dbview_quantity.cpp               |   2 +-
 nel/src/gui/group_container.cpp               |   8 +-
 nel/src/gui/group_html.cpp                    |   4 +-
 nel/src/gui/lua_ihm.cpp                       |   2 +-
 nel/src/gui/view_text.cpp                     |  12 +-
 nel/src/misc/common.cpp                       |   2 +-
 nel/src/misc/i18n.cpp                         | 106 +++++++++++++-----
 ryzom/client/src/bg_downloader_access.cpp     |  16 +--
 ryzom/client/src/client_chat_manager.cpp      |  18 ++-
 ryzom/client/src/client_sheets/item_sheet.cpp |   2 +-
 ryzom/client/src/client_sheets/item_sheet.h   |   2 +-
 ryzom/client/src/commands.cpp                 |   6 +-
 ryzom/client/src/connection.cpp               |  26 ++---
 ryzom/client/src/debug_client.cpp             |   2 +-
 ryzom/client/src/init.cpp                     |  10 +-
 ryzom/client/src/init_main_loop.cpp           |   2 +-
 .../src/interface_v3/action_handler_game.cpp  |  18 +--
 .../src/interface_v3/action_handler_help.cpp  |  48 ++++----
 .../src/interface_v3/action_phrase_faber.cpp  |   6 +-
 .../bot_chat_page_dynamic_mission.cpp         |   2 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  |  30 ++---
 ryzom/client/src/interface_v3/chat_window.cpp |  20 ++--
 ryzom/client/src/interface_v3/chat_window.h   |   2 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |   4 +-
 .../interface_v3/dbgroup_list_sheet_text.cpp  |  10 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  62 +++++-----
 .../client/src/interface_v3/group_compas.cpp  |   2 +-
 .../interface_v3/group_in_scene_user_info.cpp |   2 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  10 +-
 .../client/src/interface_v3/guild_manager.cpp |  14 +--
 .../src/interface_v3/interface_manager.cpp    |  94 ++++++++--------
 .../src/interface_v3/interface_manager.h      |   2 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |   4 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  14 +--
 .../src/interface_v3/macrocmd_manager.cpp     |   4 +-
 .../client/src/interface_v3/music_player.cpp  |   4 +-
 ryzom/client/src/interface_v3/people_list.cpp |  31 +++--
 .../client/src/interface_v3/skill_manager.cpp |   2 +-
 .../src/interface_v3/task_bar_manager.cpp     |   2 +-
 ryzom/client/src/login_patch.cpp              |   6 +-
 ryzom/client/src/main_loop_debug.cpp          |   2 +-
 ryzom/client/src/net_manager.cpp              |  10 +-
 ryzom/client/src/progress.cpp                 |   8 +-
 ryzom/client/src/r2/auto_group.cpp            |   2 +-
 .../client/src/r2/displayer_visual_entity.cpp |   4 +-
 .../client/src/r2/displayer_visual_group.cpp  |   4 +-
 ryzom/client/src/r2/editor.cpp                |  10 +-
 ryzom/client/src/r2/instance_map_deco.cpp     |   2 +-
 ryzom/client/src/r2/tool_select_move.cpp      |   4 +-
 ryzom/client/src/session_browser_impl.cpp     |   2 +-
 ryzom/common/src/game_share/rm_family.cpp     |  18 +--
 ryzom/common/src/game_share/rm_family.h       |  16 +--
 ryzom/common/src/game_share/roles.cpp         |   2 +-
 ryzom/common/src/game_share/roles.h           |   2 +-
 58 files changed, 392 insertions(+), 340 deletions(-)

diff --git a/nel/include/nel/misc/i18n.h b/nel/include/nel/misc/i18n.h
index e8b00385b..28df54c5e 100644
--- a/nel/include/nel/misc/i18n.h
+++ b/nel/include/nel/misc/i18n.h
@@ -99,7 +99,7 @@ public:
 
 	/// Return a vector with all language available. The vector contains the name of the language.
 	/// The index in the vector is used in \c load() function
-	static const std::vector<ucstring> &getLanguageNames();
+	static const std::vector<std::string> &getLanguageNames();
 
 	/** Return a vector with all language code available.
 	 *	Code are ISO 639-2 compliant.
@@ -122,7 +122,7 @@ public:
 	static void loadFromFilename (const std::string &filename, bool reload);
 
 	/// Returns the name of the language in the language name (English, Francais, ...)
-	static ucstring getCurrentLanguageName ();
+	static std::string getCurrentLanguageName ();
 
 	/// Returns the code of the language ("fr", "en", ...)
 	static std::string getCurrentLanguageCode ();
@@ -134,7 +134,10 @@ public:
 	static bool setSystemLanguageCode (const std::string &languageCode);
 
 	/// Find a string in the selected language and return his association.
-	static const ucstring &get (const std::string &label);
+	static const ucstring &getAsUtf16 (const std::string &label);
+
+	/// Find a string in the selected language and return his association.
+	static const std::string &get (const std::string &label);
 
 	// Test if a string has a translation in the selected language.
 	// NB : The empty string is considered to have a translation
@@ -219,24 +222,28 @@ public:
 
 private:
 
-	typedef std::map<std::string, ucstring>						StrMapContainer;
+	typedef std::map<std::string, std::string>					StrMapContainer;
+	typedef std::map<std::string, ucstring>						StrMapContainer16;
 
 	static ILoadProxy											*_LoadProxy;
 
 	static StrMapContainer										_StrMap;
+	static StrMapContainer16									_StrMap16;
 	static bool													_StrMapLoaded;
 
 	// the alternative language that will be used if the sentence is not found in the original language
 	static StrMapContainer										_StrMapFallback;
+	static StrMapContainer16									_StrMapFallback16;
 
 	static std::vector<std::string>								_LanguageCodes;
-	static std::vector<ucstring>								_LanguageNames;
+	static std::vector<std::string>								_LanguageNames;
 	static std::string											_SystemLanguageCode;
 
 	static bool													_LanguagesNamesLoaded;
 
 	static std::string											_SelectedLanguageCode;
-	static const ucstring										_NotTranslatedValue;
+	static const ucstring										_NotTranslatedValue16;
+	static const std::string									_NotTranslatedValue;
 
 	/** Structure to hold contextual info during
 	 *	read of preprocessed file
@@ -256,7 +263,7 @@ private:
 	/// Init _LanguageCodes and _LanguageNames
 	static void initLanguages();
 
-	static bool loadFileIntoMap(const std::string &filename, StrMapContainer &dest);
+	static bool loadFileIntoMap(const std::string &filename, StrMapContainer &dest, StrMapContainer16 &dest16);
 
 	/// The internal read function, it does the real job of readTextFile
 	static void _readTextFile(const std::string &filename,
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index 75c3024f3..1f652031b 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -127,7 +127,7 @@ namespace NLGUI
 		{
 			// Force I18N tooltip
 			if (!editorMode)
-				_ContextHelp = CI18N::get((const char *)prop).toUtf8();
+				_ContextHelp = CI18N::get((const char *)prop);
 			else
 				_ContextHelp = (const char *)prop;
 		}
@@ -138,7 +138,7 @@ namespace NLGUI
 			if (prop)
 			{
 				if (!editorMode && NLMISC::startsWith((const char *)prop, "ui"))
-					_ContextHelp = CI18N::get((const char *)prop).toUtf8();
+					_ContextHelp = CI18N::get((const char *)prop);
 				else
 					_ContextHelp = (const char *)prop;
 			}
@@ -259,7 +259,7 @@ namespace NLGUI
 		if( name == "tooltip" )
 		{
 			if (!editorMode && NLMISC::startsWith(value, "ui"))
-				_ContextHelp = CI18N::get(value).toUtf8();
+				_ContextHelp = CI18N::get(value);
 			else
 				_ContextHelp = value;
 			return;
@@ -268,7 +268,7 @@ namespace NLGUI
 		if( name == "tooltip_i18n" )
 		{
 			if (!editorMode)
-				_ContextHelp = CI18N::get(value).toUtf8();
+				_ContextHelp = CI18N::get(value);
 			else
 				_ContextHelp = value;
 			return;
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 1bd32be27..154d41633 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -598,7 +598,7 @@ namespace NLGUI
 				const char *propPtr = prop;
 				std::string text;
 				if (NLMISC::startsWith(propPtr, "ui"))
-					text = CI18N::get(propPtr).toUtf8();
+					text = CI18N::get(propPtr);
 				else
 					text = propPtr;
 				_ViewText->setText(text);
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 6cf911399..66d3220a0 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -184,7 +184,7 @@ namespace NLGUI
 				{
 					const char *propPtr = name;
 					if (NLMISC::startsWith(propPtr, "ui"))
-						addText(CI18N::get(propPtr).toUtf8());
+						addText(CI18N::get(propPtr));
 					else
 						addText(propPtr);
 				}
diff --git a/nel/src/gui/dbview_quantity.cpp b/nel/src/gui/dbview_quantity.cpp
index 0f90d598e..192b0a936 100644
--- a/nel/src/gui/dbview_quantity.cpp
+++ b/nel/src/gui/dbview_quantity.cpp
@@ -148,7 +148,7 @@ namespace NLGUI
 		{
 			const char *propPtr = ptr;
 			if (NLMISC::startsWith(propPtr, "ui"))
-				_EmptyText = CI18N::get(propPtr).toUtf8();
+				_EmptyText = CI18N::get(propPtr);
 			else
 				_EmptyText = propPtr;
 		}
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index f0a023c39..7bab62820 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3538,7 +3538,7 @@ namespace NLGUI
 						_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_popin"));
 						_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 						_RightButton->setActionOnLeftClick ("ic_popin");
-						_RightButton->setDefaultContextHelp(CI18N::get("uiPopinWindow").toUtf8());
+						_RightButton->setDefaultContextHelp(CI18N::get("uiPopinWindow"));
 					}
 					else // else the container can be deactivated ? deactivate button
 					{
@@ -3546,7 +3546,7 @@ namespace NLGUI
 						_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_deactive"));
 						_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 						_RightButton->setActionOnLeftClick ("ic_deactive");
-						_RightButton->setDefaultContextHelp(CI18N::get("uiClose").toUtf8());
+						_RightButton->setDefaultContextHelp(CI18N::get("uiClose"));
 					}
 				}
 			}
@@ -3559,7 +3559,7 @@ namespace NLGUI
 					_RightButton->setTexturePushed (pLayer->getValStr ("right_button_tx_popup"));
 					_RightButton->setTextureOver (pLayer->getValStr ("right_button_tx_over"));
 					_RightButton->setActionOnLeftClick ("ic_popup");
-					_RightButton->setDefaultContextHelp(CI18N::get("uiPopupWindow").toUtf8());
+					_RightButton->setDefaultContextHelp(CI18N::get("uiPopupWindow"));
 				}
 				_RightButton->setActive(!_Locked);
 			}
@@ -3602,7 +3602,7 @@ namespace NLGUI
 				_HelpButton->setTexturePushed (pLayer->getValStr ("help_button_tx"));
 				_HelpButton->setTextureOver (pLayer->getValStr ("help_button_tx_over"));
 				_HelpButton->setActionOnLeftClick ("ic_help");
-				_HelpButton->setDefaultContextHelp(CI18N::get("uiHelp").toUtf8());
+				_HelpButton->setDefaultContextHelp(CI18N::get("uiHelp"));
 			}
 
 			// if not layer 0
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 08bf1b7c1..15bd47a68 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -3229,7 +3229,7 @@ namespace NLGUI
 		{
 			if (CI18N::hasTranslation(tooltip))
 			{
-				ctrlButton->setDefaultContextHelp(CI18N::get(tooltip).toUtf8());
+				ctrlButton->setDefaultContextHelp(CI18N::get(tooltip));
 				//ctrlButton->setOnContextHelp(CI18N::get(tooltip).toString());
 			}
 			else
@@ -5467,7 +5467,7 @@ namespace NLGUI
 				{
 					if (CI18N::hasTranslation(tooltip))
 					{
-						ctrlButton->setDefaultContextHelp(CI18N::get(tooltip).toUtf8());
+						ctrlButton->setDefaultContextHelp(CI18N::get(tooltip));
 					}
 					else
 					{
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index cf60444a6..908898e74 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -1691,7 +1691,7 @@ namespace NLGUI
 		// inside i18n table
 		luabind::module(L, "i18n")
 		[
-			luabind::def("get", &CI18N::get),
+			luabind::def("get", &CI18N::getAsUtf16), // FIXME: Lua UTF-8
 			luabind::def("hasTranslation", &CI18N::hasTranslation)
 		];
 		// inside 'nlfile' table
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index d23d89f87..69b117330 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -653,7 +653,7 @@ namespace NLGUI
 #if 1
 			if (NLMISC::startsWith(value, "ui"))
 			{
-				_Text = CI18N::get(value).toUtf8();
+				_Text = CI18N::get(value);
 				_TextLength = 0;
 				_HardText = value;
 			}
@@ -1000,7 +1000,7 @@ namespace NLGUI
 			if (NLMISC::startsWith(propPtr, "ui"))
 			{
 				_HardText = propPtr;
-				_Text = CI18N::get(propPtr).toUtf8();
+				_Text = CI18N::get(propPtr);
 				_TextLength = 0;
 			}
 			else
@@ -1021,11 +1021,11 @@ namespace NLGUI
 
 			if (_MultiLine)
 			{
-				setTextFormatTaged(CI18N::get(propPtr).toUtf8());
+				setTextFormatTaged(CI18N::get(propPtr));
 			}
 			else
 			{
-				setSingleLineTextFormatTaged(CI18N::get(propPtr).toUtf8());
+				setSingleLineTextFormatTaged(CI18N::get(propPtr));
 			}
 		}
 
@@ -2394,7 +2394,7 @@ namespace NLGUI
 	{
 		if (NLMISC::startsWith(ht, "ui"))
 		{
-			setText(CI18N::get(ht).toUtf8());
+			setText(CI18N::get(ht));
 			_HardText = ht;
 		}
 		else
@@ -3346,7 +3346,7 @@ namespace NLGUI
 				pTooltip->setRenderLayer(getRenderLayer());
 				std::string tempTooltipStr = tempTooltips[i].toUtf8();
 				bool isI18N = NLMISC::startsWith(tempTooltipStr, "ui");
-				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr).toUtf8() : tempTooltipStr);
+				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr) : tempTooltipStr);
 				pTooltip->setParentPos(this);
 				pTooltip->setParentPosRef(Hotspot_BR);
 				pTooltip->setPosRef(Hotspot_BR);
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index 184f550d5..cbc6ee070 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -884,7 +884,7 @@ std::string formatThousands(const std::string& s)
 {
 	sint i, k;
 	sint remaining = (sint)s.length() - 1;
-	static std::string separator = NLMISC::CI18N::get("uiThousandsSeparator").toUtf8();
+	static std::string separator = NLMISC::CI18N::get("uiThousandsSeparator");
 
 	// Don't add separator if the number is < 10k
 	if (remaining < 4) return s;
diff --git a/nel/src/misc/i18n.cpp b/nel/src/misc/i18n.cpp
index 27a47c2e4..729234f56 100644
--- a/nel/src/misc/i18n.cpp
+++ b/nel/src/misc/i18n.cpp
@@ -38,15 +38,18 @@ using namespace std;
 
 namespace NLMISC {
 
-CI18N::StrMapContainer	CI18N::_StrMap;
-CI18N::StrMapContainer	CI18N::_StrMapFallback;
-bool					CI18N::_StrMapLoaded = false;
-const ucstring			CI18N::_NotTranslatedValue("<Not Translated>");
+CI18N::StrMapContainer		CI18N::_StrMap;
+CI18N::StrMapContainer		CI18N::_StrMapFallback;
+CI18N::StrMapContainer16	CI18N::_StrMap16;
+CI18N::StrMapContainer16	CI18N::_StrMapFallback16;
+bool						CI18N::_StrMapLoaded = false;
+const ucstring				CI18N::_NotTranslatedValue16("<Not Translated>");
+const std::string			CI18N::_NotTranslatedValue("<Not Translated>");
 bool					CI18N::_LanguagesNamesLoaded = false;
 string					CI18N::_SelectedLanguageCode;
 CI18N::ILoadProxy		*CI18N::_LoadProxy = 0;
 vector<string>			CI18N::_LanguageCodes;
-vector<ucstring>		CI18N::_LanguageNames;
+vector<std::string>		CI18N::_LanguageNames;
 std::string				CI18N::_SystemLanguageCode;
 bool CI18N::noResolution = false;
 
@@ -65,17 +68,17 @@ void CI18N::initLanguages()
 		_LanguageCodes.push_back("ru");
 		_LanguageCodes.push_back("es");
 
-		_LanguageNames.push_back(ucstring("English"));
-		_LanguageNames.push_back(ucstring("French"));
-		_LanguageNames.push_back(ucstring("German"));
-		_LanguageNames.push_back(ucstring("Russian"));
-		_LanguageNames.push_back(ucstring("Spanish"));
+		_LanguageNames.push_back("English");
+		_LanguageNames.push_back("French");
+		_LanguageNames.push_back("German");
+		_LanguageNames.push_back("Russian");
+		_LanguageNames.push_back("Spanish");
 
 		_LanguagesNamesLoaded = true;
 	}
 }
 
-const std::vector<ucstring> &CI18N::getLanguageNames()
+const std::vector<std::string> &CI18N::getLanguageNames()
 {
 	initLanguages();
 
@@ -91,19 +94,27 @@ const std::vector<std::string> &CI18N::getLanguageCodes()
 
 void CI18N::load (const string &languageCode, const string &fallbackLanguageCode)
 {
-	if (_StrMapLoaded)	_StrMap.clear ();
-	else				_StrMapLoaded = true;
+	if (_StrMapLoaded)
+	{
+		_StrMap.clear();
+		_StrMap16.clear();
+	}
+	else
+	{
+		_StrMapLoaded = true;
+	}
 	_SelectedLanguageCode = languageCode;
-	loadFileIntoMap(languageCode + ".uxt", _StrMap);
+	loadFileIntoMap(languageCode + ".uxt", _StrMap, _StrMap16);
 
 	_StrMapFallback.clear();
+	_StrMapFallback16.clear();
 	if(!fallbackLanguageCode.empty())
 	{
-		loadFileIntoMap(fallbackLanguageCode + ".uxt", _StrMapFallback);
+		loadFileIntoMap(fallbackLanguageCode + ".uxt", _StrMapFallback, _StrMapFallback16);
 	}
 }
 
-bool CI18N::loadFileIntoMap(const string &fileName, StrMapContainer &destMap)
+bool CI18N::loadFileIntoMap(const string &fileName, StrMapContainer &destMap, StrMapContainer16 &destMap16)
 {
 	ucstring text;
 	// read in the text
@@ -138,11 +149,12 @@ bool CI18N::loadFileIntoMap(const string &fileName, StrMapContainer &destMap)
 
 		// ok, a line read.
 		pair<map<string, ucstring>::iterator, bool> ret;
-		ret = destMap.insert(make_pair(label, ucs));
+		ret = destMap16.insert(make_pair(label, ucs));
 		if (!ret.second)
 		{
 			nlwarning("I18N: Error in %s, the label %s exists twice !", fileName.c_str(), label.c_str());
 		}
+		destMap.insert(make_pair(label, ucs.toUtf8()));
 		skipWhiteSpace(first, last);
 	}
 
@@ -152,13 +164,15 @@ bool CI18N::loadFileIntoMap(const string &fileName, StrMapContainer &destMap)
 	{
 		nlwarning("I18N: In file %s, missing LanguageName translation (should be first in file)", fileName.c_str());
 	}
+	nlassert(destMap.size() == destMap16.size());
 	return true;
 }
 
 void CI18N::loadFromFilename(const string &filename, bool reload)
 {
 	StrMapContainer destMap;
-	if (!loadFileIntoMap(filename, destMap))
+	StrMapContainer16 destMap16;
+	if (!loadFileIntoMap(filename, destMap, destMap16))
 	{
 		return;
 	}
@@ -167,16 +181,52 @@ void CI18N::loadFromFilename(const string &filename, bool reload)
 	{
 		if (!reload)
 		{
-			if (_StrMap.count(it->first))
+			if (_StrMap16.count(it->first))
 			{
 				nlwarning("I18N: Error in %s, the label %s exist twice !", filename.c_str(), it->first.c_str());
 			}
 		}
+		_StrMap16[it->first] = ucstring::makeFromUtf8(it->second);
 		_StrMap[it->first] = it->second;
 	}
 }
 
-const ucstring &CI18N::get (const string &label)
+const std::string &CI18N::get(const string &label)
+{
+	if (noResolution)
+	{
+		return label;
+	}
+
+	if (label.empty())
+	{
+		static const std::string empty;
+		return empty;
+	}
+
+	StrMapContainer::iterator it(_StrMap.find(label));
+
+	if (it != _StrMap.end())
+		return it->second;
+
+	static CHashSet<string> missingStrings;
+	if (missingStrings.find(label) == missingStrings.end())
+	{
+		nlwarning("I18N: The string %s did not exist in language %s (display once)", label.c_str(), _SelectedLanguageCode.c_str());
+		missingStrings.insert(label);
+	}
+
+	// use the fall back language if it exists
+	it = _StrMapFallback.find(label);
+	if (it != _StrMapFallback.end())
+		return it->second;
+
+	static std::string badString;
+	badString = string("<NotExist:") + label + ">";
+	return badString;
+}
+
+const ucstring &CI18N::getAsUtf16 (const string &label)
 {
 	if( noResolution )
 	{
@@ -187,13 +237,13 @@ const ucstring &CI18N::get (const string &label)
 
 	if (label.empty())
 	{
-		static ucstring	emptyString;
+		static const ucstring emptyString;
 		return emptyString;
 	}
 
-	StrMapContainer::iterator it(_StrMap.find(label));
+	StrMapContainer16::iterator it(_StrMap16.find(label));
 
-	if (it != _StrMap.end())
+	if (it != _StrMap16.end())
 		return it->second;
 
 	static CHashSet<string>	missingStrings;
@@ -204,8 +254,8 @@ const ucstring &CI18N::get (const string &label)
 	}
 
 	// use the fall back language if it exists
-	it = _StrMapFallback.find(label);
-	if (it != _StrMapFallback.end())
+	it = _StrMapFallback16.find(label);
+	if (it != _StrMapFallback16.end())
 		return it->second;
 
 	static ucstring	badString;
@@ -229,7 +279,7 @@ bool CI18N::hasTranslation(const string &label)
 	return false;
 }
 
-ucstring CI18N::getCurrentLanguageName ()
+std::string CI18N::getCurrentLanguageName ()
 {
 	return get("LanguageName");
 }
@@ -379,7 +429,7 @@ std::string CI18N::getSystemLanguageCode ()
 			// locales names are different under Windows, for example: French_France.1252
 			for(uint i = 0; i < _LanguageNames.size(); ++i)
 			{
-				std::string name = _LanguageNames[i].toUtf8();
+				std::string name = _LanguageNames[i];
 
 				// so we compare the language name with the supported ones
 				if (lang.compare(0, name.length(), name) == 0)
@@ -439,7 +489,7 @@ bool CI18N::setSystemLanguageCode (const std::string &languageCode)
 		// check if language name is supported
 		for(uint i = 0; i < _LanguageNames.size(); ++i)
 		{
-			std::string name = NLMISC::toLower(_LanguageNames[i].toUtf8());
+			std::string name = NLMISC::toLower(_LanguageNames[i]);
 
 			if (name == lang)
 			{
diff --git a/ryzom/client/src/bg_downloader_access.cpp b/ryzom/client/src/bg_downloader_access.cpp
index 61364ea5f..2a0e2d73a 100644
--- a/ryzom/client/src/bg_downloader_access.cpp
+++ b/ryzom/client/src/bg_downloader_access.cpp
@@ -230,7 +230,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
 			// that the downloader is still running and in slave mode
 			if (!isDownloaderProcessRunning() && getDownloaderMode() != DownloaderMode_Slave)
 			{
-				throw EDownloadException(CI18N::get("uiBGD_DownloaderStopped").toUtf8());
+				throw EDownloadException(CI18N::get("uiBGD_DownloaderStopped"));
 			}
 		}
 		else
@@ -429,7 +429,7 @@ void CBGDownloaderAccess::CDownloadCoTask::createDownloaderProcess()
 		BOOL ok = NLMISC::launchProgram(BGDownloaderName, Parent->_CommandLine);
 		if (!ok)
 		{
-			throw EDownloadException(CI18N::get("uiBGD_LaunchError").toUtf8());
+			throw EDownloadException(CI18N::get("uiBGD_LaunchError"));
 		}
 	}
 	else
@@ -458,7 +458,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
 			{
 				nlwarning("CBGDownloaderAccess::CDownloadCoTask : detected shared memory segment, with NULL pid");
 				// some problem here ...
-				throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance").toUtf8());
+				throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance"));
 			}
 		}
 		bool ok = NLMISC::CWinProcess::terminateProcess(*(DWORD *) ryzomInstPIDPtr);
@@ -467,7 +467,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
 		{
 			nlwarning("CBGDownloaderAccess::CDownloadCoTask : detected shared memory segment, with good pid, but couldn't stop the process");
 			// couldn't stop the other client ...
-			throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance").toUtf8());
+			throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance"));
 		}
 	}
 	// write our pid into shared mem
@@ -475,7 +475,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
 	if (!Parent->_RyzomInstPIDPtr)
 	{
 		// really, really bad luck ...
-		throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance").toUtf8());
+		throw EDownloadException(CI18N::get("uiBGD_MultipleRyzomInstance"));
 	}
 	*(uint32 *) Parent->_RyzomInstPIDPtr = (uint32) GetCurrentProcessId();
 
@@ -514,7 +514,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
 		const uint32 totalTries = 7;
 		while (waitTime <= 32000)
 		{
-			Parent->_CurrentMessage.fromUtf8(toString(CI18N::get("uiBGD_HandShaking").toUtf8().c_str(), tryIndex, totalTries));
+			Parent->_CurrentMessage.fromUtf8(toString(CI18N::get("uiBGD_HandShaking").c_str(), tryIndex, totalTries));
 
 			sendSimpleMsg(CL_Probe);
 			NLMISC::CMemStream dummyMsg;
@@ -758,7 +758,7 @@ void CBGDownloaderAccess::CDownloadCoTask::waitMsg(BGDownloader::TMsgType wanted
 	if (msgType != wantedMsgType)
 	{
 		nlwarning("BG DOWNLOADER PROTOCOL ERROR ! Bad message type received. Expected type is '%d', received type is '%d'", (int) wantedMsgType, (int) msgType);
-		throw EDownloadException(CI18N::get("uiBGD_ProtocolError").toUtf8());
+		throw EDownloadException(CI18N::get("uiBGD_ProtocolError"));
 	}
 }
 
@@ -816,7 +816,7 @@ void CBGDownloaderAccess::CDownloadCoTask::checkDownloaderAlive()
 {
 	if (!Parent->_DownloaderMsgQueue.connected() || !isDownloaderProcessRunning())
 	{
-		throw EDownloadException(CI18N::get("uiBGD_DownloaderDisconnected").toUtf8());
+		throw EDownloadException(CI18N::get("uiBGD_DownloaderDisconnected"));
 	}
 }
 
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index a61c21701..09b1140d4 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -1176,9 +1176,9 @@ class CHandlerTell : public IActionHandler
 	void execute (CCtrlBase *pCaller, const std::string &sParams)
 	{
 		string receiver = getParam (sParams, "player");
-		ucstring message;
-		message.fromUtf8(getParam (sParams, "text"));
-//		message = getParam (sParams, "text");
+		string message;
+		message = getParam (sParams, "text");
+
 		if (receiver.empty() || message.empty())
 			return;
 
@@ -1194,10 +1194,10 @@ class CHandlerTell : public IActionHandler
 		// display in the good window
 		CInterfaceProperty prop;
 		prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
-		ucstring finalMsg;
+		string finalMsg;
 		CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false);
 
-		ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+		string csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
 		finalMsg += csr + CI18N::get("youTell") + ": ";
 		prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 		CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, true);
@@ -1206,7 +1206,7 @@ class CHandlerTell : public IActionHandler
 //		TDataSetIndex dsi; // not used ....
 		PeopleInterraction.ChatInput.Tell.displayTellMessage(/*dsi, */finalMsg, receiver, prop.getRGBA());
 
-		ucstring s = CI18N::get("youTellPlayer");
+		string s = CI18N::get("youTellPlayer");
 		strFindReplace(s, "%name", receiver);
 		strFindReplace(finalMsg, CI18N::get("youTell"), s);
 		CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
@@ -1341,9 +1341,7 @@ class CHandlerTalk : public IActionHandler
 		// Param
 		uint mode;
 		fromString(getParam (sParams, "mode"), mode);
-		ucstring text;
-		text.fromUtf8 (getParam (sParams, "text"));
-//		text = getParam (sParams, "text");
+		string text = getParam (sParams, "text");
 
 		// Parse any tokens in the text
 		if ( ! CInterfaceManager::parseTokens(text))
@@ -1356,7 +1354,7 @@ class CHandlerTalk : public IActionHandler
 		{
 			if(text[0] == '/')
 			{
-				string str = text.toUtf8();
+				string str = text;
 				string cmdWithArgs = str.substr(1);
 
 				// Get the command name from the string, can contain spaces
diff --git a/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
index 04d0737e1..25d66acce 100644
--- a/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -983,7 +983,7 @@ bool	CItemSheet::canExchangeOrGive(bool botChatGift) const
 }
 
 // ***************************************************************************
-void	CItemSheet::getItemPartListAsText(ucstring &ipList) const
+void	CItemSheet::getItemPartListAsText(std::string &ipList) const
 {
 	bool	all= true;
 	for(uint i=0;i<RM_FABER_TYPE::NUM_FABER_TYPE;i++)
diff --git a/ryzom/client/src/client_sheets/item_sheet.h b/ryzom/client/src/client_sheets/item_sheet.h
index 20a2e081b..e36fd5c84 100644
--- a/ryzom/client/src/client_sheets/item_sheet.h
+++ b/ryzom/client/src/client_sheets/item_sheet.h
@@ -466,7 +466,7 @@ public:
 	bool	canExchangeOrGive(bool botChatGift) const;
 
 	// MP only. return translated text of all item part this MP can build. empty, if can't build anything
-	void	getItemPartListAsText(ucstring &ipList) const;
+	void	getItemPartListAsText(std::string &ipList) const;
 
 	// get craft plan
 	const NLMISC::CSheetId &getCraftPlan() const { return CraftPlan; }
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index fad157147..23a09c62e 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -853,7 +853,7 @@ NLMISC_COMMAND(bugReport, "Call the bug report tool with dump", "<AddScreenshot>
 
 	string sys;
 
-	sys = "Language "+CI18N::getCurrentLanguageName().toString() +" ";
+	sys = "Language "+CI18N::getCurrentLanguageName() +" ";
 
 	if (!args.empty())
 	{
@@ -1306,9 +1306,9 @@ NLMISC_COMMAND(execScript, "Execute a script file (.cmd)","<FileName>")
 						inComment++;
 					if(inComment<=0)
 					{
-						ucstring ucline(line);
+						string ucline(line);
 						CInterfaceManager::parseTokens(ucline);
-						ICommand::execute(ucline.toUtf8(), g_log);
+						ICommand::execute(ucline, g_log);
 					}
 					if(strncmp(line, "*/", 2)==0)
 						inComment--;
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 1ce257f2c..39493495f 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1021,7 +1021,7 @@ TInterfaceState globalMenu()
 				// Display the firewall alert string
 				CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:outgame:connecting:title"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiFirewallAlert").toUtf8() + "...");
+					pVT->setText(CI18N::get("uiFirewallAlert") + "...");
 
 				// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
 				nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@@ -1237,8 +1237,8 @@ TInterfaceState globalMenu()
 					if (pVT != NULL)
 					{
 						pVT->setMultiLine( true );
-						pVT->setText(CI18N::get("uiFirewallFail").toUtf8()+".\n"+
-									  CI18N::get("uiFirewallAlert").toUtf8()+".");
+						pVT->setText(CI18N::get("uiFirewallFail")+".\n"+
+									  CI18N::get("uiFirewallAlert")+".");
 					}
 				}
 			}
@@ -1319,7 +1319,7 @@ public:
 			if (pVT == NULL) return;
 
 			if (rCS.Name.empty())
-				pVT->setText(CI18N::get("uiEmptySlot").toUtf8());
+				pVT->setText(CI18N::get("uiEmptySlot"));
 			else
 				pVT->setText(rCS.Name.toUtf8());
 		}
@@ -1328,7 +1328,7 @@ public:
 		{
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sPath+":text"+NLMISC::toString(i)));
 			if (pVT == NULL) return;
-			pVT->setText(CI18N::get("uiEmptySlot").toUtf8());
+			pVT->setText(CI18N::get("uiEmptySlot"));
 		}
 	}
 };
@@ -2682,7 +2682,7 @@ class CAHScenarioControl : public IActionHandler
 			CViewText* viewText = dynamic_cast<CViewText*>(result);
 			if(viewText)
 			{
-				viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName").toUtf8():CI18N::get("uiR2EDScenarioFileName").toUtf8());
+				viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName"):CI18N::get("uiR2EDScenarioFileName"));
 			}
 		}
 
@@ -2694,9 +2694,9 @@ class CAHScenarioControl : public IActionHandler
 			if(okButton)
 			{
 				if(R2::getEditor().getAccessMode()!=R2::CEditor::AccessDM)
-					okButton->setHardText(CI18N::get("uiR2EDLaunchScenario").toString());
+					okButton->setHardText(CI18N::get("uiR2EDLaunchScenario"));
 				else
-					okButton->setHardText(CI18N::get("uiR2EDApplyScenarioFilters").toString());
+					okButton->setHardText(CI18N::get("uiR2EDApplyScenarioFilters"));
 			}
 		}
 
@@ -3184,9 +3184,9 @@ class CAHLoadScenario : public IActionHandler
 		// --------------------------
 
 		TRuleType ruleType(TRuleType::rt_strict);
-		if(rules==CI18N::get("uiR2EDliberal").toString())
+		if(rules==CI18N::get("uiR2EDliberal"))
 			ruleType = TRuleType(TRuleType::rt_liberal);
-		else if(rules == CI18N::get("uiR2EDstrict").toString())
+		else if(rules == CI18N::get("uiR2EDstrict"))
 			ruleType = TRuleType(TRuleType::rt_strict);
 		volatile static bool override = false;
 		if (override)
@@ -3250,7 +3250,7 @@ class CAHLoadScenario : public IActionHandler
 			{
 				CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
+					pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
 				CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 
 				return;
@@ -3331,7 +3331,7 @@ class CAHLoadScenario : public IActionHandler
 						{
 							CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 							if (pVT != NULL)
-								pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
+								pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
 							CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 						}
 
@@ -3360,7 +3360,7 @@ class CAHLoadScenario : public IActionHandler
 										{
 											CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 											if (pVT != NULL)
-												pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial").toUtf8());
+												pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial"));
 											CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 										}
 									}
diff --git a/ryzom/client/src/debug_client.cpp b/ryzom/client/src/debug_client.cpp
index dd182f3c9..30e2645bf 100644
--- a/ryzom/client/src/debug_client.cpp
+++ b/ryzom/client/src/debug_client.cpp
@@ -529,7 +529,7 @@ string getDebugInformation()
 	str += toString("ServerTick: %u\n", NetMngr.getCurrentServerTick());
 	str += toString("ConnectState: %s\n", NetMngr.getConnectionStateCStr());
 	str += toString("LocalAddress: %s\n", NetMngr.getAddress().asString().c_str());
-	str += toString("Language: %s\n", CI18N::getCurrentLanguageName().toString().c_str());
+	str += toString("Language: %s\n", CI18N::getCurrentLanguageName().c_str());
 	str += toString("ClientVersion: %s\n", getDebugVersion().c_str());
 	if (ClientCfg.R2Mode)
 	{
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index 5e7b03549..28d14dc7b 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -578,7 +578,7 @@ void checkDriverDepth ()
 #else
 		if (mode.Depth != 16 && mode.Depth != 24 && mode.Depth != 32)
 #endif
-			ExitClientError (CI18N::get ("uiDesktopNotIn32").toUtf8().c_str ());
+			ExitClientError (CI18N::get ("uiDesktopNotIn32").c_str ());
 	}
 }
 
@@ -1058,7 +1058,7 @@ void prelogInit()
 
 		if(Driver == NULL)
 		{
-			ExitClientError (CI18N::get ("Can_t_load_the_display_driver").toUtf8().c_str ());
+			ExitClientError (CI18N::get ("Can_t_load_the_display_driver").c_str ());
 			// ExitClientError() call exit() so the code after is never called
 			return;
 		}
@@ -1149,14 +1149,14 @@ void prelogInit()
 			string msg;
 			if (mode.Windowed)
 			{
-				msg = CI18N::get ("can_t_create_a_window_display").toUtf8();
+				msg = CI18N::get ("can_t_create_a_window_display");
 			}
 			else
 			{
-				msg = CI18N::get ("can_t_create_a_fullscreen_display").toUtf8();
+				msg = CI18N::get ("can_t_create_a_fullscreen_display");
 			}
 			msg += " (%dx%d %d ";
-			msg += CI18N::get ("bits").toUtf8 ();
+			msg += CI18N::get ("bits");
 			msg += ")";
 			ExitClientError (msg.c_str (), mode.Width, mode.Height, mode.Depth);
 			// ExitClientError() call exit() so the code after is never called
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index 9c8890775..a1caef841 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -1692,7 +1692,7 @@ void initBloomConfigUI()
 	if(!supportBloom)
 	{
 		if(group)
-			group->setDefaultContextHelp(CI18N::get("uiFxTooltipBloom").toUtf8());
+			group->setDefaultContextHelp(CI18N::get("uiFxTooltipBloom"));
 
 		ClientCfg.writeBool("FXAA", false);
 		ClientCfg.writeBool("Bloom", false);
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 2901bb261..4281181a9 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2140,7 +2140,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 				pVBR->setColor(CRGBA(0,0,0,0));
 
 				if (pTooltip)
-					pTooltip->setDefaultContextHelp(CI18N::get("uittTargetUnknown").toUtf8());
+					pTooltip->setDefaultContextHelp(CI18N::get("uittTargetUnknown"));
 
 				return;
 			}
@@ -2205,7 +2205,7 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 				sint min = (nForceRegion-2) * 50 + (nLevelForce-1) * 10 + 1;
 				sint max = (nForceRegion-2) * 50 + nLevelForce * 10;
 
-				str= CI18N::get("uittTargetLevel").toUtf8();
+				str= CI18N::get("uittTargetLevel");
 				strFindReplace(str, "%min", toString(min));
 				strFindReplace(str, "%max", toString(max));
 			}
@@ -2214,16 +2214,16 @@ class CActionHandlerSetTargetForceRegionLevel: public IActionHandler
 			{
 				sint n = (nForceRegion-1) * 50;
 				if (pE->isNPC())
-					str= CI18N::get("uittTargetGuardBoss").toUtf8();
+					str= CI18N::get("uittTargetGuardBoss");
 				else
-					str= CI18N::get("uittTargetBoss").toUtf8();
+					str= CI18N::get("uittTargetBoss");
 				strFindReplace(str, "%n", toString("%d", n) );
 			}
 			// Named
 			else
 			{
 				sint n = (nForceRegion-1) * 50;
-				str= CI18N::get("uittTargetNamed").toUtf8();
+				str= CI18N::get("uittTargetNamed");
 				strFindReplace(str, "%n", toString("%d", n) );
 			}
 
@@ -3094,10 +3094,10 @@ public:
 		if( pCB )
 		{
 			pCB->resetTexts();
-			pCB->addText(CI18N::get("uigcLowTextureMode").toUtf8());
-			pCB->addText(CI18N::get("uigcNormalTextureMode").toUtf8());
+			pCB->addText(CI18N::get("uigcLowTextureMode"));
+			pCB->addText(CI18N::get("uigcNormalTextureMode"));
 			if(ClientCfg.HDTextureInstalled)
-				pCB->addText(CI18N::get("uigcHighTextureMode").toUtf8());
+				pCB->addText(CI18N::get("uigcHighTextureMode"));
 		}
 
 		// Anisotropic Filtering
@@ -3110,7 +3110,7 @@ public:
 			sint maxAnisotropic = (sint)Driver->getAnisotropicFilterMaximum();
 
 			pCB->resetTexts();
-			pCB->addText(CI18N::get("uigcFxAnisotropicFilterNone").toUtf8());
+			pCB->addText(CI18N::get("uigcFxAnisotropicFilterNone"));
 
 			sint anisotropic = 2;
 			uint i = 1;
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 4e92c67fb..0eb240b7d 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -992,9 +992,7 @@ class CHandlerBrowse : public IActionHandler
 					}
 				}
 
-				ucstring ucparams(params);
-				CInterfaceManager::parseTokens(ucparams);
-				params = ucparams.toUtf8();
+				CInterfaceManager::parseTokens(params);
 				// go. NB: the action handler himself may translate params from utf8
 				CAHManager::getInstance()->runActionHandler(action, elementGroup, params);
 
@@ -2014,7 +2012,7 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 			if(pIS->canBuildSomeItemPart())
 			{
 				ucstring	fmt= CI18N::get("uihelpItemMPCraft");
-				ucstring	ipList;
+				std::string	ipList;
 				pIS->getItemPartListAsText(ipList);
 				strFindReplace(fmt, "%ip", ipList);
 				strFindReplace(itemText, "%craft", fmt);
@@ -2200,7 +2198,7 @@ static void	setupRawMaterialStats(CSheetHelpSetup &setup)
 
 					if(pIS->canBuildItemPart(faberType))
 					{
-						pCB->addText(RM_FABER_TYPE::toLocalString(faberType).toUtf8());
+						pCB->addText(RM_FABER_TYPE::toLocalString(faberType));
 					}
 				}
 
@@ -3165,7 +3163,7 @@ void setupListBrickHeader(CSheetHelpSetup &setup)
 	if(view)
 	{
 		view->setActive(true);
-		view->setTextFormatTaged(CI18N::get("uihelpPhraseHeaderBricks").toUtf8());
+		view->setTextFormatTaged(CI18N::get("uihelpPhraseHeaderBricks"));
 	}
 }
 
@@ -3476,73 +3474,73 @@ void setConsoModSuccessTooltip( CDBCtrlSheet *cs )
 	string ustr;
 	if( CSheetId(cs->getSheetId()).toString() == "mod_melee_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModMeleeSuccess").toUtf8();
+		ustr = CI18N::get("uittModMeleeSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:MELEE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_range_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModRangeSuccess").toUtf8();
+		ustr = CI18N::get("uittModRangeSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:RANGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_craft_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModCraftSuccess").toUtf8();
+		ustr = CI18N::get("uittModCraftSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:CRAFT", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_defense_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDefenseSuccess").toUtf8();
+		ustr = CI18N::get("uittModDefenseSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:DODGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_dodge_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDodgeSuccess").toUtf8();
+		ustr = CI18N::get("uittModDodgeSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:DODGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_parry_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModParrySuccess").toUtf8();
+		ustr = CI18N::get("uittModParrySuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:PARRY", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::common_ecosystem)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_desert_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModDesertForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModDesertForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::desert)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_forest_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModForestForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModForestForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::forest)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_lacustre_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModLacustreForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModLacustreForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::lacustre)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_jungle_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModJungleForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModJungleForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::jungle)+":FORAGE", false);
 	}
 	else
 	if( CSheetId(cs->getSheetId()).toString() == "mod_primary_root_forage_success.sbrick" )
 	{
-		ustr = CI18N::get("uittModPrimaryRootForageSuccess").toUtf8();
+		ustr = CI18N::get("uittModPrimaryRootForageSuccess");
 		nodeSM = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SUCCESS_MODIFIER:ECO:"+toString((uint8)ECOSYSTEM::primary_root)+":FORAGE", false);
 	}
 
@@ -3576,19 +3574,19 @@ public:
 		// special tooltip? (pvp outpost and xp catalyzer)
 		sint	specialTTId= getBonusMalusSpecialTT(cs);
 		if(specialTTId==BONUS_MALUS::XpCatalyser)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittXpBonus").toUtf8());
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittXpBonus"));
 		else if(specialTTId==BONUS_MALUS::OutpostPVPOn)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOn").toUtf8());
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOn"));
 		else if(specialTTId==BONUS_MALUS::OutpostPVPOutOfZone)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOutOfZone").toUtf8());
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostOutOfZone"));
 		else if(specialTTId==BONUS_MALUS::OutpostPVPInRound)
-			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostInRound").toUtf8());
+			CWidgetManager::getInstance()->setContextHelpText(CI18N::get("uittPvpOutpostInRound"));
 		else if(specialTTId==BONUS_MALUS::DeathPenalty)
 		{
 			CCDBNodeLeaf * node = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:USER:DEATH_XP_MALUS", false);
 			if( node )
 			{
-				string txt = CI18N::get("uittDeathPenalty").toUtf8();
+				string txt = CI18N::get("uittDeathPenalty");
 				strFindReplace(txt, "%dp", toString((100*node->getValue16())/254));
 				CWidgetManager::getInstance()->setContextHelpText(txt);
 			}
@@ -3600,7 +3598,7 @@ public:
 			std::string	str;
 			cs->getContextHelp(str);
 
-			str+= CI18N::get("uittAuraDisabled").toUtf8();
+			str+= CI18N::get("uittAuraDisabled");
 
 			// and replace the context help that is required.
 			CWidgetManager::getInstance()->setContextHelpText(str);
@@ -3838,7 +3836,7 @@ static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const s
 			CViewText	*statTitle= dynamic_cast<CViewText*>(groupStat->getElement(groupStat->getId()+":text" ));
 			CDBViewBar	*statValue= dynamic_cast<CDBViewBar*>(groupStat->getElement(groupStat->getId()+":bar" ));
 			if(statTitle)
-				statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType).toUtf8());
+				statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType));
 			if(statValue)
 				statValue->setValue(itemPart.Stats[i]);
 		}
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 22a30b424..6591472d4 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -1790,7 +1790,7 @@ void	CActionPhraseFaber::updateItemResult()
 				uint	sv= uint(statArray[i]*100);
 				if(statTitle)
 				{
-					statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType).toUtf8());
+					statTitle->setText(RM_FABER_STAT_TYPE::toLocalString(statType));
 					statTitle->setColor(usageColor);
 				}
 				if(statValueBar)
@@ -1810,12 +1810,12 @@ void	CActionPhraseFaber::updateItemResult()
 						// display something only for magic/protect stat
 						if( RM_FABER_STAT_TYPE::isMagicResistStat(RM_FABER_STAT_TYPE::TRMStatType(i)) ||
 							RM_FABER_STAT_TYPE::isMagicProtectStat(RM_FABER_STAT_TYPE::TRMStatType(i)) )
-							statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatActive").toUtf8());
+							statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatActive"));
 						else
 							statToolTip->setDefaultContextHelp(std::string());
 					}
 					else
-						statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatGrayed").toUtf8());
+						statToolTip->setDefaultContextHelp(CI18N::get("uiFaberStatGrayed"));
 				}
 			}
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
index 0fc03124a..e5f8cf1e4 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
@@ -189,7 +189,7 @@ void CBotChatPageDynamicMission::update()
 				else
 				{
 					// add a text to show the player that the text is being received
-					_ChoiceCB[k]->addText(NLMISC::CI18N::get("uiWaitingChoiceFromServer").toUtf8());
+					_ChoiceCB[k]->addText(NLMISC::CI18N::get("uiWaitingChoiceFromServer"));
 				}
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 913e47c2e..8fa8bd08e 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -600,12 +600,12 @@ void CBotChatPageTrade::updateTradeModal()
 					if (_BuyMean == MoneyGuildXP)
 					{
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney").toUtf8());
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
 					}
 					else
 					{
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildMoney").toUtf8());
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildMoney"));
 					}
 					return;
 				}
@@ -616,7 +616,7 @@ void CBotChatPageTrade::updateTradeModal()
 						if (confirmTradeGroup)	confirmTradeGroup->setActive(false);
 						if (cantTradeGroup)		cantTradeGroup->setActive(true);
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP").toUtf8());
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
 						return;
 					}
 				}
@@ -677,7 +677,7 @@ void CBotChatPageTrade::updateTradeModal()
 					if (cantTradeGroup) cantTradeGroup->setActive(true);
 					// can't sell more than what is in inventory
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBCNotAvailable"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBCNotAvailable").toUtf8());
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBCNotAvailable"));
 					ok= false;
 				}
 
@@ -692,7 +692,7 @@ void CBotChatPageTrade::updateTradeModal()
 						if (cantTradeGroup) cantTradeGroup->setActive(true);
 						// can't sell more than what is in inventory
 						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity").toUtf8());
+						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
 						ok= false;
 					}
 				}
@@ -710,7 +710,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney").toUtf8());
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
 							}
 							else if (_BuyMean == MoneyFactionPoints)
 							{
@@ -722,7 +722,7 @@ void CBotChatPageTrade::updateTradeModal()
 										confirmTradeGroup->setActive(false);
 										cantTradeGroup->setActive(true);
 										cantTradeButton->setText(CI18N::get("uiNotEnoughFP_"+PVP_CLAN::toString(fpType)));
-										cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughFP_"+PVP_CLAN::toString(fpType)).toUtf8());
+										cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughFP_"+PVP_CLAN::toString(fpType)));
 									}
 									else
 									{
@@ -745,7 +745,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughSkillPoints"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughSkillPoints").toUtf8());
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughSkillPoints"));
 							}
 							else
 							{
@@ -761,7 +761,7 @@ void CBotChatPageTrade::updateTradeModal()
 								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
 								if (cantTradeGroup) cantTradeGroup->setActive(true);
 								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP").toUtf8());
+								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
 							}
 							else
 							{
@@ -780,7 +780,7 @@ void CBotChatPageTrade::updateTradeModal()
 							if (cantTradeGroup) cantTradeGroup->setActive(true);
 							// can't sell less than the basic price
 							if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadResalePrice"));
-							if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadResalePrice").toUtf8());
+							if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadResalePrice"));
 						}
 						// else ok, can resell
 						else
@@ -812,7 +812,7 @@ void CBotChatPageTrade::updateTradeModal()
 				if (_SellDlgOn && priceWithoutFame == 0)
 				{
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiWontBuyThis"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittWontBuyThis").toUtf8());
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittWontBuyThis"));
 				}
 				else if (_SellDlgOn && priceWithoutFame == std::numeric_limits<uint64>::max())
 				{
@@ -821,7 +821,7 @@ void CBotChatPageTrade::updateTradeModal()
 				else if (quantity == 0 || quantity == std::numeric_limits<uint32>::max())
 				{
 					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity").toUtf8());
+					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
 				}
 			}
 		}
@@ -865,7 +865,7 @@ void CBotChatPageTrade::startBuyDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCall
 	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
 	if ( _BuyMean == Money && priceLabel )
 	{
-		priceLabel->setText( CI18N::get( "uiPrice" ).toUtf8() );
+		priceLabel->setText( CI18N::get( "uiPrice" ) );
 		priceLabel->setActive(true);
 	}
 	else
@@ -977,7 +977,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
 	if ( priceLabel )
 	{
-		priceLabel->setText( CI18N::get( "uiImmediatePrice" ).toUtf8() );
+		priceLabel->setText( CI18N::get( "uiImmediatePrice" ) );
 		priceLabel->setActive(true);
 	}
 
@@ -1003,7 +1003,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	{
 		confirmButton->setActive( !sheet->getLockedByOwner() );
 		confirmButton->setText(CI18N::get("uiSellImmediately"));
-		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton").toUtf8());
+		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
 	}
 
 	// set item or skill name
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 72a877cb7..354a4c833 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -472,25 +472,25 @@ void CChatWindow::setHeaderColor(const std::string &n)
 //=================================================================================
 void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstring &msg, uint numBlinks /*= 0*/)
 {
-	ucstring finalMsg;
+	string finalMsg;
 	CInterfaceProperty prop;
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
 	encodeColorTag(prop.getRGBA(), finalMsg, false);
 
-	ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+	string csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
 	finalMsg += csr + CI18N::get("youTell") + ": ";
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 	encodeColorTag(prop.getRGBA(), finalMsg, true);
-	finalMsg += msg;
+	finalMsg += msg.toUtf8();
 
-	ucstring s = CI18N::get("youTellPlayer");
-	strFindReplace(s, "%name", receiver);
+	string s = CI18N::get("youTellPlayer");
+	strFindReplace(s, "%name", receiver.toUtf8());
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	displayMessage(finalMsg, prop.getRGBA(), CChatGroup::tell, 0, numBlinks);
 	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 }
 
-void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, bool append)
+void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, std::string &text, bool append)
 {
 	// WARNING : The lookup table MUST contains 17 element (with the last doubled)
 	// because we add 7 to the 8 bit color before shifting to right in order to match color
@@ -498,8 +498,8 @@ void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, boo
 	// Have 17 entry remove the need for a %16 for each color component.
 	// By the way, this comment is more longer to type than to add the %16...
 	//
-	static ucchar ConvTable[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'F'};
-	ucstring str;
+	static char ConvTable[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'F'};
+	string str;
 	if (append)
 	{
 		str.reserve(7 + str.size());
@@ -1273,7 +1273,7 @@ public:
 	{
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(pCaller);
 		if (pEB == NULL) return;
-		ucstring text = pEB->getInputStringAsUtf16();
+		string text = pEB->getInputString();
 		// If the line is empty, do nothing
 		if(text.empty())
 			return;
@@ -1297,7 +1297,7 @@ public:
 		if(text[0] == '/')
 		{
 			CChatWindow::_ChatWindowLaunchingCommand = chat;
-			string str = text.toUtf8();
+			string str = text;
 			string cmdWithArgs = str.substr(1);
 
 			// Get the command name from the string, can contain spaces
diff --git a/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
index 278824753..0c8811842 100644
--- a/ryzom/client/src/interface_v3/chat_window.h
+++ b/ryzom/client/src/interface_v3/chat_window.h
@@ -156,7 +156,7 @@ public:
 	void displayLocalPlayerTell(const ucstring &receiver, const ucstring &msg, uint numBlinks = 0);
 
 	/// Encode a color tag '@{RGBA}' in the text. If append is true, append at end of text, otherwise, replace the text
-	static void encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, bool append=true);
+	static void encodeColorTag(const NLMISC::CRGBA &color, std::string &text, bool append=true);
 
 ///////////////////////////////////////////////////////////////////////////////////////
 protected:
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index c75dc3af3..5a1952735 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -1119,10 +1119,10 @@ void			CDBGroupBuildPhrase::updateAllDisplay(const CSPhraseCom &phrase)
 		{
 			word.InfoView->setActive(true);
 			if(i==0)
-				word.InfoView->setText( CI18N::get("uiTextHelpSelectRootBrick").toUtf8() );
+				word.InfoView->setText( CI18N::get("uiTextHelpSelectRootBrick") );
 			else
 				// start effect index at 1 (human readable :) )
-				word.InfoView->setText( CI18N::get("uiTextHelpSelectEffectBrick").toUtf8() + toString(i) );
+				word.InfoView->setText( CI18N::get("uiTextHelpSelectEffectBrick") + toString(i) );
 		}
 	}
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index fed48d1ac..0a474b650 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -1058,7 +1058,7 @@ void		CDBGroupListSheetText::CSheetChild::updateViewTextAsItem()
 		if(Ctrl->getType() == CCtrlSheetInfo::SheetType_Item)
 		{
 			if(!Ctrl->checkItemRequirement())
-				text= CI18N::get("uiItemCannotUseColor").toUtf8() + text;
+				text= CI18N::get("uiItemCannotUseColor") + text;
 		}
 
 		// For item, add some information
@@ -1070,17 +1070,17 @@ void		CDBGroupListSheetText::CSheetChild::updateViewTextAsItem()
 				// Add craft info for MP
 				if(pIS->Family==ITEMFAMILY::RAW_MATERIAL)
 				{
-					ucstring	ipList;
+					string	ipList;
 					pIS->getItemPartListAsText(ipList);
 					if(ipList.empty())
 					{
 						if(pIS->isUsedAsCraftRequirement())
-							text+= "\n" + CI18N::get("uiItemMpCraftRequirement").toUtf8();
+							text+= "\n" + CI18N::get("uiItemMpCraftRequirement");
 						else
-							text+= "\n" + CI18N::get("uiItemMpNoCraft").toUtf8();
+							text+= "\n" + CI18N::get("uiItemMpNoCraft");
 					}
 					else
-						text+= "\n" + CI18N::get("uiItemMpCanCraft").toUtf8() + ipList.toUtf8();
+						text+= "\n" + CI18N::get("uiItemMpCanCraft") + ipList;
 				}
 			}
 		}
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 0005d80f4..aec03653b 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -254,10 +254,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 	switch ( Ctrl->getSheetCategory() )
 	{
 		case CDBCtrlSheet::Item:		break;		// none for item. consider useless
-		case CDBCtrlSheet::Pact:		text= CI18N::get("uiBotChatPact").toUtf8() + text; break;
-		case CDBCtrlSheet::Skill:		text= CI18N::get("uiBotChatSkill").toUtf8() + text; break;
-		case CDBCtrlSheet::GuildFlag:	text= CI18N::get("uiBotChatSkill").toUtf8() + text; break;
-		case CDBCtrlSheet::Phrase:		text= CI18N::get("uiBotChatPhrase").toUtf8() + text; break;
+		case CDBCtrlSheet::Pact:		text= CI18N::get("uiBotChatPact") + text; break;
+		case CDBCtrlSheet::Skill:		text= CI18N::get("uiBotChatSkill") + text; break;
+		case CDBCtrlSheet::GuildFlag:	text= CI18N::get("uiBotChatSkill") + text; break;
+		case CDBCtrlSheet::Phrase:		text= CI18N::get("uiBotChatPhrase") + text; break;
 		default: break;
 	}
 
@@ -269,10 +269,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 			text += string("\n") + CUtfStringView(pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()))).toUtf8();
-			text += "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(pOBS->CostDapper));
-			text += CI18N::get("uiBotChatTime").toUtf8() + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute").toUtf8();
+			text += "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pOBS->CostDapper));
+			text += CI18N::get("uiBotChatTime") + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute");
 			if ((pOBS->CostTime % 60) != 0)
-				text += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond").toUtf8();
+				text += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond");
 		}
 	}
 
@@ -285,7 +285,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		bool melee,range;
 		pPM->getCombatWeaponRestriction(weaponRestriction, Ctrl->getSheetId(),melee,range);
 		// don't add also if no combat restriction
-		if(!weaponRestriction.empty() && weaponRestriction!=CI18N::get("uiawrSF"))
+		if(!weaponRestriction.empty() && weaponRestriction!=CI18N::getAsUtf16("uiawrSF"))
 		{
 			weaponRestriction= CI18N::get("uiPhraseWRHeader") + weaponRestriction;
 			text+= "\n" + weaponRestriction.toUtf8();
@@ -297,7 +297,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 	if(Ctrl->getType() == CCtrlSheetInfo::SheetType_Item)
 	{
 		if(!Ctrl->checkItemRequirement())
-			colorTag= CI18N::get("uiItemCannotUseColor").toUtf8();
+			colorTag= CI18N::get("uiItemCannotUseColor");
 	}
 
 	// For item, add some information
@@ -309,17 +309,17 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 			// Add craft info for MP
 			if(pIS->Family==ITEMFAMILY::RAW_MATERIAL)
 			{
-				ucstring	ipList;
+				string	ipList;
 				pIS->getItemPartListAsText(ipList);
 				if(ipList.empty())
 				{
 					if(pIS->isUsedAsCraftRequirement())
-						text+= "\n" + CI18N::get("uiItemMpCraftRequirement").toUtf8();
+						text+= "\n" + CI18N::get("uiItemMpCraftRequirement");
 					else
-						text+= "\n" + CI18N::get("uiItemMpNoCraft").toUtf8();
+						text+= "\n" + CI18N::get("uiItemMpNoCraft");
 				}
 				else
-					text+= "\n" + CI18N::get("uiItemMpCanCraft").toUtf8() + ipList.toUtf8();
+					text+= "\n" + CI18N::get("uiItemMpCanCraft") + ipList;
 			}
 		}
 	}
@@ -331,9 +331,9 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		if(Ctrl->getSheetCategory() == CDBCtrlSheet::Phrase)
 		{
 			if (LastPrice != -1)
-				text+= "\n" + CI18N::get("uiBotChatSkillPointCost").toUtf8() + toString(LastPrice);
+				text+= "\n" + CI18N::get("uiBotChatSkillPointCost") + toString(LastPrice);
 			else
-				text+= "\n" + CI18N::get("uiBotChatSkillPointCostNotReceived").toUtf8();
+				text+= "\n" + CI18N::get("uiBotChatSkillPointCostNotReceived");
 		}
 		else
 		{
@@ -345,8 +345,8 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 				const CItemSheet *pIS = Ctrl->asItemSheet();
 				if (pIS && pIS->Family == ITEMFAMILY::GUILD_OPTION)
 				{
-					text+= "\n" + CI18N::get("uiBotChatSkillPointCost").toUtf8() + toString(pIS->GuildOption.XPCost);
-					text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(pIS->GuildOption.MoneyCost));
+					text+= "\n" + CI18N::get("uiBotChatSkillPointCost") + toString(pIS->GuildOption.XPCost);
+					text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pIS->GuildOption.MoneyCost));
 					guildOption= true;
 				}
 			}
@@ -381,10 +381,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 					if (LastPrice > 0)
 					{
 						if(displayMulPrice)
-							text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString(sint32(LastPrice * priceFactor))) + " ("
+							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(sint32(LastPrice * priceFactor))) + " ("
 								+ NLMISC::formatThousands(toString( sint32(factor) * sint32(LastPrice * priceFactor) )) + ")";
 						else
-							text+= "\n" + CI18N::get("uiBotChatPrice").toUtf8() + NLMISC::formatThousands(toString( sint32(factor * LastPrice * priceFactor) ));
+							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString( sint32(factor * LastPrice * priceFactor) ));
 					}
 
 					if ((LastFactionPointPrice != 0) && (LastFactionType >= PVP_CLAN::BeginClans) && (LastFactionType <= PVP_CLAN::EndClans))
@@ -394,8 +394,8 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						else
 							text+= "\n";
 
-						text+= CI18N::get("uiBotChatFactionType").toUtf8() + PVP_CLAN::toString((PVP_CLAN::TPVPClan)LastFactionType)
-							+  CI18N::get("uiBotChatFactionPointPrice").toUtf8() + NLMISC::formatThousands(toString(LastFactionPointPrice));
+						text+= CI18N::get("uiBotChatFactionType") + PVP_CLAN::toString((PVP_CLAN::TPVPClan)LastFactionType)
+							+  CI18N::get("uiBotChatFactionPointPrice") + NLMISC::formatThousands(toString(LastFactionPointPrice));
 					}
 
 					// some additional info for resale
@@ -407,31 +407,31 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						{
 							// append price
 							if(pIS && pIS->Stackable>1 && zeFather->getMultiplyPriceByQuantityFlag())
-								text+= CI18N::get("uiBotChatRetirePrice").toUtf8() + NLMISC::formatThousands(toString(LastPriceRetire)) + " ("
+								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(LastPriceRetire)) + " ("
 									+ NLMISC::formatThousands(toString(factor * LastPriceRetire)) + ")";
 							else
-								text+= CI18N::get("uiBotChatRetirePrice").toUtf8() + NLMISC::formatThousands(toString(factor * LastPriceRetire));
+								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(factor * LastPriceRetire));
 							// set resale time left
-							std::string	fmt= CI18N::get("uiBotChatResaleTimeLeft").toUtf8();
+							std::string	fmt= CI18N::get("uiBotChatResaleTimeLeft");
 							strFindReplace(fmt, "%d", toString(LastResaleTimeLeft/RYZOM_DAY_IN_HOUR));
 							strFindReplace(fmt, "%h", toString(LastResaleTimeLeft%RYZOM_DAY_IN_HOUR));
 							text+= "\n" + fmt;
 							// force special color (according if retirable or not)
 							if(LastSellerType == BOTCHATTYPE::UserRetirable || LastSellerType == BOTCHATTYPE::ResaleAndUserRetirable)
-								colorTag= CI18N::get("uiItemUserSellColor").toUtf8();
+								colorTag= CI18N::get("uiItemUserSellColor");
 							else
-								colorTag= CI18N::get("uiItemUserSellColorNotRetirable").toUtf8();
+								colorTag= CI18N::get("uiItemUserSellColorNotRetirable");
 						}
 
 						// Append (NPC) tag if NPC item
 						if(LastSellerType == BOTCHATTYPE::NPC)
 						{
-							text+= "\n" + CI18N::get("uiBotChatNPCTag").toUtf8();
+							text+= "\n" + CI18N::get("uiBotChatNPCTag");
 						}
 						// else display the name of the vendor (not if this is the player himself, to avoid flood)
 						else if (LastSellerType == BOTCHATTYPE::Resale)
 						{
-							text+= "\n" + CI18N::get("uiBotChatVendorTag").toUtf8() + VendorNameString.toUtf8();
+							text+= "\n" + CI18N::get("uiBotChatVendorTag") + VendorNameString.toUtf8();
 						}
 					}
 				}
@@ -441,14 +441,14 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 					if(zeFather->sellerTypeWanted() &&
 						(LastSellerType == BOTCHATTYPE::User || LastSellerType == BOTCHATTYPE::UserRetirable) )
 					{
-						text+= "\n" + CI18N::get("uiItemSold").toUtf8();
+						text+= "\n" + CI18N::get("uiItemSold");
 						// force special color
-						colorTag= CI18N::get("uiItemSoldColor").toUtf8();
+						colorTag= CI18N::get("uiItemSoldColor");
 					}
 					// error case
 					else
 					{
-						text+= "\n" + CI18N::get("uiPriceNotReceived").toUtf8();
+						text+= "\n" + CI18N::get("uiPriceNotReceived");
 					}
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index f00b72cb2..b43f50a89 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -425,7 +425,7 @@ void CGroupCompas::draw()
 	if (toolTip)
 	{
 		if (displayedTarget.getType() != CCompassTarget::North)
-			toolTip->setDefaultContextHelp(CI18N::get("uittCompassDistance").toUtf8());
+			toolTip->setDefaultContextHelp(CI18N::get("uittCompassDistance"));
 		else
 			toolTip->setDefaultContextHelp(std::string());
 	}
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index e18cf0cc9..bd339d19d 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -1122,7 +1122,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 			{
 				CInterfaceGroup *group = getGroup ("right");
 				CForageSourceCL *forageSource = static_cast<CForageSourceCL*>(_Entity);
-				string txt( CI18N::get( "uittForageContent" ).toUtf8() + toString( ": %u", forageSource->getCurrentQuantity() ) );
+				string txt( CI18N::get( "uittForageContent" ) + toString( ": %u", forageSource->getCurrentQuantity() ) );
 				CCtrlBase *toolTip = group->getCtrl ("tt1");
 				if ( toolTip )
 					toolTip->setDefaultContextHelp( txt );
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index cdda9e915..ac70c57cc 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -697,7 +697,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 		{
 			_HomeLM->setParent(this);
 			addCtrl(_HomeLM);
-			_HomeLM->setDefaultContextHelp(NLMISC::CI18N::get("uiHome").toUtf8());
+			_HomeLM->setDefaultContextHelp(NLMISC::CI18N::get("uiHome"));
 		}
 
 		// create animals Landmark: pack Animals.
@@ -709,7 +709,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 			{
 				_AnimalLM[i]->setParent(this);
 				addCtrl(_AnimalLM[i]);
-				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uiPATitleMount%d", i+1)).toUtf8());
+				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uiPATitleMount%d", i+1)));
 			}
 		}
 
@@ -722,7 +722,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 			{
 				_TeammateLM[i]->setParent(this);
 				addCtrl(_TeammateLM[i]);
-				_TeammateLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uittLMTeam%d",i)).toUtf8());
+				_TeammateLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(NLMISC::toString("uittLMTeam%d",i)));
 			}
 		}
 	}
@@ -1201,7 +1201,7 @@ void CGroupMap::checkCoords()
 					CEntityCL *sel = EntitiesMngr.entity(UserEntity->selection());
 					if (sel)
 					{
-						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint").toUtf8() + sel->removeTitleAndShardFromName(sel->getEntityName()).toUtf8());
+						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint") + sel->removeTitleAndShardFromName(sel->getEntityName()).toUtf8());
 					}
 				}
 			}
@@ -1374,7 +1374,7 @@ void CGroupMap::checkCoords()
 					case ANIMAL_TYPE::Packer: sPrefix = "uiPATitlePacker"; break;
 					case ANIMAL_TYPE::Demon:  sPrefix = "uiPATitleDemon";  break;
 				}
-				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(sPrefix+toString(i+1)).toUtf8());
+				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(sPrefix+toString(i+1)));
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index a6b24e670..331b0ebfe 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -837,13 +837,13 @@ class CAHGuildSheetOpen : public IActionHandler
 				if (pViewGrade != NULL)
 				{
 					if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::Leader)
-						pViewGrade->setText (CI18N::get("uiGuildLeader").toUtf8());
+						pViewGrade->setText (CI18N::get("uiGuildLeader"));
 					else if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::HighOfficer)
-						pViewGrade->setText (CI18N::get("uiGuildHighOfficer").toUtf8());
+						pViewGrade->setText (CI18N::get("uiGuildHighOfficer"));
 					else if (rGuildMembers[i].Grade == EGSPD::CGuildGrade::Officer)
-						pViewGrade->setText (CI18N::get("uiGuildOfficer").toUtf8());
+						pViewGrade->setText (CI18N::get("uiGuildOfficer"));
 					else
-						pViewGrade->setText (CI18N::get("uiGuildMember").toUtf8());
+						pViewGrade->setText (CI18N::get("uiGuildMember"));
 				}
 
 				// online?
@@ -857,17 +857,17 @@ class CAHGuildSheetOpen : public IActionHandler
 					case ccs_online:
 						onlineView->setTexture("w_online.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnline").toUtf8());
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnline"));
 						break;
 					case ccs_online_abroad:
 						onlineView->setTexture("w_online_abroad.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnlineAbroad").toUtf8());
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnlineAbroad"));
 						break;
 					default:
 						onlineView->setTexture("w_offline.tga");
 						if (toolTip)
-							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOffline").toUtf8());
+							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOffline"));
 						break;
 					}
 				}
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 949a599b4..3bae5ccbc 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1535,8 +1535,8 @@ void CInterfaceManager::updateFrameEvents()
 			CCtrlBase *pTooltip= dynamic_cast<CCtrlBase*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather_tt"));
 			if (pTooltip != NULL)
 			{
-				string tt =	toString("%02d", WeatherManager.getNextWeatherHour()) + CI18N::get("uiMissionTimerHour").toUtf8() +
-								" - " + CI18N::get("uiHumidity").toUtf8() + " " +
+				string tt =	toString("%02d", WeatherManager.getNextWeatherHour()) + CI18N::get("uiMissionTimerHour") +
+								" - " + CI18N::get("uiHumidity") + " " +
 								toString("%d", (uint)(roundWeatherValue(WeatherManager.getNextWeatherValue()) * 100.f)) + "%";
 				pTooltip->setDefaultContextHelp(tt);
 			}
@@ -4040,11 +4040,11 @@ char* CInterfaceManager::getTimestampHuman(const char* format /* "[%H:%M:%S] " *
  *
  * All \d's in default parameter remove a following character.
  */
-bool CInterfaceManager::parseTokens(ucstring& ucstr)
+bool CInterfaceManager::parseTokens(string& ucstr)
 {
-	ucstring str = ucstr;
-	ucstring start_token("$");
-	ucstring end_token("$");
+	string str = ucstr;
+	string start_token("$");
+	string end_token("$");
 	size_t start_pos = 0;
 	size_t end_pos = 1;
 
@@ -4061,8 +4061,8 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		// Get the whole token substring first
 		end_pos = str.find(end_token, start_pos + 1);
 
-		if ((start_pos == ucstring::npos) ||
-			(end_pos   == ucstring::npos) ||
+		if ((start_pos == string::npos) ||
+			(end_pos   == string::npos) ||
 			(end_pos   <= start_pos + 1))
 		{
 			// Wrong formatting; give up on this one.
@@ -4080,19 +4080,19 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 			continue;
 		}
 
-		ucstring token_whole = str.luabind_substr(start_pos, end_pos - start_pos + 1);
-		ucstring token_string = token_whole.luabind_substr(1, token_whole.length() - 2);
-		ucstring token_replacement = token_whole;
-		ucstring token_default = token_whole;
+		string token_whole = str.substr(start_pos, end_pos - start_pos + 1);
+		string token_string = token_whole.substr(1, token_whole.length() - 2);
+		string token_replacement = token_whole;
+		string token_default = token_whole;
 
-		ucstring token_subject;
-		ucstring token_param;
+		string token_subject;
+		string token_param;
 
 		// Does the token have a parameter?
 		// If not it is 'name' by default
-		vector<ucstring> token_vector;
-		vector<ucstring> param_vector;
-		splitUCString(token_string, ucstring("."), token_vector);
+		vector<string> token_vector;
+		vector<string> param_vector;
+		splitString(token_string, ".", token_vector);
 		if (token_vector.empty())
 		{
 			// Wrong formatting; give up on this one.
@@ -4102,23 +4102,23 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		token_subject = token_vector[0];
 		if (token_vector.size() == 1)
 		{
-			splitUCString(token_subject, ucstring("/"), param_vector);
-			token_subject = !param_vector.empty() ? param_vector[0] : ucstring("");
-			token_param = ucstring("name");
+			splitString(token_subject, "/", param_vector);
+			token_subject = !param_vector.empty() ? param_vector[0] : string();
+			token_param = string("name");
 		}
 		else if (token_vector.size() > 1)
 		{
 			token_param = token_vector[1];
-			if (token_param.luabind_substr(0, 3) != ucstring("gs("))
+			if (token_param.substr(0, 3) != "gs(")
 			{
-				splitUCString(token_vector[1], ucstring("/"), param_vector);
-				token_param = !param_vector.empty() ? param_vector[0] : ucstring("");
+				splitString(token_vector[1], "/", param_vector);
+				token_param = !param_vector.empty() ? param_vector[0] : string();
 			}
 		}
 
 		// Get any default value, if not gs
 		sint extra_replacement = 0;
-		if (token_param.luabind_substr(0, 3) != ucstring("gs("))
+		if (token_param.substr(0, 3) != "gs(")
 		{
 			if (param_vector.size() == 2)
 			{
@@ -4126,9 +4126,9 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 				token_replacement = param_vector[1];
 				// Delete following chars for every '\d' in default
 				string::size_type token_replacement_pos;
-				while ((token_replacement_pos = token_replacement.find(ucstring("\\d"))) != string::npos)
+				while ((token_replacement_pos = token_replacement.find(string("\\d"))) != string::npos)
 				{
-					token_replacement.replace(token_replacement_pos, 2, ucstring(""));
+					token_replacement.replace(token_replacement_pos, 2, string());
 					extra_replacement++;
 				}
 				token_default = token_replacement;
@@ -4137,17 +4137,17 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 
 		CEntityCL *pTokenSubjectEntity = NULL;
 
-		if (token_subject == ucstring("me"))
+		if (token_subject == "me")
 		{
 			pTokenSubjectEntity = static_cast<CEntityCL*>(UserEntity);
 		}
-		else if (token_subject == ucstring("t"))
+		else if (token_subject == "t")
 		{
 			// Target
 			uint targetSlot = UserEntity->targetSlot();
 			pTokenSubjectEntity = EntitiesMngr.entity(targetSlot);
 		}
-		else if (token_subject == ucstring("tt"))
+		else if (token_subject == "tt")
 		{
 			// Target's target
 			uint targetSlot = UserEntity->targetSlot();
@@ -4165,11 +4165,11 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 			}
 		}
 		else if ((token_subject.length() == 3) &&
-			     (token_subject.luabind_substr(0, 2) == ucstring("tm")))
+			     (token_subject.substr(0, 2) == "tm"))
 		{
 			// Teammate
 			uint indexInTeam = 0;
-			fromString(token_subject.luabind_substr(2, 1).toString(), indexInTeam);
+			fromString(token_subject.substr(2, 1), indexInTeam);
 
 			// Make 0-based
 			--indexInTeam;
@@ -4205,22 +4205,22 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		if (pTokenSubjectEntity != NULL)
 		{
 			// Parse the parameter
-			if (token_param == ucstring("name"))
+			if (token_param == "name")
 			{
-				ucstring name = pTokenSubjectEntity->getDisplayName();
+				string name = pTokenSubjectEntity->getDisplayName().toUtf8();
 				// special case where there is only a title, very rare case for some NPC
 				if (name.empty())
 				{
-					name = pTokenSubjectEntity->getTitle();
+					name = pTokenSubjectEntity->getTitle().toUtf8();
 				}
 				token_replacement = name.empty() ? token_replacement : name;
 			}
-			else if (token_param == ucstring("title"))
+			else if (token_param == "title")
 			{
-				ucstring title = pTokenSubjectEntity->getTitle();
+				string title = pTokenSubjectEntity->getTitle().toUtf8();
 				token_replacement = title.empty() ? token_replacement : title;
 			}
-			else if (token_param == ucstring("race"))
+			else if (token_param == "race")
 			{
 				CCharacterCL *pC = dynamic_cast<CCharacterCL*>(pTokenSubjectEntity);
 				if (pC)
@@ -4228,27 +4228,27 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 					EGSPD::CPeople::TPeople race = pC->people();
 					if (race >= EGSPD::CPeople::Playable && race <= EGSPD::CPeople::EndPlayable)
 					{
-						ucstring srace = NLMISC::CI18N::get("io" + EGSPD::CPeople::toString(race));
+						string srace = NLMISC::CI18N::get("io" + EGSPD::CPeople::toString(race));
 						token_replacement = srace.empty() ? token_replacement : srace;
 					}
 				}
 			}
-			else if (token_param == ucstring("guild"))
+			else if (token_param == "guild")
 			{
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 				ucstring ucGuildName;
 				if (pSMC->getString(pTokenSubjectEntity->getGuildNameID(), ucGuildName))
 				{
-					token_replacement = ucGuildName.empty() ? token_replacement : ucGuildName;
+					token_replacement = ucGuildName.empty() ? token_replacement : ucGuildName.toUtf8();
 				}
 			}
-			else if (token_param.luabind_substr(0, 3) == ucstring("gs(") &&
-				token_param.luabind_substr(token_param.length() - 1 , 1) == ucstring(")"))
+			else if (token_param.substr(0, 3) == "gs(" &&
+				token_param.substr(token_param.length() - 1 , 1) == ")")
 			{
 				// Gender string
-				vector<ucstring> strList;
-				ucstring gender_string = token_param.luabind_substr(3, token_param.length() - 4);
-				splitUCString(gender_string, ucstring("/"), strList);
+				vector<string> strList;
+				string gender_string = token_param.substr(3, token_param.length() - 4);
+				splitString(gender_string, "/", strList);
 
 				if (strList.size() <= 1)
 				{
@@ -4277,8 +4277,8 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		{
 			// Nothing to replace; show message and exit
 			CInterfaceManager *im = CInterfaceManager::getInstance();
-			ucstring message = ucstring(CI18N::get("uiUntranslatedToken"));
-			message.replace(message.find(ucstring("%s")), 2, token_whole);
+			string message = CI18N::get("uiUntranslatedToken");
+			message.replace(message.find("%s"), 2, token_whole);
 			im->displaySystemInfo(message);
 			return false;
 		}
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 0b89584bc..342b8a7be 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -448,7 +448,7 @@ public:
 
 	/** Parses any tokens in the ucstring like $t$ or $g()$
 	 */
-	static bool parseTokens(ucstring& ucstr);
+	static bool parseTokens(std::string& ucstr);
 
 // ------------------------------------------------------------------------------------------------
 private:
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index e4dbb0f44..b36d51866 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -1050,7 +1050,7 @@ int CLuaIHMRyzom::initEmotesMenu(CLuaState &ls)
 						// Create a line
 						pMenu->addLine(CI18N::get(sTmp), "lua",
 							luaParams + "('" + sEmoteId + "', '" + toString(CI18N::get(sTmp)) + "')", sTmp);
-						emoteList[sEmoteId] = (toLower(CI18N::get(sTmp))).toUtf8();
+						emoteList[sEmoteId] = (toLower(CI18N::get(sTmp)));
 					}
 				}
 
@@ -3629,7 +3629,7 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 		if (!msg.empty())
 		{
 			// Parse any tokens in the message.
-			ucstring msg_modified = msg;
+			string msg_modified = msg.toUtf8();
 
 			// Parse any tokens in the text
 			if (! CInterfaceManager::parseTokens(msg_modified))
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 9fce02ef8..d62a8746a 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -492,7 +492,7 @@ void CModalContainerEditCmd::activate()
 					}
 					if (found)
 					{
-						pCB->addText(CI18N::get(rVCat[i].LocalizedName).toUtf8());
+						pCB->addText(CI18N::get(rVCat[i].LocalizedName));
 						CurrentEditCmdCategories.push_back(rVCat[i].Name);
 					}
 				}
@@ -689,7 +689,7 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 			if (noParam == 0)	sText = WinName+VIEW_EDITCMD_FIRST_PARAM_NAME;
 			else				sText = WinName+VIEW_EDITCMD_SECOND_PARAM_NAME;
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sText));
-			if (pVT != NULL) pVT->setText(CI18N::get(pBA->Parameters[i].LocalizedName).toUtf8());
+			if (pVT != NULL) pVT->setText(CI18N::get(pBA->Parameters[i].LocalizedName));
 			noParam++;
 		}
 	}
@@ -778,7 +778,7 @@ void CModalContainerEditCmd::invalidCurrentCommand()
 	{
 		// Dont display key shortcut if we are in creation mode
 		pVT= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId( WinName+VIEW_EDITCMD_TEXT_KEY ));
-		if (pVT != NULL) pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
+		if (pVT != NULL) pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 
 		// Deactivate the key definer text
 		pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_TEXT_KEY));
@@ -897,7 +897,7 @@ void CModalContainerEditCmd::validCurrentCommand()
 				CurrentEditCmdLine.Combo.Key = KeyCount;
 				CurrentEditCmdLine.Combo.KeyButtons = noKeyButton;
 				// Display not assigned text
-				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
+				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 				// Do not display the ok button
 				CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
 				if (pCB != NULL) pCB->setFrozen (true);
@@ -1033,7 +1033,7 @@ void CModalContainerEditCmd::onChangeCategory()
 			{
 				if (rBA.isUsableInCurrentContext())
 				{
-					pCB->addText(CI18N::get(rBA.LocalizedName).toUtf8());
+					pCB->addText(CI18N::get(rBA.LocalizedName));
 				}
 			}
 		}
@@ -1111,7 +1111,7 @@ void CModalContainerEditCmd::onChangeAction()
 
 			pViewParamName = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sViewText));
 			if (pViewParamName != NULL)
-				pViewParamName->setText (CI18N::get(rP.LocalizedName).toUtf8());
+				pViewParamName->setText (CI18N::get(rP.LocalizedName));
 		}
 
 		if (rP.Type == CBaseAction::CParameter::Constant)
@@ -1131,7 +1131,7 @@ void CModalContainerEditCmd::onChangeAction()
 					if (ActionsContext.matchContext(rVal.Contexts))
 					{
 						if (NLMISC::startsWith(rVal.LocalizedValue, "ui"))
-							pCB->addText(CI18N::get(rVal.LocalizedValue).toUtf8());
+							pCB->addText(CI18N::get(rVal.LocalizedValue));
 						else
 							pCB->addText(rVal.LocalizedValue);
 					}
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 12b066fff..4b0d2fee9 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -895,7 +895,7 @@ public:
 		if (pVT != NULL)
 		{
 			if (pMCM->CurrentEditMacro.Combo.Key == KeyCount)
-				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
+				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 			else
 				pVT->setText(pMCM->CurrentEditMacro.Combo.toUCString().toUtf8());
 		}
@@ -1005,7 +1005,7 @@ void addMacroLine (CGroupList *pParent, uint macNb, const CMacroCmd &macro)
 		if (macro.Combo.Key != KeyCount)
 			pVT->setText(macro.Combo.toUCString().toUtf8());
 		else
-			pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT).toUtf8());
+			pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 	}
 
 	pNewMacro->setParent (pParent);
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index a0a7aed66..f7f9e05f2 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -492,7 +492,7 @@ void CMusicPlayer::clearPlayingInfo()
 {
 	if (_Songs.empty())
 	{
-		updatePlayingInfo(CI18N::get("uiNoFiles").toUtf8());
+		updatePlayingInfo(CI18N::get("uiNoFiles"));
 	}
 	else
 	{
@@ -632,7 +632,7 @@ void CMusicPlayer::createPlaylistFromMusic()
 	join(extensions, ", ", extlist);
 	extlist += ", m3u, m3u8";
 
-	std::string msg(CI18N::get("uiMk_system6").toUtf8());
+	std::string msg(CI18N::get("uiMk_system6"));
 	msg += ": " + newPath + " (" + extlist + ")";
 	CInterfaceManager::getInstance()->displaySystemInfo(ucstring::makeFromUtf8(msg), "SYS");
 	nlinfo("%s", msg.c_str());
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index b380c12b0..30a468975 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -471,14 +471,14 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 		return;
 	}
 
- 	ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
-	ucstring finalMsg = csr + CI18N::get("youTell") + ": " + msg;
+ 	string csr = CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "";
+	string finalMsg = csr + CI18N::get("youTell") + ": " + msg.toUtf8();
 	// display msg with good color
 	CInterfaceProperty prop;
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 
-	ucstring s = CI18N::get("youTellPlayer");
-	strFindReplace(s, "%name", receiver);
+	string s = CI18N::get("youTellPlayer");
+	strFindReplace(s, "%name", receiver.toUtf8());
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
 	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
@@ -759,17 +759,17 @@ void CPeopleList::setOnline(uint index, TCharConnectionState online)
 			case ccs_online:
 				onlineView->setTexture("w_online.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnline").toUtf8());
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnline"));
 				break;
 			case ccs_online_abroad:
 				onlineView->setTexture("w_online_abroad.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnlineAbroad").toUtf8());
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOnlineAbroad"));
 				break;
 			default:
 				onlineView->setTexture("w_offline.tga");
 				if (toolTip)
-					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOffline").toUtf8());
+					toolTip->setDefaultContextHelp(CI18N::get("uittFriendsOffline"));
 				break;
 			}
 		}
@@ -876,7 +876,7 @@ class CHandlerContactEntry : public IActionHandler
 	{
 		CGroupEditBox *pEB = dynamic_cast<CGroupEditBox*>(pCaller);
 		if (pEB == NULL) return;
-		ucstring text = pEB->getInputStringAsUtf16();
+		string text = pEB->getInputString();
 		// If the line is empty, do nothing
 		if(text.empty())
 			return;
@@ -892,8 +892,7 @@ class CHandlerContactEntry : public IActionHandler
 		if(text[0] == '/')
 		{
 			CChatWindow::_ChatWindowLaunchingCommand = NULL; // no CChatWindow instance there ..
-			// TODO : have NLMISC::ICommand accept unicode strings
-			std::string str = text.toUtf8().substr(1);
+			std::string str = text.substr(1);
 			NLMISC::ICommand::execute( str, g_log );
 			pEB->setInputString (std::string());
 			return;
@@ -904,10 +903,10 @@ class CHandlerContactEntry : public IActionHandler
 		CGroupContainer *gc = static_cast< CGroupContainer* >( pCaller->getParent()->getEnclosingContainer() );
 
 		// title gives the name of the player
-		ucstring playerName = gc->getUCTitle();
+		string playerName = gc->getUCTitle().toUtf8();
 
 		// Simply do a tell on the player
-		ChatMngr.tell(playerName.toString(), text);
+		ChatMngr.tell(playerName, text);
 		pEB->setInputString (std::string());
 		if (gc)
 		{
@@ -940,18 +939,18 @@ class CHandlerContactEntry : public IActionHandler
 				CChatGroupWindow *pWin = PeopleInterraction.getChatGroupWindow();
 				CInterfaceProperty prop;
 				prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
-				ucstring final;
+				string final;
 				CChatWindow::encodeColorTag(prop.getRGBA(), final, false);
 
-				ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+				string csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
 				final += csr + CI18N::get("youTell")+": ";
 				prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 				CChatWindow::encodeColorTag(prop.getRGBA(), final, true);
 				final += text;
 				pWin->displayTellMessage(final, prop.getRGBA(), pWin->getFreeTellerName(str));
 
-				ucstring s = CI18N::get("youTellPlayer");
-				strFindReplace(s, "%name", pWin->getFreeTellerName(str));
+				string s = CI18N::get("youTellPlayer");
+				strFindReplace(s, "%name", pWin->getFreeTellerName(str).toUtf8());
 				strFindReplace(final, CI18N::get("youTell"), s);
 				CInterfaceManager::getInstance()->log(final, CChatGroup::groupTypeToString(CChatGroup::tell));
 			}
diff --git a/ryzom/client/src/interface_v3/skill_manager.cpp b/ryzom/client/src/interface_v3/skill_manager.cpp
index 5e91f6f6e..936db39a7 100644
--- a/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -588,7 +588,7 @@ void CSkillManager::checkTitleUnblocked(CHARACTER_TITLE::ECharacterTitle i, bool
 				string titleStr = CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)i);
 				bool womenTitle = (UserEntity && UserEntity->getGender() == GSGENDER::female);
 				const ucstring newtitle(CStringManagerClient::getTitleLocalizedName(titleStr, womenTitle));
-				CAHManager::getInstance()->runActionHandler("message_popup", NULL, "text1="+newtitle.toUtf8()+"|text0="+CI18N::get("uiNewTitleBold").toUtf8());
+				CAHManager::getInstance()->runActionHandler("message_popup", NULL, "text1="+newtitle.toUtf8()+"|text0="+CI18N::get("uiNewTitleBold"));
 			}
 			else
 			{
diff --git a/ryzom/client/src/interface_v3/task_bar_manager.cpp b/ryzom/client/src/interface_v3/task_bar_manager.cpp
index 7c9bb2a45..fcc4c30f2 100644
--- a/ryzom/client/src/interface_v3/task_bar_manager.cpp
+++ b/ryzom/client/src/interface_v3/task_bar_manager.cpp
@@ -182,7 +182,7 @@ public:
 				if (it != acmap.end())
 					pVT->setText(it->second.toUCString().toUtf8());
 				else
-					pVT->setText(CI18N::get("uiNotAssigned").toUtf8());
+					pVT->setText(CI18N::get("uiNotAssigned"));
 			}
 		}
 	}
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 926ed61b1..3d7a8a4c8 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -1931,9 +1931,9 @@ int CPatchManager::validateProgress(void *foo, double t, double d, double /* ult
 
 	if (units.empty())
 	{
-		units.push_back(CI18N::get("uiByte").toUtf8());
-		units.push_back(CI18N::get("uiKb").toUtf8());
-		units.push_back(CI18N::get("uiMb").toUtf8());
+		units.push_back(CI18N::get("uiByte"));
+		units.push_back(CI18N::get("uiKb"));
+		units.push_back(CI18N::get("uiMb"));
 	}
 
 	CPatchManager *pPM = CPatchManager::getInstance();
diff --git a/ryzom/client/src/main_loop_debug.cpp b/ryzom/client/src/main_loop_debug.cpp
index ac29a3984..70616e1f7 100644
--- a/ryzom/client/src/main_loop_debug.cpp
+++ b/ryzom/client/src/main_loop_debug.cpp
@@ -716,7 +716,7 @@ static std::string getActionKey(const char* name, const char* param = "")
 	if (ite != acmap.end())
 		return ite->second.toUCString().toString();
 
-	return CI18N::get("uiNotAssigned").toString();
+	return CI18N::get("uiNotAssigned");
 }
 
 //---------------------------------------------------
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index d1744f3ff..8d743074d 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -614,23 +614,23 @@ static CInterfaceChatDisplayer	InterfaceChatDisplayer;
 void CInterfaceChatDisplayer::colorizeSender(ucstring &text, const ucstring &senderName, CRGBA baseColor)
 {
 	// find the sender/text separator to put color tags
-	ucstring::size_type pos = senderName.length() - 1;
+	ucstring::size_type pos = senderName.toUtf8().length() - 1;
 	if (pos != ucstring::npos)
 	{
-		ucstring str;
+		string str;
 
 		CInterfaceProperty prop;
 		prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
 
 		CChatWindow::encodeColorTag(prop.getRGBA(), str, false);
 
-		str += text.substr(0, pos+1);
+		str += text.toUtf8().substr(0, pos+1);
 
 		CChatWindow::encodeColorTag(baseColor, str, true);
 
-		str += text.substr(pos+1);
+		str += text.toUtf8().substr(pos+1);
 
-		text.swap(str);
+		text.fromUtf8(str);
 	}
 }
 
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index 133f5abd2..48d642aea 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -354,12 +354,12 @@ void CProgress::internalProgress (float value)
 
 					// Print some more info
 					uint32 day = RT.getRyzomDay();
-					str = toString (CI18N::get ("uiTipsTeleport").toUtf8().c_str(),
-						CI18N::get (LoadingContinent->LocalizedName).toUtf8().c_str(),
+					str = toString (CI18N::get ("uiTipsTeleport").c_str(),
+						CI18N::get (LoadingContinent->LocalizedName).c_str(),
 						day,
 						(uint)RT.getRyzomTime(),
-						CI18N::get ("uiSeason"+toStringEnum(CRyzomTime::getSeasonByDay(day))).toUtf8().c_str(),
-						CI18N::get (WeatherManager.getCurrWeatherState().LocalizedName).toUtf8().c_str());
+						CI18N::get ("uiSeason"+toStringEnum(CRyzomTime::getSeasonByDay(day))).c_str(),
+						CI18N::get (WeatherManager.getCurrWeatherState().LocalizedName).c_str());
 					ucstring ucstr;
 					ucstr.fromUtf8 (str);
 					TextContext->setHotSpot(UTextContext::MiddleBottom);
diff --git a/ryzom/client/src/r2/auto_group.cpp b/ryzom/client/src/r2/auto_group.cpp
index 7372d6e48..7bbeb39d3 100644
--- a/ryzom/client/src/r2/auto_group.cpp
+++ b/ryzom/client/src/r2/auto_group.cpp
@@ -281,7 +281,7 @@ void CAutoGroup::group(CObject *newEntityDesc, const NLMISC::CVectorD &createPos
 		R2::getEditor().getEnv()["PaletteIdToGroupTranslation"][newEntityDesc->getAttr("Base")->toString()].push();
 		if (ls.isString(-1))
 			readableName.fromUtf8(ls.toString(-1));
-		ucstring ucGroupName = ucstring(readableName + " " + CI18N::get("uiR2EDNameGroup").toUtf8());
+		ucstring ucGroupName = ucstring(readableName + " " + CI18N::get("uiR2EDNameGroup"));
 
 		newGroup->set("Name", getEditor().genInstanceName(ucGroupName).toUtf8());
 		getEditor().getDMC().requestInsertNode(destGroup->getParentAct()->getId(),
diff --git a/ryzom/client/src/r2/displayer_visual_entity.cpp b/ryzom/client/src/r2/displayer_visual_entity.cpp
index 6e09e580e..344d2a8fa 100644
--- a/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -994,7 +994,7 @@ void CDisplayerVisualEntity::updateName()
 		}
 		std::string firstPart;
 		if(actNb>0)
-			firstPart = CI18N::get("uiR2EDDefaultActTitle").toString() + " " + NLMISC::toString(actNb);
+			firstPart = CI18N::get("uiR2EDDefaultActTitle") + " " + NLMISC::toString(actNb);
 
 		if (act->isString("Name"))
 			actName = act->toString("Name");
@@ -1006,7 +1006,7 @@ void CDisplayerVisualEntity::updateName()
 	}
 	else
 	{
-		actName = CI18N::get("uiR2EDBaseAct").toString();
+		actName = CI18N::get("uiR2EDBaseAct");
 	}
 
 	actName = NLMISC::toString(" [%s]", actName.c_str());
diff --git a/ryzom/client/src/r2/displayer_visual_group.cpp b/ryzom/client/src/r2/displayer_visual_group.cpp
index a84c6bfa4..5cf2c542d 100644
--- a/ryzom/client/src/r2/displayer_visual_group.cpp
+++ b/ryzom/client/src/r2/displayer_visual_group.cpp
@@ -76,7 +76,7 @@ public:
 	virtual void		getContextHelp(std::string &help) const
 	{
 		help = Instance.getDisplayName().toUtf8();
-		if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
+		if (help == NLMISC::CI18N::get("uiR2EDNoName"))
 			help.clear();
 	}
 	bool				emptyContextHelp() const { return true; }
@@ -125,7 +125,7 @@ public:
 	virtual void		getContextHelp(std::string &help) const
 	{
 		help = Instance.getDisplayName().toUtf8();
-		if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
+		if (help == NLMISC::CI18N::get("uiR2EDNoName"))
 			help.clear();
 	}
 	bool				emptyContextHelp() const { return true; }
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index a708bc2a4..d3611067a 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -1761,7 +1761,7 @@ void CEditor::waitScenarioScreen()
 				// Display the firewall alert string
 				CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:r2ed_connecting:title"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiFirewallAlert").toUtf8()+"...");
+					pVT->setText(CI18N::get("uiFirewallAlert")+"...");
 
 				// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
 				nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@@ -1853,8 +1853,8 @@ void CEditor::waitScenarioScreen()
 				if (pVT != NULL)
 				{
 					pVT->setMultiLine( true );
-					pVT->setText(CI18N::get("uiFirewallFail").toUtf8()+".\n"+
-								  CI18N::get("uiFirewallAlert").toUtf8()+".");
+					pVT->setText(CI18N::get("uiFirewallFail")+".\n"+
+								  CI18N::get("uiFirewallAlert")+".");
 				}
 			}
 		}
@@ -6468,7 +6468,7 @@ void CEditor::connectionMsg(const std::string &stringId)
 		CViewText *vt = dynamic_cast<CViewText *>(r2ConnectWindow->getView("connexionMsg"));
 		if (vt)
 		{
-			vt->setText(CI18N::get(stringId).toUtf8());
+			vt->setText(CI18N::get(stringId));
 		}
 	}
 }
@@ -7497,7 +7497,7 @@ class CAHInviteCharacter : public IActionHandler
 					{
 						CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 						if (pVT != NULL)
-							pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial").toUtf8());
+							pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial"));
 
 						CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 					}
diff --git a/ryzom/client/src/r2/instance_map_deco.cpp b/ryzom/client/src/r2/instance_map_deco.cpp
index 8ec630686..ae3857990 100644
--- a/ryzom/client/src/r2/instance_map_deco.cpp
+++ b/ryzom/client/src/r2/instance_map_deco.cpp
@@ -44,7 +44,7 @@ void CInstanceMapDeco::CCtrlButtonEntity::getContextHelp(std::string &help) cons
 {
 	//H_AUTO(R2_CCtrlButtonEntity_getContextHelp)
 	help = _Instance.getDisplayName().toUtf8();
-	if (help == NLMISC::CI18N::get("uiR2EDNoName").toUtf8())
+	if (help == NLMISC::CI18N::get("uiR2EDNoName"))
 		help.clear();
 }
 
diff --git a/ryzom/client/src/r2/tool_select_move.cpp b/ryzom/client/src/r2/tool_select_move.cpp
index f9b9b9a1a..d16b45ced 100644
--- a/ryzom/client/src/r2/tool_select_move.cpp
+++ b/ryzom/client/src/r2/tool_select_move.cpp
@@ -417,9 +417,9 @@ void CToolSelectMove::commitAction(CInstance &instance)
 			}
 			else
 			{
-				ucstring instanceName = instance.getDisplayName();
+				string instanceName = instance.getDisplayName().toUtf8();
 				if(instanceName == CI18N::get("uiR2EDNoName"))
-					instanceName = ucstring(instance.getClassName());
+					instanceName = instance.getClassName();
 
 				//getDMC().newAction(CI18N::get("uiR2EDMoveAction") + instance.getDisplayName());
 				getDMC().newAction(CI18N::get("uiR2EDMoveAction") + instanceName);
diff --git a/ryzom/client/src/session_browser_impl.cpp b/ryzom/client/src/session_browser_impl.cpp
index f11c24a54..9f3cc77a9 100644
--- a/ryzom/client/src/session_browser_impl.cpp
+++ b/ryzom/client/src/session_browser_impl.cpp
@@ -230,7 +230,7 @@ int CSessionBrowserImpl::luaJoinRingSession(CLuaState &ls)
 	{
 		CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 		if (pVT != NULL)
-			pVT->setText(CI18N::get("uiRingWarningFreeTrial").toUtf8());
+			pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
 		CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:warning_free_trial");
 	}
 
diff --git a/ryzom/common/src/game_share/rm_family.cpp b/ryzom/common/src/game_share/rm_family.cpp
index a45793aad..5351b00b7 100644
--- a/ryzom/common/src/game_share/rm_family.cpp
+++ b/ryzom/common/src/game_share/rm_family.cpp
@@ -118,7 +118,7 @@ namespace RM_FABER_TYPE
 	}
 
 	/// Client: use the CI18N
-	const ucstring& toLocalString( TRMFType e )
+	const std::string& toLocalString( TRMFType e )
 	{
 		return CI18N::get("mpft" + toString(e));
 	}
@@ -134,7 +134,7 @@ namespace RM_FABER_TYPE
 namespace RM_FAMILY
 {
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMFamily e )
+	const std::string& toLocalString( TRMFamily e )
 	{
 		return CI18N::get("mpfam" + toString(e));
 	}
@@ -144,7 +144,7 @@ namespace RM_FAMILY
 namespace RM_GROUP
 {
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMGroup e )
+	const std::string& toLocalString( TRMGroup e )
 	{
 		return CI18N::get("mpgroup" + toString(e));
 	}
@@ -154,7 +154,7 @@ namespace RM_GROUP
 namespace RM_FABER_PROPERTY
 {
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMFProperty e )
+	const std::string& toLocalString( TRMFProperty e )
 	{
 		return CI18N::get("mpprop" + toString(e));
 	}
@@ -188,7 +188,7 @@ namespace RM_FABER_QUALITY
 	}
 
 	/// Client: use the CI18N
-	const ucstring& toLocalString( TFaberQuality e )
+	const std::string& toLocalString( TFaberQuality e )
 	{
 		return CI18N::get("mpfq" + toString(e));
 	}
@@ -224,7 +224,7 @@ namespace RM_COLOR
 	}
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( sint value )
+	const std::string& toLocalString( sint value )
 	{
 		return CI18N::get("mpcol" + toString(value));
 	}
@@ -283,7 +283,7 @@ namespace RM_FABER_STAT_TYPE
 		return conversion.toString(stats);
 	}
 
-	const ucstring& toLocalString( TRMStatType stats )
+	const std::string& toLocalString( TRMStatType stats )
 	{
 		// must change en.uxt
 		nlctassert(NumRMStatType == sizeof(stringTable)/sizeof(stringTable[0]));
@@ -663,9 +663,9 @@ namespace RM_FABER_STAT_TYPE
 namespace RM_CLASS_TYPE
 {
 
-const ucstring &toLocalString(TRMClassType classType)
+const std::string &toLocalString(TRMClassType classType)
 {
-	return CI18N::get(toString("uiItemRMClass%d", classType).c_str());
+	return CI18N::get(toString("uiItemRMClass%d", classType));
 }
 
 
diff --git a/ryzom/common/src/game_share/rm_family.h b/ryzom/common/src/game_share/rm_family.h
index a69a51517..9f9048531 100644
--- a/ryzom/common/src/game_share/rm_family.h
+++ b/ryzom/common/src/game_share/rm_family.h
@@ -85,7 +85,7 @@ namespace RM_FABER_TYPE
 	const std::string &faberTypeToSheetEntry(TRMFType type);
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMFType e );
+	const std::string& toLocalString( TRMFType e );
 
 	/// For Client Interface, return the define name of the type (eg: "item_part_icon_MpL")
 	std::string toIconDefineString( TRMFType e );
@@ -101,7 +101,7 @@ namespace RM_FAMILY
 	const TRMFamily Unknown = 0;
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMFamily e );
+	const std::string& toLocalString( TRMFamily e );
 
 	/// Debug string
 	inline std::string toString( TRMFamily e ) { return NLMISC::toString(e); }
@@ -119,7 +119,7 @@ namespace RM_GROUP
 	const TRMGroup Unknown = 0;
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMGroup e );
+	const std::string& toLocalString( TRMGroup e );
 
 	// Note: the group names are accessible on server by CMP::rmGroupToString()
 
@@ -138,7 +138,7 @@ namespace RM_FABER_PROPERTY
 	const TRMFProperty Unknown = 0;
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMFProperty e );
+	const std::string& toLocalString( TRMFProperty e );
 
 	/// Debug string
 	inline std::string toString( TRMFProperty e ) { return NLMISC::toString(e); }
@@ -178,7 +178,7 @@ namespace RM_FABER_QUALITY
 	TFaberQuality toFaberQuality( const std::string& str );
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TFaberQuality e );
+	const std::string& toLocalString( TFaberQuality e );
 
 }
 
@@ -199,7 +199,7 @@ namespace RM_COLOR
 	const std::string& toString( sint value );
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( sint value );
+	const std::string& toLocalString( sint value );
 
 };
 
@@ -251,7 +251,7 @@ namespace RM_FABER_STAT_TYPE
 	const std::string& toString( TRMStatType stats );
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMStatType stats );
+	const std::string& toLocalString( TRMStatType stats );
 
 	/// For each Raw material faber type, does this Stat is relevant?
 	bool	isStatRelevant(RM_FABER_TYPE::TRMFType ft, TRMStatType fs);
@@ -309,7 +309,7 @@ namespace RM_CLASS_TYPE
 	};
 
 	/// Get the Localized UCString
-	const ucstring& toLocalString( TRMClassType classType );
+	const std::string& toLocalString( TRMClassType classType );
 
 	/// return the item class for a given stat energy [0..100]
 	inline TRMClassType getItemClass(uint32 energy)
diff --git a/ryzom/common/src/game_share/roles.cpp b/ryzom/common/src/game_share/roles.cpp
index 57ccfdcd4..578096b44 100644
--- a/ryzom/common/src/game_share/roles.cpp
+++ b/ryzom/common/src/game_share/roles.cpp
@@ -73,7 +73,7 @@ ERole toRoleId( const std::string& Role )
 }
 
 // Return the Translated name of the Job
-const ucstring &roleToUCString (ERole r)
+const std::string &roleToUCString(ERole r)
 {
 	return NLMISC::CI18N::get( toString( r ) );
 }
diff --git a/ryzom/common/src/game_share/roles.h b/ryzom/common/src/game_share/roles.h
index 9164a3254..8b6dfd5b2 100644
--- a/ryzom/common/src/game_share/roles.h
+++ b/ryzom/common/src/game_share/roles.h
@@ -60,7 +60,7 @@ const std::string& toString( ERole r );
 ERole toRoleId( const std::string& Role );
 
 // Return the Translated name of the Job
-const ucstring &roleToUCString (ERole r);
+const std::string &roleToUCString (ERole r);
 
 } // ROLES
 

From 079f9dff25c5f524467a6f9032fe091330e083d2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 04:01:13 +0800
Subject: [PATCH 070/292] Fix

---
 nel/src/3d/text_context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/3d/text_context.cpp b/nel/src/3d/text_context.cpp
index ba40904b3..b31a82959 100644
--- a/nel/src/3d/text_context.cpp
+++ b/nel/src/3d/text_context.cpp
@@ -77,7 +77,7 @@ uint32 CTextContext::textPush (const char *format, ...)
 	char *str;
 	NLMISC_CONVERT_VARGS (str, format, NLMISC::MaxCStringSize);
 
-	return textPush(str);
+	return textPush(NLMISC::CUtfStringView(str));
 }
 
 // ------------------------------------------------------------------------------------------------

From 0b191bc6db4b87bcbd4c33eccb3f109db8a4271b Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 05:36:13 +0800
Subject: [PATCH 071/292] More UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/gui/ctrl_text_button.h        |  8 ++-
 nel/include/nel/gui/group_container.h         |  4 +-
 nel/include/nel/gui/group_list.h              |  4 +-
 nel/include/nel/gui/group_menu.h              | 15 ++---
 nel/include/nel/gui/group_paragraph.h         |  4 +-
 nel/include/nel/gui/group_tree.h              | 10 +--
 nel/include/nel/gui/interface_expr.h          |  6 +-
 nel/include/nel/gui/view_pointer.h            |  6 +-
 nel/include/nel/gui/view_text.h               |  2 +-
 nel/include/nel/gui/view_text_formated.h      | 10 +--
 nel/include/nel/gui/view_text_id.h            |  6 +-
 nel/include/nel/gui/view_text_id_formated.h   |  6 +-
 nel/src/gui/ctrl_text_button.cpp              | 19 +++++-
 nel/src/gui/dbgroup_combo_box.cpp             |  2 +-
 nel/src/gui/group_container.cpp               | 32 +++++-----
 nel/src/gui/group_html.cpp                    | 14 ++--
 nel/src/gui/group_list.cpp                    | 14 ++--
 nel/src/gui/group_menu.cpp                    | 52 +++++----------
 nel/src/gui/group_paragraph.cpp               | 10 +--
 nel/src/gui/group_tree.cpp                    |  4 +-
 nel/src/gui/interface_expr.cpp                | 28 +++-----
 nel/src/gui/interface_expr_user_fct.cpp       | 20 +++---
 nel/src/gui/interface_link.cpp                |  2 +-
 nel/src/gui/lua_ihm.cpp                       | 30 +--------
 nel/src/gui/view_pointer.cpp                  | 12 ++--
 nel/src/gui/view_text.cpp                     | 10 +--
 nel/src/gui/view_text_formated.cpp            | 29 +++++----
 nel/src/gui/view_text_id.cpp                  | 12 ++--
 nel/src/gui/view_text_id_formated.cpp         | 27 ++++----
 ryzom/client/src/connection.cpp               |  2 +-
 ryzom/client/src/contextual_cursor.cpp        |  2 +-
 .../src/interface_v3/action_handler_game.cpp  |  4 +-
 .../src/interface_v3/action_handler_item.cpp  |  6 +-
 .../interface_v3/action_handler_phrase.cpp    |  2 +-
 .../src/interface_v3/bot_chat_page_trade.cpp  |  8 +--
 .../dbgroup_list_sheet_mission.cpp            |  2 +-
 .../src/interface_v3/encyclopedia_manager.cpp |  4 +-
 .../client/src/interface_v3/group_compas.cpp  | 20 +++---
 ryzom/client/src/interface_v3/group_map.cpp   |  2 +-
 .../group_phrase_skill_filter.cpp             |  2 +-
 .../client/src/interface_v3/group_skills.cpp  | 10 +--
 .../interface_expr_user_fct_game.cpp          | 64 +++++++++----------
 .../interface_expr_user_fct_items.cpp         | 14 ++--
 .../src/interface_v3/interface_manager.cpp    | 39 +++++------
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  2 +-
 .../src/interface_v3/people_interraction.cpp  | 10 +--
 ryzom/client/src/string_manager_client.h      |  1 +
 47 files changed, 276 insertions(+), 316 deletions(-)

diff --git a/nel/include/nel/gui/ctrl_text_button.h b/nel/include/nel/gui/ctrl_text_button.h
index 25fc9eeac..74e1c1291 100644
--- a/nel/include/nel/gui/ctrl_text_button.h
+++ b/nel/include/nel/gui/ctrl_text_button.h
@@ -96,8 +96,10 @@ namespace NLGUI
 		bool			getTextModulateGlobalColorOver() const {return _TextModulateGlobalColorOver;}
 		void			setTextModulateGlobalColorOver(bool v) {_TextModulateGlobalColorOver= v;}
 		// Set text (noop if text id)
-		void			setText (const ucstring &text);
-		ucstring		getText () const;
+		void			setText (const std::string &text);
+		std::string		getText () const;
+		void			setTextAsUtf16 (const ucstring &text);
+		ucstring		getTextAsUtf16 () const;
 
 		void			setHardText (const std::string &text);
 		std::string		getHardText () const;
@@ -130,7 +132,7 @@ namespace NLGUI
 		int luaGetViewText(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CCtrlTextButton, CCtrlBaseButton)
-			REFLECT_UCSTRING("uc_hardtext", getText, setText);
+			REFLECT_UCSTRING("uc_hardtext", getTextAsUtf16, setTextAsUtf16);
 			REFLECT_STRING("hardtext", getHardText, setHardText);
 			REFLECT_SINT32("text_x", getTextX, setTextX)
 			REFLECT_SINT32("wmargin", getWMargin, setWMargin)
diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
index 742dfcfb2..399f9c056 100644
--- a/nel/include/nel/gui/group_container.h
+++ b/nel/include/nel/gui/group_container.h
@@ -477,8 +477,8 @@ namespace NLGUI
 		float				_CurrentRolloverAlphaContainer;
 		float				_CurrentRolloverAlphaContent;
 		sint32				_LayerSetup;
-		ucstring			_TitleTextOpened;
-		ucstring			_TitleTextClosed;
+		std::string			_TitleTextOpened;
+		std::string			_TitleTextClosed;
 		CViewText			*_TitleOpened;
 		CViewText			*_TitleClosed;
 		sint32				_TitleDeltaMaxW;
diff --git a/nel/include/nel/gui/group_list.h b/nel/include/nel/gui/group_list.h
index 58af530b5..6e7587e34 100644
--- a/nel/include/nel/gui/group_list.h
+++ b/nel/include/nel/gui/group_list.h
@@ -67,13 +67,13 @@ namespace NLGUI
 		* \param line : text to be added
 		* \param color : text color
 		*/
-		void addTextChild (const ucstring& line,const NLMISC::CRGBA &textColor, bool multiLine = true);
+		void addTextChild (const std::string& line,const NLMISC::CRGBA &textColor, bool multiLine = true);
 
 		/**
 		* add a text child element to the group, using the text template
 		* \param line : text to be added
 		*/
-		void addTextChild (const ucstring& line, bool multiLine = true);
+		void addTextChild (const std::string& line, bool multiLine = true);
 
 		/// Same as adding a text child but the text will be taken from the string manager
 		void addTextChildID (uint32 id, bool multiLine = true);
diff --git a/nel/include/nel/gui/group_menu.h b/nel/include/nel/gui/group_menu.h
index 21a740d84..f304a3d60 100644
--- a/nel/include/nel/gui/group_menu.h
+++ b/nel/include/nel/gui/group_menu.h
@@ -122,12 +122,12 @@ namespace NLGUI
 		// retrieve the index of a line from its id (-1 if not found)
 		sint getLineFromId(const std::string &id);
 
-		CViewTextMenu* addLine (const ucstring &name, const std::string &ah,
+		CViewTextMenu* addLine (const std::string &name, const std::string &ah,
 								const std::string &params, const std::string &id="",
 								const std::string &cond = std::string(), const std::string &texture="",
 								bool checkable = false, bool checked = false, bool formatted = false
 							   );
-		CViewTextMenu* addLineAtIndex(uint index, const ucstring &name, const std::string &ah,
+		CViewTextMenu* addLineAtIndex(uint index, const std::string &name, const std::string &ah,
 									  const std::string &params, const std::string &id="",
 									  const std::string &cond = std::string(), const std::string &texture="",
 									  bool checkable = false, bool checked = false, bool formatted = false
@@ -332,12 +332,7 @@ namespace NLGUI
 		virtual void setActive (bool state);
 
 		virtual bool isWindowUnder (sint32 x, sint32 y);
-
-		// add line with a string, for backward compatibility
-		void addLine (const std::string &name, const std::string &ah, const std::string &params,
-					  const std::string &id = std::string(),
-					  const std::string &cond = std::string(), const std::string &texture="",
-					  bool checkable = false, bool checked = false);
+		
 		uint getNumLine() const;
 		void deleteLine(uint index);
 		const std::string getActionHandler(uint lineIndex) const;
@@ -350,12 +345,12 @@ namespace NLGUI
 		void setRightClickHandler(uint lineIndex, const std::string &ah = "");
 		void setRightClickHandlerParam(uint lineIndex, const std::string &params = "");
 
-		void addLine (const ucstring &name, const std::string &ah = "", const std::string &params = "",
+		void addLine (const std::string &name, const std::string &ah = "", const std::string &params = "",
 					  const std::string &id = std::string(),
 					  const std::string &cond = std::string(), const std::string &texture="",
 					  bool checkable = false, bool checked = false
 					 );
-		void addLineAtIndex (uint index, const ucstring &name, const std::string &ah = "", const std::string &params = "",
+		void addLineAtIndex (uint index, const std::string &name, const std::string &ah = "", const std::string &params = "",
 							 const std::string &id = std::string(),
 							 const std::string &cond = std::string(), const std::string &texture="",
 							 bool checkable = false, bool checked = false
diff --git a/nel/include/nel/gui/group_paragraph.h b/nel/include/nel/gui/group_paragraph.h
index 6142bc33b..0e1898633 100644
--- a/nel/include/nel/gui/group_paragraph.h
+++ b/nel/include/nel/gui/group_paragraph.h
@@ -84,13 +84,13 @@ namespace NLGUI
 		* \param line : text to be added
 		* \param color : text color
 		*/
-		void addTextChild (const ucstring& line,const NLMISC::CRGBA &textColor, bool multiLine = true);
+		void addTextChild (const std::string& line,const NLMISC::CRGBA &textColor, bool multiLine = true);
 
 		/**
 		* add a text child element to the group, using the text template
 		* \param line : text to be added
 		*/
-		void addTextChild (const ucstring& line, bool multiLine = true);
+		void addTextChild (const std::string& line, bool multiLine = true);
 
 		/// Same as adding a text child but the text will be taken from the string manager
 		void addTextChildID (uint32 id, bool multiLine = true);
diff --git a/nel/include/nel/gui/group_tree.h b/nel/include/nel/gui/group_tree.h
index 266e7e23f..d7518a68d 100644
--- a/nel/include/nel/gui/group_tree.h
+++ b/nel/include/nel/gui/group_tree.h
@@ -60,7 +60,7 @@ namespace NLGUI
 			bool				Show;			// If false, the node is not displayed (true default, Root ignored)
 			sint32				YDecal;
 			// Text
-			ucstring			Text;			// Internationalized displayed text
+			std::string			Text;			// Internationalized displayed text
 			sint32				FontSize;		// If -1 (default), then take the groupTree one
 			NLMISC::CRGBA		Color;
 			// Template
@@ -112,8 +112,10 @@ namespace NLGUI
 			std::string getBitmap() const { return Bitmap; }
 			void setOpened(bool opened) { Opened = opened; }
 			bool getOpened() const { return Opened; }
-			void setText(const ucstring &text) { Text = text; }
-			const ucstring& getText() const { return Text; }
+			void setText(const std::string &text) { Text = text; }
+			const std::string& getText() const { return Text; }
+			void setTextAsUtf16(const ucstring &text) { Text = text.toUtf8(); }
+			ucstring getTextAsUtf16() const { return ucstring::makeFromUtf8(Text); }
 			sint32 getFontSize() const { return FontSize; }
 			void setFontSize(sint32 value) { FontSize = value; }
 			sint32 getYDecal() const { return YDecal; }
@@ -181,7 +183,7 @@ namespace NLGUI
 				REFLECT_STRING("AHParamsClose", getAHParamsClose, setAHParamsClose);
 				REFLECT_BOOL("Opened", getOpened, setOpened);
 				REFLECT_BOOL("Show", getShow, setShow);
-				REFLECT_UCSTRING_REF("Text", getText, setText);
+				REFLECT_UCSTRING("Text", getTextAsUtf16, setTextAsUtf16); // FIXME: Lua UTF-8
 				// lua
 				REFLECT_LUA_METHOD("getNumChildren", luaGetNumChildren);
 				REFLECT_LUA_METHOD("getChild", luaGetChild);
diff --git a/nel/include/nel/gui/interface_expr.h b/nel/include/nel/gui/interface_expr.h
index b967ef7ab..0a9d9b4e9 100644
--- a/nel/include/nel/gui/interface_expr.h
+++ b/nel/include/nel/gui/interface_expr.h
@@ -59,16 +59,14 @@ namespace NLGUI
 		bool                   getBool() const;
 		sint64                 getInteger() const;
 		double                 getDouble() const;
-		std::string			   getString() const;
+		const std::string	   &getString() const;
 		NLMISC::CRGBA		   getRGBA() const;
-		const ucstring		  &getUCString() const;
 		CInterfaceExprUserType *getUserType() const;
 		// set
 		void               setBool(bool value) { clean(); _Type = Boolean; _BoolValue = value; }
 		void               setInteger(sint64 value) { clean(); _Type = Integer; _IntegerValue = value; }
 		void               setDouble(double value) { clean(); _Type = Double; _DoubleValue = value; }
 		void               setString(const std::string &value) { clean(); _Type = String; _StringValue = value; }
-		void               setUCString(const ucstring &value) { clean(); _Type = String; _StringValue = value; }
 		void			   setRGBA(NLMISC::CRGBA value) { clean(); _Type = RGBA; _RGBAValue = (uint32)(value.R+(value.G<<8)+(value.B<<16)+(value.A<<24)); }
 		void               setUserType(CInterfaceExprUserType *value);
 		// reset this object to initial state (no type)
@@ -99,7 +97,7 @@ namespace NLGUI
 			CInterfaceExprUserType *_UserTypeValue;
 			uint32					_RGBAValue;
 		};
-		ucstring					_StringValue; // well, can't fit in union, unless we do some horrible hack..
+		std::string					_StringValue; // well, can't fit in union, unless we do some horrible hack..
 	private:
 		const char *evalBoolean(const char *expr);
 		const char *evalNumber(const char *expr);
diff --git a/nel/include/nel/gui/view_pointer.h b/nel/include/nel/gui/view_pointer.h
index cb550e44a..bc605a717 100644
--- a/nel/include/nel/gui/view_pointer.h
+++ b/nel/include/nel/gui/view_pointer.h
@@ -55,7 +55,7 @@ namespace NLGUI
 		bool getStringMode() const {return _StringMode;}
 
 		// Set cursor string
-		void setString (const ucstring &str);
+		void setString (const std::string &str);
 
 		// TEMP PATCH
 		void setCursor (const std::string &name)
@@ -126,14 +126,14 @@ namespace NLGUI
 		bool				_ForceStringMode;
 		CInterfaceGroup		*_StringCursor;
 		CInterfaceGroup		*_StringCursorHardware;
-		ucstring			_ContextString;
+		std::string			_ContextString;
 
 		// draw current cursor with the given texture, or, if in hardware mode, change the hardware cursor shape
 		void drawCursor(sint32 texId, NLMISC::CRGBA col, uint8 rot);
 
 	private:
 		// set the string into frame for software or hardware version
-		void setString (const ucstring &str, CInterfaceGroup *target);
+		void setString(const std::string &str, CInterfaceGroup *target);
 
 		static bool hwMouse;
 
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 2ffaa8d49..933f9a747 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -465,7 +465,7 @@ namespace NLGUI
 		void	addDontClipWordLine(std::vector<CWord> &currLine);
 
 		// FormatTag build.
-		static void		buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CFormatTag> &formatTags, std::vector<ucstring> &tooltips);
+		static void		buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CFormatTag> &formatTags, std::vector<std::string> &tooltips);
 		// FormatTag parsing.
 		bool			isFormatTagChange(uint textIndex, uint ctIndex) const;
 		void			getFormatTagChange(uint textIndex, uint &ctIndex, CFormatInfo &wordFormat) const;
diff --git a/nel/include/nel/gui/view_text_formated.h b/nel/include/nel/gui/view_text_formated.h
index 43a7eb9a8..f6a3cf443 100644
--- a/nel/include/nel/gui/view_text_formated.h
+++ b/nel/include/nel/gui/view_text_formated.h
@@ -45,7 +45,7 @@ namespace NLGUI
 		{
 		public:
 			virtual ~IViewTextFormatter(){}
-			virtual ucstring formatString( const ucstring &inputString, const ucstring &paramString ) = 0;
+			virtual std::string formatString( const std::string &inputString, const std::string &paramString ) = 0;
 		};
 
 		CViewTextFormated (const TCtorParam &param) : CViewText(param)
@@ -55,15 +55,15 @@ namespace NLGUI
 		xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
 		virtual bool parse(xmlNodePtr cur, CInterfaceGroup * parentGroup);
 		virtual void checkCoords();
-		const  ucstring &getFormatString() const { return _FormatString; }
-		void setFormatString(const ucstring &format);
+		const  std::string &getFormatString() const { return _FormatString; }
+		void setFormatString(const std::string &format);
 
-		static ucstring formatString(const ucstring &inputString, const ucstring &paramString);
+		static std::string formatString(const std::string &inputString, const std::string &paramString);
 
 		static void setFormatter( IViewTextFormatter *formatter ){ textFormatter = formatter; }
 
 	private:
-		ucstring	_FormatString;
+		std::string	_FormatString;
 		static IViewTextFormatter *textFormatter;
 	};
 
diff --git a/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
index 1e46de062..8c012f319 100644
--- a/nel/include/nel/gui/view_text_id.h
+++ b/nel/include/nel/gui/view_text_id.h
@@ -58,8 +58,10 @@ namespace NLGUI
 		{
 		public:
 			virtual ~IViewTextProvider(){}
-			virtual bool getString( uint32 stringId, ucstring &result ) = 0;
-			virtual bool getDynString( uint32 dynStringId, ucstring &result ) = 0;
+			bool getString(uint32 stringId, std::string &result) { ucstring temp; bool res = getString(stringId, temp); result = temp.toUtf8(); return res;  }
+			bool getDynString(uint32 dynStringId, std::string &result) { ucstring temp; bool res = getDynString(dynStringId, temp); result = temp.toUtf8(); return res; }
+			virtual bool getString( uint32 stringId, ucstring &result ) = 0; // TODO: UTF-8
+			virtual bool getDynString( uint32 dynStringId, ucstring &result ) = 0; // TODO: UTF-8
 		};
 
 		CViewTextID(const TCtorParam &param) : CViewText(param)
diff --git a/nel/include/nel/gui/view_text_id_formated.h b/nel/include/nel/gui/view_text_id_formated.h
index cbc494dc1..dfd11d0d4 100644
--- a/nel/include/nel/gui/view_text_id_formated.h
+++ b/nel/include/nel/gui/view_text_id_formated.h
@@ -49,10 +49,10 @@ namespace NLGUI
 		xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
 		virtual bool parse(xmlNodePtr cur, CInterfaceGroup * parentGroup);
 		virtual void checkCoords();
-		const  ucstring &getFormatString() const { return _FormatString; }
-		void setFormatString(const ucstring &format);
+		const  std::string &getFormatString() const { return _FormatString; }
+		void setFormatString(const std::string &format);
 	private:
-		ucstring	_FormatString;
+		std::string	_FormatString;
 	};
 
 }
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 154d41633..5cc89c9a7 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -1041,14 +1041,29 @@ namespace NLGUI
 
 
 	// ***************************************************************************
-	void CCtrlTextButton::setText (const ucstring &text)
+	void CCtrlTextButton::setText (const std::string &text)
+	{
+		if (_ViewText && !_IsViewTextId)
+			_ViewText->setText(text);
+	}
+
+	// ***************************************************************************
+	std::string CCtrlTextButton::getText () const
+	{
+		if (_ViewText && !_IsViewTextId)
+			return _ViewText->getText();
+		return std::string();
+	}
+
+	// ***************************************************************************
+	void CCtrlTextButton::setTextAsUtf16 (const ucstring &text)
 	{
 		if (_ViewText && !_IsViewTextId)
 			_ViewText->setText(text.toUtf8());
 	}
 
 	// ***************************************************************************
-	ucstring CCtrlTextButton::getText () const
+	ucstring CCtrlTextButton::getTextAsUtf16 () const
 	{
 		if (_ViewText && !_IsViewTextId)
 			return CUtfStringView(_ViewText->getText()).toUtf16();
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 66d3220a0..b13005b33 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -668,7 +668,7 @@ namespace NLGUI
 				{
 					checkable = true;
 				}
-				groupMenu->addLine(ucstring::makeFromUtf8(getText(i)), "combo_box_select_end", toString(i),
+				groupMenu->addLine(getText(i), "combo_box_select_end", toString(i),
 					"", std::string(), getTexture(i), checkable);
 				groupMenu->setGrayedLine(i, getGrayed(i));
 			}
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 7bab62820..e6b69326b 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -1338,19 +1338,19 @@ namespace NLGUI
 		if( name == "title" )
 		{
 			if( _TitleTextOpened == _TitleTextClosed )
-				return _TitleTextOpened.toString();
+				return _TitleTextOpened;
 			else
 				return "";
 		}
 		else
 		if( name == "title_opened" )
 		{
-			return _TitleTextOpened.toString();
+			return _TitleTextOpened;
 		}
 		else
 		if( name == "title_closed" )
 		{
-			return _TitleTextClosed.toString();
+			return _TitleTextClosed;
 		}
 		else
 		if( name == "header_active" )
@@ -1997,12 +1997,12 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "content_y_offset", BAD_CAST toString( _ContentYOffset ).c_str() );
 		
 		if( _TitleTextOpened == _TitleTextClosed )
-			xmlSetProp( node, BAD_CAST "title", BAD_CAST _TitleTextOpened.toString().c_str() );
+			xmlSetProp( node, BAD_CAST "title", BAD_CAST _TitleTextOpened.c_str() );
 		else
 			xmlSetProp( node, BAD_CAST "title", BAD_CAST "" );
 
-		xmlSetProp( node, BAD_CAST "title_opened", BAD_CAST _TitleTextOpened.toString().c_str() );
-		xmlSetProp( node, BAD_CAST "title_closed", BAD_CAST _TitleTextClosed.toString().c_str() );
+		xmlSetProp( node, BAD_CAST "title_opened", BAD_CAST _TitleTextOpened.c_str() );
+		xmlSetProp( node, BAD_CAST "title_closed", BAD_CAST _TitleTextClosed.c_str() );
 		xmlSetProp( node, BAD_CAST "header_active", BAD_CAST toString( _HeaderActive ).c_str() );
 
 		if( _HeaderColor.getNodePtr() != NULL )
@@ -3712,7 +3712,7 @@ namespace NLGUI
 					{
 						CViewTextID	*vti= new CViewTextID(CViewBase::TCtorParam());
 						// the title here is actually the DB path
-						vti->setDBTextID(_TitleTextOpened.toString());
+						vti->setDBTextID(_TitleTextOpened);
 						vti->setDynamicString(_TitleClass==TitleTextDynString);
 						_TitleOpened = vti;
 					}
@@ -3744,7 +3744,7 @@ namespace NLGUI
 			_TitleOpened->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleOpened->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleOpened->setText (_TitleTextOpened.toUtf8());
+		if (_TitleClass==TitleText) _TitleOpened->setText (_TitleTextOpened);
 		_TitleOpened->setActive (_Opened);
 
 		// Title when the container is closed
@@ -3764,7 +3764,7 @@ namespace NLGUI
 					{
 						CViewTextID	*vti= new CViewTextID(CViewBase::TCtorParam());
 						// the title here is actually the DB path
-						vti->setDBTextID(_TitleTextClosed.toString());
+						vti->setDBTextID(_TitleTextClosed);
 						vti->setDynamicString(_TitleClass==TitleTextDynString);
 						_TitleClosed = vti;
 					}
@@ -3796,7 +3796,7 @@ namespace NLGUI
 			_TitleClosed->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleClosed->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleClosed->setText (_TitleTextClosed.toUtf8());
+		if (_TitleClass==TitleText) _TitleClosed->setText (_TitleTextClosed);
 		_TitleClosed->setActive(!_Opened);
 
 
@@ -3949,7 +3949,7 @@ namespace NLGUI
 	// ***************************************************************************
 	std::string		CGroupContainer::getTitle () const
 	{
-		return _TitleTextOpened.toString();
+		return _TitleTextOpened;
 	}
 
 	// ***************************************************************************
@@ -3962,7 +3962,7 @@ namespace NLGUI
 	// ***************************************************************************
 	std::string		CGroupContainer::getTitleOpened () const
 	{
-		return _TitleTextOpened.toString();
+		return _TitleTextOpened;
 	}
 
 	// ***************************************************************************
@@ -3975,7 +3975,7 @@ namespace NLGUI
 	// ***************************************************************************
 	std::string		CGroupContainer::getTitleClosed () const
 	{
-		return _TitleTextClosed.toString();
+		return _TitleTextClosed;
 	}
 
 	// ***************************************************************************
@@ -3988,7 +3988,7 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupContainer::setUCTitleOpened(const ucstring &title)
 	{
-		_TitleTextOpened = title;
+		_TitleTextOpened = title.toUtf8();
 		if (_TitleOpened != NULL)
 			_TitleOpened->setText (title.toUtf8());
 		invalidateCoords();
@@ -3997,9 +3997,9 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupContainer::setUCTitleClosed(const ucstring &title)
 	{
-		_TitleTextClosed = title;
+		_TitleTextClosed = title.toUtf8();
 		if (_TitleClosed != NULL)
-			_TitleClosed->setText (_TitleTextClosed.toUtf8());
+			_TitleClosed->setText (_TitleTextClosed);
 		invalidateCoords();
 	}
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 15bd47a68..b559b409f 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2755,11 +2755,11 @@ namespace NLGUI
 
 	void CGroupHTML::addString(const ucstring &str)
 	{
-		ucstring tmpStr = str;
+		string tmpStr = str.toUtf8();
 
 		if (_Localize)
 		{
-			string	_str = tmpStr.toString();
+			string	_str = tmpStr;
 			string::size_type	p = _str.find('#');
 			if (p == string::npos)
 			{
@@ -2800,7 +2800,7 @@ namespace NLGUI
 		}
 		else if (_Object)
 		{
-			_ObjectScript += tmpStr.toString();
+			_ObjectScript += tmpStr;
 		}
 		else if (_SelectOption)
 		{
@@ -2853,7 +2853,7 @@ namespace NLGUI
 					(style.GlobalColor == _CurrentViewLink->getModulateGlobalColor()))
 				{
 					// Concat the text
-					_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr.toUtf8());
+					_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr);
 					_CurrentViewLink->invalidateContent();
 					added = true;
 				}
@@ -2916,7 +2916,7 @@ namespace NLGUI
 							newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
 						}
 					}
-					newLink->setText(tmpStr.toUtf8());
+					newLink->setText(tmpStr);
 					newLink->setMultiLineSpace((uint)((float)(style.FontSize)*LineSpaceFontFactor));
 					newLink->setMultiLine(true);
 					newLink->setModulateGlobalColor(style.GlobalColor);
@@ -5475,7 +5475,7 @@ namespace NLGUI
 					}
 				}
 
-				ctrlButton->setText(ucstring::makeFromUtf8(value));
+				ctrlButton->setText(value);
 
 				setTextButtonStyle(ctrlButton, _Style.Current);
 			}
@@ -6449,7 +6449,7 @@ namespace NLGUI
 			if (sb)
 			{
 				uint lineIndex = sb->getNumLine();
-				sb->addLine(_SelectOptionStr, "", "");
+				sb->addLine(_SelectOptionStr.toUtf8(), "", "");
 
 				if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
 				{
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index 4e04501a8..b94ff6a5f 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -521,7 +521,7 @@ namespace NLGUI
 			if (NLMISC::startsWith(propPtr, "ui"))
 				addTextChild(CI18N::get(propPtr));
 			else
-				addTextChild(ucstring::makeFromUtf8(propPtr));
+				addTextChild(propPtr);
 		}
 		else
 		{
@@ -539,7 +539,7 @@ namespace NLGUI
 
 
 	// ----------------------------------------------------------------------------
-	void CGroupList::addTextChild(const ucstring& line,   bool multiLine /*= true*/)
+	void CGroupList::addTextChild(const std::string& line,   bool multiLine /*= true*/)
 	{
 		const string elid = _Id + ":el" + toString(_IdCounter); ++_IdCounter;
 		CViewText *view= new CViewText (elid,   string(""),   _Templ.getFontSize(),   _Templ.getColor(),   _Templ.getShadow());
@@ -548,7 +548,7 @@ namespace NLGUI
 		view->setMultiLine (multiLine);
 		view->setTextMode(_Templ.getTextMode());
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line.toUtf8());
+		view->setText (line);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
 		addChild(view);
@@ -558,7 +558,7 @@ namespace NLGUI
 
 
 	// ----------------------------------------------------------------------------
-	void CGroupList::addTextChild(const ucstring& line,   const CRGBA& textColor,   bool multiLine /*= true*/)
+	void CGroupList::addTextChild(const std::string& line,   const CRGBA& textColor,   bool multiLine /*= true*/)
 	{
 		const string elid = _Id + ":el" + toString(_IdCounter); ++_IdCounter;
 		CViewText *view= new CViewText (elid,   string(""),   _Templ.getFontSize(),   _Templ.getColor(),   _Templ.getShadow());
@@ -566,7 +566,7 @@ namespace NLGUI
 		view->_Parent = this;
 		view->setMultiLine (multiLine);
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line.toUtf8());
+		view->setText (line);
 		view->setColor (textColor);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
@@ -1289,7 +1289,7 @@ namespace NLGUI
 		ucstring text;
 		if(CLuaIHM::pop(ls, text))
 		{
-			addTextChild(text);
+			addTextChild(text.toUtf8()); // FIXME: Lua UTF-8
 		}
 		return 0;
 	}
@@ -1313,7 +1313,7 @@ namespace NLGUI
 		uint b = (uint) ls.toInteger(4);
 		uint a = (uint) ls.toInteger(5);
 
-		addTextChild(ucText, CRGBA(r, g, b, a));
+		addTextChild(ucText.toUtf8(), CRGBA(r, g, b, a)); // FIXME: Lua UTF-8
 
 		return 0;
 	}
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index 109baf278..77f73e18e 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -275,7 +275,7 @@ namespace NLGUI
 			if (stricmp((char*)cur->name, "action") == 0)
 			{
 				string		strId,  strAh,  strParams,  strCond, strTexture;
-				ucstring	ucstrName;
+				string	ucstrName;
 
 				if (id)		strId = (const char*)id;
 				CXMLAutoPtr name((const char*) xmlGetProp (cur,  (xmlChar*)"name"));
@@ -286,7 +286,7 @@ namespace NLGUI
 					if (NLMISC::startsWith(ptrName, "ui"))
 						ucstrName = CI18N::get(ptrName);
 					else
-						ucstrName.fromUtf8(ptrName);
+						ucstrName = ptrName;
 				}
 
 				CXMLAutoPtr ah((const char*) xmlGetProp (cur,  (xmlChar*)"handler"));
@@ -1215,7 +1215,7 @@ namespace NLGUI
 
 
 	// ------------------------------------------------------------------------------------------------
-	CViewTextMenu* CGroupSubMenu::addLine (const ucstring &name,  const std::string &ah,
+	CViewTextMenu* CGroupSubMenu::addLine (const std::string &name,  const std::string &ah,
 										   const std::string &params,  const std::string &id,
 										   const std::string &cond, const std::string &texture,
 										   bool checkable /*= false*/,  bool checked /*= false*/, bool formatted /*= false */
@@ -1231,11 +1231,11 @@ namespace NLGUI
 		{
 			pV->setMultiLine (true);
 			pV->setMultiLineMaxWOnly (true);
-			pV->setTextFormatTaged (name.toUtf8());
+			pV->setTextFormatTaged (name);
 		}
 		else
 		{
-			pV->setText (name.toUtf8());
+			pV->setText (name);
 		}
 		pV->setColor (_GroupMenu->_Color);
 		pV->setFontSize (_GroupMenu->_FontSize, _GroupMenu->_FontSizeCoef);
@@ -1296,7 +1296,7 @@ namespace NLGUI
 		return pV;
 	}
 
-	CViewTextMenu* CGroupSubMenu::addLineAtIndex(uint index,  const ucstring &name,  const std::string &ah,
+	CViewTextMenu* CGroupSubMenu::addLineAtIndex(uint index,  const std::string &name,  const std::string &ah,
 												 const std::string &params,  const std::string &id /*=""*/,
 												 const std::string &cond /*=std::string()*/, const std::string &texture,
 												 bool checkable /*= false*/,  bool checked /*= false*/, bool formatted /*= false */
@@ -1319,11 +1319,11 @@ namespace NLGUI
 		{
 			pV->setMultiLine (true);
 			pV->setMultiLineMaxWOnly (true);
-			pV->setTextFormatTaged (name.toUtf8());
+			pV->setTextFormatTaged (name);
 		}
 		else
 		{
-			pV->setText (name.toUtf8());
+			pV->setText (name);
 		}
 
 		pV->setColor (_GroupMenu->_Color);
@@ -1602,7 +1602,7 @@ namespace NLGUI
 					texture = _Lines[k].ViewText->getCheckBox()->getTexture();
 				}
 				CViewTextMenu *pV = NULL;
-				pV = copyMenu->addLine (CUtfStringView(_Lines[k].ViewText->getText()).toUtf16(),  _Lines[k].AHName,  _Lines[k].AHParams,  _Lines[k].Id,  _Lines[k].Cond,
+				pV = copyMenu->addLine (_Lines[k].ViewText->getText(),  _Lines[k].AHName,  _Lines[k].AHParams,  _Lines[k].Id,  _Lines[k].Cond,
 						 texture, _Lines[k].ViewText->getCheckable(),  _Lines[k].ViewText->getChecked(), _Lines[k].ViewText->getFormatted ());
 				copyMenu->_Lines[k].Selectable = _Lines[k].Selectable;
 				pV->setGrayed(_Lines[k].ViewText->getGrayed());
@@ -1858,8 +1858,8 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 		ucstring arg1;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1));
-		addLine(arg1, ls.toString(2), ls.toString(3), ls.toString(4));
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1)); // FIXME: Lua UTF-8
+		addLine(arg1.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4));
 		return 0;
 	}
 
@@ -1874,8 +1874,8 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
 		ucstring arg1;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1));
-		addLine(arg1, ls.toString(2), ls.toString(3), ls.toString(4), string(), ls.toString(5));
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1)); // FIXME: Lua UTF-8
+		addLine(arg1.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4), string(), ls.toString(5));
 		return 0;
 	}
 
@@ -1890,8 +1890,8 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
 		ucstring arg2;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 2, arg2));
-		addLineAtIndex((uint) ls.toInteger(1), arg2, ls.toString(3), ls.toString(4), ls.toString(5));
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 2, arg2)); // FIXME: Lua UTF-8
+		addLineAtIndex((uint) ls.toInteger(1), arg2.toUtf8(), ls.toString(3), ls.toString(4), ls.toString(5));
 		return 0;
 	}
 
@@ -2532,25 +2532,7 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	void CGroupMenu::addLine (const string &name,  const string &ah,  const string &params,
-							  const std::string &id/*=std::string()*/,
-							  const std::string &cond /*= std::string()*/, const std::string &texture,
-							  bool checkable /*= false*/,  bool checked /*= false*/
-							 )
-	{
-		if (_RootMenu == NULL)
-		{
-			_RootMenu = new CGroupSubMenu(CViewText::TCtorParam());
-			_RootMenu->_GroupMenu = this;
-			_RootMenu->setSerializable( false );
-			addGroup (_RootMenu);
-		}
-
-		_RootMenu->addLine (name,  ah,  params,  id,  cond,  texture,  checkable,  checked, _Formatted);
-	}
-
-	// ------------------------------------------------------------------------------------------------
-	void CGroupMenu::addLine(const ucstring &name,  const std::string &ah,  const std::string &params,
+	void CGroupMenu::addLine(const std::string &name,  const std::string &ah,  const std::string &params,
 							 const std::string &id /* = std::string()*/,
 							 const std::string &cond /*= std::string()*/, const std::string &texture,
 							 bool checkable /*= false*/,  bool checked /*= false*/
@@ -2566,7 +2548,7 @@ namespace NLGUI
 		_RootMenu->addLine (name,  ah,  params,  id,  cond,  texture,  checkable,  checked, _Formatted);
 	}
 	// ------------------------------------------------------------------------------------------------
-	void CGroupMenu::addLineAtIndex(uint index, const ucstring &name, const std::string &ah,
+	void CGroupMenu::addLineAtIndex(uint index, const std::string &name, const std::string &ah,
 									const std::string &params, const std::string &id /*=std::string()*/,
 									const std::string &cond /*=std::string()*/, const std::string &texture,
 									bool checkable /*=false*/, bool checked /*=false*/)
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index f2027a404..a4c2a6da7 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -479,7 +479,7 @@ namespace NLGUI
 			if (NLMISC::startsWith(propPtr, "ui"))
 				addTextChild(CI18N::get(propPtr));
 			else
-				addTextChild(ucstring::makeFromUtf8(propPtr));
+				addTextChild(propPtr);
 		}
 		else
 		{
@@ -495,7 +495,7 @@ namespace NLGUI
 	}
 
 	// ----------------------------------------------------------------------------
-	void CGroupParagraph::addTextChild(const ucstring& line, bool multiLine /*= true*/)
+	void CGroupParagraph::addTextChild(const std::string& line, bool multiLine /*= true*/)
 	{
 		const string elid = _Id + ":el" + toString(_IdCounter); ++_IdCounter;
 		CViewText *view= new CViewText (elid, string(""), _Templ.getFontSize(), _Templ.getColor(), _Templ.getShadow());
@@ -503,7 +503,7 @@ namespace NLGUI
 		view->setMultiLine (multiLine);
 		view->setTextMode(_Templ.getTextMode());
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line.toUtf8());
+		view->setText (line);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
 		addChild (view);
@@ -513,14 +513,14 @@ namespace NLGUI
 
 
 	// ----------------------------------------------------------------------------
-	void CGroupParagraph::addTextChild(const ucstring& line, const CRGBA& textColor, bool multiLine /*= true*/)
+	void CGroupParagraph::addTextChild(const std::string& line, const CRGBA& textColor, bool multiLine /*= true*/)
 	{
 		const string elid = _Id + ":el" + toString(_IdCounter); ++_IdCounter;
 		CViewText *view= new CViewText (elid, string(""), _Templ.getFontSize(), _Templ.getColor(), _Templ.getShadow());
 		view->_Parent = this;
 		view->setMultiLine (multiLine);
 		if (multiLine) view->setMultiLineSpace (_Space);
-		view->setText (line.toUtf8());
+		view->setText (line);
 		view->setColor (textColor);
 		// Herit global-coloring
 		view->setModulateGlobalColor(getModulateGlobalColor());
diff --git a/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
index 93e9880bb..674da9546 100644
--- a/nel/src/gui/group_tree.cpp
+++ b/nel/src/gui/group_tree.cpp
@@ -309,7 +309,7 @@ namespace NLGUI
 				if (NLMISC::startsWith(ptrName, "ui"))
 					Text = CI18N::get(ptrName);
 				else
-					ucstring::makeFromUtf8(ptrName);
+					Text = ptrName;
 			}
 
 			CXMLAutoPtr color((const char*) xmlGetProp (cur,   (xmlChar*)"color"));
@@ -1292,7 +1292,7 @@ namespace NLGUI
 				CViewText *pVT = new CViewText(TCtorParam());
 				line.TextOrTemplate = pVT;
 				pVT->setId("t"+toString(_Lines.size()));
-				pVT->setText(pNode->Text.toUtf8());
+				pVT->setText(pNode->Text);
 				pVT->setColor(pNode->Color);
 				if(pNode->FontSize==-1)
 					pVT->setFontSize(_FontSize);
diff --git a/nel/src/gui/interface_expr.cpp b/nel/src/gui/interface_expr.cpp
index 813962526..c83c1d722 100644
--- a/nel/src/gui/interface_expr.cpp
+++ b/nel/src/gui/interface_expr.cpp
@@ -548,7 +548,7 @@ namespace NLGUI
 			case Boolean: return true;
 			case Integer: setBool(_IntegerValue != 0); return true;
 			case Double:  setBool(_DoubleValue != 0); return true;
-			case String:  return evalBoolean(_StringValue.toString().c_str()) != NULL;
+			case String:  return evalBoolean(_StringValue.c_str()) != NULL;
 			default: break;
 		}
 		return false;
@@ -564,7 +564,7 @@ namespace NLGUI
 			case Integer: return true;
 			case Double:  setInteger((sint64) _DoubleValue); return true;
 			case String:
-				if (evalNumber(_StringValue.toString().c_str())) return toInteger();
+				if (evalNumber(_StringValue.c_str())) return toInteger();
 				return false;
 			case RGBA:	setInteger((sint64) _RGBAValue); return true;
 			default: break;
@@ -581,7 +581,7 @@ namespace NLGUI
 			case Integer:	setDouble((double) _IntegerValue); return true;
 			case Double:	return true;
 			case String:
-				if (evalNumber(_StringValue.toString().c_str())) return toBool();
+				if (evalNumber(_StringValue.c_str())) return toBool();
 				return false;
 			case RGBA:	setDouble((double) _RGBAValue); return true;
 			default: break;
@@ -627,7 +627,7 @@ namespace NLGUI
 				return true;
 
 			case String:
-				setRGBA( NLMISC::CRGBA::stringToRGBA(_StringValue.toString().c_str()));
+				setRGBA( NLMISC::CRGBA::stringToRGBA(_StringValue.c_str()));
 				return true;
 
 			default:
@@ -869,14 +869,15 @@ namespace NLGUI
 	}
 
 	//==================================================================
-	std::string CInterfaceExprValue::getString() const
+	const std::string &CInterfaceExprValue::getString() const
 	{
 		if (_Type != String)
 		{
 			nlwarning("<CInterfaceExprValue::getString> bad type!");
-			return "";
+			static const std::string empty;
+			return empty;
 		}
-		return _StringValue.toString();
+		return _StringValue;
 	}
 
 	//==================================================================
@@ -895,19 +896,6 @@ namespace NLGUI
 		return col;
 	}
 
-
-	//==================================================================
-	const ucstring &CInterfaceExprValue::getUCString() const
-	{
-		if (_Type != String)
-		{
-			nlwarning("<CInterfaceExprValue::getString> bad type!");
-			static ucstring emptyString;
-			return emptyString;
-		}
-		return _StringValue;
-	}
-
 	//==================================================================
 	CInterfaceExprUserType *CInterfaceExprValue::getUserType() const
 	{
diff --git a/nel/src/gui/interface_expr_user_fct.cpp b/nel/src/gui/interface_expr_user_fct.cpp
index d0c687d26..7fc097f48 100644
--- a/nel/src/gui/interface_expr_user_fct.cpp
+++ b/nel/src/gui/interface_expr_user_fct.cpp
@@ -359,13 +359,13 @@ namespace NLGUI
 	{
 		if (!args.empty())
 		{
-			ucstring res;
+			string res;
 			for (uint32 i = 0; i < args.size(); ++i)
 			{
 				args[i].toString();
-				res += args[i].getUCString();
+				res += args[i].getString();
 			}
-			result.setUCString (res);
+			result.setString (res);
 
 			return true;
 		}
@@ -553,13 +553,13 @@ namespace NLGUI
 				result.setString ((elem->*(pRP->GetMethod.GetString))());
 			break;
 			case CReflectedProperty::UCString:
-				result.setUCString ((elem->*(pRP->GetMethod.GetUCString))());
+				result.setString ((elem->*(pRP->GetMethod.GetUCString))().toUtf8());
 			break;
 			case CReflectedProperty::StringRef:
 				result.setString ((elem->*(pRP->GetMethod.GetStringRef))());
 			break;
 			case CReflectedProperty::UCStringRef:
-				result.setUCString ((elem->*(pRP->GetMethod.GetUCStringRef))());
+				result.setString ((elem->*(pRP->GetMethod.GetUCStringRef))().toUtf8());
 			break;
 			case CReflectedProperty::RGBA:
 				result.setRGBA ((elem->*(pRP->GetMethod.GetRGBA))());
@@ -1072,7 +1072,7 @@ namespace NLGUI
 		}
 
 		sint64 nVal = args[0].getInteger();
-		ucstring sTmp;
+		string sTmp;
 
 		if (nVal < 0) nVal = 0;
 
@@ -1099,7 +1099,7 @@ namespace NLGUI
 			}
 		}
 
-		result.setUCString(sTmp);
+		result.setString(sTmp);
 
 		return true;
 	}
@@ -1121,7 +1121,7 @@ namespace NLGUI
 		}
 
 		sint64 nVal = args[0].getInteger();
-		ucstring sTmp;
+		string sTmp;
 
 		if (nVal < 0) nVal = 0;
 
@@ -1150,7 +1150,7 @@ namespace NLGUI
 			}
 		}
 
-		result.setUCString(sTmp);
+		result.setString(sTmp);
 
 		return true;
 	}
@@ -1186,7 +1186,7 @@ namespace NLGUI
 			  nlwarning("localize : 1 arg required");
 			  return false;
 		 }
-		 result.setUCString(CI18N::get(args[0].getString()));
+		 result.setString(CI18N::get(args[0].getString()));
 		 return true;
 	}
 	REGISTER_INTERFACE_USER_FCT("localize", localize);
diff --git a/nel/src/gui/interface_link.cpp b/nel/src/gui/interface_link.cpp
index 03a1212d3..1cad39c94 100644
--- a/nel/src/gui/interface_link.cpp
+++ b/nel/src/gui/interface_link.cpp
@@ -121,7 +121,7 @@ namespace NLGUI
 			case CReflectedProperty::UCStringRef:
 				if (valueToAffect.toString())
 				{
-					(destElem.*(property.SetMethod.SetUCString))(valueToAffect.getUCString());
+					(destElem.*(property.SetMethod.SetUCString))(ucstring::makeFromUtf8(valueToAffect.getString()));
 				}
 				else
 				{
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index 908898e74..c915a8671 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -1145,34 +1145,8 @@ namespace NLGUI
 				ls.push(value.getDouble());
 				break;
 			case CInterfaceExprValue::String:
-				{
-					ucstring	ucstr= value.getUCString();
-					// Yoyo: dynamically decide whether must return a string or a ucstring
-					bool	mustUseUCString= false;
-					for (uint i = 0; i < ucstr.size (); i++)
-					{
-						if (ucstr[i] > 255)
-						{
-							mustUseUCString= true;
-							break;
-						}
-					}
-					// push a ucstring?
-					if(mustUseUCString)
-					{
-	#if LUABIND_VERSION > 600
-						luabind::detail::push(ls.getStatePointer(), ucstr);
-	#else
-						luabind::object obj(ls.getStatePointer(), ucstr);
-						obj.pushvalue();
-	#endif
-					}
-					else
-					{
-						ls.push(ucstr.toString());
-					}
-					break;
-				}
+				ls.push(value.getString());
+				break;
 			case CInterfaceExprValue::RGBA:
 				{
 					CRGBA color = value.getRGBA();
diff --git a/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
index 973708aa6..3c319c228 100644
--- a/nel/src/gui/view_pointer.cpp
+++ b/nel/src/gui/view_pointer.cpp
@@ -250,7 +250,7 @@ namespace NLGUI
 
 				if (vLink->getMouseOverShape(tooltip, rot, col))
 				{
-					setString(ucstring::makeFromUtf8(tooltip));
+					setString(tooltip);
 					sint32 texId = rVR.getTextureIdFromName ("curs_pick.tga");
 
 					CInterfaceGroup *stringCursor = hwMouse ? _StringCursorHardware : _StringCursor;
@@ -406,7 +406,7 @@ namespace NLGUI
 				splitString(tooltipInfos, "@", tooltipInfosList);
 				texName = tooltipInfosList[0];
 				tooltip = tooltipInfosList[1];
-				setString(ucstring::makeFromUtf8(tooltip));
+				setString(tooltip);
 				CViewRenderer &rVR = *CViewRenderer::getInstance();
 				sint32 texId = rVR.getTextureIdFromName (texName);
 
@@ -449,7 +449,7 @@ namespace NLGUI
 	}
 
 	// --------------------------------------------------------------------------------------------------------------------
-	void CViewPointer::setString (const ucstring &str, CInterfaceGroup *target)
+	void CViewPointer::setString(const std::string &str, CInterfaceGroup *target)
 	{
 		if (target)
 		{
@@ -458,14 +458,14 @@ namespace NLGUI
 			{
 				CViewText *text = dynamic_cast<CViewText*> (element);
 				if (text)
-					text->setText(str.toUtf8());
+					text->setText(str);
 			}
 			element = target->getView ("real_txt");
 			if (element)
 			{
 				CViewText *text = dynamic_cast<CViewText*> (element);
 				if (text)
-					text->setText(str.toUtf8());
+					text->setText(str);
 			}
 			target->updateCoords();
 			target->updateCoords();
@@ -475,7 +475,7 @@ namespace NLGUI
 
 
 	// --------------------------------------------------------------------------------------------------------------------
-	void CViewPointer::setString (const ucstring &str)
+	void CViewPointer::setString (const std::string &str)
 	{
 		if (_ContextString != str)
 		{
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 69b117330..b5744925f 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -3207,7 +3207,7 @@ namespace NLGUI
 
 
 	// ***************************************************************************
-	void		CViewText::buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CViewText::CFormatTag> &formatTags, std::vector<ucstring> &tooltips)
+	void		CViewText::buildFormatTagText(const std::string &text, std::string &textBuild, std::vector<CViewText::CFormatTag> &formatTags, std::vector<std::string> &tooltips)
 	{
 		formatTags.clear();
 		tooltips.clear();
@@ -3243,7 +3243,7 @@ namespace NLGUI
 				// get old tag.
 				CViewText::CFormatTag ct= precTag;
 				// get new Tab and skip tag.
-				ucstring uitt = getTooltipTag(text, i);
+				string uitt = getTooltipTag(text, i);
 				if (uitt.empty())
 				{
 					ct.IndexTt= -1;
@@ -3296,7 +3296,7 @@ namespace NLGUI
 		std::string							tempText;
 		// static to avoid reallocation
 		static std::vector<CFormatTag>		tempFormatTags;
-		static std::vector<ucstring>		tempTooltips;
+		static std::vector<std::string>		tempTooltips;
 		buildFormatTagText(text, tempText, tempFormatTags, tempTooltips);
 		setCase (tempText, _CaseMode);
 
@@ -3344,7 +3344,7 @@ namespace NLGUI
 				pTooltip->setId(_Id+"_tt"+toString(i));
 				pTooltip->setAvoidResizeParent(avoidResizeParent());
 				pTooltip->setRenderLayer(getRenderLayer());
-				std::string tempTooltipStr = tempTooltips[i].toUtf8();
+				std::string tempTooltipStr = tempTooltips[i];
 				bool isI18N = NLMISC::startsWith(tempTooltipStr, "ui");
 				pTooltip->setDefaultContextHelp(isI18N ? CI18N::get(tempTooltipStr) : tempTooltipStr);
 				pTooltip->setParentPos(this);
@@ -3390,7 +3390,7 @@ namespace NLGUI
 		// to allow cache (avoid infinite recurse in updateCoords() in some case), compute in temp
 		std::string							tempText;
 		static std::vector<CFormatTag>		tempLetterColors;
-		static std::vector<ucstring>		tempTooltips;
+		static std::vector<std::string>		tempTooltips;
 
 		// parse text
 		buildFormatTagText(text, tempText, tempLetterColors, tempTooltips);
diff --git a/nel/src/gui/view_text_formated.cpp b/nel/src/gui/view_text_formated.cpp
index 87cfc12bb..dfd57eadf 100644
--- a/nel/src/gui/view_text_formated.cpp
+++ b/nel/src/gui/view_text_formated.cpp
@@ -38,7 +38,7 @@ namespace NLGUI
     {
 		if (name == "format")
 		{
-			return getFormatString().toUtf8();
+			return getFormatString();
 		}
 		else
 			return CViewText::getProperty(name);
@@ -48,7 +48,7 @@ namespace NLGUI
     {
 	    if (name == "format")
 	    {
-		    setFormatString(ucstring::makeFromUtf8(value));
+		    setFormatString(value);
 		    return;
 	    }
 	    else
@@ -62,7 +62,7 @@ namespace NLGUI
 			return NULL;
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_formated" );
-		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().toUtf8().c_str() );
+		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().c_str() );
 
 		return NULL;
 	}
@@ -73,9 +73,9 @@ namespace NLGUI
 		if (!CViewText::parse(cur, parentGroup)) return false;
 		CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
 		if (prop)
-			setFormatString(ucstring::makeFromUtf8((const char *)prop));
+			setFormatString((const char *)prop);
 		else
-			setFormatString(ucstring("$t"));
+			setFormatString("$t");
 		return true;
 	}
 
@@ -83,26 +83,27 @@ namespace NLGUI
 	void CViewTextFormated::checkCoords()
 	{
 		if (!getActive()) return;
-		ucstring formatedResult;
-		formatedResult = formatString(_FormatString, ucstring(""));
+		std::string formatedResult;
+		formatedResult = formatString(_FormatString, std::string());
 
 		//
-		setText (formatedResult.toUtf8());
+		setText (formatedResult);
 		CViewText::checkCoords();
 	}
 
 	// ****************************************************************************
-	void CViewTextFormated::setFormatString(const ucstring &format)
+	void CViewTextFormated::setFormatString(const std::string &format)
 	{
-		_FormatString = format;
-		if ( (_FormatString.size()>2) && (_FormatString[0] == 'u') && (_FormatString[1] == 'i'))
-			_FormatString = NLMISC::CI18N::get (format.toString());
+		if (NLMISC::startsWith(format, "ui"))
+			_FormatString = NLMISC::CI18N::get(format);
+		else
+			_FormatString = format;
 	}
 
 	// ****************************************************************************
-	ucstring CViewTextFormated::formatString(const ucstring &inputString, const ucstring &paramString)
+	std::string CViewTextFormated::formatString(const std::string &inputString, const std::string &paramString)
 	{
-		ucstring formatedResult;
+		std::string formatedResult;
 
 		if( textFormatter == NULL )
 			formatedResult = inputString;
diff --git a/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
index 065d02e71..1f1ac5440 100644
--- a/nel/src/gui/view_text_id.cpp
+++ b/nel/src/gui/view_text_id.cpp
@@ -204,7 +204,7 @@ namespace NLGUI
 		if (!_Initialized)
 		{
 			// String result
-			ucstring result;
+			string result;
 
 			if( textProvider != NULL )
 			{
@@ -218,8 +218,8 @@ namespace NLGUI
 			// Remove all {break}
 			for(;;)
 			{
-				ucstring::size_type index = result.find (ucstring("{break}"));
-				if (index == ucstring::npos) break;
+				string::size_type index = result.find("{break}");
+				if (index == string::npos) break;
 				result = result.substr (0, index) + result.substr(index+7, result.size());
 			}
 
@@ -229,13 +229,13 @@ namespace NLGUI
 
 			// Modify the text?
 			if(_StringModifier)
-				_StringModifier->onReceiveTextId(result);
+				_StringModifier->onReceiveTextId(ucstring::makeFromUtf8(result));
 
 			// Set the Text
 			if(_IsTextFormatTaged)
-				setTextFormatTaged(result.toUtf8());
+				setTextFormatTaged(result);
 			else
-				setText (result.toUtf8());
+				setText(result);
 		}
 		CViewText::checkCoords();
 	}
diff --git a/nel/src/gui/view_text_id_formated.cpp b/nel/src/gui/view_text_id_formated.cpp
index 5b1dd2a14..88f9a58e0 100644
--- a/nel/src/gui/view_text_id_formated.cpp
+++ b/nel/src/gui/view_text_id_formated.cpp
@@ -37,7 +37,7 @@ namespace NLGUI
 	{
 		if (name == "format")
 		{
-			return getFormatString().toUtf8();
+			return getFormatString();
 		}
 		else
 			return CViewTextID::getProperty(name);
@@ -47,7 +47,7 @@ namespace NLGUI
 	{
 		if (name == "format")
 		{
-			setFormatString(ucstring::makeFromUtf8(value));
+			setFormatString(value);
 			return;
 		}
 		else
@@ -61,7 +61,7 @@ namespace NLGUI
 			return NULL;
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_id_formated" );
-		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().toUtf8().c_str() );
+		xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().c_str() );
 
 		return node;
 	}
@@ -72,9 +72,9 @@ namespace NLGUI
 		if (!CViewTextID::parse(cur, parentGroup)) return false;
 		CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
 		if (prop)
-			setFormatString(ucstring::makeFromUtf8((const char *)prop));
+			setFormatString((const char *)prop);
 		else
-			setFormatString(ucstring("$t"));
+			setFormatString("$t");
 		return true;
 	}
 
@@ -89,15 +89,15 @@ namespace NLGUI
 
 		if (!_Initialized)
 		{
-			ucstring result, formatedResult;
+			std::string result, formatedResult;
 			bool bValid;
 
 			if( CViewTextID::getTextProvider() == NULL )
 			{
 				if(!_DBPath.empty())
-					result = ucstring(_DBPath);
+					result = _DBPath;
 				else
-					result = ucstring("Text ID = " + NLMISC::toString(_TextId));
+					result = "Text ID = " + NLMISC::toString(_TextId);
 				bValid = true;
 			}
 			else
@@ -106,7 +106,7 @@ namespace NLGUI
 			}
 			formatedResult = CViewTextFormated::formatString(_FormatString, result);
 			//
-			setText (formatedResult.toUtf8());
+			setText (formatedResult);
 			//
 			if (bValid)
 			{
@@ -117,12 +117,13 @@ namespace NLGUI
 	}
 
 	// ****************************************************************************
-	void CViewTextIDFormated::setFormatString(const ucstring &format)
+	void CViewTextIDFormated::setFormatString(const std::string &format)
 	{
 		_Initialized = false;
-		_FormatString = format;
-		if ( (_FormatString.size()>2) && (_FormatString[0] == 'u') && (_FormatString[1] == 'i'))
-			_FormatString = NLMISC::CI18N::get (format.toString());
+		if (NLMISC::startsWith(format, "ui"))
+			_FormatString = NLMISC::CI18N::get(format);
+		else
+			_FormatString = format;
 	}
 
 }
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 39493495f..b6370602e 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1350,7 +1350,7 @@ void setTarget(CCtrlBase *ctrl, const string &targetName, ucstring &value)
 	if (ig)
 	{
 		CInterfaceExprValue exprValue;
-		exprValue.setUCString(value);
+		exprValue.setString(value.toUtf8());
 
 		CInterfaceLink::splitLinkTargets(targetName, ig, targets);
 		for(uint k = 0; k < targets.size(); ++k)
diff --git a/ryzom/client/src/contextual_cursor.cpp b/ryzom/client/src/contextual_cursor.cpp
index 15dd6a17a..11398f620 100644
--- a/ryzom/client/src/contextual_cursor.cpp
+++ b/ryzom/client/src/contextual_cursor.cpp
@@ -162,7 +162,7 @@ bool CContextualCursor::context(const std::string &contextName, float dist, cons
 				if(cursName.empty())
 					cursor->setString(CI18N::get(functions.cursor));
 				else
-					cursor->setString(cursName);
+					cursor->setString(cursName.toUtf8());
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 4281181a9..dacb6f100 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2074,9 +2074,9 @@ class CActionHandlerSetTargetName : public IActionHandler
 			// Set to target
 			CInterfaceExprValue evUCStr;
 			TargetName = STRING_MANAGER::CStringManagerClient::getLocalizedName(TargetName);
-			evUCStr.setUCString(TargetName);
+			evUCStr.setString(TargetName.toUtf8());
 			CInterfaceLink::setTargetProperty(sNameTarget, evUCStr);
-			evUCStr.setUCString(TargetTitle);
+			evUCStr.setString(TargetTitle.toUtf8());
 			CInterfaceLink::setTargetProperty(sTitleTarget, evUCStr);
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 2d6a7e6f5..23992f4f6 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -2046,9 +2046,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 				std::string name = groupNames[i];
 				std::string ahParams = "name=" + name;
 				//Use ucstring because group name can contain accentued characters (and stuff like that)
-				ucstring nameUC;
-				nameUC.fromUtf8(name);
-				pGroupMenu->addLine(nameUC, "", "", name);
+				pGroupMenu->addLine(name, "", "", name);
 				CGroupSubMenu* pNewSubMenu = new CGroupSubMenu(CViewBase::TCtorParam());
 				pGroupMenu->setSubMenu(pGroupMenu->getNumLine()-1, pNewSubMenu);
 				if(pNewSubMenu)
@@ -2074,7 +2072,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 						{
 							//there is an offset of 1 because TInventory names are pet_animal1/2/3/4
 							std::string dst = toString("destination=pet_animal%d|", j + 1);
-							CViewTextMenu* tmp = pNewSubMenu->addLine(ucstring(pMoveToPa[j]->getHardText()),"item_group_move",  dst + ahParams, name + toString("_pa%d", j + 1));
+							CViewTextMenu* tmp = pNewSubMenu->addLine(pMoveToPa[j]->getHardText(),"item_group_move",  dst + ahParams, name + toString("_pa%d", j + 1));
 							if(tmp) tmp->setGrayed(pMoveToPa[j]->getGrayed());
 						}
 					}
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index a73d884e8..f55d376bd 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1668,7 +1668,7 @@ static DECLARE_INTERFACE_USER_FCT(getSPhraseName)
 			return false;
 		sint	sphraseId= (sint)args[0].getInteger();
 		CSPhraseManager		*pPM= CSPhraseManager::getInstance();
-		result.setUCString(pPM->getPhrase(sphraseId).Name);
+		result.setString(pPM->getPhrase(sphraseId).Name.toUtf8());
 		return true;
 	}
 	else
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 8fa8bd08e..4c67b70b3 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -2575,11 +2575,11 @@ static DECLARE_INTERFACE_USER_FCT(getPriceWithFame)
 	sint	value= (sint)args[0].getInteger();
 	sint	valueFame= (sint)args[1].getInteger();
 	if(value==-1)
-		result.setUCString(CI18N::get("uiBadPrice"));
+		result.setString(CI18N::get("uiBadPrice"));
 	else if(value==valueFame)
-		result.setUCString(NLMISC::formatThousands(toString(value)));
+		result.setString(NLMISC::formatThousands(toString(value)));
 	else
-		result.setUCString(NLMISC::formatThousands(toString(valueFame)) + " (" + NLMISC::formatThousands(toString(value)) + ")");
+		result.setString(NLMISC::formatThousands(toString(valueFame)) + " (" + NLMISC::formatThousands(toString(value)) + ")");
 
 	return true;
 }
@@ -2595,7 +2595,7 @@ static DECLARE_INTERFACE_USER_FCT(getBonusOnResale)
 	sint	valueHigh= (sint)args[0].getInteger();
 	sint	valueLow= (sint)args[1].getInteger();
 	sint	diff = valueHigh - valueLow;
-	result.setUCString("+" + NLMISC::formatThousands(toString(diff)));
+	result.setString("+" + NLMISC::formatThousands(toString(diff)));
 
 	return true;
 }
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
index da46e9e7b..f008c32f1 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
@@ -56,7 +56,7 @@ CViewText *CDBGroupListSheetMission::CSheetChildMission::createViewText() const
 	CViewTextIDFormated *vti = new CViewTextIDFormated(CViewBase::TCtorParam());
 	if (Ctrl) vti->setDBLeaf(dynamic_cast<CCDBNodeLeaf *>(Ctrl->getRootBranch()->getNode(ICDBNode::CTextId("TEXT"))));
 	else vti->setDBLeaf(NULL);
-	vti->setFormatString(ucstring("$t"));
+	vti->setFormatString("$t");
 	return vti;
 }
 
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index 6ab68522d..c9912325f 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -205,7 +205,7 @@ void CEncyclopediaManager::rebuildAlbumList()
 		if (_Albums[i].Name == _AlbumNameSelected)
 			pAlb->Opened = true;
 		if (pSMC->getDynString(_Albums[i].Name, res))
-			pAlb->Text = res;
+			pAlb->Text = res.toUtf8();
 		else
 			nlwarning("try to construct album without name");
 
@@ -217,7 +217,7 @@ void CEncyclopediaManager::rebuildAlbumList()
 			pThm->AHName = "ency_click_thema";
 			pThm->AHParams = toString(_Albums[i].Themas[j].Name);
 			if (pSMC->getDynString(_Albums[i].Themas[j].Name, res))
-				pThm->Text = res;
+				pThm->Text = res.toUtf8();
 			else
 				nlwarning("try to construct thema without name");
 
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index b43f50a89..f7418e868 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -710,7 +710,7 @@ void CGroupCompasMenu::setActive (bool state)
 			ct.setType(CCompassTarget::North);
 			ct.Name = CI18N::get("uiNorth");
 			Targets.push_back(ct);
-			getRootMenu()->addLineAtIndex(lineIndex ++, ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+			getRootMenu()->addLineAtIndex(lineIndex ++, ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			// Home
 			CCDBNodeLeaf *pos = NLGUI::CDBManager::getInstance()->getDbProp(COMPASS_DB_PATH ":HOME_POINT");
 			sint32 px = (sint32) (pos->getValue64() >> 32);
@@ -720,7 +720,7 @@ void CGroupCompasMenu::setActive (bool state)
 				ct.setType(CCompassTarget::Home);
 				ct.Name = CI18N::get("uiHome");
 				Targets.push_back(ct);
-				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			}
 			// Respawn
 			pos = NLGUI::CDBManager::getInstance()->getDbProp(COMPASS_DB_PATH ":BIND_POINT");
@@ -731,7 +731,7 @@ void CGroupCompasMenu::setActive (bool state)
 				ct.setType(CCompassTarget::Respawn);
 				ct.Name = CI18N::get("uiRespawn");
 				Targets.push_back(ct);
-				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			}
 
 			// As of 6/5/2007 : The option to point the selection is always proposed even if no slot is currently targeted
@@ -741,7 +741,7 @@ void CGroupCompasMenu::setActive (bool state)
 				if (entity != NULL)
 				{*/
 					//ucstring targetName = CI18N::get("uiTargetTwoPoint") + entity->removeTitleAndShardFromName(entity->getEntityName());
-					ucstring targetName = CI18N::get("uiTarget");
+					std::string targetName = CI18N::get("uiTarget");
 					ct.setType(CCompassTarget::Selection);
 					ct.Name = targetName;
 					Targets.push_back(ct);
@@ -789,7 +789,7 @@ void CGroupCompasMenu::setActive (bool state)
 									ct.setPositionState(tracker);
 									ct.Name = name;
 									Targets.push_back(ct);
-									missionSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+									missionSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 									selectable= true;
 								}
 							}
@@ -846,7 +846,7 @@ void CGroupCompasMenu::setActive (bool state)
 					ct.Pos = currCont->ContLandMarks[k].Pos;
 					ct.Name = CStringManagerClient::getPlaceLocalizedName(currCont->ContLandMarks[k].TitleTextID);
 					Targets.push_back(ct);
-					landMarkSubMenu->addLineAtIndex(contLandMarkIndex++, ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					landMarkSubMenu->addLineAtIndex(contLandMarkIndex++, ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 				// separator?
@@ -869,7 +869,7 @@ void CGroupCompasMenu::setActive (bool state)
 						ct.Pos = sortedLandmarks[k].Pos;
 						ct.Name = sortedLandmarks[k].Title;
 						Targets.push_back(ct);
-						landMarkSubMenus[sortedLandmarks[k].Type]->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+						landMarkSubMenus[sortedLandmarks[k].Type]->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 						selectable= true;
 					}
 				}
@@ -900,7 +900,7 @@ void CGroupCompasMenu::setActive (bool state)
 				if (buildCompassTargetFromTeamMember(ct, k))
 				{
 					Targets.push_back(ct);
-					teamSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					teamSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
@@ -923,7 +923,7 @@ void CGroupCompasMenu::setActive (bool state)
 				if (buildCompassTargetFromAnimalMember(ct, k))
 				{
 					Targets.push_back(ct);
-					animalSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					animalSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
@@ -951,7 +951,7 @@ void CGroupCompasMenu::setActive (bool state)
 					CSmartPtr<CDialogEntityPositionState> tracker = new CDialogEntityPositionState( i );
 					ct.setPositionState(tracker);
 					Targets.push_back(ct);
-					dialogsSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					dialogsSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index ac70c57cc..d7d68477f 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -3811,7 +3811,7 @@ void CGroupMap::updateClosestLandMarkMenu(const std::string &menu, const NLMISC:
 		std::string lineId = toString("%s:lmcosest%d", menu.c_str(), i);
 		std::string ahParams = toString("type=user|map=%s|index=%d", _Id.c_str(), index);
 
-		CViewTextMenu* vt = rootMenu->addLine(ucstring(""), "map_landmark_by_index", ahParams, lineId.c_str(), "", "", false, false, false);
+		CViewTextMenu* vt = rootMenu->addLine(std::string(), "map_landmark_by_index", ahParams, lineId.c_str(), "", "", false, false, false);
 		if (!vt) break;
 
 		vt->setSingleLineTextFormatTaged(name.toUtf8());
diff --git a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
index 04d05e6f2..62d96280f 100644
--- a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
+++ b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
@@ -224,7 +224,7 @@ void	CGroupPhraseSkillFilter::rebuild()
 			// just text
 			pNode->DisplayText = true;
 			pNode->Template = NULL;
-			pNode->Text= STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i);;
+			pNode->Text = CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i)).toUtf8();
 
 			// Action handler?
 			if(!_AHCtrlNode.empty())
diff --git a/ryzom/client/src/interface_v3/group_skills.cpp b/ryzom/client/src/interface_v3/group_skills.cpp
index 053bddf86..4248ea898 100644
--- a/ryzom/client/src/interface_v3/group_skills.cpp
+++ b/ryzom/client/src/interface_v3/group_skills.cpp
@@ -245,11 +245,11 @@ static DECLARE_INTERFACE_USER_FCT(getSkillBaseText)
 
 	if(skillValue!=skillBase)
 	{
-		result.setUCString( toString("(%d)", skillBase) );
+		result.setString( toString("(%d)", skillBase) );
 	}
 	else
 	{
-		result.setUCString( ucstring() );
+		result.setString( std::string() );
 	}
 
 	return true;
@@ -335,7 +335,7 @@ void CGroupSkills::createAllTreeNodes()
 
 	// local variable (avoid realloc in loop)
 	vector< pair<string, string> > tempVec(2);
-	ucstring	sSkillName;
+	string	sSkillName;
 
 	while ((!bQuit) && (nCounter < 32)) // Counter is used to not infinitly loop
 	{
@@ -365,7 +365,7 @@ void CGroupSkills::createAllTreeNodes()
 			pNode->Id = NLMISC::toString(i);
 
 			// get Skill Name
-			sSkillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i);
+			sSkillName = CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i)).toUtf8();
 
 			// just text or template?
 			if(_TemplateSkill.empty())
@@ -387,7 +387,7 @@ void CGroupSkills::createAllTreeNodes()
 				// Set Skill Name
 				CViewText *pViewSkillName = dynamic_cast<CViewText*>(pIG->getView("name"));
 				if (pViewSkillName != NULL)
-					pViewSkillName->setText (sSkillName.toUtf8());
+					pViewSkillName->setText (sSkillName);
 				// Set Skill Max Value
 				CViewText *pViewSkillMax = dynamic_cast<CViewText*>(pIG->getView("max"));
 				if (pViewSkillMax != NULL)
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
index 30126c0d9..82b928211 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@@ -176,7 +176,7 @@ static DECLARE_INTERFACE_USER_FCT(getCompassText)
 		"uiWNW",
 	};
 
-	result.setUCString( CI18N::get(txts[direction]) );
+	result.setString( CI18N::get(txts[direction]) );
 	return true;
 }
 REGISTER_INTERFACE_USER_FCT("getCompassText", getCompassText);
@@ -251,7 +251,7 @@ static DECLARE_INTERFACE_USER_FCT(getDifficultyText)
 	}
 
 	SENTENCE_APPRAISAL::ESentenceAppraisal sa = (SENTENCE_APPRAISAL::ESentenceAppraisal)args[0].getInteger();
-	result.setUCString (CI18N::get(SENTENCE_APPRAISAL::toString(sa)));
+	result.setString (CI18N::get(SENTENCE_APPRAISAL::toString(sa)));
 
 	return true;
 }
@@ -665,14 +665,14 @@ static DECLARE_INTERFACE_USER_FCT(getKey)
 	CActionsManager::TActionComboMap::const_iterator it = acmap.find(CAction::CName(name.c_str(),param.c_str()));
 	if (it != acmap.end())
 	{
-		result.setUCString (it->second.toUCString());
+		result.setString (it->second.toUCString().toUtf8());
 	}
 	else
 	{
 		if (notna)
-			result.setUCString (ucstring(""));
+			result.setString (std::string());
 		else
-			result.setUCString (CI18N::get("uiNotAssigned"));
+			result.setString (CI18N::get("uiNotAssigned"));
 	}
 
 	return true;
@@ -1025,9 +1025,9 @@ static DECLARE_INTERFACE_USER_FCT(getBotChatBuyFilterMPText)
 
 	RM_FABER_TYPE::TRMFType		faberType= (RM_FABER_TYPE::TRMFType)args[0].getInteger();
 	if(faberType>=RM_FABER_TYPE::Unknown)
-		result.setUCString(CI18N::get("uittBCNoItemPartFilter"));
+		result.setString(CI18N::get("uittBCNoItemPartFilter"));
 	else
-		result.setUCString(RM_FABER_TYPE::toLocalString(faberType));
+		result.setString(RM_FABER_TYPE::toLocalString(faberType));
 
 	return true;
 }
@@ -1076,15 +1076,15 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostName)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const ucstring name(pSMC->getOutpostLocalizedName(CSheetId(nSheet)));
+	const std::string name = CUtfStringView(pSMC->getOutpostLocalizedName(CSheetId(nSheet))).toUtf8();
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1103,15 +1103,15 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostDesc)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const ucstring name(pSMC->getOutpostLocalizedDescription(CSheetId(nSheet)));
+	const string name = CUtfStringView(pSMC->getOutpostLocalizedDescription(CSheetId(nSheet))).toUtf8();
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1130,15 +1130,15 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostBuildingName)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const ucstring name(pSMC->getOutpostBuildingLocalizedName(CSheetId(nSheet)));
+	const string name = CUtfStringView(pSMC->getOutpostBuildingLocalizedName(CSheetId(nSheet))).toUtf8();
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1157,12 +1157,12 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostBuildingDesc)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
-	ucstring name;
+	string name;
 	CEntitySheet *pSheet= SheetMngr.get(CSheetId(nSheet));
 	COutpostBuildingSheet *pOBS = dynamic_cast<COutpostBuildingSheet*>(pSheet);
 	if (pOBS && pOBS->OBType == COutpostBuildingSheet::OB_Empty)
@@ -1173,11 +1173,11 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostBuildingDesc)
 	else
 	{
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-		name = pSMC->getOutpostBuildingLocalizedDescription(CSheetId(nSheet));
+		name = CUtfStringView(pSMC->getOutpostBuildingLocalizedDescription(CSheetId(nSheet))).toUtf8();
 	}
 
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1196,15 +1196,15 @@ static DECLARE_INTERFACE_USER_FCT(getSquadName)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const ucstring name(pSMC->getSquadLocalizedName(CSheetId(nSheet)));
+	const string name = CUtfStringView(pSMC->getSquadLocalizedName(CSheetId(nSheet))).toUtf8();
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1223,15 +1223,15 @@ static DECLARE_INTERFACE_USER_FCT(getSquadDesc)
 	uint32	nSheet = (uint32)args[0].getInteger();
 	if (nSheet == 0)
 	{
-		result.setUCString(string(""));
+		result.setString(string());
 		return true;
 	}
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const ucstring name(pSMC->getSquadLocalizedDescription(CSheetId(nSheet)));
+	const string name = CUtfStringView(pSMC->getSquadLocalizedDescription(CSheetId(nSheet))).toUtf8();
 
-	result.setUCString(name);
+	result.setString(name);
 
 	return true;
 }
@@ -1284,7 +1284,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostPeriod)
 	// if status wanted is peace or unknow, then "N/A", because there is no attack period in peace mode
 	if( status==OUTPOSTENUMS::Peace || status==OUTPOSTENUMS::UnknownOutpostState )
 	{
-		result.setUCString(string(" - "));
+		result.setString(string(" - "));
 		return true;
 	}
 
@@ -1292,7 +1292,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostPeriod)
 	if( (isAttackPeriod && status>OUTPOSTENUMS::AttackRound) ||
 		(!isAttackPeriod && status>OUTPOSTENUMS::DefenseRound) )
 	{
-		result.setUCString(CI18N::get("uiOutpostPeriodEnded"));
+		result.setString(CI18N::get("uiOutpostPeriodEnded"));
 		return true;
 	}
 
@@ -1312,7 +1312,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostPeriod)
 	tstruct= gmtime(&tval);
 	if(!tstruct)
 	{
-		result.setUCString(string("Bad Date Received"));
+		result.setString(string("Bad Date Received"));
 		return true;
 	}
 	dname= tstruct->tm_wday;	// 0-6 (Sunday==0!!)
@@ -1325,21 +1325,21 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostPeriod)
 	tstruct= gmtime(&tval);
 	if(!tstruct)
 	{
-		result.setUCString(string("Bad Date Received"));
+		result.setString(string("Bad Date Received"));
 		return true;
 	}
 	hend= tstruct->tm_hour;	// 0-23
 	mend= tstruct->tm_min;	// 0-59
 
 	// translate
-	ucstring	res= CI18N::get("uiOutpostPeriodFormat");
+	string	res= CI18N::get("uiOutpostPeriodFormat");
 	strFindReplace( res, "%dayname", CI18N::get(toString("uiDay%d", dname)) );
 	strFindReplace( res, "%daynumber", toString(dnumber) );
 	strFindReplace( res, "%month", CI18N::get(toString("uiMonth%02d", month+1)) );
 	strFindReplace( res, "%timestart", toString("%02d:%02d", hstart, mstart) );
 	strFindReplace( res, "%timeend", toString("%02d:%02d", hend, mend) );
 
-	result.setUCString(res);
+	result.setString(res);
 	return true;
 }
 REGISTER_INTERFACE_USER_FCT("getOutpostPeriod", getOutpostPeriod)
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
index 9aeec4e5f..b686db2be 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
@@ -312,16 +312,16 @@ static DECLARE_INTERFACE_USER_FCT(getSheetName)
 	// if from ctrlSheet, then take the correct ACTUAL name (ie from NAMEID if not 0)
 	if(ctrlSheet)
 	{
-		result.setUCString(ctrlSheet->getItemActualName());
+		result.setString(ctrlSheet->getItemActualName().toUtf8());
 		return true;
 	}
 	// Standard (but less accurate) way
 	else
 	{
 		const CItemSheet *itemSheet = getItemSheet(args);
-		ucstring tmp;
-		if (itemSheet != NULL) tmp = STRING_MANAGER::CStringManagerClient::getItemLocalizedName(itemSheet->Id);
-		result.setUCString(tmp);
+		string tmp;
+		if (itemSheet != NULL) tmp = CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedName(itemSheet->Id)).toUtf8();
+		result.setString(tmp);
 		return true;
 	}
 }
@@ -345,9 +345,9 @@ static DECLARE_INTERFACE_USER_FCT(getItemTranslatedName)
 		return false;
 	}
 
-	ucstring tmp;
-	tmp = STRING_MANAGER::CStringManagerClient::getItemLocalizedName(sheet);
-	result.setUCString(tmp);
+	string tmp;
+	tmp = CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedName(sheet)).toUtf8();
+	result.setString(tmp);
 	return true;
 }
 REGISTER_INTERFACE_USER_FCT("getItemTranslatedName", getItemTranslatedName)
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 3bae5ccbc..089dc39d0 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -324,12 +324,12 @@ class CStringManagerTextProvider : public CViewTextID::IViewTextProvider
 class CRyzomTextFormatter : public CViewTextFormated::IViewTextFormatter
 {
 public:
-	ucstring formatString( const ucstring &inputString, const ucstring &paramString )
+	std::string formatString( const std::string &inputString, const std::string &paramString )
 	{
-		ucstring formatedResult;
+		std::string formatedResult;
 
 		// Apply the format
-		for(ucstring::const_iterator it = inputString.begin(); it != inputString.end();)
+		for(std::string::const_iterator it = inputString.begin(); it != inputString.end();)
 		{
 			if (*it == '$')
 			{
@@ -347,13 +347,14 @@ public:
 				case 'p':  // add player name
 					if (ClientCfg.Local)
 					{
-						formatedResult += ucstring("player");
+						if (*it == 'P') formatedResult += "PLAYER";
+						else formatedResult += "Player";
 					}
 					else
 					{
 						if(UserEntity)
 						{
-							ucstring name = UserEntity->getEntityName();
+							std::string name = UserEntity->getEntityName().toUtf8();
 							if (*it == 'P') name = toUpper(name);
 							formatedResult += name;
 						}
@@ -363,11 +364,11 @@ public:
 				case 's':
 				case 'b': // add bot name
 					{
-						ucstring botName;
+						string botName;
 						bool womanTitle = false;
 						if (ClientCfg.Local)
 						{
-							botName = ucstring("NPC");
+							botName = "NPC";
 						}
 						else
 						{
@@ -387,7 +388,7 @@ public:
 									}
 									else
 									{
-										botName = entity->getDisplayName();
+										botName = entity->getDisplayName().toUtf8();
 									}
 									CCharacterCL *pChar = dynamic_cast<CCharacterCL*>(entity);
 									if (pChar != NULL)
@@ -396,40 +397,40 @@ public:
 							}
 						}
 						// get the title translated
-						ucstring sTitleTranslated = botName;
+						ucstring sTitleTranslated = botName; // FIXME: UTF-8
 						CStringPostProcessRemoveName spprn;
 						spprn.Woman = womanTitle;
 						spprn.cbIDStringReceived(sTitleTranslated);
 
-						botName = CEntityCL::removeTitleAndShardFromName(botName);
+						botName = CEntityCL::removeTitleAndShardFromName(botName).toUtf8();
 
 						// short name (with no title such as 'guard', 'merchant' ...)
 						if (*it == 's')
 						{
 							// But if there is no name, display only the title
 							if (botName.empty())
-								botName = sTitleTranslated;
+								botName = sTitleTranslated.toUtf8();
 						}
 						else
 						{
 							// Else we want the title !
 							if (!botName.empty())
 								botName += " ";
-							botName += sTitleTranslated;
+							botName += sTitleTranslated.toUtf8();
 						}
 
 						formatedResult += botName;
 					}
 					break;
 					default:
-						formatedResult += (ucchar) '$';
+						formatedResult += '$';
 					break;
 				}
 				++it;
 			}
 			else
 			{
-				formatedResult += (ucchar) *it;
+				formatedResult += *it;
 				++it;
 			}
 		}
@@ -2302,7 +2303,7 @@ void CInterfaceManager::addServerString (const std::string &sTarget, uint32 id,
 	if (id == 0)
 	{
 		CInterfaceExprValue val;
-		val.setUCString (ucstring(""));
+		val.setString (std::string());
 		CInterfaceLink::setTargetProperty (sTarget, val);
 		return;
 	}
@@ -2320,7 +2321,7 @@ void CInterfaceManager::addServerID (const std::string &sTarget, uint32 id, IStr
 	if (id == 0)
 	{
 		CInterfaceExprValue val;
-		val.setUCString (ucstring(""));
+		val.setString (std::string());
 		CInterfaceLink::setTargetProperty (sTarget, val);
 		return;
 	}
@@ -2367,7 +2368,7 @@ void CInterfaceManager::processServerIDString()
 			if (bValid)
 			{
 				ucstrToAffect = STRING_MANAGER::CStringManagerClient::getLocalizedName(ucstrToAffect);
-				val.setUCString (ucstrToAffect);
+				val.setString (ucstrToAffect.toUtf8());
 				CInterfaceLink::setTargetProperty (pISW->Target, val);
 			}
 
@@ -3336,7 +3337,7 @@ void CInterfaceManager::initEmotes()
 					translateEmote(sTmp, sTranslatedName, sCommandName, sCommandNameAlt);
 
 					// Create a line
-					pMenu->addLine (sTranslatedName + " (/" + ucstring::makeFromUtf8(sCommandName) + ")", "emote",
+					pMenu->addLine (sTranslatedName.toUtf8() + " (/" + sCommandName + ")", "emote",
 						"nb="+toString(nEmoteNb)+"|behav="+toString(nBehav), sTmp);
 				}
 			}
@@ -3392,7 +3393,7 @@ void CInterfaceManager::initEmotes()
 					{
 						// Yeah that's a quick emote too; set command
 						pMenu->addLineAtIndex (i,
-								"@{FFFF}/" + ucstring::makeFromUtf8(sCommandName),
+								"@{FFFF}/" + sCommandName,
 								"emote", "nb="+toString(nEmoteNb)+"|behav="+toString(nBehav),
 								"", "", "", false, false, true);
 
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index b36d51866..2efdf339b 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -269,7 +269,7 @@ static DECLARE_INTERFACE_USER_FCT(lua)
 
 		if (CLuaIHM::pop(ls, ucstrVal))
 		{
-			result.setUCString(ucstrVal);
+			result.setString(ucstrVal.toUtf8());
 			ok = true;
 		}
 
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index e285bbaf9..3d23e31f2 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2593,7 +2593,7 @@ public:
 		{
 			for(uint l = 0; l < pl.PartyChats.size(); ++l)
 			{
-				menu->addLineAtIndex(insertionIndex, pl.PartyChats[l].Window->getTitle(), "chat_target_selected", toString(pl.PartyChats[l].ID));
+				menu->addLineAtIndex(insertionIndex, pl.PartyChats[l].Window->getTitle().toUtf8(), "chat_target_selected", toString(pl.PartyChats[l].ID));
 				++ insertionIndex;
 			}
 		}
@@ -2640,8 +2640,8 @@ public:
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 
 						// replace dynamic channel name and shortcut
-						ucstring res = CI18N::get("uiFilterMenuDynamic");
-						strFindReplace(res, "%channel", title);
+						string res = CI18N::get("uiFilterMenuDynamic");
+						strFindReplace(res, "%channel", title.toUtf8());
 						strFindReplace(res, "%shortcut", s);
 
 						pMenu->addLineAtIndex(5 + insertion_index, res, "chat_target_selected", "dyn"+s, "dyn"+s);
@@ -2940,7 +2940,7 @@ class CHandlerSelectChatSource : public IActionHandler
 			{
 				if (pc[l].Filter != NULL)
 				{
-					menu->addLineAtIndex(insertionIndex, pc[l].Window->getTitle(), FILTER_TOGGLE, toString(pc[l].ID));
+					menu->addLineAtIndex(insertionIndex, pc[l].Window->getTitle().toUtf8(), FILTER_TOGGLE, toString(pc[l].ID));
 					menu->setUserGroupLeft(insertionIndex, createMenuCheckBox(FILTER_TOGGLE, toString(pc[l].ID), pc[l].Filter->isListeningWindow(cw)));
 					++ insertionIndex;
 				}
@@ -2956,7 +2956,7 @@ class CHandlerSelectChatSource : public IActionHandler
 				{
 					ucstring title;
 					STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-					menu->addLineAtIndex(insertionIndex, "["+s+"] " + title, FILTER_TOGGLE, "dyn"+s);
+					menu->addLineAtIndex(insertionIndex, "["+s+"] " + title.toUtf8(), FILTER_TOGGLE, "dyn"+s);
 					menu->setUserGroupLeft(insertionIndex, createMenuCheckBox(FILTER_TOGGLE, "dyn"+s, pi.ChatInput.DynamicChat[i].isListeningWindow(cw)));
 					++insertionIndex;
 				}
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index c977a8380..021d9f433 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -60,6 +60,7 @@ public:
 	// Force the cache to be saved
 	void flushStringCache();
 
+	bool getString(uint32 stringId, std::string &result) { ucstring temp; getString(stringId, temp); result = temp.toUtf8(); } // FIXME: UTF-8
 	bool getString(uint32 stringId, ucstring &result);
 	void waitString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result);
 	void waitString(uint32 stringId, IStringWaitCallback *pcallback);

From ac799e444dcf322f8306096c62dfaea8e2020410 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 09:10:20 +0800
Subject: [PATCH 072/292] More UTF-8, ryzom/ryzomcore#335

---
 nel/samples/misc/i18n/main.cpp           |  6 +++---
 nel/src/misc/unicode.cpp                 | 18 ++++++++++++------
 nel/src/misc/utf_string_view.cpp         | 14 +++++++-------
 ryzom/client/src/string_manager_client.h |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/nel/samples/misc/i18n/main.cpp b/nel/samples/misc/i18n/main.cpp
index 1c8ddabb9..5456c1325 100644
--- a/nel/samples/misc/i18n/main.cpp
+++ b/nel/samples/misc/i18n/main.cpp
@@ -44,9 +44,9 @@ int main (int argc, char **argv)
 	// load the language
 	CI18N::load(langName);
 
-	InfoLog->displayRawNL(CI18N::get("Hi").toString().c_str());
-	InfoLog->displayRawNL(CI18N::get("PresentI18N").toString().c_str(), "Nevrax");
-	InfoLog->displayRawNL(CI18N::get("ExitStr").toString().c_str());
+	InfoLog->displayRawNL(CI18N::get("Hi").c_str());
+	InfoLog->displayRawNL(CI18N::get("PresentI18N").c_str(), "Nevrax");
+	InfoLog->displayRawNL(CI18N::get("ExitStr").c_str());
 	getchar();
 
 	return EXIT_SUCCESS;
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index d28a7c56e..c6780db54 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -4731,10 +4731,13 @@ NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrd
 {
 	char c = str[i];
 	char d, e;
-	if (c >= 'A' && c <= 'Z')
+	if (c < 0x80)
 	{
-		// 1-byte UTF-8
-		c += 'a' - 'A';
+		if (c >= 'A' && c <= 'Z')
+		{
+			// 1-byte UTF-8
+			c += 'a' - 'A';
+		}
 	}
 	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
 	{
@@ -4803,10 +4806,13 @@ NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrd
 {
 	char c = str[i];
 	char d, e;
-	if (c >= 'a' && c <= 'z')
+	if (c < 0x80)
 	{
-		// 1-byte UTF-8
-		c -= 'a' - 'A';
+		if (c >= 'a' && c <= 'z')
+		{
+			// 1-byte UTF-8
+			c -= 'a' - 'A';
+		}
 	}
 	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
 	{
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 9f4057b66..06dcb5e76 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -72,7 +72,7 @@ std::string CUtfStringView::toUtf8(bool reEncode) const
 		return std::string((const char *)m_Str, (const char *)((ptrdiff_t)m_Str + m_Size));
 	std::string res;
 	res.reserve(m_Size);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 	{
 		appendUtf8(res, *it);
 	}
@@ -85,7 +85,7 @@ ucstring CUtfStringView::toUtf16(bool reEncode) const
 		return ucstring((const ucchar *)m_Str, (const ucchar *)((ptrdiff_t)m_Str + m_Size));
 	ucstring res;
 	res.reserve(m_Size << 1);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 	{
 		u32char c = *it;
 		if (c < 0x10000)
@@ -110,7 +110,7 @@ u32string CUtfStringView::toUtf32() const
 		return u32string((const u32char *)m_Str, (const u32char *)((ptrdiff_t)m_Str + m_Size));
 	u32string res;
 	res.reserve(m_Size << 2);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 		res += *it;
 	return res;
 }
@@ -119,7 +119,7 @@ std::string CUtfStringView::toAscii() const
 {
 	std::string res;
 	res.reserve(m_Size);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 	{
 		u32char c = *it;
 		if (c < 0x80)
@@ -137,7 +137,7 @@ std::wstring CUtfStringView::toWide() const
 		return std::wstring((const wchar_t *)m_Str, (const wchar_t *)((ptrdiff_t)m_Str + m_Size));
 	std::wstring res;
 	res.reserve(m_Size << 1);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 	{
 		u32char c = *it;
 		if (c < 0x10000)
@@ -157,7 +157,7 @@ std::wstring CUtfStringView::toWide() const
 		return std::wstring((const wchar_t *)m_Str, (const wchar_t *)((ptrdiff_t)m_Str + m_Size));
 	std::wstring res;
 	res.reserve(m_Size << 2);
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 		res += *it;
 	return res;
 #endif
@@ -166,7 +166,7 @@ std::wstring CUtfStringView::toWide() const
 size_t CUtfStringView::count() const
 {
 	size_t res = 0;
-	for (iterator it(begin()), end(end()); it != end; ++it)
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
 		++res;
 	return res;
 }
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index 021d9f433..c553f7c57 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -60,7 +60,7 @@ public:
 	// Force the cache to be saved
 	void flushStringCache();
 
-	bool getString(uint32 stringId, std::string &result) { ucstring temp; getString(stringId, temp); result = temp.toUtf8(); } // FIXME: UTF-8
+	bool getString(uint32 stringId, std::string &result) { ucstring temp; bool res = getString(stringId, temp); result = temp.toUtf8(); return res; } // FIXME: UTF-8
 	bool getString(uint32 stringId, ucstring &result);
 	void waitString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result);
 	void waitString(uint32 stringId, IStringWaitCallback *pcallback);

From 376dd2aff1b199aa9f1329dce8d7720522d87782 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 10:34:24 +0800
Subject: [PATCH 073/292] More UTF-8, ryzom/ryzomcore#335

---
 nel/include/nel/gui/css_parser.h              |  46 +++----
 nel/include/nel/gui/event_descriptor.h        |   8 +-
 nel/include/nel/gui/group_container.h         |  19 ++-
 nel/include/nel/gui/group_editbox.h           |  52 ++++----
 nel/include/nel/gui/group_html.h              |  20 +--
 nel/include/nel/gui/view_text.h               |   6 +-
 nel/include/nel/misc/events.h                 |   8 +-
 nel/include/nel/misc/utf_string_view.h        |   4 +-
 .../3d/driver/direct3d/driver_direct3d.cpp    |   4 +
 .../3d/driver/opengl/driver_opengl_window.cpp |   4 +
 .../3d/driver/opengl/unix_event_emitter.cpp   |   6 +-
 nel/src/gui/css_parser.cpp                    |  74 +++++------
 nel/src/gui/group_container.cpp               |  68 +++++++---
 nel/src/gui/group_editbox.cpp                 |  70 +++++-----
 nel/src/gui/group_html.cpp                    | 123 ++++++++----------
 nel/src/gui/view_text.cpp                     |  47 +++----
 nel/src/misc/inter_window_msg_queue.cpp       |   3 +
 nel/src/misc/utf_string_view.cpp              |   6 +-
 nel/src/misc/win_event_emitter.cpp            |   8 ++
 ryzom/client/src/actions.cpp                  |   4 +-
 ryzom/client/src/actions.h                    |   2 +-
 .../src/interface_v3/action_handler_edit.cpp  |  14 +-
 ryzom/client/src/interface_v3/chat_window.cpp |   4 +-
 .../client/src/interface_v3/dbctrl_sheet.cpp  |   2 +-
 .../src/interface_v3/group_modal_get_key.cpp  |   2 +-
 .../src/interface_v3/group_quick_help.cpp     |   2 +-
 .../interface_expr_user_fct_game.cpp          |   2 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  10 +-
 .../src/interface_v3/macrocmd_manager.cpp     |   4 +-
 .../src/interface_v3/task_bar_manager.cpp     |   2 +-
 ryzom/client/src/main_loop_debug.cpp          |   2 +-
 31 files changed, 344 insertions(+), 282 deletions(-)

diff --git a/nel/include/nel/gui/css_parser.h b/nel/include/nel/gui/css_parser.h
index a6dc92022..65b6a11b0 100644
--- a/nel/include/nel/gui/css_parser.h
+++ b/nel/include/nel/gui/css_parser.h
@@ -38,7 +38,7 @@ namespace NLGUI
 
 	private:
 		// stylesheet currently parsed
-		ucstring _Style;
+		std::string _Style;
 		// keep track of current position in _Style
 		size_t _Position;
 
@@ -70,49 +70,49 @@ namespace NLGUI
 		void preprocess();
 
 		// parse selectors + combinators
-		std::vector<CCssSelector> parse_selector(const ucstring &sel, std::string &pseudoElement) const;
+		std::vector<CCssSelector> parse_selector(const std::string &sel, std::string &pseudoElement) const;
 
 		// parse selector and style
-		void parseRule(const ucstring &selectorString, const ucstring &styleString);
+		void parseRule(const std::string &selectorString, const std::string &styleString);
 
 		inline bool is_eof() const
 		{
 			return _Position >= _Style.size();
 		}
 
-		inline bool is_whitespace(ucchar ch) const
+		inline bool is_whitespace(char ch) const
 		{
-			return (ch == (ucchar)' ' || ch == (ucchar)'\t' || ch == (ucchar)'\n');
+			return (ch == ' ' || ch == '\t' || ch == '\n');
 		}
 
-		inline bool is_hex(ucchar ch) const
+		inline bool is_hex(char ch) const
 		{
-			return ((ch >= (ucchar)'0' && ch <= (ucchar)'9') ||
-					(ch >= (ucchar)'a' && ch <= (ucchar)'f') ||
-					(ch >= (ucchar)'A' && ch <= (ucchar)'F'));
+			return ((ch >= '0' && ch <= '9') ||
+					(ch >= 'a' && ch <= 'f') ||
+					(ch >= 'A' && ch <= 'F'));
 		}
 
 		inline bool maybe_escape() const
 		{
 			// escaping newline (\n) only allowed inside strings
-			return (_Style.size() - _Position) >= 1 && _Style[_Position] == (ucchar)'\\' && _Style[_Position+1] != '\n';
+			return (_Style.size() - _Position) >= 1 && _Style[_Position] == '\\' && _Style[_Position+1] != '\n';
 		}
 
-		inline bool is_quote(ucchar ch) const
+		inline bool is_quote(char ch) const
 		{
-			return	ch== (ucchar)'"' || ch == (ucchar)'\'';
+			return	ch== '"' || ch == '\'';
 		}
 
-		inline bool is_block_open(ucchar ch) const
+		inline bool is_block_open(char ch) const
 		{
-			return	ch == (ucchar)'{' || ch == (ucchar)'[' || ch == (ucchar)'(';
+			return	ch == (char)'{' || ch == (char)'[' || ch == (char)'(';
 		}
 
-		inline bool is_block_close(ucchar ch, ucchar open) const
+		inline bool is_block_close(char ch, char open) const
 		{
-			return ((open == '{' && ch == (ucchar)'}') ||
-					(open == '[' && ch == (ucchar)']') ||
-					(open == '(' && ch == (ucchar)')'));
+			return ((open == '{' && ch == (char)'}') ||
+					(open == '[' && ch == (char)']') ||
+					(open == '(' && ch == (char)')'));
 		}
 
 		inline bool is_comment_open() const
@@ -120,25 +120,25 @@ namespace NLGUI
 			if (_Position+1 > _Style.size())
 				return false;
 
-			return _Style[_Position] == (ucchar)'/' && _Style[_Position+1] == (ucchar)'*';
+			return _Style[_Position] == (char)'/' && _Style[_Position+1] == (char)'*';
 		}
 
-		inline bool is_nonascii(ucchar ch) const
+		inline bool is_nonascii(char ch) const
 		{
 			return ch >= 0x80 /*&&  ch <= 255*/;
 		}
 
-		inline bool is_alpha(ucchar ch) const
+		inline bool is_alpha(char ch) const
 		{
 			return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
 		}
 
-		inline bool is_digit(ucchar ch) const
+		inline bool is_digit(char ch) const
 		{
 			return ch >= '0' && ch <= '9';
 		}
 
-		inline bool is_nmchar(ucchar ch) const
+		inline bool is_nmchar(char ch) const
 		{
 			// checking escape here does not check if next char is '\n' or not
 			return ch == '_' || ch == '-' || is_alpha(ch) || is_digit(ch) || is_nonascii(ch) || ch == '\\'/*is_escape(ch)*/;
diff --git a/nel/include/nel/gui/event_descriptor.h b/nel/include/nel/gui/event_descriptor.h
index 95bdad212..dd2ae19c4 100644
--- a/nel/include/nel/gui/event_descriptor.h
+++ b/nel/include/nel/gui/event_descriptor.h
@@ -82,13 +82,13 @@ public:
 		return _Key;
 	}
 	// return the char that has been pressed. The key event type MUST be 'keychar', else => assert
-	ucchar getChar() const
+	u32char getChar() const
 	{
 		nlassert(_KeyEvent == keychar);
 		return _Char;
 	}
 	// return the string that has been sent. The key event type MUST be 'keystring', else => assert
-	ucstring getString() const
+	std::string getString() const
 	{
 		nlassert(_KeyEvent == keystring);
 		return _String;
@@ -141,9 +141,9 @@ private:
 	union
 	{
 		NLMISC::TKey	_Key;
-		ucchar			_Char;
+		u32char			_Char;
 	};
-	ucstring		_String;
+	std::string			_String;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
index 399f9c056..361ae70b9 100644
--- a/nel/include/nel/gui/group_container.h
+++ b/nel/include/nel/gui/group_container.h
@@ -248,6 +248,13 @@ namespace NLGUI
 		// Get the header color draw. NB: depends if grayed, and if active.
 		NLMISC::CRGBA	getDrawnHeaderColor () const;
 
+		std::string		getTitleRaw () const;
+		void			setTitleRaw (const std::string &title);
+		std::string		getTitleOpenedRaw () const;
+		void			setTitleOpenedRaw (const std::string &title);
+		std::string		getTitleClosedRaw () const;
+		void			setTitleClosedRaw (const std::string &title);
+
 		ucstring		getUCTitleOpened () const;
 		void			setUCTitleOpened (const ucstring &title);
 		ucstring		getUCTitleClosed () const;
@@ -287,9 +294,15 @@ namespace NLGUI
 			REFLECT_STRING("title", getTitle, setTitle);
 			REFLECT_STRING("title_opened", getTitleOpened, setTitleOpened);
 			REFLECT_STRING("title_closed", getTitleClosed, setTitleClosed);
-			REFLECT_UCSTRING("uc_title_opened", getUCTitleOpened, setUCTitleOpened);
-			REFLECT_UCSTRING("uc_title_closed", getUCTitleClosed, setUCTitleClosed);
-			REFLECT_UCSTRING("uc_title", getUCTitle, setUCTitle);
+
+			REFLECT_STRING("title_raw", getTitleRaw, setTitleRaw);
+			REFLECT_STRING("title_opened_raw", getTitleOpenedRaw, setTitleOpenedRaw);
+			REFLECT_STRING("title_closed_raw", getTitleClosedRaw, setTitleClosedRaw);
+
+			REFLECT_UCSTRING("uc_title_opened", getUCTitleOpened, setUCTitleOpened); // FIXME: Lua UTF-8
+			REFLECT_UCSTRING("uc_title_closed", getUCTitleClosed, setUCTitleClosed); // FIXME: Lua UTF-8
+			REFLECT_UCSTRING("uc_title", getUCTitle, setUCTitle); // FIXME: Lua UTF-8
+
 			REFLECT_STRING("title_color", getTitleColorAsString, setTitleColorAsString);
 			REFLECT_SINT32("pop_min_h", getPopupMinH, setPopupMinH);
 			REFLECT_SINT32("pop_max_h", getPopupMaxH, setPopupMaxH);
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 36b8d63b4..9b2998be0 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -65,15 +65,15 @@ namespace NLGUI
 		/// Accessors
 		std::string getInputString() const;
 		std::string getPrompt() const;
-		const u32string &getInputStringRef() const { return _InputString; }
-		const u32string &getPromptRef() const { return _Prompt; }
+		const ::u32string &getInputStringRef() const { return _InputString; }
+		const ::u32string &getPromptRef() const { return _Prompt; }
 
 		/** Set the prompt
 		  * NB : line returns are encoded as '\n', not '\r\n'
 		  */
 		void		setPrompt(const std::string &s);
 		void		setInputString(const std::string &str);
-		void		setInputStringRef(const u32string &str) {_InputString = str; };
+		void		setInputStringRef(const ::u32string &str) {_InputString = str; };
 		void		setInputStringAsInt(sint32 val);
 		sint32		getInputStringAsInt() const;
 		void		setInputStringAsInt64(sint64 val);
@@ -82,8 +82,8 @@ namespace NLGUI
 		float		getInputStringAsFloat() const;
 		void		setInputStringAsUtf16(const ucstring &str);
 		ucstring    getInputStringAsUtf16() const;
-		void		setInputStringAsUtf32(const u32string &str);
-		u32string   getInputStringAsUtf32() const { return _InputString; }
+		void		setInputStringAsUtf32(const ::u32string &str);
+		::u32string   getInputStringAsUtf32() const { return _InputString; }
 		void		setColor(NLMISC::CRGBA col);
 
 
@@ -98,7 +98,7 @@ namespace NLGUI
 
 		static CGroupEditBox *getMenuFather() { return _MenuFather; }
 
-		void setCommand(const ucstring &command, bool execute);
+		void setCommand(const std::string &command, bool execute);
 
 		// Stop parent from blinking
 		void		stopParentBlink() { if (_Parent) _Parent->disableBlink(); }
@@ -122,7 +122,7 @@ namespace NLGUI
 		sint32	getMaxHistoric() const {return _MaxHistoric;}
 		sint32	getCurrentHistoricIndex () const {return _CurrentHistoricIndex;}
 		void	setCurrentHistoricIndex (sint32 index) {_CurrentHistoricIndex=index;}
-		const u32string	&getHistoric(uint32 index) const {return _Historic[index];}
+		const ::u32string	&getHistoric(uint32 index) const {return _Historic[index];}
 		uint32	getNumHistoric() const {return (uint32)_Historic.size ();}
 
 		// Get on change action handler
@@ -140,7 +140,7 @@ namespace NLGUI
 		// Paste the selection into buffer
 		void		paste();
 		// Write the string into buffer
-		void		writeString(const ucstring &str, bool replace = true, bool atEnd = true);
+		void		writeString(const ucstring &str, bool replace = true, bool atEnd = true); // UTF-16 because of Clipboard implementation
 
 		// Expand the expression (true if there was a '/' at the start of the line)
 		bool		expand();
@@ -171,7 +171,7 @@ namespace NLGUI
 		virtual void onKeyboardCaptureLost();
 
 		// set the input string as "default". will be reseted at first click (used for user information)
-		void	setDefaultInputString(const ucstring &str);
+		void	setDefaultInputString(const std::string &str);
 
 		// For Interger and PositiveInteger, can specify min and max values
 		void	setIntegerMinValue(sint32 minValue) {_IntegerMinValue=minValue;}
@@ -229,17 +229,17 @@ namespace NLGUI
 		NLMISC::CRGBA	_BackSelectColor;
 
 		// Text info
-		u32string	_Prompt;
-		u32string	_InputString;
+		::u32string	_Prompt;
+		::u32string	_InputString;
 		CViewText	*_ViewText;
 
 		// undo / redo
-		u32string	_StartInputString;  // value of the input string when focus was acuired first
-		u32string	_ModifiedInputString;
+		::u32string	_StartInputString;  // value of the input string when focus was acuired first
+		::u32string	_ModifiedInputString;
 
 
 		// Historic info
-		typedef std::deque<u32string>		THistoric;
+		typedef std::deque<::u32string>		THistoric;
 		THistoric	_Historic;
 		uint32		_MaxHistoric;
 		sint32		_CurrentHistoricIndex;
@@ -276,7 +276,7 @@ namespace NLGUI
 		bool	_CanRedo                   : 1;
 		bool	_CanUndo                   : 1;
 
-		std::vector<char>					_NegativeFilter;
+		std::vector<u32char>					_NegativeFilter;
 
 		sint	_CursorTexID;
 		sint32	_CursorWidth;
@@ -299,13 +299,13 @@ namespace NLGUI
 		void handleEventString(const NLGUI::CEventDescriptorKey &event);
 		void setup();
 		void triggerOnChangeAH();
-		void appendStringFromClipboard(const ucstring &str);
+		void appendStringFromClipboard(const ucstring &str); // UTF-16 because of Clipboard implementation
 
-		ucstring	getSelection();
+		ucstring	getSelection(); // UTF-16 because of Clipboard implementation
 
 		static CGroupEditBox *_MenuFather;
 
-		static bool isValidAlphaNumSpace(ucchar c)
+		static bool isValidAlphaNumSpace(u32char c)
 		{
 			if (c > 255) return false;
 			char ac = (char) c;
@@ -315,7 +315,7 @@ namespace NLGUI
 				ac==' ';
 		}
 
-		static bool isValidAlphaNum(ucchar c)
+		static bool isValidAlphaNum(u32char c)
 		{
 			if (c > 255) return false;
 			char ac = (char) c;
@@ -324,7 +324,7 @@ namespace NLGUI
 				   (ac >= 'A' && ac <= 'Z');
 		}
 
-		static bool isValidAlpha(ucchar c)
+		static bool isValidAlpha(u32char c)
 		{
 			if (c > 255) return false;
 			char ac = (char) c;
@@ -332,13 +332,13 @@ namespace NLGUI
 				   (ac >= 'A' && ac <= 'Z');
 		}
 
-		static bool isValidPlayerNameChar(ucchar c)
+		static bool isValidPlayerNameChar(u32char c)
 		{
 			// valid player name (with possible shard prefix / suffix format
 			return isValidAlpha(c) || c=='.' || c=='(' || c==')';
 		}
 
-		static bool isValidFilenameChar(ucchar c)
+		static bool isValidFilenameChar(u32char c)
 		{
 			if (c == '\\' ||
 				c == '/' ||
@@ -352,12 +352,12 @@ namespace NLGUI
 			return true;
 		}
 		//
-		bool isFiltered(ucchar c)
+		bool isFiltered(u32char c)
 		{
-			uint length = (uint)_NegativeFilter.size();
-			for (uint k = 0; k < length; ++k)
+			ptrdiff_t length = _NegativeFilter.size();
+			for (ptrdiff_t k = 0; k < length; ++k)
 			{
-				if ((ucchar) _NegativeFilter[k] == c) return true;
+				if (_NegativeFilter[k] == c) return true;
 			}
 			return false;
 		}
diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 1013a8b10..56605c0cc 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -320,16 +320,16 @@ namespace NLGUI
 		void clearContext();
 
 		// Translate a char
-		bool translateChar(ucchar &output, ucchar input, ucchar lastChar) const;
+		bool translateChar(u32char &output, u32char input, u32char lastChar) const;
 
 		// Add a string in the current paragraph
-		void addString(const ucstring &str);
+		void addString(const std::string &str);
 
 		// Add an image in the current paragraph
 		void addImage(const std::string &id, const std::string &img, bool reloadImg=false, const CStyleParams &style = CStyleParams());
 
 		// Add a text area in the current paragraph
-		CInterfaceGroup *addTextArea (const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content, uint maxlength);
+		CInterfaceGroup *addTextArea (const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const std::string &content, uint maxlength);
 
 		// Add a combo box in the current paragraph
 		CDBGroupComboBox *addComboBox(const std::string &templateName, const char *name);
@@ -350,9 +350,9 @@ namespace NLGUI
 		void flushString();
 
 		// Set the title
-		void setTitle (const ucstring &title);
 		void setTitle (const std::string &title);
 		std::string getTitle() const;
+		void setTitleRaw (const std::string &title);
 
 		// Lookup a url in local file system
 		bool lookupLocalFile (std::string &result, const char *url, bool isUrl);
@@ -392,10 +392,10 @@ namespace NLGUI
 		bool			_TrustedDomain;
 
 		// Title prefix
-		ucstring		_TitlePrefix;
+		std::string		_TitlePrefix;
 
 		// Title string
-		ucstring		_TitleString;
+		std::string		_TitleString;
 
 		// Need to browse next update coords..
 		bool			_BrowseNextTime;
@@ -644,7 +644,7 @@ namespace NLGUI
 				std::string		Name;
 
 				// Variable value
-				ucstring		Value;
+				std::string		Value;
 
 				// Text area group
 				CInterfaceGroup *TextArea;
@@ -747,7 +747,7 @@ namespace NLGUI
 		// Current node is a text area
 		bool			_TextArea;
 		std::string		_TextAreaTemplate;
-		ucstring		_TextAreaContent;
+		std::string		_TextAreaContent;
 		std::string		_TextAreaName;
 		uint			_TextAreaRow;
 		uint			_TextAreaCols;
@@ -755,7 +755,7 @@ namespace NLGUI
 
 		// current mode is in select option
 		bool			_SelectOption;
-		ucstring		_SelectOptionStr;
+		std::string		_SelectOptionStr;
 
 		// Current node is a object
 		std::string		_ObjectType;
@@ -826,7 +826,7 @@ namespace NLGUI
 		void spliceFragment(std::list<CHtmlElement>::iterator src);
 
 		// decode all HTML entities
-		static ucstring decodeHTMLEntities(const ucstring &str);
+		static std::string decodeHTMLEntities(const std::string &str);
 
 		struct CDataImageDownload
 		{
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 933f9a747..7c0324f58 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -222,7 +222,7 @@ namespace NLGUI
 		int luaSetLineMaxW(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CViewText, CViewBase)
-			REFLECT_STRING("text", getText, setText);
+			REFLECT_STRING("text_raw", getText, setText);
 			REFLECT_STRING("hardtext", getHardText, setHardText);
 			// REFLECT_UCSTRING("uc_text", getTextAsUtf16, setTextAsUtf16); // Deprecate uc_ functions
 			REFLECT_UCSTRING("uc_hardtext", getHardTextAsUtf16, setHardTextAsUtf16);
@@ -262,8 +262,8 @@ namespace NLGUI
 		// width of the font in pixel. Just a Hint for tabing format (computed with '_')
 		float	_FontWidth;
 		// strings to use when computing font size
-		ucstring _FontSizingChars;
-		ucstring _FontSizingFallback;
+		::u32string _FontSizingChars;
+		::u32string _FontSizingFallback;
 		// height of the font in pixel.
 		// use getFontHeight
 		float	_FontHeight;
diff --git a/nel/include/nel/misc/events.h b/nel/include/nel/misc/events.h
index c783a85eb..6cfe902b8 100644
--- a/nel/include/nel/misc/events.h
+++ b/nel/include/nel/misc/events.h
@@ -320,11 +320,11 @@ public:
 class CEventChar : public CEventKey
 {
 public:
-	CEventChar (ucchar c, TKeyButton button, IEventEmitter* emitter) : CEventKey (button, emitter, EventCharId), _Raw(true)
+	CEventChar (u32char c, TKeyButton button, IEventEmitter* emitter) : CEventKey (button, emitter, EventCharId), _Raw(true)
 	{
 		Char=c;
 	}
-	ucchar Char;
+	u32char Char;
 
 	virtual	CEvent			*clone() const {return new CEventChar(*this);}
 	void					setRaw( bool raw ) { _Raw = raw; }
@@ -341,11 +341,11 @@ private:
 class CEventString : public CEventKey
 {
 public:
-	CEventString (const ucstring &str, IEventEmitter* emitter) : CEventKey (noKeyButton, emitter, EventStringId)
+	CEventString (const std::string &str, IEventEmitter* emitter) : CEventKey (noKeyButton, emitter, EventStringId)
 	{
 		String = str;
 	}
-	ucstring String;
+	std::string String;
 
 	virtual	CEvent			*clone() const {return new CEventString(*this);}
 };
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 61291f421..ab8a25a58 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -54,11 +54,11 @@ public:
 
 	inline CUtfStringView(const ucstring &utf16Str) : m_Str(utf16Str.c_str()), m_Size(utf16Str.size() << 1), m_Iterator(utf16Iterator) {}
 	inline CUtfStringView(const ucchar *utf16Str) : m_Str(utf16Str), m_Size(strlen((const char *)utf16Str) & (ptrdiff_t)(-2)), m_Iterator(utf16Iterator) {}
-	inline CUtfStringView(const u32string &utf32Str) : m_Str(utf32Str.c_str()), m_Size(utf32Str.size() << 2), m_Iterator(utf32Iterator) {}
+	inline CUtfStringView(const ::u32string &utf32Str) : m_Str(utf32Str.c_str()), m_Size(utf32Str.size() << 2), m_Iterator(utf32Iterator) {}
 
 	std::string toUtf8(bool reEncode = false) const; // Makes a copy
 	ucstring toUtf16(bool reEncode = false) const; // Makes a copy
-	u32string toUtf32() const; // Makes a copy
+	::u32string toUtf32() const; // Makes a copy
 
 	std::wstring toWide() const; // Platform dependent, UTF-16 or UTF-32. Makes a copy.
 	std::string toAscii() const; // Returns only values 0-127, 7-bit ASCII. Makes a copy.
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 211ed27fd..bb954ba4d 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1265,6 +1265,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		return 0;
 	}
 
+	// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
+	if (message == WM_UNICHAR)
+		return (wParam == UNICODE_NOCHAR);
+
 	return DefWindowProcW(hWnd, message, wParam, lParam);
 }
 
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index f04ad304e..dc48ecbf0 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -183,6 +183,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		return 0;
 	}
 
+	// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
+	if (message == WM_UNICHAR)
+		return (wParam == UNICODE_NOCHAR);
+
 	return trapMessage ? 0 : DefWindowProcW(hWnd, message, wParam, lParam);
 }
 
diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index d4153dde5..2945b90e7 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -29,6 +29,7 @@
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
 #include "nel/misc/debug.h"
+#include "nel/misc/utf_string_view.h"
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
@@ -537,8 +538,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 		if (c > 0)
 		{
 #ifdef X_HAVE_UTF8_STRING
-			ucstring ucstr;
-			ucstr.fromUtf8(Text);
+			::u32string ucstr = NLMISC::CUtfStringView(Text).toUtf32();
 
 			CEventChar *charEvent = new CEventChar (ucstr[0], getKeyButton(event.xbutton.state), this);
 
@@ -549,7 +549,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 #else
 			for (int i = 0; i < c; i++)
 			{
-				CEventChar *charEvent = new CEventChar ((ucchar)(unsigned char)Text[i], getKeyButton(event.xbutton.state), this);
+				CEventChar *charEvent = new CEventChar ((u32char)(unsigned char)Text[i], getKeyButton(event.xbutton.state), this);
 
 				// raw if not processed by IME
 				charEvent->setRaw(keyCode != 0);
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index e59cf832b..ebc8d8d34 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -65,7 +65,7 @@ namespace NLGUI
 		_Rules.clear();
 		_Style.clear();
 
-		_Style.fromUtf8(cssString);
+		_Style = cssString;
 		preprocess();
 
 		_Position = 0;
@@ -73,7 +73,7 @@ namespace NLGUI
 		{
 			skipWhitespace();
 
-			if (_Style[_Position] == (ucchar)'@')
+			if (_Style[_Position] == '@')
 				readAtRule();
 			else
 				readRule();
@@ -89,13 +89,13 @@ namespace NLGUI
 	// style:    "color: red; font-size: 10px;"
 	//
 	// @internal
-	void CCssParser::parseRule(const ucstring &selectorString, const ucstring &styleString)
+	void CCssParser::parseRule(const std::string &selectorString, const std::string &styleString)
 	{
-		std::vector<ucstring> selectors;
-		NLMISC::explode(selectorString, ucstring(","), selectors);
+		std::vector<std::string> selectors;
+		NLMISC::explode(selectorString, std::string(","), selectors);
 
 		TStyleVec props;
-		props = parseDecls(styleString.toUtf8());
+		props = parseDecls(styleString);
 
 		// duplicate props to each selector in selector list,
 		// example 'div > p, h1' creates 'div>p' and 'h1'
@@ -129,7 +129,7 @@ namespace NLGUI
 		skipIdentifier();
 
 		// skip at-rule statement
-		while(!is_eof() && _Style[_Position] != (ucchar)';')
+		while(!is_eof() && _Style[_Position] != ';')
 		{
 			if (maybe_escape())
 			{
@@ -174,9 +174,9 @@ namespace NLGUI
 				_Position++;
 			else if (is_quote(_Style[_Position]))
 				skipString();
-			else if (_Style[_Position] == (ucchar)'[')
+			else if (_Style[_Position] == '[')
 				skipBlock();
-			else if (_Style[_Position] == (ucchar)'{')
+			else if (_Style[_Position] == '{')
 				break;
 			else
 				_Position++;
@@ -184,7 +184,7 @@ namespace NLGUI
 
 		if (!is_eof())
 		{
-			ucstring selector;
+			std::string selector;
 			selector.append(_Style, start, _Position - start);
 
 			skipWhitespace();
@@ -194,7 +194,7 @@ namespace NLGUI
 			skipBlock();
 			if (_Position <= _Style.size())
 			{
-				ucstring rules;
+				std::string rules;
 				rules.append(_Style, start + 1, _Position - start - 2);
 
 				parseRule(selector, rules);
@@ -215,7 +215,7 @@ namespace NLGUI
 			for(uint i=0; i<6 && is_hex(_Style[_Position]); i++)
 				_Position++;
 
-			if (_Style[_Position] == (ucchar)' ')
+			if (_Style[_Position] == ' ')
 				_Position++;
 		}
 		else if (_Style[_Position] != 0x0A)
@@ -246,23 +246,23 @@ namespace NLGUI
 					// cannot start with digit
 					valid = false;
 				}
-				else if ((_Position - start) == 0 && _Style[_Position-1] == (ucchar)'-')
+				else if ((_Position - start) == 0 && _Style[_Position-1] == '-')
 				{
 					// cannot start with -#
 					valid = false;
 				}
 			}
-			else if (_Style[_Position] == (ucchar)'_')
+			else if (_Style[_Position] == '_')
 			{
 				// valid
 			}
-			else if (_Style[_Position] >= 0x0080)
+			else if (_Style[_Position] >= 0x80)
 			{
 				// valid
 			}
-			else if (_Style[_Position] == (ucchar)'-')
+			else if (_Style[_Position] == '-')
 			{
-				if ((_Position - start) == 1 && _Style[_Position-1] == (ucchar)'-')
+				if ((_Position - start) == 1 && _Style[_Position-1] == '-')
 				{
 					// cannot start with --
 					valid = false;
@@ -285,7 +285,7 @@ namespace NLGUI
 	// @internal
 	void CCssParser::skipBlock()
 	{
-		ucchar startChar = _Style[_Position];
+		char startChar = _Style[_Position];
 
 		// block start
 		_Position++;
@@ -311,7 +311,7 @@ namespace NLGUI
 	// @internal
 	void CCssParser::skipString()
 	{
-		ucchar endChar = _Style[_Position];
+		char endChar = _Style[_Position];
 
 		// quote start
 		_Position++;
@@ -338,7 +338,7 @@ namespace NLGUI
 	// ***************************************************************************
 	// parse selector list
 	// @internal
-	std::vector<CCssSelector> CCssParser::parse_selector(const ucstring &sel, std::string &pseudoElement) const
+	std::vector<CCssSelector> CCssParser::parse_selector(const std::string &sel, std::string &pseudoElement) const
 	{
 		std::vector<CCssSelector> result;
 		CCssSelector current;
@@ -346,10 +346,10 @@ namespace NLGUI
 		pseudoElement.clear();
 
 		bool failed = false;
-		ucstring::size_type start = 0, pos = 0;
+		std::string::size_type start = 0, pos = 0;
 		while(pos < sel.size())
 		{
-			ucstring uc;
+			std::string uc;
 			uc = sel[pos];
 			if (is_nmchar(sel[pos]) && current.empty())
 			{
@@ -358,7 +358,7 @@ namespace NLGUI
 				while(pos < sel.size() && is_nmchar(sel[pos]))
 					pos++;
 
-				current.Element = toLower(sel.substr(start, pos - start).toUtf8());
+				current.Element = toLower(sel.substr(start, pos - start));
 				start = pos;
 				continue;
 			}
@@ -371,7 +371,7 @@ namespace NLGUI
 				while(pos < sel.size() && is_nmchar(sel[pos]))
 					pos++;
 
-				current.Id = toLower(sel.substr(start, pos - start).toUtf8());
+				current.Id = toLower(sel.substr(start, pos - start));
 				start = pos;
 			}
 			else if (sel[pos] == '.')
@@ -383,7 +383,7 @@ namespace NLGUI
 				while(pos < sel.size() && (is_nmchar(sel[pos]) || sel[pos] == '.'))
 					pos++;
 
-				current.setClass(toLower(sel.substr(start, pos - start).toUtf8()));
+				current.setClass(toLower(sel.substr(start, pos - start)));
 				start = pos;
 			}
 			else if (sel[pos] == '[')
@@ -399,9 +399,9 @@ namespace NLGUI
 					start = pos;
 				}
 
-				ucstring key;
-				ucstring value;
-				ucchar op = ' ';
+				std::string key;
+				std::string value;
+				char op = ' ';
 
 				// key
 				while(pos < sel.size() && is_nmchar(sel[pos]))
@@ -420,7 +420,7 @@ namespace NLGUI
 
 				if (sel[pos] == ']')
 				{
-					current.addAttribute(key.toUtf8());
+					current.addAttribute(key);
 				}
 				else
 				{
@@ -496,14 +496,14 @@ namespace NLGUI
 						// [value="attr" i]
 						if (value.size() > 2 && value[value.size()-2] == ' ')
 						{
-							ucchar lastChar = value[value.size()-1];
+							char lastChar = value[value.size()-1];
 							if (lastChar == 'i' || lastChar == 'I' || lastChar == 's' || lastChar == 'S')
 							{
 								value = value.substr(0, value.size()-2);
 								cs = !((lastChar == 'i' || lastChar == 'I'));
 							}
 						}
-						current.addAttribute(key.toUtf8(), trimQuotes(value).toUtf8(), (char)op, cs);
+						current.addAttribute(key, trimQuotes(value), (char)op, cs);
 					} // op error
 				} // no value
 
@@ -549,7 +549,7 @@ namespace NLGUI
 					}
 				}
 
-				std::string key = toLower(sel.substr(start, pos - start).toUtf8());
+				std::string key = toLower(sel.substr(start, pos - start));
 				if (key.empty())
 				{
 					failed = true;
@@ -647,7 +647,7 @@ namespace NLGUI
 		size_t start;
 		size_t charsLeft;
 		bool quote = false;
-		ucchar quoteChar;
+		char quoteChar;
 		while(!is_eof())
 		{
 			charsLeft = _Style.size() - _Position - 1;
@@ -660,8 +660,8 @@ namespace NLGUI
 				if (charsLeft >= 1 && _Style[_Position] == 0x0D && _Style[_Position+1] == 0x0A)
 					len++;
 
-				ucstring tmp;
-				tmp += 0x000A;
+				std::string tmp;
+				tmp += 0x0A;
 				_Style.replace(_Position, 1, tmp);
 			}
 			else if (_Style[_Position] == 0x00)
@@ -686,12 +686,12 @@ namespace NLGUI
 				}
 				else if (!quote && is_comment_open())
 				{
-					size_t pos = _Style.find(ucstring("*/"), _Position + 2);
+					size_t pos = _Style.find("*/", _Position + 2);
 					if (pos == std::string::npos)
 						pos = _Style.size();
 
 					_Style.erase(_Position, pos - _Position + 2);
-					ucstring uc;
+					std::string uc;
 					uc = _Style[_Position];
 
 					// _Position is already at correct place
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index e6b69326b..141c7ba9b 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3955,8 +3955,8 @@ namespace NLGUI
 	// ***************************************************************************
 	void			CGroupContainer::setTitle (const std::string &title)
 	{
-		if (_Localize)	setUCTitle (CI18N::get(title));
-		else			setUCTitle (title);
+		if (_Localize)	setTitleRaw (CI18N::get(title));
+		else			setTitleRaw (title);
 	}
 
 	// ***************************************************************************
@@ -3968,8 +3968,8 @@ namespace NLGUI
 	// ***************************************************************************
 	void			CGroupContainer::setTitleOpened (const std::string &title)
 	{
-		if (_Localize)	setUCTitleOpened (CI18N::get(title));
-		else			setUCTitleOpened (title);
+		if (_Localize)	setTitleOpenedRaw (CI18N::get(title));
+		else			setTitleOpenedRaw (title);
 	}
 
 	// ***************************************************************************
@@ -3981,51 +3981,87 @@ namespace NLGUI
 	// ***************************************************************************
 	void			CGroupContainer::setTitleClosed (const std::string &title)
 	{
-		if (_Localize)	setUCTitleClosed (CI18N::get(title));
-		else			setUCTitleClosed (title);
+		if (_Localize)	setTitleClosedRaw (CI18N::get(title));
+		else			setTitleClosedRaw (title);
 	}
 
 	// ***************************************************************************
-	void CGroupContainer::setUCTitleOpened(const ucstring &title)
+	void CGroupContainer::setTitleOpenedRaw(const std::string &title)
 	{
-		_TitleTextOpened = title.toUtf8();
+		_TitleTextOpened = title;
 		if (_TitleOpened != NULL)
-			_TitleOpened->setText (title.toUtf8());
+			_TitleOpened->setText (title);
 		invalidateCoords();
 	}
 
 	// ***************************************************************************
-	void CGroupContainer::setUCTitleClosed(const ucstring &title)
+	void CGroupContainer::setTitleClosedRaw(const std::string &title)
 	{
-		_TitleTextClosed = title.toUtf8();
+		_TitleTextClosed = title;
 		if (_TitleClosed != NULL)
 			_TitleClosed->setText (_TitleTextClosed);
 		invalidateCoords();
 	}
 
+	// ***************************************************************************
+	void CGroupContainer::setTitleRaw(const std::string &title)
+	{
+		setTitleOpenedRaw(title);
+		setTitleClosedRaw(title);
+	}
+
+	// ***************************************************************************
+	std::string CGroupContainer::getTitleRaw () const
+	{
+		return getTitleOpened();
+	}
+
+	// ***************************************************************************
+	std::string CGroupContainer::getTitleOpenedRaw () const
+	{
+		return _TitleTextOpened;
+	}
+
+	// ***************************************************************************
+	std::string CGroupContainer::getTitleClosedRaw () const
+	{
+		return _TitleTextClosed;
+	}
+
+	// ***************************************************************************
+	void CGroupContainer::setUCTitleOpened(const ucstring &title)
+	{
+		setTitleOpenedRaw(title.toUtf8());
+	}
+
+	// ***************************************************************************
+	void CGroupContainer::setUCTitleClosed(const ucstring &title)
+	{
+		setTitleClosedRaw(title.toUtf8());
+	}
+
 	// ***************************************************************************
 	void CGroupContainer::setUCTitle(const ucstring &title)
 	{
-		setUCTitleOpened(title);
-		setUCTitleClosed(title);
+		setTitleRaw(title.toUtf8());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitle () const
 	{
-		return getUCTitleOpened();
+		return ucstring::makeFromUtf8(getTitleRaw());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitleOpened () const
 	{
-		return _TitleTextOpened;
+		return ucstring::makeFromUtf8(getTitleOpenedRaw());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitleClosed () const
 	{
-		return _TitleTextClosed;
+		return ucstring::makeFromUtf8(getTitleClosedRaw());
 	}
 
 	// ***************************************************************************
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 768c69066..47a36d0a1 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -96,7 +96,7 @@ namespace NLGUI
 									_ViewTextDeltaX(0)
 
 	{
-		_Prompt = u32string(1, (u32char)'>');
+		_Prompt = ::u32string(1, (u32char)'>');
 		_BackSelectColor= CRGBA::White;
 		_TextSelectColor= CRGBA::Black;
 	}
@@ -264,9 +264,9 @@ namespace NLGUI
 			std::string s;
 			s.reserve( _NegativeFilter.size() );
 
-			std::vector< char >::const_iterator itr;
-			for( itr = _NegativeFilter.begin(); itr != _NegativeFilter.end(); ++itr )
-				s.push_back( *itr );
+			std::vector< u32char >::const_iterator itr;
+			for (itr = _NegativeFilter.begin(); itr != _NegativeFilter.end(); ++itr)
+				CUtfStringView::append(s, *itr);
 			
 			return s;
 		}
@@ -450,10 +450,10 @@ namespace NLGUI
 		if( name == "negative_filter" )
 		{
 			_NegativeFilter.clear();
-
-			std::string::size_type i;
-			for( i = 0; i < value.size(); i++ )
-				_NegativeFilter.push_back( value[ i ] );
+			::u32string::size_type i;
+			::u32string ustr = CUtfStringView(value).toUtf32();
+			for( i = 0; i < ustr.size(); i++ )
+				_NegativeFilter.push_back(ustr[i]);
 		}
 		else
 			CInterfaceGroup::setProperty( name, value );
@@ -539,9 +539,9 @@ namespace NLGUI
 		std::string s;
 		s.reserve( _NegativeFilter.size() );
 
-		std::vector< char >::const_iterator itr;
+		std::vector< u32char >::const_iterator itr;
 		for( itr = _NegativeFilter.begin(); itr != _NegativeFilter.end(); ++itr )
-			s.push_back( *itr );
+			CUtfStringView::append(s, *itr);
 
 		xmlSetProp( node, BAD_CAST "negative_filter", BAD_CAST s.c_str() );
 
@@ -657,9 +657,11 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"negative_filter" );
 		if (prop)
 		{
-			uint length = (uint)strlen(prop);
-			_NegativeFilter.resize(length);
-			std::copy((const char *) prop, (const char *) prop + length, _NegativeFilter.begin());
+			_NegativeFilter.clear();
+			::u32string::size_type i;
+			::u32string ustr = CUtfStringView(prop).toUtf32();
+			for( i = 0; i < ustr.size(); i++ )
+				_NegativeFilter.push_back(ustr[i]);
 		}
 
 		return true;
@@ -829,10 +831,10 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	void CGroupEditBox::writeString(const ucstring &str16, bool replace, bool atEnd)
 	{
-		u32string str = CUtfStringView(str16).toUtf32();
+		::u32string str = CUtfStringView(str16).toUtf32();
 		sint length = (sint)str.length();
 
-		u32string toAppend;
+		::u32string toAppend;
 		// filter character depending on the entry type
 		switch (_EntryType)
 		{
@@ -854,7 +856,7 @@ namespace NLGUI
 					}
 				}
 				// remove '\r' characters
-				toAppend.erase(std::remove(toAppend.begin(), toAppend.end(), (ucchar) '\r'), toAppend.end());
+				toAppend.erase(std::remove(toAppend.begin(), toAppend.end(), (u32char) '\r'), toAppend.end());
 
 			}
 			break;
@@ -965,7 +967,7 @@ namespace NLGUI
 		{
 			length = _MaxNumChar - (sint)_InputString.length();
 		}
-		u32string toAdd = toAppend.substr(0, length);
+		::u32string toAdd = toAppend.substr(0, length);
 		sint32	minPos;
 		sint32	maxPos;
 		if (_CurrSelection == this)
@@ -1015,7 +1017,7 @@ namespace NLGUI
 				_CursorAtPreviousLineEnd = false;
 				if (_ClearOnEscape)
 				{
-					setInputStringAsUtf32(u32string());
+					setInputStringAsUtf32(::u32string());
 					triggerOnChangeAH();
 				}
 				CWidgetManager::getInstance()->setCaptureKeyboard(NULL);
@@ -1077,7 +1079,7 @@ namespace NLGUI
 							cutSelection();
 						}
 
-						ucchar c = isKeyRETURN ? '\n' : rEDK.getChar();
+						u32char c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
 						switch(_EntryType)
 						{
@@ -1124,8 +1126,8 @@ namespace NLGUI
 						if(_EntryType==Integer && (_IntegerMinValue!=INT_MIN || _IntegerMaxValue!=INT_MAX))
 						{
 							// estimate new string
-							u32string	copyStr= _InputString;
-							u32string::iterator it = copyStr.begin() + _CursorPos;
+							::u32string	copyStr= _InputString;
+							::u32string::iterator it = copyStr.begin() + _CursorPos;
 							copyStr.insert(it, c);
 							sint32	value;
 							fromString(CUtfStringView(copyStr).toUtf8(), value);
@@ -1137,8 +1139,8 @@ namespace NLGUI
 						if(_EntryType==PositiveInteger && (_PositiveIntegerMinValue!=0 || _PositiveIntegerMaxValue!=UINT_MAX))
 						{
 							// estimate new string
-							u32string	copyStr= _InputString;
-							u32string::iterator it = copyStr.begin() + _CursorPos;
+							::u32string	copyStr= _InputString;
+							::u32string::iterator it = copyStr.begin() + _CursorPos;
 							copyStr.insert(it, c);
 							// \todo yoyo: this doesn't really work i think....
 							uint32	value;
@@ -1151,7 +1153,7 @@ namespace NLGUI
 						if ((uint) _InputString.length() < _MaxNumChar)
 						{
 							makeTopWindow();
-							u32string::iterator it = _InputString.begin() + _CursorPos;
+							::u32string::iterator it = _InputString.begin() + _CursorPos;
 							_InputString.insert(it, c);
 							++ _CursorPos;
 							triggerOnChangeAH();
@@ -1263,7 +1265,7 @@ namespace NLGUI
 		// else delete last character
 		else if(_InputString.size () > 0 && _CursorPos != 0)
 		{
-			u32string::iterator it = _InputString.begin() + (_CursorPos - 1);
+			::u32string::iterator it = _InputString.begin() + (_CursorPos - 1);
 			_InputString.erase(it);
 			-- _CursorPos;
 			_CursorAtPreviousLineEnd = false;
@@ -1436,7 +1438,7 @@ namespace NLGUI
 			std::string usTmp;
 			if (_EntryType == Password)
 			{
-				usTmp = CUtfStringView(_Prompt + u32string(_InputString.size(), 0x2022)).toUtf8();
+				usTmp = CUtfStringView(_Prompt + ::u32string(_InputString.size(), 0x2022)).toUtf8();
 			}
 			else
 			{
@@ -1634,7 +1636,7 @@ namespace NLGUI
 	{
 		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
 	}
-	void CGroupEditBox::setInputStringAsUtf32(const u32string &str)
+	void CGroupEditBox::setInputStringAsUtf32(const ::u32string &str)
 	{
 		_InputString = str;
 		if (_CursorPos > (sint32) str.length())
@@ -1650,10 +1652,10 @@ namespace NLGUI
 
 
 	// ***************************************************************************
-	void	CGroupEditBox::setDefaultInputString(const ucstring &str)
+	void	CGroupEditBox::setDefaultInputString(const std::string &str)
 	{
 		_DefaultInputString= true;
-		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
+		setInputString(str);
 	}
 
 	// ***************************************************************************
@@ -1771,14 +1773,14 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CGroupEditBox::setCommand(const ucstring &command, bool execute)
+	void CGroupEditBox::setCommand(const std::string &command, bool execute)
 	{
 		// do nothing if frozen
 		if(_Frozen)
 			return;
 
 		// set the string and maybe execute
-		setInputStringAsUtf16((ucchar) '/' + command);
+		setInputString('/' + command);
 		if (execute)
 		{
 			// stop selection
@@ -1878,7 +1880,7 @@ namespace NLGUI
 	void CGroupEditBox::onQuit()
 	{
 		// clear the text and restore backup pos before final save
-		setInputStringAsUtf32(u32string());
+		setInputStringAsUtf32(::u32string());
 		_CurrSelection = NULL;
 	}
 
@@ -1886,7 +1888,7 @@ namespace NLGUI
 	void CGroupEditBox::onLoadConfig()
 	{
 		// config is not saved when there's an empty string, so restore that default state.
-		setInputStringAsUtf32(u32string());
+		setInputStringAsUtf32(::u32string());
 		_CurrSelection = NULL;
 		_PrevNumLine = 1;
 	}
@@ -1901,7 +1903,7 @@ namespace NLGUI
 			if (_DefaultInputString)
 			{
 				_DefaultInputString= false;
-				setInputStringAsUtf32(u32string());
+				setInputStringAsUtf32(::u32string());
 			}
 			_CanRedo = false;
 			_CanUndo = false;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index b559b409f..f7a62cc90 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1034,7 +1034,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::addText (const char * buf, int len)
+	void CGroupHTML::addText (const char *buf, int len)
 	{
 		if (_Browsing)
 		{
@@ -1042,44 +1042,43 @@ namespace NLGUI
 				return;
 
 			// Build a UTF8 string
-			string inputString(buf, buf+len);
-
 			if (_ParsingLua && _TrustedDomain)
 			{
 				// we are parsing a lua script
-				_LuaScript += inputString;
+				_LuaScript += string(buf, buf + len);
 				// no more to do
 				return;
 			}
 
 			// Build a unicode string
-			ucstring inputUCString;
-			inputUCString.fromUtf8(inputString);
+			CUtfStringView inputStringView(buf, len);
 
 			// Build the final unicode string
-			ucstring tmp;
+			string tmp;
 			tmp.reserve(len);
-			uint ucLen = (uint)inputUCString.size();
-			for (uint i=0; i<ucLen; i++)
+			u32char lastChar = 0;
+			u32char inputStringView0 = *inputStringView.begin();
+			for (CUtfStringView::iterator it(inputStringView.begin()), end(inputStringView.end()); it != end; ++it)
 			{
-				ucchar output;
+				u32char output;
 				bool keep;
 				// special treatment for 'nbsp' (which is returned as a discreet space)
-				if (inputString.size() == 1 && inputString[0] == 32)
+				if (len == 1 && inputStringView0 == 32)
 				{
 					// this is a nbsp entity
-					output = inputUCString[i];
+					output = *it;
 					keep = true;
 				}
 				else
 				{
 					// not nbsp, use normal white space removal routine
-					keep = translateChar (output, inputUCString[i], (tmp.empty())?0:tmp[tmp.size()-1]);
+					keep = translateChar (output, *it, lastChar);
 				}
 
 				if (keep)
 				{
-					tmp.push_back(output);
+					CUtfStringView::append(tmp, output);
+					lastChar = output;
 				}
 			}
 
@@ -1293,7 +1292,7 @@ namespace NLGUI
 					pos++;
 				}
 				token = content.substr(start, pos - start);
-				addString(ucstring::makeFromUtf8(token));
+				addString(token);
 
 				// skip closing quote
 				pos++;
@@ -1376,7 +1375,7 @@ namespace NLGUI
 
 				if (elm.hasAttribute(token))
 				{
-					addString(ucstring::makeFromUtf8(elm.getAttribute(token)));
+					addString(elm.getAttribute(token));
 				}
 			}
 			else
@@ -1562,7 +1561,7 @@ namespace NLGUI
 		else
 		if( name == "title_prefix" )
 		{
-			return _TitlePrefix.toString();
+			return _TitlePrefix;
 		}
 		else
 		if( name == "background_color" )
@@ -2224,7 +2223,7 @@ namespace NLGUI
 
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "html" );
 		xmlSetProp( node, BAD_CAST "url", BAD_CAST _URL.c_str() );
-		xmlSetProp( node, BAD_CAST "title_prefix", BAD_CAST _TitlePrefix.toString().c_str() );
+		xmlSetProp( node, BAD_CAST "title_prefix", BAD_CAST _TitlePrefix.c_str() );
 		xmlSetProp( node, BAD_CAST "background_color", BAD_CAST toString( BgColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "error_color", BAD_CAST toString( ErrorColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "link_color", BAD_CAST toString( LinkColor ).c_str() );
@@ -2669,7 +2668,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	bool CGroupHTML::translateChar(ucchar &output, ucchar input, ucchar lastCharParam) const
+	bool CGroupHTML::translateChar(u32char &output, u32char input, u32char lastCharParam) const
 	{
 		// Keep this char ?
 		bool keep = true;
@@ -2691,13 +2690,13 @@ namespace NLGUI
 				else
 				{
 					// Get the last char
-					ucchar lastChar = lastCharParam;
+					u32char lastChar = lastCharParam;
 					if (lastChar == 0)
 						lastChar = getLastChar();
-					keep = ((lastChar != (ucchar)' ') &&
+					keep = ((lastChar != (u32char)' ') &&
 							(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
 					if(!getPRE())
-						input = ' ';
+						input = (u32char)' ';
 				}
 			}
 			break;
@@ -2710,11 +2709,11 @@ namespace NLGUI
 				else
 				{
 					// Get the last char
-					ucchar lastChar = lastCharParam;
+					u32char lastChar = lastCharParam;
 					if (lastChar == 0)
 						lastChar = getLastChar();
-					keep = ((lastChar != (ucchar)' ') &&
-							(lastChar != (ucchar)'\n') &&
+					keep = ((lastChar != (u32char)' ') &&
+							(lastChar != (u32char)'\n') &&
 							(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
 				}
 			}
@@ -2753,9 +2752,9 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::addString(const ucstring &str)
+	void CGroupHTML::addString(const std::string &str)
 	{
-		string tmpStr = str.toUtf8();
+		string tmpStr = str;
 
 		if (_Localize)
 		{
@@ -2968,7 +2967,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content, uint maxlength)
+	CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const std::string &content, uint maxlength)
 	{
 		// In a paragraph ?
 		if (!_Paragraph)
@@ -3024,7 +3023,7 @@ namespace NLGUI
 				CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(textArea->getGroup("eb"));
 				if (eb)
 				{
-					eb->setInputString(CUtfStringView(decodeHTMLEntities(content)).toUtf8());
+					eb->setInputString(decodeHTMLEntities(content));
 					if (style.hasStyle("background-color"))
 					{
 						CViewBitmap *bg = dynamic_cast<CViewBitmap*>(eb->getView("bg"));
@@ -3310,7 +3309,7 @@ namespace NLGUI
 	{
 		if (_CurrentViewLink)
 		{
-			u32string str = CUtfStringView(_CurrentViewLink->getText()).toUtf32(); // FIXME: Optimize reverse UTF iteration
+			::u32string str = CUtfStringView(_CurrentViewLink->getText()).toUtf32(); // FIXME: Optimize reverse UTF iteration
 			if (!str.empty())
 				return str[str.length()-1];
 		}
@@ -3402,7 +3401,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::setTitle (const ucstring &title)
+	void CGroupHTML::setTitleRaw (const std::string &title)
 	{
 		CInterfaceElement *parent = getParent();
 		if (parent)
@@ -3412,7 +3411,7 @@ namespace NLGUI
 				CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
 				if (container)
 				{
-					container->setUCTitle (title);
+					container->setTitleRaw (title);
 				}
 			}
 		}
@@ -3420,21 +3419,18 @@ namespace NLGUI
 
 	void CGroupHTML::setTitle(const std::string &title)
 	{
-		ucstring uctitle;
-		uctitle.fromUtf8(title);
-
 		_TitleString.clear();
 		if(!_TitlePrefix.empty())
 		{
 			_TitleString = _TitlePrefix + " - ";
 		}
-		_TitleString += uctitle;
+		_TitleString += title;
 
-		setTitle(_TitleString);
+		setTitleRaw(_TitleString);
 	}
 
 	std::string CGroupHTML::getTitle() const {
-		return _TitleString.toUtf8();
+		return _TitleString;
 	};
 
 	// ***************************************************************************
@@ -4685,9 +4681,7 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 3, LUA_TBOOLEAN);
 
 		string name = ls.toString(1);
-
-		ucstring text;
-		text.fromUtf8(ls.toString(2));
+		string text = ls.toString(2);
 
 		if (!_Forms.empty())
 		{
@@ -4717,7 +4711,7 @@ namespace NLGUI
 		const char *funcName = "addString";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
-		addString(ucstring::makeFromUtf8(ls.toString(1)));
+		addString(ls.toString(1));
 		return 0;
 	}
 
@@ -4945,7 +4939,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	inline bool isDigit(ucchar c, uint base = 16)
+	inline bool isDigit(char c, uint base = 16)
 	{
 		if (c>='0' && c<='9') return true;
 		if (base != 16) return false;
@@ -4955,7 +4949,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	inline ucchar convertHexDigit(ucchar c)
+	inline char convertHexDigit(char c)
 	{
 		if (c>='0' && c<='9') return c-'0';
 		if (c>='A' && c<='F') return c-'A'+10;
@@ -4964,9 +4958,10 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	ucstring CGroupHTML::decodeHTMLEntities(const ucstring &str)
+	std::string CGroupHTML::decodeHTMLEntities(const std::string &str)
 	{
-		ucstring result;
+		std::string result;
+		result.reserve(str.size() + (str.size() >> 2));
 		uint last, pos;
 
 		for (uint i=0; i<str.length(); ++i)
@@ -5002,13 +4997,13 @@ namespace NLGUI
 						continue;
 					}
 
-					ucchar c = 0;
+					u32char c = 0;
 
 					// convert digits to unicode character
-					while (pos<last) c = convertHexDigit(str[pos++]) + c*ucchar(base);
+					while (pos < last) c = convertHexDigit(str[pos++]) + (c * u32char(base));
 
 					// append our new character to the result string
-					result += c;
+					CUtfStringView::append(result, c);
 
 					// move 'i' forward to point at the ';' .. the for(...) will increment i to point to next char
 					i = last;
@@ -5017,10 +5012,10 @@ namespace NLGUI
 				}
 
 				// special xml characters
-				if (str.substr(i+1,5)==ucstring("quot;"))	{ i+=5; result+='\"'; continue; }
-				if (str.substr(i+1,4)==ucstring("amp;"))	{ i+=4; result+='&'; continue; }
-				if (str.substr(i+1,3)==ucstring("lt;"))	{ i+=3; result+='<'; continue; }
-				if (str.substr(i+1,3)==ucstring("gt;"))	{ i+=3; result+='>'; continue; }
+				if (str.substr(i+1,5)=="quot;")	{ i+=5; result+='\"'; continue; }
+				if (str.substr(i+1,4)=="amp;")	{ i+=4; result+='&'; continue; }
+				if (str.substr(i+1,3)=="lt;")	{ i+=3; result+='<'; continue; }
+				if (str.substr(i+1,3)=="gt;")	{ i+=3; result+='>'; continue; }
 			}
 
 			// all the special cases are catered for... treat this as a normal character
@@ -5563,8 +5558,7 @@ namespace NLGUI
 	{
 		if (!_Paragraph || _Paragraph->getNumChildren() == 0)
 		{
-			ucstring tmp("\n");
-			addString(tmp);
+			addString("\n");
 		}
 		else
 		{
@@ -6086,8 +6080,7 @@ namespace NLGUI
 		{
 			// Get the string name
 			string name = elm.getAttribute("name");
-			ucstring ucValue;
-			ucValue.fromUtf8(elm.getAttribute("value"));
+			string ucValue = elm.getAttribute("value");
 
 			uint size = 20;
 			uint maxlength = 1024;
@@ -6121,12 +6114,12 @@ namespace NLGUI
 			string normal = elm.getAttribute("src");
 			string pushed;
 			string over;
-			ucstring ucValue = ucstring("on");
+			string ucValue = "on";
 			bool checked = elm.hasAttribute("checked");
 
 			// TODO: unknown if empty attribute should override or not
 			if (elm.hasNonEmptyAttribute("value"))
-				ucValue.fromUtf8(elm.getAttribute("value"));
+				ucValue = elm.getAttribute("value");
 
 			if (type == "radio")
 			{
@@ -6191,8 +6184,7 @@ namespace NLGUI
 				string name = elm.getAttribute("name");
 
 				// Get the value
-				ucstring ucValue;
-				ucValue.fromUtf8(elm.getAttribute("value"));
+				string ucValue = elm.getAttribute("value");
 
 				// Add an entry
 				CGroupHTML::CForm::CEntry entry;
@@ -6224,8 +6216,7 @@ namespace NLGUI
 		if (elm.hasNonEmptyAttribute("value"))
 			fromString(elm.getAttribute("value"), _UL.back().Value);
 
-		ucstring str;
-		str.fromUtf8(_UL.back().getListMarkerText());
+		string str = _UL.back().getListMarkerText();
 		addString (str);
 
 		// list-style-type: outside
@@ -6429,7 +6420,7 @@ namespace NLGUI
 		// use option text as value
 		if (!elm.hasAttribute("value"))
 		{
-			_Forms.back().Entries.back().SelectValues.back() = _SelectOptionStr.toUtf8();
+			_Forms.back().Entries.back().SelectValues.back() = _SelectOptionStr;
 		}
 
 		// insert the parsed text into the select control
@@ -6437,7 +6428,7 @@ namespace NLGUI
 		if (cb)
 		{
 			uint lineIndex = cb->getNumTexts();
-			cb->addText(_SelectOptionStr.toUtf8());
+			cb->addText(_SelectOptionStr);
 			if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
 			{
 				cb->setGrayed(lineIndex, true);
@@ -6449,7 +6440,7 @@ namespace NLGUI
 			if (sb)
 			{
 				uint lineIndex = sb->getNumLine();
-				sb->addLine(_SelectOptionStr.toUtf8(), "", "");
+				sb->addLine(_SelectOptionStr, "", "");
 
 				if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
 				{
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index b5744925f..d8552f153 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -118,9 +118,10 @@ namespace NLGUI
 		// Letter size
 		// - "_" that should be the character with the lowest part
 		// - A with an accent for the highest part
-		_FontSizingChars.fromUtf8("_\xc3\x84");
+		// https://www.compart.com/en/unicode/U+00C4
+		_FontSizingChars = { (u32char)'_', 0x000000C4 };
 		// fallback if SizingChars are not supported by font
-		_FontSizingFallback.fromUtf8("|");
+		_FontSizingFallback = { (u32char)'|' };
 		computeFontSize ();
 	}
 
@@ -396,12 +397,12 @@ namespace NLGUI
 		else
 		if ( name == "sizing_chars" )
 		{
-			return _FontSizingChars.toUtf8();
+			return CUtfStringView(_FontSizingChars).toUtf8();
 		}
 		else
 		if ( name == "sizing_fallback" )
 		{
-			return _FontSizingFallback.toUtf8();
+			return CUtfStringView(_FontSizingFallback).toUtf8();
 		}
 		else
 			return "";
@@ -688,13 +689,13 @@ namespace NLGUI
 		else
 		if( name == "sizing_chars" )
 		{
-			_FontSizingChars.fromUtf8(value);
+			_FontSizingChars = CUtfStringView(value).toUtf32();
 			return true;
 		}
 		else
 		if( name == "sizing_fallback" )
 		{
-			_FontSizingFallback.fromUtf8(value);
+			_FontSizingFallback = CUtfStringView(value).toUtf32();
 			return true;
 		}
 		else
@@ -766,8 +767,8 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "clamp_right", BAD_CAST toString( _ClampRight ).c_str() );
 		xmlSetProp( node, BAD_CAST "auto_clamp_offset", BAD_CAST toString( _AutoClampOffset ).c_str() );
 		xmlSetProp( node, BAD_CAST "continuous_update", BAD_CAST toString( _ContinuousUpdate ).c_str() );
-		xmlSetProp( node, BAD_CAST "sizing_chars", BAD_CAST _FontSizingChars.toUtf8().c_str() );
-		xmlSetProp( node, BAD_CAST "sizing_fallback", BAD_CAST _FontSizingFallback.toUtf8().c_str() );
+		xmlSetProp( node, BAD_CAST "sizing_chars", BAD_CAST CUtfStringView(_FontSizingChars).toUtf8().c_str() );
+		xmlSetProp( node, BAD_CAST "sizing_fallback", BAD_CAST CUtfStringView(_FontSizingFallback).toUtf8().c_str() );
 
 		return true;
 	}
@@ -953,16 +954,16 @@ namespace NLGUI
 		}
 
 		// "_Ä" lowest/highest chars (underscore, A+diaeresis)
-		_FontSizingChars.fromUtf8("_\xc3\x84");
+		_FontSizingChars = { (u32char)'_', 0x000000C4 };
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_chars" );
 		if (prop)
-			_FontSizingChars.fromUtf8((const char*)prop);
+			_FontSizingChars = CUtfStringView((const char*)prop).toUtf32();
 
 		// fallback if SizingChars are not supported by font
-		_FontSizingFallback.fromUtf8("|");
+		_FontSizingFallback = { (u32char)'|' };
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_fallback" );
 		if (prop)
-			_FontSizingFallback.fromUtf8((const char*)prop);
+			_FontSizingFallback = CUtfStringView((const char*)prop).toUtf32();
 
 		computeFontSize ();
 	}
@@ -1468,9 +1469,9 @@ namespace NLGUI
 	void CViewText::setFontSizing(const std::string &chars, const std::string &fallback)
 	{
 		_FontSizingChars.clear();
-		_FontSizingChars.fromUtf8(chars);
+		_FontSizingChars = CUtfStringView(chars).toUtf32();
 		_FontSizingFallback.clear();
-		_FontSizingFallback.fromUtf8(fallback);
+		_FontSizingFallback = CUtfStringView(fallback).toUtf32();
 	}
 
 	// ***************************************************************************
@@ -1683,7 +1684,7 @@ namespace NLGUI
 		nMaxWidth *= _Scale;
 		//for (i = 0; i < textSize; ++i)
 		CUtfStringView sv(_Text);
-		u32string ucStrLetter(1, ' ');
+		::u32string ucStrLetter(1, ' ');
 		for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it, ++i)
 		{
 			if(isFormatTagChange(i, formatTagIndex))
@@ -1863,7 +1864,7 @@ namespace NLGUI
 				uint	i;
 				for(i= (uint)spaceEnd;i<(uint)_Text.length();i++)
 				{
-					ucchar	c= _Text[i];
+					char	c= _Text[i];
 					if(c==' ' || c=='\n')
 						break;
 					// If change of color tag, stop the word, but don't take the new color now.
@@ -1950,7 +1951,7 @@ namespace NLGUI
 					else
 					{
 						float px = numSpaces * _SpaceWidth;
-						u32string oneChar(1, ' ');
+						::u32string oneChar(1, ' ');
 						CUtfStringView wsv(wordValue);
 						CUtfStringView::iterator wit(wsv.begin()), wend(wsv.end());
 						for (; wit != wend; ++wit)
@@ -2198,7 +2199,7 @@ namespace NLGUI
 				if (_ClampRight)
 				{
 					CUtfStringView sv(_Text);
-					u32string ucStrLetter = u32string(1, (u32char)' ');
+					::u32string ucStrLetter = u32string(1, (u32char)' ');
 					for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
 					{
 						ucStrLetter[0] = *it;
@@ -2224,8 +2225,8 @@ namespace NLGUI
 				else
 				{
 					// FIXME: Optimize reverse UTF iteration
-					u32string uctext = CUtfStringView(_Text).toUtf32();
-					u32string ucStrLetter = u32string(1, (u32char)' ');
+					::u32string uctext = CUtfStringView(_Text).toUtf32();
+					::u32string ucStrLetter = u32string(1, (u32char)' ');
 					for (sint i = (sint)uctext.size() - 1; i >= 0; --i)
 					{
 						ucStrLetter[0] = uctext[i];
@@ -2358,7 +2359,7 @@ namespace NLGUI
 			charIndex += currLine.getNumChars() + currLine.getEndSpaces() + (currLine.getLF() ? 1 : 0);
 		}
 		// skip all spaces at start of line (unless there are only spaces in the line)
-		std::string::size_type nextPos = _Text.find_first_not_of((ucchar) ' ', charIndex);
+		std::string::size_type nextPos = _Text.find_first_not_of(' ', charIndex);
 		if (nextPos != std::string::npos)
 		{
 			if (getLineFromIndex(charIndex) == (sint) line)
@@ -2567,7 +2568,7 @@ namespace NLGUI
 		float px = 0.f;
 
 		UTextContext::CStringInfo si;
-		u32string singleChar(1, ' ');
+		::u32string singleChar(1, ' ');
 		uint i = 0;
 		NLMISC::CUtfStringView sv(textValue);
 		for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it, ++i)
@@ -3405,7 +3406,7 @@ namespace NLGUI
 
 			while(textIndex<formatTag.Index)
 			{
-				if(tempText[textIndex] == ucchar(' '))
+				if(tempText[textIndex] == ' ')
 					spacesNb++;
 
 				textIndex++;
diff --git a/nel/src/misc/inter_window_msg_queue.cpp b/nel/src/misc/inter_window_msg_queue.cpp
index f27fa55da..ead2565a4 100644
--- a/nel/src/misc/inter_window_msg_queue.cpp
+++ b/nel/src/misc/inter_window_msg_queue.cpp
@@ -459,6 +459,9 @@ namespace NLMISC
 		{
 			return handleWMCopyData(hwnd, (COPYDATASTRUCT *) lParam);
 		}
+		// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
+		if (uMsg == WM_UNICHAR)
+			return (wParam == UNICODE_NOCHAR);
 		return DefWindowProc(hwnd, uMsg, wParam, lParam);
 	}
 
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 06dcb5e76..070745202 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -102,13 +102,13 @@ ucstring CUtfStringView::toUtf16(bool reEncode) const
 	return res;
 }
 
-u32string CUtfStringView::toUtf32() const
+::u32string CUtfStringView::toUtf32() const
 {
 	// Decode any UTF
 	// This implementation makes no attempt at fixing bad encoding
 	if (m_Iterator == utf32Iterator)
-		return u32string((const u32char *)m_Str, (const u32char *)((ptrdiff_t)m_Str + m_Size));
-	u32string res;
+		return ::u32string((const u32char *)m_Str, (const u32char *)((ptrdiff_t)m_Str + m_Size));
+	::u32string res;
 	res.reserve(m_Size << 2);
 	for (iterator it(begin()), end(this->end()); it != end; ++it)
 		res += *it;
diff --git a/nel/src/misc/win_event_emitter.cpp b/nel/src/misc/win_event_emitter.cpp
index 5b6860794..0d370cffc 100644
--- a/nel/src/misc/win_event_emitter.cpp
+++ b/nel/src/misc/win_event_emitter.cpp
@@ -162,6 +162,14 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 				server->postEvent (new CEventKeyUp ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
 		}
 		break;
+	case WM_UNICHAR:
+		if (wParam != UNICODE_NOCHAR && _KeyboardEventsEnabled)
+		{
+			//if (wParam < KeyCount)
+			//nlinfo("WM_UNICHAR with %u", wParam);
+			server->postEvent (new CEventChar ((u32char)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
+		}
+		break;
 	case WM_CHAR:
 		if (_KeyboardEventsEnabled)
 		{
diff --git a/ryzom/client/src/actions.cpp b/ryzom/client/src/actions.cpp
index 783088b21..428c607f0 100644
--- a/ryzom/client/src/actions.cpp
+++ b/ryzom/client/src/actions.cpp
@@ -499,9 +499,9 @@ void CCombo::init (NLMISC::TKey key, NLMISC::TKeyButton keyButtons)
 }
 
 // ***************************************************************************
-ucstring CCombo::toUCString() const
+string CCombo::toString() const
 {
-	ucstring ret;
+	string ret;
 	if ((KeyButtons & shiftKeyButton) && (Key != 0x10))
 		ret += CI18N::get("uiKeySHIFT") + "+";
 	if ((KeyButtons & ctrlKeyButton) && (Key != 0x11))
diff --git a/ryzom/client/src/actions.h b/ryzom/client/src/actions.h
index 1e1bffb84..3fe976ac4 100644
--- a/ryzom/client/src/actions.h
+++ b/ryzom/client/src/actions.h
@@ -66,7 +66,7 @@ public:
 	void init (NLMISC::TKey key, NLMISC::TKeyButton keyButtons);
 
 	/// Get the combo in human readable form
-	ucstring toUCString() const;
+	std::string toString() const;
 
 	// For maps
 	bool operator<(const CCombo &other) const
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index bde8f5389..c2d3bafbc 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -70,7 +70,7 @@ static inline uint getCharacterCategory(u32char c)
 /** skip a block of character in a string, (same behaviour than when Ctrl-arrow is pressed)
   * It returns the new index
   */
-static uint skipUCCharsRight(uint startPos, const u32string &str)
+static uint skipUCCharsRight(uint startPos, const ::u32string &str)
 {
 	uint pos = startPos;
 	uint endIndex = (uint)str.length();
@@ -87,7 +87,7 @@ static uint skipUCCharsRight(uint startPos, const u32string &str)
 /** skip a block of character in a string, (same behaviour than when Ctrl-arrow is pressed)
   * It returns the new index
   */
-static uint skipUCCharsLeft(uint startPos, const u32string &str)
+static uint skipUCCharsLeft(uint startPos, const ::u32string &str)
 {
 	uint pos = startPos;
 	-- pos;
@@ -363,7 +363,7 @@ class CAHEditPreviousLine : public CAHEdit
 		if (_GroupEdit->getMaxHistoric() && (! _GroupEdit->getViewText()->getMultiLine()))
 		{
 			// Get the start of the string.
-			u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
+			::u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
 
 			// Search all historic string that match startStr.
 			for(sint i=_GroupEdit->getCurrentHistoricIndex()+1;i<(sint)_GroupEdit->getNumHistoric();i++)
@@ -435,7 +435,7 @@ class CAHEditNextLine : public CAHEdit
 		if( (! _GroupEdit->getViewText()->getMultiLine()) && _GroupEdit->getMaxHistoric() && _GroupEdit->getCurrentHistoricIndex()>0)
 		{
 			// Get the start of the string.
-			u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
+			::u32string	startStr= _GroupEdit->getInputStringRef().substr(0, _GroupEdit->getCursorPos());
 
 			// Search all historic string that match startStr.
 			for(sint i=_GroupEdit->getCurrentHistoricIndex()-1;i>=0;i--)
@@ -521,8 +521,8 @@ protected:
 		// else cut forwards
 		else if(_GroupEdit->getCursorPos() < (sint32) _GroupEdit->getInputStringRef().length())
 		{
-			u32string inputString = _GroupEdit->getInputStringRef();
-			u32string::iterator it = inputString.begin() + _GroupEdit->getCursorPos();
+			::u32string inputString = _GroupEdit->getInputStringRef();
+			::u32string::iterator it = inputString.begin() + _GroupEdit->getCursorPos();
 			inputString.erase(it);
 			_GroupEdit->setInputStringRef (inputString);
 			if (!_GroupEdit->getAHOnChange().empty())
@@ -660,7 +660,7 @@ class CAHEditExpandOrCycleTell : public CAHEdit
 		else
 		{
 			// it is not a filtered chat, display 'tell' (must be ingame)
-			_GroupEdit->setCommand(ucstring("tell ") + *lastTellPeople + (ucchar) ' ', false);
+			_GroupEdit->setCommand("tell " + (*lastTellPeople).toUtf8() + ' ', false);
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 354a4c833..e046fbe2d 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -349,13 +349,13 @@ void CChatWindow::enableBlink(uint numBlinks)
 void CChatWindow::setCommand(const std::string &command, bool execute)
 {
 	if (!_EB) return;
-	_EB->setCommand(ucstring(command), execute);
+	_EB->setCommand(command, execute);
 }
 
 void CChatWindow::setCommand(const ucstring &command,bool execute)
 {
 	if (!_EB) return;
-	_EB->setCommand(command, execute);
+	_EB->setCommand(command.toUtf8(), execute);
 }
 
 
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 669ee62c2..994274571 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -3398,7 +3398,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 		if (macroName.empty())
 			macroName = CI18N::get("uiNotAssigned");
 
-		ucstring assignedTo = macro->Combo.toUCString();
+		ucstring assignedTo = macro->Combo.toString();
 		if (assignedTo.empty())
 			assignedTo = CI18N::get("uiNotAssigned");
 
diff --git a/ryzom/client/src/interface_v3/group_modal_get_key.cpp b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
index e3791cf8e..6f28e3b65 100644
--- a/ryzom/client/src/interface_v3/group_modal_get_key.cpp
+++ b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
@@ -89,7 +89,7 @@ bool CGroupModalGetKey::handleEvent (const NLGUI::CEventDescriptor &event)
 				// Setup the text !
 				CInterfaceManager *pIM = CInterfaceManager::getInstance();
 				CViewText *pVT= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId( VIEW_TEXT_KEY ));
-				if (pVT != NULL) pVT->setText(Combo.toUCString().toUtf8());
+				if (pVT != NULL) pVT->setText(Combo.toString());
 
 				// Check if in use
 				CActionsManager *pCurAM = NULL;
diff --git a/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp
index 0b789fccf..77775489f 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.cpp
+++ b/ryzom/client/src/interface_v3/group_quick_help.cpp
@@ -244,7 +244,7 @@ void CGroupQuickHelp::beginElement(CHtmlElement &elm)
 					CActionsManager::TActionComboMap::const_iterator ite = actionCombo.find (CAction::CName (elm.getAttribute("z_action_shortcut").c_str(), params.c_str()));
 					if (ite != actionCombo.end())
 					{
-						addString (ite->second.toUCString());
+						addString (ite->second.toString());
 					}
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
index 82b928211..aa8cd0582 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@@ -665,7 +665,7 @@ static DECLARE_INTERFACE_USER_FCT(getKey)
 	CActionsManager::TActionComboMap::const_iterator it = acmap.find(CAction::CName(name.c_str(),param.c_str()));
 	if (it != acmap.end())
 	{
-		result.setString (it->second.toUCString().toUtf8());
+		result.setString (it->second.toString());
 	}
 	else
 	{
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index d62a8746a..c04ce38cd 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -208,7 +208,7 @@ void getAllComboAction(uint8 nAM, CGroupList *pList, const map<ucstring, CComboA
 		if(remapIT->second.Combo.Key==KeyCount)
 			keyName= CI18N::get("uiNotAssigned");
 		else
-			keyName= remapIT->second.Combo.toUCString();
+			keyName= remapIT->second.Combo.toString();
 		const CBaseAction *baseAction = pAM->getBaseAction(remapIT->second.ActionName);
 		if (baseAction)
 		{
@@ -711,7 +711,7 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(WinName+VIEW_EDITCMD_TEXT_KEY));
 		if (pVT != NULL) pVT->setActive(true);
 		// setup the text of the key
-		pVT->setText(it->second.toUCString().toUtf8());
+		pVT->setText(it->second.toString());
 
 		// There is already a shortcut so we can display ok button
 		pBut = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
@@ -887,7 +887,7 @@ void CModalContainerEditCmd::validCurrentCommand()
 			{
 				CurrentEditCmdLine.Combo = it->second;
 				// Yes ok let setup the text of the key
-				pVT->setText(it->second.toUCString().toUtf8());
+				pVT->setText(it->second.toString());
 				// There is already a shortcut so we can display ok button
 				CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(WinName+CTRL_EDITCMD_BUTTON_OK));
 				if (pCB != NULL) pCB->setFrozen (false);
@@ -1353,7 +1353,7 @@ public:
 			pMCM->NewKey->CurrentEditCmdLine.Combo = pGetKey->Combo;
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(pMCM->NewKey->WinName+VIEW_EDITCMD_TEXT_KEY));
-			if (pVT != NULL) pVT->setText(pMCM->NewKey->CurrentEditCmdLine.Combo.toUCString().toUtf8());
+			if (pVT != NULL) pVT->setText(pMCM->NewKey->CurrentEditCmdLine.Combo.toString());
 
 			CCtrlBaseButton *pCB = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId(pMCM->NewKey->WinName+CTRL_EDITCMD_BUTTON_OK));
 			if (pCB != NULL) pCB->setFrozen (false);
@@ -1365,7 +1365,7 @@ public:
 			pMCM->EditCmd->CurrentEditCmdLine.Combo = pGetKey->Combo;
 			pMCM->CurrentEditMacro.Combo = pMCM->EditCmd->CurrentEditCmdLine.Combo;
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_NEWMACRO_KEY));
-			if (pVT != NULL) pVT->setText(pMCM->EditCmd->CurrentEditCmdLine.Combo.toUCString().toUtf8());
+			if (pVT != NULL) pVT->setText(pMCM->EditCmd->CurrentEditCmdLine.Combo.toString());
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 4b0d2fee9..d097ec239 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -897,7 +897,7 @@ public:
 			if (pMCM->CurrentEditMacro.Combo.Key == KeyCount)
 				pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 			else
-				pVT->setText(pMCM->CurrentEditMacro.Combo.toUCString().toUtf8());
+				pVT->setText(pMCM->CurrentEditMacro.Combo.toString());
 		}
 
 		pList->clearGroups();
@@ -1003,7 +1003,7 @@ void addMacroLine (CGroupList *pParent, uint macNb, const CMacroCmd &macro)
 	if (pVT != NULL)
 	{
 		if (macro.Combo.Key != KeyCount)
-			pVT->setText(macro.Combo.toUCString().toUtf8());
+			pVT->setText(macro.Combo.toString());
 		else
 			pVT->setText(CI18N::get(VIEW_EDITCMD_TEXT_KEY_DEFAULT));
 	}
diff --git a/ryzom/client/src/interface_v3/task_bar_manager.cpp b/ryzom/client/src/interface_v3/task_bar_manager.cpp
index fcc4c30f2..35f27b07d 100644
--- a/ryzom/client/src/interface_v3/task_bar_manager.cpp
+++ b/ryzom/client/src/interface_v3/task_bar_manager.cpp
@@ -180,7 +180,7 @@ public:
 			if (pVT != NULL)
 			{
 				if (it != acmap.end())
-					pVT->setText(it->second.toUCString().toUtf8());
+					pVT->setText(it->second.toString());
 				else
 					pVT->setText(CI18N::get("uiNotAssigned"));
 			}
diff --git a/ryzom/client/src/main_loop_debug.cpp b/ryzom/client/src/main_loop_debug.cpp
index 70616e1f7..7c63d9502 100644
--- a/ryzom/client/src/main_loop_debug.cpp
+++ b/ryzom/client/src/main_loop_debug.cpp
@@ -714,7 +714,7 @@ static std::string getActionKey(const char* name, const char* param = "")
 
 	CActionsManager::TActionComboMap::const_iterator ite = acmap.find(CAction::CName(name, param));
 	if (ite != acmap.end())
-		return ite->second.toUCString().toString();
+		return ite->second.toString();
 
 	return CI18N::get("uiNotAssigned");
 }

From 632f8133a287df6a7faa7233ea1169c4e3f60094 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 10:50:39 +0800
Subject: [PATCH 074/292] Fix merge

---
 nel/src/gui/view_text.cpp                     |   5 +-
 .../src/interface_v3/action_handler_item.cpp  | 165 +++++++++++++++---
 2 files changed, 146 insertions(+), 24 deletions(-)

diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index d8552f153..4f0b71c60 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -1022,7 +1022,10 @@ namespace NLGUI
 
 			if (_MultiLine)
 			{
-				setTextFormatTaged(CI18N::get(propPtr));
+				if (NLMISC::startsWith(propPtr, "u:"))
+					setTextFormatTaged(std::string(propPtr).substr(2));
+				else
+					setTextFormatTaged(CI18N::get(propPtr));
 			}
 			else
 			{
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 23992f4f6..d108e6a21 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -156,27 +156,35 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 						// Select all the text for easier selection
 						editBoxShort->setSelectionAll();
 					}
+					group->setActive(true);
 				}
 				else
 				{
+					ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 					if (itemInfo.CustomText.empty())
-						display->setTextFormatTaged(CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)).toUtf8());
+						display->setTextFormatTaged(localDesc.toUtf8());
 					else
 					{
 						ucstring text = itemInfo.CustomText;
-						string::size_type delimiter = text.find(' ');
-						if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+						if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 						{
 							CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 							if (pGH)
-								pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
-							if (delimiter == string::npos)
-								group->setActive(false);
-							else
-								text = text.substr(delimiter, text.size()-delimiter);
+								pGH->browse(text.substr(4, text.size()-4).toString().c_str());
+							text = localDesc;
+						}
+						else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
+						{
+							string code = text.substr(4, text.size()-4).toString();
+							if (!code.empty())
+								CLuaManager::getInstance().executeLuaScript(code);
+							text = localDesc;
+						}
+						if (!text.empty())
+						{
+							display->setTextFormatTaged(text.toUtf8());
+							group->setActive(true);
 						}
-						
-						display->setTextFormatTaged(text.toUtf8());		
 					}
 				}
 			}
@@ -287,33 +295,37 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					display->setActive(true);
 					editButtons->setActive(false);
 					closeButton->setActive(true);
-					group->setActive(true);
+					group->setActive(false);
 
 					editBoxShort->setInputString(std::string());
 					editBoxLarge->setInputString(std::string());
-					display->setTextFormatTaged(std::string());
+					display->setTextFormatTaged(ucstring());
 
 					// Finish the display or add the waiter
 					if (getInventory().isItemInfoUpToDate(ItemSlotId))
 					{
-						// If we already have item info
+						ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 						if (itemInfo.CustomText.empty())
-							display->setTextFormatTaged(CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)).toUtf8());
+							display->setTextFormatTaged(localDesc.toUtf8());
 						else
 						{
 							ucstring text = itemInfo.CustomText;
-							string::size_type delimiter = text.find(' ');
-							if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+							if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 							{
 								CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 								if (pGH)
-									pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
-								if (delimiter == string::npos)
-									group->setActive(false);
-								else
-									text = text.substr(delimiter, text.size()-delimiter);
+									pGH->browse(text.substr(4, text.size()-4).toUtf8().c_str());
+								text = localDesc;
 							}
-							display->setTextFormatTaged(text.toUtf8());
+							else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
+							{
+								string code = text.substr(4, text.size()-4).toUtf8();
+								if (!code.empty())
+									CLuaManager::getInstance().executeLuaScript(code);
+								text = localDesc;
+							}
+							if (!text.empty())
+								display->setTextFormatTaged(text.toUtf8());
 						}
 					}
 					else
@@ -434,7 +446,7 @@ static	TStackMode		CurrentStackMode;
 
 
 static void validateStackItem(CDBCtrlSheet *src, CDBCtrlSheet *dest, sint32 quantity, TStackMode stackMode);
-
+static void checkItemCommand(const CItemSheet *itemSheet);
 
 //=====================================================================================================================
 /** Send a swap item msg to the server
@@ -1676,6 +1688,10 @@ class CHandlerItemCristalReload : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
+		const CItemSheet *pIS = pCS->asItemSheet();
+		if (pIS && pIS->Scroll.Label.empty())
+			checkItemCommand(pIS);
+
 		sendToServerEnchantMessage((uint8)pCS->getInventoryIndex(), (uint16)pCS->getIndexInDB());
 	}
 };
@@ -1753,6 +1769,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 		CViewTextMenu	*pCrisReload = dynamic_cast<CViewTextMenu*>(pMenu->getView("cris_reload"));
 		CViewTextMenu	*pTeleportUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("teleport_use"));
 		CViewTextMenu	*pItemConsume = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_consume"));
+		CViewTextMenu	*pItemExecute = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_execute"));
 		CViewTextMenu	*pXpCatalyserUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("xp_catalyser_use"));
 		CViewTextMenu	*pDrop = dynamic_cast<CViewTextMenu*>(pMenu->getView("drop"));
 		CViewTextMenu	*pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
@@ -1780,6 +1797,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 		if(pCrisReload)	pCrisReload->setActive(false);
 		if(pTeleportUse) pTeleportUse->setActive(false);
 		if(pItemConsume) pItemConsume->setActive(false);
+		if(pItemExecute) pItemExecute->setActive(false);
 		if(pXpCatalyserUse) pXpCatalyserUse->setActive(false);
 		if(pItemTextDisplay) pItemTextDisplay->setActive(false);
 		if(pItemTextEdition) pItemTextEdition->setActive(false);
@@ -1854,6 +1872,61 @@ class CHandlerItemMenuCheck : public IActionHandler
 			{
 				pItemInfos->setActive(true);
 			}
+			// item has a label?
+			if (!pIS->Scroll.Label.empty())
+			{
+				CGroupMenu *menu = dynamic_cast<CGroupMenu *>(
+					CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag")
+				);
+				// add the label to default menu
+				if (!pIS->Scroll.LuaCommand.empty() || !pIS->Scroll.WebCommand.empty())
+					menu->setActionHandler(4, menu->getActionHandler(4));
+				else
+				{
+					// replace default menu and redirect action handler
+					if (pCrisEnchant && pCrisEnchant->getActive())
+					{
+						pCrisEnchant->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(0));
+					}
+					if (pCrisReload && pCrisReload->getActive())
+					{
+						pCrisReload->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(1));
+					}
+					if (pTeleportUse && pTeleportUse->getActive())
+					{
+						pTeleportUse->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(2));
+					}
+					if (pItemConsume && pItemConsume->getActive())
+					{
+						pItemConsume->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(3));
+					}
+					if (pXpCatalyserUse && pXpCatalyserUse->getActive())
+					{
+						pXpCatalyserUse->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(5));
+					}
+					if (pItemTextDisplay && pItemTextDisplay->getActive())
+					{
+						pItemTextDisplay->setActive(false);
+						menu->setActionHandler(4, menu->getActionHandler(6));
+						menu->setActionHandlerParam(4, menu->getActionHandlerParam(6));
+					}
+				}
+				if (!bIsLockedByOwner)
+				{
+					if (pCS->getInventoryIndex() == INVENTORIES::bag)
+						pItemExecute->setActive(true);
+					// enchant and reload can be used from anywhere
+					if (pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL || pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE)
+						pItemExecute->setActive(true);
+
+					pItemExecute->setText(CI18N::get(pIS->Scroll.Label));
+				}
+			}
 		}
 
 		CInventoryManager	&invMngr= getInventory();
@@ -1984,6 +2057,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pCrisReload)		pCrisReload->setGrayed(true);
 			if(pTeleportUse)	pTeleportUse->setGrayed(true);
 			if(pItemConsume)	pItemConsume->setGrayed(true);
+			if(pItemExecute)	pItemExecute->setGrayed(true);
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(true);
 			if(pDrop)			pDrop->setGrayed(true);
 			if(pDestroy)		pDestroy->setGrayed(true);
@@ -2003,6 +2077,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pCrisReload)		pCrisReload->setGrayed(false);
 			if(pTeleportUse)	pTeleportUse->setGrayed(false);
 			if(pItemConsume)	pItemConsume->setGrayed(false);
+			if(pItemExecute)	pItemExecute->setGrayed(false);
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(false);
 			if(pDrop)			pDrop->setGrayed(false);
 			if(pDestroy)		pDestroy->setGrayed(false);
@@ -2181,6 +2256,24 @@ static void sendMsgStopUseXpCat( bool isRingCatalyser )
 	}
 }
 
+// ***************************************************************************
+static void checkItemCommand(const CItemSheet *itemSheet)
+{
+	if (itemSheet)
+	{
+		if (!itemSheet->Scroll.LuaCommand.empty())
+			CLuaManager::getInstance().executeLuaScript(itemSheet->Scroll.LuaCommand);
+		// webig
+		if (!itemSheet->Scroll.WebCommand.empty())
+		{
+			CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(
+				CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html")
+			);
+			if (pGH) pGH->browse(itemSheet->Scroll.WebCommand.c_str());
+		}
+	}
+	return;
+}
 
 // ***************************************************************************
 class CHandlerTeleportUse : public IActionHandler
@@ -2209,6 +2302,8 @@ class CHandlerTeleportUse : public IActionHandler
 					LoadingBackground = TeleportKaravanBackground;
 				break;
 			}
+			if (pIS->Scroll.Label.empty())
+				checkItemCommand(pIS);
 		}
 	}
 };
@@ -2223,12 +2318,28 @@ class CHandlerItemConsume : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
+		const CItemSheet *pIS = pCS->asItemSheet();
+		if (pIS && pIS->Scroll.Label.empty())
+			checkItemCommand(pIS);
+
 		// use the item
 		sendMsgUseItem(uint16(pCS->getIndexInDB()));
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerItemConsume, "item_consume" );
 
+// ***************************************************************************
+class CHandlerItemExecute : public IActionHandler
+{
+	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
+	{
+		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
+		if (pCS)
+			checkItemCommand(pCS->asItemSheet());
+		return;
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerItemExecute, "item_execute" );
 
 // ***************************************************************************
 class CHandlerValidateItemTextEdition : public IActionHandler
@@ -2252,6 +2363,10 @@ class CHandlerItemTextDisplay : public IActionHandler
 		if (pCSItem == NULL || windowName.empty()) 
 			return;
 
+		const CItemSheet *pIS = pCSItem->asItemSheet();
+		if (pIS && pIS->Scroll.Label.empty())
+			checkItemCommand(pIS);
+
 		CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, false);
 	}
 };
@@ -2293,6 +2408,10 @@ class CHandlerXpCatalyserUse : public IActionHandler
 		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
 		if (pCS == NULL) return;
 
+		const CItemSheet *pIS = pCS->asItemSheet();
+		if (pIS && pIS->Scroll.Label.empty())
+			checkItemCommand(pIS);
+
 		// use the item
 		sendMsgUseItem(uint16(pCS->getIndexInDB()));
 	}

From 856f7e88f264c28a3e1254312837ac5e36eb296e Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 11:29:49 +0800
Subject: [PATCH 075/292] Update general_settings_widget.cpp

---
 .../client/client_config_qt/src/general_settings_widget.cpp   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp b/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
index f38e5299b..6bb81f70f 100644
--- a/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
+++ b/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
@@ -42,13 +42,13 @@ void CGeneralSettingsWidget::load()
 	CSystem &s = CSystem::GetInstance();
 
 	std::vector<std::string> codes = NLMISC::CI18N::getLanguageCodes();
-	std::vector<ucstring> names = NLMISC::CI18N::getLanguageNames();
+	std::vector<std::string> names = NLMISC::CI18N::getLanguageNames();
 
 	languageComboBox->clear();
 
 	for(uint i = 0; i < codes.size(); ++i)
 	{
-		languageComboBox->addItem(QString::fromUtf16(names[i].c_str()), QString::fromUtf8(codes[i].c_str()));
+		languageComboBox->addItem(QString::fromUtf8(names[i].c_str()), QString::fromUtf8(codes[i].c_str()));
 	}
 
 	sint32 cbIndex = getIndexForLanguageCode( QString::fromUtf8( s.config.getString( "LanguageCode" ).c_str() ) );

From 2450f95c03edb83c11463c83c3572aef3ac027ce Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 11:11:41 +0800
Subject: [PATCH 076/292] Fix XP build

---
 nel/src/3d/driver/direct3d/driver_direct3d.cpp    | 2 ++
 nel/src/3d/driver/opengl/driver_opengl_window.cpp | 2 ++
 nel/src/misc/inter_window_msg_queue.cpp           | 2 ++
 nel/src/misc/win_event_emitter.cpp                | 5 +++++
 4 files changed, 11 insertions(+)

diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index bb954ba4d..f26a37afb 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1265,9 +1265,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		return 0;
 	}
 
+#ifdef WM_UNICHAR
 	// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
 	if (message == WM_UNICHAR)
 		return (wParam == UNICODE_NOCHAR);
+#endif
 
 	return DefWindowProcW(hWnd, message, wParam, lParam);
 }
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index dc48ecbf0..a987b7425 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -183,9 +183,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		return 0;
 	}
 
+#ifdef WM_UNICHAR
 	// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
 	if (message == WM_UNICHAR)
 		return (wParam == UNICODE_NOCHAR);
+#endif
 
 	return trapMessage ? 0 : DefWindowProcW(hWnd, message, wParam, lParam);
 }
diff --git a/nel/src/misc/inter_window_msg_queue.cpp b/nel/src/misc/inter_window_msg_queue.cpp
index ead2565a4..74c34b281 100644
--- a/nel/src/misc/inter_window_msg_queue.cpp
+++ b/nel/src/misc/inter_window_msg_queue.cpp
@@ -459,9 +459,11 @@ namespace NLMISC
 		{
 			return handleWMCopyData(hwnd, (COPYDATASTRUCT *) lParam);
 		}
+#ifdef WM_UNICHAR
 		// https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-unichar
 		if (uMsg == WM_UNICHAR)
 			return (wParam == UNICODE_NOCHAR);
+#endif
 		return DefWindowProc(hwnd, uMsg, wParam, lParam);
 	}
 
diff --git a/nel/src/misc/win_event_emitter.cpp b/nel/src/misc/win_event_emitter.cpp
index 0d370cffc..8788bab7b 100644
--- a/nel/src/misc/win_event_emitter.cpp
+++ b/nel/src/misc/win_event_emitter.cpp
@@ -162,6 +162,7 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 				server->postEvent (new CEventKeyUp ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
 		}
 		break;
+#ifdef WM_UNICHAR
 	case WM_UNICHAR:
 		if (wParam != UNICODE_NOCHAR && _KeyboardEventsEnabled)
 		{
@@ -170,11 +171,15 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 			server->postEvent (new CEventChar ((u32char)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
 		}
 		break;
+#endif
 	case WM_CHAR:
 		if (_KeyboardEventsEnabled)
 		{
 			//if (wParam < KeyCount)
 			//nlinfo("WM_CHAR with %u", wParam);
+#ifndef WM_UNICHAR
+			// FIXME: Combine UTF-16 pairs
+#endif
 			server->postEvent (new CEventChar ((ucchar)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
 		}
 		break;

From 560a19e6f727e835e556130c51b186dc3a8ba390 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 11:17:18 +0800
Subject: [PATCH 077/292] Fix build

---
 nel/src/gui/view_text.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 4f0b71c60..acb898d12 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -119,9 +119,11 @@ namespace NLGUI
 		// - "_" that should be the character with the lowest part
 		// - A with an accent for the highest part
 		// https://www.compart.com/en/unicode/U+00C4
-		_FontSizingChars = { (u32char)'_', 0x000000C4 };
+		static const u32char chars[] = { (u32char)'_', 0x000000C4, 0 };
+		_FontSizingChars = chars;
 		// fallback if SizingChars are not supported by font
-		_FontSizingFallback = { (u32char)'|' };
+		static const u32char fallback[] = { (u32char)'|', 0 };
+		_FontSizingFallback = fallback;
 		computeFontSize ();
 	}
 
@@ -954,13 +956,15 @@ namespace NLGUI
 		}
 
 		// "_Ä" lowest/highest chars (underscore, A+diaeresis)
-		_FontSizingChars = { (u32char)'_', 0x000000C4 };
+		static const u32char chars[] = { (u32char)'_', 0x000000C4, 0 };
+		_FontSizingChars = chars;
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_chars" );
 		if (prop)
 			_FontSizingChars = CUtfStringView((const char*)prop).toUtf32();
 
 		// fallback if SizingChars are not supported by font
-		_FontSizingFallback = { (u32char)'|' };
+		static const u32char fallback[] = { (u32char)'|', 0 };
+		_FontSizingFallback = fallback;
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_fallback" );
 		if (prop)
 			_FontSizingFallback = CUtfStringView((const char*)prop).toUtf32();

From 9ff5eee1e81357c65f7688455ab25cb64dae04f6 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 13:13:56 +0800
Subject: [PATCH 078/292] Fix

---
 nel/src/gui/view_text.cpp    | 4 ++--
 nel/src/gui/view_text_id.cpp | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index acb898d12..2f8a27d0c 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -2206,7 +2206,7 @@ namespace NLGUI
 				if (_ClampRight)
 				{
 					CUtfStringView sv(_Text);
-					::u32string ucStrLetter = u32string(1, (u32char)' ');
+					::u32string ucStrLetter = ::u32string(1, (u32char)' ');
 					for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
 					{
 						ucStrLetter[0] = *it;
@@ -2233,7 +2233,7 @@ namespace NLGUI
 				{
 					// FIXME: Optimize reverse UTF iteration
 					::u32string uctext = CUtfStringView(_Text).toUtf32();
-					::u32string ucStrLetter = u32string(1, (u32char)' ');
+					::u32string ucStrLetter = ::u32string(1, (u32char)' ');
 					for (sint i = (sint)uctext.size() - 1; i >= 0; --i)
 					{
 						ucStrLetter[0] = uctext[i];
diff --git a/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
index 1f1ac5440..ea961dd2a 100644
--- a/nel/src/gui/view_text_id.cpp
+++ b/nel/src/gui/view_text_id.cpp
@@ -228,8 +228,12 @@ namespace NLGUI
 			while(NLMISC::strFindReplace(result,   "{ros_exit}",   ""));
 
 			// Modify the text?
-			if(_StringModifier)
-				_StringModifier->onReceiveTextId(ucstring::makeFromUtf8(result));
+			if (_StringModifier)
+			{
+				ucstring tmp = ucstring::makeFromUtf8(result);
+				_StringModifier->onReceiveTextId(tmp); // FIXME: UTF-8
+				result = tmp.toUtf8();
+			}
 
 			// Set the Text
 			if(_IsTextFormatTaged)

From bc66f3a464f0801b19dddad186d68e7f4121bb2e Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 13:44:04 +0800
Subject: [PATCH 079/292] Update css_parser.cpp

---
 nel/src/gui/css_parser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index ebc8d8d34..6967cd567 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -667,7 +667,8 @@ namespace NLGUI
 			else if (_Style[_Position] == 0x00)
 			{
 				// Unicode replacement character
-				_Style[_Position] = 0xFFFD;
+				// _Style[_Position] = 0xFFFD;
+				_Style.replace(_Position, 1, "\xE\xB\xBD");
 			}
 			else
 			{

From 850b8e0158d1d28f1e940f1dd1817a9fbfde6d39 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 13:44:38 +0800
Subject: [PATCH 080/292] Update css_parser.cpp

---
 nel/src/gui/css_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index 6967cd567..f3003b195 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -668,7 +668,7 @@ namespace NLGUI
 			{
 				// Unicode replacement character
 				// _Style[_Position] = 0xFFFD;
-				_Style.replace(_Position, 1, "\xE\xB\xBD");
+				_Style.replace(_Position, 1, "\xEF\xBF\xBD");
 			}
 			else
 			{

From 396f0d808e90e2d77f9bdf032e66feaad1840425 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 14:06:23 +0800
Subject: [PATCH 081/292] Update unix_event_emitter.cpp

---
 nel/src/3d/driver/opengl/unix_event_emitter.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index 2945b90e7..fcb00b20e 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -699,22 +699,21 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 			if (XGetWindowProperty(_dpy, _win, XA_NEL_SEL, 0, XMaxRequestSize(_dpy), False, AnyPropertyType, &actualType, &actualFormat, &nitems, &bytesLeft, (unsigned char**)&data) != Success)
 				return false;
 
-			ucstring text;
-			std::string tmpData = (const char*)data;
+			std::string text = (const char*)data;
 			XFree(data);
 
 			// convert buffer to ucstring
 			if (target == XA_UTF8_STRING)
 			{
-				text = ucstring::makeFromUtf8(tmpData);
+				// OK
 			}
 			else if (target == XA_STRING)
 			{
-				text = tmpData;
+				// FIXME: Convert local to UTF-8
 			}
 			else
 			{
-				nlwarning("Unknow format %u", (uint)target);
+				nlwarning("Unknown format %u", (uint)target);
 			}
 
 			// sent string event to event server

From ce9c7aae84e7123a193eb3ebe990bb08702c6705 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Thu, 29 Oct 2020 14:33:53 +0800
Subject: [PATCH 082/292] Update action_handler_item.cpp

---
 ryzom/client/src/interface_v3/action_handler_item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index d108e6a21..2145ac2b6 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -299,7 +299,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 
 					editBoxShort->setInputString(std::string());
 					editBoxLarge->setInputString(std::string());
-					display->setTextFormatTaged(ucstring());
+					display->setTextFormatTaged(std::string());
 
 					// Finish the display or add the waiter
 					if (getInventory().isItemInfoUpToDate(ItemSlotId))

From e5fce11618b29bd91ac4c0f7034a92657cddd010 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 03:25:02 +0800
Subject: [PATCH 083/292] Update group_map.cpp

---
 ryzom/client/src/interface_v3/group_map.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index d7d68477f..4537adaae 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -1240,9 +1240,7 @@ void CGroupMap::checkCoords()
 				_RespawnLM[i] = createArkPointButton(_ArkPoints[i]);
 				_RespawnLM[i]->setId(this->getId() + ":arklm_" + NLMISC::toString(i));
 				_RespawnLM[i]->setParent(this);
-				ucstring title;
-				title.fromUtf8(_ArkPoints[i].Title);
-				_RespawnLM[i]->setDefaultContextHelp(title);
+				_RespawnLM[i]->setDefaultContextHelp(_ArkPoints[i].Title);
 				_RespawnLM[i]->HandleEvents = true;
 				addCtrl(_RespawnLM[i]);
 				updateLMPosFromDBPos(_RespawnLM[i], _ArkPoints[i].x, _ArkPoints[i].y);

From 7c028d7a83161c63c0e4e10cebec7c2f216eb788 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 04:43:47 +0800
Subject: [PATCH 084/292] Update group_map.cpp

---
 ryzom/client/src/interface_v3/group_map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 4537adaae..f96a2842c 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -2831,7 +2831,7 @@ void CGroupMap::addUserLandMark(const NLMISC::CVector2f &pos, const ucstring &ti
 	CLandMarkButton *lmb = createLandMarkButton(options);
 	lmb->setParent(this);
 	lmb->Pos = pos;
-	lmb->setDefaultContextHelp(title);
+	lmb->setDefaultContextHelp(title.toUtf8());
 	_UserLM.push_back(lmb);
 	addCtrl(lmb);
 	invalidateCoords();

From 8dc777495ae9f5074ba257eb350e3974e94a3831 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 03:33:05 +0800
Subject: [PATCH 085/292] UTF-8 clipboard, ryzom/ryzomcore#335

---
 nel/include/nel/3d/driver.h                   |  4 +-
 nel/include/nel/3d/driver_user.h              |  4 +-
 nel/include/nel/3d/u_driver.h                 |  4 +-
 nel/include/nel/gui/event_descriptor.h        |  2 +-
 nel/include/nel/gui/group_editbox.h           |  6 +--
 nel/include/nel/misc/event_emitter_multi.h    |  4 +-
 nel/include/nel/misc/system_utils.h           |  4 +-
 .../3d/driver/direct3d/driver_direct3d.cpp    |  4 +-
 nel/src/3d/driver/direct3d/driver_direct3d.h  |  4 +-
 nel/src/3d/driver/opengl/driver_opengl.h      |  4 +-
 .../3d/driver/opengl/driver_opengl_window.cpp |  4 +-
 .../3d/driver/opengl/unix_event_emitter.cpp   | 11 +++--
 nel/src/3d/driver/opengl/unix_event_emitter.h |  6 +--
 nel/src/3d/driver_user.cpp                    |  4 +-
 nel/src/gui/action_handler.cpp                |  4 +-
 nel/src/gui/group_editbox.cpp                 | 10 ++--
 nel/src/misc/event_emitter_multi.cpp          |  4 +-
 nel/src/misc/system_utils.cpp                 | 46 ++++++++++++++-----
 nel/src/misc/utf_string_view.cpp              |  2 +-
 19 files changed, 76 insertions(+), 55 deletions(-)

diff --git a/nel/include/nel/3d/driver.h b/nel/include/nel/3d/driver.h
index 75472df37..0fdae7a58 100644
--- a/nel/include/nel/3d/driver.h
+++ b/nel/include/nel/3d/driver.h
@@ -262,10 +262,10 @@ public:
 	virtual NLMISC::IEventEmitter *getEventEmitter() = 0;
 
 	/// Copy a string to system clipboard.
-	virtual bool			copyTextToClipboard(const ucstring &text) = 0;
+	virtual bool			copyTextToClipboard(const std::string &text) = 0;
 
 	/// Paste a string from system clipboard.
-	virtual bool			pasteTextFromClipboard(ucstring &text) = 0;/// Return the depth of the driver after init().
+	virtual bool			pasteTextFromClipboard(std::string &text) = 0;/// Return the depth of the driver after init().
 
 	virtual uint8			getBitPerPixel() = 0;
 
diff --git a/nel/include/nel/3d/driver_user.h b/nel/include/nel/3d/driver_user.h
index c3564975f..862921f8f 100644
--- a/nel/include/nel/3d/driver_user.h
+++ b/nel/include/nel/3d/driver_user.h
@@ -558,10 +558,10 @@ public:
 	// @}
 
 	// Copy a string to system clipboard.
-	virtual bool copyTextToClipboard(const ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
 
 	// Paste a string from system clipboard.
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 
 	virtual uint64	getSwapBufferCounter();
 
diff --git a/nel/include/nel/3d/u_driver.h b/nel/include/nel/3d/u_driver.h
index f4f78e2cb..ca8a98e02 100644
--- a/nel/include/nel/3d/u_driver.h
+++ b/nel/include/nel/3d/u_driver.h
@@ -835,10 +835,10 @@ public:
 	/// \name Clipboard management
 	// @{
 		// Copy a string to system clipboard.
-		virtual bool copyTextToClipboard(const ucstring &text) =0;
+		virtual bool copyTextToClipboard(const std::string &text) =0;
 
 		// Paste a string from system clipboard.
-		virtual bool pasteTextFromClipboard(ucstring &text) =0;
+		virtual bool pasteTextFromClipboard(std::string &text) =0;
 	// @}
 
 public:
diff --git a/nel/include/nel/gui/event_descriptor.h b/nel/include/nel/gui/event_descriptor.h
index dd2ae19c4..baa9414fd 100644
--- a/nel/include/nel/gui/event_descriptor.h
+++ b/nel/include/nel/gui/event_descriptor.h
@@ -60,7 +60,7 @@ public:
 		keydown = 0, // a key has been press down. The key value is stored as a TKey
 		keyup,   // a key has been released. The key value is stored as a TKey
 		keychar,  // a key has been stroke. The key is a ucchar
-		keystring, // a string has been sent. The string is a ucstring
+		keystring, // a string has been sent. The string is a utf-8 string
 		unknown, // uninitialized event
 	};
 	CEventDescriptorKey() : _KeyEvent(unknown), _CtrlState(false), _ShiftState(false), _AltState(false), _Char(0)
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 9b2998be0..3263837c1 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -140,7 +140,7 @@ namespace NLGUI
 		// Paste the selection into buffer
 		void		paste();
 		// Write the string into buffer
-		void		writeString(const ucstring &str, bool replace = true, bool atEnd = true); // UTF-16 because of Clipboard implementation
+		void		writeString(const std::string &str, bool replace = true, bool atEnd = true);
 
 		// Expand the expression (true if there was a '/' at the start of the line)
 		bool		expand();
@@ -299,9 +299,9 @@ namespace NLGUI
 		void handleEventString(const NLGUI::CEventDescriptorKey &event);
 		void setup();
 		void triggerOnChangeAH();
-		void appendStringFromClipboard(const ucstring &str); // UTF-16 because of Clipboard implementation
+		void appendStringFromClipboard(const std::string &str);
 
-		ucstring	getSelection(); // UTF-16 because of Clipboard implementation
+		std::string	getSelection();
 
 		static CGroupEditBox *_MenuFather;
 
diff --git a/nel/include/nel/misc/event_emitter_multi.h b/nel/include/nel/misc/event_emitter_multi.h
index e41ee2055..9b8d25c64 100644
--- a/nel/include/nel/misc/event_emitter_multi.h
+++ b/nel/include/nel/misc/event_emitter_multi.h
@@ -48,8 +48,8 @@ public:
 	/// From IEventEmitter. This call submitEvents on all the emitters
 	virtual void submitEvents(CEventServer &server, bool allWindows);
 
-	virtual bool copyTextToClipboard(const ucstring &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 
 private:
 	typedef std::vector<std::pair<IEventEmitter *, bool> > TEmitterCont;
diff --git a/nel/include/nel/misc/system_utils.h b/nel/include/nel/misc/system_utils.h
index 426e38b73..9093eb90d 100644
--- a/nel/include/nel/misc/system_utils.h
+++ b/nel/include/nel/misc/system_utils.h
@@ -49,10 +49,10 @@ public:
 	static bool updateProgressBar(uint value, uint total);
 
 	/// Copy a string to system clipboard.
-	static bool copyTextToClipboard(const ucstring &text);
+	static bool copyTextToClipboard(const std::string &text);
 
 	/// Paste a string from system clipboard.
-	static bool pasteTextFromClipboard(ucstring &text);
+	static bool pasteTextFromClipboard(std::string &text);
 
 	/// Check if system supports unicode.
 	static bool supportUnicode();
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index f26a37afb..6263de0f8 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -4018,12 +4018,12 @@ void CDriverD3D::findNearestFullscreenVideoMode()
 		}
 	}
 }
-bool CDriverD3D::copyTextToClipboard(const ucstring &text)
+bool CDriverD3D::copyTextToClipboard(const std::string &text)
 {
 	return _EventEmitter.copyTextToClipboard(text);
 }
 
-bool CDriverD3D::pasteTextFromClipboard(ucstring &text)
+bool CDriverD3D::pasteTextFromClipboard(std::string &text)
 {
 	return _EventEmitter.pasteTextFromClipboard(text);
 }
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.h b/nel/src/3d/driver/direct3d/driver_direct3d.h
index c021f052d..bc7911df2 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.h
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.h
@@ -2748,8 +2748,8 @@ public:
 
 	bool convertBitmapToIcon(const NLMISC::CBitmap &bitmap, HICON &icon, uint iconWidth, uint iconHeight, uint iconDepth, const NLMISC::CRGBA &col = NLMISC::CRGBA::White, sint hotSpotX = 0, sint hotSpotY = 0, bool cursor = false);
 
-	virtual bool copyTextToClipboard(const ucstring &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 
 public:
 	#ifdef 	NL_DEBUG
diff --git a/nel/src/3d/driver/opengl/driver_opengl.h b/nel/src/3d/driver/opengl/driver_opengl.h
index e1ee968a5..e85d2da05 100644
--- a/nel/src/3d/driver/opengl/driver_opengl.h
+++ b/nel/src/3d/driver/opengl/driver_opengl.h
@@ -354,8 +354,8 @@ public:
 		return _win;
 	}
 
-	virtual bool			copyTextToClipboard(const ucstring &text);
-	virtual bool			pasteTextFromClipboard(ucstring &text);
+	virtual bool			copyTextToClipboard(const std::string &text);
+	virtual bool			pasteTextFromClipboard(std::string &text);
 
 	virtual uint32			getAvailableVertexAGPMemory ();
 	virtual uint32			getAvailableVertexVRAMMemory ();
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index a987b7425..c60ec602e 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -3020,12 +3020,12 @@ void CDriverGL::setupApplicationMenu()
 }
 #endif
 
-bool CDriverGL::copyTextToClipboard(const ucstring &text)
+bool CDriverGL::copyTextToClipboard(const std::string &text)
 {
 	return _EventEmitter.copyTextToClipboard(text);
 }
 
-bool CDriverGL::pasteTextFromClipboard(ucstring &text)
+bool CDriverGL::pasteTextFromClipboard(std::string &text)
 {
 	return _EventEmitter.pasteTextFromClipboard(text);
 }
diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index fcb00b20e..594d60183 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -547,6 +547,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 
 			server->postEvent (charEvent);
 #else
+			// FIXME: Convert locale to UTF-32
 			for (int i = 0; i < c; i++)
 			{
 				CEventChar *charEvent = new CEventChar ((u32char)(unsigned char)Text[i], getKeyButton(event.xbutton.state), this);
@@ -610,14 +611,13 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 		else if (req.target == XA_STRING)
 		{
 			respond.xselection.property = req.property;
-			std::string str = _CopiedString.toString();
+			std::string str = _CopiedString; // NLMISC::CUtfStringView(_CopiedString).toAscii(); // FIXME: Convert UTF-8 to local
 			XChangeProperty(req.display, req.requestor, req.property, XA_STRING, 8, PropModeReplace, (const unsigned char*)str.c_str(), str.length());
 		}
 		else if (req.target == XA_UTF8_STRING)
 		{
 			respond.xselection.property = req.property;
-			std::string str = _CopiedString.toUtf8();
-			XChangeProperty(req.display, req.requestor, respond.xselection.property, XA_UTF8_STRING, 8, PropModeReplace, (const unsigned char*)str.c_str(), str.length());
+			XChangeProperty(req.display, req.requestor, respond.xselection.property, XA_UTF8_STRING, 8, PropModeReplace, (const unsigned char*)_CopiedString.c_str(), _CopiedString.length());
 		}
 		else
 		{
@@ -710,6 +710,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 			else if (target == XA_STRING)
 			{
 				// FIXME: Convert local to UTF-8
+				// text = NLMISC::CUtfStringView(text).toAscii();
 			}
 			else
 			{
@@ -767,7 +768,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 	return true;
 }
 
-bool CUnixEventEmitter::copyTextToClipboard(const ucstring &text)
+bool CUnixEventEmitter::copyTextToClipboard(const std::string &text)
 {
 	_CopiedString = text;
 
@@ -786,7 +787,7 @@ bool CUnixEventEmitter::copyTextToClipboard(const ucstring &text)
 	return true;
 }
 
-bool CUnixEventEmitter::pasteTextFromClipboard(ucstring &text)
+bool CUnixEventEmitter::pasteTextFromClipboard(std::string &text)
 {
 	// check if we own the selection
 	if (_SelectionOwned)
diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.h b/nel/src/3d/driver/opengl/unix_event_emitter.h
index bbee65e5e..68dc81a48 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.h
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.h
@@ -66,12 +66,12 @@ public:
 	/**
 	 * Copy a string to system clipboard.
 	 */
-        virtual bool copyTextToClipboard(const ucstring &text);
+        virtual bool copyTextToClipboard(const std::string &text);
 
 	/*
 	 * Paste a string from system clipboard.
 	 */
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 
 	void createIM();
 	void closeIM();
@@ -105,7 +105,7 @@ private:
 	XIC						_ic;
 	NL3D::IDriver*			_driver;
 	CUnixEventServer		_InternalServer;
-	ucstring				_CopiedString;
+	std::string				_CopiedString;
 	bool					_SelectionOwned;
 };
 
diff --git a/nel/src/3d/driver_user.cpp b/nel/src/3d/driver_user.cpp
index b44a64737..02e9c4b27 100644
--- a/nel/src/3d/driver_user.cpp
+++ b/nel/src/3d/driver_user.cpp
@@ -1971,12 +1971,12 @@ bool CDriverUser::setRenderTarget(class UTexture & uTex, uint32 x, uint32 y, uin
 
 	return result;
 }
-bool CDriverUser::copyTextToClipboard(const ucstring &text)
+bool CDriverUser::copyTextToClipboard(const std::string &text)
 {
 	return _Driver->copyTextToClipboard(text);
 }
 
-bool CDriverUser::pasteTextFromClipboard(ucstring &text)
+bool CDriverUser::pasteTextFromClipboard(std::string &text)
 {
 	return _Driver->pasteTextFromClipboard(text);
 }
diff --git a/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
index 2b8bf890b..b80ce2f5f 100644
--- a/nel/src/gui/action_handler.cpp
+++ b/nel/src/gui/action_handler.cpp
@@ -751,9 +751,7 @@ namespace NLGUI
 	{
 		virtual void execute (CCtrlBase *pCaller, const std::string &params)
 		{
-			ucstring s;
-			s.fromUtf8(params);
-			if (!CViewRenderer::getInstance()->getDriver()->copyTextToClipboard(s))
+			if (!CViewRenderer::getInstance()->getDriver()->copyTextToClipboard(params))
 			{
 				nlwarning("Copy to clipboard failed: '%s'", params.c_str());
 			}
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 47a36d0a1..dc7e34e16 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -805,7 +805,7 @@ namespace NLGUI
 			cutSelection();
 		}
 
-		ucstring sString;
+		string sString;
 
 		if (CViewRenderer::getInstance()->getDriver()->pasteTextFromClipboard(sString))
 		{
@@ -815,7 +815,7 @@ namespace NLGUI
 	}
 
 	// ----------------------------------------------------------------------------
-	void CGroupEditBox::appendStringFromClipboard(const ucstring &str)
+	void CGroupEditBox::appendStringFromClipboard(const std::string &str)
 	{
 		stopParentBlink();
 		makeTopWindow();
@@ -829,7 +829,7 @@ namespace NLGUI
 	}
 
 	// ----------------------------------------------------------------------------
-	void CGroupEditBox::writeString(const ucstring &str16, bool replace, bool atEnd)
+	void CGroupEditBox::writeString(const std::string &str16, bool replace, bool atEnd)
 	{
 		::u32string str = CUtfStringView(str16).toUtf32();
 		sint length = (sint)str.length();
@@ -1717,12 +1717,12 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	ucstring	CGroupEditBox::getSelection()
+	std::string	CGroupEditBox::getSelection()
 	{
 		ptrdiff_t	minPos= min(_CursorPos, _SelectCursorPos);
 		ptrdiff_t	maxPos= max(_CursorPos, _SelectCursorPos);
 		// get the selection
-		return CUtfStringView(_InputString.substr(minPos, maxPos-minPos)).toUtf16();
+		return CUtfStringView(_InputString.substr(minPos, maxPos-minPos)).toUtf8();
 	}
 
 
diff --git a/nel/src/misc/event_emitter_multi.cpp b/nel/src/misc/event_emitter_multi.cpp
index 45559ebc4..a7d133f3c 100644
--- a/nel/src/misc/event_emitter_multi.cpp
+++ b/nel/src/misc/event_emitter_multi.cpp
@@ -98,13 +98,13 @@ const IEventEmitter *CEventEmitterMulti::getEmitter(uint index) const
 	return _Emitters[index].first;
 }
 
-bool CEventEmitterMulti::copyTextToClipboard(const ucstring &text)
+bool CEventEmitterMulti::copyTextToClipboard(const std::string &text)
 {
 	// Naush: wrapped to old API to avoid duplicate code
 	return CSystemUtils::copyTextToClipboard(text);
 }
 
-bool CEventEmitterMulti::pasteTextFromClipboard(ucstring &text)
+bool CEventEmitterMulti::pasteTextFromClipboard(std::string &text)
 {
 	// Naush: wrapped to old API to avoid duplicate code
 	return CSystemUtils::pasteTextFromClipboard(text);
diff --git a/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
index 63eecbf0d..ba15d5363 100644
--- a/nel/src/misc/system_utils.cpp
+++ b/nel/src/misc/system_utils.cpp
@@ -19,6 +19,7 @@
 
 #include "stdmisc.h"
 #include "nel/misc/system_utils.h"
+#include "nel/misc/utf_string_view.h"
 
 #ifdef NL_OS_WINDOWS
 #define INITGUID
@@ -154,7 +155,7 @@ bool CSystemUtils::updateProgressBar(uint value, uint total)
 	return true;
 }
 
-bool CSystemUtils::copyTextToClipboard(const ucstring &text)
+bool CSystemUtils::copyTextToClipboard(const std::string &text)
 {
 	if (text.empty()) return false;
 
@@ -167,10 +168,23 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 		bool isUnicode = (IsClipboardFormatAvailable(CF_UNICODETEXT) == TRUE);
 
 		// allocates a buffer to copy text in global memory
-		std::string textLocal;
-		if (!isUnicode) textLocal = NLMISC::wideToMbcs((const wchar_t *)text.c_str(), text.size());
-		if (text.size() && !textLocal.size()) textLocal = text.toString();
-		HGLOBAL mem = GlobalAlloc(GHND | GMEM_DDESHARE, isUnicode ? ((text.size() + 1) * sizeof(wchar_t)) : textLocal.size());
+		std::string textMbcs;
+		std::wstring textWide;
+		if (!isUnicode)
+		{
+			textMbcs = NLMISC::utf8ToMbcs(text); // Prefer system for API
+			if (text.size() && !textMbcs.size()) 
+				textMbcs = CUtfStringView(text).toAscii(); // Fallback to 7-bit ASCII
+		}
+		else
+		{
+			textWide = NLMISC::utf8ToWide(text); // Prefer system for API
+			if (text.size() && !textWide.size()) 
+				textWide = CUtfStringView(text).toWide();
+		}
+		HGLOBAL mem = GlobalAlloc(GHND | GMEM_DDESHARE, isUnicode 
+			? ((textWide.size() + 1) * sizeof(wchar_t))
+			: (textMbcs.size() + 1));
 
 		if (mem)
 		{
@@ -180,9 +194,9 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 			{
 				// copy text to this buffer
 				if (isUnicode)
-					wcscpy((wchar_t *)hLock, (const wchar_t *)text.c_str());
+					wcscpy((wchar_t *)hLock, textWide.c_str());
 				else
-					strcpy((char *)hLock, textLocal.c_str());
+					strcpy((char *)hLock, textMbcs.c_str());
 
 				// unlock buffer
 				GlobalUnlock(mem);
@@ -204,7 +218,7 @@ bool CSystemUtils::copyTextToClipboard(const ucstring &text)
 	return res;
 }
 
-bool CSystemUtils::pasteTextFromClipboard(ucstring &text)
+bool CSystemUtils::pasteTextFromClipboard(std::string &text)
 {
 	bool res = false;
 
@@ -228,13 +242,21 @@ bool CSystemUtils::pasteTextFromClipboard(ucstring &text)
 				// retrieve clipboard data
 				if (isUnicode)
 				{
-					text = (const ucchar *)hLock;
+					const wchar_t *str = (const wchar_t *)hLock;
+					text = NLMISC::wideToUtf8(str); // Prefer system for API
+					if (!text.size() && str[0])
+						text = CUtfStringView(str).toUtf8();
+					else
+						text = CUtfStringView(text).toUtf8(true); // Sanitize UTF-8 user input
 				}
 				else 
 				{
-					reinterpret_cast<std::wstring &>(text) = NLMISC::mbcsToWide((const char *)hLock);
-					if (!text.size() && ((const char *)hLock)[0])
-						text = (const char *)hLock;
+					const char *str = (const char *)hLock;
+					text = NLMISC::mbcsToUtf8(str); // Prefer system for API
+					if (!text.size() && str[0])
+						text = CUtfStringView(str).toAscii(); // Fallback to 7-bit ASCII
+					else
+						text = CUtfStringView(text).toUtf8(true); // Sanitize UTF-8 user input
 				}
 
 				// unlock data
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 070745202..d1239ae43 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -125,7 +125,7 @@ std::string CUtfStringView::toAscii() const
 		if (c < 0x80)
 			res += c;
 		else
-			res += '_';
+			res += '?';
 	}
 	return res;
 }

From 592ec2aaf1feb9b0a1afb6d35b4a201ffc97df03 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 03:42:43 +0800
Subject: [PATCH 086/292] Cleanup group container title localization behaviour,
 ryzom/ryzomcore#335

---
 nel/include/nel/gui/group_container.h | 18 ++----
 nel/include/nel/gui/group_html.h      |  2 +-
 nel/include/nel/gui/string_case.h     |  1 -
 nel/include/nel/gui/view_text.h       |  4 +-
 nel/src/gui/group_container.cpp       | 86 ++++++++++++---------------
 nel/src/gui/group_html.cpp            |  6 +-
 6 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
index 361ae70b9..30d91dad6 100644
--- a/nel/include/nel/gui/group_container.h
+++ b/nel/include/nel/gui/group_container.h
@@ -248,13 +248,6 @@ namespace NLGUI
 		// Get the header color draw. NB: depends if grayed, and if active.
 		NLMISC::CRGBA	getDrawnHeaderColor () const;
 
-		std::string		getTitleRaw () const;
-		void			setTitleRaw (const std::string &title);
-		std::string		getTitleOpenedRaw () const;
-		void			setTitleOpenedRaw (const std::string &title);
-		std::string		getTitleClosedRaw () const;
-		void			setTitleClosedRaw (const std::string &title);
-
 		ucstring		getUCTitleOpened () const;
 		void			setUCTitleOpened (const ucstring &title);
 		ucstring		getUCTitleClosed () const;
@@ -295,10 +288,6 @@ namespace NLGUI
 			REFLECT_STRING("title_opened", getTitleOpened, setTitleOpened);
 			REFLECT_STRING("title_closed", getTitleClosed, setTitleClosed);
 
-			REFLECT_STRING("title_raw", getTitleRaw, setTitleRaw);
-			REFLECT_STRING("title_opened_raw", getTitleOpenedRaw, setTitleOpenedRaw);
-			REFLECT_STRING("title_closed_raw", getTitleClosedRaw, setTitleClosedRaw);
-
 			REFLECT_UCSTRING("uc_title_opened", getUCTitleOpened, setUCTitleOpened); // FIXME: Lua UTF-8
 			REFLECT_UCSTRING("uc_title_closed", getUCTitleClosed, setUCTitleClosed); // FIXME: Lua UTF-8
 			REFLECT_UCSTRING("uc_title", getUCTitle, setUCTitle); // FIXME: Lua UTF-8
@@ -315,6 +304,8 @@ namespace NLGUI
 			REFLECT_BOOL("lockable", isLockable, setLockable);
 			REFLECT_BOOL("locked", isLocked, setLocked);
 
+			REFLECT_BOOL("localize", isLocalize, setLocalize);
+
 			REFLECT_BOOL("header_active", getHeaderActive, setHeaderActive);
 			REFLECT_BOOL("right_button_enabled", getRightButtonEnabled, setRightButtonEnabled);
 		REFLECT_EXPORT_END
@@ -377,7 +368,7 @@ namespace NLGUI
 		bool             isActiveSavable() const { return _ActiveSavable; }
 
 		bool isLocalize() const { return _Localize; }
-		void setLocalize(bool localize) { _Localize = localize; }
+		void setLocalize(bool localize);
 
 		void setPopupX(sint32 x) { _PopupX = x; }
 		void setPopupY(sint32 y) { _PopupY = y; }
@@ -649,6 +640,9 @@ namespace NLGUI
 
 		TTileClass	convertTitleClass(const char *ptr);
 
+		void setTitledOpenedViewText();
+		void setTitledClosedViewText();
+
 		static COptionsContainerMove *getMoveOptions();
 
 		COptionsLayer *getContainerOptions(sint32 ls=-1); // Depends if overload by OptionsName or default used
diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 56605c0cc..a5e1dc4e1 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -352,7 +352,7 @@ namespace NLGUI
 		// Set the title
 		void setTitle (const std::string &title);
 		std::string getTitle() const;
-		void setTitleRaw (const std::string &title);
+		void setContainerTitle (const std::string &title);
 
 		// Lookup a url in local file system
 		bool lookupLocalFile (std::string &result, const char *url, bool isUrl);
diff --git a/nel/include/nel/gui/string_case.h b/nel/include/nel/gui/string_case.h
index bd56c7998..446998e1a 100644
--- a/nel/include/nel/gui/string_case.h
+++ b/nel/include/nel/gui/string_case.h
@@ -21,7 +21,6 @@
 #define STRING_CASE_H
 
 #include "nel/misc/types_nl.h"
-#include "nel/misc/ucstring.h"
 
 namespace NLGUI
 {
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 7c0324f58..1974e6933 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -84,7 +84,7 @@ namespace NLGUI
 
 		/// Set
 
-		void setText(const std::string &text);
+		void setText(const std::string &text); //< Not localized. Use setHardText to localize strings starting with "ui". TODO: Add a Localize flag, like title in group container. HardText then simply sets localize to true.
 		void setTextAsUtf16 (const ucstring &text);
 		void setFontName (const std::string &name);
 		void setFontSize (sint nFontSize, bool coef = true);
@@ -178,7 +178,7 @@ namespace NLGUI
 		void getLineEndIndex(uint line, sint &index, bool &endOfPreviousLine) const;
 
 		std::string getHardText() const { return _HardText.empty() ? _Text : _HardText; }
-		void        setHardText (const std::string &ht);
+		void        setHardText (const std::string &ht); //< Localizes strings starting with "ui"
 		void		setHardTextAsUtf16(const ucstring &ht);
 
 		std::string getColorAsString() const;
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 141c7ba9b..e201f2eb4 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3744,7 +3744,7 @@ namespace NLGUI
 			_TitleOpened->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleOpened->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleOpened->setText (_TitleTextOpened);
+		if (_TitleClass == TitleText) setTitledOpenedViewText();
 		_TitleOpened->setActive (_Opened);
 
 		// Title when the container is closed
@@ -3796,7 +3796,7 @@ namespace NLGUI
 			_TitleClosed->setY (pLayer->getValSInt32 ("title_offset_y"));
 		}
 		_TitleClosed->setFontSize (pLayer->getValSInt32 ("title_font_size"));
-		if (_TitleClass==TitleText) _TitleClosed->setText (_TitleTextClosed);
+		if (_TitleClass == TitleText) setTitledClosedViewText();
 		_TitleClosed->setActive(!_Opened);
 
 
@@ -3946,6 +3946,15 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	void CGroupContainer::setLocalize(bool localize) 
+	{ 
+		_Localize = localize; 
+		setTitledOpenedViewText(); 
+		setTitledClosedViewText(); 
+		invalidateCoords();
+	}
+
 	// ***************************************************************************
 	std::string		CGroupContainer::getTitle () const
 	{
@@ -3955,8 +3964,8 @@ namespace NLGUI
 	// ***************************************************************************
 	void			CGroupContainer::setTitle (const std::string &title)
 	{
-		if (_Localize)	setTitleRaw (CI18N::get(title));
-		else			setTitleRaw (title);
+		setTitleOpened(title);
+		setTitleClosed(title);
 	}
 
 	// ***************************************************************************
@@ -3968,8 +3977,9 @@ namespace NLGUI
 	// ***************************************************************************
 	void			CGroupContainer::setTitleOpened (const std::string &title)
 	{
-		if (_Localize)	setTitleOpenedRaw (CI18N::get(title));
-		else			setTitleOpenedRaw (title);
+		_TitleTextOpened = title;
+		setTitledOpenedViewText();
+		invalidateCoords();
 	}
 
 	// ***************************************************************************
@@ -3980,88 +3990,70 @@ namespace NLGUI
 
 	// ***************************************************************************
 	void			CGroupContainer::setTitleClosed (const std::string &title)
-	{
-		if (_Localize)	setTitleClosedRaw (CI18N::get(title));
-		else			setTitleClosedRaw (title);
-	}
-
-	// ***************************************************************************
-	void CGroupContainer::setTitleOpenedRaw(const std::string &title)
-	{
-		_TitleTextOpened = title;
-		if (_TitleOpened != NULL)
-			_TitleOpened->setText (title);
-		invalidateCoords();
-	}
-
-	// ***************************************************************************
-	void CGroupContainer::setTitleClosedRaw(const std::string &title)
 	{
 		_TitleTextClosed = title;
-		if (_TitleClosed != NULL)
-			_TitleClosed->setText (_TitleTextClosed);
+		setTitledClosedViewText();
 		invalidateCoords();
 	}
 
 	// ***************************************************************************
-	void CGroupContainer::setTitleRaw(const std::string &title)
+	void CGroupContainer::setTitledOpenedViewText()
 	{
-		setTitleOpenedRaw(title);
-		setTitleClosedRaw(title);
-	}
-
-	// ***************************************************************************
-	std::string CGroupContainer::getTitleRaw () const
-	{
-		return getTitleOpened();
-	}
-
-	// ***************************************************************************
-	std::string CGroupContainer::getTitleOpenedRaw () const
-	{
-		return _TitleTextOpened;
+		if (_TitleOpened != NULL)
+		{
+			if (_Localize && NLMISC::startsWith(_TitleTextOpened, "ui"))
+				_TitleOpened->setHardText(_TitleTextOpened);
+			else
+				_TitleOpened->setText(_TitleTextOpened);
+		}
 	}
 
 	// ***************************************************************************
-	std::string CGroupContainer::getTitleClosedRaw () const
+	void CGroupContainer::setTitledClosedViewText()
 	{
-		return _TitleTextClosed;
+		if (_TitleClosed != NULL)
+		{
+			if (_Localize && NLMISC::startsWith(_TitleTextClosed, "ui"))
+				_TitleClosed->setHardText(_TitleTextClosed);
+			else
+				_TitleClosed->setText(_TitleTextClosed);
+		}
 	}
 
 	// ***************************************************************************
 	void CGroupContainer::setUCTitleOpened(const ucstring &title)
 	{
-		setTitleOpenedRaw(title.toUtf8());
+		setTitleOpened(title.toUtf8());
 	}
 
 	// ***************************************************************************
 	void CGroupContainer::setUCTitleClosed(const ucstring &title)
 	{
-		setTitleClosedRaw(title.toUtf8());
+		setTitleClosed(title.toUtf8());
 	}
 
 	// ***************************************************************************
 	void CGroupContainer::setUCTitle(const ucstring &title)
 	{
-		setTitleRaw(title.toUtf8());
+		setTitle(title.toUtf8());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitle () const
 	{
-		return ucstring::makeFromUtf8(getTitleRaw());
+		return ucstring::makeFromUtf8(getTitle());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitleOpened () const
 	{
-		return ucstring::makeFromUtf8(getTitleOpenedRaw());
+		return ucstring::makeFromUtf8(getTitleOpened());
 	}
 
 	// ***************************************************************************
 	ucstring CGroupContainer::getUCTitleClosed () const
 	{
-		return ucstring::makeFromUtf8(getTitleClosedRaw());
+		return ucstring::makeFromUtf8(getTitleClosed());
 	}
 
 	// ***************************************************************************
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index f7a62cc90..b85cb5bfc 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -3401,7 +3401,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::setTitleRaw (const std::string &title)
+	void CGroupHTML::setContainerTitle (const std::string &title)
 	{
 		CInterfaceElement *parent = getParent();
 		if (parent)
@@ -3411,7 +3411,7 @@ namespace NLGUI
 				CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
 				if (container)
 				{
-					container->setTitleRaw (title);
+					container->setTitle(title);
 				}
 			}
 		}
@@ -3426,7 +3426,7 @@ namespace NLGUI
 		}
 		_TitleString += title;
 
-		setTitleRaw(_TitleString);
+		setContainerTitle(_TitleString);
 	}
 
 	std::string CGroupHTML::getTitle() const {

From 7ea4b2b9895405509c6a1cb683578a1157e44338 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 04:42:30 +0800
Subject: [PATCH 087/292] Adjust font sizing

---
 nel/include/nel/gui/view_text.h |  4 ++--
 nel/src/gui/view_text.cpp       | 36 +++++++++++++++------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 1974e6933..2074576c1 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -262,8 +262,8 @@ namespace NLGUI
 		// width of the font in pixel. Just a Hint for tabing format (computed with '_')
 		float	_FontWidth;
 		// strings to use when computing font size
-		::u32string _FontSizingChars;
-		::u32string _FontSizingFallback;
+		std::string _FontSizingChars;
+		std::string _FontSizingFallback;
 		// height of the font in pixel.
 		// use getFontHeight
 		float	_FontHeight;
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 2f8a27d0c..a307893c7 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -119,11 +119,9 @@ namespace NLGUI
 		// - "_" that should be the character with the lowest part
 		// - A with an accent for the highest part
 		// https://www.compart.com/en/unicode/U+00C4
-		static const u32char chars[] = { (u32char)'_', 0x000000C4, 0 };
-		_FontSizingChars = chars;
+		_FontSizingChars = "_\xC3\x84q";
 		// fallback if SizingChars are not supported by font
-		static const u32char fallback[] = { (u32char)'|', 0 };
-		_FontSizingFallback = fallback;
+		_FontSizingFallback = "|XO";
 		computeFontSize ();
 	}
 
@@ -399,12 +397,12 @@ namespace NLGUI
 		else
 		if ( name == "sizing_chars" )
 		{
-			return CUtfStringView(_FontSizingChars).toUtf8();
+			return _FontSizingChars;
 		}
 		else
 		if ( name == "sizing_fallback" )
 		{
-			return CUtfStringView(_FontSizingFallback).toUtf8();
+			return _FontSizingFallback;
 		}
 		else
 			return "";
@@ -691,13 +689,13 @@ namespace NLGUI
 		else
 		if( name == "sizing_chars" )
 		{
-			_FontSizingChars = CUtfStringView(value).toUtf32();
+			_FontSizingChars = value;
 			return true;
 		}
 		else
 		if( name == "sizing_fallback" )
 		{
-			_FontSizingFallback = CUtfStringView(value).toUtf32();
+			_FontSizingFallback = value;
 			return true;
 		}
 		else
@@ -769,8 +767,8 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "clamp_right", BAD_CAST toString( _ClampRight ).c_str() );
 		xmlSetProp( node, BAD_CAST "auto_clamp_offset", BAD_CAST toString( _AutoClampOffset ).c_str() );
 		xmlSetProp( node, BAD_CAST "continuous_update", BAD_CAST toString( _ContinuousUpdate ).c_str() );
-		xmlSetProp( node, BAD_CAST "sizing_chars", BAD_CAST CUtfStringView(_FontSizingChars).toUtf8().c_str() );
-		xmlSetProp( node, BAD_CAST "sizing_fallback", BAD_CAST CUtfStringView(_FontSizingFallback).toUtf8().c_str() );
+		xmlSetProp( node, BAD_CAST "sizing_chars", BAD_CAST _FontSizingChars.c_str() );
+		xmlSetProp( node, BAD_CAST "sizing_fallback", BAD_CAST _FontSizingFallback.c_str() );
 
 		return true;
 	}
@@ -956,18 +954,18 @@ namespace NLGUI
 		}
 
 		// "_Ä" lowest/highest chars (underscore, A+diaeresis)
-		static const u32char chars[] = { (u32char)'_', 0x000000C4, 0 };
-		_FontSizingChars = chars;
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_chars" );
 		if (prop)
-			_FontSizingChars = CUtfStringView((const char*)prop).toUtf32();
+			_FontSizingChars = (const char*)prop;
+		else
+			_FontSizingChars = "_\xC3\x84q";
 
 		// fallback if SizingChars are not supported by font
-		static const u32char fallback[] = { (u32char)'|', 0 };
-		_FontSizingFallback = fallback;
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"sizing_fallback" );
 		if (prop)
-			_FontSizingFallback = CUtfStringView((const char*)prop).toUtf32();
+			_FontSizingFallback = (const char *)prop;
+		else
+			_FontSizingFallback = "|XO";
 
 		computeFontSize ();
 	}
@@ -1475,10 +1473,8 @@ namespace NLGUI
 	// ***************************************************************************
 	void CViewText::setFontSizing(const std::string &chars, const std::string &fallback)
 	{
-		_FontSizingChars.clear();
-		_FontSizingChars = CUtfStringView(chars).toUtf32();
-		_FontSizingFallback.clear();
-		_FontSizingFallback = CUtfStringView(fallback).toUtf32();
+		_FontSizingChars = chars;
+		_FontSizingFallback = fallback;
 	}
 
 	// ***************************************************************************

From 4fba8cc18d380da875117dc89248fea55d417470 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 05:16:06 +0800
Subject: [PATCH 088/292] Improved vertical font centering

---
 nel/src/gui/view_text.cpp | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index a307893c7..0f4e93b89 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -3045,6 +3045,44 @@ namespace NLGUI
 		TextContext->setEmbolden (_Embolden);
 		TextContext->setOblique (_Oblique);
 
+#if 1
+
+		UTextContext::CStringInfo si = TextContext->getStringInfo("XO");
+		float xoHeight = si.StringHeight;
+
+		si = TextContext->getStringInfo("XO\xC3\x81\xC3\x83");
+		float upHeight = si.StringHeight;
+
+		si = TextContext->getStringInfo("XOgq");
+		float downHeight = si.StringHeight;
+		float legHeight = si.StringLine;
+
+		nlassert(upHeight >= xoHeight);
+		nlassert(downHeight >= xoHeight);
+		float diff;
+		if (downHeight > upHeight)
+		{
+			diff = downHeight - xoHeight;
+		}
+		else
+		{
+			diff = upHeight - xoHeight;
+			legHeight += upHeight - downHeight;
+		}
+
+		_FontHeight = xoHeight + diff + diff;
+		_FontLegHeight = legHeight;
+
+		// Space width
+		si = TextContext->getStringInfo(" ");
+		_SpaceWidth = si.StringWidth;
+
+		// Font Width (used for <tab>)
+		si = TextContext->getStringInfo("O");
+		_FontWidth = si.StringWidth;
+
+#else
+
 		// Letter size
 		UTextContext::CStringInfo si = TextContext->getStringInfo(_FontSizingChars);
 
@@ -3065,6 +3103,8 @@ namespace NLGUI
 		// Font Width (used for <tab>)
 		si = TextContext->getStringInfo("_");
 		_FontWidth = si.StringWidth;
+
+#endif
 	}
 
 

From 19e00522d9c3847642ad49b79d55f02898d010d6 Mon Sep 17 00:00:00 2001
From: Ryzom Pipeline <ryzom-pipeline@kaetemi.be>
Date: Fri, 30 Oct 2020 09:41:01 +0800
Subject: [PATCH 089/292] Update copyright attribution for GPL compliance

---
 nel/include/nel/3d/computed_string.h          |  2 +-
 nel/include/nel/3d/driver.h                   |  2 +-
 nel/include/nel/3d/driver_user.h              |  2 +-
 nel/include/nel/3d/font_generator.h           |  3 +++
 nel/include/nel/3d/font_manager.h             |  3 +++
 nel/include/nel/3d/landscape.h                |  3 +++
 nel/include/nel/3d/text_context.h             |  2 +-
 nel/include/nel/3d/text_context_user.h        |  2 +-
 nel/include/nel/3d/texture.h                  |  3 +++
 nel/include/nel/3d/texture_font.h             |  3 +++
 nel/include/nel/3d/u_driver.h                 |  2 +-
 nel/include/nel/3d/u_text_context.h           |  2 +-
 nel/include/nel/gui/css_parser.h              |  3 +++
 nel/include/nel/gui/ctrl_base.h               |  1 +
 nel/include/nel/gui/ctrl_text_button.h        |  1 +
 nel/include/nel/gui/dbgroup_combo_box.h       |  2 +-
 nel/include/nel/gui/dbview_quantity.h         |  1 +
 nel/include/nel/gui/event_descriptor.h        |  1 +
 nel/include/nel/gui/group_container.h         |  1 +
 nel/include/nel/gui/group_editbox.h           |  1 +
 nel/include/nel/gui/group_html.h              |  1 +
 nel/include/nel/gui/group_list.h              |  1 +
 nel/include/nel/gui/group_menu.h              |  2 +-
 nel/include/nel/gui/group_paragraph.h         |  1 +
 nel/include/nel/gui/group_tree.h              |  1 +
 nel/include/nel/gui/interface_element.h       |  1 +
 nel/include/nel/gui/interface_expr.h          |  1 +
 nel/include/nel/gui/interface_group.h         |  1 +
 nel/include/nel/gui/lua_helper.h              |  2 +-
 nel/include/nel/gui/lua_helper_inline.h       |  2 +-
 nel/include/nel/gui/reflect.h                 |  1 +
 nel/include/nel/gui/string_case.h             |  1 +
 nel/include/nel/gui/view_pointer.h            |  1 +
 nel/include/nel/gui/view_text.h               |  2 +-
 nel/include/nel/gui/view_text_formated.h      |  1 +
 nel/include/nel/gui/view_text_id.h            |  1 +
 nel/include/nel/gui/view_text_id_formated.h   |  1 +
 nel/include/nel/gui/widget_manager.h          |  2 +-
 nel/include/nel/misc/common.h                 |  2 +-
 nel/include/nel/misc/debug.h                  |  2 +-
 nel/include/nel/misc/event_emitter_multi.h    |  3 +++
 nel/include/nel/misc/events.h                 |  3 +++
 nel/include/nel/misc/file.h                   |  3 +++
 nel/include/nel/misc/i18n.h                   |  1 +
 nel/include/nel/misc/sha1.h                   |  2 +-
 nel/include/nel/misc/sheet_id.h               |  2 +-
 nel/include/nel/misc/stream.h                 |  3 +++
 nel/include/nel/misc/string_common.h          |  2 +-
 nel/include/nel/misc/system_utils.h           |  2 +-
 nel/include/nel/misc/types_nl.h               |  2 +-
 nel/include/nel/misc/ucstring.h               |  2 +-
 nel/include/nel/net/unified_network.h         |  3 +++
 nel/include/nel/sound/music_channel_fader.h   |  2 +-
 nel/include/nel/sound/stream_file_source.h    |  2 +-
 nel/include/nel/web/http_client_curl.h        |  2 +-
 nel/samples/misc/i18n/main.cpp                |  3 +++
 .../3d/driver/direct3d/driver_direct3d.cpp    |  2 +-
 nel/src/3d/driver/direct3d/driver_direct3d.h  |  2 +-
 .../direct3d/driver_direct3d_material.cpp     |  2 +-
 .../direct3d/driver_direct3d_texture.cpp      |  2 +-
 nel/src/3d/driver/opengl/driver_opengl.h      |  2 +-
 .../driver/opengl/driver_opengl_extension.cpp |  2 +-
 .../driver_opengl_vertex_buffer_hard.cpp      |  2 +-
 .../3d/driver/opengl/driver_opengl_window.cpp |  2 +-
 .../3d/driver/opengl/unix_event_emitter.cpp   |  2 +-
 nel/src/3d/driver/opengl/unix_event_emitter.h |  1 +
 nel/src/3d/driver_user.cpp                    |  2 +-
 nel/src/3d/font_generator.cpp                 |  2 +-
 nel/src/3d/font_manager.cpp                   |  3 +++
 nel/src/3d/fxaa.cpp                           |  2 +-
 nel/src/3d/lod_character_manager.cpp          |  3 +++
 nel/src/3d/packed_zone.cpp                    |  3 +++
 nel/src/3d/render_trav.cpp                    |  2 +-
 nel/src/3d/scene.cpp                          |  2 +-
 nel/src/3d/shadow_map_manager.cpp             |  2 +-
 nel/src/3d/shape_bank.cpp                     |  3 +++
 nel/src/3d/surface_light_grid.cpp             |  3 +++
 nel/src/3d/tessellation.cpp                   |  3 +++
 nel/src/3d/text_context.cpp                   |  2 +-
 nel/src/3d/text_context_user.cpp              |  2 +-
 nel/src/3d/texture_bump.cpp                   |  3 +++
 nel/src/georges/form.cpp                      |  2 +-
 nel/src/georges/type.cpp                      |  2 +-
 nel/src/gui/action_handler.cpp                |  1 +
 nel/src/gui/css_parser.cpp                    |  3 +++
 nel/src/gui/ctrl_base.cpp                     |  1 +
 nel/src/gui/ctrl_scroll.cpp                   |  2 +-
 nel/src/gui/ctrl_text_button.cpp              |  1 +
 nel/src/gui/dbgroup_combo_box.cpp             |  2 +-
 nel/src/gui/dbview_number.cpp                 |  1 +
 nel/src/gui/dbview_quantity.cpp               |  1 +
 nel/src/gui/group_container.cpp               |  2 +-
 nel/src/gui/group_editbox.cpp                 |  1 +
 nel/src/gui/group_header.cpp                  |  1 +
 nel/src/gui/group_html.cpp                    |  2 +-
 nel/src/gui/group_list.cpp                    |  1 +
 nel/src/gui/group_menu.cpp                    |  2 +-
 nel/src/gui/group_paragraph.cpp               |  1 +
 nel/src/gui/group_tree.cpp                    |  1 +
 nel/src/gui/interface_expr.cpp                |  1 +
 nel/src/gui/interface_expr_user_fct.cpp       |  1 +
 nel/src/gui/interface_group.cpp               |  2 +-
 nel/src/gui/interface_link.cpp                |  2 +-
 nel/src/gui/lua_helper.cpp                    |  2 +-
 nel/src/gui/lua_ihm.cpp                       |  2 +-
 nel/src/gui/string_case.cpp                   |  1 +
 nel/src/gui/view_pointer.cpp                  |  1 +
 nel/src/gui/view_renderer.cpp                 |  1 +
 nel/src/gui/view_text.cpp                     |  2 +-
 nel/src/gui/view_text_formated.cpp            |  1 +
 nel/src/gui/view_text_id.cpp                  |  1 +
 nel/src/gui/view_text_id_formated.cpp         |  1 +
 nel/src/gui/widget_manager.cpp                |  2 +-
 nel/src/ligo/primitive.cpp                    |  1 +
 nel/src/logic/logic_state_machine.cpp         |  3 +++
 nel/src/misc/big_file.cpp                     |  3 +++
 nel/src/misc/bitmap.cpp                       |  2 +-
 nel/src/misc/cdb_branch.cpp                   |  2 +-
 nel/src/misc/co_task.cpp                      |  2 +-
 nel/src/misc/common.cpp                       |  2 +-
 nel/src/misc/debug.cpp                        |  2 +-
 nel/src/misc/diff_tool.cpp                    |  3 +++
 nel/src/misc/eid_translator.cpp               |  3 +++
 nel/src/misc/eval_num_expr.cpp                |  2 +-
 nel/src/misc/event_emitter_multi.cpp          |  3 +++
 nel/src/misc/file.cpp                         |  2 +-
 nel/src/misc/i18n.cpp                         |  1 +
 nel/src/misc/i_xml.cpp                        |  3 +++
 nel/src/misc/inter_window_msg_queue.cpp       |  3 +++
 nel/src/misc/mem_displayer.cpp                |  2 +-
 nel/src/misc/object_arena_allocator.cpp       |  2 +-
 nel/src/misc/path.cpp                         |  2 +-
 nel/src/misc/seven_zip.cpp                    |  2 +-
 nel/src/misc/string_common.cpp                |  2 +-
 nel/src/misc/string_mapper.cpp                |  3 +++
 nel/src/misc/system_info.cpp                  |  2 +-
 nel/src/misc/system_utils.cpp                 |  2 +-
 nel/src/misc/ucstring.cpp                     |  3 +++
 nel/src/misc/unicode.cpp                      |  3 +++
 nel/src/misc/win_displayer.cpp                |  2 +-
 nel/src/misc/win_event_emitter.cpp            |  2 +-
 nel/src/misc/win_thread.cpp                   |  2 +-
 nel/src/net/unified_network.cpp               |  2 +-
 nel/src/pacs/build_indoor.cpp                 |  2 +-
 nel/src/pacs/move_container.cpp               |  3 +++
 nel/src/sound/audio_decoder.cpp               |  2 +-
 .../sound/driver/xaudio2/source_xaudio2.cpp   |  2 +-
 nel/src/sound/music_channel_fader.cpp         |  2 +-
 nel/src/sound/stream_file_source.cpp          |  2 +-
 .../3d/build_clodtex/lod_texture_builder.cpp  |  3 +++
 nel/tools/3d/ig_elevation/main.cpp            |  2 +-
 nel/tools/3d/panoply_preview/main_window.cpp  |  2 +-
 .../nel_3dsmax_shared/string_common.h         |  2 +-
 .../plugin_max/nel_patch_converter/script.cpp |  2 +-
 nel/tools/pacs/build_rbank/prim_checker.cpp   |  2 +-
 ryzom/client/src/actions.cpp                  |  1 +
 ryzom/client/src/actions.h                    |  2 +-
 ryzom/client/src/bg_downloader_access.cpp     |  2 +-
 ryzom/client/src/character_cl.cpp             |  2 +-
 ryzom/client/src/client_cfg.cpp               |  2 +-
 ryzom/client/src/client_cfg.h                 |  2 +-
 ryzom/client/src/client_chat_manager.cpp      |  1 +
 .../src/client_sheets/character_sheet.cpp     |  3 +++
 ryzom/client/src/client_sheets/item_sheet.cpp |  3 +++
 ryzom/client/src/client_sheets/item_sheet.h   |  3 +++
 ryzom/client/src/commands.cpp                 |  2 +-
 ryzom/client/src/connection.cpp               |  2 +-
 ryzom/client/src/contextual_cursor.cpp        |  1 +
 ryzom/client/src/continent.cpp                |  3 +++
 ryzom/client/src/debug_client.cpp             |  2 +-
 ryzom/client/src/entity_cl.cpp                |  2 +-
 ryzom/client/src/far_tp.cpp                   |  2 +-
 ryzom/client/src/forage_source_cl.cpp         |  1 +
 ryzom/client/src/fx_cl.cpp                    |  3 +++
 ryzom/client/src/game_context_menu.cpp        |  1 +
 ryzom/client/src/init.cpp                     |  2 +-
 ryzom/client/src/init_main_loop.cpp           |  2 +-
 .../src/interface_v3/action_handler_edit.cpp  |  1 +
 .../src/interface_v3/action_handler_game.cpp  |  2 +-
 .../src/interface_v3/action_handler_help.cpp  |  1 +
 .../src/interface_v3/action_handler_item.cpp  |  1 +
 .../interface_v3/action_handler_phrase.cpp    |  1 +
 .../src/interface_v3/action_phrase_faber.cpp  |  1 +
 .../bot_chat_page_create_guild.cpp            |  1 +
 .../bot_chat_page_dynamic_mission.cpp         |  1 +
 .../src/interface_v3/bot_chat_page_trade.cpp  |  1 +
 .../src/interface_v3/chat_text_manager.cpp    |  1 +
 ryzom/client/src/interface_v3/chat_window.cpp |  1 +
 ryzom/client/src/interface_v3/chat_window.h   |  1 +
 .../client/src/interface_v3/dbctrl_sheet.cpp  |  2 +-
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  2 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |  1 +
 .../dbgroup_list_sheet_icon_phrase.cpp        |  1 +
 .../dbgroup_list_sheet_mission.cpp            |  1 +
 .../interface_v3/dbgroup_list_sheet_text.cpp  |  2 +-
 .../interface_v3/dbgroup_list_sheet_text.h    |  1 +
 ...roup_list_sheet_text_brick_composition.cpp |  2 +-
 .../dbgroup_list_sheet_text_phrase.cpp        |  1 +
 .../dbgroup_list_sheet_text_phrase_id.cpp     |  3 +++
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  1 +
 .../src/interface_v3/encyclopedia_manager.cpp |  1 +
 .../src/interface_v3/flying_text_manager.cpp  |  1 +
 .../client/src/interface_v3/group_compas.cpp  |  1 +
 .../client/src/interface_v3/group_html_cs.cpp |  1 +
 ryzom/client/src/interface_v3/group_html_cs.h |  1 +
 .../src/interface_v3/group_html_forum.cpp     |  1 +
 .../src/interface_v3/group_html_forum.h       |  1 +
 .../src/interface_v3/group_html_mail.cpp      |  1 +
 .../client/src/interface_v3/group_html_mail.h |  1 +
 .../src/interface_v3/group_html_webig.h       |  1 +
 .../interface_v3/group_in_scene_bubble.cpp    |  1 +
 .../interface_v3/group_in_scene_user_info.cpp |  2 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  2 +-
 .../src/interface_v3/group_modal_get_key.cpp  |  1 +
 .../group_phrase_skill_filter.cpp             |  1 +
 .../src/interface_v3/group_quick_help.cpp     |  1 +
 .../src/interface_v3/group_quick_help.h       |  1 +
 .../client/src/interface_v3/group_skills.cpp  |  1 +
 .../client/src/interface_v3/guild_manager.cpp |  1 +
 .../interface_v3/input_handler_manager.cpp    |  2 +-
 .../src/interface_v3/input_handler_manager.h  |  1 +
 .../client/src/interface_v3/interface_ddx.cpp |  1 +
 .../interface_expr_user_fct_game.cpp          |  1 +
 .../interface_expr_user_fct_items.cpp         |  1 +
 .../src/interface_v3/interface_manager.cpp    |  2 +-
 .../src/interface_v3/interface_manager.h      |  2 +-
 .../src/interface_v3/inventory_manager.cpp    |  2 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  2 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  1 +
 .../src/interface_v3/macrocmd_manager.cpp     |  1 +
 .../client/src/interface_v3/music_player.cpp  |  1 +
 .../src/interface_v3/people_interraction.cpp  |  2 +-
 ryzom/client/src/interface_v3/people_list.cpp |  1 +
 .../client/src/interface_v3/skill_manager.cpp |  1 +
 .../src/interface_v3/sphrase_manager.cpp      |  2 +-
 .../src/interface_v3/task_bar_manager.cpp     |  1 +
 ryzom/client/src/item_group_manager.cpp       |  3 +++
 ryzom/client/src/login.cpp                    |  2 +-
 ryzom/client/src/login_patch.cpp              |  2 +-
 ryzom/client/src/main_loop.cpp                |  2 +-
 ryzom/client/src/main_loop_debug.cpp          |  2 +-
 ryzom/client/src/net_manager.cpp              |  2 +-
 ryzom/client/src/network_connection.cpp       |  2 +-
 ryzom/client/src/network_connection.h         |  2 +-
 ryzom/client/src/player_cl.cpp                |  1 +
 ryzom/client/src/progress.cpp                 |  2 +-
 ryzom/client/src/r2/auto_group.cpp            |  3 +++
 .../client/src/r2/displayer_visual_entity.cpp |  2 +-
 .../client/src/r2/displayer_visual_group.cpp  |  1 +
 .../src/r2/dmc/client_edition_module.cpp      |  2 +-
 ryzom/client/src/r2/dmc/com_lua_module.cpp    |  2 +-
 ryzom/client/src/r2/editor.cpp                |  2 +-
 ryzom/client/src/r2/instance_map_deco.cpp     |  1 +
 ryzom/client/src/r2/instance_map_deco.h       |  1 +
 ryzom/client/src/r2/prim_render.cpp           |  1 +
 ryzom/client/src/r2/tool_select_move.cpp      |  3 +++
 ryzom/client/src/session_browser.cpp          |  3 +++
 ryzom/client/src/session_browser_impl.cpp     |  2 +-
 ryzom/client/src/string_manager_client.h      |  3 +++
 ryzom/client/src/timed_fx_manager.cpp         |  2 +-
 ryzom/client/src/user_entity.cpp              |  2 +-
 ryzom/common/src/game_share/crypt.cpp         |  2 +-
 .../src/game_share/mirrored_data_set.cpp      |  2 +-
 ryzom/common/src/game_share/object.cpp        |  2 +-
 ryzom/common/src/game_share/object.h          |  3 +++
 ryzom/common/src/game_share/rm_family.cpp     |  3 +++
 ryzom/common/src/game_share/rm_family.h       |  3 +++
 ryzom/common/src/game_share/roles.cpp         |  3 +++
 ryzom/common/src/game_share/roles.h           |  3 +++
 .../game_share/server_animation_module.cpp    |  3 +++
 .../time_weather_season/weather_function.cpp  |  3 +++
 ryzom/common/src/game_share/timer.h           |  3 +++
 ryzom/common/src/game_share/utils.h           |  1 +
 .../src/game_share/visual_slot_manager.h      |  3 +++
 .../src/general_settings_widget.cpp           |  3 +++
 .../georges_dll/file_tree_view.cpp            |  2 +-
 .../leveldesign/georges_dll/form_dialog.cpp   |  2 +-
 .../leveldesign/mission_compiler_lib/main.cpp |  3 +++
 ryzom/tools/leveldesign/mp_generator/main.cpp |  1 +
 .../world_editor/world_editor.cpp             |  2 +-
 .../sheets_packer_shard.cpp                   |  2 +-
 ryzom/tools/translation_tools/main.cpp        |  2 +-
 .../bnp_manager/bnp_manager_window.cpp        |  3 +++
 .../plugins/core/general_settings_page.cpp    |  1 +
 .../georges_editor/georges_editor_form.cpp    |  1 +
 .../georges_treeview_dialog.cpp               |  2 +-
 tool/attribution/annotate.py                  | 25 +++++++++++--------
 287 files changed, 410 insertions(+), 143 deletions(-)

diff --git a/nel/include/nel/3d/computed_string.h b/nel/include/nel/3d/computed_string.h
index 35bfb692c..c0ae90578 100644
--- a/nel/include/nel/3d/computed_string.h
+++ b/nel/include/nel/3d/computed_string.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/driver.h b/nel/include/nel/3d/driver.h
index 0fdae7a58..1892aace0 100644
--- a/nel/include/nel/3d/driver.h
+++ b/nel/include/nel/3d/driver.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/driver_user.h b/nel/include/nel/3d/driver_user.h
index 862921f8f..a59d167a4 100644
--- a/nel/include/nel/3d/driver_user.h
+++ b/nel/include/nel/3d/driver_user.h
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/font_generator.h b/nel/include/nel/3d/font_generator.h
index ea737afab..eca05d456 100644
--- a/nel/include/nel/3d/font_generator.h
+++ b/nel/include/nel/3d/font_generator.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/font_manager.h b/nel/include/nel/3d/font_manager.h
index 134df26f9..620b2164f 100644
--- a/nel/include/nel/3d/font_manager.h
+++ b/nel/include/nel/3d/font_manager.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/landscape.h b/nel/include/nel/3d/landscape.h
index f6e1a5861..cf05f6c9a 100644
--- a/nel/include/nel/3d/landscape.h
+++ b/nel/include/nel/3d/landscape.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/text_context.h b/nel/include/nel/3d/text_context.h
index 01a711e7e..a8d4188a8 100644
--- a/nel/include/nel/3d/text_context.h
+++ b/nel/include/nel/3d/text_context.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/text_context_user.h b/nel/include/nel/3d/text_context_user.h
index 039aebcd0..b673bfa8f 100644
--- a/nel/include/nel/3d/text_context_user.h
+++ b/nel/include/nel/3d/text_context_user.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/texture.h b/nel/include/nel/3d/texture.h
index f74af29d9..6016917d2 100644
--- a/nel/include/nel/3d/texture.h
+++ b/nel/include/nel/3d/texture.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
index 5b0796721..b250fecd8 100644
--- a/nel/include/nel/3d/texture_font.h
+++ b/nel/include/nel/3d/texture_font.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/u_driver.h b/nel/include/nel/3d/u_driver.h
index ca8a98e02..24e3d6482 100644
--- a/nel/include/nel/3d/u_driver.h
+++ b/nel/include/nel/3d/u_driver.h
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
index c5d31b886..f7f833c47 100644
--- a/nel/include/nel/3d/u_text_context.h
+++ b/nel/include/nel/3d/u_text_context.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/css_parser.h b/nel/include/nel/gui/css_parser.h
index 65b6a11b0..c3a426ee7 100644
--- a/nel/include/nel/gui/css_parser.h
+++ b/nel/include/nel/gui/css_parser.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/gui/ctrl_base.h b/nel/include/nel/gui/ctrl_base.h
index 39b795252..9c80e7f7a 100644
--- a/nel/include/nel/gui/ctrl_base.h
+++ b/nel/include/nel/gui/ctrl_base.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/ctrl_text_button.h b/nel/include/nel/gui/ctrl_text_button.h
index 74e1c1291..4773a25e9 100644
--- a/nel/include/nel/gui/ctrl_text_button.h
+++ b/nel/include/nel/gui/ctrl_text_button.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/dbgroup_combo_box.h b/nel/include/nel/gui/dbgroup_combo_box.h
index 61e447f4e..ddf84cbef 100644
--- a/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/nel/include/nel/gui/dbgroup_combo_box.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/dbview_quantity.h b/nel/include/nel/gui/dbview_quantity.h
index c23b394ab..e172624d7 100644
--- a/nel/include/nel/gui/dbview_quantity.h
+++ b/nel/include/nel/gui/dbview_quantity.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/event_descriptor.h b/nel/include/nel/gui/event_descriptor.h
index baa9414fd..69c90ff5d 100644
--- a/nel/include/nel/gui/event_descriptor.h
+++ b/nel/include/nel/gui/event_descriptor.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
index 30d91dad6..d7c489e5f 100644
--- a/nel/include/nel/gui/group_container.h
+++ b/nel/include/nel/gui/group_container.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 3263837c1..4bf200df8 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index a5e1dc4e1..a96f0180a 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_list.h b/nel/include/nel/gui/group_list.h
index 6e7587e34..e7fda6eb3 100644
--- a/nel/include/nel/gui/group_list.h
+++ b/nel/include/nel/gui/group_list.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_menu.h b/nel/include/nel/gui/group_menu.h
index f304a3d60..fb5f9af88 100644
--- a/nel/include/nel/gui/group_menu.h
+++ b/nel/include/nel/gui/group_menu.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_paragraph.h b/nel/include/nel/gui/group_paragraph.h
index 0e1898633..20bc50585 100644
--- a/nel/include/nel/gui/group_paragraph.h
+++ b/nel/include/nel/gui/group_paragraph.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/group_tree.h b/nel/include/nel/gui/group_tree.h
index d7518a68d..835a305e1 100644
--- a/nel/include/nel/gui/group_tree.h
+++ b/nel/include/nel/gui/group_tree.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/interface_element.h b/nel/include/nel/gui/interface_element.h
index 47025f155..42fa1de2f 100644
--- a/nel/include/nel/gui/interface_element.h
+++ b/nel/include/nel/gui/interface_element.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/interface_expr.h b/nel/include/nel/gui/interface_expr.h
index 0a9d9b4e9..27ed24fe0 100644
--- a/nel/include/nel/gui/interface_expr.h
+++ b/nel/include/nel/gui/interface_expr.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/interface_group.h b/nel/include/nel/gui/interface_group.h
index 9f1e5562b..672e52e6a 100644
--- a/nel/include/nel/gui/interface_group.h
+++ b/nel/include/nel/gui/interface_group.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/lua_helper.h b/nel/include/nel/gui/lua_helper.h
index 8a0f985a6..fa941f79a 100644
--- a/nel/include/nel/gui/lua_helper.h
+++ b/nel/include/nel/gui/lua_helper.h
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/lua_helper_inline.h b/nel/include/nel/gui/lua_helper_inline.h
index 5dbc3cef4..d50455880 100644
--- a/nel/include/nel/gui/lua_helper_inline.h
+++ b/nel/include/nel/gui/lua_helper_inline.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/reflect.h b/nel/include/nel/gui/reflect.h
index 8bd3b4781..7da0b3529 100644
--- a/nel/include/nel/gui/reflect.h
+++ b/nel/include/nel/gui/reflect.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/string_case.h b/nel/include/nel/gui/string_case.h
index 446998e1a..44e38651f 100644
--- a/nel/include/nel/gui/string_case.h
+++ b/nel/include/nel/gui/string_case.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_pointer.h b/nel/include/nel/gui/view_pointer.h
index bc605a717..b947cc604 100644
--- a/nel/include/nel/gui/view_pointer.h
+++ b/nel/include/nel/gui/view_pointer.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 2074576c1..7980e6427 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_text_formated.h b/nel/include/nel/gui/view_text_formated.h
index f6a3cf443..1b7146b8b 100644
--- a/nel/include/nel/gui/view_text_formated.h
+++ b/nel/include/nel/gui/view_text_formated.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
index 8c012f319..abba8cb39 100644
--- a/nel/include/nel/gui/view_text_id.h
+++ b/nel/include/nel/gui/view_text_id.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_text_id_formated.h b/nel/include/nel/gui/view_text_id_formated.h
index dfd11d0d4..428bca035 100644
--- a/nel/include/nel/gui/view_text_id_formated.h
+++ b/nel/include/nel/gui/view_text_id_formated.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/widget_manager.h b/nel/include/nel/gui/widget_manager.h
index e8b4e376c..dc1d75063 100644
--- a/nel/include/nel/gui/widget_manager.h
+++ b/nel/include/nel/gui/widget_manager.h
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 7b89bae3b..7c2cc2937 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2015-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/debug.h b/nel/include/nel/misc/debug.h
index 1d533c149..9b6e48376 100644
--- a/nel/include/nel/misc/debug.h
+++ b/nel/include/nel/misc/debug.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/event_emitter_multi.h b/nel/include/nel/misc/event_emitter_multi.h
index 9b8d25c64..cb41d023f 100644
--- a/nel/include/nel/misc/event_emitter_multi.h
+++ b/nel/include/nel/misc/event_emitter_multi.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/events.h b/nel/include/nel/misc/events.h
index 6cfe902b8..b75d72ca2 100644
--- a/nel/include/nel/misc/events.h
+++ b/nel/include/nel/misc/events.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/file.h b/nel/include/nel/misc/file.h
index f634f4378..6f0584dd7 100644
--- a/nel/include/nel/misc/file.h
+++ b/nel/include/nel/misc/file.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/i18n.h b/nel/include/nel/misc/i18n.h
index 28df54c5e..86499eae5 100644
--- a/nel/include/nel/misc/i18n.h
+++ b/nel/include/nel/misc/i18n.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/sha1.h b/nel/include/nel/misc/sha1.h
index d458c6f8f..8c046fca1 100644
--- a/nel/include/nel/misc/sha1.h
+++ b/nel/include/nel/misc/sha1.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/sheet_id.h b/nel/include/nel/misc/sheet_id.h
index 856dbf330..c1fc7070f 100644
--- a/nel/include/nel/misc/sheet_id.h
+++ b/nel/include/nel/misc/sheet_id.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h
index 89db78a1c..9b18d575c 100644
--- a/nel/include/nel/misc/stream.h
+++ b/nel/include/nel/misc/stream.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/string_common.h b/nel/include/nel/misc/string_common.h
index 6021b8159..96f7f7bd1 100644
--- a/nel/include/nel/misc/string_common.h
+++ b/nel/include/nel/misc/string_common.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2016-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/system_utils.h b/nel/include/nel/misc/system_utils.h
index 9093eb90d..5cec22af2 100644
--- a/nel/include/nel/misc/system_utils.h
+++ b/nel/include/nel/misc/system_utils.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h
index bac48c3d6..a257eb293 100644
--- a/nel/include/nel/misc/types_nl.h
+++ b/nel/include/nel/misc/types_nl.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2011  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 61f7f416b..5b95c33c2 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/net/unified_network.h b/nel/include/nel/net/unified_network.h
index df735a740..094ff7390 100644
--- a/nel/include/nel/net/unified_network.h
+++ b/nel/include/nel/net/unified_network.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/sound/music_channel_fader.h b/nel/include/nel/sound/music_channel_fader.h
index 577d23949..bacbbe837 100644
--- a/nel/include/nel/sound/music_channel_fader.h
+++ b/nel/include/nel/sound/music_channel_fader.h
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2008-2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Winch Gate Property Limited
diff --git a/nel/include/nel/sound/stream_file_source.h b/nel/include/nel/sound/stream_file_source.h
index c8cf91cf5..1ade68572 100644
--- a/nel/include/nel/sound/stream_file_source.h
+++ b/nel/include/nel/sound/stream_file_source.h
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/web/http_client_curl.h b/nel/include/nel/web/http_client_curl.h
index e130cd768..cfb1ac38a 100644
--- a/nel/include/nel/web/http_client_curl.h
+++ b/nel/include/nel/web/http_client_curl.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/samples/misc/i18n/main.cpp b/nel/samples/misc/i18n/main.cpp
index 5456c1325..5b1c73123 100644
--- a/nel/samples/misc/i18n/main.cpp
+++ b/nel/samples/misc/i18n/main.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 6263de0f8..f8a678957 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2014  Matthew LAGOE (Botanic) <cyberempires@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.h b/nel/src/3d/driver/direct3d/driver_direct3d.h
index bc7911df2..9a434cab2 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.h
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
index 2285688d4..1436e5aa4 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
index 15dcb7768..71af20f00 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl.h b/nel/src/3d/driver/opengl/driver_opengl.h
index e85d2da05..5be157403 100644
--- a/nel/src/3d/driver/opengl/driver_opengl.h
+++ b/nel/src/3d/driver/opengl/driver_opengl.h
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
 // Copyright (C) 2010  Thibaut GIRKA (ThibG) <thib@sitedethib.com>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index 0b8c4a458..ff5252c61 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
index 8e539afd7..8c86f4c7e 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index c60ec602e..163f64843 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index 594d60183..e8e8ae99f 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/unix_event_emitter.h b/nel/src/3d/driver/opengl/unix_event_emitter.h
index 68dc81a48..297fdcb5a 100644
--- a/nel/src/3d/driver/opengl/unix_event_emitter.h
+++ b/nel/src/3d/driver/opengl/unix_event_emitter.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver_user.cpp b/nel/src/3d/driver_user.cpp
index 02e9c4b27..a7bd7a332 100644
--- a/nel/src/3d/driver_user.cpp
+++ b/nel/src/3d/driver_user.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2015  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
index 86a233f22..06ccd3a8b 100644
--- a/nel/src/3d/font_generator.cpp
+++ b/nel/src/3d/font_generator.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index 872c1fd3d..9e954ac1f 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/fxaa.cpp b/nel/src/3d/fxaa.cpp
index 6478abf8e..2dfd58d37 100644
--- a/nel/src/3d/fxaa.cpp
+++ b/nel/src/3d/fxaa.cpp
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/lod_character_manager.cpp b/nel/src/3d/lod_character_manager.cpp
index f5d6a23c5..8e062bf07 100644
--- a/nel/src/3d/lod_character_manager.cpp
+++ b/nel/src/3d/lod_character_manager.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/packed_zone.cpp b/nel/src/3d/packed_zone.cpp
index 72866ea78..f1cb7426b 100644
--- a/nel/src/3d/packed_zone.cpp
+++ b/nel/src/3d/packed_zone.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/render_trav.cpp b/nel/src/3d/render_trav.cpp
index 355ceb7ab..1b7e8e84e 100644
--- a/nel/src/3d/render_trav.cpp
+++ b/nel/src/3d/render_trav.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/scene.cpp b/nel/src/3d/scene.cpp
index db8a629ff..15173d7d9 100644
--- a/nel/src/3d/scene.cpp
+++ b/nel/src/3d/scene.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/shadow_map_manager.cpp b/nel/src/3d/shadow_map_manager.cpp
index e6a7cfe50..174ecd580 100644
--- a/nel/src/3d/shadow_map_manager.cpp
+++ b/nel/src/3d/shadow_map_manager.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/shape_bank.cpp b/nel/src/3d/shape_bank.cpp
index a7c60cd03..71bdb79e2 100644
--- a/nel/src/3d/shape_bank.cpp
+++ b/nel/src/3d/shape_bank.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/surface_light_grid.cpp b/nel/src/3d/surface_light_grid.cpp
index b30abe730..d85422869 100644
--- a/nel/src/3d/surface_light_grid.cpp
+++ b/nel/src/3d/surface_light_grid.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/tessellation.cpp b/nel/src/3d/tessellation.cpp
index 9dbc12296..88c0fa26e 100644
--- a/nel/src/3d/tessellation.cpp
+++ b/nel/src/3d/tessellation.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/text_context.cpp b/nel/src/3d/text_context.cpp
index b31a82959..4549622da 100644
--- a/nel/src/3d/text_context.cpp
+++ b/nel/src/3d/text_context.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index 447122293..f32fd175d 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/texture_bump.cpp b/nel/src/3d/texture_bump.cpp
index 7705a58fa..fc1fe4139 100644
--- a/nel/src/3d/texture_bump.cpp
+++ b/nel/src/3d/texture_bump.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/georges/form.cpp b/nel/src/georges/form.cpp
index c3fea6e0a..40f374b8d 100644
--- a/nel/src/georges/form.cpp
+++ b/nel/src/georges/form.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/georges/type.cpp b/nel/src/georges/type.cpp
index 1055313dd..9c65acae7 100644
--- a/nel/src/georges/type.cpp
+++ b/nel/src/georges/type.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
index b80ce2f5f..a10513ebb 100644
--- a/nel/src/gui/action_handler.cpp
+++ b/nel/src/gui/action_handler.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index f3003b195..d43189fca 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index 1f652031b..2e95c50dd 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_scroll.cpp b/nel/src/gui/ctrl_scroll.cpp
index 14caa75f4..b40498186 100644
--- a/nel/src/gui/ctrl_scroll.cpp
+++ b/nel/src/gui/ctrl_scroll.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 5cc89c9a7..c5571a4ca 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index b13005b33..725019b72 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/dbview_number.cpp b/nel/src/gui/dbview_number.cpp
index 7ba4c17ba..c0c728f2b 100644
--- a/nel/src/gui/dbview_number.cpp
+++ b/nel/src/gui/dbview_number.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/dbview_quantity.cpp b/nel/src/gui/dbview_quantity.cpp
index 192b0a936..84c214191 100644
--- a/nel/src/gui/dbview_quantity.cpp
+++ b/nel/src/gui/dbview_quantity.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index e201f2eb4..1416f5ee6 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index dc7e34e16..799452b33 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_header.cpp b/nel/src/gui/group_header.cpp
index 5fec1d4be..2671c2a62 100644
--- a/nel/src/gui/group_header.cpp
+++ b/nel/src/gui/group_header.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index b85cb5bfc..d2c6d4cf3 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index b94ff6a5f..c65d759ba 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index 77f73e18e..8db402540 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index a4c2a6da7..4ca13c8ae 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
index 674da9546..44636f1d6 100644
--- a/nel/src/gui/group_tree.cpp
+++ b/nel/src/gui/group_tree.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_expr.cpp b/nel/src/gui/interface_expr.cpp
index c83c1d722..c10627e02 100644
--- a/nel/src/gui/interface_expr.cpp
+++ b/nel/src/gui/interface_expr.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_expr_user_fct.cpp b/nel/src/gui/interface_expr_user_fct.cpp
index 7fc097f48..f5de62b6f 100644
--- a/nel/src/gui/interface_expr_user_fct.cpp
+++ b/nel/src/gui/interface_expr_user_fct.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_group.cpp b/nel/src/gui/interface_group.cpp
index dacaf16cf..9cced8264 100644
--- a/nel/src/gui/interface_group.cpp
+++ b/nel/src/gui/interface_group.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_link.cpp b/nel/src/gui/interface_link.cpp
index 1cad39c94..6fbe3a3ec 100644
--- a/nel/src/gui/interface_link.cpp
+++ b/nel/src/gui/interface_link.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/lua_helper.cpp b/nel/src/gui/lua_helper.cpp
index a07ba3b71..bb5fd5426 100644
--- a/nel/src/gui/lua_helper.cpp
+++ b/nel/src/gui/lua_helper.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index c915a8671..9b00026d7 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index 8946a5d1d..801b2fc68 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
index 3c319c228..74644fa9f 100644
--- a/nel/src/gui/view_pointer.cpp
+++ b/nel/src/gui/view_pointer.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 82716de4a..405781440 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 0f4e93b89..87ebab92d 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_text_formated.cpp b/nel/src/gui/view_text_formated.cpp
index dfd57eadf..537773788 100644
--- a/nel/src/gui/view_text_formated.cpp
+++ b/nel/src/gui/view_text_formated.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
index ea961dd2a..61d97b523 100644
--- a/nel/src/gui/view_text_id.cpp
+++ b/nel/src/gui/view_text_id.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_text_id_formated.cpp b/nel/src/gui/view_text_id_formated.cpp
index 88f9a58e0..b6bd9dc22 100644
--- a/nel/src/gui/view_text_id_formated.cpp
+++ b/nel/src/gui/view_text_id_formated.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index 864e4ef5b..534a0cc1b 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/ligo/primitive.cpp b/nel/src/ligo/primitive.cpp
index d43d4cde1..205464c67 100644
--- a/nel/src/ligo/primitive.cpp
+++ b/nel/src/ligo/primitive.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/logic/logic_state_machine.cpp b/nel/src/logic/logic_state_machine.cpp
index 3d55be849..0492671f6 100644
--- a/nel/src/logic/logic_state_machine.cpp
+++ b/nel/src/logic/logic_state_machine.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/big_file.cpp b/nel/src/misc/big_file.cpp
index f01bbf297..533d52818 100644
--- a/nel/src/misc/big_file.cpp
+++ b/nel/src/misc/big_file.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/bitmap.cpp b/nel/src/misc/bitmap.cpp
index 967cc325e..33c0cec43 100644
--- a/nel/src/misc/bitmap.cpp
+++ b/nel/src/misc/bitmap.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/cdb_branch.cpp b/nel/src/misc/cdb_branch.cpp
index f3e4f7de5..f77acc194 100644
--- a/nel/src/misc/cdb_branch.cpp
+++ b/nel/src/misc/cdb_branch.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/co_task.cpp b/nel/src/misc/co_task.cpp
index 4548fbe86..7446a72d3 100644
--- a/nel/src/misc/co_task.cpp
+++ b/nel/src/misc/co_task.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index cbc6ee070..8d046c97c 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/debug.cpp b/nel/src/misc/debug.cpp
index 6a40d3b0b..f821ac620 100644
--- a/nel/src/misc/debug.cpp
+++ b/nel/src/misc/debug.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2015  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/nel/src/misc/diff_tool.cpp b/nel/src/misc/diff_tool.cpp
index 3cbaea5a6..2e390f9d9 100644
--- a/nel/src/misc/diff_tool.cpp
+++ b/nel/src/misc/diff_tool.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/eid_translator.cpp b/nel/src/misc/eid_translator.cpp
index 9978b37e0..d8c7e06ee 100644
--- a/nel/src/misc/eid_translator.cpp
+++ b/nel/src/misc/eid_translator.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/eval_num_expr.cpp b/nel/src/misc/eval_num_expr.cpp
index 5d19e22a1..8cde36a48 100644
--- a/nel/src/misc/eval_num_expr.cpp
+++ b/nel/src/misc/eval_num_expr.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/event_emitter_multi.cpp b/nel/src/misc/event_emitter_multi.cpp
index a7d133f3c..245d935a7 100644
--- a/nel/src/misc/event_emitter_multi.cpp
+++ b/nel/src/misc/event_emitter_multi.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/file.cpp b/nel/src/misc/file.cpp
index 24222bdfe..138e85c88 100644
--- a/nel/src/misc/file.cpp
+++ b/nel/src/misc/file.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/i18n.cpp b/nel/src/misc/i18n.cpp
index 729234f56..74558db17 100644
--- a/nel/src/misc/i18n.cpp
+++ b/nel/src/misc/i18n.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 // Copyright (C) 2014  Matthew LAGOE (Botanic) <cyberempires@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/i_xml.cpp b/nel/src/misc/i_xml.cpp
index 24a2b7910..b38601f06 100644
--- a/nel/src/misc/i_xml.cpp
+++ b/nel/src/misc/i_xml.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/inter_window_msg_queue.cpp b/nel/src/misc/inter_window_msg_queue.cpp
index 74c34b281..6e8478801 100644
--- a/nel/src/misc/inter_window_msg_queue.cpp
+++ b/nel/src/misc/inter_window_msg_queue.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/mem_displayer.cpp b/nel/src/misc/mem_displayer.cpp
index 0250fc4c6..cefa99589 100644
--- a/nel/src/misc/mem_displayer.cpp
+++ b/nel/src/misc/mem_displayer.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/object_arena_allocator.cpp b/nel/src/misc/object_arena_allocator.cpp
index ba2c81148..b8aea9ada 100644
--- a/nel/src/misc/object_arena_allocator.cpp
+++ b/nel/src/misc/object_arena_allocator.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index 2e3aacae6..bd8190db0 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2014-2015  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/nel/src/misc/seven_zip.cpp b/nel/src/misc/seven_zip.cpp
index ad07bf3cc..7a89c20c6 100644
--- a/nel/src/misc/seven_zip.cpp
+++ b/nel/src/misc/seven_zip.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/string_common.cpp b/nel/src/misc/string_common.cpp
index f869a5d35..9e6459677 100644
--- a/nel/src/misc/string_common.cpp
+++ b/nel/src/misc/string_common.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/string_mapper.cpp b/nel/src/misc/string_mapper.cpp
index 8518afa4b..88b81ff07 100644
--- a/nel/src/misc/string_mapper.cpp
+++ b/nel/src/misc/string_mapper.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/system_info.cpp b/nel/src/misc/system_info.cpp
index 5dc70182c..fb192cc43 100644
--- a/nel/src/misc/system_info.cpp
+++ b/nel/src/misc/system_info.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
index ba15d5363..8c01b227c 100644
--- a/nel/src/misc/system_utils.cpp
+++ b/nel/src/misc/system_utils.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/ucstring.cpp b/nel/src/misc/ucstring.cpp
index 05c0d24ab..9e97df650 100644
--- a/nel/src/misc/ucstring.cpp
+++ b/nel/src/misc/ucstring.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index c6780db54..10321a907 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/win_displayer.cpp b/nel/src/misc/win_displayer.cpp
index 7a0045c17..50bef6030 100644
--- a/nel/src/misc/win_displayer.cpp
+++ b/nel/src/misc/win_displayer.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/win_event_emitter.cpp b/nel/src/misc/win_event_emitter.cpp
index 8788bab7b..dfc385bd9 100644
--- a/nel/src/misc/win_event_emitter.cpp
+++ b/nel/src/misc/win_event_emitter.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/win_thread.cpp b/nel/src/misc/win_thread.cpp
index c3624c161..6f45594ca 100644
--- a/nel/src/misc/win_thread.cpp
+++ b/nel/src/misc/win_thread.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/net/unified_network.cpp b/nel/src/net/unified_network.cpp
index ca3ef37d7..0ac8b1c21 100644
--- a/nel/src/net/unified_network.cpp
+++ b/nel/src/net/unified_network.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/pacs/build_indoor.cpp b/nel/src/pacs/build_indoor.cpp
index f97dddfa7..e1207235d 100644
--- a/nel/src/pacs/build_indoor.cpp
+++ b/nel/src/pacs/build_indoor.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/pacs/move_container.cpp b/nel/src/pacs/move_container.cpp
index 099f46839..35b7ddcd6 100644
--- a/nel/src/pacs/move_container.cpp
+++ b/nel/src/pacs/move_container.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/sound/audio_decoder.cpp b/nel/src/sound/audio_decoder.cpp
index db87bd990..57fc8ead8 100644
--- a/nel/src/sound/audio_decoder.cpp
+++ b/nel/src/sound/audio_decoder.cpp
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
-// Copyright (C) 2008-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
index 273c6ee60..13a613d6d 100644
--- a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
+++ b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2008-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/music_channel_fader.cpp b/nel/src/sound/music_channel_fader.cpp
index 70ab890d2..3e1b0f1cf 100644
--- a/nel/src/sound/music_channel_fader.cpp
+++ b/nel/src/sound/music_channel_fader.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2008-2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/src/sound/stream_file_source.cpp b/nel/src/sound/stream_file_source.cpp
index 50d9bda97..a7b45b948 100644
--- a/nel/src/sound/stream_file_source.cpp
+++ b/nel/src/sound/stream_file_source.cpp
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/build_clodtex/lod_texture_builder.cpp b/nel/tools/3d/build_clodtex/lod_texture_builder.cpp
index b0ff316df..05bb184bb 100644
--- a/nel/tools/3d/build_clodtex/lod_texture_builder.cpp
+++ b/nel/tools/3d/build_clodtex/lod_texture_builder.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp
index 126c66c62..4856051c3 100644
--- a/nel/tools/3d/ig_elevation/main.cpp
+++ b/nel/tools/3d/ig_elevation/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/panoply_preview/main_window.cpp b/nel/tools/3d/panoply_preview/main_window.cpp
index 1ef144a14..1195642e8 100644
--- a/nel/tools/3d/panoply_preview/main_window.cpp
+++ b/nel/tools/3d/panoply_preview/main_window.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
index 4a331a78a..22b16e981 100644
--- a/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
+++ b/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
index 48bf1d921..2f00c9c63 100644
--- a/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
+++ b/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2011-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2011-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/pacs/build_rbank/prim_checker.cpp b/nel/tools/pacs/build_rbank/prim_checker.cpp
index 3b8c11bf9..e4c2b0b91 100644
--- a/nel/tools/pacs/build_rbank/prim_checker.cpp
+++ b/nel/tools/pacs/build_rbank/prim_checker.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/actions.cpp b/ryzom/client/src/actions.cpp
index 428c607f0..67695a9d6 100644
--- a/ryzom/client/src/actions.cpp
+++ b/ryzom/client/src/actions.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/actions.h b/ryzom/client/src/actions.h
index 3fe976ac4..f333782f5 100644
--- a/ryzom/client/src/actions.h
+++ b/ryzom/client/src/actions.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/bg_downloader_access.cpp b/ryzom/client/src/bg_downloader_access.cpp
index 2a0e2d73a..e2500eaa6 100644
--- a/ryzom/client/src/bg_downloader_access.cpp
+++ b/ryzom/client/src/bg_downloader_access.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 76263ee56..84b058902 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index ec3535529..21d73859e 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2010-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2011-2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
diff --git a/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h
index e35e9701f..a8404fb39 100644
--- a/ryzom/client/src/client_cfg.h
+++ b/ryzom/client/src/client_cfg.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2010-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2011-2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index 09b1140d4..d614d345b 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/client_sheets/character_sheet.cpp b/ryzom/client/src/client_sheets/character_sheet.cpp
index e6e5cbd00..2568717f9 100644
--- a/ryzom/client/src/client_sheets/character_sheet.cpp
+++ b/ryzom/client/src/client_sheets/character_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
index 25d66acce..0bc47d947 100644
--- a/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client_sheets/item_sheet.h b/ryzom/client/src/client_sheets/item_sheet.h
index e36fd5c84..dc6c0a658 100644
--- a/ryzom/client/src/client_sheets/item_sheet.h
+++ b/ryzom/client/src/client_sheets/item_sheet.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index 23a09c62e..986da78e6 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index b6370602e..4fafe3ebc 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/contextual_cursor.cpp b/ryzom/client/src/contextual_cursor.cpp
index 11398f620..24c95a96c 100644
--- a/ryzom/client/src/contextual_cursor.cpp
+++ b/ryzom/client/src/contextual_cursor.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/continent.cpp b/ryzom/client/src/continent.cpp
index 6bd22741a..3a7dff52d 100644
--- a/ryzom/client/src/continent.cpp
+++ b/ryzom/client/src/continent.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/debug_client.cpp b/ryzom/client/src/debug_client.cpp
index 30e2645bf..88df4be99 100644
--- a/ryzom/client/src/debug_client.cpp
+++ b/ryzom/client/src/debug_client.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 506069426..9d3f446eb 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -3,8 +3,8 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index 80134f26b..c250aec95 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
index be41c0e75..46249ed9e 100644
--- a/ryzom/client/src/forage_source_cl.cpp
+++ b/ryzom/client/src/forage_source_cl.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/fx_cl.cpp b/ryzom/client/src/fx_cl.cpp
index aeb3ddcba..32a764e99 100644
--- a/ryzom/client/src/fx_cl.cpp
+++ b/ryzom/client/src/fx_cl.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 2b46d33dd..441976be8 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index 28d14dc7b..ebb713a73 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2010-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index a1caef841..a5bfa67df 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index c2d3bafbc..ffca45406 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index dacb6f100..cf25d00c5 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 0eb240b7d..dc64feae1 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 2145ac2b6..e3ee653aa 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index f55d376bd..033f99bbf 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 6591472d4..3eacf8a60 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
index 105d4a180..143a71837 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
index e5f8cf1e4..78a38051e 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 4c67b70b3..ce4ec3173 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 6fae6a29b..dff2da28c 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index e046fbe2d..237ffdd8b 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
index 0c8811842..13012ca31 100644
--- a/ryzom/client/src/interface_v3/chat_window.h
+++ b/ryzom/client/src/interface_v3/chat_window.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 994274571..a07d4c2fb 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2011  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2011-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index b662d86af..9440222f4 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2011  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2011-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
 //
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index 5a1952735..be0df19ad 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
index 9a8efa4ae..19083e4ee 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
index f008c32f1..188e06225 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index 0a474b650..7e47e740c 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
index 3d308d582..1cb977978 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
index 8e21b7f26..e8ad3a2e8 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
index 02f8fb6ae..cad06e699 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
index bc812bbc5..6e5e19d9e 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index aec03653b..a461d0194 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index c9912325f..63c5f07c9 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/flying_text_manager.cpp b/ryzom/client/src/interface_v3/flying_text_manager.cpp
index f577d41e2..3f2e510e1 100644
--- a/ryzom/client/src/interface_v3/flying_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/flying_text_manager.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index f7418e868..a5e443da6 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_cs.cpp b/ryzom/client/src/interface_v3/group_html_cs.cpp
index ba20123e1..d02940e60 100644
--- a/ryzom/client/src/interface_v3/group_html_cs.cpp
+++ b/ryzom/client/src/interface_v3/group_html_cs.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_cs.h b/ryzom/client/src/interface_v3/group_html_cs.h
index 76a066e6d..f21eb0834 100644
--- a/ryzom/client/src/interface_v3/group_html_cs.h
+++ b/ryzom/client/src/interface_v3/group_html_cs.h
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_forum.cpp b/ryzom/client/src/interface_v3/group_html_forum.cpp
index fe218c215..641f9b43e 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.cpp
+++ b/ryzom/client/src/interface_v3/group_html_forum.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_forum.h b/ryzom/client/src/interface_v3/group_html_forum.h
index 31e5308be..ef7a98063 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.h
+++ b/ryzom/client/src/interface_v3/group_html_forum.h
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_mail.cpp b/ryzom/client/src/interface_v3/group_html_mail.cpp
index 8627a8573..ac2241523 100644
--- a/ryzom/client/src/interface_v3/group_html_mail.cpp
+++ b/ryzom/client/src/interface_v3/group_html_mail.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_mail.h b/ryzom/client/src/interface_v3/group_html_mail.h
index 59cf4c852..1a24469cb 100644
--- a/ryzom/client/src/interface_v3/group_html_mail.h
+++ b/ryzom/client/src/interface_v3/group_html_mail.h
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_webig.h b/ryzom/client/src/interface_v3/group_html_webig.h
index a339dd3dc..be6412710 100644
--- a/ryzom/client/src/interface_v3/group_html_webig.h
+++ b/ryzom/client/src/interface_v3/group_html_webig.h
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index b6b0195ef..258700dd2 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index bd339d19d..fa88db43e 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -3,8 +3,8 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index f96a2842c..ce6d21021 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_modal_get_key.cpp b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
index 6f28e3b65..b79f6c38a 100644
--- a/ryzom/client/src/interface_v3/group_modal_get_key.cpp
+++ b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
index 62d96280f..d246918bd 100644
--- a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
+++ b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp
index 77775489f..8a5e925cf 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.cpp
+++ b/ryzom/client/src/interface_v3/group_quick_help.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_quick_help.h b/ryzom/client/src/interface_v3/group_quick_help.h
index 0d897d014..6f9c748a3 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.h
+++ b/ryzom/client/src/interface_v3/group_quick_help.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_skills.cpp b/ryzom/client/src/interface_v3/group_skills.cpp
index 4248ea898..d0efce626 100644
--- a/ryzom/client/src/interface_v3/group_skills.cpp
+++ b/ryzom/client/src/interface_v3/group_skills.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 331b0ebfe..e3a1b6b41 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/input_handler_manager.cpp b/ryzom/client/src/interface_v3/input_handler_manager.cpp
index 67a1b2350..28420dff4 100644
--- a/ryzom/client/src/interface_v3/input_handler_manager.cpp
+++ b/ryzom/client/src/interface_v3/input_handler_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/input_handler_manager.h b/ryzom/client/src/interface_v3/input_handler_manager.h
index 4b078ee84..b587fecef 100644
--- a/ryzom/client/src/interface_v3/input_handler_manager.h
+++ b/ryzom/client/src/interface_v3/input_handler_manager.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_ddx.cpp b/ryzom/client/src/interface_v3/interface_ddx.cpp
index caa394723..36bd17e62 100644
--- a/ryzom/client/src/interface_v3/interface_ddx.cpp
+++ b/ryzom/client/src/interface_v3/interface_ddx.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
index aa8cd0582..a4dfb9d79 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
index b686db2be..eafdcccaf 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 089dc39d0..d03412c35 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2010-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2011  Robert TIMM (rti) <mail@rtti.de>
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 342b8a7be..059020018 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -2,8 +2,8 @@
 // Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
index 5324c6e69..75cab6f78 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 2efdf339b..e448b1f4a 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index c04ce38cd..81033f5aa 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index d097ec239..03e53c06b 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index f7f9e05f2..889b83495 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 3d23e31f2..948b45e51 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 30a468975..3f0481b1f 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/skill_manager.cpp b/ryzom/client/src/interface_v3/skill_manager.cpp
index 936db39a7..cf35e6bd6 100644
--- a/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index dc605d11d..f6a89df7a 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/task_bar_manager.cpp b/ryzom/client/src/interface_v3/task_bar_manager.cpp
index 35f27b07d..713a9d07b 100644
--- a/ryzom/client/src/interface_v3/task_bar_manager.cpp
+++ b/ryzom/client/src/interface_v3/task_bar_manager.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index 83c8b4f5a..5e5f0d6c9 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index 9e0fb7f12..a5b94c879 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 3d7a8a4c8..650531773 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014  Matthew LAGOE (Botanic) <cyberempires@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index 356b00452..d9de05961 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/main_loop_debug.cpp b/ryzom/client/src/main_loop_debug.cpp
index 7c63d9502..b4edaf5e9 100644
--- a/ryzom/client/src/main_loop_debug.cpp
+++ b/ryzom/client/src/main_loop_debug.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 8d743074d..f1f622836 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/network_connection.cpp b/ryzom/client/src/network_connection.cpp
index 4778641c0..bad168a60 100644
--- a/ryzom/client/src/network_connection.cpp
+++ b/ryzom/client/src/network_connection.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/network_connection.h b/ryzom/client/src/network_connection.h
index 84bb26d43..99b1bf699 100644
--- a/ryzom/client/src/network_connection.h
+++ b/ryzom/client/src/network_connection.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
index 15e8209db..9aef1032b 100644
--- a/ryzom/client/src/player_cl.cpp
+++ b/ryzom/client/src/player_cl.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index 48d642aea..e75b4a984 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/auto_group.cpp b/ryzom/client/src/r2/auto_group.cpp
index 7bbeb39d3..ee269376c 100644
--- a/ryzom/client/src/r2/auto_group.cpp
+++ b/ryzom/client/src/r2/auto_group.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/r2/displayer_visual_entity.cpp b/ryzom/client/src/r2/displayer_visual_entity.cpp
index 344d2a8fa..72b4c3ddb 100644
--- a/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/displayer_visual_group.cpp b/ryzom/client/src/r2/displayer_visual_group.cpp
index 5cf2c542d..ba7249fd9 100644
--- a/ryzom/client/src/r2/displayer_visual_group.cpp
+++ b/ryzom/client/src/r2/displayer_visual_group.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/dmc/client_edition_module.cpp b/ryzom/client/src/r2/dmc/client_edition_module.cpp
index e388707ca..73e231d4a 100644
--- a/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015-2018  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/dmc/com_lua_module.cpp b/ryzom/client/src/r2/dmc/com_lua_module.cpp
index 2ea3d91dd..aaa8410ab 100644
--- a/ryzom/client/src/r2/dmc/com_lua_module.cpp
+++ b/ryzom/client/src/r2/dmc/com_lua_module.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index d3611067a..3628dfe93 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/instance_map_deco.cpp b/ryzom/client/src/r2/instance_map_deco.cpp
index ae3857990..46b1ad874 100644
--- a/ryzom/client/src/r2/instance_map_deco.cpp
+++ b/ryzom/client/src/r2/instance_map_deco.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/instance_map_deco.h b/ryzom/client/src/r2/instance_map_deco.h
index 9be099c19..dd7c719e4 100644
--- a/ryzom/client/src/r2/instance_map_deco.h
+++ b/ryzom/client/src/r2/instance_map_deco.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/prim_render.cpp b/ryzom/client/src/r2/prim_render.cpp
index f4b6cb8a9..93f610377 100644
--- a/ryzom/client/src/r2/prim_render.cpp
+++ b/ryzom/client/src/r2/prim_render.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/tool_select_move.cpp b/ryzom/client/src/r2/tool_select_move.cpp
index d16b45ced..e23d969eb 100644
--- a/ryzom/client/src/r2/tool_select_move.cpp
+++ b/ryzom/client/src/r2/tool_select_move.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/session_browser.cpp b/ryzom/client/src/session_browser.cpp
index 6d80c55cb..7b29f3023 100644
--- a/ryzom/client/src/session_browser.cpp
+++ b/ryzom/client/src/session_browser.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/session_browser_impl.cpp b/ryzom/client/src/session_browser_impl.cpp
index 9f3cc77a9..08a5dba3a 100644
--- a/ryzom/client/src/session_browser_impl.cpp
+++ b/ryzom/client/src/session_browser_impl.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index c553f7c57..971d808b3 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2017  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/timed_fx_manager.cpp b/ryzom/client/src/timed_fx_manager.cpp
index 6f46d6712..c42928127 100644
--- a/ryzom/client/src/timed_fx_manager.cpp
+++ b/ryzom/client/src/timed_fx_manager.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index 5c14bf82e..a09256703 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/crypt.cpp b/ryzom/common/src/game_share/crypt.cpp
index 1416cac52..5a2e99b9c 100644
--- a/ryzom/common/src/game_share/crypt.cpp
+++ b/ryzom/common/src/game_share/crypt.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/mirrored_data_set.cpp b/ryzom/common/src/game_share/mirrored_data_set.cpp
index 8db024784..61c7dc08b 100644
--- a/ryzom/common/src/game_share/mirrored_data_set.cpp
+++ b/ryzom/common/src/game_share/mirrored_data_set.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/object.cpp b/ryzom/common/src/game_share/object.cpp
index bb92c4936..51e5e3ef6 100644
--- a/ryzom/common/src/game_share/object.cpp
+++ b/ryzom/common/src/game_share/object.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/object.h b/ryzom/common/src/game_share/object.h
index 806d790aa..5b8c1c45d 100644
--- a/ryzom/common/src/game_share/object.h
+++ b/ryzom/common/src/game_share/object.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/rm_family.cpp b/ryzom/common/src/game_share/rm_family.cpp
index 5351b00b7..cae184117 100644
--- a/ryzom/common/src/game_share/rm_family.cpp
+++ b/ryzom/common/src/game_share/rm_family.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/rm_family.h b/ryzom/common/src/game_share/rm_family.h
index 9f9048531..627969214 100644
--- a/ryzom/common/src/game_share/rm_family.h
+++ b/ryzom/common/src/game_share/rm_family.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/roles.cpp b/ryzom/common/src/game_share/roles.cpp
index 578096b44..f4471183a 100644
--- a/ryzom/common/src/game_share/roles.cpp
+++ b/ryzom/common/src/game_share/roles.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/roles.h b/ryzom/common/src/game_share/roles.h
index 8b6dfd5b2..226a4d3c6 100644
--- a/ryzom/common/src/game_share/roles.h
+++ b/ryzom/common/src/game_share/roles.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/server_animation_module.cpp b/ryzom/common/src/game_share/server_animation_module.cpp
index 3c3276130..634d518c3 100644
--- a/ryzom/common/src/game_share/server_animation_module.cpp
+++ b/ryzom/common/src/game_share/server_animation_module.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_function.cpp b/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
index f62a5a244..e43561da1 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/timer.h b/ryzom/common/src/game_share/timer.h
index 1659464fa..8f7ed63dd 100644
--- a/ryzom/common/src/game_share/timer.h
+++ b/ryzom/common/src/game_share/timer.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/utils.h b/ryzom/common/src/game_share/utils.h
index a534b156b..cb22574a4 100644
--- a/ryzom/common/src/game_share/utils.h
+++ b/ryzom/common/src/game_share/utils.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/visual_slot_manager.h b/ryzom/common/src/game_share/visual_slot_manager.h
index 135e729a8..de1a5634a 100644
--- a/ryzom/common/src/game_share/visual_slot_manager.h
+++ b/ryzom/common/src/game_share/visual_slot_manager.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp b/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
index 6bb81f70f..3ba0d9bf3 100644
--- a/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
+++ b/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp b/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
index e1a52d887..24d2bec98 100644
--- a/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
index b4def1a14..9d3b4df65 100644
--- a/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
index 6c4285d46..6f32fbd8c 100644
--- a/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/leveldesign/mp_generator/main.cpp b/ryzom/tools/leveldesign/mp_generator/main.cpp
index 150807f5c..f265ccc05 100644
--- a/ryzom/tools/leveldesign/mp_generator/main.cpp
+++ b/ryzom/tools/leveldesign/mp_generator/main.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
index 0140452b5..c57536fd3 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp b/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
index 3062878ed..f5c3971d9 100644
--- a/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
+++ b/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://www.ryzomcore.org/>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/translation_tools/main.cpp b/ryzom/tools/translation_tools/main.cpp
index 4f65df260..dc91079f3 100644
--- a/ryzom/tools/translation_tools/main.cpp
+++ b/ryzom/tools/translation_tools/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/studio/src/plugins/bnp_manager/bnp_manager_window.cpp b/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
index 9a4af0cd5..5dc19ff8f 100644
--- a/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
+++ b/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
@@ -1,6 +1,9 @@
 // Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2011  Roland WINKLMEIER <roland.m.winklmeier@gmail.com>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/studio/src/plugins/core/general_settings_page.cpp b/studio/src/plugins/core/general_settings_page.cpp
index 6fb51b128..af2ede1b7 100644
--- a/studio/src/plugins/core/general_settings_page.cpp
+++ b/studio/src/plugins/core/general_settings_page.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/studio/src/plugins/georges_editor/georges_editor_form.cpp b/studio/src/plugins/georges_editor/georges_editor_form.cpp
index 009d2a6f0..89d8dfd19 100644
--- a/studio/src/plugins/georges_editor/georges_editor_form.cpp
+++ b/studio/src/plugins/georges_editor/georges_editor_form.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp b/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
index 014b6c6ba..b6b6a8f92 100644
--- a/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
+++ b/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
@@ -3,8 +3,8 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/tool/attribution/annotate.py b/tool/attribution/annotate.py
index 80d530650..6029f9aeb 100644
--- a/tool/attribution/annotate.py
+++ b/tool/attribution/annotate.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019  Jan BOON <jan.boon@kaetemi.be>
+# Copyright (C) 2019-2020  Jan BOON <jan.boon@kaetemi.be>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@ from datetime import datetime
 from pathlib import Path
 
 from git import Repo
-repo = Repo("../../..")
+repo = Repo("../..")
 
 # Mapping for author short name to full display name
 authors = { }
@@ -83,6 +83,7 @@ authors["etrange"] = "StudioEtrange <nomorgan@gmail.com>"
 authors["sircotare"] = "SirCotare"
 authors["rolandw"] = "Roland WINKLMEIER <roland.m.winklmeier@gmail.com>"
 authors["thibg"] = "Thibaut GIRKA (ThibG) <thib@sitedethib.com>" # LibVR support
+authors["xtarsia"] = "Xtarsia"
 
 # Mapping from git author name to short name, dash to ignore author
 short_authors = { }
@@ -164,6 +165,8 @@ short_authors["cemycc <cemycc@gmail.com>"] = "cemycc"
 short_authors["cemycc"] = "cemycc"
 short_authors["Thibaut Girka <thib@sitedethib.com>"] = "thibg"
 short_authors["Thibaut Girka (ThibG)"] = "thibg"
+short_authors["Xtarsia <69606701+Xtarsia@users.noreply.github.com>"] = "xtarsia"
+short_authors["Xtarsia"] = "xtarsia"
 # short_authors["\"picomancer ext:(%22) <pico-bitbucketpub-4mcdxm39-onlyham@picomancer.com>"] = "-"
 # short_authors["Quitta"] = "-"
 # short_authors["Krolock"] = "-"
@@ -206,12 +209,12 @@ override_author["dc734ed66226b257becae9fcd140898e14510e6a"] = "-" # Header clean
 
 # Exclude some paths
 exclude_paths = { }
-exclude_paths["code/nel/3rdparty"] = True
-exclude_paths["code/nel/src/3d/driver/opengl/GL"] = True
-exclude_paths["code/nel/src/3d/driver/opengl/EGL"] = True
-exclude_paths["code/nel/src/3d/driver/opengl/GLES"] = True
-exclude_paths["code/nel/src/3d/driver/opengl/KHR"] = True
-exclude_paths["code/studio/src/3rdparty"] = True
+exclude_paths["nel/3rdparty"] = True
+exclude_paths["nel/src/3d/driver/opengl/GL"] = True
+exclude_paths["nel/src/3d/driver/opengl/EGL"] = True
+exclude_paths["nel/src/3d/driver/opengl/GLES"] = True
+exclude_paths["nel/src/3d/driver/opengl/KHR"] = True
+exclude_paths["studio/src/3rdparty"] = True
 
 # Programmatical remappings
 def remap_author(blob, commit, author):
@@ -234,7 +237,7 @@ def remap_author(blob, commit, author):
 		short_author = "winch_gate"
 	if short_author == "sircotare" and authored_date.year >= 2012:
 		short_author = "winch_gate"
-	if short_author == "inky":
+	if short_author == "inky" and authored_date.year < 2020:
 		short_author = "winch_gate"
 	if "feature-export-assimp" in commit.message and authored_date.year <= 2015:
 		# Project paid for by Winch Gate
@@ -334,7 +337,7 @@ def rewrite_cpp(path, copyright_oldest, copyright_newest, copyright_lines):
 	# Everything before the first "// Copyright" remains intact
 	# Parse existing notices, merge with lists, track which one is first
 	# Write out new copyright and modification notices
-	contents = Path("../../../" + path).read_text()
+	contents = Path("../../" + path).read_text()
 	content_start = contents.find("// This program is free software")
 	if content_start < 0:
 		header_not_found[path] = True
@@ -431,7 +434,7 @@ def rewrite_cpp(path, copyright_oldest, copyright_newest, copyright_lines):
 	new_contents = contents[0:copyright_start] + new_statement + contents[content_start:]
 	if contents != new_contents:
 		print(new_statement)
-		Path("../../../" + path).write_text(new_contents)
+		Path("../../" + path).write_text(new_contents)
 
 def process_cpp(cpp_entry):
 	print(cpp_entry.path)

From 38e5dfe00711f93da4589629739bc25a44e554df Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 06:19:02 +0800
Subject: [PATCH 090/292] Stricter UTF-8

---
 nel/src/misc/utf_string_view.cpp | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index d1239ae43..222265e91 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -178,8 +178,13 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 	const uint8 **pp = reinterpret_cast<const uint8 **>(addr);
 	u32char c0 = **pp;
 	++(*pp);
-	if ((c0 & 0xC0) == 0xC0)
+	if (c0 >= 0x80)
 	{
+		if (c0 < 0xC0)
+		{
+			// Replacement character �
+			return 0xFFFD;
+		}
 		uint8 cx = **pp;
 		if ((cx & 0xC0) == 0x80)
 		{
@@ -206,6 +211,11 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 							c0 <<= 6;
 							c0 |= (cx & 0x3F); // 22 bits now (17 - 1 + 6), 3-byte encoding
 						}
+						else
+						{
+							// Replacement character �
+							return 0xFFFD;
+						}
 					}
 					else if ((c0 & 0xFC00) == 0xD800) // Higher bits of nutcase UTF-16 encoded as UTF-8
 					{
@@ -222,10 +232,30 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 							c0 |= (c1 & 0x03FF);
 							c0 += 0x10000;
 						}
+						else
+						{
+							// Replacement character �
+							return 0xFFFD;
+						}
 					}
+					else if ((c0 & 0xFC00) == 0xDC00) // Lower bits of nutcase UTF-16 encoded as UTF-8
+					{
+						// Replacement character �
+						return 0xFFFD;
+					}
+				}
+				else
+				{
+					// Replacement character �
+					return 0xFFFD;
 				}
 			}
 		}
+		else
+		{
+			// Replacement character �
+			return 0xFFFD;
+		}
 	}
 	return c0;
 }

From 182a9173388afd844385900e032c86f5a36fa2fd Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 06:37:52 +0800
Subject: [PATCH 091/292] Make control characters printable

---
 nel/src/3d/font_manager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index 9e954ac1f..da8573ef7 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -146,6 +146,8 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		{
 			// Creating font
 			k.Char = *it;
+			if (k.Char < 0x20)
+				k.Char += 0x2400;
 			k.FontGenerator = fontGen;
 			k.Size = fontSize;
 			k.Embolden = embolden;
@@ -300,6 +302,8 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 	{
 		// Creating font
 		k.Char = *it;
+		if (k.Char < 0x20)
+			k.Char += 0x2400;
 		k.FontGenerator = fontGen;
 		k.Size = fontSize;
 		k.Embolden = embolden;

From 0bd43913e16e7e26b7dc133aff4617e9d09087d1 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 06:56:03 +0800
Subject: [PATCH 092/292] Stricter UTF-8

---
 nel/src/misc/utf_string_view.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 222265e91..17dbaea58 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -49,7 +49,7 @@ NL_FORCE_INLINE void appendUtf8(std::string &str, u32char c)
 		str += (char)((c & 0x0FC0) >> 6) | 0x80;
 		str += (char)(c & 0x3F) | 0x80;
 	}
-	else
+	else if (c < 0x110000)
 	{
 		// Encode as 4 bytes
 		str += (char)((c & 0x1C0000) >> 18) | 0xF0;
@@ -57,6 +57,11 @@ NL_FORCE_INLINE void appendUtf8(std::string &str, u32char c)
 		str += (char)((c & 0x0FC0) >> 6) | 0x80;
 		str += (char)(c & 0x3F) | 0x80;
 	}
+	else
+	{
+		// Replacement character �
+		str += "\xEF\xB\xBD";
+	}
 }
 
 void CUtfStringView::append(std::string &str, u32char c)
@@ -175,6 +180,7 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 {
 	// Decode UTF-8
 	// This implementation makes no attempt at fixing bad encoding, except for bad UTF-16 surrogate pairs
+	// Invalid characters are replaced with the replacement character
 	const uint8 **pp = reinterpret_cast<const uint8 **>(addr);
 	u32char c0 = **pp;
 	++(*pp);
@@ -209,7 +215,12 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 							++(*pp);
 							c0 &= 0xFFFF; // Drop first bit
 							c0 <<= 6;
-							c0 |= (cx & 0x3F); // 22 bits now (17 - 1 + 6), 3-byte encoding
+							c0 |= (cx & 0x3F); // 22 bits now (17 - 1 + 6), 4-byte encoding
+							if (c0 >= 0x110000)
+							{
+								// Replacement character �
+								return 0xFFFD;
+							}
 						}
 						else
 						{

From 47c0c8cc074b9a424789008476da3d59380773e3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 10:21:01 +0800
Subject: [PATCH 093/292] Fix utf iterator ptr

---
 nel/include/nel/misc/utf_string_view.h | 39 ++++++++++++--------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index ab8a25a58..0aac8d2c3 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -71,29 +71,27 @@ public:
 	{
 	public:
 		inline void operator++()
-		{ 
-			m_Char = m_View.m_Iterator(&m_Addr);
-			if ((ptrdiff_t)m_Addr > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
-			{
-				m_Addr = 0;
-				m_Char = 0;
-			}
+		{
+			if ((ptrdiff_t)m_Next > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
+				m_Next = (void *)((ptrdiff_t)m_View.m_Str + m_View.m_Size);
+			m_Addr = m_Next;
+			m_Char = m_View.m_Iterator(&m_Next);
 		}
 		inline void operator+=(ptrdiff_t a)
 		{
-			while (m_Addr)
+			while ((ptrdiff_t)m_Addr < ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
 			{
 				++(*this);
 			}
 		}
 		inline bool operator!=(const const_iterator &o) const { return m_Addr != o.m_Addr; }
 		inline bool operator==(const const_iterator &o) const { return m_Addr == o.m_Addr; }
-		inline const u32char &operator*() const {  return m_Char; }
+		inline const u32char &operator*() const { return m_Char; }
 		const_iterator() : m_View(*(CUtfStringView *)NULL), m_Addr(NULL), m_Char(0) { }
 
-		const_iterator &operator=(const const_iterator &other) 
-		{  
-			if(this == &other) return *this;
+		const_iterator &operator=(const const_iterator &other)
+		{
+			if (this == &other) return *this;
 			this->~const_iterator();
 			return *new(this) const_iterator(other);
 		}
@@ -101,23 +99,22 @@ public:
 		const void *ptr() const { return m_Addr; }
 	private:
 		friend class CUtfStringView;
-		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Char(addr ? view.m_Iterator(&m_Addr) : 0)
-		{ 
-			if ((ptrdiff_t)m_Addr > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
-			{
-				m_Addr = 0;
-				m_Char = 0;
-			}
+		inline const_iterator(const CUtfStringView &view, const void *addr) : m_View(view), m_Addr(addr), m_Next(addr), m_Char(view.m_Iterator(&m_Next))
+		{
+			if ((ptrdiff_t)m_Next > ((ptrdiff_t)m_View.m_Str + m_View.m_Size))
+				m_Next = (void *)((ptrdiff_t)m_View.m_Str + m_View.m_Size);
 		}
+		inline const_iterator(const CUtfStringView &view) : m_View(view), m_Addr((char *)view.m_Str + view.m_Size), m_Next((char *)view.m_Str + view.m_Size + 1), m_Char(0) { }
 		const CUtfStringView &m_View;
-		const void *m_Addr; // Next address
+		const void *m_Addr; // Current address
+		const void *m_Next; // Next address
 		u32char m_Char;
 	};
 
 	typedef const_iterator iterator;
 
 	iterator begin() const { return iterator(*this, m_Str); }
-	inline iterator end() const { return iterator(*this, NULL); }
+	inline iterator end() const { return iterator(*this); }
 
 	/// Largest possible number of characters in this string.
 	/// Number of actual characters may be less or equal.

From ff49b89b73b0f04273eabf995b41af321ecddc0c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 10:59:21 +0800
Subject: [PATCH 094/292] Fix identity title, kaetemi/ryzomclassic#170

---
 .../src/interface_v3/interface_manager.cpp    | 145 +++++++++++-------
 1 file changed, 91 insertions(+), 54 deletions(-)

diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index d03412c35..cbfb9ba57 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -335,97 +335,134 @@ public:
 			{
 				++it;
 				if (it == inputString.end())
+				{
+					formatedResult += '$';
+					--it;
 					break;
+				}
 
 				switch(*it)
 				{
 				case 't': // add text ID
+				{
 					formatedResult += paramString;
 					break;
-
+				}
 				case 'P':
 				case 'p':  // add player name
-					if (ClientCfg.Local)
+				{
+					if (ClientCfg.Local || !UserEntity)
 					{
 						if (*it == 'P') formatedResult += "PLAYER";
 						else formatedResult += "Player";
 					}
 					else
 					{
-						if(UserEntity)
-						{
-							std::string name = UserEntity->getEntityName().toUtf8();
-							if (*it == 'P') name = toUpper(name);
-							formatedResult += name;
-						}
+						std::string name = UserEntity->getEntityName().toUtf8();
+						if (*it == 'P') name = toUpper(name);
+						formatedResult += name;
 					}
 					break;
-					//
+				}
 				case 's':
 				case 'b': // add bot name
+				{
+					string botName;
+					bool womanTitle = false;
+					if (ClientCfg.Local)
 					{
-						string botName;
-						bool womanTitle = false;
-						if (ClientCfg.Local)
-						{
-							botName = "NPC";
-						}
-						else
+						botName = "NPC";
+					}
+					else
+					{
+						CLFECOMMON::TCLEntityId trader = CLFECOMMON::INVALID_SLOT;
+						if(UserEntity)
+							trader = UserEntity->trader();
+						if (trader != CLFECOMMON::INVALID_SLOT)
 						{
-							CLFECOMMON::TCLEntityId trader = CLFECOMMON::INVALID_SLOT;
-							if(UserEntity)
-								trader = UserEntity->trader();
-							if (trader != CLFECOMMON::INVALID_SLOT)
+							CEntityCL *entity = EntitiesMngr.entity(trader);
+							if (entity != NULL)
 							{
-								CEntityCL *entity = EntitiesMngr.entity(trader);
-								if (entity != NULL)
+								uint32 nDBid = entity->getNameId();
+								if (nDBid != 0)
+								{
+									STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
+									pSMC->getString(nDBid, botName);
+								}
+								else
 								{
-									uint32 nDBid = entity->getNameId();
-									if (nDBid != 0)
-									{
-										STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-										pSMC->getString(nDBid, botName);
-									}
-									else
-									{
-										botName = entity->getDisplayName().toUtf8();
-									}
-									CCharacterCL *pChar = dynamic_cast<CCharacterCL*>(entity);
-									if (pChar != NULL)
-										womanTitle = pChar->getGender() == GSGENDER::female;
+									botName = entity->getDisplayName().toUtf8();
 								}
+								CCharacterCL *pChar = dynamic_cast<CCharacterCL*>(entity);
+								if (pChar != NULL)
+									womanTitle = pChar->getGender() == GSGENDER::female;
 							}
 						}
-						// get the title translated
-						ucstring sTitleTranslated = botName; // FIXME: UTF-8
-						CStringPostProcessRemoveName spprn;
-						spprn.Woman = womanTitle;
-						spprn.cbIDStringReceived(sTitleTranslated);
+					}
+					// get the title translated
+					ucstring sTitleTranslated = botName; // FIXME: UTF-8
+					CStringPostProcessRemoveName spprn;
+					spprn.Woman = womanTitle;
+					spprn.cbIDStringReceived(sTitleTranslated);
 
-						botName = CEntityCL::removeTitleAndShardFromName(botName).toUtf8();
+					botName = CEntityCL::removeTitleAndShardFromName(botName).toUtf8();
 
-						// short name (with no title such as 'guard', 'merchant' ...)
-						if (*it == 's')
+					// short name (with no title such as 'guard', 'merchant' ...)
+					if (*it == 's')
+					{
+						// But if there is no name, display only the title
+						if (botName.empty())
+							botName = sTitleTranslated.toUtf8();
+					}
+					else
+					{
+						// Else we want the title !
+						if (!botName.empty())
+							botName += " ";
+						botName += sTitleTranslated.toUtf8();
+					}
+
+					formatedResult += botName;
+					break;
+				}
+				case '\'': // 's and 'S -> Potato’s Identity and TOMATOES’ IDENTITY
+				{
+					std::string::const_iterator it2 = it;
+					++it2;
+					if (it2 == inputString.end())
+					{
+						formatedResult += "$'";
+					}
+					else
+					{
+						it = it2;
+						if (*it == 's' || *it == 'S')
 						{
-							// But if there is no name, display only the title
-							if (botName.empty())
-								botName = sTitleTranslated.toUtf8();
+							if (formatedResult.size() && (formatedResult[formatedResult.size() - 1] == 's' || formatedResult[formatedResult.size() - 1] == 'S'))
+							{
+								formatedResult += "\xE2\x80\x99"; // RIGHT SINGLE QUOTATION MARK
+							}
+							else
+							{
+								formatedResult += "\xE2\x80\x99"; // RIGHT SINGLE QUOTATION MARK
+								formatedResult += *it;
+							}
 						}
 						else
 						{
-							// Else we want the title !
-							if (!botName.empty())
-								botName += " ";
-							botName += sTitleTranslated.toUtf8();
+							--it;
+							formatedResult += "$'";
 						}
-
-						formatedResult += botName;
 					}
 					break;
-					default:
-						formatedResult += '$';
+				}
+				default:
+				{
+					formatedResult += '$';
+					--it;
 					break;
 				}
+				}
 				++it;
 			}
 			else

From 7812ccafc18e30c4b26a98436bd5e6e9417ced2d Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 12:25:53 +0800
Subject: [PATCH 095/292] Fix infinite loop

---
 ryzom/client/src/interface_v3/chat_window.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 237ffdd8b..3b3063879 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -208,7 +208,8 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 {
 	if (!_Chat)
 	{
-		nlwarning("<CChatWindow::displayMessage> There's no global chat");
+		if (msg.toUtf8() != "WRN: <CChatWindow::displayMessage> There's no global chat")
+			nlwarning("<CChatWindow::displayMessage> There's no global chat");
 		return;
 	}
 	CGroupList *gl;
@@ -541,7 +542,8 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 {
 	if (!_Chat)
 	{
-		nlwarning("<CChatGroupWindow::displayMessage> There's no global chat");
+		if (msg.toUtf8() != "WRN: <CChatGroupWindow::displayMessage> There's no global chat")
+			nlwarning("<CChatGroupWindow::displayMessage> There's no global chat");
 		return;
 	}
 

From 39fc4895d2d003b9c63ff8e0181c864862d82795 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 13:20:02 +0800
Subject: [PATCH 096/292] Fix to work with saner new behaviour

---
 ryzom/client/src/interface_v3/chat_window.cpp | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 3b3063879..8d7551803 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -1093,10 +1093,7 @@ CChatWindow *CChatWindowManager::createChatWindow(const CChatWindowDesc &desc)
 		if (desc.Id.empty())
 			_WindowID++;
 
-		if (desc.Localize)
-			_ChatWindowMap[CI18N::get(desc.Title.toString())] = w;
-		else
-			_ChatWindowMap[desc.Title] = w;
+		_ChatWindowMap[desc.Title] = w;
 
 		w->setAHOnActive(desc.AHOnActive);
 		w->setAHOnActiveParams(desc.AHOnActiveParams);
@@ -1135,10 +1132,7 @@ CChatWindow *CChatWindowManager::createChatGroupWindow(const CChatWindowDesc &de
 		if (desc.Id.empty())
 			_WindowID++;
 
-		if (desc.Localize)
-			_ChatWindowMap[CI18N::get(desc.Title.toString())] = w;
-		else
-			_ChatWindowMap[desc.Title] = w;
+		_ChatWindowMap[desc.Title] = w;
 
 		w->setAHOnActive(desc.AHOnActive);
 		w->setAHOnActiveParams(desc.AHOnActiveParams);
@@ -1185,7 +1179,7 @@ void CChatWindowManager::removeChatWindow(const ucstring &title)
 	TChatWindowMap::iterator it = _ChatWindowMap.find(title);
 	if (it == _ChatWindowMap.end())
 	{
-		nlwarning("unknwown window %s", title.toString().c_str());
+		nlwarning("Unknown chat window '%s'", title.toUtf8().c_str());
 		return;
 	}
 	it->second->deleteContainer();
@@ -1225,18 +1219,9 @@ bool CChatWindowManager::rename(const ucstring &oldName, const ucstring &newName
 	if (newWin != NULL) return false; // target window exists
 	TChatWindowMap::iterator it = _ChatWindowMap.find(oldName);
 	if (it == _ChatWindowMap.end()) return false;
-	if (newNameLocalize)
-	{
-		_ChatWindowMap[CI18N::get(newName.toString())] = it->second;
-		it->second->getContainer()->setLocalize(true);
-		it->second->getContainer()->setTitle(newName.toString());
-	}
-	else
-	{
-		_ChatWindowMap[newName] = it->second;
-		it->second->getContainer()->setLocalize(false);
-		it->second->getContainer()->setUCTitle(newName);
-	}
+	_ChatWindowMap[newName] = it->second;
+	it->second->getContainer()->setLocalize(false);
+	it->second->getContainer()->setTitle(newName.toUtf8());
 	_ChatWindowMap.erase(it);
 	return true;
 }

From 2a7bf997b9c4fe3b68134ebcc1b31834965689aa Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 15:06:12 +0800
Subject: [PATCH 097/292] Cleanup localization behaviour

---
 nel/include/nel/gui/view_text.h  |  11 +-
 nel/src/gui/ctrl_text_button.cpp |   7 +-
 nel/src/gui/group_container.cpp  |  32 ++---
 nel/src/gui/group_editbox.cpp    |   2 +-
 nel/src/gui/view_text.cpp        | 211 ++++++++++++++++++++-----------
 nel/src/gui/widget_manager.cpp   |   1 +
 6 files changed, 166 insertions(+), 98 deletions(-)

diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 7980e6427..69f9efca7 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -84,8 +84,10 @@ namespace NLGUI
 
 		/// Set
 
-		void setText(const std::string &text); //< Not localized. Use setHardText to localize strings starting with "ui". TODO: Add a Localize flag, like title in group container. HardText then simply sets localize to true.
+		void setText(const std::string &text);
+		void setTextLocalized(const std::string &text, bool localized);
 		void setTextAsUtf16 (const ucstring &text);
+		void setLocalized(bool localized);
 		void setFontName (const std::string &name);
 		void setFontSize (sint nFontSize, bool coef = true);
 		void setEmbolden (bool nEmbolden);
@@ -114,9 +116,10 @@ namespace NLGUI
 		void disableStringSelection();
 
 		/// Get
-		std::string		getText() const { return _Text; }
+		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
 		ucstring		getTextAsUtf16() const;
 		ucstring		getHardTextAsUtf16() const;
+		bool			isLocalized() const { return _Localized;  }
 		sint			getFontSize() const;
 		std::string		getFontName() const { return _FontName; }
 		bool			getEmbolden() 		{ return _Embolden; }
@@ -224,6 +227,7 @@ namespace NLGUI
 		REFLECT_EXPORT_START(CViewText, CViewBase)
 			REFLECT_STRING("text_raw", getText, setText);
 			REFLECT_STRING("hardtext", getHardText, setHardText);
+			REFLECT_BOOL ("localize", isLocalized, setLocalized);
 			// REFLECT_UCSTRING("uc_text", getTextAsUtf16, setTextAsUtf16); // Deprecate uc_ functions
 			REFLECT_UCSTRING("uc_hardtext", getHardTextAsUtf16, setHardTextAsUtf16);
 			REFLECT_UCSTRING("uc_hardtext_format", getTextAsUtf16, setTextFormatTagedAsUtf16); // FIXME: Name doesn't make sense
@@ -248,6 +252,7 @@ namespace NLGUI
 		std::string _HardText;
 		std::string _Text;
 		mutable sint _TextLength;
+		bool _Localized;
 		/// index of the computed String associated to this text control
 		uint _Index;
 		/// info on the computed String associated to this text control
@@ -443,6 +448,8 @@ namespace NLGUI
 		void setup ();
 		void setupDefault ();
 
+		void setTextLocalized(const std::string &text);
+
 		void setStringSelectionSkipingSpace(uint stringId, const std::string &text, sint charStart, sint charEnd);
 
 	//	void pushString(const ucstring &str, bool deleteSpaceAtStart = false);
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index c5571a4ca..3be6142e3 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -597,12 +597,7 @@ namespace NLGUI
 			if (prop)
 			{
 				const char *propPtr = prop;
-				std::string text;
-				if (NLMISC::startsWith(propPtr, "ui"))
-					text = CI18N::get(propPtr);
-				else
-					text = propPtr;
-				_ViewText->setText(text);
+				_ViewText->setTextLocalized(propPtr, true);
 			}
 		}
 
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 1416f5ee6..0740bd80f 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -2144,24 +2144,20 @@ namespace NLGUI
 		ptr = xmlGetProp (cur, (xmlChar*)"title");
 		if (ptr)
 		{
-			if (_Localize)	_TitleTextOpened = CI18N::get(string((const char*)ptr));
-			else			_TitleTextOpened = string((const char*)ptr);
-			if (_Localize)	_TitleTextClosed = CI18N::get(string((const char*)ptr));
-			else			_TitleTextClosed = string((const char*)ptr);
+			_TitleTextOpened = (const char *)ptr;
+			_TitleTextClosed = (const char *)ptr;
 		}
 
 		ptr = xmlGetProp (cur, (xmlChar*)"title_opened");
 		if (ptr)
 		{
-			if (_Localize)	_TitleTextOpened = CI18N::get(string((const char*)ptr));
-			else			_TitleTextOpened = string((const char*)ptr);
+			_TitleTextOpened = (const char*)ptr;
 		}
 
 		ptr = xmlGetProp (cur, (xmlChar*)"title_closed");
 		if (ptr)
 		{
-			if (_Localize)	_TitleTextClosed = CI18N::get(string((const char*)ptr));
-			else			_TitleTextClosed = string((const char*)ptr);
+			_TitleTextClosed = (const char *)ptr;
 		}
 
 		ptr = xmlGetProp (cur, (xmlChar*)"header_active");
@@ -3950,8 +3946,14 @@ namespace NLGUI
 	void CGroupContainer::setLocalize(bool localize) 
 	{ 
 		_Localize = localize; 
-		setTitledOpenedViewText(); 
-		setTitledClosedViewText(); 
+		if (_TitleOpened)
+		{
+			_TitleOpened->setLocalized(localize);
+		}
+		if (_TitleClosed)
+		{
+			_TitleClosed->setLocalized(localize);
+		}
 		invalidateCoords();
 	}
 
@@ -4001,10 +4003,7 @@ namespace NLGUI
 	{
 		if (_TitleOpened != NULL)
 		{
-			if (_Localize && NLMISC::startsWith(_TitleTextOpened, "ui"))
-				_TitleOpened->setHardText(_TitleTextOpened);
-			else
-				_TitleOpened->setText(_TitleTextOpened);
+			_TitleOpened->setTextLocalized(_TitleTextOpened, _Localize);
 		}
 	}
 
@@ -4013,10 +4012,7 @@ namespace NLGUI
 	{
 		if (_TitleClosed != NULL)
 		{
-			if (_Localize && NLMISC::startsWith(_TitleTextClosed, "ui"))
-				_TitleClosed->setHardText(_TitleTextClosed);
-			else
-				_TitleClosed->setText(_TitleTextClosed);
+			_TitleClosed->setTextLocalized(_TitleTextClosed, _Localize);
 		}
 	}
 
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 799452b33..27084dd1b 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -1580,7 +1580,7 @@ namespace NLGUI
 
 		_ViewText->setParent( this );
 		_ViewText->setIdRecurse( "edit_text" );
-		_ViewText->setHardText( "" );
+		_ViewText->setTextLocalized( "", false );
 		_ViewText->setPosRef( Hotspot_ML );
 		_ViewText->setParentPosRef( Hotspot_ML );
 		addView( _ViewText );
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 87ebab92d..f96ac535d 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -111,6 +111,8 @@ namespace NLGUI
 		_ClampRight = true; // clamp on the right of the text
 		_OverflowText = "...";
 
+		_Localized = true;
+
 		_LetterColors = NULL;
 		_Setuped= false;
 		_AutoClampOffset = 0;
@@ -211,7 +213,7 @@ namespace NLGUI
 		_Index = 0xFFFFFFFF;
 
 		_ModulateGlobalColor= vt._ModulateGlobalColor;
-
+		_Localized = vt._Localized;
 
 		// remove previous lines
 		clearLines();
@@ -244,6 +246,11 @@ namespace NLGUI
 
 	std::string CViewText::getTextProperty( const std::string &name ) const
 	{
+		if( name == "localize" )
+		{
+			return toString(_Localized);
+		}
+		else
 		if( name == "color" )
 		{
 			return toString( _Color );
@@ -418,6 +425,18 @@ namespace NLGUI
 
 	bool CViewText::setTextProperty( const std::string &name, const std::string &value )
 	{
+		if( name == "localize" )
+		{
+			bool b;
+			if (fromString(value, b))
+			{
+				_Localized = b;
+				setTextLocalized(_HardText.empty() ? _Text : _HardText); // FIXME: setCase?
+				_TextLength = 0;
+			}
+			return true;
+		}
+		else
 		if( name == "color" )
 		{
 			CRGBA c;
@@ -649,28 +668,19 @@ namespace NLGUI
 			return true;
 		}
 		else
+		if( name == "text" )
+		{
+			setTextLocalized(value); // FIXME: setCase?
+			_TextLength = 0;
+			invalidateContent();
+			return true;
+		}
+		else
 		if( name == "hardtext" )
 		{
-#if 1
-			if (NLMISC::startsWith(value, "ui"))
-			{
-				_Text = CI18N::get(value);
-				_TextLength = 0;
-				_HardText = value;
-			}
-			else
-			{
-				_Text = value;
-				_TextLength = 0;
-				_HardText.clear();
-			}
-#else
-			_Text = value;
+			_Localized = true;
+			setTextLocalized(value); // FIXME: setCase?
 			_TextLength = 0;
-			_HardText.clear();
-			if (NLMISC::startsWith(value, "ui"))
-				_HardText = _Text;
-#endif
 			invalidateContent();
 			return true;
 		}
@@ -705,6 +715,8 @@ namespace NLGUI
 
 	bool CViewText::serializeTextOptions( xmlNodePtr node ) const
 	{
+		xmlSetProp( node, BAD_CAST "localize", BAD_CAST toString( _Localized ).c_str() );
+
 		xmlSetProp( node, BAD_CAST "color", BAD_CAST toString( _Color ).c_str() );
 		xmlSetProp( node, BAD_CAST "global_color", BAD_CAST toString( _ModulateGlobalColor ).c_str() );
 
@@ -784,7 +796,7 @@ namespace NLGUI
 
 		serializeTextOptions( node );
 
-		xmlSetProp( node, BAD_CAST "hardtext", BAD_CAST _Text.c_str() );
+		xmlSetProp( node, BAD_CAST "text", BAD_CAST (_HardText.empty() ? _Text.c_str() : _HardText.c_str()) );
 		xmlSetProp( node, BAD_CAST "hardtext_format", BAD_CAST _HardTextFormat.c_str() );
 
 		return node;
@@ -795,6 +807,9 @@ namespace NLGUI
 	{
 		CXMLAutoPtr prop;
 
+		prop = xmlGetProp (cur, (xmlChar*)"localize");
+		if (prop) _Localized = convertBool((const char*)prop);
+
 		prop= (char*) xmlGetProp( cur, (xmlChar*)"color" );
 		_Color = CRGBA(255,255,255,255);
 		if (prop)
@@ -1000,18 +1015,8 @@ namespace NLGUI
 		if (prop)
 		{
 			const char *propPtr = prop;
-			if (NLMISC::startsWith(propPtr, "ui"))
-			{
-				_HardText = propPtr;
-				_Text = CI18N::get(propPtr);
-				_TextLength = 0;
-			}
-			else
-			{
-				_HardText.clear();
-				_Text = propPtr;
-				_TextLength = 0;
-			}
+			_Localized = true;
+			setTextLocalized(propPtr);
 			setCase(_Text, _CaseMode);
 			_TextLength = 0;
 		}
@@ -1427,49 +1432,109 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CViewText::setText(const std::string &text)
+	void CViewText::setTextLocalized(const std::string &text, bool localized)
 	{
-		_HardText.clear();
-		// common case: no special format, no case mode => easy cache test
-		if (_FormatTags.empty() && _CaseMode==CaseNormal)
+		if (localized != _Localized)
 		{
-			if (text != _Text)
-			{
-				_Text = text;
-				_TextLength = 0;
-				// no need to call  "setCase (_Text, _CaseMode);"  since CaseNormal:
-				invalidateContent ();
-			}
+			_Localized = localized;
+
+			// Always recompute if localization and text changed
+			setTextLocalized(text);
+			setCase(_Text, _CaseMode);
+			_TextLength = 0;
+			invalidateContent();
 		}
 		else
 		{
-			// if the view text had some format before, no choice, must recompute all
-			if (!_FormatTags.empty())
+			setText(text);
+		}
+	}
+
+	// ***************************************************************************
+	void CViewText::setLocalized(bool localized)
+	{
+		if (localized != _Localized)
+		{
+			const std::string &text = _HardText.empty() ? _Text : _HardText;
+			_Localized = localized;
+			if (!text.empty() && NLMISC::startsWith(text, "ui"))
 			{
-				_Text = text;
-				setCase (_Text, _CaseMode);
+				setTextLocalized(text);
+				setCase(_Text, _CaseMode);
 				_TextLength = 0;
-				invalidateContent ();
-			}
-			// else test if after the case change the cache succeed
-			else
-			{
-				// compute the temp cased text
-				std::string tempText = text;
-				setCase (tempText, _CaseMode);
-				if (tempText != _Text)
-				{
-					_Text = tempText;
-					_TextLength = 0;
-					invalidateContent();
-				}
+				invalidateContent();
 			}
 		}
 
-		// clear format tags if any
-		_FormatTags.clear();
+		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(getText(), "ui"))) == (_HardText.empty() == _Text.empty())));
+	}
+
+	// ***************************************************************************
+	void CViewText::setTextLocalized(const std::string &text)
+	{
+		if (_Localized && NLMISC::startsWith(text, "ui"))
+		{
+			_HardText = text;
+			_Text = CI18N::get(text);
+		}
+		else
+		{
+			_Text = text;
+			_HardText.clear();
+		}
 	}
 
+	// ***************************************************************************
+    void CViewText::setText(const std::string &text)
+    {
+	    // common case: no special format, no case mode => easy cache test
+	    if (_FormatTags.empty() && _CaseMode == CaseNormal)
+	    {
+		    if (_HardText.empty() ? text != _Text : text != _HardText)
+		    {
+			    setTextLocalized(text);
+			    _TextLength = 0;
+			    // no need to call  "setCase (_Text, _CaseMode);"  since CaseNormal:
+			    invalidateContent();
+		    }
+	    }
+	    else
+	    {
+		    // if the view text had some format before, no choice, must recompute all
+		    if (!_FormatTags.empty())
+		    {
+			    setTextLocalized(text);
+			    setCase(_Text, _CaseMode);
+			    _TextLength = 0;
+			    invalidateContent();
+		    }
+		    // else test if after the case change the cache succeed
+		    else
+		    {
+			    // compute the temp cased text
+			    std::string holdText, holdHardText;
+			    holdText.swap(_Text);
+			    holdHardText.swap(_HardText);
+			    setTextLocalized(text);
+			    setCase(_Text, _CaseMode);
+			    if (holdText != _Text)
+			    {
+				    _TextLength = 0;
+				    invalidateContent();
+			    }
+			    else
+			    {
+				    holdText.swap(_Text);
+			    }
+		    }
+	    }
+
+		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(text, "ui"))) == (_HardText.empty() == _Text.empty())));
+
+	    // clear format tags if any
+	    _FormatTags.clear();
+    }
+
 	// ***************************************************************************
 	void CViewText::setFontSizing(const std::string &chars, const std::string &fallback)
 	{
@@ -2396,15 +2461,12 @@ namespace NLGUI
 	// ***************************************************************************
 	void CViewText::setHardText (const std::string &ht)
 	{
-		if (NLMISC::startsWith(ht, "ui"))
-		{
-			setText(CI18N::get(ht));
-			_HardText = ht;
-		}
-		else
+		if (!_Localized)
 		{
-			setText(ht);
+			setText(std::string());
+			_Localized = true;
 		}
+		setText(ht);
 	}
 
 	// ***************************************************************************
@@ -3367,6 +3429,7 @@ namespace NLGUI
 			// Copy to Text (preserve Memory)
 			contReset(_Text);
 			_Text = tempText;
+			_HardText.clear();
 			_TextLength = 0;
 
 			CInterfaceGroup *parent = getParent();
@@ -3477,6 +3540,7 @@ namespace NLGUI
 			// Copy to Text (preserve Memory)
 			contReset(_Text);
 			_Text = tempText;
+			_HardText.clear();
 			_TextLength = 0;
 			invalidateContent ();
 		}
@@ -3560,6 +3624,11 @@ namespace NLGUI
 		#define SERIAL_UINT(val) { uint32 tmp = (uint32) val; f.serial(tmp); val = (uint) tmp; }
 		#define SERIAL_SINT(val) { sint32 tmp = (sint32) val; f.serial(tmp); val = (sint) tmp; }
 		CViewBase::serial(f);
+
+		int version = f.serialVersion(101);
+		nlassert(version >= 100);
+
+		f.serial(_Localized);
 		SERIAL_SINT(_FontSize);
 		SERIAL_UINT(_FontWidth);
 		SERIAL_UINT(_FontHeight);
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index 534a0cc1b..9ce889a95 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -1195,6 +1195,7 @@ namespace NLGUI
 					sint32 backupX = groupOver->getX();
 
 					// Copy all aspects to the view
+					vtDst->setLocalized (vtSrc->isLocalized());
 					vtDst->setText (vtSrc->getText());
 					vtDst->setFontSize (vtSrc->getFontSize());
 					vtDst->setColor (vtSrc->getColor());

From d238d2122bafb2d7b7949af39adc636b974369ad Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 30 Oct 2020 15:07:36 +0800
Subject: [PATCH 098/292] Cleanup localization behaviour

---
 ryzom/client/src/connection.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 4fafe3ebc..a491d5e57 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1021,7 +1021,7 @@ TInterfaceState globalMenu()
 				// Display the firewall alert string
 				CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:outgame:connecting:title"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiFirewallAlert") + "...");
+					pVT->setTextLocalized("uiFirewallAlert", true);
 
 				// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
 				nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@@ -1237,8 +1237,8 @@ TInterfaceState globalMenu()
 					if (pVT != NULL)
 					{
 						pVT->setMultiLine( true );
-						pVT->setText(CI18N::get("uiFirewallFail")+".\n"+
-									  CI18N::get("uiFirewallAlert")+".");
+						pVT->setTextLocalized(CI18N::get("uiFirewallFail")+".\n"+
+									  CI18N::get("uiFirewallAlert")+".", false);
 					}
 				}
 			}
@@ -1319,16 +1319,16 @@ public:
 			if (pVT == NULL) return;
 
 			if (rCS.Name.empty())
-				pVT->setText(CI18N::get("uiEmptySlot"));
+				pVT->setTextLocalized("uiEmptySlot", true);
 			else
-				pVT->setText(rCS.Name.toUtf8());
+				pVT->setTextLocalized(rCS.Name.toUtf8(), false);
 		}
 		// 5 slots
 		for (; i < 5; ++i)
 		{
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sPath+":text"+NLMISC::toString(i)));
 			if (pVT == NULL) return;
-			pVT->setText(CI18N::get("uiEmptySlot"));
+			pVT->setTextLocalized("uiEmptySlot", true);
 		}
 	}
 };
@@ -2171,7 +2171,7 @@ public:
 				if (pVT != NULL)
 				{
 					std::string str = Mainlands[i].Name.toUtf8() + " " + Mainlands[i].Description.toUtf8();
-					pVT->setText(str);
+					pVT->setTextLocalized(str, false);
 				}
 
 				// Add to the list
@@ -2311,7 +2311,7 @@ public:
 			CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name"));
 			if (pVT != NULL)
 			{
-				pVT->setText(name.toUtf8());
+				pVT->setTextLocalized(name.toUtf8(), false);
 			}
 
 			CCtrlBase *pBut = pNewLine->getCtrl("but");
@@ -2559,7 +2559,7 @@ static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName
 	{
 		CViewText* viewText = dynamic_cast<CViewText*>(result);
 		if(viewText)
-			viewText->setText(text.toUtf8());
+			viewText->setTextLocalized(text.toUtf8(), false);
 		CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 		if(editBox)
 			editBox->setInputStringAsUtf16(text);
@@ -2682,7 +2682,7 @@ class CAHScenarioControl : public IActionHandler
 			CViewText* viewText = dynamic_cast<CViewText*>(result);
 			if(viewText)
 			{
-				viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName"):CI18N::get("uiR2EDScenarioFileName"));
+				viewText->setTextLocalized(R2::getEditor().isInitialized() ? "uiR2EDScenarioName" : "uiR2EDScenarioFileName", true);
 			}
 		}
 
@@ -2712,7 +2712,7 @@ class CAHScenarioControl : public IActionHandler
 				CViewText* viewText= dynamic_cast<CViewText*>(result);
 
 				if(viewText)
-					viewText->setText("");
+					viewText->setText(std::string());
 			}
 		}
 		setScenarioInformation(scenarioWnd, "");
@@ -2748,7 +2748,7 @@ class CAHScenarioControl : public IActionHandler
 					CViewText *shardName = dynamic_cast<CViewText *>(toggleGr->getView("button_text"));
 					if (shardName)
 					{
-						shardName->setText(Mainlands[i].Name.toUtf8());
+						shardName->setTextLocalized(Mainlands[i].Name.toUtf8(), false);
 					}
 				}
 			}
@@ -2888,7 +2888,7 @@ class CAHScenarioInformation : public IActionHandler
 					scenarioName = scenarioName.substr(posScenarioName==0?posScenarioName:posScenarioName+1);
 					posScenarioName = scenarioName.find('/');
 				}
-				viewText->setText(scenarioName);
+				viewText->setTextLocalized(scenarioName, false);
 			}
 		}
 
@@ -3250,7 +3250,7 @@ class CAHLoadScenario : public IActionHandler
 			{
 				CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 				if (pVT != NULL)
-					pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
+					pVT->setTextLocalized("uiRingWarningFreeTrial", true);
 				CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 
 				return;
@@ -3331,7 +3331,7 @@ class CAHLoadScenario : public IActionHandler
 						{
 							CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 							if (pVT != NULL)
-								pVT->setText(CI18N::get("uiRingWarningFreeTrial"));
+								pVT->setTextLocalized("uiRingWarningFreeTrial", true);
 							CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 						}
 
@@ -3360,7 +3360,7 @@ class CAHLoadScenario : public IActionHandler
 										{
 											CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
 											if (pVT != NULL)
-												pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial"));
+												pVT->setTextLocalized("uiRingWarningInviteFreeTrial", true);
 											CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
 										}
 									}

From c061f3df3a707cbce417b140017c24998afb2ecd Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 03:32:50 +0800
Subject: [PATCH 099/292] Don't need this behaviour after all

---
 .../src/interface_v3/interface_manager.cpp    | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index cbfb9ba57..24ab75058 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -425,37 +425,6 @@ public:
 					formatedResult += botName;
 					break;
 				}
-				case '\'': // 's and 'S -> Potato’s Identity and TOMATOES’ IDENTITY
-				{
-					std::string::const_iterator it2 = it;
-					++it2;
-					if (it2 == inputString.end())
-					{
-						formatedResult += "$'";
-					}
-					else
-					{
-						it = it2;
-						if (*it == 's' || *it == 'S')
-						{
-							if (formatedResult.size() && (formatedResult[formatedResult.size() - 1] == 's' || formatedResult[formatedResult.size() - 1] == 'S'))
-							{
-								formatedResult += "\xE2\x80\x99"; // RIGHT SINGLE QUOTATION MARK
-							}
-							else
-							{
-								formatedResult += "\xE2\x80\x99"; // RIGHT SINGLE QUOTATION MARK
-								formatedResult += *it;
-							}
-						}
-						else
-						{
-							--it;
-							formatedResult += "$'";
-						}
-					}
-					break;
-				}
 				default:
 				{
 					formatedResult += '$';

From 13f99b393f96f46e11bea14d6be2c23a17cb7a5b Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 03:52:37 +0800
Subject: [PATCH 100/292] Reimplement setCase in purely UTF-8,
 kaetemi/ryzomclassic#172

---
 nel/include/nel/misc/common.h |  10 ++++
 nel/src/gui/string_case.cpp   | 108 +++++++++++++++++-----------------
 nel/src/misc/unicode.cpp      |  48 ++++++++++++---
 3 files changed, 103 insertions(+), 63 deletions(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 7c2cc2937..9ed33c8d8 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -240,6 +240,16 @@ std::string toUpper ( const char *str ); // UTF-8
 std::string	toUpper ( const std::string &str); // UTF-8
 void		toUpper ( char *str); // Ascii only
 
+/** Convert a single character in UTF-8 to upper or lowercase.
+* \param res Character is appended in UTF-8 into this string.
+* \param src Character is sourced from this UTF-8 string.
+* \param i Index in `str`, incremented by the number of bytes read.
+*/
+void appendToLower(std::string &res, const char *str, ptrdiff_t &i);
+void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i);
+void appendToUpper(std::string &res, const char *str, ptrdiff_t &i);
+void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i);
+
 
 /**
  *  Convert to an hexadecimal std::string
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index 801b2fc68..ced12e3ca 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -28,19 +28,19 @@
 
 namespace NLGUI
 {
-	inline bool isSeparator (u32char c)
+	inline bool isSeparator (char c)
 	{
-		return (c == (u32char)' ') || (c == (u32char)'\t') || (c == (u32char)'\n') || (c == (u32char)'\r');
+		return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r');
 	}
 
-	inline bool isEndSentence (u32char c, u32char lastChar)
+	inline bool isEndSentence (char c, char lastChar)
 	{
 		// Ex: One sentence. Another sentence.
 		//                  ^
 		// Counterexample: nevrax.com
 		//                       ^
-		return ((c == (u32char)' ') || (c == (u32char)'\n'))
-			&& (lastChar == (u32char)'.') || (lastChar == (u32char)'!') || (lastChar == (u32char)'?');
+		return ((c == ' ') || (c == '\n'))
+			&& (lastChar == '.') || (lastChar == '!') || (lastChar == '?');
 	}
 
 	void setCase(std::string &str, TCaseMode mode)
@@ -60,85 +60,83 @@ namespace NLGUI
 			break;
 		case CaseFirstStringLetterUp:
 		{
-			NLMISC::CUtfStringView sv(str);
 			std::string res;
-			res.reserve(sv.largestSize());
-			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			res.reserve(str.size() + (str.size() >> 2));
+			for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
 			{
-				u32char c = *it;
-				if (c < 0x10000)
+				char c = str[i];
+				if (!isSeparator(c))
 				{
-					if (!isSeparator(c))
-					{
-						if (newString)
-							c = NLMISC::toUpper((ucchar)c);
-						else
-							c = NLMISC::toLower((ucchar)c);
-						newString = false;
-					}
+					if (newString)
+						NLMISC::appendToUpper(res, str, i);
+					else
+						NLMISC::appendToLower(res, str, i);
+					newString = false;
+				}
+				else
+				{
+					res += c;
+					++i;
 				}
-				NLMISC::CUtfStringView::append(res, c);
 			}
-			str = nlmove(res);
+			str.swap(res);
 			break;
 		}
 		case CaseFirstSentenceLetterUp:
 		{
-			NLMISC::CUtfStringView sv(str);
 			std::string res;
-			res.reserve(sv.largestSize());
-			u32char lastChar = 0;
-			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			res.reserve(str.size() + (str.size() >> 2));
+			char lastChar = 0;
+			for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
 			{
-				u32char c = *it;
-				if (c < 0x10000)
+				char c = str[i];
+				if (isEndSentence(c, lastChar))
 				{
-					if (isEndSentence(c, lastChar))
-						newSentence = true;
+					newSentence = true;
+					res += c;
+					++i;
+				}
+				else
+				{
+					if (newSentence)
+						NLMISC::appendToUpper(res, str, i);
 					else
-					{
-						if (newSentence)
-							c = NLMISC::toUpper((ucchar)c);
-						else
-							c = NLMISC::toLower((ucchar)c);
+						NLMISC::appendToLower(res, str, i);
 
-						if (!isSeparator(c))
-							newSentence = false;
-					}
+					if (!isSeparator(c))
+						newSentence = false;
 				}
-				NLMISC::CUtfStringView::append(res, c);
 				lastChar = c;
 			}
-			str = nlmove(res);
+			str.swap(res);
 			break;
 		}
 		case CaseFirstWordLetterUp:
 		{
-			NLMISC::CUtfStringView sv(str);
 			std::string res;
-			res.reserve(sv.largestSize());
-			u32char lastChar = 0;
-			for (NLMISC::CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
+			res.reserve(str.size() + (str.size() >> 2));
+			char lastChar = 0;
+			for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
 			{
-				u32char c = *it;
-				if (c < 0x10000)
+				char c = str[i];
+				if (isSeparator(c) || isEndSentence(c, lastChar))
+				{
+					newWord = true;
+					res += c;
+					++i;
+				}
+				else
 				{
-					if (isSeparator(c) || isEndSentence(c, lastChar))
-						newWord = true;
+					if (newWord)
+						NLMISC::appendToUpper(res, str, i);
 					else
-					{
-						if (newWord)
-							c = NLMISC::toUpper((ucchar)c);
-						else
-							c = NLMISC::toLower((ucchar)c);
+						NLMISC::appendToLower(res, str, i);
 
-						newWord = false;
-					}
+					newWord = false;
 				}
-				NLMISC::CUtfStringView::append(res, c);
 				lastChar = c;
 			}
-			str = nlmove(res);
+			str.swap(res);
 			break;
 		}
 		default:
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 10321a907..b38344d4a 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -4752,7 +4752,7 @@ NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrd
 			if (table[idx])
 			{
 				res += &table[idx];
-				++i;
+				i += 2;
 				return;
 			}
 		}
@@ -4770,20 +4770,23 @@ NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrd
 				if (table[idx])
 				{
 					res += &table[idx];
-					i += 2;
+					i += 3;
 					return;
 				}
 			}
 		}
 	}
 	res += c;
+	++i;
 }
 
+// ***************************************************************************
+
 std::string toLower(const char *str)
 {
 	// UTF-8 toLower, tables generated from UTF-16 tables
 	std::string res;
-	for (ptrdiff_t i = 0; str[i]; ++i)
+	for (ptrdiff_t i = 0; str[i];)
 		appendToLowerAsUtf8(res, str, i);
 	return res;
 }
@@ -4796,11 +4799,25 @@ std::string	toLower(const std::string &str)
 	std::string res;
 	res.reserve(str.size() + (str.size() >> 2));
 	const char *cstr = &str[0];
-	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size(); ++i)
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
 		appendToLowerAsUtf8(res, cstr, i);
 	return res;
 }
 
+// ***************************************************************************
+
+void appendToLower(std::string &res, const char *str, ptrdiff_t &i)
+{
+	appendToLowerAsUtf8(res, str, i);
+}
+
+// ***************************************************************************
+
+void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i)
+{
+	appendToLowerAsUtf8(res, &str[0], i);
+}
+
 // ***************************************************************************
 // ***************************************************************************
 // ***************************************************************************
@@ -4827,7 +4844,7 @@ NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrd
 			if (table[idx])
 			{
 				res += &table[idx];
-				++i;
+				i += 2;
 				return;
 			}
 		}
@@ -4845,13 +4862,14 @@ NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrd
 				if (table[idx])
 				{
 					res += &table[idx];
-					i += 2;
+					i += 3;
 					return;
 				}
 			}
 		}
 	}
 	res += c;
+	++i;
 }
 
 // ***************************************************************************
@@ -4860,7 +4878,7 @@ std::string toUpper(const char *str)
 {
 	// UTF-8 toLower, tables generated from UTF-16 tables
 	std::string res;
-	for (ptrdiff_t i = 0; str[i]; ++i)
+	for (ptrdiff_t i = 0; str[i];)
 		appendToUpperAsUtf8(res, str, i);
 	return res;
 }
@@ -4873,13 +4891,27 @@ std::string	toUpper(const std::string &str)
 	std::string res;
 	res.reserve(str.size() + (str.size() >> 2));
 	const char *cstr = &str[0];
-	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size(); ++i)
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
 		appendToUpperAsUtf8(res, cstr, i);
 	return res;
 }
 
 // ***************************************************************************
 
+void appendToUpper(std::string &res, const char *str, ptrdiff_t &i)
+{
+	appendToUpperAsUtf8(res, str, i);
+}
+
+// ***************************************************************************
+
+void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i)
+{
+	appendToUpperAsUtf8(res, &str[0], i);
+}
+
+// ***************************************************************************
+
 #else
 
 // ***************************************************************************

From 1c09d2ea4bd0ceb2847d3bc8a169e54a9a2b6bed Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 04:19:02 +0800
Subject: [PATCH 101/292] Avoid useless string operations

---
 nel/include/nel/misc/string_common.h | 7 ++++---
 nel/src/gui/interface_element.cpp    | 9 ++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/nel/include/nel/misc/string_common.h b/nel/include/nel/misc/string_common.h
index 96f7f7bd1..71ab05a30 100644
--- a/nel/include/nel/misc/string_common.h
+++ b/nel/include/nel/misc/string_common.h
@@ -254,9 +254,10 @@ inline bool fromString(const std::string &str, double &val) { bool ret = sscanf(
 inline bool fromString(const std::string &str, wchar_t &val) { return fromString(str, reinterpret_cast<uint16 &>(val)); }
 #endif
 
-// Fast string to bool, reliably defined for strings starting with 0, 1, t, T, f, F, y, Y, n, N, anything else is undefined.
-// (str[0] == '1' || (str[0] & 0xD2) == 0x50)
-//  - Kaetemi
+/// Fast string to bool, reliably defined for strings starting with 0, 1, t, T, f, F, y, Y, n, N, and empty strings, anything else is undefined.
+///  - Kaetemi
+inline bool toBool(const char *str) { return str[0] == '1' || (str[0] & 0xD2) == 0x50; }
+inline bool toBool(const std::string &str) { return toBool(str.c_str()); } // Safe because first byte may be null
 
 bool fromString(const std::string &str, bool &val);
 
diff --git a/nel/src/gui/interface_element.cpp b/nel/src/gui/interface_element.cpp
index cf5646077..bc5da4e03 100644
--- a/nel/src/gui/interface_element.cpp
+++ b/nel/src/gui/interface_element.cpp
@@ -1028,21 +1028,16 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	bool			CInterfaceElement::convertBool (const char *ptr)
+	bool CInterfaceElement::convertBool (const char *ptr)
 	{
-		std::string str = toLower(ptr);
-		bool b = false;
-		fromString( str, b );
-		return b;
+		return NLMISC::toBool(ptr);
 	}
 
 	// ------------------------------------------------------------------------------------------------
 	NLMISC::CVector CInterfaceElement::convertVector (const char *ptr)
 	{
 		float x = 0.0f, y = 0.0f, z = 0.0f;
-
 		sscanf (ptr, "%f %f %f", &x, &y, &z);
-
 		return CVector(x,y,z);
 	}
 

From 0629951ba6903f3eb506dbca31cd0a1cecb57d49 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 04:25:07 +0800
Subject: [PATCH 102/292] Fix useless cursor reloads

---
 nel/include/nel/gui/view_pointer.h | 7 +++++--
 nel/src/gui/view_pointer.cpp       | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/view_pointer.h b/nel/include/nel/gui/view_pointer.h
index b947cc604..db7355465 100644
--- a/nel/include/nel/gui/view_pointer.h
+++ b/nel/include/nel/gui/view_pointer.h
@@ -61,8 +61,11 @@ namespace NLGUI
 		// TEMP PATCH
 		void setCursor (const std::string &name)
 		{
-			_TxDefault = name;
-			_TxIdDefault = -2;
+			if (_TxDefault != name)
+			{
+				_TxDefault = name;
+				_TxIdDefault = -2;
+			}
 		}
 		// TEMP PATCH
 
diff --git a/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
index 74644fa9f..228868731 100644
--- a/nel/src/gui/view_pointer.cpp
+++ b/nel/src/gui/view_pointer.cpp
@@ -207,7 +207,10 @@ namespace NLGUI
 
 		if (_TxIdDefault == -2)
 		{
-			_TxIdDefault	= rVR.getTextureIdFromName (_TxDefault);
+			_TxIdDefault = rVR.getTextureIdFromName(_TxDefault);
+		}
+		if (_TxIdMoveWindow == -2)
+		{
 			_TxIdMoveWindow = rVR.getTextureIdFromName (_TxMoveWindow);
 			_TxIdResizeBRTL = rVR.getTextureIdFromName (_TxResizeBRTL);
 			_TxIdResizeBLTR = rVR.getTextureIdFromName (_TxResizeBLTR);

From 22fd1132edd0cf95fa14c440deb28d7faaf201e7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 04:26:21 +0800
Subject: [PATCH 103/292] Improve setCase behaviour

---
 nel/src/gui/string_case.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index ced12e3ca..946b8d58a 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -40,7 +40,7 @@ namespace NLGUI
 		// Counterexample: nevrax.com
 		//                       ^
 		return ((c == ' ') || (c == '\n'))
-			&& (lastChar == '.') || (lastChar == '!') || (lastChar == '?');
+			&& ((lastChar == '.') || (lastChar == '!') || (lastChar == '?') || (lastChar == '\n'));
 	}
 
 	void setCase(std::string &str, TCaseMode mode)

From 7e8f84462f5097c923faa8e8e796ff23f9252db2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 04:36:46 +0800
Subject: [PATCH 104/292] Add manifest to enable segment heap

---
 ryzom/client/src/CMakeLists.txt         | 2 +-
 ryzom/client/src/segement_heap.manifest | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 ryzom/client/src/segement_heap.manifest

diff --git a/ryzom/client/src/CMakeLists.txt b/ryzom/client/src/CMakeLists.txt
index 99b9a6773..f5d19f1d5 100644
--- a/ryzom/client/src/CMakeLists.txt
+++ b/ryzom/client/src/CMakeLists.txt
@@ -21,7 +21,7 @@ IF(WITH_RYZOM_CLIENT)
   ENDIF()
 
   FILE(GLOB CFG ../*.cfg)
-  FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc)
+  FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc *.manifest)
   FILE(GLOB SRC_INTERFACE interface_v3/*.h interface_v3/*.cpp)
   FILE(GLOB SRC_MODE motion/modes/*.cpp motion/modes/*.h)
   FILE(GLOB SRC_R2 r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp)
diff --git a/ryzom/client/src/segement_heap.manifest b/ryzom/client/src/segement_heap.manifest
new file mode 100644
index 000000000..0deedb1e7
--- /dev/null
+++ b/ryzom/client/src/segement_heap.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">
+      <heapType>SegmentHeap</heapType>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>

From 246ea2f603c7a3a3084bc175e2faecb1638ffcfd Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 06:38:33 +0800
Subject: [PATCH 105/292] UTF-8 entity name, ryzom/ryzomcore#335

---
 nel/include/nel/misc/common.h                 |   4 +
 nel/src/misc/unicode.cpp                      | 232 +++++++++++++++++-
 ryzom/client/src/character_cl.cpp             |   2 +-
 ryzom/client/src/client_chat_manager.cpp      |  18 +-
 ryzom/client/src/connection.cpp               |   8 +-
 ryzom/client/src/connection.h                 |   4 +-
 ryzom/client/src/debug_client.cpp             |   2 +-
 ryzom/client/src/entity_cl.cpp                |  34 +--
 ryzom/client/src/entity_cl.h                  |  16 +-
 ryzom/client/src/forage_source_cl.cpp         |  14 +-
 ryzom/client/src/init_main_loop.cpp           |   8 +-
 .../src/interface_v3/action_handler_game.cpp  |   4 +-
 .../src/interface_v3/action_handler_help.cpp  |  14 +-
 .../src/interface_v3/action_handler_item.cpp  |   4 +-
 .../src/interface_v3/action_handler_misc.cpp  |  12 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp |   2 +-
 .../client/src/interface_v3/group_compas.cpp  |   2 +-
 .../src/interface_v3/group_html_webig.cpp     |   4 +-
 ryzom/client/src/interface_v3/group_map.cpp   |   6 +-
 .../client/src/interface_v3/guild_manager.cpp |   4 +-
 .../src/interface_v3/interface_manager.cpp    |   8 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |   8 +-
 .../src/interface_v3/people_interraction.cpp  |   6 +-
 ryzom/client/src/net_manager.cpp              |   8 +-
 .../client/src/r2/displayer_visual_entity.cpp |   2 +-
 ryzom/client/src/string_manager_client.cpp    |   4 +-
 26 files changed, 329 insertions(+), 101 deletions(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 9ed33c8d8..6a4480e5a 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -250,6 +250,10 @@ void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i);
 void appendToUpper(std::string &res, const char *str, ptrdiff_t &i);
 void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i);
 
+/** UTF-8 case insensitive compare */
+int compareCaseInsensitive(const char *a, const char *b);
+int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB);
+
 
 /**
  *  Convert to an hexadecimal std::string
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index b38344d4a..6e00afe88 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -4732,8 +4732,8 @@ static const char **s_UtfLowerToUpperMap[16] = {
 
 NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
 {
-	char c = str[i];
-	char d, e;
+	unsigned char c = str[i];
+	unsigned char d, e;
 	if (c < 0x80)
 	{
 		if (c >= 'A' && c <= 'Z')
@@ -4824,8 +4824,8 @@ void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i)
 
 NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
 {
-	char c = str[i];
-	char d, e;
+	unsigned char c = str[i];
+	unsigned char d, e;
 	if (c < 0x80)
 	{
 		if (c >= 'a' && c <= 'z')
@@ -4910,6 +4910,230 @@ void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i)
 	appendToUpperAsUtf8(res, &str[0], i);
 }
 
+// ***************************************************************************
+// ***************************************************************************
+// ***************************************************************************
+
+static const char s_UpperAscii[] = {
+	'A', 0, 'B', 0, 'C', 0, 'D', 0, 'E', 0, 'F', 0, 'G', 0, 
+	'H', 0, 'I', 0, 'J', 0, 'K', 0, 'L', 0, 'M', 0, 'N', 0, 
+	'O', 0, 'P', 0, 'Q', 0, 'R', 0, 'S', 0, 'T', 0, 'U', 0, 
+	'V', 0, 'W', 0, 'X', 0, 'Y', 0, 'Z', 0, 0, 0, 0, 0
+};
+
+const char *fetchToUpperAsUtf8(const char **str)
+{
+	unsigned char c = *(*str);
+	unsigned char d, e;
+	if (c < 0x80)
+	{
+		if (c >= 'a' && c <= 'z')
+		{
+			// 1-byte UTF-8
+			++(*str);
+			return &s_UpperAscii[(c - 'a') << 1];
+		}
+	}
+	else if ((c & 0xE0) == 0xC0 && ((d = (*str)[1]) & 0xC0) == 0x80)
+	{
+		// 2-byte UTF-8
+		const char *table = s_Utf8LowerToUpperTables[c & 0x1F];
+		if (table)
+		{
+			unsigned char idx = (d & 0x3F) << 2;
+			if (table[idx])
+			{
+				(*str) += 2;
+				return &table[idx];
+			}
+		}
+	}
+	else if ((c & 0xF0) == 0xE0 && ((d = (*str)[1]) & 0xC0) == 0x80 && ((e = (*str)[2]) & 0xC0) == 0x80)
+	{
+		// 3-byte UTF-8
+		const char **map = s_UtfLowerToUpperMap[c & 0x0F];
+		if (map)
+		{
+			const char *table = map[d & 0x3F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					(*str) += 3;
+					return &table[idx];
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+int compareCaseInsensitive(const char *a, const char *b)
+{
+	// while (*a != 0 && *b != 0)
+	for (; ;)
+	{
+		const char *ca = fetchToUpperAsUtf8(&a);
+		const char *cb = fetchToUpperAsUtf8(&b);
+		if (!ca && !cb)
+		{
+			// Easy case, ASCII compare or junk
+			if (*a != *b)
+			{
+				if (*a > * b) return 1;
+				else return -1;
+			}
+			else if (!*a) // Equal and NUL, ends both
+			{
+				return 0;
+			}
+			++a;
+			++b;
+		}
+		else if (!cb)
+		{
+			// String a changed lowercase, iterate ca until NUL alongside b
+			nlassert(*ca);
+			do
+			{
+				if (*ca != *b)
+				{
+					if (*ca > *b) return 1;
+					else return -1;
+				}
+				++ca;
+				++b;
+			} while (*ca);
+		}
+		else if (!ca)
+		{
+			// String b changed lowercase, iterate a alongside cb until NUL
+			nlassert(*cb);
+			do
+			{
+				if (*a != *cb)
+				{
+					if (*a > *cb) return 1;
+					else return -1;
+				}
+				++a;
+				++cb;
+			} while (*cb);
+		}
+		else
+		{
+			// Both strings changed lowercase
+			if (ca != cb) // Only check if it's a different result
+			{
+				do
+				{
+					if (*ca != *cb)
+					{
+						if (*ca > *cb) return 1;
+						else return -1;
+					}
+					++ca;
+					++cb;
+				} while (*ca && *cb);
+			}
+		}
+	}
+	// if (*a == *b) return 0;
+	// if (*a > *b) return 1;
+	// return -1;
+}
+
+int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB)
+{
+	const char *ma = a + lenA;
+	const char *mb = b + lenB;
+	for (; ;)
+	{
+		if (a >= ma)
+		{
+			if (b >= mb)
+			{
+				return 0; // Both strings ended
+			}
+			else
+			{
+				return 1; // A is longer
+			}
+		}
+		if (b >= mb)
+		{
+			return -1; // B is longer
+		}
+		const char *ca = fetchToUpperAsUtf8(&a);
+		const char *cb = fetchToUpperAsUtf8(&b);
+		if (!ca && !cb)
+		{
+			// Easy case, ASCII compare or junk
+			if (*a != *b)
+			{
+				if (*a > * b) return 1;
+				else return -1;
+			}
+			/*
+			else if (!*a) // Equal and NUL, ends both
+			{
+				return 0;
+			}
+			*/
+			++a;
+			++b;
+		}
+		else if (!cb)
+		{
+			// String a changed lowercase, iterate ca until NUL alongside b
+			nlassert(*ca);
+			do
+			{
+				if (*ca != *b)
+				{
+					if (*ca > *b) return 1;
+					else return -1;
+				}
+				++ca;
+				++b;
+			} while (*ca);
+		}
+		else if (!ca)
+		{
+			// String b changed lowercase, iterate a alongside cb until NUL
+			nlassert(*cb);
+			do
+			{
+				if (*a != *cb)
+				{
+					if (*a > *cb) return 1;
+					else return -1;
+				}
+				++a;
+				++cb;
+			} while (*cb);
+		}
+		else
+		{
+			// Both strings changed lowercase
+			if (ca != cb) // Only check if it's a different result
+			{
+				do
+				{
+					if (*ca != *cb)
+					{
+						if (*ca > *cb) return 1;
+						else return -1;
+					}
+					++ca;
+					++cb;
+				} while (*ca && *cb);
+			}
+		}
+	}
+}
+
 // ***************************************************************************
 
 #else
diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 84b058902..d68a836de 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -811,7 +811,7 @@ bool CCharacterCL::build(const CEntitySheet *sheet)	// virtual
 		// Get the fauna name in the sheet
 		const ucstring creatureName(STRING_MANAGER::CStringManagerClient::getCreatureLocalizedName(_Sheet->Id));
 		if (creatureName.find(ucstring("<NotExist:")) != 0)
-			_EntityName = creatureName;
+			_EntityName = creatureName.toUtf8();
 	}
 	else
 	{
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index d614d345b..06c9c9776 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -955,7 +955,7 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 		result = msg;
 	else
 	{
-		ucstring name = CEntityCL::removeTitleAndShardFromName(sender);
+		ucstring name = CEntityCL::removeTitleAndShardFromName(sender.toUtf8());
 		ucstring csr;
 
 		// special case where there is only a title, very rare case for some NPC
@@ -965,20 +965,20 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 			CCharacterCL *entity = dynamic_cast<CCharacterCL*>(EntitiesMngr.getEntityByName(sender, true, true));
 			bool bWoman = entity && entity->getGender() == GSGENDER::female;
 
-			name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
+			name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender.toUtf8()), bWoman);
 			{
 				// Sometimes translation contains another title
 				ucstring::size_type pos = name.find('$');
 				if (pos != ucstring::npos)
 				{
-					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
+					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name.toUtf8()), bWoman);
 				}
 			}
 		}
 		else
 		{
 			// Does the char have a CSR title?
-			csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring("");
+			csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender.toUtf8())) ? ucstring("(CSR) ") : ucstring("");
 		}
 
 		result = csr + name + ucstring(" ") + CI18N::get("tellsYou") + ucstring(": ") + msg;
@@ -1018,13 +1018,13 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 	}
 
 	// Format the sentence with the provided sender name
-	ucstring senderName = CEntityCL::removeTitleAndShardFromName(sender);
+	ucstring senderName = CEntityCL::removeTitleAndShardFromName(sender.toUtf8());
 
 	ucstring csr;
 	// Does the char have a CSR title?
-	csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring("");
+	csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender.toUtf8())) ? ucstring("(CSR) ") : ucstring("");
 
-	if (UserEntity && senderName == UserEntity->getDisplayName())
+	if (UserEntity && senderName.toUtf8() == UserEntity->getDisplayName())
 	{
 		// The player talks
 		switch(type)
@@ -1046,13 +1046,13 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 			// We need the gender to display the correct title
 			bool bWoman = entity && entity->getGender() == GSGENDER::female;
 
-			senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
+			senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender.toUtf8()), bWoman);
 			{
 				// Sometimes translation contains another title
 				ucstring::size_type pos = senderName.find('$');
 				if (pos != ucstring::npos)
 				{
-					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
+					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName.toUtf8()), bWoman);
 				}
 			}
 		}
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index a491d5e57..1fa7efb9f 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -145,8 +145,8 @@ string CharNameValidDBLink;
 uint8		PlayerSelectedSlot = 0;
 string		PlayerSelectedFileName;
 TSessionId	PlayerSelectedMainland= (TSessionId)0;	// This is the mainland selected at the SELECT perso!!
-ucstring	PlayerSelectedHomeShardName;
-ucstring	PlayerSelectedHomeShardNameWithParenthesis;
+std::string	PlayerSelectedHomeShardName;
+std::string	PlayerSelectedHomeShardNameWithParenthesis;
 extern std::string CurrentCookie;
 
 ucstring NewKeysCharNameWanted; // name of the character for which a new keyset must be created
@@ -1441,7 +1441,7 @@ Deprecated	{
 				ucstring::size_type pos = sValue.find('$');
 				if (pos != ucstring::npos)
 				{
-					sValue = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sValue), womanTitle);
+					sValue = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sValue.toUtf8()), womanTitle);
 				}
 			}
 			setTarget (pCaller, sTarget, sValue);
@@ -3348,7 +3348,7 @@ class CAHLoadScenario : public IActionHandler
 									ucstring res;
 									if (pSMC->getString(val,res))
 									{
-										string charName = CEntityCL::removeTitleAndShardFromName(res).toString();
+										string charName = CEntityCL::removeTitleAndShardFromName(res.toUtf8());
 										sessionBrowser.inviteCharacterByName(sessionBrowser._LastScheduleSessionCharId, charName);
 
 										if(!sessionBrowser.waitOneMessage(sessionBrowser.getMessageName("on_invokeResult")))
diff --git a/ryzom/client/src/connection.h b/ryzom/client/src/connection.h
index 67bda815c..bb6f4cd24 100644
--- a/ryzom/client/src/connection.h
+++ b/ryzom/client/src/connection.h
@@ -30,8 +30,8 @@ extern std::vector<CMainlandSummary>	Mainlands;
 extern uint8 PlayerSelectedSlot;
 extern std::string	PlayerSelectedFileName;
 extern TSessionId	PlayerSelectedMainland;							// This is the mainland selected at the SELECT perso!!
-extern ucstring		PlayerSelectedHomeShardName;					// The home shard name (aniro, leanon etc....)
-extern ucstring		PlayerSelectedHomeShardNameWithParenthesis;		// Same with parenthesis
+extern std::string	PlayerSelectedHomeShardName;					// The home shard name (aniro, leanon etc....)
+extern std::string	PlayerSelectedHomeShardNameWithParenthesis;		// Same with parenthesis
 extern std::vector<CCharacterSummary>	CharacterSummaries;
 extern std::string UserPrivileges;
 extern sint LoginCharsel;
diff --git a/ryzom/client/src/debug_client.cpp b/ryzom/client/src/debug_client.cpp
index 88df4be99..cbceca4ef 100644
--- a/ryzom/client/src/debug_client.cpp
+++ b/ryzom/client/src/debug_client.cpp
@@ -514,7 +514,7 @@ string getDebugInformation()
 
 	if(UserEntity)
 	{
-		str += toString("Player Name: '%s'\n", UserEntity->getEntityName().toString().c_str());
+		str += toString("Player Name: '%s'\n", UserEntity->getEntityName().c_str());
 		str += toString("UserPosition: %.2f %.2f %.2f\n", UserEntity->pos().x, UserEntity->pos().y, UserEntity->pos().z);
 	}
 	else
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 9d3f446eb..9e57b3acb 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2097,7 +2097,7 @@ bool CEntityCL::clipped (const std::vector<NLMISC::CPlane> &clippingPlanes, cons
 // Set the name of the entity. Handle replacement tag if any
 // to insert NPC task translated.
 //---------------------------------------------------
-void CEntityCL::setEntityName(const ucstring &name)
+void CEntityCL::setEntityName(const std::string &name)
 {
 	_EntityName = name;
 }
@@ -2264,7 +2264,7 @@ void CEntityCL::load()	// virtual
 //-----------------------------------------------
 void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 {
-	_EntityName = value;
+	_EntityName = value.toUtf8();
 
 	// remove the shard name if possible
 	_EntityName= removeShardFromName(_EntityName);
@@ -2303,7 +2303,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 				if (pos != ucstring::npos)
 				{
 					ucstring sn = replacement;
-					_EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(sn.substr(0, pos));
+					_EntityName = sn.substr(0, pos).toUtf8();
 					ucstring::size_type pos2 = sn.find('$', pos + 1);
 					_TitleRaw = sn.substr(pos+1, pos2 - pos - 1);
 					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
@@ -2370,32 +2370,32 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 //-----------------------------------------------
 // getTitleFromName
 //-----------------------------------------------
-ucstring CEntityCL::getTitleFromName(const ucstring &name)
+std::string CEntityCL::getTitleFromName(const std::string &name)
 {
-	ucstring::size_type p1 = name.find('$');
+	std::string::size_type p1 = name.find('$');
 	if (p1 != ucstring::npos)
 	{
-		ucstring::size_type p2 = name.find('$', p1 + 1);
-		if (p2 != ucstring::npos)
+		std::string::size_type p2 = name.find('$', p1 + 1);
+		if (p2 != std::string::npos)
 			return name.substr(p1+1, p2-p1-1);
 	}
 
-	return ucstring("");
+	return std::string();
 }// getTitleFromName //
 
 //-----------------------------------------------
 // removeTitleFromName
 //-----------------------------------------------
-ucstring CEntityCL::removeTitleFromName(const ucstring &name)
+std::string CEntityCL::removeTitleFromName(const std::string &name)
 {
-	ucstring::size_type p1 = name.find('$');
+	std::string::size_type p1 = name.find('$');
 	if (p1 == ucstring::npos)
 	{
 		return name;
 	}
 	else
 	{
-		ucstring::size_type p2 = name.find('$', p1 + 1);
+		std::string::size_type p2 = name.find('$', p1 + 1);
 		if (p2 != ucstring::npos)
 		{
 			return name.substr(0, p1) + name.substr(p2 + 1);
@@ -2410,16 +2410,16 @@ ucstring CEntityCL::removeTitleFromName(const ucstring &name)
 //-----------------------------------------------
 // removeShardFromName
 //-----------------------------------------------
-ucstring CEntityCL::removeShardFromName(const ucstring &name)
+std::string CEntityCL::removeShardFromName(const std::string &name)
 {
 	// The string must contains a '(' and a ')'
-	ucstring::size_type	p0= name.find('(');
-	ucstring::size_type	p1= name.find(')');
-	if(p0==ucstring::npos || p1==ucstring::npos || p1<=p0)
+	std::string::size_type	p0= name.find('(');
+	std::string::size_type	p1= name.find(')');
+	if(p0==std::string::npos || p1==std::string::npos || p1<=p0)
 		return name;
 
 	// if it is the same as the shard name of the user, remove it
-	if(ucstrnicmp(name, (uint)p0+1, (uint)(p1-p0-1), PlayerSelectedHomeShardName)==0)
+	if (!NLMISC::compareCaseInsensitive(name.c_str() + p0 + 1, p1-p0-1, PlayerSelectedHomeShardName.c_str(), PlayerSelectedHomeShardName.size()))
 		return name.substr(0,p0) + name.substr(p1+1);
 	// else don't modify
 	else
@@ -2429,7 +2429,7 @@ ucstring CEntityCL::removeShardFromName(const ucstring &name)
 //-----------------------------------------------
 // removeTitleAndShardFromName
 //-----------------------------------------------
-ucstring CEntityCL::removeTitleAndShardFromName(const ucstring &name)
+std::string CEntityCL::removeTitleAndShardFromName(const std::string &name)
 {
 	return removeTitleFromName(removeShardFromName(name));
 }
diff --git a/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
index e2985493a..5b53c3027 100644
--- a/ryzom/client/src/entity_cl.h
+++ b/ryzom/client/src/entity_cl.h
@@ -334,19 +334,19 @@ public:
 	 */
 	//@{
 	/// Return the Name of the entity. There may be a specification in it (guard, trader, etc ...). It is then surrounded by '$'
-	const ucstring &getEntityName() const {return _EntityName;}
+	const std::string &getEntityName() const {return _EntityName;}
 	/// Return the title from a name. The specification is surrounded by '$', and tells the title of the entity (guard, matis merchant, etc ..)
-	static ucstring getTitleFromName(const ucstring &name);
+	static std::string getTitleFromName(const std::string &name);
 	/// Remove the specification from a name. The specification is surrounded by '$', and tells the title of the entity (guard, matis merchant, etc ..)
-	static ucstring removeTitleFromName(const ucstring &name);
+	static std::string removeTitleFromName(const std::string &name);
 	/// Remove the shard from a name (if player from the same shard). The shard is surrounded by (), and tells the incoming shard of the entity (aniro, leanon etc...)
-	static ucstring removeShardFromName(const ucstring &name);
+	static std::string removeShardFromName(const std::string &name);
 	/// Remove both title and shard from name
-	static ucstring removeTitleAndShardFromName(const ucstring &name);
+	static std::string removeTitleAndShardFromName(const std::string &name);
 	/// Change the entity name.
-	void setEntityName(const ucstring &name);
+	void setEntityName(const std::string &name);
 	/// Return a displayable name
-	ucstring getDisplayName() const
+	std::string getDisplayName() const
 	{
 		return removeTitleAndShardFromName(_EntityName);
 	}
@@ -931,7 +931,7 @@ protected:
 	// Flags to know what is possible to do with the entity (selectable, liftable, etc.).
 	CProperties						_Properties;
 	// Current Name for the entity
-	ucstring						_EntityName;
+	std::string						_EntityName;
 	// Current entity title
 	ucstring						_Title;
 	// Current entity tags
diff --git a/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
index 46249ed9e..7f538a2f0 100644
--- a/ryzom/client/src/forage_source_cl.cpp
+++ b/ryzom/client/src/forage_source_cl.cpp
@@ -508,9 +508,9 @@ void CForageSourceCL::updateVisualPropertyVisualFX(const NLMISC::TGameCycle &/*
 			CEntityCL *prospector = EntitiesMngr.entities()[_ProspectorSlot];
 			if (prospector != NULL)
 			{
-				ucstring prospectorName = prospector->getDisplayName();
+				string prospectorName = prospector->getDisplayName();
 				if ( ! prospectorName.empty() )
-					_EntityName += ucstring(" [") + prospectorName + ucstring("]");
+					_EntityName += " [" + prospectorName + "]";
 			}
 		}
 
@@ -539,15 +539,15 @@ void CForageSourceCL::updateVisualPropertyName(const NLMISC::TGameCycle &/* game
 	const ucchar *name = STRING_MANAGER::CStringManagerClient::getItemLocalizedName( rmSheetId );
 	if ( name )
 	{
-		_EntityName = name;
+		_EntityName = ucstring(name).toUtf8();
 		if ( _ProspectorSlot != 255 )
 		{
 			CEntityCL *prospector = EntitiesMngr.entities()[_ProspectorSlot];
 			if (prospector != NULL)
 			{
-				ucstring prospectorName = prospector->getDisplayName();
+				std::string prospectorName = prospector->getDisplayName();
 				if ( ! prospectorName.empty() )
-					_EntityName += ucstring(" [") + prospectorName + ucstring("]");
+					_EntityName += " [" + prospectorName + "]";
 			}
 		}
 		// Rebuild inscene interface
@@ -568,9 +568,9 @@ void CForageSourceCL::updateVisualPropertyTarget(const NLMISC::TGameCycle &/* ga
 		CEntityCL *prospector = EntitiesMngr.entities()[_ProspectorSlot]; // NULL if entity not received
 		if (prospector != NULL)
 		{
-			ucstring prospectorName = prospector->getDisplayName();
+			std::string prospectorName = prospector->getDisplayName();
 			if ( ! prospectorName.empty() )
-				_EntityName = _EntityName + ucstring(" [") + prospectorName + ucstring("]");
+				_EntityName = _EntityName + " [" + prospectorName + "]";
 		}
 
 		// Rebuild inscene interface
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index a5bfa67df..e2566e48f 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -225,8 +225,8 @@ struct CStatThread : public NLMISC::IRunnable
 	string cookie()
 	{
 		string name;
-		if(UserEntity && !UserEntity->getEntityName().toString().empty())
-			name = UserEntity->getEntityName().toString();
+		if(UserEntity && !UserEntity->getEntityName().empty())
+			name = UserEntity->getEntityName();
 
 		std::string userid = toString("u%d", NetMngr.getUserId())+name;
 		return toUpper(getMD5((const uint8 *)userid.c_str(), (uint32)userid.size()).toString());
@@ -236,7 +236,7 @@ struct CStatThread : public NLMISC::IRunnable
 	bool connect()
 	{
 		//nlinfo("connect");
-		if(!UserEntity || UserEntity->getEntityName().toString().empty())
+		if(!UserEntity || UserEntity->getEntityName().empty())
 			return false;
 
 		referer = ContinentMngr.getCurrentContinentSelectName();
@@ -260,7 +260,7 @@ struct CStatThread : public NLMISC::IRunnable
 		timeinfo = localtime ( &rawtime );
 		strftime (buffer,80,"%H%%3A%M", timeinfo);
 		addParam(params, "localtime", buffer);
-		addParam(params, "cv_name", UserEntity->getEntityName().toUtf8());
+		addParam(params, "cv_name", UserEntity->getEntityName());
 		//addParam(params, "cv_email", "");
 		//addParam(params, "cv_avatar", "");
 		addParam(params, "cv_Userid", toString(NetMngr.getUserId()));
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index cf25d00c5..4da75a8da 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1959,13 +1959,13 @@ public:
 					if (pChar != NULL)
 						womanTitle = pChar->getGender() == GSGENDER::female;
 					
-					STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
+					STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout.toUtf8()), womanTitle);
 
 					// Sometimes translation contains another title
 					ucstring::size_type pos = copyInout.find('$');
 					if (pos != ucstring::npos)
 					{
-						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
+						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout.toUtf8()), womanTitle);
 					}
 
 					CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index dc64feae1..2ccbf963a 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -670,7 +670,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 			if (selection == NULL) return;
 			//if(selection->isNPC())
 			{
-				ucstring name = selection->getEntityName();
+				std::string name = selection->getEntityName();
 				if(name.empty())
 				{
 					// try to get the name from the string manager (for npc)
@@ -679,7 +679,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 					{
 						STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 						pSMC->getString (nDBid, name);
-						ucstring copyName = name;
+						std::string copyName = name;
 						name = CEntityCL::removeTitleAndShardFromName(name);
 						if (name.empty())
 						{
@@ -689,18 +689,18 @@ class CHandlerOpenTitleHelp : public IActionHandler
 								woman = pChar->getGender() == GSGENDER::female;
 
 							// extract the replacement id
-							ucstring strNewTitle = CEntityCL::getTitleFromName(copyName);
+							std::string strNewTitle = CEntityCL::getTitleFromName(copyName);
 
 							// retrieve the translated string
 							if (!strNewTitle.empty())
-								name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(strNewTitle, woman);
+								name = ucstring(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(ucstring::makeFromUtf8(strNewTitle), woman)).toUtf8();
 							else
 								name.clear();
 						}
 					}
 				}
 				if(!name.empty())
-					CAHManager::getInstance()->runActionHandler("show_hide", pCaller, "profile|pname="+name.toUtf8()+"|ptype="+toString((int)selection->Type));
+					CAHManager::getInstance()->runActionHandler("show_hide", pCaller, "profile|pname="+name+"|ptype="+toString((int)selection->Type));
 				return;
 			}
 		}
@@ -2762,7 +2762,7 @@ class CPlayerShardNameRemover : public IOnReceiveTextId
 {
 	virtual	void	onReceiveTextId(ucstring &str)
 	{
-		str= CEntityCL::removeShardFromName(str);
+		str= CEntityCL::removeShardFromName(str.toUtf8());
 	}
 };
 static CPlayerShardNameRemover	PlayerShardNameRemover;
@@ -3629,7 +3629,7 @@ public:
 		CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:PACK_ANIMAL:BEAST%d:NAME", index));
 		if (node && CStringManagerClient::instance()->getDynString(node->getValue32(), txt))
 		{
-			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt).toUtf8());
+			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt.toUtf8()));
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index e3ee653aa..0edd74491 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -1737,7 +1737,7 @@ void CItemMenuInBagInfoWaiter::infoValidated(CDBCtrlSheet* ctrlSheet)
 		ucstring creatorNameString;
 		if( STRING_MANAGER::CStringManagerClient::instance()->getString ( itemInfo.CreatorName, creatorNameString) )
 		{
-			if (toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString))
+			if (   toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString.toUtf8()))
 				isCraftedByUserEntity = true;
 		}
 
@@ -1845,7 +1845,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 							ucstring creatorNameString;
 							if( STRING_MANAGER::CStringManagerClient::instance()->getString ( getInventory().getItemInfo(getInventory().getItemSlotId(pCS)).CreatorName, creatorNameString) )
 							{
-								if (toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString))
+								if (toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString.toUtf8()))
 									isTextEditionActive = true;
 							}
 						}
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 8b379f6d1..63d491deb 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -836,7 +836,7 @@ class CAHReplyTeller : public IActionHandler
 			{
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				PeopleInterraction.ChatGroup.Filter.setTargetPlayer(CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName));
+				PeopleInterraction.ChatGroup.Filter.setTargetPlayer(CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName.toUtf8()));
 				CGroupEditBox *eb = w->getEditBox();
 				if (eb != NULL)
 				{
@@ -863,7 +863,7 @@ class CAHReplyTellerOnce : public IActionHandler
 			{
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName) + ucstring(" "), false);
+				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName.toUtf8()) + ucstring(" "), false);
 				CGroupEditBox *eb = w->getEditBox();
 				if (eb != NULL)
 				{
@@ -916,7 +916,7 @@ NLMISC_COMMAND(slsn, "Temp : set the name of the last sender.", "<name>")
 bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 {
 	// extract the replacement id
-	ucstring strNewTitle = CEntityCL::getTitleFromName(inOut);
+	ucstring strNewTitle = CEntityCL::getTitleFromName(inOut.toUtf8());
 
 	// retrieve the translated string
 	if (!strNewTitle.empty())
@@ -927,7 +927,7 @@ bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 			ucstring::size_type pos = inOut.find('$');
 			if (pos != ucstring::npos)
 			{
-				inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(inOut), Woman);
+				inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(inOut.toUtf8()), Woman);
 			}
 		}
 	}
@@ -940,14 +940,14 @@ bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 // ***************************************************************************
 bool CStringPostProcessRemoveTitle::cbIDStringReceived(ucstring &inOut)
 {
-	inOut = CEntityCL::removeTitleAndShardFromName(inOut);
+	inOut = CEntityCL::removeTitleAndShardFromName(inOut.toUtf8());
 	return true;
 }
 
 // ***************************************************************************
 bool CStringPostProcessNPCRemoveTitle::cbIDStringReceived(ucstring &inOut)
 {
-	ucstring sOut = CEntityCL::removeTitleAndShardFromName(inOut);
+	ucstring sOut = CEntityCL::removeTitleAndShardFromName(inOut.toUtf8());
 	if (sOut.empty())
 	{
 		CStringPostProcessRemoveName SPPRM;
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index a461d0194..3d59ea644 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -692,7 +692,7 @@ void CDBGroupListSheetTrade::checkCoords ()
 		ucstring result;
 		if( pSMC->getString ( cst->LastVendorNameId, result) )
 		{
-			cst->VendorNameString = CEntityCL::removeShardFromName(result);
+			cst->VendorNameString = CEntityCL::removeShardFromName(result.toUtf8());
 			set< CSheetChildTrade *>::iterator itTmp = it;
 			++it;
 			VendorNameIdToUpdate.erase(itTmp);
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index a5e443da6..d5b8d7e9c 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -560,7 +560,7 @@ bool	buildCompassTargetFromTeamMember(CCompassTarget &ct, uint teamMemberId)
 		CStringManagerClient *pSMC = CStringManagerClient::instance();
 		ucstring name;
 		if (pSMC->getString(nameNode->getValue32(), name))
-			ct.Name = CEntityCL::removeTitleAndShardFromName(name); // TODO : dynamic support for name
+			ct.Name = CEntityCL::removeTitleAndShardFromName(name.toUtf8()); // TODO : dynamic support for name
 		else
 			ct.Name = CI18N::get("uiNotReceived");
 		return true;
diff --git a/ryzom/client/src/interface_v3/group_html_webig.cpp b/ryzom/client/src/interface_v3/group_html_webig.cpp
index 985ae3f20..d190b83b6 100644
--- a/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -97,7 +97,7 @@ void addWebIGParams (string &url, bool trustedDomain)
 		if (url.find('$') != string::npos)
 		{
 			strFindReplace(url, "$gender$", GSGENDER::toString(UserEntity->getGender()));
-			strFindReplace(url, "$displayName$", UserEntity->getDisplayName().toString());
+			strFindReplace(url, "$displayName$", UserEntity->getDisplayName()); // FIXME: UrlEncode...
 			strFindReplace(url, "$posx$", toString(UserEntity->pos().x));
 			strFindReplace(url, "$posy$", toString(UserEntity->pos().y));
 			strFindReplace(url, "$posz$", toString(UserEntity->pos().z));
@@ -113,7 +113,7 @@ void addWebIGParams (string &url, bool trustedDomain)
 				if (target)
 				{
 					strFindReplace(url, "$tdatasetid$", toString(target->dataSetId()));
-					strFindReplace(url, "$tdisplayName$", target->getDisplayName().toString());
+					strFindReplace(url, "$tdisplayName$", target->getDisplayName()); // FIXME: UrlEncode...
 					strFindReplace(url, "$tposx$", toString(target->pos().x));
 					strFindReplace(url, "$tposy$", toString(target->pos().y));
 					strFindReplace(url, "$tposz$", toString(target->pos().z));
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index ce6d21021..7725d45f9 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -1201,7 +1201,7 @@ void CGroupMap::checkCoords()
 					CEntityCL *sel = EntitiesMngr.entity(UserEntity->selection());
 					if (sel)
 					{
-						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint") + sel->removeTitleAndShardFromName(sel->getEntityName()).toUtf8());
+						_TargetLM->setDefaultContextHelp(NLMISC::CI18N::get("uiTargetTwoPoint") + sel->removeTitleAndShardFromName(sel->getEntityName()));
 					}
 				}
 			}
@@ -1405,8 +1405,8 @@ void CGroupMap::checkCoords()
 
 				if (pSMC->getString(val,res))
 				{
-						res = CEntityCL::removeTitleAndShardFromName(res);
-						_TeammateLM[i]->setDefaultContextHelp(res.toUtf8());
+						std::string res2 = CEntityCL::removeTitleAndShardFromName(res.toUtf8());
+						_TeammateLM[i]->setDefaultContextHelp(res2);
 				}
 			}
 			updateLMPosFromDBPos(_TeammateLM[i], px, py);
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index e3a1b6b41..328579d06 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -359,7 +359,7 @@ void CGuildManager::update()
 		for (uint i = 0; i < _GuildMembers.size(); ++i)
 		{
 			if (!pSMC->getString (_GuildMembers[i].NameID, _GuildMembers[i].Name)) bAllValid = false;
-			else _GuildMembers[i].Name = CEntityCL::removeTitleAndShardFromName(_GuildMembers[i].Name);
+			else _GuildMembers[i].Name = CEntityCL::removeTitleAndShardFromName(_GuildMembers[i].Name.toUtf8());
 		}
 
 		// If all is valid no more need update and if guild is opened update the interface
@@ -875,7 +875,7 @@ class CAHGuildSheetOpen : public IActionHandler
 				
 				CCtrlBase *inviteButton = pLine->getCtrl("invite_button");
 				if (inviteButton != NULL)
-					inviteButton->setActive(rGuildMembers[i].Online != ccs_offline && rGuildMembers[i].Name != UserEntity->getEntityName());
+					inviteButton->setActive(rGuildMembers[i].Online != ccs_offline && rGuildMembers[i].Name.toUtf8() != UserEntity->getEntityName());
 
 				// Enter Date
 				CViewText *pViewEnterDate = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_ENTER_DATE));
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 24ab75058..40413914e 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -358,7 +358,7 @@ public:
 					}
 					else
 					{
-						std::string name = UserEntity->getEntityName().toUtf8();
+						std::string name = UserEntity->getEntityName();
 						if (*it == 'P') name = toUpper(name);
 						formatedResult += name;
 					}
@@ -391,7 +391,7 @@ public:
 								}
 								else
 								{
-									botName = entity->getDisplayName().toUtf8();
+									botName = entity->getDisplayName();
 								}
 								CCharacterCL *pChar = dynamic_cast<CCharacterCL*>(entity);
 								if (pChar != NULL)
@@ -405,7 +405,7 @@ public:
 					spprn.Woman = womanTitle;
 					spprn.cbIDStringReceived(sTitleTranslated);
 
-					botName = CEntityCL::removeTitleAndShardFromName(botName).toUtf8();
+					botName = CEntityCL::removeTitleAndShardFromName(botName);
 
 					// short name (with no title such as 'guard', 'merchant' ...)
 					if (*it == 's')
@@ -4214,7 +4214,7 @@ bool CInterfaceManager::parseTokens(string& ucstr)
 			// Parse the parameter
 			if (token_param == "name")
 			{
-				string name = pTokenSubjectEntity->getDisplayName().toUtf8();
+				string name = pTokenSubjectEntity->getDisplayName();
 				// special case where there is only a title, very rare case for some NPC
 				if (name.empty())
 				{
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index e448b1f4a..c9dc2767e 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -1363,7 +1363,7 @@ int CLuaIHMRyzom::getPlayerGender(CLuaState &ls)
 int CLuaIHMRyzom::getPlayerName(CLuaState &ls)
 {
 	CLuaIHM::checkArgCount(ls, "getPlayerName", 0);
-	ls.push(UserEntity->getEntityName().toUtf8());
+	ls.push(UserEntity->getEntityName());
 	return 1;
 }
 
@@ -1441,7 +1441,7 @@ int CLuaIHMRyzom::getTargetName(CLuaState &ls)
 
 	if (!target) return 0;
 
-	ls.push(target->getEntityName().toUtf8());
+	ls.push(target->getEntityName());
 	return 1;
 }
 
@@ -3274,7 +3274,7 @@ void	CLuaIHMRyzom::browseNpcWebPage(const std::string &htmlId, const std::string
 
 			if (UserEntity)
 			{
-				userName = UserEntity->getDisplayName().toString();
+				userName = UserEntity->getDisplayName();
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 				ucstring ucsTmp;
 				pSMC->getString(UserEntity->getGuildNameID(), ucsTmp);
@@ -3648,7 +3648,7 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 				CInterfaceManager *im = CInterfaceManager::getInstance();
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleFromName(player) + ucstring(" "), false);
+				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleFromName(player.toUtf8()) + ucstring(" "), false);
 				CGroupEditBox *eb = w->getEditBox();
 
 				if (eb != NULL)
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 948b45e51..de7c9023a 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1276,7 +1276,7 @@ void CPeopleInterraction::addContactInList(uint32 contactId, const ucstring &nam
 	CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 
 	// remove the shard name if possible
-	ucstring	name= CEntityCL::removeShardFromName(nameIn);
+	ucstring	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
 
 	// add the contact to this list
 	sint index = pl.getIndexFromName(name);
@@ -1327,7 +1327,7 @@ bool CPeopleInterraction::isContactInList(const ucstring &nameIn, uint8 nList) c
 	// select correct people list
 	const CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 	// remove the shard name if possible
-	ucstring	name= CEntityCL::removeShardFromName(nameIn);
+	ucstring	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
 	return pl.getIndexFromName(name) != -1;
 }
 
@@ -2250,7 +2250,7 @@ public:
 						if (peopleList)
 						{
 							// don't add if it is the player name
-							if (!ClientCfg.Local && (UserEntity->getEntityName() == geb->getInputStringAsUtf16()))
+							if (!ClientCfg.Local && (UserEntity->getEntityName() == geb->getInputString()))
 							{
 								displayVisibleSystemMsg(CI18N::get("uiCantAddYourSelfInContactList"));
 							}
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index f1f622836..e2d55e250 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -832,7 +832,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 				}
 				if (!senderName.empty())
 				{
-					CEntityCL *senderEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(senderName), true, true);
+					CEntityCL *senderEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(senderName.toUtf8()), true, true);
 					if (senderEntity)
 					{
 						if (senderEntity->Type != CEntityCL::Player)
@@ -845,7 +845,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 							}
 							else
 							{
-								CEntityCL *destEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(playerName), false, true);
+								CEntityCL *destEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(playerName.toUtf8()), false, true);
 								if (destEntity)
 								{
 									destEntity->removeStateFx();
@@ -866,7 +866,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		// if tell, bkup sendername
 		if (mode == CChatGroup::tell && windowVisible && !senderName.empty())
 		{
-			PeopleInterraction.LastSenderName = CEntityCL::removeTitleAndShardFromName(senderName);
+			PeopleInterraction.LastSenderName = CEntityCL::removeTitleAndShardFromName(senderName.toUtf8());
 		}
 	}
 
@@ -928,7 +928,7 @@ void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const u
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 	bool windowVisible;
 
-	ucstring goodSenderName = CEntityCL::removeTitleAndShardFromName(senderName);
+	ucstring goodSenderName = CEntityCL::removeTitleAndShardFromName(senderName.toUtf8());
 
 	// The sender part is up to and including the first ":" after the goodSenderName
 	ucstring::size_type pos = finalString.find(goodSenderName);
diff --git a/ryzom/client/src/r2/displayer_visual_entity.cpp b/ryzom/client/src/r2/displayer_visual_entity.cpp
index 72b4c3ddb..01eaf0bc0 100644
--- a/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -1017,7 +1017,7 @@ void CDisplayerVisualEntity::updateName()
 
 	{
 		//BENCH(setEntityName)
-		_Entity->setEntityName(ucName);
+		_Entity->setEntityName(ucName.toUtf8());
 	}
 	{
 		//BENCH(buildInSceneInterface)
diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 06c3523b4..ec493e3d3 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -734,7 +734,7 @@ restartLoop:
 									// If the shard name is the same as the player home shard name, remove it
 									uint	len= (uint)PlayerSelectedHomeShardNameWithParenthesis.size();
 									uint	start= (uint)str.size()-len;
-									if(ucstrnicmp(str, start, len, PlayerSelectedHomeShardNameWithParenthesis)==0)
+									if(ucstrnicmp(str, start, len, PlayerSelectedHomeShardNameWithParenthesis)==0) // TODO: NLMISC::compareCaseInsensitive
 										str.resize(start);
 								}
 							}
@@ -744,7 +744,7 @@ restartLoop:
 						ucstring::size_type pos = str.find('$');
 						if ( ! str.empty() && pos != ucstring::npos)
 						{
-							str = CEntityCL::removeTitleFromName(str);
+							str = CEntityCL::removeTitleFromName(str.toUtf8());
 						}
 
 						// append this string

From 9d534882e862bc89f127b1d3c6a9ced098b88214 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 08:11:32 +0800
Subject: [PATCH 106/292] UTF-8 string manager, ryzom/ryzomcore#335

---
 ryzom/client/src/commands.cpp                 |  22 +-
 ryzom/client/src/entity_cl.cpp                |  37 ++-
 ryzom/client/src/entity_cl.h                  |   4 +-
 ryzom/client/src/forage_source_cl.cpp         |   4 +-
 .../src/interface_v3/action_handler_help.cpp  |   4 +-
 .../src/interface_v3/action_handler_misc.cpp  |   2 +-
 .../client/src/interface_v3/group_compas.cpp  |   4 +-
 .../src/interface_v3/sbrick_manager.cpp       |   6 +-
 ryzom/client/src/net_manager.cpp              |   8 +-
 ryzom/client/src/player_cl.cpp                |   2 +-
 ryzom/client/src/player_r2_cl.cpp             |   2 +-
 ryzom/client/src/string_manager_client.cpp    | 241 +++++++++---------
 ryzom/client/src/string_manager_client.h      | 138 +++++-----
 13 files changed, 247 insertions(+), 227 deletions(-)

diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index 986da78e6..d3a6a2df6 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -1385,14 +1385,14 @@ NLMISC_COMMAND(setItemName, "set name of items, sbrick, etc..","<sheet_id> <name
 {
 	if (args.size() < 2) return false;
 	CSheetId id(args[0]);
-	ucstring name;
-	name.fromUtf8(args[1]);
-	ucstring desc;
-	ucstring desc2;
+	string name;
+	name = args[1];
+	string desc;
+	string desc2;
 	if (args.size() > 2)
-		desc.fromUtf8(args[2]);
+		desc = args[2];
 	if (args.size() > 3)
-		desc2.fromUtf8(args[3]);
+		desc2 = args[3];
 
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 	if (pSMC)
@@ -1406,10 +1406,10 @@ NLMISC_COMMAND(setItemName, "set name of items, sbrick, etc..","<sheet_id> <name
 NLMISC_COMMAND(setMissingDynstringText, "set text of missing dynamic string"," <name> <text>")
 {
 	if (args.size() < 2) return false;
-	ucstring name;
-	name.fromUtf8(args[0]);
-	ucstring text;
-	text.fromUtf8(args[1]);
+	string name;
+	name = args[0];
+	string text;
+	text = args[1];
 
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 	if (pSMC)
@@ -1459,7 +1459,7 @@ NLMISC_COMMAND(ah, "Launch an action handler", "<ActionHandler> <AHparam>")
 static void setDynString(uint32 strID, const std::string &value)
 {
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	pSMC->receiveString(strID, ucstring(value));
+	pSMC->receiveString(strID, value);
 	CBitMemStream bm;
 	if (bm.isReading()) bm.invert();
 	bm.serial(strID);
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 9e57b3acb..b28d3fda6 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2262,32 +2262,32 @@ void CEntityCL::load()	// virtual
 // onStringAvailable :
 // Callback when the name is arrived.
 //-----------------------------------------------
-void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
+void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 {
-	_EntityName = value.toUtf8();
+	_EntityName = value;
 
 	// remove the shard name if possible
 	_EntityName= removeShardFromName(_EntityName);
 
 	// New title
-	ucstring newtitle;
+	string newtitle;
 
 	_HasReservedTitle = false;
 
 	// check if there is any replacement tag in the string
-	ucstring::size_type p1 = _EntityName.find('$');
+	string::size_type p1 = _EntityName.find('$');
 	if (p1 != ucstring::npos)
 	{
 		// we found a replacement point begin tag
-		ucstring::size_type p2 = _EntityName.find('$', p1+1);
+		string::size_type p2 = _EntityName.find('$', p1+1);
 		if (p2 != ucstring::npos)
 		{
 			// ok, we have the second replacement point!
 			// extract the replacement id
-			ucstring id = _EntityName.substr(p1+1, p2-p1-1);
+			string id = _EntityName.substr(p1+1, p2-p1-1);
 			// retrieve the translated string
-			_TitleRaw = id.toString();
-//			ucstring replacement = CI18N::get(strNewTitle);
+			_TitleRaw = id;
+//			string replacement = CI18N::get(strNewTitle);
 			bool womanTitle = false;
 			CCharacterCL * c = dynamic_cast<CCharacterCL*>(this);
 			if(c)
@@ -2295,22 +2295,21 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 				womanTitle = ( c->getGender() == GSGENDER::female );
 			}
 			
-			ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle));
+			string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), womanTitle);
 
 			// Sometimes translation contains another title
 			{
-				ucstring::size_type pos = replacement.find('$');
+				string::size_type pos = replacement.find('$');
 				if (pos != ucstring::npos)
 				{
-					ucstring sn = replacement;
-					_EntityName = sn.substr(0, pos).toUtf8();
-					ucstring::size_type pos2 = sn.find('$', pos + 1);
-					_TitleRaw = sn.substr(pos+1, pos2 - pos - 1);
-					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
+					_EntityName = _EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(sn.substr(0, pos));
+					string::size_type pos2 = replacement.find('$', pos + 1);
+					_TitleRaw = replacement.substr(pos+1, pos2 - pos - 1);
+					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), womanTitle);
 				}
 			}
 
-			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw, womanTitle);
+			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw.toUtf8(), womanTitle);
 
 			if (!replacement.empty() || !ClientCfg.DebugStringManager)
 			{
@@ -2319,9 +2318,9 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 				_EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(_EntityName.substr(0, p1));	// + _Name.substr(p2+1)
 				// Get extended name
 				_NameEx = replacement;
-				newtitle = _NameEx;
+				newtitle = _NameEx.toUtf8();
 			}
-			CHARACTER_TITLE::ECharacterTitle titleEnum = CHARACTER_TITLE::toCharacterTitle( _TitleRaw.toString() );
+			CHARACTER_TITLE::ECharacterTitle titleEnum = CHARACTER_TITLE::toCharacterTitle( _TitleRaw.toUtf8() );
 			if ( titleEnum >= CHARACTER_TITLE::BeginGmTitle && titleEnum <= CHARACTER_TITLE::EndGmTitle )
 			{
 				_GMTitle = titleEnum - CHARACTER_TITLE::BeginGmTitle;
@@ -2359,7 +2358,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 		if (pGC != NULL) pGC->setUCTitle(_EntityName);
 
 		CSkillManager *pSM = CSkillManager::getInstance();
-		pSM->setPlayerTitle(_TitleRaw.toString());
+		pSM->setPlayerTitle(_TitleRaw.toUtf8());
 	}
 
 	// Must rebuild the in scene interface 'cause name has changed
diff --git a/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
index 5b53c3027..3ac01ed25 100644
--- a/ryzom/client/src/entity_cl.h
+++ b/ryzom/client/src/entity_cl.h
@@ -935,7 +935,7 @@ protected:
 	// Current entity title
 	ucstring						_Title;
 	// Current entity tags
-	std::vector<ucstring>			_Tags;
+	std::vector<std::string>		_Tags;
 	// Current entity title string id
 	ucstring						_TitleRaw;
 	// Current permanent content symbol for the entity
@@ -1222,7 +1222,7 @@ public:
 private:
 
 	// Override for string reception callback
-	virtual void onStringAvailable(uint stringId, const ucstring &value);
+	virtual void onStringAvailable(uint stringId, const std::string &value);
 
 };
 
diff --git a/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
index 7f538a2f0..e813912df 100644
--- a/ryzom/client/src/forage_source_cl.cpp
+++ b/ryzom/client/src/forage_source_cl.cpp
@@ -536,10 +536,10 @@ void CForageSourceCL::updateVisualPropertyVisualFX(const NLMISC::TGameCycle &/*
 void CForageSourceCL::updateVisualPropertyName(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
 {
 	CSheetId rmSheetId( (const uint32&)prop );
-	const ucchar *name = STRING_MANAGER::CStringManagerClient::getItemLocalizedName( rmSheetId );
+	const char *name = STRING_MANAGER::CStringManagerClient::getItemLocalizedName( rmSheetId );
 	if ( name )
 	{
-		_EntityName = ucstring(name).toUtf8();
+		_EntityName = name;
 		if ( _ProspectorSlot != 255 )
 		{
 			CEntityCL *prospector = EntitiesMngr.entities()[_ProspectorSlot];
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 2ccbf963a..c00328ef0 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -693,7 +693,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 
 							// retrieve the translated string
 							if (!strNewTitle.empty())
-								name = ucstring(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(ucstring::makeFromUtf8(strNewTitle), woman)).toUtf8();
+								name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(strNewTitle, woman);
 							else
 								name.clear();
 						}
@@ -752,7 +752,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 		for (titleIDnb = 0; titleIDnb < CHARACTER_TITLE::NB_CHARACTER_TITLE; ++titleIDnb)
 		{
 			bool women = UserEntity && UserEntity->getGender()==GSGENDER::female;
-			if (CStringManagerClient::getTitleLocalizedName(CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)titleIDnb),women) == title)
+			if (CStringManagerClient::getTitleLocalizedName(CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)titleIDnb),women) == title.toUtf8())
 				break;
 		}
 
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 63d491deb..8190ab799 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -916,7 +916,7 @@ NLMISC_COMMAND(slsn, "Temp : set the name of the last sender.", "<name>")
 bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 {
 	// extract the replacement id
-	ucstring strNewTitle = CEntityCL::getTitleFromName(inOut.toUtf8());
+	string strNewTitle = CEntityCL::getTitleFromName(inOut.toUtf8());
 
 	// retrieve the translated string
 	if (!strNewTitle.empty())
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index d5b8d7e9c..fc0f2a5a5 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -1047,12 +1047,12 @@ REGISTER_ACTION_HANDLER( CHandlerSetCompassNorth, "set_compass_north");
 
 class CCompassDialogsStringCallback : public IStringWaitCallback
 {
-	virtual void onDynStringAvailable(uint /* stringId */, const ucstring &value)
+	virtual void onDynStringAvailable(uint /* stringId */, const std::string &value)
 	{
 		uint size = (uint)CCompassDialogsManager::getInstance()._Entries.size();
 		for ( uint i = 0; i < size; i++)
 		{
-			ucstring name;
+			std::string name;
 			if ( CStringManagerClient::instance()->getDynString(CCompassDialogsManager::getInstance()._Entries[i].Text, name) )
 			{
 				if ( value == name )
diff --git a/ryzom/client/src/interface_v3/sbrick_manager.cpp b/ryzom/client/src/interface_v3/sbrick_manager.cpp
index d12ed783c..a2cecf2d4 100644
--- a/ryzom/client/src/interface_v3/sbrick_manager.cpp
+++ b/ryzom/client/src/interface_v3/sbrick_manager.cpp
@@ -436,7 +436,7 @@ void			CSBrickManager::compileBrickProperties()
 
 
 	// **** for all bricks, recompute localized text with formated version
-	ucstring	textTemp;
+	string	textTemp;
 	textTemp.reserve(1000);
 	for (std::vector<CSBrickSheet *>::size_type ib = 0; ib < _BrickVector.size(); ++ib)
 	{
@@ -445,7 +445,7 @@ void			CSBrickManager::compileBrickProperties()
 			continue;
 
 		// Get the Brick texts
-		ucstring	texts[3];
+		std::string texts[3];
 		texts[0]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brickSheet->Id);
 		texts[1]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedDescription(brickSheet->Id);
 		texts[2]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(brickSheet->Id);
@@ -453,7 +453,7 @@ void			CSBrickManager::compileBrickProperties()
 		// For alls texts, parse format
 		for(uint i=0;i<3;i++)
 		{
-			ucstring	&text= texts[i];
+			string	&text= texts[i];
 			textTemp.erase();
 
 			// Parse the text
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index e2d55e250..9f05fe860 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -2299,11 +2299,9 @@ void impulsePhraseSend(NLMISC::CBitMemStream &impulse)
 void impulseStringResp(NLMISC::CBitMemStream &impulse)
 {
 	uint32 stringId;
-	string	strUtf8;
+	string	str;
 	impulse.serial(stringId);
-	impulse.serial(strUtf8);
-	ucstring str;
-	str.fromUtf8(strUtf8);
+	impulse.serial(str);
 
 	if (PermanentlyBanned) return;
 
@@ -3390,7 +3388,7 @@ private:
 
 public:
 	// called when the string is available
-	virtual void onDynStringAvailable(uint stringId, const ucstring &value)
+	virtual void onDynStringAvailable(uint stringId, const std::string &value)
 	{
 		// don't care if already displayed
 		if(_AlreadyDisplayed)
diff --git a/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
index 9aef1032b..437149f16 100644
--- a/ryzom/client/src/player_cl.cpp
+++ b/ryzom/client/src/player_cl.cpp
@@ -743,7 +743,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 	}
 
 	// update title when gender changed
-	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, _Gender == GSGENDER::female));
+	const string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), _Gender == GSGENDER::female);
 	if (!replacement.empty() || !ClientCfg.DebugStringManager)
 	{
 		// Get extended name
diff --git a/ryzom/client/src/player_r2_cl.cpp b/ryzom/client/src/player_r2_cl.cpp
index 138e7d8fa..8f7621755 100644
--- a/ryzom/client/src/player_r2_cl.cpp
+++ b/ryzom/client/src/player_r2_cl.cpp
@@ -446,7 +446,7 @@ void CPlayerR2CL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle
 	}
 
 	// update title when gender changed
-	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,_Gender == GSGENDER::female));
+	const string replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(),_Gender == GSGENDER::female));
 	if (!replacement.empty())
 	{
 		// Get extended name
diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index ec493e3d3..7381f5cb9 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -39,17 +39,17 @@ namespace STRING_MANAGER
 
 	// ***************************************************************************
 	map<string, CStringManagerClient::CItem> CStringManagerClient::_SpecItem_TempMap;
-	map<ucstring, ucstring> CStringManagerClient::_DynStrings;
-	vector<ucstring> CStringManagerClient::_TitleWords;
+	map<string, string> CStringManagerClient::_DynStrings;
+	vector<string> CStringManagerClient::_TitleWords;
 	bool CStringManagerClient::_SpecItem_MemoryCompressed = false;
 	char *CStringManagerClient::_SpecItem_Labels = NULL;
-	ucchar *CStringManagerClient::_SpecItem_NameDesc = NULL;
+	char *CStringManagerClient::_SpecItem_NameDesc = NULL;
 	vector<CStringManagerClient::CItemLight> CStringManagerClient::_SpecItems;
 	bool MustReleaseStaticArrays = true;
 
 
 	CStringManagerClient *CStringManagerClient::_Instance= NULL;
-	ucstring CStringManagerClient::_WaitString("???");
+	string CStringManagerClient::_WaitString("???");
 
 
 	CStringManagerClient::CStringManagerClient()
@@ -57,7 +57,7 @@ namespace STRING_MANAGER
 		_CacheInited = false;
 		_CacheLoaded = false;
 		// insert the empty string.
-		_ReceivedStrings.insert(make_pair((uint)EmptyStringId, ucstring()));
+		_ReceivedStrings.insert(make_pair((uint)EmptyStringId, string()));
 		// reserve some place to avoid reallocation as possible
 		_CacheStringToSave.reserve(1024);
 	}
@@ -122,6 +122,7 @@ namespace STRING_MANAGER
 		{
 			try
 			{
+				const uint currentVersion = 1;
 				_CacheFilename = std::string("save/") + _ShardId.substr(0, _ShardId.find(":")) + ".string_cache";
 
 				nlinfo("SM : Try to open the string cache : %s", _CacheFilename.c_str());
@@ -131,6 +132,8 @@ namespace STRING_MANAGER
 					// there is a cache file, check date reset it if needed
 					{
 						NLMISC::CIFile file(_CacheFilename);
+						file.setVersionException(false, false);
+						file.serialVersion(currentVersion);
 						file.serial(_Timestamp);
 					}
 
@@ -139,6 +142,7 @@ namespace STRING_MANAGER
 						nlinfo("SM: Clearing string cache : outofdate");
 						// the cache is not sync, reset it
 						NLMISC::COFile file(_CacheFilename);
+						file.serialVersion(currentVersion);
 						file.serial(timestamp);
 					}
 					else
@@ -151,6 +155,7 @@ namespace STRING_MANAGER
 					nlinfo("SM: Creating string cache");
 					// cache file don't exist, create it with the timestamp
 					NLMISC::COFile file(_CacheFilename);
+					file.serialVersion(currentVersion);
 					file.serial(timestamp);
 				}
 
@@ -160,17 +165,19 @@ namespace STRING_MANAGER
 				// NB : we keep the waiting strings and dyn strings
 
 				// insert the empty string.
-				_ReceivedStrings.insert(make_pair((uint)EmptyStringId, ucstring()));
+				_ReceivedStrings.insert(make_pair((uint)EmptyStringId, string()));
 
 				// load the cache file
 				NLMISC::CIFile file(_CacheFilename);
+				int version = file.serialVersion(currentVersion);
 				file.serial(_Timestamp);
 				nlassert(_Timestamp == timestamp);
+				nlassert(version >= 1); // Initial version
 
 				while (!file.eof())
 				{
 					uint32			id;
-					ucstring		str;
+					string		str;
 
 					file.serial(id);
 					file.serial(str);
@@ -194,12 +201,12 @@ namespace STRING_MANAGER
 
 
 
-	void CStringManagerClient::waitString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result)
+	void CStringManagerClient::waitString(uint32 stringId, const IStringWaiterRemover *premover, string *result)
 	{
 		H_AUTO( CStringManagerClient_waitString )
 
 		nlassert(premover && result);
-		ucstring value;
+		string value;
 		if (getString(stringId, value))
 			*result = value;
 		else
@@ -217,7 +224,7 @@ namespace STRING_MANAGER
 		H_AUTO( CStringManagerClient_waitString2 )
 
 		nlassert(pcallback != 0);
-		ucstring value;
+		string value;
 		if (getString(stringId, value))
 		{
 			pcallback->onStringAvailable(stringId, value);
@@ -230,12 +237,12 @@ namespace STRING_MANAGER
 	}
 
 
-	void CStringManagerClient::waitDynString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result)
+	void CStringManagerClient::waitDynString(uint32 stringId, const IStringWaiterRemover *premover, string *result)
 	{
 		H_AUTO( CStringManagerClient_waitDynString )
 
 		nlassert(premover && result);
-		ucstring value;
+		string value;
 		if (getDynString(stringId, value))
 			*result = value;
 		else
@@ -253,7 +260,7 @@ namespace STRING_MANAGER
 		H_AUTO( CStringManagerClient_waitDynString2 )
 
 		nlassert(pcallback != 0);
-		ucstring value;
+		string value;
 		if (getDynString(stringId, value))
 		{
 			pcallback->onDynStringAvailable(stringId, value);
@@ -330,7 +337,7 @@ restartLoop4:
 
 
 
-	bool CStringManagerClient::getString(uint32 stringId, ucstring &result)
+	bool CStringManagerClient::getString(uint32 stringId, string &result)
 	{
 		H_AUTO( CStringManagerClient_getString )
 
@@ -357,7 +364,7 @@ restartLoop4:
 					_WaitingStrings.insert(stringId);
 					// need to ask for this string.
 					NLMISC::CBitMemStream bms;
-					const std::string msgType = "STRING_MANAGER:STRING_RQ";
+					const string msgType = "STRING_MANAGER:STRING_RQ";
 					if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 					{
 						bms.serial( stringId );
@@ -374,7 +381,7 @@ restartLoop4:
 				{
 					char tmp[1024];
 					sprintf(tmp, "<WAIT STR %u>", stringId);
-					result = ucstring(tmp);
+					result = tmp;
 				}
 				else
 					result.erase(); // = _WaitString;
@@ -385,14 +392,14 @@ restartLoop4:
 			{
 				char tmp[1024];
 				sprintf(tmp, "<STR %u>", stringId);
-				result = ucstring(tmp) + it->second;
+				result = tmp + it->second;
 			}
 			else
 			{
 				result = it->second;
-				if (result.size() > 9 && result.substr(0, 9) == ucstring("<missing:")) 
+				if (result.size() > 9 && result.substr(0, 9) == "<missing:") 
 				{
-					map<ucstring, ucstring>::iterator itds = _DynStrings.find(result.substr(9, result.size()-10));
+					map<string, string>::iterator itds = _DynStrings.find(result.substr(9, result.size()-10));
 					if (itds != _DynStrings.end())
 						result = itds->second;
 				}
@@ -402,7 +409,7 @@ restartLoop4:
 		return true;
 	}
 
-	void CStringManagerClient::receiveString(uint32 stringId, const ucstring &str)
+	void CStringManagerClient::receiveString(uint32 stringId, const string &str)
 	{
 		H_AUTO( CStringManagerClient_receiveString )
 
@@ -419,8 +426,8 @@ restartLoop4:
 			TStringsContainer::iterator it(_ReceivedStrings.find(stringId));
 			nlwarning("Receiving stringID %u (%s), already in received string (%s), replacing with new value.",
 				stringId,
-				str.toString().c_str(),
-				it->second.toString().c_str());
+				str.c_str(),
+				it->second.c_str());
 
 			if (it->second != str)
 				it->second = str;
@@ -484,7 +491,7 @@ restartLoop:
 			last = _WaitingDynStrings.end();
 			for (; first != last; ++first)
 			{
-				ucstring value;
+				string value;
 				uint number = first->first;
 				/// Warning: if getDynString() return true, 'first' is erased => don't use it after in this loop
 				if (getDynString(number, value))
@@ -616,7 +623,7 @@ restartLoop:
 				return false;
 			}
 			// ok, we have the base string, we can serial the parameters
-			ucstring::iterator first(dynInfo.String.begin()), last(dynInfo.String.end());
+			string::iterator first(dynInfo.String.begin()), last(dynInfo.String.end());
 			for (; first != last; ++first)
 			{
 				if (*first == '%')
@@ -699,10 +706,10 @@ restartLoop:
 		if (dynInfo.Status == TDynStringInfo::serialized)
 		{
 			// try to retreive all string parameter to build the string.
-			ucstring temp;
+			string temp;
 			temp.reserve(dynInfo.String.size() * 2);
-			ucstring::iterator src(dynInfo.String.begin());
-			ucstring::iterator move = src;
+			string::iterator src(dynInfo.String.begin());
+			string::iterator move = src;
 
 			std::vector<TParamValue>::iterator first(dynInfo.Params.begin()), last(dynInfo.Params.end());
 			for (; first != last; ++first)
@@ -712,7 +719,7 @@ restartLoop:
 				{
 				case string_id:
 					{
-						ucstring str;
+						string str;
 						if (!getString(param.StringId, str))
 							return false;
 
@@ -741,10 +748,10 @@ restartLoop:
 						}
 
 						// If the string contains a title, then remove it
-						ucstring::size_type pos = str.find('$');
+						string::size_type pos = str.find('$');
 						if ( ! str.empty() && pos != ucstring::npos)
 						{
-							str = CEntityCL::removeTitleFromName(str.toUtf8());
+							str = CEntityCL::removeTitleFromName(str);
 						}
 
 						// append this string
@@ -759,13 +766,13 @@ restartLoop:
 						char value[1024];
 						sprintf(value, "%d", param.Integer);
 						temp.append(move, src+param.ReplacementPoint);
-						temp+=ucstring(value);
+						temp += value;
 						move = dynInfo.String.begin()+param.ReplacementPoint+2;
 					}
 					break;
 				case time:
 					{
-						ucstring value;
+						string value;
 						uint32 time = (uint32)param.Time;
 						if( time >= (10*60*60) )
 						{
@@ -796,7 +803,7 @@ restartLoop:
 						char value[1024];
 						sprintf(value, "%u", (uint32)param.Money);
 						temp.append(move, src+param.ReplacementPoint);
-						temp+=ucstring(value);
+						temp += value;
 						move = dynInfo.String.begin()+param.ReplacementPoint+2;
 					}
 					// TODO
@@ -805,7 +812,7 @@ restartLoop:
 					break;
 				case dyn_string_id:
 					{
-						ucstring dynStr;
+						string dynStr;
 						if (!getDynString(param.DynStringId, dynStr))
 							return false;
 						temp.append(move, src+param.ReplacementPoint);
@@ -823,8 +830,8 @@ restartLoop:
 
 			// apply any 'delete' character in the string and replace double '%'
 			{
-				uint i =0;
-				while (i < temp.size())
+				ptrdiff_t i =0;
+				while (i < (ptrdiff_t)temp.size())
 				{
 					if (temp[i] == 8)
 					{
@@ -853,7 +860,7 @@ restartLoop:
 	}
 
 
-	bool CStringManagerClient::getDynString(uint32 dynStringId, ucstring &result)
+	bool CStringManagerClient::getDynString(uint32 dynStringId, std::string &result)
 	{
 		H_AUTO( CStringManagerClient_getDynString )
 
@@ -882,7 +889,7 @@ restartLoop:
 				{
 					char tmp[1024];
 					sprintf(tmp, "<DYNSTR %u>", dynStringId);
-					result = ucstring(tmp) + it->second.String;
+					result = tmp + it->second.String;
 				}
 				else
 					result = it->second.String;
@@ -908,7 +915,7 @@ restartLoop:
 						nlwarning("DynStringID %u is unknown !", dynStringId);
 						char tmp[1024];
 						sprintf(tmp, "<UNKNOWN DYNSTR %u>", dynStringId);
-						result = ucstring(tmp);
+						result = tmp;
 					}
 					else
 						result.erase(); //_WaitString;
@@ -920,7 +927,7 @@ restartLoop:
 					{
 						char tmp[1024];
 						sprintf(tmp, "<DYNSTR %u>", dynStringId);
-						result = ucstring(tmp) + it->second.String;
+						result = tmp + it->second.String;
 					}
 					else
 						result = it->second.String;
@@ -933,7 +940,7 @@ restartLoop:
 				{
 					char tmp[1024];
 					sprintf(tmp, "<WAIT DYNSTR %u>", dynStringId);
-					result = ucstring(tmp);
+					result = tmp;
 				}
 				else
 					result.erase(); // = _WaitString;
@@ -943,7 +950,7 @@ restartLoop:
 	}
 
 	// Tool fct to lookup a reference file
-	static string	lookupReferenceFile(const std::string &fileName)
+	static string	lookupReferenceFile(const string &fileName)
 	{
 		string	referenceFile;
 		// special location for the "wk" language
@@ -964,14 +971,14 @@ restartLoop:
 		return referenceFile;
 	}
 
-	void CLoadProxy::loadStringFile(const std::string &filename, ucstring &text)
+	void CLoadProxy::loadStringFile(const string &filename, ucstring &text)
 	{
 		vector<TStringInfo>	reference;
 		vector<TStringInfo> addition;
 		vector<TStringInfo> diff;
 
 		// get the correct path name of the ref file
-		std::string referenceFile= lookupReferenceFile(filename);
+		string referenceFile= lookupReferenceFile(filename);
 
 		// load the reference file
 		if (!referenceFile.empty())
@@ -1041,7 +1048,7 @@ public:
 		TWorksheet	diff;
 
 		// get the correct path name of the ref file
-		std::string referenceFile= lookupReferenceFile(filename);
+		string referenceFile= lookupReferenceFile(filename);
 
 		// load the reference file
 		if (!referenceFile.empty())
@@ -1134,7 +1141,7 @@ public:
 const string	StringClientPackedFileName= "./save/string_client.pack";
 // Must Increment this number if change are made to the code (else change not taken into account)
 const uint		StringClientPackedVersion= 0;
-bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, const std::vector<std::string> &fileNames, const std::string &languageCode)
+bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, const std::vector<string> &fileNames, const string &languageCode)
 {
 	fileChecks.resize(fileNames.size());
 
@@ -1142,7 +1149,7 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 	for(uint i=0;i<fileChecks.size();i++)
 	{
 		// get the correct path name of the ref file
-		std::string referenceFile= lookupReferenceFile(fileNames[i]);
+		string referenceFile= lookupReferenceFile(fileNames[i]);
 		fileChecks[i].ReferenceDate= referenceFile.empty()?0:CFile::getFileModificationDate(referenceFile);
 
 		// get then one of the working File (NB: 0 is a valid reponse for Final Client: no working file)
@@ -1169,7 +1176,7 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 
 
 // ***************************************************************************
-void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
+void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 {
 	ucstring		womenNameColIdent= string("women_name");
 	ucstring		descColIdent= string("description");
@@ -1213,8 +1220,8 @@ void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
 			uint32	profile0= (uint32)ryzomGetLocalTime();
 
 			ucstring ucs;
-			std::string fileName = fileNames[i];
-			std::string keyExtenstion = specialWords[i*3+2];
+			string fileName = fileNames[i];
+			string keyExtenstion = specialWords[i*3+2];
 
 			// read the ucstring and make diffs with data in ./translation/work.
 			CReadWorkSheetFile	rwsf;
@@ -1250,17 +1257,17 @@ void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
 			for(uint j=1;j<ws.size();j++)
 			{
 				// Get the key and name string.
-				const ucstring &key=  ws.getData(j, keyColIndex);
-				const ucstring &name= ws.getData(j, nameColIndex);
+				const string &key=  ws.getData(j, keyColIndex).toUtf8();
+				const string &name= ws.getData(j, nameColIndex).toUtf8();
 				// Append to the I18N.
 				// avoid case problems
-				string	keyStr= NLMISC::toLower(key.toString());
+				string keyStr = NLMISC::toLower(key);
 
 				// append the special key extension.
 				keyStr+= keyExtenstion;
 
 				// insert in map.
-				std::map<std::string, CItem>::iterator	it;
+				std::map<string, CItem>::iterator	it;
 				it= _SpecItem_TempMap.find( keyStr );
 				if ( it!=_SpecItem_TempMap.end() )
 				{
@@ -1276,7 +1283,7 @@ void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
 					if(womenNameColIndex!=std::numeric_limits<uint>::max())
 					{
 						const ucstring &womenName= ws.getData(j, womenNameColIndex);
-						_SpecItem_TempMap[keyStr].WomenName= womenName;
+						_SpecItem_TempMap[keyStr].WomenName= womenName.toUtf8();
 						// replace all \n in the women name with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].WomenName, "\\n", "\n"));
 					}
@@ -1285,7 +1292,7 @@ void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
 					if(descColIndex!=std::numeric_limits<uint>::max())
 					{
 						const ucstring &desc= ws.getData(j, descColIndex);
-						_SpecItem_TempMap[keyStr].Desc= desc;
+						_SpecItem_TempMap[keyStr].Desc= desc.toUtf8();
 						// replace all \n in the desc with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].Desc, "\\n", "\n"));
 					}
@@ -1294,7 +1301,7 @@ void CStringManagerClient::initI18NSpecialWords(const std::string &languageCode)
 					if(descColIndex2!=std::numeric_limits<uint>::max())
 					{
 						const ucstring &desc= ws.getData(j, descColIndex2);
-						_SpecItem_TempMap[keyStr].Desc2= desc;
+						_SpecItem_TempMap[keyStr].Desc2= desc.toUtf8();
 						// replace all \n in the desc with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].Desc2, "\\n", "\n"));
 					}
@@ -1358,7 +1365,7 @@ void CStringManagerClient::specialWordsMemoryCompress()
 	// Make big strings
 	_SpecItems.resize(nNbEntries);
 	_SpecItem_Labels = new char[nLabelSize];
-	_SpecItem_NameDesc = new ucchar[nNameDescSize];
+	_SpecItem_NameDesc = new char[nNameDescSize];
 
 	nNbEntries = 0;
 	nLabelSize = 0;
@@ -1366,35 +1373,30 @@ void CStringManagerClient::specialWordsMemoryCompress()
 	it = _SpecItem_TempMap.begin();
 	while (it != _SpecItem_TempMap.end())
 	{
-
-		if (strnicmp(it->first.c_str(), "bf", 2) == 0)
+		if (NLMISC::startsWith(it->first.c_str(), "bf"))
 		{
 			uint nDbg = 0;
 			nDbg++;
 		}
 
 		_SpecItems[nNbEntries].Label = _SpecItem_Labels+nLabelSize;
-		strcpy(_SpecItems[nNbEntries].Label, it->first.c_str());
+		strcpy(_SpecItem_Labels+nLabelSize, it->first.c_str());
 		nLabelSize += (uint32)it->first.size() + 1;
 
 		_SpecItems[nNbEntries].Name = _SpecItem_NameDesc+nNameDescSize;
-		memcpy(_SpecItems[nNbEntries].Name, it->second.Name.c_str(), 2*(it->second.Name.size()+1));
-		_SpecItems[nNbEntries].Name[it->second.Name.size()] = 0;
+		strcpy(_SpecItem_NameDesc+nNameDescSize, it->second.Name.c_str());
 		nNameDescSize += (uint32)it->second.Name.size() + 1;
 
 		_SpecItems[nNbEntries].WomenName = _SpecItem_NameDesc+nNameDescSize;
-		memcpy(_SpecItems[nNbEntries].WomenName, it->second.WomenName.c_str(), 2*(it->second.WomenName.size()+1));
-		_SpecItems[nNbEntries].WomenName[it->second.WomenName.size()] = 0;
+		strcpy(_SpecItem_NameDesc+nNameDescSize, it->second.WomenName.c_str());
 		nNameDescSize += (uint32)it->second.WomenName.size() + 1;
 
 		_SpecItems[nNbEntries].Desc = _SpecItem_NameDesc+nNameDescSize;
-		memcpy(_SpecItems[nNbEntries].Desc, it->second.Desc.c_str(), 2*(it->second.Desc.size()+1));
-		_SpecItems[nNbEntries].Desc[it->second.Desc.size()] = 0;
+		strcpy(_SpecItem_NameDesc+nNameDescSize, it->second.Desc.c_str());
 		nNameDescSize += (uint32)it->second.Desc.size() + 1;
 
 		_SpecItems[nNbEntries].Desc2 = _SpecItem_NameDesc+nNameDescSize;
-		memcpy(_SpecItems[nNbEntries].Desc2, it->second.Desc2.c_str(), 2*(it->second.Desc2.size()+1));
-		_SpecItems[nNbEntries].Desc2[it->second.Desc2.size()] = 0;
+		strcpy(_SpecItem_NameDesc+nNameDescSize, it->second.Desc2.c_str());
 		nNameDescSize += (uint32)it->second.Desc2.size() + 1;
 
 		nNbEntries++;
@@ -1406,22 +1408,21 @@ void CStringManagerClient::specialWordsMemoryCompress()
 }
 
 // ***************************************************************************
-const ucchar * CStringManagerClient::getSpecialWord(const std::string &label, bool women)
+const char *CStringManagerClient::getSpecialWord(const string &label, bool women)
 {
 	if (label.empty())
 	{
-		static ucstring	emptyString;
+		static string	emptyString;
 		return emptyString.c_str();
 	}
 
 	if (label[0] == '#')
 	{
-		static ucstring	rawString;
 		return getLocalizedName(label.substr(1, label.size()-1));
 	}
 
 	// avoid case problems
-	static std::string lwrLabel;
+	static string lwrLabel;
 	lwrLabel = toLower(label);
 
 	if (_SpecItem_MemoryCompressed)
@@ -1456,28 +1457,26 @@ const ucchar * CStringManagerClient::getSpecialWord(const std::string &label, bo
 		}
 	}
 
-	static ucstring	badString;
-
-	badString = ucstring(std::string("<NotExist:")+lwrLabel+">");
-
+	static string badString;
+	badString = "<NotExist:" + lwrLabel + ">";
 	return badString.c_str();
 }
 
 // ***************************************************************************
-const ucchar * CStringManagerClient::getSpecialDesc(const std::string &label)
+const char *CStringManagerClient::getSpecialDesc(const string &label)
 {
-	static ucstring	emptyString;
+	static string emptyString;
 	if (label.empty())
 		return emptyString.c_str();
 
 	// avoid case problems
-	static std::string	lwrLabel;
+	static string lwrLabel;
 	lwrLabel = toLower(label);
 
 	if (_SpecItem_MemoryCompressed)
 	{
 		CItemLight tmp;
-		tmp.Label = (char*)lwrLabel.c_str();
+		tmp.Label = lwrLabel.c_str();
 		vector<CItemLight>::iterator it = lower_bound(_SpecItems.begin(), _SpecItems.end(), tmp, CItemLightComp());
 
 		if (it != _SpecItems.end())
@@ -1497,20 +1496,20 @@ const ucchar * CStringManagerClient::getSpecialDesc(const std::string &label)
 }
 
 // ***************************************************************************
-const ucchar * CStringManagerClient::getSpecialDesc2(const std::string &label)
+const char *CStringManagerClient::getSpecialDesc2(const string &label)
 {
-	static ucstring	emptyString;
+	static string emptyString;
 	if (label.empty())
 		return emptyString.c_str();
 
 	// avoid case problems
-	static std::string	lwrLabel;
+	static string lwrLabel;
 	lwrLabel = toLower(label);
 
 	if (_SpecItem_MemoryCompressed)
 	{
 		CItemLight tmp;
-		tmp.Label = (char*)lwrLabel.c_str();
+		tmp.Label = lwrLabel.c_str();
 		vector<CItemLight>::iterator it = lower_bound(_SpecItems.begin(), _SpecItems.end(), tmp, CItemLightComp());
 
 		if (it != _SpecItems.end())
@@ -1539,87 +1538,88 @@ const ucchar * CStringManagerClient::getSpecialDesc2(const std::string &label)
 */
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getPlaceLocalizedName(const string &placeNameID)
+const char *CStringManagerClient::getPlaceLocalizedName(const string &placeNameID)
 {
 	return getSpecialWord(placeNameID);
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getFactionLocalizedName(const string &factionNameID)
+const char *CStringManagerClient::getFactionLocalizedName(const string &factionNameID)
 {
 	return getSpecialWord(factionNameID);
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSkillLocalizedName(SKILLS::ESkills e)
+const char *CStringManagerClient::getSkillLocalizedName(SKILLS::ESkills e)
 {
 	return getSpecialWord(SKILLS::toString(e));
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getItemLocalizedName(CSheetId id)
+const char *CStringManagerClient::getItemLocalizedName(CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getCreatureLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getCreatureLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSBrickLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSBrickLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSPhraseLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSPhraseLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-/*const ucchar *CStringManagerClient::getBrickLocalizedDescription(BRICK_FAMILIES::TBrickFamily e)
+/*const char *CStringManagerClient::getBrickLocalizedDescription(BRICK_FAMILIES::TBrickFamily e)
 {
 	return getSpecialDesc(BRICK_FAMILIES::toString(e));
 }
 */
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSkillLocalizedDescription(SKILLS::ESkills e)
+const char *CStringManagerClient::getSkillLocalizedDescription(SKILLS::ESkills e)
 {
 	return getSpecialDesc(SKILLS::toString(e));
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getItemLocalizedDescription(CSheetId id)
+const char *CStringManagerClient::getItemLocalizedDescription(CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSBrickLocalizedDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSBrickLocalizedDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSBrickLocalizedCompositionDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSBrickLocalizedCompositionDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc2(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getTitleLocalizedName(const ucstring &titleId, bool women)
+const char *CStringManagerClient::getTitleLocalizedName(const string &titleId, bool women)
 {
-	vector<ucstring> listInfos = getTitleInfos(titleId, women);
+	vector<string> listInfos = getTitleInfos(titleId, women);
+	
 	if (!listInfos.empty())
 	{
 		_TitleWords.push_back(listInfos[0]);
@@ -1661,18 +1661,18 @@ const ucchar *CStringManagerClient::getLocalizedName(const ucstring &uctext)
 }
 
 // ***************************************************************************
-vector<ucstring> CStringManagerClient::getTitleInfos(const ucstring &titleId, bool women)
+vector<string> CStringManagerClient::getTitleInfos(const string &titleId, bool women)
 {
 	//ucstring infosUC;
 	//infosUC.fromUtf8(titleId);
-	vector<ucstring> listInfos;
-	splitUCString(titleId, ucstring("#"), listInfos);
+	vector<string> listInfos;
+	splitString(titleId, string("#"), listInfos);
 
 	if (!listInfos.empty())
 	{
 		if (titleId[0] != '#')
 		{
-			listInfos[0] = getSpecialWord(listInfos[0].toUtf8(), women);
+			listInfos[0] = getSpecialWord(listInfos[0], women);
 		}
 	}
 
@@ -1680,74 +1680,76 @@ vector<ucstring> CStringManagerClient::getTitleInfos(const ucstring &titleId, bo
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type)
+const char *CStringManagerClient::getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type)
 {
 	return getSpecialDesc(EGSPD::CClassificationType::toString(type));
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getOutpostLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getOutpostLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getOutpostLocalizedDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getOutpostLocalizedDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getOutpostBuildingLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getOutpostBuildingLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getOutpostBuildingLocalizedDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getOutpostBuildingLocalizedDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSquadLocalizedName(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSquadLocalizedName(NLMISC::CSheetId id)
 {
 	return getSpecialWord(id.toString());
 }
 
 // ***************************************************************************
-const ucchar *CStringManagerClient::getSquadLocalizedDescription(NLMISC::CSheetId id)
+const char *CStringManagerClient::getSquadLocalizedDescription(NLMISC::CSheetId id)
 {
 	return getSpecialDesc(id.toString());
 }
 
 // ***************************************************************************
-void CStringManagerClient::replaceDynString(const ucstring &name, const ucstring &text)
+void CStringManagerClient::replaceDynString(const std::string &name, const std::string &text)
 {
 	_DynStrings[name] = text;
 }
 
 
 // ***************************************************************************
-void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const ucstring &name, const ucstring &desc, const ucstring &desc2)
+void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const std::string &name, const std::string &desc, const std::string &desc2)
 {
-	std::string	label= id.toString();
+	string	label= id.toString();
 	if (label.empty())
 	{
 		return;
 	}
 
 	// avoid case problems
-	static std::string	lwrLabel;
+	static string lwrLabel;
 	lwrLabel = toLower(label);
 
+	nlassert(!_SpecItem_MemoryCompressed); // Not allowed, strings are released!
 	if (_SpecItem_MemoryCompressed)
 	{
-		ucchar *strName = (ucchar *)name.c_str();
-		ucchar *strDesc = (ucchar *)desc.c_str();
-		ucchar *strDesc2 = (ucchar *)desc2.c_str();
+#if 0
+		const char *strName = name.c_str();
+		const char *strDesc = desc.c_str();
+		const char *strDesc2 = desc2.c_str();
 		CItemLight tmp;
-		tmp.Label = (char*)lwrLabel.c_str();
+		tmp.Label = lwrLabel.c_str();
 		vector<CItemLight>::iterator it = lower_bound(_SpecItems.begin(), _SpecItems.end(), tmp, CItemLightComp());
 
 		if (it != _SpecItems.end())
@@ -1773,6 +1775,7 @@ void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const ucstring
 			tmp.Desc2 = strDesc2;
 			_SpecItems.push_back(tmp);
 		}
+#endif
 	}
 	else
 	{
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index 971d808b3..5179318f4 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -63,15 +63,16 @@ public:
 	// Force the cache to be saved
 	void flushStringCache();
 
-	bool getString(uint32 stringId, std::string &result) { ucstring temp; bool res = getString(stringId, temp); result = temp.toUtf8(); return res; } // FIXME: UTF-8
-	bool getString(uint32 stringId, ucstring &result);
-	void waitString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result);
+	bool getString(uint32 stringId, std::string &result);
+	bool getString(uint32 stringId, ucstring &result) { std::string temp; bool res = getString(stringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
+	void waitString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitString(uint32 stringId, IStringWaitCallback *pcallback);
-	bool getDynString(uint32 dynStringId, ucstring &result);
-	void waitDynString(uint32 stringId, const IStringWaiterRemover *premover, ucstring *result);
+	bool getDynString(uint32 dynStringId, std::string &result);
+	bool getDynString(uint32 dynStringId, ucstring &result) { std::string temp; bool res = getString(dynStringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
+	void waitDynString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitDynString(uint32 stringId, IStringWaitCallback *pcallback);
 
-	void receiveString(uint32 stringId, const ucstring &str);
+	void receiveString(uint32 stringId, const std::string &str);
 	void receiveDynString(NLMISC::CBitMemStream &bms);
 
 	void releaseDynString(uint32 stringId);
@@ -80,55 +81,55 @@ public:
 	static void				initI18NSpecialWords(const std::string &languageCode);
 	static void				specialWordsMemoryCompress();
 	// Yoyo: Replace the Brick Name with Filled stats (CSBrickManager work). No-Op if not found
-	static void				replaceSBrickName(NLMISC::CSheetId id, const ucstring &name, const ucstring &desc, const ucstring &desc2);
-	static void				replaceDynString(const ucstring &name, const ucstring &text);
+	static void				replaceSBrickName(NLMISC::CSheetId id, const std::string &name, const std::string &desc, const std::string &desc2);
+	static void				replaceDynString(const std::string &name, const std::string &text);
 
 	// Get the Localized Name of the Places.
-	static const ucchar *getPlaceLocalizedName(const std::string &placeNameID);
+	static const char *getPlaceLocalizedName(const std::string &placeNameID);
 	// Get the Localized Name of the faction (for the fame)
-	static const ucchar *getFactionLocalizedName(const std::string &factionNameID);
+	static const char *getFactionLocalizedName(const std::string &factionNameID);
 	// Get the Localized Name of the Skill.
-	static const ucchar *getSkillLocalizedName(SKILLS::ESkills e);
+	static const char *getSkillLocalizedName(SKILLS::ESkills e);
 	// Get the Localized Name of the Item.
-	static const ucchar *getItemLocalizedName(NLMISC::CSheetId id);
+	static const char *getItemLocalizedName(NLMISC::CSheetId id);
 	// Get the Localized Name of the Creature.
-	static const ucchar *getCreatureLocalizedName(NLMISC::CSheetId id);
+	static const char *getCreatureLocalizedName(NLMISC::CSheetId id);
 	// Get the Localized Name of the SBrick.
-	static const ucchar *getSBrickLocalizedName(NLMISC::CSheetId id);
+	static const char *getSBrickLocalizedName(NLMISC::CSheetId id);
 	// Get the Localized Name of the SPhrase.
-	static const ucchar *getSPhraseLocalizedName(NLMISC::CSheetId id);
+	static const char *getSPhraseLocalizedName(NLMISC::CSheetId id);
 
 	// Get the Localized Description of the Skill.
-	static const ucchar *getSkillLocalizedDescription(SKILLS::ESkills e);
+	static const char *getSkillLocalizedDescription(SKILLS::ESkills e);
 	// Get the Localized Descriptionof the Item.
-	static const ucchar *getItemLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getItemLocalizedDescription(NLMISC::CSheetId id);
 	// Get the Localized Description of the SBrick.
-	static const ucchar *getSBrickLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getSBrickLocalizedDescription(NLMISC::CSheetId id);
 	// Get the Localized Composition Description of the SBrick.
-	static const ucchar *getSBrickLocalizedCompositionDescription(NLMISC::CSheetId id);
+	static const char *getSBrickLocalizedCompositionDescription(NLMISC::CSheetId id);
 	// Get the Localized Description of the SPhrase.
-	static const ucchar *getSPhraseLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getSPhraseLocalizedDescription(NLMISC::CSheetId id);
 
 	// Get the Localized Title name
-	static const ucchar *getTitleLocalizedName(const ucstring &titleId, bool women);
-	static const ucchar *getLocalizedName(const ucstring &text);
-	static std::vector<ucstring> getTitleInfos(const ucstring &titleId, bool women);
+	static const char *getTitleLocalizedName(const std::string &titleId, bool women);
+	static const char *getLocalizedName(const std::string &text);
+	static std::vector<std::string> getTitleInfos(const std::string &titleId, bool women);
 
 	// Get the Localized name of a classification type
-	static const ucchar *getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type);
+	static const char *getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type);
 
 	// Outpost name
-	static const ucchar *getOutpostLocalizedName(NLMISC::CSheetId id);
+	static const char *getOutpostLocalizedName(NLMISC::CSheetId id);
 	// Outpost description
-	static const ucchar *getOutpostLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getOutpostLocalizedDescription(NLMISC::CSheetId id);
 	// Outpost building name
-	static const ucchar *getOutpostBuildingLocalizedName(NLMISC::CSheetId id);
+	static const char *getOutpostBuildingLocalizedName(NLMISC::CSheetId id);
 	// Outpost building description
-	static const ucchar *getOutpostBuildingLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getOutpostBuildingLocalizedDescription(NLMISC::CSheetId id);
 	// Squad name
-	static const ucchar *getSquadLocalizedName(NLMISC::CSheetId id);
+	static const char *getSquadLocalizedName(NLMISC::CSheetId id);
 	// Squad description
-	static const ucchar *getSquadLocalizedDescription(NLMISC::CSheetId id);
+	static const char *getSquadLocalizedDescription(NLMISC::CSheetId id);
 
 private:
 	// constructor.
@@ -153,8 +154,8 @@ private:
 
 	struct TParamValue
 	{
-		TParamType				Type;
-		ucstring::size_type		ReplacementPoint;
+		TParamType Type;
+		std::string::size_type ReplacementPoint;
 		union
 		{
 			uint32	StringId;
@@ -177,7 +178,7 @@ private:
 		NLMISC::CBitMemStream		Message;
 		uint32						StringId;
 		std::vector<TParamValue>	Params;
-		ucstring					String;
+		std::string					String;
 	};
 
 	enum
@@ -189,7 +190,7 @@ private:
 	struct TStringWaiter
 	{
 		/// Pointer to the ucstring to fill
-		ucstring					*Result;
+		std::string					*Result;
 		/// Pointer to the remover that contains this string reference
 		const IStringWaiterRemover	*Remover;
 	};
@@ -198,7 +199,7 @@ private:
 
 
 	/// Container for simple strings
-	typedef CHashMap<uint, ucstring>			TStringsContainer;
+	typedef CHashMap<uint, std::string>			TStringsContainer;
 	/// Container for dyn strings
 	typedef CHashMap<uint, TDynStringInfo>		TDynStringsContainer;
 	/// Container of string reference waiting for value.
@@ -224,7 +225,7 @@ private:
 	TStringCallbacksContainer	_DynStringsCallbacks;
 
 	// Return value for waiting string..
-	static ucstring			_WaitString;
+	static std::string			_WaitString;
 
 	// Singleton pattern implementation
 	static CStringManagerClient	*_Instance;
@@ -247,7 +248,7 @@ private:
 	struct CCacheString
 	{
 		uint32		StringId;
-		ucstring	String;
+		std::string	String;
 	};
 	std::vector<CCacheString>	_CacheStringToSave;
 	//@}
@@ -257,41 +258,60 @@ private:
 	{
 	public:
 		// The Name of the item
-		ucstring		Name;
+		std::string		Name;
 		// The Women Name of the item
-		ucstring		WomenName;
+		std::string		WomenName;
 		// Description of the item
-		ucstring		Desc;
+		std::string		Desc;
 		// Optional Second description (For SBrick composition for example)
-		ucstring		Desc2;
+		std::string		Desc2;
 
 		void	serial(NLMISC::IStream &f)
 		{
-			sint	ver= f.serialVersion(1);
-			f.serial(Name);
-			if (ver >= 1)
+			sint ver = f.serialVersion(2);
+			if (ver >= 2)
+			{
+				f.serial(Name);
 				f.serial(WomenName);
-			f.serial(Desc);
-			f.serial(Desc2);
+				f.serial(Desc);
+				f.serial(Desc2);
+			}
+			else
+			{
+				nlassert(f.isReading());
+				ucstring name;
+				ucstring womenName;
+				ucstring desc;
+				ucstring desc2;
+				f.serial(name);
+				if (ver >= 1)
+					f.serial(womenName);
+				f.serial(desc);
+				f.serial(desc2);
+				Name = name.toUtf8();
+				WomenName = womenName.toUtf8();
+				Desc = desc.toUtf8();
+				Desc2 = desc2.toUtf8();
+			}
 		}
 	};
 
 	static bool _SpecItem_MemoryCompressed;
 
 	static	std::map<std::string, CItem> _SpecItem_TempMap;
-	static std::vector<ucstring> _TitleWords;
-	static std::map<ucstring, ucstring> _DynStrings;
+	static std::vector<std::string> _TitleWords;
+	static std::map<std::string, std::string> _DynStrings;
 
 
 	static char *_SpecItem_Labels;
-	static ucchar *_SpecItem_NameDesc;
+	static char *_SpecItem_NameDesc;
 	struct CItemLight
 	{
-		char	*Label;
-		ucchar	*Name;
-		ucchar	*WomenName;
-		ucchar	*Desc;
-		ucchar	*Desc2;
+		const char *Label;
+		const char *Name;
+		const char *WomenName;
+		const char *Desc;
+		const char *Desc2;
 	};
 	struct CItemLightComp
 	{
@@ -303,9 +323,9 @@ private:
 
 	static std::vector<CItemLight> _SpecItems;
 
-	static	const ucchar *getSpecialWord(const std::string &label, bool women = false);
-	static	const ucchar *getSpecialDesc(const std::string &label);
-	static	const ucchar *getSpecialDesc2(const std::string &label);
+	static	const char *getSpecialWord(const std::string &label, bool women = false);
+	static	const char *getSpecialDesc(const std::string &label);
+	static	const char *getSpecialDesc2(const std::string &label);
 
 	// Check Files for the Packed string.
 	class CFileCheck
@@ -381,9 +401,9 @@ class IStringWaitCallback
 {
 public:
 	/// Overide this method to receive callback for string.
-	virtual void onStringAvailable(uint /* stringId */, const ucstring &/* value */) {}
+	virtual void onStringAvailable(uint /* stringId */, const std::string &/* value */) {}
 	/// Overide this method to receive callback for dynamic string.
-	virtual void onDynStringAvailable(uint /* stringId */, const ucstring &/* value */) {}
+	virtual void onDynStringAvailable(uint /* stringId */, const std::string &/* value */) {}
 
 	virtual ~IStringWaitCallback()
 	{

From 5a470a7b16a77c1be7b56d8a1d1a40ba7b26788e Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 08:21:31 +0800
Subject: [PATCH 107/292] UTF-8 string manager, ryzom/ryzomcore#335

---
 nel/include/nel/gui/interface_expr.h             |  1 +
 ryzom/client/src/game_context_menu.cpp           |  2 +-
 .../src/interface_v3/action_handler_item.cpp     |  6 ++----
 ryzom/client/src/interface_v3/dbctrl_sheet.cpp   |  8 ++++----
 .../interface_v3/dbgroup_list_sheet_trade.cpp    |  2 +-
 .../src/interface_v3/encyclopedia_manager.cpp    |  9 +++------
 .../src/interface_v3/group_in_scene_bubble.cpp   |  3 +--
 .../interface_v3/group_phrase_skill_filter.cpp   |  2 +-
 ryzom/client/src/interface_v3/group_skills.cpp   |  4 ++--
 .../interface_expr_user_fct_game.cpp             | 16 ++++++++--------
 .../interface_expr_user_fct_items.cpp            |  8 ++++----
 11 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/nel/include/nel/gui/interface_expr.h b/nel/include/nel/gui/interface_expr.h
index 27ed24fe0..b4474ac22 100644
--- a/nel/include/nel/gui/interface_expr.h
+++ b/nel/include/nel/gui/interface_expr.h
@@ -68,6 +68,7 @@ namespace NLGUI
 		void               setInteger(sint64 value) { clean(); _Type = Integer; _IntegerValue = value; }
 		void               setDouble(double value) { clean(); _Type = Double; _DoubleValue = value; }
 		void               setString(const std::string &value) { clean(); _Type = String; _StringValue = value; }
+		void               setString(const char *value) { clean(); _Type = String; _StringValue = value; }
 		void			   setRGBA(NLMISC::CRGBA value) { clean(); _Type = RGBA; _RGBAValue = (uint32)(value.R+(value.G<<8)+(value.B<<16)+(value.A<<24)); }
 		void               setUserType(CInterfaceExprUserType *value);
 		// reset this object to initial state (no type)
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 441976be8..47ca97a80 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -798,7 +798,7 @@ void CGameContextMenu::updateContextMenuOutpostState(uint options)
 	{
 		CViewTextMenu *pVTM = _TextOutpostState;
 		if (pVTM)
-			pVTM->setText(CUtfStringView(STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet)).toUtf8());
+			pVTM->setText(STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet));
 	}
 
 	// apply the active
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 0edd74491..2df888285 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -161,9 +161,8 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 				}
 				else
 				{
-					ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 					if (itemInfo.CustomText.empty())
-						display->setTextFormatTaged(localDesc.toUtf8());
+						display->setTextFormatTaged(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 					else
 					{
 						ucstring text = itemInfo.CustomText;
@@ -305,9 +304,8 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					// Finish the display or add the waiter
 					if (getInventory().isItemInfoUpToDate(ItemSlotId))
 					{
-						ucstring localDesc = ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 						if (itemInfo.CustomText.empty())
-							display->setTextFormatTaged(localDesc.toUtf8());
+							display->setTextFormatTaged(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
 						else
 						{
 							ucstring text = itemInfo.CustomText;
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index a07d4c2fb..e9575f776 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -3385,7 +3385,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 	{
 		// just show the name of the skill
 		// the sheet id is interpreted as a skill enum
-		help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName( (SKILLS::ESkills)_SheetId.getSInt32() )).toUtf8();
+		help= STRING_MANAGER::CStringManagerClient::getSkillLocalizedName( (SKILLS::ESkills)_SheetId.getSInt32() );
 	}
 	else if(getType() == CCtrlSheetInfo::SheetType_Macro)
 	{
@@ -3485,7 +3485,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 		CSBrickManager	*pBM= CSBrickManager::getInstance();
 		CSBrickSheet	*brick= pBM->getBrick(CSheetId(getSheetId()));
 		if(brick)
-			help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brick->Id)).toUtf8();
+			help= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brick->Id);
 		else
 			help= _ContextHelp;
 	}
@@ -3549,7 +3549,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 	{
 		CSPhraseSheet	*phrase= dynamic_cast<CSPhraseSheet*>(SheetMngr.get(CSheetId(getSheetId())));
 		if(phrase)
-			help= CUtfStringView(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(phrase->Id)).toUtf8();
+			help= STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(phrase->Id);
 		else
 			help= _ContextHelp;
 	}
@@ -3557,7 +3557,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 	{
 		const COutpostBuildingSheet *outpost = asOutpostBuildingSheet();
 		if (outpost)
-			help = CUtfStringView(CStringManagerClient::getOutpostBuildingLocalizedName(CSheetId(_SheetId.getSInt32()))).toUtf8();
+			help = CStringManagerClient::getOutpostBuildingLocalizedName(CSheetId(_SheetId.getSInt32()));
 		else
 			help = _ContextHelp;
 	}
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 3d59ea644..2b52de9b0 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -269,7 +269,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		if (pOBS != NULL)
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-			text += string("\n") + CUtfStringView(pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()))).toUtf8();
+			text += string("\n") + pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()));
 			text += "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pOBS->CostDapper));
 			text += CI18N::get("uiBotChatTime") + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute");
 			if ((pOBS->CostTime % 60) != 0)
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index 63c5f07c9..25f5bc2e8 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -360,18 +360,15 @@ void CEncyclopediaManager::rebuildThemaPage(uint32 themaName)
 	{
 		if (pES->type() == CEntitySheet::ITEM)
 		{
-			CUtfStringView desc(pSMC->getItemLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc.toUtf8());
+			pRBVT->setText(pSMC->getItemLocalizedDescription(CSheetId(pThema->RewardSheet)));
 		}
 		else if (pES->type() == CEntitySheet::SBRICK)
 		{
-			CUtfStringView desc(pSMC->getSBrickLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc.toUtf8());
+			pRBVT->setText(pSMC->getSBrickLocalizedDescription(CSheetId(pThema->RewardSheet)));
 		}
 		else if (pES->type() == CEntitySheet::SPHRASE)
 		{
-			CUtfStringView desc(pSMC->getSPhraseLocalizedDescription(CSheetId(pThema->RewardSheet)));
-			pRBVT->setText(desc.toUtf8());
+			pRBVT->setText(pSMC->getSPhraseLocalizedDescription(CSheetId(pThema->RewardSheet)));
 		}
 	}
 
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 258700dd2..c3edc87f9 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -531,10 +531,9 @@ void CGroupInSceneBubbleManager::addSkillPopup (uint skillId, sint delta, uint t
 	if (group)
 	{
 		// Skill name
-		CUtfStringView sSkillName(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId));
 		CViewText *pViewSkillName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewSkillName != NULL)
-			pViewSkillName->setText (sSkillName.toUtf8());
+			pViewSkillName->setText (STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId));
 
 		// Skill value
 		CCDBNodeLeaf *skillLeaf = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:CHARACTER_INFO:SKILLS:"+toString(skillId)+":BaseSKILL", false);
diff --git a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
index d246918bd..7d2054fc4 100644
--- a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
+++ b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
@@ -225,7 +225,7 @@ void	CGroupPhraseSkillFilter::rebuild()
 			// just text
 			pNode->DisplayText = true;
 			pNode->Template = NULL;
-			pNode->Text = CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i)).toUtf8();
+			pNode->Text = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i);
 
 			// Action handler?
 			if(!_AHCtrlNode.empty())
diff --git a/ryzom/client/src/interface_v3/group_skills.cpp b/ryzom/client/src/interface_v3/group_skills.cpp
index d0efce626..146117d17 100644
--- a/ryzom/client/src/interface_v3/group_skills.cpp
+++ b/ryzom/client/src/interface_v3/group_skills.cpp
@@ -336,7 +336,7 @@ void CGroupSkills::createAllTreeNodes()
 
 	// local variable (avoid realloc in loop)
 	vector< pair<string, string> > tempVec(2);
-	string	sSkillName;
+	const char *sSkillName;
 
 	while ((!bQuit) && (nCounter < 32)) // Counter is used to not infinitly loop
 	{
@@ -366,7 +366,7 @@ void CGroupSkills::createAllTreeNodes()
 			pNode->Id = NLMISC::toString(i);
 
 			// get Skill Name
-			sSkillName = CUtfStringView(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i)).toUtf8();
+			sSkillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)i);
 
 			// just text or template?
 			if(_TemplateSkill.empty())
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
index a4dfb9d79..9494deacf 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@@ -1083,7 +1083,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostName)
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const std::string name = CUtfStringView(pSMC->getOutpostLocalizedName(CSheetId(nSheet))).toUtf8();
+	const char *name = pSMC->getOutpostLocalizedName(CSheetId(nSheet));
 
 	result.setString(name);
 
@@ -1110,7 +1110,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostDesc)
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const string name = CUtfStringView(pSMC->getOutpostLocalizedDescription(CSheetId(nSheet))).toUtf8();
+	const char *name = pSMC->getOutpostLocalizedDescription(CSheetId(nSheet));
 
 	result.setString(name);
 
@@ -1137,7 +1137,7 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostBuildingName)
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const string name = CUtfStringView(pSMC->getOutpostBuildingLocalizedName(CSheetId(nSheet))).toUtf8();
+	const char *name = pSMC->getOutpostBuildingLocalizedName(CSheetId(nSheet));
 
 	result.setString(name);
 
@@ -1163,18 +1163,18 @@ static DECLARE_INTERFACE_USER_FCT(getOutpostBuildingDesc)
 	}
 
 	// get sheet name
-	string name;
+	const char *name;
 	CEntitySheet *pSheet= SheetMngr.get(CSheetId(nSheet));
 	COutpostBuildingSheet *pOBS = dynamic_cast<COutpostBuildingSheet*>(pSheet);
 	if (pOBS && pOBS->OBType == COutpostBuildingSheet::OB_Empty)
 	{
 		// Don't display description if the building is an empty slot
-		name.clear();
+		name = "";
 	}
 	else
 	{
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-		name = CUtfStringView(pSMC->getOutpostBuildingLocalizedDescription(CSheetId(nSheet))).toUtf8();
+		name = pSMC->getOutpostBuildingLocalizedDescription(CSheetId(nSheet));
 	}
 
 
@@ -1203,7 +1203,7 @@ static DECLARE_INTERFACE_USER_FCT(getSquadName)
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const string name = CUtfStringView(pSMC->getSquadLocalizedName(CSheetId(nSheet))).toUtf8();
+	const char *name = pSMC->getSquadLocalizedName(CSheetId(nSheet));
 
 	result.setString(name);
 
@@ -1230,7 +1230,7 @@ static DECLARE_INTERFACE_USER_FCT(getSquadDesc)
 
 	// get sheet name
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-	const string name = CUtfStringView(pSMC->getSquadLocalizedDescription(CSheetId(nSheet))).toUtf8();
+	const char *name = pSMC->getSquadLocalizedDescription(CSheetId(nSheet));
 
 	result.setString(name);
 
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
index eafdcccaf..cae4b9d77 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
@@ -320,8 +320,8 @@ static DECLARE_INTERFACE_USER_FCT(getSheetName)
 	else
 	{
 		const CItemSheet *itemSheet = getItemSheet(args);
-		string tmp;
-		if (itemSheet != NULL) tmp = CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedName(itemSheet->Id)).toUtf8();
+		const char *tmp = "";
+		if (itemSheet != NULL) tmp = STRING_MANAGER::CStringManagerClient::getItemLocalizedName(itemSheet->Id);
 		result.setString(tmp);
 		return true;
 	}
@@ -346,8 +346,8 @@ static DECLARE_INTERFACE_USER_FCT(getItemTranslatedName)
 		return false;
 	}
 
-	string tmp;
-	tmp = CUtfStringView(STRING_MANAGER::CStringManagerClient::getItemLocalizedName(sheet)).toUtf8();
+	const char *tmp = "";
+	tmp = STRING_MANAGER::CStringManagerClient::getItemLocalizedName(sheet);
 	result.setString(tmp);
 	return true;
 }

From ecabc00ec5338da1569f552a089dab194b610243 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 08:40:06 +0800
Subject: [PATCH 108/292] UTF-8 various, ryzom/ryzomcore#335

---
 ryzom/client/src/init.cpp                     | 16 ++++++-------
 .../interface_v3/group_in_scene_user_info.cpp | 12 +++++-----
 ryzom/client/src/interface_v3/group_map.cpp   | 10 ++++----
 ryzom/client/src/progress.cpp                 | 24 +++++++++----------
 ryzom/client/src/r2/auto_group.cpp            |  6 ++---
 ryzom/client/src/r2/editor.cpp                |  6 ++---
 ryzom/client/src/r2/tool_draw_prim.cpp        |  6 ++---
 7 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index ebb713a73..41c924baf 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -168,7 +168,7 @@ extern NLMISC::CCmdArgs Args;
 
 // Tips of the day count
 #define RZ_NUM_TIPS 17
-ucstring				TipsOfTheDay;
+std::string				TipsOfTheDay;
 uint					TipsOfTheDayIndex;
 
 // includes for following register classes
@@ -272,19 +272,19 @@ static INT_PTR CALLBACK ExitClientErrorDialogProc(HWND hwndDlg, UINT uMsg, WPARA
 		{
 			if (CI18N::hasTranslation("TheSagaOfRyzom"))
 			{
-				if (!SetWindowTextW(hwndDlg, (WCHAR*)CI18N::get ("TheSagaOfRyzom").c_str ()))
+				if (!SetWindowTextW(hwndDlg, nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str())))
 				{
 					nlwarning("SetWindowText failed: %s", formatErrorMessage(getLastError()).c_str());
 				}
 			}
-			SetDlgItemTextW(hwndDlg, IDC_ERROR_MSG_TEXT, (WCHAR*) CurrentErrorMessage.c_str ());
+			SetDlgItemTextW(hwndDlg, IDC_ERROR_MSG_TEXT, (WCHAR*)CurrentErrorMessage.c_str());
 			if (CI18N::hasTranslation("uiRyzomErrorMsgBoxExit"))
 			{
-				SetDlgItemTextW(hwndDlg, IDOK, (WCHAR*)CI18N::get ("uiRyzomErrorMsgBoxExit").c_str ());
+				SetDlgItemTextW(hwndDlg, IDOK, nlUtf8ToWide(CI18N::get("uiRyzomErrorMsgBoxExit").c_str()));
 			}
 			if (CI18N::hasTranslation("uiRyzomErrorMsgBoxHelp"))
 			{
-				SetDlgItemTextW(hwndDlg, IDC_RYZOM_ERROR_HELP, (WCHAR*)CI18N::get ("uiRyzomErrorMsgBoxHelp").c_str ());
+				SetDlgItemTextW(hwndDlg, IDC_RYZOM_ERROR_HELP, nlUtf8ToWide(CI18N::get("uiRyzomErrorMsgBoxHelp").c_str()));
 			}
 			RECT rect;
 			RECT rectDesktop;
@@ -343,7 +343,7 @@ void ExitClientError (const char *format, ...)
 	/*
 		ucstring ucstr;
 		ucstr.fromUtf8 (str);
-		MessageBoxW (NULL, (WCHAR*)ucstr.c_str(), (WCHAR*)CI18N::get ("TheSagaOfRyzom").c_str (), MB_OK|MB_ICONERROR);
+		MessageBoxW (NULL, (WCHAR *)ucstr.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONERROR);
 	*/
 #else
 	fprintf (stderr, "%s\n", str);
@@ -360,7 +360,7 @@ void ExitClientError (const char *format, ...)
 void ClientInfo (const ucstring &message)
 {
 #ifdef NL_OS_WINDOWS
-	MessageBoxW (NULL, (WCHAR*)message.c_str(), (WCHAR*)CI18N::get ("TheSagaOfRyzom").c_str (), MB_OK|MB_ICONINFORMATION);
+	MessageBoxW(NULL, (WCHAR *)message.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONINFORMATION);
 #endif
 }
 
@@ -368,7 +368,7 @@ void ClientInfo (const ucstring &message)
 bool ClientQuestion (const ucstring &message)
 {
 #ifdef NL_OS_WINDOWS
-	return MessageBoxW (NULL, (WCHAR*)message.c_str(), (WCHAR*)CI18N::get ("TheSagaOfRyzom").c_str (), MB_YESNO|MB_ICONQUESTION) != IDNO;
+	return MessageBoxW(NULL, (WCHAR *)message.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_YESNO|MB_ICONQUESTION) != IDNO;
 #else
 	return false;
 #endif
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index fa88db43e..c5dc116e3 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -200,9 +200,9 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 
 	// Names
 	const char *templateName;
-	ucstring theTribeName;
-	ucstring entityName = entity->getDisplayName();
-	ucstring entityTitle = entity->getTitle();
+	const char *theTribeName = "";
+	std::string entityName = entity->getDisplayName();
+	std::string entityTitle = entity->getTitle().toUtf8();
 
 	// For some NPC's the name is empty and only a title is given,
 	// in that case, treat the title as the name.
@@ -780,19 +780,19 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			// Set player name
 			if (info->_Name)
 			{
-				info->_Name->setText(entityName.toUtf8());
+				info->_Name->setText(entityName);
 				info->_Name->setModulateGlobalColor(false);
 			}
 
 			// Set player title
 			if (info->_Title)
-				info->_Title->setText(entityTitle.toUtf8());
+				info->_Title->setText(entityTitle);
 
 			// Set tribe name
 			if (info->_TribeName)
 			{
 				nlassert(info->_GuildName == NULL);
-				info->_TribeName->setText(theTribeName.toUtf8());
+				info->_TribeName->setText(theTribeName);
 			}
 
 			// Init user leaf nodes
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 7725d45f9..b5302885e 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -2530,19 +2530,19 @@ void CGroupMap::createLMWidgets(const std::vector<CContLandMark> &lms)
 		NLMISC::CVector2f mapPos;
 		worldToMap(mapPos, rCLM.Pos);
 
-		const ucstring ucsTmp(CStringManagerClient::getPlaceLocalizedName(rCLM.TitleTextID));
-		const ucstring lcTitle = toLower(ucsTmp);
+		const char *ucsTmp = CStringManagerClient::getPlaceLocalizedName(rCLM.TitleTextID);
+		const std::string lcTitle = toLower(ucsTmp);
 
 		bool searchMatch = notWorldMode && _LandmarkFilter.size() > 0 && filterLandmark(lcTitle);
 		if (searchMatch)
-			_MatchedLandmarks.push_back(SMatchedLandmark(rCLM.Pos, ucsTmp, _ContinentLMOptions));
+			_MatchedLandmarks.push_back(SMatchedLandmark(rCLM.Pos, ucstring::makeFromUtf8(ucsTmp), _ContinentLMOptions));
 
 		// Add button if not a region nor a place
 		if ((rCLM.Type != CContLandMark::Region) && (rCLM.Type != CContLandMark::Place) &&
 			(rCLM.Type != CContLandMark::Street))
 		{
 			if (rCLM.Type != CContLandMark::Stable)
-				addLandMark(_ContinentLM, mapPos, ucsTmp, _ContinentLMOptions);
+				addLandMark(_ContinentLM, mapPos, ucstring::makeFromUtf8(ucsTmp), _ContinentLMOptions);
 			else
 				addLandMark(_ContinentLM, mapPos, CI18N::get("uiStable"), _ContinentLMOptions);
 			_ContinentLM.back()->Type = rCLM.Type;
@@ -2551,7 +2551,7 @@ void CGroupMap::createLMWidgets(const std::vector<CContLandMark> &lms)
 		else // just add a text
 		{
 			CLandMarkText *pNewText = new CLandMarkText(CViewBase::TCtorParam());
-			pNewText->setText(ucsTmp.toUtf8());
+			pNewText->setText(ucsTmp);
 			pNewText->Pos = mapPos;
 			pNewText->setParent(this);
 			pNewText->setParentPosRef(Hotspot_BL);
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index e75b4a984..c27e285e1 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -50,7 +50,7 @@ extern NL3D::UMaterial LoadingMaterialFull;
 
 extern std::vector<UTextureFile*> LogoBitmaps;
 extern uint TipsOfTheDayIndex;
-extern ucstring			TipsOfTheDay;
+extern string			TipsOfTheDay;
 extern bool					UseEscapeDuringLoading;
 
 CProgress::CProgress ()
@@ -287,8 +287,8 @@ void CProgress::internalProgress (float value)
 				// Display the tips of the day.
 				TextContext->setFontSize((uint)(16.f * fontFactor));
 				TextContext->setHotSpot(UTextContext::MiddleTop);
-				ucstring::size_type index = 0;
-				ucstring::size_type end = TipsOfTheDay.find((ucchar)'\n');
+				string::size_type index = 0;
+				string::size_type end = TipsOfTheDay.find('\n');
 				if (end == string::npos)
 					end = TipsOfTheDay.size();
 				float fY = ClientCfg.TipsY;
@@ -297,15 +297,15 @@ void CProgress::internalProgress (float value)
 					while (index < end)
 					{
 						// Get the line
-						ucstring line = TipsOfTheDay.substr (index, end-index);
+						string line = TipsOfTheDay.substr (index, end-index);
 
 						// Draw the line
 						TextContext->printAt(0.5f, fY, line);
 						fY = nextLine (TextContext->getFontSize(), Driver->getWindowHeight(), fY);
 
 						index=end+1;
-						end = TipsOfTheDay.find((ucchar)'\n', index);
-						if (end == ucstring::npos)
+						end = TipsOfTheDay.find('\n', index);
+						if (end == string::npos)
 							end = TipsOfTheDay.size();
 					}
 
@@ -338,7 +338,7 @@ void CProgress::internalProgress (float value)
 						TextContext->setFontSize((uint)(15.f * fontFactor));
 						TextContext->setHotSpot(UTextContext::BottomLeft);
 
-						ucstring uc = CI18N::get("uiR2EDTPEscapeToInteruptLoading") + " (" + _TPCancelText + ") - " + CI18N::get("uiDelayedTPCancel");
+						string uc = CI18N::get("uiR2EDTPEscapeToInteruptLoading") + " (" + _TPCancelText.toUtf8() + ") - " + CI18N::get("uiDelayedTPCancel");
 						UTextContext::CStringInfo info = TextContext->getStringInfo(uc);
 						float stringX = 0.5f - info.StringWidth/(ClientCfg.Width*2);
 						TextContext->printAt(stringX, 7.f / ClientCfg.Height, uc);
@@ -386,13 +386,13 @@ void CProgress::internalProgress (float value)
 							TextContext->setFontSize( (uint)(16.f * fontFactor));
 
 							// build the ucstr(s)
-							ucstring ucstr = CI18N::get((*itpc).Text);
-							vector<ucstring> vucstr;
-							ucstring sep("\n");
-							splitUCString(ucstr,sep,vucstr);
+							string ucstr = CI18N::get((*itpc).Text);
+							vector<string> vucstr;
+							string sep("\n");
+							splitString(ucstr,sep,vucstr);
 
 							// Letter size
-							UTextContext::CStringInfo si = TextContext->getStringInfo(ucstring("|"));
+							UTextContext::CStringInfo si = TextContext->getStringInfo("|");
 							uint fontHeight = (uint) si.StringHeight + 2; // we add 2 pixels for the gap
 
 							uint i;
diff --git a/ryzom/client/src/r2/auto_group.cpp b/ryzom/client/src/r2/auto_group.cpp
index ee269376c..7da977b3d 100644
--- a/ryzom/client/src/r2/auto_group.cpp
+++ b/ryzom/client/src/r2/auto_group.cpp
@@ -279,12 +279,12 @@ void CAutoGroup::group(CObject *newEntityDesc, const NLMISC::CVectorD &createPos
 			getEditor().getDMC().flushActions();
 			return;
 		}
-		ucstring readableName;
+		string readableName;
 		CLuaState &ls = getEditor().getLua();
 		R2::getEditor().getEnv()["PaletteIdToGroupTranslation"][newEntityDesc->getAttr("Base")->toString()].push();
 		if (ls.isString(-1))
-			readableName.fromUtf8(ls.toString(-1));
-		ucstring ucGroupName = ucstring(readableName + " " + CI18N::get("uiR2EDNameGroup"));
+			readableName = ls.toString(-1);
+		string ucGroupName = readableName + " " + CI18N::get("uiR2EDNameGroup");
 
 		newGroup->set("Name", getEditor().genInstanceName(ucGroupName).toUtf8());
 		getEditor().getDMC().requestInsertNode(destGroup->getParentAct()->getId(),
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 3628dfe93..c9b47e6a3 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -1571,12 +1571,12 @@ int CEditor::luaGetUserEntityName(CLuaState &ls)
 	CLuaIHM::checkArgCount(ls, funcName, 1); // this is a method
 	if (UserEntity)
 	{
-		ucstring name = UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis;
-		ls.push( name.toUtf8() );
+		string name = UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis;
+		ls.push( name );
 	}
 	else
 	{
-		ls.push(std::string(""));
+		ls.push(std::string());
 	}
 
 	return 1;
diff --git a/ryzom/client/src/r2/tool_draw_prim.cpp b/ryzom/client/src/r2/tool_draw_prim.cpp
index c32682626..7ec119e29 100644
--- a/ryzom/client/src/r2/tool_draw_prim.cpp
+++ b/ryzom/client/src/r2/tool_draw_prim.cpp
@@ -551,9 +551,9 @@ void CToolDrawPrim::commit()
 		if (!_Extending)
 		{
 			// set readable name
-			ucstring readableName = NLMISC::CI18N::get(_PrimType == Road ? "uiR2EDNameBotRoad" : "uiR2EDNameBotRegion");
-			readableName = getEditor().genInstanceName(readableName);
-			desc->set("Name", readableName.toUtf8());
+			string readableName = NLMISC::CI18N::get(_PrimType == Road ? "uiR2EDNameBotRoad" : "uiR2EDNameBotRegion");
+			readableName = getEditor().genInstanceName(readableName).toUtf8();
+			desc->set("Name", readableName);
 			// send creation command
 			// tmp : static npc counter
 			// add in component list of default feature

From 2d9f10bee3fb1c91aea9a356b718064cb5325da1 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 09:43:23 +0800
Subject: [PATCH 109/292] UTF-8 various, ryzom/ryzomcore#335

---
 nel/src/gui/view_renderer.cpp                      |  1 +
 ryzom/client/src/entity_cl.cpp                     | 12 ++++++------
 ryzom/client/src/entity_cl.h                       | 14 +++++++-------
 .../src/interface_v3/group_in_scene_user_info.cpp  |  2 +-
 .../client/src/interface_v3/interface_manager.cpp  |  4 ++--
 ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp    |  8 ++++----
 ryzom/client/src/player_cl.cpp                     |  4 ++--
 ryzom/client/src/player_r2_cl.cpp                  |  2 +-
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 405781440..ea177dff0 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -883,6 +883,7 @@ namespace NLGUI
 		driver->setCursorScale( CViewRenderer::hwCursorScale );
 
 		char bufTmp[256], tgaName[256];
+		tgaName[0] = 0;
 		string sTGAname;
 		float uvMinU, uvMinV, uvMaxU, uvMaxV;
 		while (!iFile.eof())
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index b28d3fda6..5071f771d 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2295,7 +2295,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 				womanTitle = ( c->getGender() == GSGENDER::female );
 			}
 			
-			string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), womanTitle);
+			string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
 
 			// Sometimes translation contains another title
 			{
@@ -2305,11 +2305,11 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 					_EntityName = _EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(sn.substr(0, pos));
 					string::size_type pos2 = replacement.find('$', pos + 1);
 					_TitleRaw = replacement.substr(pos+1, pos2 - pos - 1);
-					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), womanTitle);
+					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
 				}
 			}
 
-			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw.toUtf8(), womanTitle);
+			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw, womanTitle);
 
 			if (!replacement.empty() || !ClientCfg.DebugStringManager)
 			{
@@ -2320,7 +2320,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 				_NameEx = replacement;
 				newtitle = _NameEx.toUtf8();
 			}
-			CHARACTER_TITLE::ECharacterTitle titleEnum = CHARACTER_TITLE::toCharacterTitle( _TitleRaw.toUtf8() );
+			CHARACTER_TITLE::ECharacterTitle titleEnum = CHARACTER_TITLE::toCharacterTitle( _TitleRaw );
 			if ( titleEnum >= CHARACTER_TITLE::BeginGmTitle && titleEnum <= CHARACTER_TITLE::EndGmTitle )
 			{
 				_GMTitle = titleEnum - CHARACTER_TITLE::BeginGmTitle;
@@ -2352,13 +2352,13 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player:header_opened:player_title"));
-		if (pVT != NULL) pVT->setText(_Title.toUtf8());
+		if (pVT != NULL) pVT->setText(_Title);
 
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player"));
 		if (pGC != NULL) pGC->setUCTitle(_EntityName);
 
 		CSkillManager *pSM = CSkillManager::getInstance();
-		pSM->setPlayerTitle(_TitleRaw.toUtf8());
+		pSM->setPlayerTitle(_TitleRaw);
 	}
 
 	// Must rebuild the in scene interface 'cause name has changed
diff --git a/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
index 3ac01ed25..0f1296780 100644
--- a/ryzom/client/src/entity_cl.h
+++ b/ryzom/client/src/entity_cl.h
@@ -769,25 +769,25 @@ public:
 	bool					isAnOutpostAlly() const;
 
 	/// Return the entity title
-	const ucstring &getTitle() const
+	const std::string &getTitle() const
 	{
 		return _Title;
 	}
 
 	/// Return the entity tags
-	const ucstring &getTag(uint8 id) const
+	const std::string &getTag(uint8 id) const
 	{
 		if (_Tags.size() > id) {
 			return _Tags[id];
 		}
-		static ucstring empty;
+		static const std::string empty;
 		return empty;
 	}
 
 	/// Return the raw unparsed entity title
-	const ucstring getTitleRaw() const
+	const std::string &getTitleRaw() const
 	{
-		return ucstring(_TitleRaw);
+		return _TitleRaw;
 	}
 
 	/// Return true if this entity has a reserved title
@@ -933,11 +933,11 @@ protected:
 	// Current Name for the entity
 	std::string						_EntityName;
 	// Current entity title
-	ucstring						_Title;
+	std::string						_Title;
 	// Current entity tags
 	std::vector<std::string>		_Tags;
 	// Current entity title string id
-	ucstring						_TitleRaw;
+	std::string						_TitleRaw;
 	// Current permanent content symbol for the entity
 	std::string						_PermanentStatutIcon;
 	// Has reserved title?
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index c5dc116e3..e5021ca00 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -202,7 +202,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 	const char *templateName;
 	const char *theTribeName = "";
 	std::string entityName = entity->getDisplayName();
-	std::string entityTitle = entity->getTitle().toUtf8();
+	std::string entityTitle = entity->getTitle();
 
 	// For some NPC's the name is empty and only a title is given,
 	// in that case, treat the title as the name.
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 40413914e..a0d36f535 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -4218,13 +4218,13 @@ bool CInterfaceManager::parseTokens(string& ucstr)
 				// special case where there is only a title, very rare case for some NPC
 				if (name.empty())
 				{
-					name = pTokenSubjectEntity->getTitle().toUtf8();
+					name = pTokenSubjectEntity->getTitle();
 				}
 				token_replacement = name.empty() ? token_replacement : name;
 			}
 			else if (token_param == "title")
 			{
-				string title = pTokenSubjectEntity->getTitle().toUtf8();
+				string title = pTokenSubjectEntity->getTitle();
 				token_replacement = title.empty() ? token_replacement : title;
 			}
 			else if (token_param == "race")
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index c9dc2767e..21322295e 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -1371,7 +1371,7 @@ int CLuaIHMRyzom::getPlayerName(CLuaState &ls)
 int CLuaIHMRyzom::getPlayerTitleRaw(CLuaState &ls)
 {
 	CLuaIHM::checkArgCount(ls, "getPlayerTitleRaw", 0);
-	ls.push(UserEntity->getTitleRaw().toUtf8());
+	ls.push(UserEntity->getTitleRaw());
 	return 1;
 }
 
@@ -1379,7 +1379,7 @@ int CLuaIHMRyzom::getPlayerTitleRaw(CLuaState &ls)
 int CLuaIHMRyzom::getPlayerTitle(CLuaState &ls)
 {
 	CLuaIHM::checkArgCount(ls, "getPlayerTitle", 0);
-	ls.push(UserEntity->getTitle().toUtf8());
+	ls.push(UserEntity->getTitle());
 	return 1;
 }
 
@@ -1453,7 +1453,7 @@ int CLuaIHMRyzom::getTargetTitleRaw(CLuaState &ls)
 
 	if (!target) return 0;
 
-	ls.push(target->getTitleRaw().toUtf8());
+	ls.push(target->getTitleRaw());
 	return 1;
 }
 
@@ -1465,7 +1465,7 @@ int CLuaIHMRyzom::getTargetTitle(CLuaState &ls)
 
 	if (!target) return 0;
 
-	ls.push(target->getTitle().toUtf8());
+	ls.push(target->getTitle());
 	return 1;
 }
 
diff --git a/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
index 437149f16..58deeac56 100644
--- a/ryzom/client/src/player_cl.cpp
+++ b/ryzom/client/src/player_cl.cpp
@@ -743,7 +743,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 	}
 
 	// update title when gender changed
-	const string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(), _Gender == GSGENDER::female);
+	const string replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, _Gender == GSGENDER::female);
 	if (!replacement.empty() || !ClientCfg.DebugStringManager)
 	{
 		// Get extended name
@@ -754,7 +754,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 		if (_Slot == 0)
 		{
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player:header_opened:player_title"));
-			if (pVT != NULL) pVT->setText(_Title.toUtf8());
+			if (pVT != NULL) pVT->setText(_Title);
 		}
 
 		// rebuild in scene interface
diff --git a/ryzom/client/src/player_r2_cl.cpp b/ryzom/client/src/player_r2_cl.cpp
index 8f7621755..75effe9bf 100644
--- a/ryzom/client/src/player_r2_cl.cpp
+++ b/ryzom/client/src/player_r2_cl.cpp
@@ -446,7 +446,7 @@ void CPlayerR2CL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle
 	}
 
 	// update title when gender changed
-	const string replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw.toUtf8(),_Gender == GSGENDER::female));
+	const string replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,_Gender == GSGENDER::female));
 	if (!replacement.empty())
 	{
 		// Get extended name

From 5fe2fae8b02fb61a666f920e595813246b4fa6d2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 10:03:53 +0800
Subject: [PATCH 110/292] UTF-8 string manager, ryzom/ryzomcore#335

---
 ryzom/client/src/string_manager_client.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 7381f5cb9..0ef667dc9 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -364,7 +364,7 @@ restartLoop4:
 					_WaitingStrings.insert(stringId);
 					// need to ask for this string.
 					NLMISC::CBitMemStream bms;
-					const string msgType = "STRING_MANAGER:STRING_RQ";
+					static const string msgType = "STRING_MANAGER:STRING_RQ";
 					if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 					{
 						bms.serial( stringId );
@@ -749,7 +749,7 @@ restartLoop:
 
 						// If the string contains a title, then remove it
 						string::size_type pos = str.find('$');
-						if ( ! str.empty() && pos != ucstring::npos)
+						if ( ! str.empty() && pos != string::npos)
 						{
 							str = CEntityCL::removeTitleFromName(str);
 						}
@@ -1178,9 +1178,9 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 // ***************************************************************************
 void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 {
-	ucstring		womenNameColIdent= string("women_name");
-	ucstring		descColIdent= string("description");
-	ucstring		descColIdent2= string("description2");
+	ucstring womenNameColIdent = "women_name";
+	ucstring descColIdent = "description";
+	ucstring descColIdent2 = "description2";
 
 	// List of words to append to the local CI18N system.
 	static const char	*specialWords[]=
@@ -1257,8 +1257,8 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 			for(uint j=1;j<ws.size();j++)
 			{
 				// Get the key and name string.
-				const string &key=  ws.getData(j, keyColIndex).toUtf8();
-				const string &name= ws.getData(j, nameColIndex).toUtf8();
+				string key=  ws.getData(j, keyColIndex).toUtf8(); // FIXME: const string & when UTF-8
+				string name= ws.getData(j, nameColIndex).toUtf8(); // FIXME: const string & when UTF-8
 				// Append to the I18N.
 				// avoid case problems
 				string keyStr = NLMISC::toLower(key);
@@ -1437,8 +1437,7 @@ const char *CStringManagerClient::getSpecialWord(const string &label, bool women
 			{
 				if( UseFemaleTitles && women )
 				{
-					ucstring ustr(it->WomenName);
-					if( !ustr.empty() )
+					if( !it->WomenName[0] )
 						return it->WomenName;
 				}
 				return it->Name;
@@ -1663,8 +1662,6 @@ const ucchar *CStringManagerClient::getLocalizedName(const ucstring &uctext)
 // ***************************************************************************
 vector<string> CStringManagerClient::getTitleInfos(const string &titleId, bool women)
 {
-	//ucstring infosUC;
-	//infosUC.fromUtf8(titleId);
 	vector<string> listInfos;
 	splitString(titleId, string("#"), listInfos);
 

From ad0e9707850b535c63d3da4210366e7244df575d Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 11:32:29 +0800
Subject: [PATCH 111/292] UTF-8 chat, ryzom/ryzomcore#335

---
 ryzom/client/src/character_cl.cpp             |   2 +-
 ryzom/client/src/client_chat_manager.cpp      | 159 +++++++++---------
 ryzom/client/src/client_chat_manager.h        |  20 +--
 ryzom/client/src/commands.cpp                 | 130 +++++++-------
 .../src/interface_v3/action_handler_edit.cpp  |   4 +-
 .../src/interface_v3/action_handler_game.cpp  |  20 +--
 .../src/interface_v3/action_handler_misc.cpp  |   4 +-
 .../src/interface_v3/action_handler_move.cpp  |   2 +-
 .../interface_v3/action_handler_phrase.cpp    |   4 +-
 .../client/src/interface_v3/chat_displayer.h  |   2 +-
 ryzom/client/src/interface_v3/chat_filter.cpp |  17 +-
 ryzom/client/src/interface_v3/chat_filter.h   |  12 +-
 .../src/interface_v3/chat_text_manager.cpp    |  74 ++++----
 .../src/interface_v3/chat_text_manager.h      |   6 +-
 ryzom/client/src/interface_v3/chat_window.cpp |  48 +++---
 ryzom/client/src/interface_v3/chat_window.h   |  12 +-
 .../client/src/interface_v3/guild_manager.cpp |  10 +-
 .../src/interface_v3/interface_manager.cpp    |   8 +-
 .../src/interface_v3/interface_manager.h      |   4 +-
 .../src/interface_v3/inventory_manager.cpp    |   4 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  14 +-
 .../client/src/interface_v3/music_player.cpp  |   6 +-
 .../src/interface_v3/people_interraction.cpp  |  43 +++--
 .../src/interface_v3/people_interraction.h    |   4 +-
 ryzom/client/src/interface_v3/people_list.cpp |  10 +-
 ryzom/client/src/interface_v3/people_list.h   |   4 +-
 ryzom/client/src/item_group_manager.cpp       |   5 +-
 ryzom/client/src/main_loop.cpp                |   6 +-
 ryzom/client/src/misc.cpp                     |  32 ++--
 ryzom/client/src/misc.h                       |   6 +-
 ryzom/client/src/net_manager.cpp              |  98 +++++------
 ryzom/client/src/user_entity.cpp              |  26 +--
 .../common/src/game_share/msg_client_server.h |  12 +-
 33 files changed, 397 insertions(+), 411 deletions(-)

diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index d68a836de..676bf11f4 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -10367,7 +10367,7 @@ NLMISC_COMMAND(pvpMode, "modify pvp mode", "[<pvp mode> <state>]")
 			str+="in_safe_zone ";
 		if( pvpMode&PVP_MODE::PvpSafe)
 			str+="safe ";
-		IM->displaySystemInfo(ucstring(str));
+		IM->displaySystemInfo(str);
 		nlinfo("<pvpMode> %s",str.c_str());
 	}
 	else
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index 06c9c9776..a6ec40bdd 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -241,7 +241,7 @@ CClientChatManager::CClientChatManager()
 }
 
 //-------------------------------------------------------
-const ucstring *CClientChatManager::cycleLastTell()
+const string *CClientChatManager::cycleLastTell()
 {
 	if (_TellPeople.empty()) return NULL;
 	_TellPeople.push_front(_TellPeople.back());
@@ -282,10 +282,10 @@ void CClientChatManager::init( const string& /* staticDBFileName */ )
 //	chat
 //
 //-----------------------------------------------
-void CClientChatManager::chat( const ucstring& strIn, bool isChatTeam )
+void CClientChatManager::chat( const string& strIn, bool isChatTeam )
 {
 	// Truncate to 255 chars max (because of server restriction)
-	ucstring	str= strIn.substr(0,255);
+	ucstring	str= ucstring(strIn).substr(0,255);
 
 	// send str to IOS
 	CBitMemStream bms;
@@ -303,7 +303,7 @@ void CClientChatManager::chat( const ucstring& strIn, bool isChatTeam )
 
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
-		bms.serial( str );
+		bms.serial( str ); // FIXME: UTF-8
 		NetMngr.push( bms );
 		//nlinfo("impulseCallBack : %s %s sent", msgType.c_str(), str.toString().c_str());
 	}
@@ -321,11 +321,11 @@ void CClientChatManager::chat( const ucstring& strIn, bool isChatTeam )
 //	tell
 //
 //-----------------------------------------------
-void CClientChatManager::tell( const string& receiverIn, const ucstring& strIn )
+void CClientChatManager::tell( const string& receiverIn, const string& strIn )
 {
 	// Truncate to 255 chars max (because of server restriction)
 	string		receiver= receiverIn.substr(0,255);
-	ucstring	str= strIn.substr(0,255);
+	ucstring	str= ucstring(strIn).substr(0,255);
 
 	// *** send str
 	CBitMemStream bms;
@@ -333,7 +333,7 @@ void CClientChatManager::tell( const string& receiverIn, const ucstring& strIn )
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serial( receiver );
-		bms.serial( str );
+		bms.serial( str ); // FIXME: UTF-8
 		NetMngr.push( bms );
 		//nlinfo("impulseCallBack : %s %s %s sent", msgType.c_str(), receiver.c_str(), str.toString().c_str());
 	}
@@ -345,10 +345,10 @@ void CClientChatManager::tell( const string& receiverIn, const ucstring& strIn )
 
 	// *** manage list of last telled people
 	// remove the telled people from list (if present)
-	std::list<ucstring>::iterator it = _TellPeople.begin();
+	std::list<string>::iterator it = _TellPeople.begin();
 	while(it != _TellPeople.end())
 	{
-		if (*it == ucstring(receiver))
+		if (*it == receiver)
 		{
 			it = _TellPeople.erase(it);
 			nlassert(_NumTellPeople != 0);
@@ -454,14 +454,14 @@ void CClientChatManager::processTellString(NLMISC::CBitMemStream& bms, IChatDisp
 	// Serial. For tell message, there is no chat mode, coz we know we are in tell mode !
 	bms.serial (chatMsg.CompressedIndex);
 	bms.serial (chatMsg.SenderNameId);
-	bms.serial (chatMsg.Content);
+	bms.serial (chatMsg.Content); // FIXME: UTF-8
 
 	if (PermanentlyBanned) return;
 
 	chatMsg.ChatMode = (uint8) CChatGroup::tell;
 
 	// If !complete, wait
-	ucstring senderStr;
+	string senderStr;
 	bool	complete = true;
 	complete &= STRING_MANAGER::CStringManagerClient::instance()->getString(chatMsg.SenderNameId, senderStr);
 	if (!complete)
@@ -472,8 +472,8 @@ void CClientChatManager::processTellString(NLMISC::CBitMemStream& bms, IChatDisp
 	}
 
 	// display
-	ucstring	ucstr;
-	buildTellSentence(senderStr, chatMsg.Content, ucstr);
+	string	ucstr;
+	buildTellSentence(senderStr, chatMsg.Content.toUtf8(), ucstr);
 	chatDisplayer.displayTell(/*chatMsg.CompressedIndex, */ucstr, senderStr);
 }
 
@@ -488,9 +488,9 @@ void CClientChatManager::processFarTellString(NLMISC::CBitMemStream& bms, IChatD
 	if (PermanentlyBanned) return;
 
 	// display
-	ucstring	ucstr;
-	buildTellSentence(farTellMsg.SenderName, farTellMsg.Text, ucstr);
-	chatDisplayer.displayTell(/*chatMsg.CompressedIndex, */ucstr, farTellMsg.SenderName);
+	string	ucstr;
+	buildTellSentence(farTellMsg.SenderName.toUtf8(), farTellMsg.Text.toUtf8(), ucstr);
+	chatDisplayer.displayTell(/*chatMsg.CompressedIndex, */ucstr, farTellMsg.SenderName.toUtf8());
 }
 
 
@@ -505,7 +505,7 @@ void	CClientChatManager::processChatString( NLMISC::CBitMemStream& bms, IChatDis
 	CChatMsg chatMsg;
 	bms.serial( chatMsg );
 	CChatGroup::TGroupType	type = static_cast<CChatGroup::TGroupType>(chatMsg.ChatMode);
-	ucstring	senderStr;
+	string	senderStr;
 
 	bool complete = true;
 	complete &= STRING_MANAGER::CStringManagerClient::instance()->getString(chatMsg.SenderNameId, senderStr);
@@ -528,9 +528,9 @@ void	CClientChatManager::processChatString( NLMISC::CBitMemStream& bms, IChatDis
 	}
 
 	// display
-	ucstring	ucstr;
-	buildChatSentence(chatMsg.CompressedIndex, senderStr, chatMsg.Content, type, ucstr);
-	chatDisplayer.displayChat(chatMsg.CompressedIndex, ucstr, chatMsg.Content, type, chatMsg.DynChatChanID, senderStr);
+	string	ucstr;
+	buildChatSentence(chatMsg.CompressedIndex, senderStr, chatMsg.Content.toUtf8(), type, ucstr);
+	chatDisplayer.displayChat(chatMsg.CompressedIndex, ucstr, chatMsg.Content.toUtf8(), type, chatMsg.DynChatChanID, senderStr);
 }
 
 
@@ -545,8 +545,8 @@ void CClientChatManager::processTellString2(NLMISC::CBitMemStream& bms, IChatDis
 	bms.serial(chatMsg.PhraseId);
 
 	// if !complete, wait
-	ucstring senderStr;
-	ucstring rawMessage;
+	string senderStr;
+	string rawMessage;
 	bool	complete = true;
 	complete &= STRING_MANAGER::CStringManagerClient::instance()->getString(chatMsg.SenderNameId, senderStr);
 	complete &= STRING_MANAGER::CStringManagerClient::instance()->getDynString(chatMsg.PhraseId, rawMessage);
@@ -558,7 +558,7 @@ void CClientChatManager::processTellString2(NLMISC::CBitMemStream& bms, IChatDis
 	}
 
 	// display
-	ucstring	ucstr;
+	string	ucstr;
 	buildTellSentence(senderStr, rawMessage, ucstr);
 	chatDisplayer.displayTell(/*chatMsg.CompressedIndex, */ucstr, senderStr);
 }
@@ -571,8 +571,8 @@ void CClientChatManager::processChatString2(NLMISC::CBitMemStream& bms, IChatDis
 	bms.serial( chatMsg );
 	if (PermanentlyBanned) return;
 	CChatGroup::TGroupType	type = static_cast<CChatGroup::TGroupType>(chatMsg.ChatMode);
-	ucstring	senderStr;
-	ucstring	rawMessage;
+	string	senderStr;
+	string	rawMessage;
 
 	// here, the type cannot be dyn_chat (no DynChatId in the message) => discard
 	if(type==CChatGroup::dyn_chat)
@@ -592,11 +592,11 @@ void CClientChatManager::processChatString2(NLMISC::CBitMemStream& bms, IChatDis
 		return;
 	}
 
-	rawMessage += ucstring(" ");
-	rawMessage += chatMsg.CustomTxt;
+	rawMessage += " ";
+	rawMessage += chatMsg.CustomTxt.toUtf8();
 
 	// display
-	ucstring	ucstr;
+	string	ucstr;
 	buildChatSentence(chatMsg.CompressedIndex, senderStr, rawMessage, type, ucstr);
 	chatDisplayer.displayChat(chatMsg.CompressedIndex, ucstr, rawMessage, type, CEntityId::Unknown, senderStr);
 }
@@ -615,7 +615,7 @@ void CClientChatManager::processChatStringWithNoSender( NLMISC::CBitMemStream& b
 	chatMsg.SenderNameId = 0;
 	chatMsg.ChatMode = type;
 	chatMsg.PhraseId = phraseID;
-	ucstring ucstr;
+	string ucstr;
 
 	// if !complete, wait
 	bool	complete = STRING_MANAGER::CStringManagerClient::instance()->getDynString(chatMsg.PhraseId, ucstr);
@@ -627,7 +627,7 @@ void CClientChatManager::processChatStringWithNoSender( NLMISC::CBitMemStream& b
 	}
 
 	// diplay
-	ucstring senderName("");
+	string senderName;
 	chatDisplayer.displayChat(INVALID_DATASET_INDEX, ucstr, ucstr, type, CEntityId::Unknown, senderName);
 }
 
@@ -643,7 +643,7 @@ void CClientChatManager::flushBuffer(IChatDisplayer &chatDisplayer)
 		for( itMsg = _ChatBuffer.begin(); itMsg != _ChatBuffer.end(); )
 		{
 			CChatGroup::TGroupType	type = static_cast<CChatGroup::TGroupType>(itMsg->ChatMode);
-			ucstring sender, content;
+			string sender, content;
 
 			// all strings received?
 			bool complete = true;
@@ -652,7 +652,7 @@ void CClientChatManager::flushBuffer(IChatDisplayer &chatDisplayer)
 			if(itMsg->UsePhraseId)
 				complete &= STRING_MANAGER::CStringManagerClient::instance()->getDynString(itMsg->PhraseId, content);
 			else
-				content= itMsg->Content;
+				content= itMsg->Content.toUtf8();
 
 			if (type == CChatGroup::dyn_chat)
 			{
@@ -666,7 +666,7 @@ void CClientChatManager::flushBuffer(IChatDisplayer &chatDisplayer)
 			// if complete, process
 			if (complete)
 			{
-				ucstring ucstr;
+				string ucstr;
 				if (itMsg->SenderNameId == 0)
 				{
 					ucstr = content;
@@ -703,7 +703,7 @@ void CClientChatManager::flushBuffer(IChatDisplayer &chatDisplayer)
 //	getString
 //
 //-----------------------------------------------
-ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
+string CClientChatManager::getString( CBitMemStream& bms, string& ucstr )
 {
 
 	// deal with parameters
@@ -714,8 +714,8 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 	{
 		// search if a parameter exists in the string
 		sprintf(chTmp,"$%d",dynParamIdx);
-		ucstring ucstrTmp( chTmp );
-		ucstring::size_type idx = ucstr.find(ucstrTmp);
+		string ucstrTmp( chTmp );
+		string::size_type idx = ucstr.find(ucstrTmp);
 
 		// if there's a parameter in the string
 		if( idx != ucstring::npos )
@@ -728,7 +728,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 				{
 					bool huff;
 					bms.serialBit(huff);
-					const ucstring dynStr("???");
+					const string dynStr("???");
 					if( huff )
 					{
 						nldebug("<CClientChatManager::getString> receiving huffman dynamic parameter in static string");
@@ -756,8 +756,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 				{
 					string dynStr;
 					bms.serial( dynStr );
-					ucstring ucDynStr(dynStr);
-					ucstr.replace( idx, ucstrTmp.size()+1, ucDynStr );
+					ucstr.replace( idx, ucstrTmp.size()+1, dynStr );
 				}
 				break;
 
@@ -766,7 +765,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 				{
 					uint32 nb;
 					bms.serial( nb );
-					ucstr.replace( idx, ucstrTmp.size()+1, ucstring(toString(nb)) );
+					ucstr.replace( idx, ucstrTmp.size()+1, toString(nb) );
 				}
 				break;
 				/*
@@ -794,7 +793,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 				{
 					sint32 nb;
 					bms.serial( nb );
-					ucstr.replace( idx, ucstrTmp.size()+1, ucstring(toString(nb)) );
+					ucstr.replace( idx, ucstrTmp.size()+1, toString(nb) );
 				}
 				break;
 				/*
@@ -823,7 +822,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 				{
 					float nb;
 					bms.serial( nb );
-					ucstr.replace( idx, ucstrTmp.size()+1, ucstring(toString(nb)) );
+					ucstr.replace( idx, ucstrTmp.size()+1, toString(nb) );
 				}
 				break;
 
@@ -849,7 +848,7 @@ ucstring CClientChatManager::getString( CBitMemStream& bms, ucstring& ucstr )
 //	getString
 //
 //-----------------------------------------------
-bool CClientChatManager::getString( ucstring &result, std::vector<uint64>& args, const ucstring &ucstrbase )
+bool CClientChatManager::getString( string &result, std::vector<uint64>& args, const string &ucstrbase )
 {
 	result = ucstrbase;
 
@@ -863,17 +862,17 @@ bool CClientChatManager::getString( ucstring &result, std::vector<uint64>& args,
 	{
 		// search if a parameter exists in the string
 		sprintf(chTmp,"$%d",dynParamIdx);
-		ucstring ucstrTmp( chTmp );
-		ucstring::size_type idx = result.find(ucstrTmp);
+		string ucstrTmp( chTmp );
+		string::size_type idx = result.find(ucstrTmp);
 
 		// if there's a parameter in the string
-		if( idx != ucstring::npos )
+		if( idx != string::npos )
 		{
-			ucstring rep;
+			string rep;
 			rep = "???";
 			if (dynParamIdx >= args.size())
 			{
-				nlwarning ("Missing args for string '%s', only %d args, need arg %d", ucstrbase.toString().c_str(), args.size(), dynParamIdx);
+				nlwarning ("Missing args for string '%s', only %d args, need arg %d", ucstrbase.c_str(), args.size(), dynParamIdx);
 			}
 			else
 			{
@@ -948,15 +947,15 @@ bool CClientChatManager::getString( ucstring &result, std::vector<uint64>& args,
 } // getString //
 
 // ***************************************************************************
-void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstring &msg, ucstring &result)
+void CClientChatManager::buildTellSentence(const string &sender, const string &msg, string &result)
 {
 	// If no sender name was provided, show only the msg
 	if ( sender.empty() )
 		result = msg;
 	else
 	{
-		ucstring name = CEntityCL::removeTitleAndShardFromName(sender.toUtf8());
-		ucstring csr;
+		string name = CEntityCL::removeTitleAndShardFromName(sender);
+		string csr;
 
 		// special case where there is only a title, very rare case for some NPC
 		if (name.empty())
@@ -965,29 +964,29 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 			CCharacterCL *entity = dynamic_cast<CCharacterCL*>(EntitiesMngr.getEntityByName(sender, true, true));
 			bool bWoman = entity && entity->getGender() == GSGENDER::female;
 
-			name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender.toUtf8()), bWoman);
+			name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
 			{
 				// Sometimes translation contains another title
 				ucstring::size_type pos = name.find('$');
 				if (pos != ucstring::npos)
 				{
-					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name.toUtf8()), bWoman);
+					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
 				}
 			}
 		}
 		else
 		{
 			// Does the char have a CSR title?
-			csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender.toUtf8())) ? ucstring("(CSR) ") : ucstring("");
+			csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? "(CSR) " : "";
 		}
 
-		result = csr + name + ucstring(" ") + CI18N::get("tellsYou") + ucstring(": ") + msg;
+		result = csr + name + " " + CI18N::get("tellsYou") + ": " + msg;
 	}
 }
 
 
 // ***************************************************************************
-void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderIndex */, const ucstring &sender, const ucstring &msg, CChatGroup::TGroupType type, ucstring &result)
+void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderIndex */, const string &sender, const string &msg, CChatGroup::TGroupType type, string &result)
 {
 	// if its a tell, then use buildTellSentence
 	if(type==CChatGroup::tell)
@@ -1005,35 +1004,35 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 
 	// get the category if any. Note, in some case (chat from other player), there is not categories
 	// and we do not want getStringCategory to return 'SYS' category.
-	ucstring finalMsg;
+	string finalMsg;
 	string catStr = getStringCategory(msg, finalMsg, false);
-	ucstring cat;
+	string cat;
 	if (!catStr.empty())
-		cat = string("&")+catStr+"&";
+		cat = "&" + catStr + "&";
 
-	if ( ! cat.empty())
+	if (!cat.empty())
 	{
 		result = msg;
 		return;
 	}
 
 	// Format the sentence with the provided sender name
-	ucstring senderName = CEntityCL::removeTitleAndShardFromName(sender.toUtf8());
+	string senderName = CEntityCL::removeTitleAndShardFromName(sender);
 
-	ucstring csr;
+	string csr;
 	// Does the char have a CSR title?
-	csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender.toUtf8())) ? ucstring("(CSR) ") : ucstring("");
+	csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? "(CSR) " : "";
 
-	if (UserEntity && senderName.toUtf8() == UserEntity->getDisplayName())
+	if (UserEntity && senderName == UserEntity->getDisplayName())
 	{
 		// The player talks
 		switch(type)
 		{
 			case CChatGroup::shout:
-				result = cat + csr + CI18N::get("youShout") + ucstring(": ") + finalMsg;
+				result = cat + csr + CI18N::get("youShout") + ": " + finalMsg;
 			break;
 			default:
-				result = cat + csr + CI18N::get("youSay") + ucstring(": ") + finalMsg;
+				result = cat + csr + CI18N::get("youSay") + ": " + finalMsg;
 			break;
 		}
 	}
@@ -1046,13 +1045,13 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 			// We need the gender to display the correct title
 			bool bWoman = entity && entity->getGender() == GSGENDER::female;
 
-			senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender.toUtf8()), bWoman);
+			senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
 			{
 				// Sometimes translation contains another title
 				ucstring::size_type pos = senderName.find('$');
 				if (pos != ucstring::npos)
 				{
-					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName.toUtf8()), bWoman);
+					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
 				}
 			}
 		}
@@ -1061,10 +1060,10 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 		switch(type)
 		{
 			case CChatGroup::shout:
-				result = cat + csr + senderName + ucstring(" ") + CI18N::get("heShout") + ucstring(": ") + finalMsg;
+				result = cat + csr + senderName + " " + CI18N::get("heShout") + ": " + finalMsg;
 			break;
 			default:
-				result = cat + csr + senderName + ucstring(" ") + CI18N::get("heSays") + ucstring(": ") + finalMsg;
+				result = cat + csr + senderName + " " + CI18N::get("heSays") + ": " + finalMsg;
 			break;
 		}
 	}
@@ -1174,7 +1173,7 @@ void	CClientChatManager::updateDynamicChatChannels(IChatDisplayer &chatDisplayer
 
 class CHandlerTell : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		string receiver = getParam (sParams, "player");
 		string message;
@@ -1219,7 +1218,7 @@ REGISTER_ACTION_HANDLER( CHandlerTell, "tell");
 
 class CHandlerEnterTell : public IActionHandler
 {
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
+	void execute (CCtrlBase * /* pCaller */, const string &sParams)
 	{
 		CInterfaceManager *im = CInterfaceManager::getInstance();
 		string receiver = getParam (sParams, "player");
@@ -1295,7 +1294,7 @@ void CClientChatManager::updateChatModeAndButton(uint mode, uint32 dynamicChanne
 					case CChatGroup::guild:		if (guildActive) pUserBut->setHardText("uiFilterGuild");	break;
 					case CChatGroup::dyn_chat:
 						uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(dynamicChannelDbIndex);
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 						if (title.empty())
 						{
@@ -1305,7 +1304,7 @@ void CClientChatManager::updateChatModeAndButton(uint mode, uint32 dynamicChanne
 						}
 						else
 						{
-							pUserBut->setHardText(title.toUtf8());
+							pUserBut->setHardText(title);
 						}
 						break;
 				}
@@ -1337,7 +1336,7 @@ void CClientChatManager::updateChatModeAndButton(uint mode, uint32 dynamicChanne
 
 class CHandlerTalk : public IActionHandler
 {
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
+	void execute (CCtrlBase * /* pCaller */, const string &sParams)
 	{
 		// Param
 		uint mode;
@@ -1376,7 +1375,7 @@ class CHandlerTalk : public IActionHandler
 				else
 				{
 					CInterfaceManager *im = CInterfaceManager::getInstance();
-					im->displaySystemInfo (ucstring::makeFromUtf8(cmd) + ": " + CI18N::get ("uiCommandNotExists"));
+					im->displaySystemInfo (cmd + ": " + CI18N::get ("uiCommandNotExists"));
 				}
 			}
 			else
@@ -1409,7 +1408,7 @@ REGISTER_ACTION_HANDLER( CHandlerTalk, "talk");
 
 class CHandlerEnterTalk : public IActionHandler
 {
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
+	void execute (CCtrlBase * /* pCaller */, const string &sParams)
 	{
 		// Param
 		uint mode;
@@ -1436,10 +1435,10 @@ REGISTER_ACTION_HANDLER( CHandlerEnterTalk, "enter_talk");
 
 class CHandlerTalkMessage : public IActionHandler
 {
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
+	void execute (CCtrlBase * /* pCaller */, const string &sParams)
 	{
 		// Param
-		ucstring text = CI18N::get ("uiTalkMemMsg"+sParams);
+		string text = CI18N::get ("uiTalkMemMsg"+sParams);
 
 		// Find the base group
 		if (!text.empty())
@@ -1455,7 +1454,7 @@ REGISTER_ACTION_HANDLER( CHandlerTalkMessage, "talk_message");
 
 class CHandlerSwapChatMode : public IActionHandler
 {
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
+	void execute (CCtrlBase * /* pCaller */, const string &sParams)
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 		bool	updateCapture= getParam(sParams, "update_capture")=="1";
diff --git a/ryzom/client/src/client_chat_manager.h b/ryzom/client/src/client_chat_manager.h
index 2f7decac9..06792a50f 100644
--- a/ryzom/client/src/client_chat_manager.h
+++ b/ryzom/client/src/client_chat_manager.h
@@ -137,11 +137,11 @@ public:
 		 *	\param mode in which channel should this message goes
 		 *	\param dynChatId is valid only if mode==dyn_chat. This the Id of channel (not the index in DB!)
 		 */
-		virtual void	displayChat(TDataSetIndex compressedSenderIndex, const ucstring &ucstr, const ucstring &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, ucstring &senderName, uint bubbleTimer=0) =0;
+		virtual void	displayChat(TDataSetIndex compressedSenderIndex, const std::string &ucstr, const std::string &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, std::string &senderName, uint bubbleTimer=0) =0;
 		/**
 		 *	display a player tell message
 		 */
-		virtual void	displayTell(/*TDataSetIndex senderIndex, */const ucstring &ucstr, const ucstring &senderName) =0;
+		virtual void	displayTell(/*TDataSetIndex senderIndex, */const std::string &ucstr, const std::string &senderName) =0;
 		/**
 		 *	Clear a channel.
 		 *	\param dynChatDbIndex is valid only if mode==dyn_chat. Contrary to displayChat, this is the Db Index (0..MaxDynChanPerPlayer)
@@ -177,18 +177,18 @@ public :
 	 * \param str is the chat content (truncated to 255 char max)
 	 * \param isChatTeam special case for Chat TEAM
 	 */
-	void chat( const ucstring& str, bool isChatTeam = false );
+	void chat( const std::string& str, bool isChatTeam = false );
 
 	/**
 	 * Transmit a chat message to the receiver
 	 * \param receiver is the name of the listening char (truncated to 255 char max)
 	 * \param str is the chat content (truncated to 255 char max)
 	 */
-	void tell( const std::string& receiver, const ucstring& str );
+	void tell( const std::string& receiver, const std::string& str );
 
 	/** Get the last name of the people with which a 'tell' has been done, then move that name at the start of the list
 	  */
-	const ucstring *cycleLastTell();
+	const std::string *cycleLastTell();
 
 	/** Set the max number of name in the tell list
 	  */
@@ -263,12 +263,12 @@ public :
 	 * \param result decoded string
 	 * \return true if the string is finalize, false if some param are missing from network
 	 */
-	bool getString( ucstring &result, std::vector<uint64>& args, const ucstring& strbase );
+	bool getString( std::string &result, std::vector<uint64>& args, const std::string& strbase );
 
 	// build a sentence to be displayed in the chat (e.g add "you say", "you shout", "[user name] says" or "[user name] shout")
-	static void	 buildChatSentence(TDataSetIndex compressedSenderIndex, const ucstring &sender, const ucstring &msg, CChatGroup::TGroupType type, ucstring &result);
+	static void	 buildChatSentence(TDataSetIndex compressedSenderIndex, const std::string &sender, const std::string &msg, CChatGroup::TGroupType type, std::string &result);
 	// build a sentence to be displayed in the tell
-	static void	 buildTellSentence(const ucstring &sender, const ucstring &msg, ucstring &result);
+	static void	 buildTellSentence(const std::string &sender, const std::string &msg, std::string &result);
 
 
 	/// \name Dynamic Chat channel mgt
@@ -338,7 +338,7 @@ private :
 	std::list<CChatMsgNode>		_ChatBuffer;
 
 	// peoples
-	std::list<ucstring> _TellPeople; // the last people on which tells ha been done
+	std::list<std::string> _TellPeople; // the last people on which tells ha been done
 	uint				_NumTellPeople;
 	uint				_MaxNumTellPeople;
 
@@ -361,7 +361,7 @@ private :
 	 * \param str string with parameter values at end (str will change after)
 	 * \return decoded string (str)
 	 */
-	ucstring getString( NLMISC::CBitMemStream& bms, ucstring& str );
+	std::string getString( NLMISC::CBitMemStream& bms, std::string& str );
 
 };
 
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index d3a6a2df6..3fea9a2a7 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -240,20 +240,18 @@ NLMISC_COMMAND(equipGroup, "equip group <name>", "name")
 	}
 	if(CItemGroupManager::getInstance()->equipGroup(args[0]))
 	{
-		ucstring msg = CI18N::get("cmdEquipGroupSuccess");
+		string msg = CI18N::get("cmdEquipGroupSuccess");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return true;
 	}
 	else
 	{
-		ucstring msg = CI18N::get("cmdEquipGroupError");
+		string msg = CI18N::get("cmdEquipGroupError");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return false;
@@ -274,10 +272,9 @@ NLMISC_COMMAND(moveGroup, "move group <name> to <dst>", "name dst")
 
 	if(CItemGroupManager::getInstance()->moveGroup(args[0], INVENTORIES::toInventory(args[1])))
 	{
-		ucstring msg = CI18N::get("cmdMoveGroupSuccess");
+		string msg = CI18N::get("cmdMoveGroupSuccess");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		strFindReplace(msg, "%inventory", args[1]);
 		pIM->displaySystemInfo(msg);
@@ -285,10 +282,9 @@ NLMISC_COMMAND(moveGroup, "move group <name> to <dst>", "name dst")
 	}
 	else
 	{
-		ucstring msg = CI18N::get("cmdMoveGroupError");
+		string msg = CI18N::get("cmdMoveGroupError");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		strFindReplace(msg, "%inventory", args[1]);
 		pIM->displaySystemInfo(msg);
@@ -312,24 +308,22 @@ NLMISC_COMMAND(createGroup, "create group <name> [true](create a <remove> for ev
 		removeUnequiped = !args[1].empty();
 	if(CItemGroupManager::getInstance()->createGroup(args[0], removeUnequiped))
 	{
-		ucstring msg;
+		string msg;
 		if(removeUnequiped)
 			msg = CI18N::get("cmdCreateGroupSuccess2");
 		else
 			msg = CI18N::get("cmdCreateGroupSuccess1");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return true;
 	}
 	else
 	{
-		ucstring msg = CI18N::get("cmdCreateGroupError");
+		string msg = CI18N::get("cmdCreateGroupError");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return false;
@@ -350,20 +344,18 @@ NLMISC_COMMAND(deleteGroup, "delete group <name>", "name")
 	}
 	if(CItemGroupManager::getInstance()->deleteGroup(args[0]))
 	{
-		ucstring msg = CI18N::get("cmdDeleteGroupSuccess");
+		string msg = CI18N::get("cmdDeleteGroupSuccess");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return true;
 	}
 	else
 	{
-		ucstring msg = CI18N::get("cmdDeleteGroupError");
+		string msg = CI18N::get("cmdDeleteGroupError");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(args[0]);
+		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
 		return false;
@@ -494,7 +486,7 @@ NLMISC_COMMAND(random, "Roll a dice and say the result around","[<min>] <max> [h
 	if (!randomFromString(args[0], max))
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("uiRandomBadParameter");
+		string msg = CI18N::get("uiRandomBadParameter");
 		strFindReplace(msg, "%s", args[0] );
 		pIM->displaySystemInfo(msg);
 		return false;
@@ -504,7 +496,7 @@ NLMISC_COMMAND(random, "Roll a dice and say the result around","[<min>] <max> [h
 		if (!randomFromString(args[1], min))
 		{
 			CInterfaceManager *pIM = CInterfaceManager::getInstance();
-			ucstring msg = CI18N::get("uiRandomBadParameter");
+			string msg = CI18N::get("uiRandomBadParameter");
 			strFindReplace(msg, "%s", args[1] );
 			pIM->displaySystemInfo(msg);
 			return false;
@@ -544,7 +536,7 @@ NLMISC_COMMAND(dumpShapePos, "Dump Last Added Shape Pos.", "")
 
 	CInterfaceManager *IM = CInterfaceManager::getInstance();
 	CVector pos = ShapeAddedByCommand.back().getPos();
-	IM->displaySystemInfo(ucstring(toString("Shape Pos = %f, %f, %f", pos.x, pos.y, pos.z)));
+	IM->displaySystemInfo(toString("Shape Pos = %f, %f, %f", pos.x, pos.y, pos.z));
 	return true;
 }
 //-----------------------------------------------
@@ -1096,11 +1088,11 @@ NLMISC_COMMAND(verbose, "Enable/Disable some Debug Information", "none or magic"
 	{
 		// Help
 		CInterfaceManager *IM = CInterfaceManager::getInstance();
-		IM->displaySystemInfo(ucstring("This command need 1 parameter :"));
-		IM->displaySystemInfo(ucstring("<string> :"));
-		IM->displaySystemInfo(ucstring("- none(to remove all verboses)"));
-		IM->displaySystemInfo(ucstring("- magic(to add debug infos about magic)"));
-		IM->displaySystemInfo(ucstring("- anim (to add debug infos about animation)"));
+		IM->displaySystemInfo("This command need 1 parameter :");
+		IM->displaySystemInfo("<string> :");
+		IM->displaySystemInfo("- none(to remove all verboses)");
+		IM->displaySystemInfo("- magic(to add debug infos about magic)");
+		IM->displaySystemInfo("- anim (to add debug infos about animation)");
 	}
 	else
 	{
@@ -1114,11 +1106,11 @@ NLMISC_COMMAND(verbose, "Enable/Disable some Debug Information", "none or magic"
 		else
 		{
 			CInterfaceManager *IM = CInterfaceManager::getInstance();
-			IM->displaySystemInfo(ucstring("This command need 1 parameter :"));
-			IM->displaySystemInfo(ucstring("<string> :"));
-			IM->displaySystemInfo(ucstring("- none(to remove all verboses)"));
-			IM->displaySystemInfo(ucstring("- magic(to add debug infos about magic)"));
-			IM->displaySystemInfo(ucstring("- anim (to add debug infos about animation)"));
+			IM->displaySystemInfo("This command need 1 parameter :");
+			IM->displaySystemInfo("<string> :");
+			IM->displaySystemInfo("- none(to remove all verboses)");
+			IM->displaySystemInfo("- magic(to add debug infos about magic)");
+			IM->displaySystemInfo("- anim (to add debug infos about animation)");
 		}
 	}
 	return true;
@@ -1323,7 +1315,7 @@ NLMISC_COMMAND(execScript, "Execute a script file (.cmd)","<FileName>")
 	}
 	else
 	{
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("Cannot open file"));
+		CInterfaceManager::getInstance()->displaySystemInfo("Cannot open file");
 	}
 
 	return true;
@@ -1368,7 +1360,7 @@ NLMISC_COMMAND(db, "Modify Database","<Property> <Value>")
 		{
 			sint64 prop = node->getValue64();
 			string str = toString(prop);
-			pIM->displaySystemInfo(ucstring(str));
+			pIM->displaySystemInfo(str);
 			nlinfo("%s", str.c_str());
 		}
 		else
@@ -1722,7 +1714,7 @@ NLMISC_COMMAND(getSheetId, "get_sheet_id","<sheet file name>")
 		return false;
 	CSheetId id(args[0]);
 
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring(toString(id.asInt())));
+	CInterfaceManager::getInstance()->displaySystemInfo(toString(id.asInt()));
 	return true;
 }
 
@@ -1737,7 +1729,7 @@ NLMISC_COMMAND(getSheetName, "get_sheet_name","<Sheet Id>")
 	string name = id.toString();
 
 
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring(name));
+	CInterfaceManager::getInstance()->displaySystemInfo(name);
 	return true;
 }
 
@@ -2388,7 +2380,7 @@ NLMISC_COMMAND(sheet2idx, "Return the index of a sheet", "<sheet name> <visual s
 	else
 		result = NLMISC::toString("sheet '%s' not valid", args[0].c_str());
 
-	IM->displaySystemInfo(ucstring(result));
+	IM->displaySystemInfo(result);
 	nlinfo("'sheet2idx': %s", result.c_str());
 	return true;
 }
@@ -2411,7 +2403,7 @@ NLMISC_COMMAND(dynstr, "display a dyn string value", "<dyn string_id>")
 	uint dynId;
 	fromString(args[0], dynId);
 
-	ucstring result;
+	string result;
 	STRING_MANAGER::CStringManagerClient::instance()->getDynString(dynId, result);
 
 	CInterfaceManager::getInstance()->displaySystemInfo(result);
@@ -2426,7 +2418,7 @@ NLMISC_COMMAND(serverstr, "display a server string value", "<serverstr string_id
 	uint dynId;
 	fromString(args[0], dynId);
 
-	ucstring result;
+	string result;
 	STRING_MANAGER::CStringManagerClient::instance()->getString(dynId, result);
 
 	CInterfaceManager::getInstance()->displaySystemInfo(result);
@@ -2510,11 +2502,11 @@ NLMISC_COMMAND(mode, "Change the mode for an entity in a slot", "<Slot> <Mode> [
 	if(args.size() < 2)
 	{
 		// Help
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 paramters :"));
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Slot> : the slot number of the entity to change"));
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Mode> : the mode wanted for the entity, one of the following number :"));
+		CInterfaceManager::getInstance()->displaySystemInfo("This command need 2 paramters :");
+		CInterfaceManager::getInstance()->displaySystemInfo("  <Slot> : the slot number of the entity to change");
+		CInterfaceManager::getInstance()->displaySystemInfo("  <Mode> : the mode wanted for the entity, one of the following number :");
 		for(uint i = 0; i<MBEHAV::NUMBER_OF_MODES; ++i)
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d - %s", i, MBEHAV::modeToString((MBEHAV::EMode)i).c_str())));
+			CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d - %s", i, MBEHAV::modeToString((MBEHAV::EMode)i).c_str()));
 	}
 	// Right parameters number
 	else
@@ -2544,7 +2536,7 @@ NLMISC_COMMAND(mode, "Change the mode for an entity in a slot", "<Slot> <Mode> [
 		}
 		// Invalid slot.
 		else
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring("There is no entity in the given slot"));
+			CInterfaceManager::getInstance()->displaySystemInfo("There is no entity in the given slot");
 	}
 
 	// Command well done.
@@ -2557,12 +2549,12 @@ NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot
 	if(args.size() < 2 || args.size() > 6)
 	{
 		// Help
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 to 6 paramters :"));
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Slot> : the slot number of the entity to change"));
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Behaviour> : the behaviour to play for the entity, one of the following number :"));
+		CInterfaceManager::getInstance()->displaySystemInfo("This command need 2 to 6 paramters :");
+		CInterfaceManager::getInstance()->displaySystemInfo("  <Slot> : the slot number of the entity to change");
+		CInterfaceManager::getInstance()->displaySystemInfo("  <Behaviour> : the behaviour to play for the entity, one of the following number :");
 		for(uint i = 0; i<MBEHAV::EMOTE_BEGIN; ++i)
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i).c_str())));
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END)));
+			CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i).c_str()));
+		CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END));
 	}
 	else
 	{
@@ -2633,7 +2625,7 @@ NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot
 			entity->updateVisualProperty(NetMngr.getCurrentServerTick()+dt, CLFECOMMON::PROPERTY_BEHAVIOUR);
 		}
 		else
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring("There is no entity in the given slot"));
+			CInterfaceManager::getInstance()->displaySystemInfo("There is no entity in the given slot");
 	}
 
 	// Command well done.
@@ -2782,7 +2774,7 @@ NLMISC_COMMAND(spell, "Cast a spell", "\n"
 			entity->updateVisualProperty(NetMngr.getCurrentServerTick()+50, CLFECOMMON::PROPERTY_BEHAVIOUR);
 		}
 		else
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring("There is no entity in the given slot"));
+			CInterfaceManager::getInstance()->displaySystemInfo("There is no entity in the given slot");
 	}
 
 	// Command well done.
@@ -4005,7 +3997,7 @@ NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compar
 	srvVal&= pIM->getLocalSyncActionCounterMask();
 	locVal&= pIM->getLocalSyncActionCounterMask();
 
-	pIM->displaySystemInfo(ucstring( "ServerCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
+	pIM->displaySystemInfo("ServerCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal));
 
 	// Well done.
 	return true;
@@ -4023,7 +4015,7 @@ NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
 	srvVal&= PHRASE_EXECUTE_COUNTER_MASK;
 	locVal&= PHRASE_EXECUTE_COUNTER_MASK;
 
-	pIM->displaySystemInfo(ucstring( "NextCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
+	pIM->displaySystemInfo("NextCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal));
 
 	// cycle
 	srvVal= NLGUI::CDBManager::getInstance()->getDbProp(PHRASE_DB_COUNTER_CYCLE)->getValue32();
@@ -4031,7 +4023,7 @@ NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
 	srvVal&= PHRASE_EXECUTE_COUNTER_MASK;
 	locVal&= PHRASE_EXECUTE_COUNTER_MASK;
 
-	pIM->displaySystemInfo(ucstring( "CycleCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
+	pIM->displaySystemInfo("CycleCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal));
 
 	return true;
 }
@@ -4114,7 +4106,7 @@ NLMISC_COMMAND(skillToInt, "Convert a skill to an int", "")
 {
 	if (args.size() != 1) return false;
 	CInterfaceManager *im = CInterfaceManager::getInstance();
-	im->displaySystemInfo(ucstring(toString((uint) SKILLS::toSkill(args[0]))));
+	im->displaySystemInfo(toString((uint) SKILLS::toSkill(args[0])));
 	return true;
 }
 
@@ -4520,7 +4512,7 @@ NLMISC_COMMAND(getSkillValue, "get a skill value by its name", "skill_name")
 	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:SKILL", skillId), false);
 	if(node)
 	{
-		pIM->displaySystemInfo(ucstring(toString(node->getValue32())));
+		pIM->displaySystemInfo(toString(node->getValue32()));
 	}
 
 	return true;
@@ -4550,7 +4542,7 @@ NLMISC_COMMAND(getBaseSkillValue, "get a baseskill value by its name", "skill_na
 	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:BaseSKILL", skillId), false);
 	if(node)
 	{
-		pIM->displaySystemInfo(ucstring(toString(node->getValue32())));
+		pIM->displaySystemInfo(toString(node->getValue32()));
 	}
 
 	return true;
@@ -4812,7 +4804,7 @@ NLMISC_COMMAND(stick_log, "", "<slot>")
 		skel->getStickedObjects(sticks);
 
 		nlinfo("StickedModels: %d", sticks.size());
-		pIM->displaySystemInfo(ucstring(toString("StickedModels: %d", sticks.size())));
+		pIM->displaySystemInfo(toString("StickedModels: %d", sticks.size()));
 
 		for(uint i=0;i<sticks.size();i++)
 		{
@@ -5377,7 +5369,7 @@ bool CUserCommand::execute(const std::string &/* rawCommandString */, const std:
 				if ((uint)index >= args.size())
 				{
 					// Not enough arguments
-					pIM->displaySystemInfo (ucstring(CommandName+" : ")+CI18N::get ("uiCommandWrongArgumentCount"));
+					pIM->displaySystemInfo (CommandName+" : "+CI18N::get ("uiCommandWrongArgumentCount"));
 					return false;
 				}
 				else
@@ -5414,7 +5406,7 @@ bool CUserCommand::execute(const std::string &/* rawCommandString */, const std:
 	else
 	{
 		// Not enough argument
-		pIM->displaySystemInfo (ucstring(CommandName+" : ")+CI18N::get ("uiCommandWrongArgumentCount"));
+		pIM->displaySystemInfo (CommandName+" : "+CI18N::get ("uiCommandWrongArgumentCount"));
 		return false;
 	}
 	return true;
@@ -5658,7 +5650,7 @@ NLMISC_COMMAND(tickToDate, "convert a tick value into a readable ryzom time", ""
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	float ryTime = rt.getRyzomTime();
 	std::string readableDate = toString("Day = %d, hour = %d:%d", rt.getRyzomDay(), (int) floorf(ryTime), (int) floorf(60.f * fmodf(ryTime, 1.f)));
-	im->displaySystemInfo(ucstring(readableDate));
+	im->displaySystemInfo(readableDate);
 	return true;
 }
 
@@ -5930,7 +5922,7 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
 	tm = gmtime(&date);
 	strftime(cs_utc, size, "%X", tm);
 
-	ucstring msg = CI18N::get("uiCurrentLocalAndUtcTime");
+	string msg = CI18N::get("uiCurrentLocalAndUtcTime");
 	strFindReplace(msg, "%local", cs_local);
 	strFindReplace(msg, "%utc", cs_utc);
 	CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
@@ -5939,7 +5931,7 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
 
 NLMISC_COMMAND(playedTime, "Display character played time", "")
 {
-	ucstring msg = CI18N::get("uiPlayedTime");
+	string msg = CI18N::get("uiPlayedTime");
 	strFindReplace(msg, "%time", NLMISC::secondsToHumanReadable(CharPlayedTime));
 	CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
 	return true;
@@ -5947,7 +5939,7 @@ NLMISC_COMMAND(playedTime, "Display character played time", "")
 
 NLMISC_COMMAND(version, "Display client version", "")
 {
-	ucstring msg = getDebugVersion();
+	string msg = getDebugVersion();
 	CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
 	return true;
 }
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index ffca45406..1f3b7ee4f 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -647,7 +647,7 @@ class CAHEditExpandOrCycleTell : public CAHEdit
 		CInterfaceManager *im = CInterfaceManager::getInstance();
 		if (!im->isInGame()) return;
 		// there was no / at the start of the line so try to cycle through the last people on which a tell was done
-		const ucstring *lastTellPeople = ChatMngr.cycleLastTell();
+		const string *lastTellPeople = ChatMngr.cycleLastTell();
 		if (!lastTellPeople) return;
 		// Get chat box from ist edit box
 		// If it isn't a user chat or the main chat, just display 'tell' with the name. Otherwise, change the target of the window
@@ -661,7 +661,7 @@ class CAHEditExpandOrCycleTell : public CAHEdit
 		else
 		{
 			// it is not a filtered chat, display 'tell' (must be ingame)
-			_GroupEdit->setCommand("tell " + (*lastTellPeople).toUtf8() + ' ', false);
+			_GroupEdit->setCommand("tell " + (*lastTellPeople) + ' ', false);
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 4da75a8da..d574a7248 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1358,19 +1358,19 @@ class CSelectItemSheet : public IActionHandler
 					// display msg in the system infos
 					if (!canUse)
 					{
-						ucstring msg = CI18N::get("msgCantUseItem");
+						string msg = CI18N::get("msgCantUseItem");
 						string cat = getStringCategory(msg, msg);
 						im->displaySystemInfo(msg, cat);
 					}
 					if (!canBuild)
 					{
-						ucstring msg = CI18N::get("msgCantBuild");
+						string msg = CI18N::get("msgCantBuild");
 						string cat = getStringCategory(msg, msg);
 						im->displaySystemInfo(msg, cat);
 					}
 					if (!canUseBuiltItem)
 					{
-						ucstring msg = CI18N::get("msgCantUseBuiltItem");
+						string msg = CI18N::get("msgCantUseBuiltItem");
 						string cat = getStringCategory(msg, msg);
 						im->displaySystemInfo(msg, cat);
 					}
@@ -3797,7 +3797,7 @@ class CHandlerSetInterfaceScale : public IActionHandler
 			}
 		}
 
-		ucstring help("/setuiscale "+toString("%.1f .. %.1f", ClientCfg.InterfaceScale_min, ClientCfg.InterfaceScale_max));
+		string help = "/setuiscale "+toString("%.1f .. %.1f", ClientCfg.InterfaceScale_min, ClientCfg.InterfaceScale_max);
 		CInterfaceManager::getInstance()->displaySystemInfo(help);
 	}
 };
@@ -3981,7 +3981,7 @@ public:
 
 		// display parry mode msg
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("msgUserModeParry");
+		string msg = CI18N::get("msgUserModeParry");
 		string cat = getStringCategory(msg, msg);
 		pIM->displaySystemInfo(msg, cat);
 	}
@@ -3998,7 +3998,7 @@ public:
 
 		// display dodge mode msg
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("msgUserModeDodge");
+		string msg = CI18N::get("msgUserModeDodge");
 		string cat = getStringCategory(msg, msg);
 		pIM->displaySystemInfo(msg, cat);
 	}
@@ -4533,7 +4533,7 @@ public:
 		if( sCustomPhrase.empty() )
 		{
 			// Create the message and send.
-			const string msgName = "COMMAND:EMOTE";
+			static const string msgName = "COMMAND:EMOTE";
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 			{
@@ -4548,7 +4548,7 @@ public:
 		else
 		{
 			// Create the message and send.
-			const string msgName = "COMMAND:CUSTOM_EMOTE";
+			static const string msgName = "COMMAND:CUSTOM_EMOTE";
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 			{
@@ -4561,7 +4561,7 @@ public:
 					{
 						// display "no animation for emote"
 						CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-						ucstring msg = CI18N::get("msgCustomizedEmoteNoAnim");
+						string msg = CI18N::get("msgCustomizedEmoteNoAnim");
 						string cat = getStringCategory(msg, msg);
 						pIM->displaySystemInfo(msg, cat);
 						return;
@@ -4573,7 +4573,7 @@ public:
 				}
 
 				out.serialEnum(behavToSend);
-				out.serial(ucstr);
+				out.serial(ucstr); // FIXME: UTF-8 (serial)
 				NetMngr.push(out);
 				//nlinfo("impulseCallBack : %s %d %s sent", msgName.c_str(), (uint32)behavToSend, sCustomPhrase.c_str());
 			}
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 8190ab799..d6d41e32b 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -598,7 +598,7 @@ void getBuffer (CBitmap &btm)
 void displayScreenShotSavedInfo(const string &filename)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	ucstring msg("'" + filename + "' " + CI18N::get("uiScreenshotSaved"));
+	string msg = "'" + filename + "' " + CI18N::get("uiScreenshotSaved");
 	pIM->displaySystemInfo(msg);
 }
 
@@ -885,7 +885,7 @@ class CAHCycleTell : public IActionHandler
 	{
 		CInterfaceManager *im = CInterfaceManager::getInstance();
 		if (!im->isInGame()) return;
-		const ucstring *lastTellPeople = ChatMngr.cycleLastTell();
+		const string *lastTellPeople = ChatMngr.cycleLastTell();
 		if (!lastTellPeople) return;
 		// just popup the main chat
 		//CChatWindow *w = PeopleInterraction.MainChat.Window;
diff --git a/ryzom/client/src/interface_v3/action_handler_move.cpp b/ryzom/client/src/interface_v3/action_handler_move.cpp
index cbdfb9491..415dedbbc 100644
--- a/ryzom/client/src/interface_v3/action_handler_move.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_move.cpp
@@ -441,7 +441,7 @@ class CAHToggleDodgeParry : public IActionHandler
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		ucstring msg;
+		string msg;
 		// 0 - dodge mode
 		// 1 - parry mode
 		if (NLGUI::CDBManager::getInstance()->getDbProp("SERVER:DEFENSE:DEFENSE_MODE")->getValue32() == 0)
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 033f99bbf..56382bf54 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1173,7 +1173,7 @@ public:
 				{
 					// display "you can't cast while moving"
 					CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-					ucstring msg = CI18N::get("msgNoCastWhileMoving");
+					string msg = CI18N::get("msgNoCastWhileMoving");
 					string cat = getStringCategory(msg, msg);
 					pIM->displaySystemInfo(msg, cat);
 					return;
@@ -1417,7 +1417,7 @@ public:
 		else
 		{
 			// debug:
-			pIM->displaySystemInfo( ucstring("PHRASE:CANCEL_ALL") );
+			pIM->displaySystemInfo("PHRASE:CANCEL_ALL");
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/chat_displayer.h b/ryzom/client/src/interface_v3/chat_displayer.h
index a3218670d..217b4beb8 100644
--- a/ryzom/client/src/interface_v3/chat_displayer.h
+++ b/ryzom/client/src/interface_v3/chat_displayer.h
@@ -97,7 +97,7 @@ public:
 		std::vector<SDispString> &rVal = acces.value ();
 		for (uint i = 0; i < rVal.size(); ++i)
 		{
-			CInterfaceManager::getInstance()->displayDebugInfo(ucstring(rVal[i].Str), rVal[i].Mode);
+			CInterfaceManager::getInstance()->displayDebugInfo(rVal[i].Str, rVal[i].Mode);
 		}
 		rVal.clear();
 	}
diff --git a/ryzom/client/src/interface_v3/chat_filter.cpp b/ryzom/client/src/interface_v3/chat_filter.cpp
index a5fd04c5b..237106170 100644
--- a/ryzom/client/src/interface_v3/chat_filter.cpp
+++ b/ryzom/client/src/interface_v3/chat_filter.cpp
@@ -170,7 +170,7 @@ void CChatInputFilter::chatWindowRemoved(CChatWindow *cw)
 }
 
 //=============================================================================================================
-void CChatInputFilter::displayMessage(const ucstring &msg, NLMISC::CRGBA col, uint numBlinks /*=0*/, bool *windowVisible)
+void CChatInputFilter::displayMessage(const string &msg, NLMISC::CRGBA col, uint numBlinks /*=0*/, bool *windowVisible)
 {
 	bool windowVisibleTmp = false;
 	std::vector<CChatWindow *>::iterator it;
@@ -187,10 +187,9 @@ void CChatInputFilter::displayMessage(const ucstring &msg, NLMISC::CRGBA col, ui
 }
 
 //=============================================================================================================
-void CChatInputFilter::displayTellMessage(/*TDataSetIndex &receiverIndex, */const ucstring &msg, const ucstring &sender, NLMISC::CRGBA col, uint numBlinks /*=0*/,bool *windowVisible /*=NULL*/)
+void CChatInputFilter::displayTellMessage(/*TDataSetIndex &receiverIndex, */const string &msg, const string &sender, NLMISC::CRGBA col, uint numBlinks /*=0*/,bool *windowVisible /*=NULL*/)
 {
-	ucstring senderLwr;
-	senderLwr.fromUtf8(NLMISC::toLower(sender.toUtf8()));
+	string senderLwr = NLMISC::toLower(sender);
 
 	// look in people lists
 	std::vector<CPeopleList *>::iterator peopleListIt;
@@ -290,7 +289,7 @@ void CChatTargetFilter::setChat(CChatWindow *w)
 }
 
 //=============================================================================================================
-void CChatTargetFilter::msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+void CChatTargetFilter::msgEntered(const string &msg, CChatWindow *chatWindow)
 {
 	// Common Target case
 	if (ClientCfg.Local)
@@ -307,9 +306,9 @@ void CChatTargetFilter::msgEntered(const ucstring &msg, CChatWindow *chatWindow)
 	else if (!_TargetPlayer.empty())
 	{
 		// the target must be a player, make a tell on him
-		ChatMngr.tell(_TargetPlayer.toString(), msg);
+		ChatMngr.tell(_TargetPlayer, msg);
 		// direct output in the chat
-		chatWindow->displayLocalPlayerTell(_TargetPlayer.toString(), msg);
+		chatWindow->displayLocalPlayerTell(_TargetPlayer, msg);
 	}
 	else
 	{
@@ -334,7 +333,7 @@ void CChatTargetFilter::setTargetPartyChat(CChatWindow *w)
 }
 
 //=============================================================================================================
-void CChatTargetFilter::setTargetPlayer(const ucstring &targetPlayer)
+void CChatTargetFilter::setTargetPlayer(const string &targetPlayer)
 {
 	_TargetPlayer = targetPlayer;
 	if (_TargetPartyChat)
@@ -345,7 +344,7 @@ void CChatTargetFilter::setTargetPlayer(const ucstring &targetPlayer)
 	// set the prompt
 	if (_Chat)
 	{
-		_Chat->setPrompt(targetPlayer + (ucchar) '>');
+		_Chat->setPrompt(targetPlayer + '>');
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/chat_filter.h b/ryzom/client/src/interface_v3/chat_filter.h
index aeff77afc..317069899 100644
--- a/ryzom/client/src/interface_v3/chat_filter.h
+++ b/ryzom/client/src/interface_v3/chat_filter.h
@@ -42,10 +42,10 @@ public:
 	  * Listening windows will blick only if there isnt a single visible listening window, so that the player can know if there's a message
 	  * \param windowVisible is not NULL, points a bool that will be filled with true if one of the window on the which the msg was displayed is visible.
 	  */
-	void displayMessage(const ucstring &msg, NLMISC::CRGBA col, uint numBlinks = 0, bool *windowVisible = NULL);
+	void displayMessage(const std::string &msg, NLMISC::CRGBA col, uint numBlinks = 0, bool *windowVisible = NULL);
 	/** The same as displayMessage, but with sender name, so that the msg will be displayed in attached people lists as well
 	  */
-	void displayTellMessage(/*TDataSetIndex &senderIndex, */const ucstring &msg, const ucstring &sender, NLMISC::CRGBA col, uint numBlinks = 0, bool *windowVisible = NULL);
+	void displayTellMessage(/*TDataSetIndex &senderIndex, */const std::string &msg, const std::string &sender, NLMISC::CRGBA col, uint numBlinks = 0, bool *windowVisible = NULL);
 	/** Clear the messages in all registered chat windows
 	 */
 	void clearMessages();
@@ -134,8 +134,8 @@ public:
 			/** Set a player as the target. This remove any previous window target
 			  * NB : this replace any previous party chat or target group or player
 			  */
-			void			   setTargetPlayer(const ucstring &targetPlayer);
-			const ucstring     &getTargetPlayer() const { return _TargetPlayer; }
+			void			   setTargetPlayer(const std::string &targetPlayer);
+			const std::string     &getTargetPlayer() const { return _TargetPlayer; }
 	//@}
 private:
 
@@ -148,14 +148,14 @@ private:
 	// @{
 		CChatWindow				   *_TargetPartyChat; // the target party chat
 		CChatGroup::TGroupType      _TargetGroup;
-		ucstring					_TargetPlayer;
+		std::string					_TargetPlayer;
 		// relevant only if _TargetGroup==dyn_chat
 		uint32						_TargetDynamicChannelDbIndex;
 	// @}
 private:
 	// from IChatWindowListener
 	void chatWindowRemoved(CChatWindow *cw);
-	void msgEntered(const ucstring &msg, CChatWindow *chatWindow);
+	void msgEntered(const std::string &msg, CChatWindow *chatWindow);
 	// copy not supported
 	CChatTargetFilter(const CChatTargetFilter &/* other */):NLMISC::CRefCount() { nlassert(0); }
 	CChatTargetFilter& operator=(const CChatTargetFilter &/* other */) { nlassert(0); return *this; }
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index dff2da28c..3e99cd8b5 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -106,15 +106,13 @@ bool CChatTextManager::showTimestamps() const
 }
 
 //=================================================================================
-static CInterfaceGroup *parseCommandTag(ucstring &line)
+static CInterfaceGroup *parseCommandTag(string &line)
 {
-	string::size_type start = line.find(ucstring("/$$"));
+	string::size_type start = line.find("/$$");
 	if (start == string::npos) return NULL;
-	string::size_type end = line.find(ucstring("$$/"), start + 3);
+	string::size_type end = line.find("$$/", start + 3);
 	if (end == string::npos) return NULL;
-	std::string commandLine;
-	ucstring ucCommandLine = line.substr(start + 3, end - start - 3);
-	ucCommandLine.toString(commandLine);
+	std::string commandLine = line.substr(start + 3, end - start - 3);
 	line = line.substr(0, start) + line.substr(end +3);
 	vector<string> params;
 	explode(commandLine, std::string("|"), params);
@@ -221,11 +219,11 @@ static inline bool	isUrlTag(const ucstring &s, ucstring::size_type index, ucstri
 
 // ***************************************************************************
 // isUrlTag must match
-static inline void getUrlTag(const ucstring &s, ucstring::size_type &index, ucstring &url, ucstring &title)
+static inline void getUrlTag(const string &s, string::size_type &index, string &url, string &title)
 {
 	bool isMarkdown = false;
-	ucstring::size_type textSize = s.size();
-	ucstring::size_type pos;
+	string::size_type textSize = s.size();
+	string::size_type pos;
 
 	// see if we have markdown format
 	if (s[index] == '(')
@@ -250,8 +248,8 @@ static inline void getUrlTag(const ucstring &s, ucstring::size_type &index, ucst
 		}
 	}
 
-	ucchar chOpen = ' ';
-	ucchar chClose = ' ';
+	char chOpen = ' ';
+	char chClose = ' ';
 	if (isMarkdown)
 	{
 		chOpen = '[';
@@ -272,7 +270,7 @@ static inline void getUrlTag(const ucstring &s, ucstring::size_type &index, ucst
 		pos = s.find_first_of(chClose, index);
 
 		// handle common special case: 'text http://.../, text'
-		if (pos != ucstring::npos && index > 0)
+		if (pos != string::npos && index > 0)
 		{
 			if (s[index-1] == ' ' && (s[pos-1] == ',' || s[pos-1] == '.'))
 			{
@@ -308,7 +306,7 @@ static inline void getUrlTag(const ucstring &s, ucstring::size_type &index, ucst
 	}
 
 	// fallback to full string length as we did match http:// already and url spans to the end probably
-	if (pos == ucstring::npos)
+	if (pos == string::npos)
 	{
 		pos = textSize;
 	}
@@ -321,22 +319,22 @@ static inline void getUrlTag(const ucstring &s, ucstring::size_type &index, ucst
 }
 
 //=================================================================================
-static void prependTimestamp(ucstring &msg)
+static void prependTimestamp(string &msg)
 {
-	ucstring cur_time;
+	string cur_time;
 	CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:SHOW_CLOCK_12H", false);
 	if (node && node->getValueBool())
 		cur_time = CInterfaceManager::getTimestampHuman("[%I:%M:%S %p] ");
 	else
 		cur_time = CInterfaceManager::getTimestampHuman();
 
-	ucstring::size_type codePos = msg.find(ucstring("@{"));
-	if (codePos != ucstring::npos)
+	string::size_type codePos = msg.find("@{");
+	if (codePos != string::npos)
 	{
 		// Prepend the current time (do it after the color if the color at first position.
 		if (codePos == 0)
 		{
-			codePos = msg.find(ucstring("}"));
+			codePos = msg.find(string("}"));
 			msg = msg.substr(0, codePos + 1) + cur_time + msg.substr(codePos + 1, msg.length() - codePos);
 		}
 		else
@@ -351,9 +349,9 @@ static void prependTimestamp(ucstring &msg)
 }
 
 //=================================================================================
-CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA col, bool justified /*=false*/, bool plaintext /*=false*/)
+CViewBase *CChatTextManager::createMsgText(const string &cstMsg, NLMISC::CRGBA col, bool justified /*=false*/, bool plaintext /*=false*/)
 {
-	ucstring msg = cstMsg;
+	string msg = cstMsg;
 	CInterfaceGroup *commandGroup = parseCommandTag(msg);
 
 	if (showTimestamps())
@@ -365,7 +363,7 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
 }
 
 //=================================================================================
-CViewBase *CChatTextManager::createMsgTextSimple(const ucstring &msg, NLMISC::CRGBA col, bool justified, CInterfaceGroup *commandGroup)
+CViewBase *CChatTextManager::createMsgTextSimple(const string &msg, NLMISC::CRGBA col, bool justified, CInterfaceGroup *commandGroup)
 {
 	CViewText *vt = new CViewText(CViewText::TCtorParam());
 	// get parameters from config.xml
@@ -379,14 +377,14 @@ CViewBase *CChatTextManager::createMsgTextSimple(const ucstring &msg, NLMISC::CR
 
 	// if text contain any color code, set the text formated and white,
 	// otherwise, set text normal and apply global color
-	if (msg.find(ucstring("@{")) != ucstring::npos)
+	if (msg.find("@{") != string::npos)
 	{
-		vt->setTextFormatTaged(msg.toUtf8());
+		vt->setTextFormatTaged(msg);
 		vt->setColor(NLMISC::CRGBA::White);
 	}
 	else
 	{
-		vt->setText(msg.toUtf8());
+		vt->setText(msg);
 		vt->setColor(col);
 	}
 
@@ -401,9 +399,9 @@ CViewBase *CChatTextManager::createMsgTextSimple(const ucstring &msg, NLMISC::CR
 }
 
 //=================================================================================
-CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::CRGBA col, bool justified, bool plaintext, CInterfaceGroup *commandGroup)
+CViewBase *CChatTextManager::createMsgTextComplex(const string &msg, NLMISC::CRGBA col, bool justified, bool plaintext, CInterfaceGroup *commandGroup)
 {
-	ucstring::size_type textSize = msg.size();
+	string::size_type textSize = msg.size();
 
 	CGroupParagraph *para = new CGroupParagraph(CViewBase::TCtorParam());
 	para->setId("line");
@@ -412,7 +410,7 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 
 	// use right click because left click might be used to activate chat window
 	para->setRightClickHandler("copy_chat_popup");
-	para->setRightClickHandlerParams(msg.toUtf8());
+	para->setRightClickHandlerParams(msg);
 
 	if (plaintext)
 	{
@@ -427,12 +425,12 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 	// quickly check if text has links or not
 	bool hasUrl;
 	{
-		ucstring s = toLower(msg);
-		hasUrl = (s.find(ucstring("http://")) || s.find(ucstring("https://")));
+		string s = toLower(msg);
+		hasUrl = (s.find("http://") || s.find("https://"));
 	}
 
-	ucstring::size_type pos = 0;
-	for (ucstring::size_type i = 0; i< textSize;)
+	string::size_type pos = 0;
+	for (string::size_type i = 0; i< textSize;)
 	{
 		if (hasUrl && isUrlTag(msg, i, textSize))
 		{
@@ -442,8 +440,8 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 				para->addChild(vt);
 			}
 
-			ucstring url;
-			ucstring title;
+			string url;
+			string title;
 			getUrlTag(msg, i, url, title);
 			if (url.size() > 0)
 			{
@@ -465,29 +463,29 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 
 				if (title.size() > 0)
 				{
-					vt->LinkTitle = title.toUtf8();
+					vt->LinkTitle = title;
 					vt->setText(vt->LinkTitle);
 				}
 				else
 				{
-					vt->LinkTitle = url.toUtf8();
+					vt->LinkTitle = url;
 					vt->setText(vt->LinkTitle);
 				}
 
 				if (url.find_first_of('\'') != string::npos)
 				{
-					ucstring clean;
+					string clean;
 					for(string::size_type i = 0; i< url.size(); ++i)
 					{
 						if (url[i] == '\'')
-							clean += ucstring("%27");
+							clean += "%27";
 						else
 							clean += url[i];
 					}
 					url = clean;
 				}
 				vt->setActionOnLeftClick("lua");
-				vt->setParamsOnLeftClick("game:chatUrl('" + url.toUtf8() + "')");
+				vt->setParamsOnLeftClick("game:chatUrl('" + url + "')");
 
 				para->addChildLink(vt);
 
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.h b/ryzom/client/src/interface_v3/chat_text_manager.h
index 2f7e380be..1cf66730e 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.h
+++ b/ryzom/client/src/interface_v3/chat_text_manager.h
@@ -55,7 +55,7 @@ public:
 	  * \param justified Should be true for justified text (stretch spaces of line to fill the full width)
 	  * \param plaintext Text will not be parsed for uri markup links
 	  */
-	NLGUI::CViewBase *createMsgText(const ucstring &msg, NLMISC::CRGBA col, bool justified = false, bool plaintext = false);
+	NLGUI::CViewBase *createMsgText(const std::string &msg, NLMISC::CRGBA col, bool justified = false, bool plaintext = false);
 	// Singleton access
 	static CChatTextManager &getInstance();
 
@@ -79,8 +79,8 @@ private:
 
 	bool showTimestamps() const;
 
-	NLGUI::CViewBase *createMsgTextSimple(const ucstring &msg, NLMISC::CRGBA col, bool justified, NLGUI::CInterfaceGroup *commandGroup);
-	NLGUI::CViewBase *createMsgTextComplex(const ucstring &msg, NLMISC::CRGBA col, bool justified, bool plaintext, NLGUI::CInterfaceGroup *commandGroup);
+	NLGUI::CViewBase *createMsgTextSimple(const std::string &msg, NLMISC::CRGBA col, bool justified, NLGUI::CInterfaceGroup *commandGroup);
+	NLGUI::CViewBase *createMsgTextComplex(const std::string &msg, NLMISC::CRGBA col, bool justified, bool plaintext, NLGUI::CInterfaceGroup *commandGroup);
 };
 
 // shortcut to get text manager instance
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 8d7551803..eef48509e 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -204,11 +204,11 @@ bool CChatWindow::isVisible() const
 }
 
 //=================================================================================
-void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks /* = 0*/, bool *windowVisible /*= NULL*/)
+void CChatWindow::displayMessage(const string &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks /* = 0*/, bool *windowVisible /*= NULL*/)
 {
 	if (!_Chat)
 	{
-		if (msg.toUtf8() != "WRN: <CChatWindow::displayMessage> There's no global chat")
+		if (msg != "WRN: <CChatWindow::displayMessage> There's no global chat")
 			nlwarning("<CChatWindow::displayMessage> There's no global chat");
 		return;
 	}
@@ -538,11 +538,11 @@ void CChatWindow::clearMessages(CChatGroup::TGroupType /* gt */, uint32 /* dynam
 // CChatGroupWindow //
 //////////////////////
 
-void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks, bool *windowVisible)
+void CChatGroupWindow::displayMessage(const string &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks, bool *windowVisible)
 {
 	if (!_Chat)
 	{
-		if (msg.toUtf8() != "WRN: <CChatGroupWindow::displayMessage> There's no global chat")
+		if (msg != "WRN: <CChatGroupWindow::displayMessage> There's no global chat")
 			nlwarning("<CChatGroupWindow::displayMessage> There's no global chat");
 		return;
 	}
@@ -563,8 +563,8 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CRGBA	newMsgColor= CRGBA::stringToRGBA(CWidgetManager::getInstance()->getParser()->getDefine("chat_group_tab_color_newmsg").c_str());
 
-	ucstring newmsg = msg;
-	ucstring prefix;
+	string newmsg = msg;
+	string prefix;
 
 	if (gl != NULL)
 	{
@@ -599,20 +599,20 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 					gl = gl2;
 
 					// Add dyn chan number before string
-					ucstring prefix("[" + NLMISC::toString(dynamicChatDbIndex) + "]");
+					string prefix = "[" + NLMISC::toString(dynamicChatDbIndex) + "]";
 					// Find position to put the new string
 					// After timestamp?
-					size_t pos = newmsg.find(ucstring("]"));
-					size_t colonpos = newmsg.find(ucstring(": @{"));
+					size_t pos = newmsg.find("]");
+					size_t colonpos = newmsg.find(": @{");
 					// If no ] found or if found but after the colon (so part of the user chat)
-					if (pos == ucstring::npos || (colonpos < pos))
+					if (pos == string::npos || (colonpos < pos))
 					{
 						// No timestamp, so put it right after the color and add a space
-						pos = newmsg.find(ucstring("}"));
+						pos = newmsg.find("}");
 						prefix += " ";
 					}
 					
-					if (pos == ucstring::npos)
+					if (pos == string::npos)
 						newmsg = prefix + newmsg;
 					else
 						newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
@@ -622,10 +622,10 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 					if (node && node->getValueBool())
 					{
 						uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(dynamicChatDbIndex);
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-						prefix = title.empty() ? ucstring("") : ucstring(" ") + title;
-						pos = newmsg.find(ucstring("] "));
+						prefix = (title.empty() ? "" : " ") + title;
+						pos = newmsg.find("] ");
 
 						if (pos == ucstring::npos)
 							newmsg = prefix + newmsg;
@@ -667,7 +667,7 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 }
 
 //=================================================================================
-void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col, const ucstring &sender)
+void CChatGroupWindow::displayTellMessage(const string &msg, NLMISC::CRGBA col, const string &sender)
 {
 	// If we are here with a tell message this is because the teller doesn't belong to any people list
 	CGroupContainer *gcChat = createFreeTeller(sender);
@@ -876,7 +876,7 @@ void CChatGroupWindow::setActiveFreeTeller(const ucstring &winName, bool bActive
 }
 
 //=================================================================================
-ucstring CChatGroupWindow::getFreeTellerName(const std::string &containerID)
+string CChatGroupWindow::getFreeTellerName(const std::string &containerID)
 {
 	uint32 i;
 	for (i = 0; i < _FreeTellers.size(); ++i)
@@ -886,8 +886,8 @@ ucstring CChatGroupWindow::getFreeTellerName(const std::string &containerID)
 			break;
 	}
 	if (i == _FreeTellers.size())
-		return ucstring("");
-	return _FreeTellers[i]->getUCTitle();
+		return string();
+	return _FreeTellers[i]->getTitle();
 }
 
 //=================================================================================
@@ -1306,7 +1306,7 @@ public:
 			else
 			{
 				CInterfaceManager *im = CInterfaceManager::getInstance();
-				im->displaySystemInfo (ucstring::makeFromUtf8(cmd) + ": " + CI18N::get ("uiCommandNotExists"));
+				im->displaySystemInfo (cmd + ": " + CI18N::get ("uiCommandNotExists"));
 			}
 		}
 		else
@@ -1410,16 +1410,16 @@ class CHandlerInviteToRingSession : public IActionHandler
 public:
 	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
 	{
-		ucstring playerName = ::getFreeTellerName(pCaller);
+		string playerName = ::getFreeTellerName(pCaller).toUtf8();
 		if (!playerName.empty())
 		{
 			// ask the SBS to invite the character in the session
-			CSessionBrowserImpl::getInstance().inviteCharacterByName(CSessionBrowserImpl::getInstance().getCharId(), playerName.toUtf8());
+			CSessionBrowserImpl::getInstance().inviteCharacterByName(CSessionBrowserImpl::getInstance().getCharId(), playerName);
 			// additionaly, send a tell to signal the player he has been invited to a ring session
-			ChatMngr.tell(playerName.toUtf8(), CI18N::get("uiRingInviteNotification"));
+			ChatMngr.tell(playerName, CI18N::get("uiRingInviteNotification"));
 			//
 			CInterfaceManager *im = CInterfaceManager::getInstance();
-			im->displaySystemInfo(ucstring("@{6F6F}") +  playerName +ucstring(" @{FFFF}") + CI18N::get("uiRingInvitationSent"), "BC");
+			im->displaySystemInfo("@{6F6F}" +  playerName +" @{FFFF}" + CI18N::get("uiRingInvitationSent"), "BC");
 			// force a refresh of the ui
 			CLuaManager::getInstance().executeLuaScript("CharTracking:forceRefresh()");
 		}
diff --git a/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
index 13012ca31..39fc448f9 100644
--- a/ryzom/client/src/interface_v3/chat_window.h
+++ b/ryzom/client/src/interface_v3/chat_window.h
@@ -47,7 +47,7 @@ class CChatWindow;
 struct IChatWindowListener
 {
 	// the user entered a msg in the given chat box
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow) = 0;
+	virtual void msgEntered(const std::string &msg, CChatWindow *chatWindow) = 0;
 };
 
 
@@ -98,8 +98,8 @@ public:
 	};
 public:
 	// display a message in this chat box with the given color
-	virtual void displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks = 0, bool *windowVisible = NULL);
-	virtual void displayTellMessage(const ucstring &/* msg */, NLMISC::CRGBA /* col */, const ucstring &/* sender */) {}
+	virtual void displayMessage(const std::string &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks = 0, bool *windowVisible = NULL);
+	virtual void displayTellMessage(const std::string &/* msg */, NLMISC::CRGBA /* col */, const std::string &/* sender */) {}
 	virtual void clearMessages(CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex);
 	// Test if the window is visible
 	bool isVisible() const;
@@ -189,8 +189,8 @@ class CChatGroupWindow : public CChatWindow
 public:
 	CChatGroupWindow() {}
 	// display a message in this chat box with the given color (callback from chat input filter)
-	virtual void displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks = 0, bool *windowVisible = NULL);
-	virtual void displayTellMessage(const ucstring &msg, NLMISC::CRGBA col, const ucstring &sender);
+	virtual void displayMessage(const std::string &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks = 0, bool *windowVisible = NULL);
+	virtual void displayTellMessage(const std::string &msg, NLMISC::CRGBA col, const std::string &sender);
 	virtual void clearMessages(CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex);
 	sint32 getTabIndex();
 	void setTabIndex(sint32 n);
@@ -198,7 +198,7 @@ public:
 	// Free Teller
 	NLGUI::CGroupContainer *createFreeTeller(const ucstring &winName, const std::string &winColor="");
 	void setActiveFreeTeller(const ucstring &winName, bool bActive=true);
-	ucstring getFreeTellerName(const std::string &containerID);
+	std::string getFreeTellerName(const std::string &containerID);
 	bool removeFreeTeller(const std::string &containerID); // Return true if free teller found
 	void removeAllFreeTellers();
 	void saveFreeTeller(NLMISC::IStream &f);
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 328579d06..74dc5d991 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -370,8 +370,8 @@ void CGuildManager::update()
 			{
 				// See if we need to show any online/offline messages
 				static map<ucstring, SGuildMember> CachedGuildMembers;
-				ucstring onlineMessage = CI18N::get("uiPlayerOnline");
-				ucstring offlineMessage = CI18N::get("uiPlayerOffline");
+				const string &onlineMessage = CI18N::get("uiPlayerOnline");
+				const string &offlineMessage = CI18N::get("uiPlayerOffline");
 
 				for (uint i = 0; i < _GuildMembers.size(); ++i)
 				{
@@ -390,8 +390,8 @@ void CGuildManager::update()
 							continue;
 						}
 
-						ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
-						strFindReplace(msg, "%s", _GuildMembers[i].Name);
+						string msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
+						strFindReplace(msg, "%s", _GuildMembers[i].Name.toUtf8());
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
@@ -1084,7 +1084,7 @@ public:
 		MemberIndexSelected= nLineNb;
 		MemberNameSelected = rGuildMembers[nLineNb].Name;
 
-		CPeopleInterraction::displayTellInMainChat(MemberNameSelected);	
+		CPeopleInterraction::displayTellInMainChat(MemberNameSelected.toUtf8());	
 	}
 
 	// Current selection
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index a0d36f535..4330782bc 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -982,7 +982,7 @@ void CInterfaceManager::initInGame()
 	// flush system msg buffer
 	for( uint i=0; i<PeopleInterraction.SystemMessageBuffer.size(); ++i )
 	{
-		displaySystemInfo(PeopleInterraction.SystemMessageBuffer[i].Str, PeopleInterraction.SystemMessageBuffer[i].Cat);
+		displaySystemInfo(PeopleInterraction.SystemMessageBuffer[i].Str.toUtf8(), PeopleInterraction.SystemMessageBuffer[i].Cat);
 	}
 	PeopleInterraction.SystemMessageBuffer.clear();
 
@@ -2495,7 +2495,7 @@ bool	CInterfaceManager::getCurrentValidMessageBoxOnOk(string &ahOnOk, const std:
 
 
 // ***************************************************************************
-void CInterfaceManager::displayDebugInfo(const ucstring &str, TSystemInfoMode mode /*=InfoMsg*/)
+void CInterfaceManager::displayDebugInfo(const string &str, TSystemInfoMode mode /*=InfoMsg*/)
 {
 	if (PeopleInterraction.DebugInfo)
 		PeopleInterraction.ChatInput.DebugInfo.displayMessage(str, getDebugInfoColor(mode), 2);
@@ -2525,7 +2525,7 @@ NLMISC::CRGBA CInterfaceManager::getDebugInfoColor(TSystemInfoMode mode)
 }
 
 // ***************************************************************************
-void CInterfaceManager::displaySystemInfo(const ucstring &str, const string &cat)
+void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
 {
 	CClientConfig::SSysInfoParam::TMode mode = CClientConfig::SSysInfoParam::Normal;
 	CRGBA color = CRGBA::White;
@@ -3061,7 +3061,7 @@ NLMISC_COMMAND( localCounter, "Get value of local counter", "" )
 {
 	if (args.size() != 0) return false;
 	CInterfaceManager *im = CInterfaceManager::getInstance();
-	im->displaySystemInfo(ucstring(toString(im->getLocalSyncActionCounter())));
+	im->displaySystemInfo(toString(im->getLocalSyncActionCounter()));
 	return true;
 }
 
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 059020018..39fd12dc4 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -292,12 +292,12 @@ public:
 	void drawViews (NL3D::UCamera camera);
 
 	// display a debug info
-	void		  displayDebugInfo(const ucstring &str, TSystemInfoMode mode = InfoMsg);
+	void		  displayDebugInfo(const std::string &str, TSystemInfoMode mode = InfoMsg);
 	// get the color associated with the given system info mode
 	NLMISC::CRGBA getDebugInfoColor(TSystemInfoMode mode);
 
 	// display a system info string
-	void		  displaySystemInfo(const ucstring &str, const std::string &Category = "SYS");
+	void		  displaySystemInfo(const std::string &str, const std::string &Category = "SYS");
 	NLMISC::CRGBA getSystemInfoColor(const std::string &Category = "SYS");
 
 	void setupOptions();
diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
index 75cab6f78..3b16c41d2 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -3236,7 +3236,7 @@ class CHandlerInvTempToBag : public IActionHandler
 		// If we cant find place display a message and dont send the request to the server
 		if (!getInventory().isSpaceInAllBagsForItem(pCSDst))
 		{
-			ucstring msg = CI18N::get("msgCantPutItemInBag");
+			string msg = CI18N::get("msgCantPutItemInBag");
 			string cat = getStringCategory(msg, msg);
 			pIM->displaySystemInfo(msg, cat);
 			return;
@@ -3322,7 +3322,7 @@ class CHandlerInvTempAll : public IActionHandler
 
 		if (!bPlaceFound)
 		{
-			ucstring msg = CI18N::get("msgCantPutItemInBag");
+			string msg = CI18N::get("msgCantPutItemInBag");
 			string cat = getStringCategory(msg, msg);
 			CInterfaceManager::getInstance()->displaySystemInfo(msg, cat);
 			return;
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 21322295e..fec5ff3fe 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -1701,7 +1701,7 @@ int CLuaIHMRyzom::displaySystemInfo(CLuaState &ls)
 	ucstring msg;
 	nlverify(CLuaIHM::getUCStringOnStack(ls, 1, msg));
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->displaySystemInfo(msg, ls.toString(2));
+	pIM->displaySystemInfo(msg.toUtf8(), ls.toString(2));
 	return 0;
 }
 
@@ -4247,27 +4247,27 @@ int CLuaIHMRyzom::displayChatMessage(CLuaState &ls)
 		if (input == "around")
 		{
 			prop.readRGBA(std::string(dbPath + ":SAY").c_str(), " ");
-			ci.AroundMe.displayMessage(ucstring(msg), prop.getRGBA());
+			ci.AroundMe.displayMessage(msg, prop.getRGBA());
 		}
 		else if (input == "region")
 		{
 			prop.readRGBA(std::string(dbPath + ":REGION").c_str(), " ");
-			ci.Region.displayMessage(ucstring(msg), prop.getRGBA());
+			ci.Region.displayMessage(msg, prop.getRGBA());
 		}
 		else if (input == "universe")
 		{
 			prop.readRGBA(std::string(dbPath + ":UNIVERSE_NEW").c_str(), " ");
-			ci.Universe.displayMessage(ucstring(msg), prop.getRGBA());
+			ci.Universe.displayMessage(msg, prop.getRGBA());
 		}
 		else if (input == "guild")
 		{
 			prop.readRGBA(std::string(dbPath + ":CLADE").c_str(), " ");
-			ci.Guild.displayMessage(ucstring(msg), prop.getRGBA());
+			ci.Guild.displayMessage(msg, prop.getRGBA());
 		}
 		else if (input == "team")
 		{
 			prop.readRGBA(std::string(dbPath + ":GROUP").c_str(), " ");
-			ci.Team.displayMessage(ucstring(msg), prop.getRGBA());
+			ci.Team.displayMessage(msg, prop.getRGBA());
 		}
 	}
 	if (ls.type(2) == LUA_TNUMBER)
@@ -4275,7 +4275,7 @@ int CLuaIHMRyzom::displayChatMessage(CLuaState &ls)
 		sint64 id = ls.toInteger(2);
 		prop.readRGBA(toString("%s:DYN:%i", dbPath.c_str(), id).c_str(), " ");
 		if (id >= 0 && id < CChatGroup::MaxDynChanPerPlayer)
-			ci.DynamicChat[id].displayMessage(ucstring(msg), prop.getRGBA());
+			ci.DynamicChat[id].displayMessage(msg, prop.getRGBA());
 	}
 	return 1;
 }
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 889b83495..b45af6c7b 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -623,9 +623,9 @@ void CMusicPlayer::createPlaylistFromMusic()
 	if (extensions.empty())
 	{
 		// in the very unlikely scenario
-		const ucstring message("Sound driver has no support for music.");
+		static const string message("Sound driver has no support for music.");
 		CInterfaceManager::getInstance()->displaySystemInfo(message, "SYS");
-		nlinfo("%s", message.toUtf8().c_str());
+		nlinfo("%s", message.c_str());
 		return;
 	}
 	std::string newPath = CPath::makePathAbsolute(CPath::standardizePath(ClientCfg.MediaPlayerDirectory), CPath::getCurrentPath(), true);
@@ -635,7 +635,7 @@ void CMusicPlayer::createPlaylistFromMusic()
 
 	std::string msg(CI18N::get("uiMk_system6"));
 	msg += ": " + newPath + " (" + extlist + ")";
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring::makeFromUtf8(msg), "SYS");
+	CInterfaceManager::getInstance()->displaySystemInfo(msg, "SYS");
 	nlinfo("%s", msg.c_str());
 
 	// Recursive scan for files from media directory
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index de7c9023a..eaf6386c2 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -91,7 +91,7 @@ static const sint PARTY_CHAT_SPAWN_DELTA = 20; // to avoid that all party chat a
 
 /** Display an error msg in the system info window, and also in the last window that triggered the command (so that the user is sure to see it)
   */
-static void displayVisibleSystemMsg(const ucstring &msg, const string &cat = "CHK");
+static void displayVisibleSystemMsg(const std::string &msg, const string &cat = "CHK");
 
 
 //////////////////////////////
@@ -102,7 +102,7 @@ static void displayVisibleSystemMsg(const ucstring &msg, const string &cat = "CH
 
 struct CPartyChatEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -120,7 +120,7 @@ struct CPartyChatEntryHandler : public IChatWindowListener
 // handler to manage user entry in 'around me' window
 struct CAroundMeEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -138,7 +138,7 @@ struct CAroundMeEntryHandler : public IChatWindowListener
 // handler to manage user entry in 'region' window
 struct CRegionEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -156,7 +156,7 @@ struct CRegionEntryHandler : public IChatWindowListener
 // handler to manage user entry in 'universe' window
 struct CUniverseEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -174,7 +174,7 @@ struct CUniverseEntryHandler : public IChatWindowListener
 // handler to manage user entry in 'guild chat' window
 struct CGuildChatEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -191,7 +191,7 @@ struct CGuildChatEntryHandler : public IChatWindowListener
 // handler to manage user entry in 'team chat' window
 struct CTeamChatEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -208,7 +208,7 @@ struct CTeamChatEntryHandler : public IChatWindowListener
 // handler to manage user entry in a 'talk with friend' window
 struct CFriendTalkEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -225,10 +225,9 @@ struct CFriendTalkEntryHandler : public IChatWindowListener
 // handler to manage user entry in a debug console window
 struct CDebugConsoleEntryHandler : public IChatWindowListener
 {
-	virtual void msgEntered(const ucstring &msg, CChatWindow * /* chatWindow */)
+	virtual void msgEntered(const string &msg, CChatWindow * /* chatWindow */)
 	{
-		std::string str = msg.toString();
-		NLMISC::ICommand::execute( str, g_log );
+		NLMISC::ICommand::execute( msg, g_log );
 	}
 };
 
@@ -242,7 +241,7 @@ public:
 		DbIndex= 0;
 	}
 
-	virtual void msgEntered(const ucstring &msg, CChatWindow *chatWindow)
+	virtual void msgEntered(const string &msg, CChatWindow *chatWindow)
 	{
 		if (ClientCfg.Local)
 		{
@@ -1410,8 +1409,8 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 					// Player is not in my guild, and the status change is from offline to online/abroad online or vice versa. 
 					if (showMsg)
 					{
-						ucstring msg = (online != ccs_offline) ? CI18N::get("uiPlayerOnline") : CI18N::get("uiPlayerOffline");
-						strFindReplace(msg, "%s", FriendList.getName(index));
+						string msg = (online != ccs_offline) ? CI18N::get("uiPlayerOnline") : CI18N::get("uiPlayerOffline");
+						strFindReplace(msg, "%s", FriendList.getName(index).toUtf8());
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
@@ -1883,7 +1882,7 @@ void CPeopleInterraction::refreshActiveUserChats()
 }
 
 //=================================================================================================================
-void CPeopleInterraction::talkInDynamicChannel(uint32 channelNb,ucstring sentence)
+void CPeopleInterraction::talkInDynamicChannel(uint32 channelNb,string sentence)
 {
 	if(channelNb<CChatGroup::MaxDynChanPerPlayer)
 	{
@@ -1892,7 +1891,7 @@ void CPeopleInterraction::talkInDynamicChannel(uint32 channelNb,ucstring sentenc
 }
 
 //=================================================================================================================
-void CPeopleInterraction::displayTellInMainChat(const ucstring &playerName)
+void CPeopleInterraction::displayTellInMainChat(const string &playerName)
 {
 	//CChatWindow *chat = PeopleInterraction.MainChat.Window;
 	CChatWindow *chat = PeopleInterraction.ChatGroup.Window;
@@ -2138,7 +2137,7 @@ public:
 		uint peopleIndex;
 		if (PeopleInterraction.getPeopleFromCurrentMenu(list, peopleIndex))
 		{
-			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex));
+			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex).toUtf8());
 		}
 	}
 };
@@ -2160,7 +2159,7 @@ class CHandlerTellContact : public IActionHandler
 		uint peopleIndex;
 		if (PeopleInterraction.getPeopleFromContainerID(gc->getId(), list, peopleIndex))
 		{
-			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex));
+			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex).toUtf8());
 		}
 
 	}
@@ -2416,7 +2415,7 @@ class CHandlerValidatePartyChatName : public IActionHandler
 		if (!gc) return;
 		CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(gc->getGroup("eb"));
 		if (!eb) return;
-		ucstring title = eb->getInputStringAsUtf16();
+		string title = eb->getInputString();
 
 		// TODO GAMEDEV : create (or join ?) a new channel. Each channel (party chat) should have a unique name in the game
 		// moreover, it should not have the name of another available chat window (for example, it shouldn't be named 'Around Me')
@@ -2425,7 +2424,7 @@ class CHandlerValidatePartyChatName : public IActionHandler
 
 		if (!PeopleInterraction.testValidPartyChatName(title))
 		{
-			displayVisibleSystemMsg(title + ucstring(" : ") +  CI18N::get("uiInvalidPartyChatName"));
+			displayVisibleSystemMsg(title + " : " +  CI18N::get("uiInvalidPartyChatName"));
 			return;
 		}
 
@@ -3315,7 +3314,7 @@ REGISTER_INTERFACE_USER_FCT("getNumUserChatLeft", getNumUserChatLeft)
 // STATIC FUNCTIONS IMPLEMENTATIONS //
 //////////////////////////////////////
 
-static void displayVisibleSystemMsg(const ucstring &msg, const string &cat)
+static void displayVisibleSystemMsg(const string &msg, const string &cat)
 {
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	im->displaySystemInfo(msg, cat);
@@ -3328,7 +3327,7 @@ static void displayVisibleSystemMsg(const ucstring &msg, const string &cat)
 #if !FINAL_VERSION
 NLMISC_COMMAND(testSI, "tmp", "tmp")
 {
-	PeopleInterraction.ChatInput.DebugInfo.displayMessage(ucstring("test"), CRGBA::Red);
+	PeopleInterraction.ChatInput.DebugInfo.displayMessage("test", CRGBA::Red);
 	return true;
 }
 #endif
diff --git a/ryzom/client/src/interface_v3/people_interraction.h b/ryzom/client/src/interface_v3/people_interraction.h
index 591a005e2..a88db2a65 100644
--- a/ryzom/client/src/interface_v3/people_interraction.h
+++ b/ryzom/client/src/interface_v3/people_interraction.h
@@ -250,14 +250,14 @@ public:
 	// Test if the given chat is a user chat (this includes the main chat)
 	bool				isUserChat(CChatWindow *cw) const;
 
-	void				talkInDynamicChannel(uint32 channelNb,ucstring sentence);
+	void				talkInDynamicChannel(uint32 channelNb,std::string sentence);
 
 	CChatGroupWindow	*getChatGroupWindow() const;
 
 	void updateAllFreeTellerHeaders();
 	void removeAllFreeTellers();
 
-	static void displayTellInMainChat(const ucstring &playerName);
+	static void displayTellInMainChat(const std::string &playerName);
 private:
 	// create various chat & people lists
 	void createTeamChat();
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 3f0481b1f..e5426ccfb 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -449,7 +449,7 @@ void CPeopleList::setContactId(uint index, uint32 contactId)
 }
 
 //==================================================================
-void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, const ucstring &msg,uint numBlinks /*=0*/)
+void CPeopleList::displayLocalPlayerTell(const string &receiver, uint index, const string &msg,uint numBlinks /*=0*/)
 {
 	if (_ContactType == CPeopleListDesc::Ignore)
 	{
@@ -473,13 +473,13 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 	}
 
  	string csr = CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "";
-	string finalMsg = csr + CI18N::get("youTell") + ": " + msg.toUtf8();
+	string finalMsg = csr + CI18N::get("youTell") + ": " + msg;
 	// display msg with good color
 	CInterfaceProperty prop;
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 
 	string s = CI18N::get("youTellPlayer");
-	strFindReplace(s, "%name", receiver.toUtf8());
+	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
 	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
@@ -497,7 +497,7 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 
 
 //==================================================================
-void CPeopleList::displayMessage(uint index, const ucstring &msg, NLMISC::CRGBA col, uint /* numBlinks */ /*= 0*/)
+void CPeopleList::displayMessage(uint index, const string &msg, NLMISC::CRGBA col, uint /* numBlinks */ /*= 0*/)
 {
 	if (_ContactType == CPeopleListDesc::Ignore)
 	{
@@ -951,7 +951,7 @@ class CHandlerContactEntry : public IActionHandler
 				pWin->displayTellMessage(final, prop.getRGBA(), pWin->getFreeTellerName(str));
 
 				string s = CI18N::get("youTellPlayer");
-				strFindReplace(s, "%name", pWin->getFreeTellerName(str).toUtf8());
+				strFindReplace(s, "%name", pWin->getFreeTellerName(str));
 				strFindReplace(final, CI18N::get("youTell"), s);
 				CInterfaceManager::getInstance()->log(final, CChatGroup::groupTypeToString(CChatGroup::tell));
 			}
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index 32317b6b8..da7556aa5 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -113,8 +113,8 @@ public:
 	/** Display a message for the given people
 	  * If the window is closed, it causes it to blink (and also the parent window)
 	  */
-	void displayMessage(uint index, const ucstring &msg, NLMISC::CRGBA col, uint numBlinks = 0);
-	void displayLocalPlayerTell(const ucstring &receiver, uint index, const ucstring &msg, uint numBlinks = 0);
+	void displayMessage(uint index, const std::string &msg, NLMISC::CRGBA col, uint numBlinks = 0);
+	void displayLocalPlayerTell(const std::string &receiver, uint index, const std::string &msg, uint numBlinks = 0);
 	// Is the given people window visible ?
 	bool isPeopleChatVisible(uint index) const;
 	// reset remove everything from the interface
diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index 5e5f0d6c9..ad35a2a97 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -697,10 +697,9 @@ void CItemGroupManager::listGroup()
 	for(int i=0;i<_Groups.size();i++)
 	{
 		CItemGroup group = _Groups[i];
-		ucstring msg = NLMISC::CI18N::get("cmdListGroupLine");
+		string msg = NLMISC::CI18N::get("cmdListGroupLine");
 		//Use ucstring because group name can contain accentued characters (and stuff like that)
-		ucstring nameUC;
-		nameUC.fromUtf8(group.name);
+		string nameUC = group.name;
 		NLMISC::strFindReplace(msg, "%name", nameUC);
 		NLMISC::strFindReplace(msg, "%size", NLMISC::toString(group.Items.size()));
 		pIM->displaySystemInfo(msg);
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index d9de05961..881e14431 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -1165,7 +1165,7 @@ bool mainLoop()
 			if (BanMsgCountdown < 0.f)
 			{
 				CInterfaceManager *pIM = CInterfaceManager::getInstance();
-				ucstring msg = CI18N::get("msgPermanentlyBanned");
+				string msg = CI18N::get("msgPermanentlyBanned");
 				string cat = getStringCategory(msg, msg);
 				pIM->displaySystemInfo(msg, cat);
 				BanMsgCountdown	 = BanMsgRepeatTime;
@@ -3448,11 +3448,11 @@ NLMISC_COMMAND(dumpFontTexture, "Write font texture to file", "")
 	{
 		std::string fname = CFile::findNewFile("font-texture.tga");
 		TextContext->dumpCacheTexture(fname.c_str());
-		im->displaySystemInfo(ucstring(fname + " created"), "SYS");
+		im->displaySystemInfo(fname + " created", "SYS");
 	}
 	else
 	{
-		im->displaySystemInfo(ucstring("Error: TextContext == NULL"), "SYS");
+		im->displaySystemInfo("Error: TextContext == NULL", "SYS");
 	}
 	return true;
 }
diff --git a/ryzom/client/src/misc.cpp b/ryzom/client/src/misc.cpp
index ee247e921..9816202d4 100644
--- a/ryzom/client/src/misc.cpp
+++ b/ryzom/client/src/misc.cpp
@@ -871,14 +871,14 @@ bool setVect(CVector &vectToChange, const CVector &vect, bool compute, bool chec
 	return true;
 }// setVect //
 
-NLMISC::CRGBA interpClientCfgColor(const ucstring &src, ucstring &dest)
+NLMISC::CRGBA interpClientCfgColor(const string &src, string &dest)
 {
 	CRGBA color = CRGBA::White;
 	if (src.size() >= 3)
 	{
-		if (src[0] == (ucchar) '&')
+		if (src[0] == '&')
 		{
-			ucstring::size_type nextPos = src.find((ucchar) '&', 1);
+			string::size_type nextPos = src.find('&', 1);
 			if (nextPos != ucstring::npos)
 			{
 				std::string colorCode;
@@ -911,7 +911,7 @@ NLMISC::CRGBA interpClientCfgColor(const ucstring &src, ucstring &dest)
 	return color;
 }
 
-std::string getStringCategory(const ucstring &src, ucstring &dest, bool alwaysAddSysByDefault)
+std::string getStringCategory(const string &src, string &dest, bool alwaysAddSysByDefault)
 {
 	std::string str = getStringCategoryIfAny(src, dest);
 	if (alwaysAddSysByDefault)
@@ -921,41 +921,41 @@ std::string getStringCategory(const ucstring &src, ucstring &dest, bool alwaysAd
 }
 
 
-std::string getStringCategoryIfAny(const ucstring &src, ucstring &dest)
+std::string getStringCategoryIfAny(const string &src, string &dest)
 {
 	std::string colorCode;
 	if (src.size() >= 3)
 	{
-		uint startPos = 0;
+		size_t startPos = 0;
 
 		// Skip <NEW> or <CHG> if present at beginning
-		ucstring preTag;
-		const uint PreTagSize = 5;
-		const ucstring newTag("<NEW>");
+		string preTag;
+		const size_t PreTagSize = 5;
+		static const string newTag = "<NEW>";
 		if ( (src.size() >= PreTagSize) && (src.substr( 0, PreTagSize ) == newTag) )
 		{
 			startPos = PreTagSize;
 			preTag = newTag;
 		}
-		const ucstring chgTag("<CHG>");
+		static const string chgTag = "<CHG>";
 		if ( (src.size() >= PreTagSize) && (src.substr( 0, PreTagSize ) == chgTag) )
 		{
 			startPos = PreTagSize;
 			preTag = chgTag;
 		}
 
-		if (src[startPos] == (ucchar) '&')
+		if (src[startPos] == '&')
 		{
-			ucstring::size_type nextPos = src.find((ucchar) '&', startPos+1);
-			if (nextPos != ucstring::npos)
+			string::size_type nextPos = src.find('&', startPos+1);
+			if (nextPos != string::npos)
 			{
-				uint codeSize = (uint)nextPos - startPos - 1;
+				size_t codeSize = nextPos - startPos - 1;
 				colorCode.resize( codeSize );
-				for(uint k = 0; k < codeSize; ++k)
+				for(ptrdiff_t k = 0; k < (ptrdiff_t)codeSize; ++k)
 				{
 					colorCode[k] = tolower((char) src[k + startPos + 1]);
 				}
-				ucstring destTmp;
+				string destTmp;
 				if ( startPos != 0 )
 					destTmp = preTag; // leave <NEW> or <CHG> in the dest string
 				destTmp += src.substr(nextPos + 1);
diff --git a/ryzom/client/src/misc.h b/ryzom/client/src/misc.h
index 49127d100..96568c22e 100644
--- a/ryzom/client/src/misc.h
+++ b/ryzom/client/src/misc.h
@@ -165,11 +165,11 @@ bool setVect(NLMISC::CVector &vectToChange, const NLMISC::CVector &vect, bool co
 
 
 // read color from client cfg system info colors
-NLMISC::CRGBA interpClientCfgColor(const ucstring &src, ucstring &dest);
+NLMISC::CRGBA interpClientCfgColor(const std::string &src, std::string &dest);
 // Get the category from the string (src="&SYS&Who are you?" and dest="Who are you?" and return "SYS"), if no category, return "SYS"
-std::string getStringCategory(const ucstring &src, ucstring &dest, bool alwaysAddSysByDefault = true);
+std::string getStringCategory(const std::string &src, std::string &dest, bool alwaysAddSysByDefault = true);
 // Get the category from the string (src="&SYS&Who are you?" and dest="Who are you?" and return "SYS"), if no category, return ""
-std::string getStringCategoryIfAny(const ucstring &src, ucstring &dest);
+std::string getStringCategoryIfAny(const std::string &src, std::string &dest);
 
 bool getRelativeFloatFromString(const std::string src, float &dst);
 void updateVector(const std::string part, NLMISC::CVector &dst, float value, bool add = false);
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 9f05fe860..f4ceb511c 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -600,21 +600,21 @@ void impulsePermanentUnban(NLMISC::CBitMemStream &impulse)
 class CInterfaceChatDisplayer : public CClientChatManager::IChatDisplayer
 {
 public:
-	virtual void displayChat(TDataSetIndex compressedSenderIndex, const ucstring &ucstr, const ucstring &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, ucstring &senderName, uint bubbleTimer=0);
-	virtual void displayTell(/*TDataSetIndex senderIndex, */const ucstring &ucstr, const ucstring &senderName);
+	virtual void displayChat(TDataSetIndex compressedSenderIndex, const std::string &ucstr, const std::string &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, std::string &senderName, uint bubbleTimer=0);
+	virtual void displayTell(/*TDataSetIndex senderIndex, */const std::string &ucstr, const std::string &senderName);
 	virtual void clearChannel(CChatGroup::TGroupType mode, uint32 dynChatDbIndex);
 
 private:
 	// Add colorization tag for sender name
-	void colorizeSender(ucstring &text, const ucstring &senderName, CRGBA baseColor);
+	void colorizeSender(string &text, const string &senderName, CRGBA baseColor);
 
 };
 static CInterfaceChatDisplayer	InterfaceChatDisplayer;
 
-void CInterfaceChatDisplayer::colorizeSender(ucstring &text, const ucstring &senderName, CRGBA baseColor)
+void CInterfaceChatDisplayer::colorizeSender(string &text, const string &senderName, CRGBA baseColor)
 {
 	// find the sender/text separator to put color tags
-	ucstring::size_type pos = senderName.toUtf8().length() - 1;
+	ucstring::size_type pos = senderName.length() - 1;
 	if (pos != ucstring::npos)
 	{
 		string str;
@@ -624,36 +624,36 @@ void CInterfaceChatDisplayer::colorizeSender(ucstring &text, const ucstring &sen
 
 		CChatWindow::encodeColorTag(prop.getRGBA(), str, false);
 
-		str += text.toUtf8().substr(0, pos+1);
+		str += text.substr(0, pos+1);
 
 		CChatWindow::encodeColorTag(baseColor, str, true);
 
-		str += text.toUtf8().substr(pos+1);
+		str += text.substr(pos+1);
 
-		text.fromUtf8(str);
+		text = str;
 	}
 }
 
 // display a chat from network to interface
-void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, const ucstring &ucstr, const ucstring &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, ucstring &senderName, uint bubbleTimer)
+void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, const std::string &ucstr, const std::string &rawMessage, CChatGroup::TGroupType mode, NLMISC::CEntityId dynChatId, std::string &senderName, uint bubbleTimer)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	ucstring finalString;
+	string finalString;
 	string stringCategory = getStringCategory(ucstr, finalString);
 
 	bool bubbleWanted = true;
 
 	// Subtract rawMessage from ucstr so that the 'sender' part remains.
-	ucstring senderPart = ucstr.luabind_substr(0, ucstr.length() - rawMessage.length());
+	string senderPart = ucstr.substr(0, ucstr.length() - rawMessage.length());
 
 	// search a "{no_bubble}" tag
 	{
-		ucstring::size_type index = finalString.find(ucstring("{no_bubble}"));
+		string::size_type index = finalString.find("{no_bubble}");
 		const size_t tokenSize= 11; // length of "{no_bubble}"
-		if (index != ucstring::npos)
+		if (index != string::npos)
 		{
 			bubbleWanted = false;
-			finalString = finalString.luabind_substr(0, index) + finalString.substr(index+tokenSize,finalString.size());
+			finalString = finalString.substr(0, index) + finalString.substr(index+tokenSize,finalString.size());
 		}
 	}
 
@@ -665,9 +665,9 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		// Remove all {break}
 		for(;;)
 		{
-			ucstring::size_type index = finalString.find(ucstring("{break}"));
+			string::size_type index = finalString.find("{break}");
 			if (index == ucstring::npos) break;
-			finalString = finalString.luabind_substr(0, index) + finalString.luabind_substr(index+7,finalString.size());
+			finalString = finalString.substr(0, index) + finalString.substr(index+7,finalString.size());
 		}
 
 		// select DB
@@ -716,10 +716,10 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		// find the sender/text separator to put color tags
 		if (senderPart.empty() && stringCategory == "emt")
 		{
-			size_t pos = finalString.find(ucstring(": "), 0);
-			if (pos != ucstring::npos)
+			size_t pos = finalString.find(": ", 0);
+			if (pos != string::npos)
 			{
-				senderPart = finalString.luabind_substr(0, pos + 2);
+				senderPart = finalString.substr(0, pos + 2);
 			}
 		}
 		colorizeSender(finalString, senderPart, col);
@@ -786,16 +786,16 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 				if (pIM->getLogState())
 				{
 					// Add dyn chan number before string
-					ucstring prefix("[" + NLMISC::toString(dbIndex) + "]");
+					string prefix = "[" + NLMISC::toString(dbIndex) + "]";
 					// Find position to put the new string
 					// After timestamp?
-					size_t pos = finalString.find(ucstring("]"));
-					size_t colonpos = finalString.find(ucstring(": @{"));
+					size_t pos = finalString.find("]");
+					size_t colonpos = finalString.find(": @{");
 					// If no ] found or if found but after the colon (so part of the user chat)
-					if (pos == ucstring::npos || (colonpos < pos))
+					if (pos == string::npos || (colonpos < pos))
 					{
 						// No timestamp, so put it right after the color and add a space
-						pos = finalString.find(ucstring("}"));;
+						pos = finalString.find("}");;
 						prefix += " ";
 					}
 					finalString = finalString.substr(0, pos + 1) + prefix + finalString.substr(pos + 1);
@@ -803,28 +803,28 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 					if (node && node->getValueBool())
 					{
 						uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(dbIndex);
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-						prefix = title.empty() ? ucstring("") : ucstring(" ") + title;
-						pos = finalString.find(ucstring("] "));
+						prefix = (title.empty() ? "" : " ") + title;
+						pos = finalString.find("] ");
 						finalString = finalString.substr(0, pos) + prefix + finalString.substr(pos);
 					}
 				}
 			}
 			else
 			{
-				nlwarning("Dynamic chat %s not found for message: %s", dynChatId.toString().c_str(), finalString.toString().c_str());
+				nlwarning("Dynamic chat %s not found for message: %s", dynChatId.toString().c_str(), finalString.c_str());
 			}
 		}
 		else
 		{
-			ucstring::size_type index = finalString.find(ucstring("<BPFX>"));
+			string::size_type index = finalString.find("<BPFX>");
 			if (index != ucstring::npos)
 			{
 				bubbleWanted = false;
 				finalString = finalString.substr(index+6,finalString.size());
-				ucstring::size_type index2 = finalString.find(ucstring(" "));
-				ucstring playerName;
+				string::size_type index2 = finalString.find(string(" "));
+				string playerName;
 				if (index2 < (finalString.size()-3))
 				{
 					playerName = finalString.substr(0,index2);
@@ -832,7 +832,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 				}
 				if (!senderName.empty())
 				{
-					CEntityCL *senderEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(senderName.toUtf8()), true, true);
+					CEntityCL *senderEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(senderName), true, true);
 					if (senderEntity)
 					{
 						if (senderEntity->Type != CEntityCL::Player)
@@ -840,16 +840,16 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 							if (playerName.empty())
 							{
 								senderEntity->removeStateFx();
-								senderEntity->setStateFx(finalString.toString());
+								senderEntity->setStateFx(finalString);
 								nlinfo("empty");
 							}
 							else
 							{
-								CEntityCL *destEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(playerName.toUtf8()), false, true);
+								CEntityCL *destEntity = EntitiesMngr.getEntityByName (CEntityCL::removeTitleAndShardFromName(playerName), false, true);
 								if (destEntity)
 								{
 									destEntity->removeStateFx();
-									destEntity->setStateFx(finalString.toString());
+									destEntity->setStateFx(finalString);
 									nlinfo("no empty");
 								}
 							}
@@ -866,7 +866,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		// if tell, bkup sendername
 		if (mode == CChatGroup::tell && windowVisible && !senderName.empty())
 		{
-			PeopleInterraction.LastSenderName = CEntityCL::removeTitleAndShardFromName(senderName.toUtf8());
+			PeopleInterraction.LastSenderName = CEntityCL::removeTitleAndShardFromName(senderName);
 		}
 	}
 
@@ -876,7 +876,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 
 	// **** Process chat entry for the bubbles
 	// todo hulud : registering a chat callback would be better than calling this hardcoded action handler
-	ucstring finalRawMessage;
+	string finalRawMessage;
 	// remove color qualifier from raw string
 	getStringCategory(rawMessage, finalRawMessage);
 	if (bubbleWanted)
@@ -902,7 +902,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 			channel = "#" + toString((uint32)mode);
 		}
 	}
-	if (!stringCategory.empty() && NLMISC::toUpper(stringCategory) != "SYS")
+	if (!stringCategory.empty() && NLMISC::compareCaseInsensitive(stringCategory.c_str(), "SYS")) // Not empty and not 'SYS'
 	{
 		channel = channel + "/" + stringCategory;
 	}
@@ -912,13 +912,13 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 
 
 // display a tell from network to interface
-void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const ucstring &ucstr, const ucstring &senderName)
+void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const std::string &ucstr, const std::string &senderName)
 {
 
-	ucstring finalString = ucstr;
+	string finalString = ucstr;
 
 	// for now, '&' are removed by server so use another format	until a special msg is made
-	if (strFindReplace(finalString, ucstring("<R2_INVITE>"), ucstring()))
+	if (strFindReplace(finalString, "<R2_INVITE>", string()))
 	{
 		CLuaManager::getInstance().executeLuaScript("RingAccessPoint:forceRefresh()");
 	}
@@ -928,13 +928,13 @@ void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const u
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 	bool windowVisible;
 
-	ucstring goodSenderName = CEntityCL::removeTitleAndShardFromName(senderName.toUtf8());
+	string goodSenderName = CEntityCL::removeTitleAndShardFromName(senderName);
 
 	// The sender part is up to and including the first ":" after the goodSenderName
-	ucstring::size_type pos = finalString.find(goodSenderName);
+	string::size_type pos = finalString.find(goodSenderName);
 	pos = finalString.find(':', pos);
 	pos = finalString.find(' ', pos);
-	ucstring senderPart = finalString.substr(0, pos+1);
+	string senderPart = finalString.substr(0, pos+1);
  	colorizeSender(finalString, senderPart, prop.getRGBA());
 
 	PeopleInterraction.ChatInput.Tell.displayTellMessage(/*senderIndex, */finalString, goodSenderName, prop.getRGBA(), 2, &windowVisible);
@@ -2125,7 +2125,7 @@ void impulseWhere(NLMISC::CBitMemStream &impulse)
 
 	sprintf(buf,"Your server position is : X= %g   Y= %g   Z= %g",xf,yf,zf);
 	nlinfo(buf);
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring(buf));
+	CInterfaceManager::getInstance()->displaySystemInfo(buf);
 }// impulseWhere //
 
 //-----------------------------------------------
@@ -4204,7 +4204,7 @@ std::string				WebServer;
 NLMISC_COMMAND(localTellTeam, "Temp : simulate a tell in local mode", "<people_name> <msg>")
 {
 	if (args.empty()) return false;
-	ucstring player = args[0];
+	string player = args[0];
 	std::string msg;
 	if (args.size() >= 2)
 	{
@@ -4215,7 +4215,7 @@ NLMISC_COMMAND(localTellTeam, "Temp : simulate a tell in local mode", "<people_n
 		}
 	}
 	TDataSetIndex dsi = INVALID_DATASET_INDEX;
-	InterfaceChatDisplayer.displayChat(dsi, ucstring(msg), ucstring(msg), CChatGroup::team, NLMISC::CEntityId::Unknown, player);
+	InterfaceChatDisplayer.displayChat(dsi, msg, msg, CChatGroup::team, NLMISC::CEntityId::Unknown, player);
 	return true;
 }
 
@@ -4223,7 +4223,7 @@ NLMISC_COMMAND(localTellTeam, "Temp : simulate a tell in local mode", "<people_n
 NLMISC_COMMAND(localTell, "Temp : simulate a tell in local mode", "<people_name> <msg>")
 {
 	if (args.empty()) return false;
-	ucstring player = args[0];
+	string player = args[0];
 	std::string msg;
 	if (args.size() >= 2)
 	{
@@ -4234,7 +4234,7 @@ NLMISC_COMMAND(localTell, "Temp : simulate a tell in local mode", "<people_name>
 		}
 	}
 //	TDataSetIndex dsi = INVALID_DATASET_ROW;
-	InterfaceChatDisplayer.displayTell(/*dsi, */ucstring(msg), player);
+	InterfaceChatDisplayer.displayTell(/*dsi, */msg, player);
 	return true;
 }
 
diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index a09256703..b2dcb0cab 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -2948,7 +2948,7 @@ bool CUserEntity::sit(bool s)
 				// autowalk disabled
 				UserControls.autowalkState(false);
 
-				const string msgName = "COMMAND:SIT";
+				static const string msgName = "COMMAND:SIT";
 				CBitMemStream out;
 				if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 				{
@@ -2963,7 +2963,7 @@ bool CUserEntity::sit(bool s)
 
 				// display sit msg
 				CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-				ucstring msg = CI18N::get("msgUserIsSitting");
+				string msg = CI18N::get("msgUserIsSitting");
 				string cat = getStringCategory(msg, msg);
 				pIM->displaySystemInfo(msg, cat);
 			}
@@ -2976,7 +2976,7 @@ bool CUserEntity::sit(bool s)
 		{
 			if(mode(MBEHAV::NORMAL))
 			{
-				const string msgName = "COMMAND:SIT";
+				static const string msgName = "COMMAND:SIT";
 				CBitMemStream out;
 				if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 				{
@@ -2991,7 +2991,7 @@ bool CUserEntity::sit(bool s)
 
 				// display stand msg
 				CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-				ucstring msg = CI18N::get("msgUserIsStanding");
+				string msg = CI18N::get("msgUserIsStanding");
 				string cat = getStringCategory(msg, msg);
 				pIM->displaySystemInfo(msg, cat);
 			}
@@ -3067,7 +3067,7 @@ void CUserEntity::setAFK(bool b, string afkTxt)
 	}
 
 	// send afk state
-	string msgName = "COMMAND:AFK";
+	static const string msgName = "COMMAND:AFK";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -3081,15 +3081,15 @@ void CUserEntity::setAFK(bool b, string afkTxt)
 	ucstring ucstr;
 	ucstr.fromUtf8( afkTxt );
 	CBitMemStream outTxt;
-	msgName = "STRING:AFK_TXT";
-	if( GenericMsgHeaderMngr.pushNameToStream(msgName,outTxt) )
+	static const string msgNameTxt = "STRING:AFK_TXT";
+	if( GenericMsgHeaderMngr.pushNameToStream(msgNameTxt,outTxt) )
 	{
 		outTxt.serial( ucstr );
 		NetMngr.push( outTxt );
 	}
 	else
 	{
-		nlwarning("CUserEntity:setAFK: unknown message named '%s'.", msgName.c_str());
+		nlwarning("CUserEntity:setAFK: unknown message named '%s'.", msgNameTxt.c_str());
 	}
 
 
@@ -3111,7 +3111,7 @@ void CUserEntity::rollDice(sint16 min, sint16 max, bool local)
 		}
 		sint16 roll = min + (sint16)dice->rand(max-min);
 
-		ucstring msg = CI18N::get("msgRollDiceLocal");
+		string msg = CI18N::get("msgRollDiceLocal");
 		strFindReplace(msg, "%min", toString(min));
 		strFindReplace(msg, "%max", toString(max));
 		strFindReplace(msg, "%roll", toString(roll));
@@ -3143,7 +3143,7 @@ bool CUserEntity::canEngageCombat()
 	{
 		// display "you can't fight while sitting" message)
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("msgCantFightSit");
+		string msg = CI18N::get("msgCantFightSit");
 		string cat = getStringCategory(msg, msg);
 		pIM->displaySystemInfo(msg, cat);
 
@@ -3154,7 +3154,7 @@ bool CUserEntity::canEngageCombat()
 	{
 		// display "you can't fight while swiming" message)
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("msgCantFightSwim");
+		string msg = CI18N::get("msgCantFightSwim");
 		string cat = getStringCategory(msg, msg);
 		pIM->displaySystemInfo(msg, cat);
 
@@ -3165,7 +3165,7 @@ bool CUserEntity::canEngageCombat()
 	{
 		// display "you can't fight while swimming" message)
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		ucstring msg = CI18N::get("msgCantFightRide");
+		string msg = CI18N::get("msgCantFightRide");
 		string cat = getStringCategory(msg, msg);
 		pIM->displaySystemInfo(msg, cat);
 
@@ -4140,7 +4140,7 @@ void CUserEntity::switchVelocity(bool userRequest)
 
 	// display message : your are running, you are walking
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	ucstring msg;
+	string msg;
 	if( _Run )
 		msg = CI18N::get("msgUserIsRunning");
 	else
diff --git a/ryzom/common/src/game_share/msg_client_server.h b/ryzom/common/src/game_share/msg_client_server.h
index 08dc0e171..c66e7856a 100644
--- a/ryzom/common/src/game_share/msg_client_server.h
+++ b/ryzom/common/src/game_share/msg_client_server.h
@@ -633,7 +633,7 @@ public:
 	uint8			ChatMode;
 //	uint32			DynChatChanID;
 	NLMISC::CEntityId	DynChatChanID;
-	ucstring		Content;
+	ucstring		Content; // FIXME: UTF-8 (serial)
 
 	CChatMsg()
 	{
@@ -650,7 +650,7 @@ public:
 		f.serial( ChatMode );
 		if(ChatMode==CChatGroup::dyn_chat)
 			f.serial(DynChatChanID);
-		f.serial( Content );
+		f.serial( Content ); // FIXME: UTF-8 (serial)
 	}
 };
 
@@ -669,7 +669,7 @@ public:
 	uint32			SenderNameId;
 	uint8			ChatMode;
 	uint32			PhraseId;
-	ucstring		CustomTxt;
+	ucstring		CustomTxt; // FIXME: UTF-8 (serial)
 
 	CChatMsg2()
 	{
@@ -685,7 +685,7 @@ public:
 		f.serial( SenderNameId );
 		f.serial( ChatMode );
 		f.serial( PhraseId );
-		f.serial( CustomTxt );
+		f.serial( CustomTxt ); // FIXME: UTF-8 (serial)
 	}
 };
 
@@ -700,8 +700,8 @@ public:
 class CFarTellMsg
 {
 public:
-	ucstring		SenderName;
-	ucstring		Text;
+	ucstring		SenderName; // FIXME: UTF-8 (serial)
+	ucstring		Text; // FIXME: UTF-8 (serial)
 
 	void serial(NLMISC::CBitMemStream &f)
 	{

From 72d9f8ea4f464116ced6961602673418d801cede Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 12:21:39 +0800
Subject: [PATCH 112/292] UTF-8 various, ryzom/ryzomcore#335

---
 nel/include/nel/gui/view_text_id.h            |  6 +--
 nel/include/nel/misc/common.h                 |  1 +
 ryzom/client/src/connection.cpp               |  4 +-
 ryzom/client/src/contextual_cursor.cpp        |  4 +-
 ryzom/client/src/contextual_cursor.h          |  2 +-
 ryzom/client/src/cursor_functions.cpp         | 13 +++----
 ryzom/client/src/entities.cpp                 |  4 +-
 ryzom/client/src/game_context_menu.cpp        | 12 +++---
 .../src/interface_v3/action_handler_game.cpp  | 12 +++---
 .../src/interface_v3/action_handler_help.cpp  |  4 +-
 .../src/interface_v3/action_handler_item.cpp  | 10 +++--
 .../src/interface_v3/action_handler_misc.cpp  | 14 +++----
 .../src/interface_v3/action_handler_misc.h    |  6 +--
 .../bot_chat_page_dynamic_mission.cpp         | 10 ++---
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 18 ++++-----
 .../interface_v3/dbgroup_list_sheet_text.cpp  |  4 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  4 +-
 .../src/interface_v3/encyclopedia_manager.cpp |  8 ++--
 .../client/src/interface_v3/group_compas.cpp  | 34 ++++++++---------
 ryzom/client/src/interface_v3/group_compas.h  |  6 +--
 .../src/interface_v3/group_html_forum.cpp     |  4 +-
 .../interface_v3/group_in_scene_bubble.cpp    | 10 ++---
 .../interface_v3/group_in_scene_user_info.cpp | 10 ++---
 ryzom/client/src/interface_v3/group_map.cpp   | 30 +++++++--------
 .../client/src/interface_v3/guild_manager.cpp | 38 +++++++++----------
 ryzom/client/src/interface_v3/guild_manager.h |  8 ++--
 .../src/interface_v3/interface_manager.cpp    | 18 ++++-----
 .../src/interface_v3/interface_manager.h      |  2 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp | 12 +++---
 .../src/interface_v3/people_interraction.cpp  | 22 +++++------
 ryzom/client/src/net_manager.cpp              | 14 +++----
 ryzom/client/src/string_manager_client.h      |  4 +-
 32 files changed, 173 insertions(+), 175 deletions(-)

diff --git a/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
index abba8cb39..292f1728a 100644
--- a/nel/include/nel/gui/view_text_id.h
+++ b/nel/include/nel/gui/view_text_id.h
@@ -59,10 +59,8 @@ namespace NLGUI
 		{
 		public:
 			virtual ~IViewTextProvider(){}
-			bool getString(uint32 stringId, std::string &result) { ucstring temp; bool res = getString(stringId, temp); result = temp.toUtf8(); return res;  }
-			bool getDynString(uint32 dynStringId, std::string &result) { ucstring temp; bool res = getDynString(dynStringId, temp); result = temp.toUtf8(); return res; }
-			virtual bool getString( uint32 stringId, ucstring &result ) = 0; // TODO: UTF-8
-			virtual bool getDynString( uint32 dynStringId, ucstring &result ) = 0; // TODO: UTF-8
+			virtual bool getString(uint32 stringId, std::string &result) = 0;
+			virtual bool getDynString(uint32 dynStringId, std::string &result) = 0;
 		};
 
 		CViewTextID(const TCtorParam &param) : CViewText(param)
diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 6a4480e5a..bca3372bd 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -253,6 +253,7 @@ void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i);
 /** UTF-8 case insensitive compare */
 int compareCaseInsensitive(const char *a, const char *b);
 int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB);
+inline int compareCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()); }
 
 
 /**
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 1fa7efb9f..6e5276755 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -3345,10 +3345,10 @@ class CAHLoadScenario : public IActionHandler
 								if(val!=0)
 								{
 									STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-									ucstring res;
+									string res;
 									if (pSMC->getString(val,res))
 									{
-										string charName = CEntityCL::removeTitleAndShardFromName(res.toUtf8());
+										string charName = CEntityCL::removeTitleAndShardFromName(res);
 										sessionBrowser.inviteCharacterByName(sessionBrowser._LastScheduleSessionCharId, charName);
 
 										if(!sessionBrowser.waitOneMessage(sessionBrowser.getMessageName("on_invokeResult")))
diff --git a/ryzom/client/src/contextual_cursor.cpp b/ryzom/client/src/contextual_cursor.cpp
index 24c95a96c..2a4d053d1 100644
--- a/ryzom/client/src/contextual_cursor.cpp
+++ b/ryzom/client/src/contextual_cursor.cpp
@@ -130,7 +130,7 @@ void CContextualCursor::del(const std::string &contextName)
 // context :
 // Select a nex context.
 //-----------------------------------------------
-bool CContextualCursor::context(const std::string &contextName, float dist, const ucstring &cursName)
+bool CContextualCursor::context(const std::string &contextName, float dist, const std::string &cursName)
 {
 	// Delete the context.
 	TContext::iterator it = _Contexts.find(contextName);
@@ -163,7 +163,7 @@ bool CContextualCursor::context(const std::string &contextName, float dist, cons
 				if(cursName.empty())
 					cursor->setString(CI18N::get(functions.cursor));
 				else
-					cursor->setString(cursName.toUtf8());
+					cursor->setString(cursName);
 			}
 		}
 	}
diff --git a/ryzom/client/src/contextual_cursor.h b/ryzom/client/src/contextual_cursor.h
index 6dfd20749..31ba7a3c5 100644
--- a/ryzom/client/src/contextual_cursor.h
+++ b/ryzom/client/src/contextual_cursor.h
@@ -68,7 +68,7 @@ public:
 	void del(const std::string &contextName);
 
 	// Select a nex context.
-	bool context(const std::string &contextName, float dist = 0, const ucstring &cursName = ucstring(""));
+	bool context(const std::string &contextName, float dist = 0, const std::string &cursName = std::string());
 	inline const std::string &context() const {return _Context;}
 
 	// Check if there is an entity under the cursor.
diff --git a/ryzom/client/src/cursor_functions.cpp b/ryzom/client/src/cursor_functions.cpp
index 44e2dde7e..8773e84f7 100644
--- a/ryzom/client/src/cursor_functions.cpp
+++ b/ryzom/client/src/cursor_functions.cpp
@@ -197,7 +197,7 @@ static bool testMissionOption(sint32 priorityWanted)
 	// Get the Text for the cursor
 	if(textID)
 	{
-		ucstring result;
+		string result;
 		bool res = STRING_MANAGER::CStringManagerClient::instance()->getDynString(textID, result);
 		if (!res)
 			result = NLMISC::CI18N::get("uiMissionOptionNotReceived");
@@ -224,7 +224,7 @@ static bool testMissionRing()
 			uint32	textID = pNL->getValue32();
 
 			// if the string is not received display a temp string
-			ucstring	missionRingText;
+			string	missionRingText;
 			if(!STRING_MANAGER::CStringManagerClient::instance()->getDynString(textID, missionRingText))
 				missionRingText = NLMISC::CI18N::get("uiMissionRingNameNotReceived");
 
@@ -445,7 +445,7 @@ void checkUnderCursor()
 									uint32	textID = pNL->getValue32();
 
 									// if the string is not received display a temp string
-									ucstring	webPageText;
+									string	webPageText;
 									if(!STRING_MANAGER::CStringManagerClient::instance()->getDynString(textID, webPageText))
 										webPageText = NLMISC::CI18N::get("uiWebPageNameNotReceived");
 
@@ -463,8 +463,8 @@ void checkUnderCursor()
 								{
 									// get the outpost name
 									CSheetId outpostSheet(pNL->getValue32());
-									ucstring outpostName;
-									outpostName= ucstring(STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet));
+									string outpostName;
+									outpostName= STRING_MANAGER::CStringManagerClient::getOutpostLocalizedName(outpostSheet);
 
 									// display the cursor
 									if(ContextCur.context("OUTPOST", 0.f, outpostName))
@@ -570,8 +570,7 @@ void checkUnderCursor()
 				else
 				{
 					cursor->setCursor("curs_pick.tga");
-					ucstring contextText;
-					contextText.fromUtf8(instref.ContextText);
+					string contextText = instref.ContextText;
 					if (ContextCur.context("WEBIG", 0.f, contextText))
 						return;
 				}
diff --git a/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
index 9ecadba93..99caacf45 100644
--- a/ryzom/client/src/entities.cpp
+++ b/ryzom/client/src/entities.cpp
@@ -178,7 +178,7 @@ public :
 				CCompassTarget ct = pGC->getTarget();
 
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-				ucstring oldName;
+				string oldName;
 				if (!pSMC->getDynString(leaf->getOldValue32(), oldName))
 				{
 					nlwarning("Can't get compass target name");
@@ -201,7 +201,7 @@ public :
 			{
 				// TODO : maybe the following code could be include in CGroupMap::checkCoords, but it is not called when the map is not visible...
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-				ucstring name;
+				string name;
 				if (pSMC->getDynString((*tmpIt)->getValue32(), name))
 				{
 //					if (_AlreadyReceived.count(name) == 0)
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 47ca97a80..3a283022c 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -713,13 +713,13 @@ void CGameContextMenu::updateContextMenuMissionsOptions( bool forceHide )
 				uint32 textID = (uint32) _MissionOption[k]->getValue32();
 				if (textID)
 				{
-					ucstring result;
+					string result;
 					bool res = STRING_MANAGER::CStringManagerClient::instance()->getDynString(textID, result);
 					if (!res)
 					{
 						result = NLMISC::CI18N::get("uiMissionOptionNotReceived");
 					}
-					pVTM->setText(result.toUtf8());
+					pVTM->setText(result);
 					pVTM->setActive(true);
 				}
 				else
@@ -754,13 +754,13 @@ void CGameContextMenu::updateContextMenuWebPage(uint options)
 			uint32 textID = (uint32) _WebPageTitle->getValue32();
 			if (textID)
 			{
-				ucstring result;
+				string result;
 				bool res = STRING_MANAGER::CStringManagerClient::instance()->getDynString(textID, result);
 				if (!res)
 				{
 					result = NLMISC::CI18N::get("uiWebPageNameNotReceived");
 				}
-				pVTM->setText(result.toUtf8());
+				pVTM->setText(result);
 			}
 			else
 			{
@@ -834,13 +834,13 @@ void CGameContextMenu::updateContextMenuMissionRing()
 			// if the textId is ok and Flag is set.
 			if ( textId )
 			{
-				ucstring result;
+				string result;
 				bool res = STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, result);
 				if (!res)
 				{
 					result = NLMISC::CI18N::get("uiMissionRingNameNotReceived");
 				}
-				pVTM->setText(result.toUtf8());
+				pVTM->setText(result);
 				pVTM->setActive(true);
 			}
 			else
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index d574a7248..3b3738c38 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1943,13 +1943,13 @@ public:
 
 	sint32 Slot;
 
-	bool cbIDStringReceived(ucstring &inout)
+	bool cbIDStringReceived(string &inout)
 	{
 		if (UserEntity != NULL)
 		{
 			if (UserEntity->selection() == Slot)
 			{
-				ucstring copyInout = inout;
+				string copyInout = inout;
 				CStringPostProcessRemoveTitle::cbIDStringReceived(inout);
 				if (inout.empty())
 				{
@@ -1959,13 +1959,13 @@ public:
 					if (pChar != NULL)
 						womanTitle = pChar->getGender() == GSGENDER::female;
 					
-					STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout.toUtf8()), womanTitle);
+					copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
 
 					// Sometimes translation contains another title
-					ucstring::size_type pos = copyInout.find('$');
+					string::size_type pos = copyInout.find('$');
 					if (pos != ucstring::npos)
 					{
-						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout.toUtf8()), womanTitle);
+						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
 					}
 
 					CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
@@ -1987,7 +1987,7 @@ public:
 
 	sint32 Slot;
 
-	bool cbIDStringReceived(ucstring &inout)
+	bool cbIDStringReceived(string &inout)
 	{
 		if (UserEntity != NULL)
 		{
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index c00328ef0..e8c36809f 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -3625,11 +3625,11 @@ public:
 			return;
 		}
 
-		ucstring txt;
+		string txt;
 		CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:PACK_ANIMAL:BEAST%d:NAME", index));
 		if (node && CStringManagerClient::instance()->getDynString(node->getValue32(), txt))
 		{
-			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt.toUtf8()));
+			CWidgetManager::getInstance()->setContextHelpText(CEntityCL::removeTitleFromName(txt));
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 2df888285..7a87719ab 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -1732,10 +1732,11 @@ void CItemMenuInBagInfoWaiter::infoValidated(CDBCtrlSheet* ctrlSheet)
 
 		// get the CreatorTextID
 		bool isCraftedByUserEntity = false;
-		ucstring creatorNameString;
+		string creatorNameString;
 		if( STRING_MANAGER::CStringManagerClient::instance()->getString ( itemInfo.CreatorName, creatorNameString) )
 		{
-			if (   toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString.toUtf8()))
+			std::string userNameString = UserEntity->getEntityName() + PlayerSelectedHomeShardNameWithParenthesis;
+			if (NLMISC::compareCaseInsensitive(userNameString, creatorNameString) == 0)
 				isCraftedByUserEntity = true;
 		}
 
@@ -1840,10 +1841,11 @@ class CHandlerItemMenuCheck : public IActionHandler
 						if (getInventory().isItemInfoUpToDate(getInventory().getItemSlotId(pCS)))
 						{
 							// get the CreatorTextID
-							ucstring creatorNameString;
+							string creatorNameString;
 							if( STRING_MANAGER::CStringManagerClient::instance()->getString ( getInventory().getItemInfo(getInventory().getItemSlotId(pCS)).CreatorName, creatorNameString) )
 							{
-								if (toLower(UserEntity->getEntityName()+PlayerSelectedHomeShardNameWithParenthesis) == toLower(creatorNameString.toUtf8()))
+								string userNameString = UserEntity->getEntityName() + PlayerSelectedHomeShardNameWithParenthesis;
+								if (NLMISC::compareCaseInsensitive(userNameString, creatorNameString) == 0)
 									isTextEditionActive = true;
 							}
 						}
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index d6d41e32b..8b144f844 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -913,10 +913,10 @@ NLMISC_COMMAND(slsn, "Temp : set the name of the last sender.", "<name>")
 }
 
 // ***************************************************************************
-bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
+bool CStringPostProcessRemoveName::cbIDStringReceived(string &inOut)
 {
 	// extract the replacement id
-	string strNewTitle = CEntityCL::getTitleFromName(inOut.toUtf8());
+	string strNewTitle = CEntityCL::getTitleFromName(inOut);
 
 	// retrieve the translated string
 	if (!strNewTitle.empty())
@@ -927,7 +927,7 @@ bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 			ucstring::size_type pos = inOut.find('$');
 			if (pos != ucstring::npos)
 			{
-				inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(inOut.toUtf8()), Woman);
+				inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(inOut), Woman);
 			}
 		}
 	}
@@ -938,16 +938,16 @@ bool CStringPostProcessRemoveName::cbIDStringReceived(ucstring &inOut)
 }
 
 // ***************************************************************************
-bool CStringPostProcessRemoveTitle::cbIDStringReceived(ucstring &inOut)
+bool CStringPostProcessRemoveTitle::cbIDStringReceived(string &inOut)
 {
-	inOut = CEntityCL::removeTitleAndShardFromName(inOut.toUtf8());
+	inOut = CEntityCL::removeTitleAndShardFromName(inOut);
 	return true;
 }
 
 // ***************************************************************************
-bool CStringPostProcessNPCRemoveTitle::cbIDStringReceived(ucstring &inOut)
+bool CStringPostProcessNPCRemoveTitle::cbIDStringReceived(string &inOut)
 {
-	ucstring sOut = CEntityCL::removeTitleAndShardFromName(inOut.toUtf8());
+	string sOut = CEntityCL::removeTitleAndShardFromName(inOut);
 	if (sOut.empty())
 	{
 		CStringPostProcessRemoveName SPPRM;
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.h b/ryzom/client/src/interface_v3/action_handler_misc.h
index d820963ac..93db8080b 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.h
+++ b/ryzom/client/src/interface_v3/action_handler_misc.h
@@ -157,7 +157,7 @@ class CStringPostProcessRemoveName : public CInterfaceManager::IStringProcess
 public:
 	CStringPostProcessRemoveName():Woman(false) {}
 	bool Woman;
-	bool cbIDStringReceived(ucstring &inOut);
+	bool cbIDStringReceived(std::string &inOut);
 };
 
 // ***************************************************************************
@@ -165,7 +165,7 @@ public:
 class CStringPostProcessRemoveTitle : public CInterfaceManager::IStringProcess
 {
 public:
-	bool cbIDStringReceived(ucstring &inOut);
+	bool cbIDStringReceived(std::string &inOut);
 };
 
 // ***************************************************************************
@@ -173,7 +173,7 @@ public:
 class CStringPostProcessNPCRemoveTitle : public CInterfaceManager::IStringProcess
 {
 public:
-	bool cbIDStringReceived(ucstring &inOut);
+	bool cbIDStringReceived(std::string &inOut);
 };
 
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
index 78a38051e..c8190e8e7 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
@@ -164,11 +164,11 @@ void CBotChatPageDynamicMission::update()
 					{
 						uint32 textID = (uint32) NLGUI::CDBManager::getInstance()->getDbProp(toString(DM_CHOICE "%d:%d:TEXT", (int) k, (int) l))->getValue32();
 						// see if text has been receive
-						ucstring result;
+						string result;
 						bool received = CStringManagerClient::instance()->getDynString(textID, result);
 						if (received)
 						{
-							_ChoiceCB[k]->setText(l, result.toUtf8());
+							_ChoiceCB[k]->setText(l, result);
 							_TextReceived[k][l] = true;
 						}
 					}
@@ -180,11 +180,11 @@ void CBotChatPageDynamicMission::update()
 				uint32 textID = (uint32) NLGUI::CDBManager::getInstance()->getDbProp(toString(DM_CHOICE "%d:%d:TEXT", (int) k, (int) l))->getValue32();
 				if (textID == 0 && !ClientCfg.Local) break;
 				// see if text has been received
-				ucstring result;
+				string result;
 				bool received = CStringManagerClient::instance()->getDynString(textID, result);
 				if (received)
 				{
-					_ChoiceCB[k]->addText(result.toUtf8());
+					_ChoiceCB[k]->addText(result);
 					_TextReceived[k][l] = true;
 				}
 				else
@@ -207,7 +207,7 @@ void CBotChatPageDynamicMission::update()
 			uint32 textID = NLGUI::CDBManager::getInstance()->getDbProp(DM_TITLE_DB_PATH)->getValue32();
 			if (textID != 0)
 			{
-				ucstring result;
+				string result;
 				if (CStringManagerClient::instance()->getDynString(textID, result))
 				{
 					textID = NLGUI::CDBManager::getInstance()->getDbProp(DM_DESCRIPTION_DB_PATH)->getValue32();
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index e9575f776..7196bdac9 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -207,9 +207,9 @@ int CDBCtrlSheet::luaGetCreatorName(CLuaState &ls)
 {
 	uint32	itemSlotId = getInventory().getItemSlotId(this);
 	CClientItemInfo itemInfo = getInventory().getItemInfo(itemSlotId);
-	ucstring creatorName;
+	string creatorName;
 	STRING_MANAGER::CStringManagerClient::instance()->getString(itemInfo.CreatorName, creatorName);
-	CLuaIHM::push(ls, creatorName);
+	CLuaIHM::push(ls, ucstring::makeFromUtf8(creatorName)); // FIXME: Lua UTF-8
 
 	return 1;
 }
@@ -1460,7 +1460,7 @@ void CDBCtrlSheet::setupMission()
 void CDBCtrlSheet::setupGuildFlag ()
 {
 	// Find the guild name
-	ucstring usGuildName;
+	string usGuildName;
 	sint32 nGuildName = _SheetId.getSInt32();
 	if (_LastSheetId != nGuildName || _NeedSetup)
 	{
@@ -4570,7 +4570,7 @@ ucstring CDBCtrlSheet::getItemActualName() const
 		return ucstring();
 	else
 	{
-		ucstring ret;
+		string ret;
 		// If NameId not 0, get from StringManager
 		uint32	nameId= getItemNameId();
 		if(nameId)
@@ -4602,21 +4602,21 @@ ucstring CDBCtrlSheet::getItemActualName() const
 		{
 			// get description string for item format
 			std::string formatID = getItemRMFaberStatType() != RM_FABER_STAT_TYPE::Unknown ? "uihelpItemFaberPrefixAndSuffix" : "uihelpItemFaberPrefix";
-			ucstring format;
+			string format;
 			if (!CI18N::hasTranslation(formatID))
 			{
-				format = ucstring("%p %n %s"); // not found, uses default string
+				format = "%p %n %s"; // not found, uses default string
 			}
 			else
 			{
 				format = CI18N::get(formatID);
 			}
 			// suffix
-			strFindReplace(format, ucstring("%p"), RM_CLASS_TYPE::toLocalString(getItemRMClassType()));
+			strFindReplace(format, "%p", RM_CLASS_TYPE::toLocalString(getItemRMClassType()));
 			// name
-			strFindReplace(format, ucstring("%n"), ret);
+			strFindReplace(format, "%n", ret);
 			// prefix
-			strFindReplace(format, ucstring("%s"), CI18N::get(toString("mpstatItemQualifier%d", (int) getItemRMFaberStatType()).c_str()));
+			strFindReplace(format, "%s", CI18N::get(toString("mpstatItemQualifier%d", (int) getItemRMFaberStatType()).c_str()));
 
 
 			ret = format;
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index 7e47e740c..02d009661 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -313,7 +313,7 @@ void CDBGroupListSheetText::updateCoords ()
 				else
 				{
 					// if not received, must insert in list of pending dynstring to check each frame
-					ucstring result;
+					string result;
 					if( !STRING_MANAGER::CStringManagerClient::instance()->getDynString ( curNameId, result) )
 						_NameIdToUpdate.insert( _SheetChildren[i] );
 				}
@@ -492,7 +492,7 @@ void CDBGroupListSheetText::checkCoords ()
 	{
 		CSheetChild * cst = (*it);
 		// String result
-		ucstring result;
+		string result;
 		if( STRING_MANAGER::CStringManagerClient::instance()->getDynString ( cst->NameId, result) )
 		{
 			set< CSheetChild *>::iterator itTmp = it;
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 2b52de9b0..21a56ec4f 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -689,10 +689,10 @@ void CDBGroupListSheetTrade::checkCoords ()
 	{
 		CSheetChildTrade * cst = (*it);
 		// String result
-		ucstring result;
+		string result;
 		if( pSMC->getString ( cst->LastVendorNameId, result) )
 		{
-			cst->VendorNameString = CEntityCL::removeShardFromName(result.toUtf8());
+			cst->VendorNameString = CEntityCL::removeShardFromName(result);
 			set< CSheetChildTrade *>::iterator itTmp = it;
 			++it;
 			VendorNameIdToUpdate.erase(itTmp);
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index 25f5bc2e8..8de31a438 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -194,7 +194,7 @@ void CEncyclopediaManager::rebuildAlbumList()
 	nlassert(pTree != NULL);
 
 	CGroupTree::SNode *pRoot = new CGroupTree::SNode;
-	ucstring res;
+	string res;
 
 	// Add all albums
 	for (uint32 i = 0; i < _Albums.size(); ++i)
@@ -206,7 +206,7 @@ void CEncyclopediaManager::rebuildAlbumList()
 		if (_Albums[i].Name == _AlbumNameSelected)
 			pAlb->Opened = true;
 		if (pSMC->getDynString(_Albums[i].Name, res))
-			pAlb->Text = res.toUtf8();
+			pAlb->Text = res;
 		else
 			nlwarning("try to construct album without name");
 
@@ -218,7 +218,7 @@ void CEncyclopediaManager::rebuildAlbumList()
 			pThm->AHName = "ency_click_thema";
 			pThm->AHParams = toString(_Albums[i].Themas[j].Name);
 			if (pSMC->getDynString(_Albums[i].Themas[j].Name, res))
-				pThm->Text = res.toUtf8();
+				pThm->Text = res;
 			else
 				nlwarning("try to construct thema without name");
 
@@ -426,7 +426,7 @@ bool CEncyclopediaManager::isStringWaiting()
 
 	for (uint32 i = 0; i < _Albums.size(); ++i)
 	{
-		ucstring res;
+		string res;
 		if (!pSMC->getDynString(_Albums[i].Name, res))
 			return true;
 		for (uint32 j = 0; j < _Albums[i].Themas.size(); ++j)
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index fc0f2a5a5..bee955ba4 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -394,18 +394,18 @@ void CGroupCompas::draw()
 
 				// The text
 				char message[50];
-				ucstring  distText;
+				string  distText;
 				if (displayedTarget.getType() != CCompassTarget::North)
 				{
 					if (dist > 999.0f)
 					{
 						smprintf (message, 50, "%.1f ", dist/1000.0f);
-						distText = ucstring (message) + CI18N::get("uiKilometerUnit");
+						distText = message + CI18N::get("uiKilometerUnit");
 					}
 					else
 					{
 						smprintf (message, 50, "%.0f ", dist);
-						distText = ucstring (message) + CI18N::get("uiMeterUnit");
+						distText = message + CI18N::get("uiMeterUnit");
 					}
 					distText = distText + " - " + displayedTarget.Name;
 				}
@@ -415,7 +415,7 @@ void CGroupCompas::draw()
 				}
 				if (_DistViewText != distText)
 				{
-					_DistView->setText(distText.toUtf8());
+					_DistView->setText(distText);
 					_DistViewText = distText;
 				}
 			}
@@ -558,9 +558,9 @@ bool	buildCompassTargetFromTeamMember(CCompassTarget &ct, uint teamMemberId)
 		ct.setPositionState(tracker);
 
 		CStringManagerClient *pSMC = CStringManagerClient::instance();
-		ucstring name;
+		string name;
 		if (pSMC->getString(nameNode->getValue32(), name))
-			ct.Name = CEntityCL::removeTitleAndShardFromName(name.toUtf8()); // TODO : dynamic support for name
+			ct.Name = CEntityCL::removeTitleAndShardFromName(name); // TODO : dynamic support for name
 		else
 			ct.Name = CI18N::get("uiNotReceived");
 		return true;
@@ -711,7 +711,7 @@ void CGroupCompasMenu::setActive (bool state)
 			ct.setType(CCompassTarget::North);
 			ct.Name = CI18N::get("uiNorth");
 			Targets.push_back(ct);
-			getRootMenu()->addLineAtIndex(lineIndex ++, ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+			getRootMenu()->addLineAtIndex(lineIndex ++, ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			// Home
 			CCDBNodeLeaf *pos = NLGUI::CDBManager::getInstance()->getDbProp(COMPASS_DB_PATH ":HOME_POINT");
 			sint32 px = (sint32) (pos->getValue64() >> 32);
@@ -721,7 +721,7 @@ void CGroupCompasMenu::setActive (bool state)
 				ct.setType(CCompassTarget::Home);
 				ct.Name = CI18N::get("uiHome");
 				Targets.push_back(ct);
-				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			}
 			// Respawn
 			pos = NLGUI::CDBManager::getInstance()->getDbProp(COMPASS_DB_PATH ":BIND_POINT");
@@ -732,7 +732,7 @@ void CGroupCompasMenu::setActive (bool state)
 				ct.setType(CCompassTarget::Respawn);
 				ct.Name = CI18N::get("uiRespawn");
 				Targets.push_back(ct);
-				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name.toUtf8(), "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+				getRootMenu()->addLineAtIndex(lineIndex ++,  ct.Name, "set_compas", toString ("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 			}
 
 			// As of 6/5/2007 : The option to point the selection is always proposed even if no slot is currently targeted
@@ -777,7 +777,7 @@ void CGroupCompasMenu::setActive (bool state)
 						CCDBNodeLeaf *textIDLeaf = NLGUI::CDBManager::getInstance()->getDbProp(baseDbPath + toString(":%d:TARGET%d:TITLE", (int) k, (int) l), false);
 						if (textIDLeaf)
 						{
-							ucstring name;
+							string name;
 							if (CStringManagerClient::instance()->getDynString(textIDLeaf->getValue32(), name))
 							{
 								CCDBNodeLeaf *leafPosX= NLGUI::CDBManager::getInstance()->getDbProp(baseDbPath +  toString(":%d:TARGET%d:X", (int) k, (int) l), false);
@@ -790,7 +790,7 @@ void CGroupCompasMenu::setActive (bool state)
 									ct.setPositionState(tracker);
 									ct.Name = name;
 									Targets.push_back(ct);
-									missionSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+									missionSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 									selectable= true;
 								}
 							}
@@ -847,7 +847,7 @@ void CGroupCompasMenu::setActive (bool state)
 					ct.Pos = currCont->ContLandMarks[k].Pos;
 					ct.Name = CStringManagerClient::getPlaceLocalizedName(currCont->ContLandMarks[k].TitleTextID);
 					Targets.push_back(ct);
-					landMarkSubMenu->addLineAtIndex(contLandMarkIndex++, ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					landMarkSubMenu->addLineAtIndex(contLandMarkIndex++, ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 				// separator?
@@ -868,9 +868,9 @@ void CGroupCompasMenu::setActive (bool state)
 						CCompassTarget ct;
 						ct.setType(CCompassTarget::UserLandMark);
 						ct.Pos = sortedLandmarks[k].Pos;
-						ct.Name = sortedLandmarks[k].Title;
+						ct.Name = sortedLandmarks[k].Title.toUtf8();
 						Targets.push_back(ct);
-						landMarkSubMenus[sortedLandmarks[k].Type]->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+						landMarkSubMenus[sortedLandmarks[k].Type]->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 						selectable= true;
 					}
 				}
@@ -901,7 +901,7 @@ void CGroupCompasMenu::setActive (bool state)
 				if (buildCompassTargetFromTeamMember(ct, k))
 				{
 					Targets.push_back(ct);
-					teamSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					teamSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
@@ -924,7 +924,7 @@ void CGroupCompasMenu::setActive (bool state)
 				if (buildCompassTargetFromAnimalMember(ct, k))
 				{
 					Targets.push_back(ct);
-					animalSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					animalSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
@@ -952,7 +952,7 @@ void CGroupCompasMenu::setActive (bool state)
 					CSmartPtr<CDialogEntityPositionState> tracker = new CDialogEntityPositionState( i );
 					ct.setPositionState(tracker);
 					Targets.push_back(ct);
-					dialogsSubMenu->addLine(ct.Name.toUtf8(), "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
+					dialogsSubMenu->addLine(ct.Name, "set_compas", toString("compass=%s|id=%d|menu=%s", _TargetCompass.c_str(), (int) Targets.size() - 1, _Id.c_str()));
 					selectable= true;
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/group_compas.h b/ryzom/client/src/interface_v3/group_compas.h
index c9ba106ef..6a57b0294 100644
--- a/ryzom/client/src/interface_v3/group_compas.h
+++ b/ryzom/client/src/interface_v3/group_compas.h
@@ -46,7 +46,7 @@ class CCompassTarget
 public:
 	enum TType	{ North = 0, Selection, Home, Respawn, ContinentLandMark, UserLandMark, PosTracker, NumTypes };
 	NLMISC::CVector2f		Pos;		// Used for static target (ie not the current selection, a team member ...)
-	ucstring				Name;
+	std::string					Name;
 	CCompassTarget();
 	TType					 getType() const { return _Type; }
 	void                     setType(TType type) { if (type == _Type) return; setPositionState(NULL); _Type = type; }
@@ -124,11 +124,11 @@ private:
 
 	bool	_Blinking;
 	double  _StartBlinkTime;
-	ucstring _CurrTargetName;
+	std::string _CurrTargetName;
 
 	// The dist text
 	CViewText	*_DistView;
-	ucstring	_DistViewText;
+	std::string	_DistViewText;
 
 	CViewRadar	*_RadarView;
 	CViewText	*_RadarRangeView;
diff --git a/ryzom/client/src/interface_v3/group_html_forum.cpp b/ryzom/client/src/interface_v3/group_html_forum.cpp
index 641f9b43e..4b74732f3 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.cpp
+++ b/ryzom/client/src/interface_v3/group_html_forum.cpp
@@ -60,7 +60,7 @@ void CGroupHTMLForum::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
  	ucstring user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
-	string	gname = guild.Name.toUtf8();
+	string	gname = guild.Name;
 
 	if (!gname.empty())
 	{
@@ -92,7 +92,7 @@ void CGroupHTMLForum::addHTTPPostParams (SFormFields &formfields, bool /*trusted
 {
 	ucstring user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
-	string	gname = guild.Name.toUtf8();
+	string	gname = guild.Name;
 
 	if (!gname.empty())
 	{
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index c3edc87f9..06f81f762 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -456,7 +456,7 @@ void CGroupInSceneBubbleManager::update ()
 	{
 		if (_DynBubbles[i].DescWaiting != 0)
 		{
-			ucstring res;
+			string res;
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 			if (pSMC->getDynString(_DynBubbles[i].DescWaiting,res))
 			{
@@ -1317,14 +1317,14 @@ class CAHDynChatClickOption : public IActionHandler
 		if (isBGDownloadEnabled())
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-			ucstring result;
+			string result;
 			if (!pSMC->getDynString(optStrId, result))
 			{
 				return; // shouldn't happen since the button isn't visible as long as the text has not been received ...
 			}
 			static volatile bool forceWarning = false; // for debug
-			ucstring::size_type	pos= result.find(ucstring("{ros_exit}"));
-			if(pos != ucstring::npos || forceWarning)
+			string::size_type	pos= result.find("{ros_exit}");
+			if(pos != string::npos || forceWarning)
 			{
 				if (AvailablePatchs != 0)
 				{
@@ -1334,7 +1334,7 @@ class CAHDynChatClickOption : public IActionHandler
 			}
 		}
 
-		const string sMsg = "BOTCHAT:DYNCHAT_SEND";
+		static const string sMsg = "BOTCHAT:DYNCHAT_SEND";
 		CBitMemStream out;
 		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index e5021ca00..ee2f6c526 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -992,9 +992,9 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 	if (_GuildName)
 	{
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-		ucstring ucsTmp;
+		string ucsTmp;
 		if (pSMC->getString (_Entity->getGuildNameID(), ucsTmp))
-			_GuildName->setText(ucsTmp.toUtf8());
+			_GuildName->setText(ucsTmp);
 
 		// guildname color is the pvp color
 		_GuildName->setColor(entityColor);
@@ -1018,9 +1018,9 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 	if (_EventFaction)
 	{
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-		ucstring ucsTmp;
-		if (pSMC->getString (_Entity->getEventFactionID(), ucsTmp))
-			_EventFaction->setText(ucsTmp.toUtf8());
+		string ucsTmp;
+		if (pSMC->getString(_Entity->getEventFactionID(), ucsTmp))
+			_EventFaction->setText(ucsTmp);
 
 		// guildname color depends of PVP faction or not
 		_EventFaction->setColor(entityColor);
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index b5302885e..8582b938e 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -1176,10 +1176,10 @@ void CGroupMap::checkCoords()
 			// update text if needed
 			if (!_MissionTargetTextReceived[k])
 			{
-				ucstring result;
+				string result;
 				if (STRING_MANAGER::CStringManagerClient::instance()->getDynString(_MissionTargetTextIDs[k], result))
 				{
-					_MissionLM[k]->setDefaultContextHelp(result.toUtf8());
+					_MissionLM[k]->setDefaultContextHelp(result);
 					_MissionTargetTextReceived[k] = true;
 				}
 			}
@@ -1401,11 +1401,11 @@ void CGroupMap::checkCoords()
 				CInterfaceManager *im = CInterfaceManager::getInstance();
 				uint32 val = NLGUI::CDBManager::getInstance()->getDbProp(NLMISC::toString("SERVER:GROUP:%d:NAME",i))->getValue32();
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-				ucstring res;
+				string res;
 
-				if (pSMC->getString(val,res))
+				if (pSMC->getString(val, res))
 				{
-						std::string res2 = CEntityCL::removeTitleAndShardFromName(res.toUtf8());
+						std::string res2 = CEntityCL::removeTitleAndShardFromName(res);
 						_TeammateLM[i]->setDefaultContextHelp(res2);
 				}
 			}
@@ -3197,7 +3197,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 		if (it != _ContinentLM.end())
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
-			(*it)->getContextHelpAsUtf16(ct.Name);
+			(*it)->getContextHelp(ct.Name);
 			mapToWorld(ct.Pos, (*it)->Pos);
 			found = true;
 		}
@@ -3210,7 +3210,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			if (it != _MissionLM.end())
 			{
 				ct.setPositionState(_MissionPosStates[it - _MissionLM.begin()]);
-				(*it)->getContextHelpAsUtf16(ct.Name);
+				(*it)->getContextHelp(ct.Name);
 				mapToWorld(ct.Pos, (*it)->Pos);
 				found = true;
 			}
@@ -3224,7 +3224,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			if (it != _UserLM.end())
 			{
 				ct.setType(CCompassTarget::UserLandMark);
-				(*it)->getContextHelpAsUtf16(ct.Name);
+				(*it)->getContextHelp(ct.Name);
 				mapToWorld(ct.Pos, (*it)->Pos);
 				found = true;
 			}
@@ -3252,7 +3252,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 				if (!isIsland())
 				{
 					ct.setType(CCompassTarget::Respawn);
-					(*it)->getContextHelpAsUtf16(ct.Name);
+					(*it)->getContextHelp(ct.Name);
 					mapToWorld(ct.Pos, (*it)->Pos);
 					found = true;
 				}
@@ -3298,7 +3298,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			{
 				if(_AnimalLM[i]==lm)
 				{
-					_AnimalLM[i]->getContextHelpAsUtf16(ct.Name);
+					_AnimalLM[i]->getContextHelp(ct.Name);
 					// copy The Animal Pos retriever into the compass
 					ct.setPositionState(_AnimalPosStates[i]);
 					found = true;
@@ -3316,7 +3316,7 @@ void CGroupMap::targetLandmark(CCtrlButton *lm)
 			{
 				if(_TeammateLM[i]==lm)
 				{
-					_TeammateLM[i]->getContextHelpAsUtf16(ct.Name);
+					_TeammateLM[i]->getContextHelp(ct.Name);
 					// copy The Animal Pos retriever into the compass
 					ct.setPositionState(_TeammatePosStates[i]);
 					found = true;
@@ -3346,7 +3346,7 @@ void CGroupMap::targetLandmarkResult(uint32 index)
 
 	CCompassTarget ct;
 	ct.Pos = _MatchedLandmarks[index].Pos;
-	ct.Name = _MatchedLandmarks[index].Title;
+	ct.Name = _MatchedLandmarks[index].Title.toUtf8();
 	// type sets compass arrow color
 	ct.setType(CCompassTarget::UserLandMark);
 
@@ -3440,7 +3440,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 	{
 		ct.setType(CCompassTarget::UserLandMark);
 		mapToWorld(ct.Pos, lm->Pos);
-		lm->getContextHelpAsUtf16(ct.Name);
+		lm->getContextHelp(ct.Name);
 		closest = dist;
 		found = true;
 	}
@@ -3453,7 +3453,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
 			mapToWorld(ct.Pos, lm->Pos);
-			lm->getContextHelpAsUtf16(ct.Name);
+			lm->getContextHelp(ct.Name);
 			closest = dist;
 			found = true;
 		}
@@ -3464,7 +3464,7 @@ bool CGroupMap::targetLandmarkByName(const ucstring &search, bool startsWith) co
 		{
 			ct.setType(CCompassTarget::ContinentLandMark);
 			mapToWorld(ct.Pos, lmt->Pos);
-			ct.Name = CUtfStringView(lmt->getText()).toUtf16();
+			ct.Name = lmt->getText();
 			closest = dist;
 			found = true;
 		}
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 74dc5d991..39fe7e05e 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -245,11 +245,11 @@ bool CGuildManager::isLeaderOfTheGuild()
 }
 
 // ***************************************************************************
-ucstring CGuildManager::getGuildName()
+string CGuildManager::getGuildName()
 {
 	if (_InGuild)
 		return _Guild.Name;
-	return ucstring("");
+	return string();
 }
 
 // ***************************************************************************
@@ -359,7 +359,7 @@ void CGuildManager::update()
 		for (uint i = 0; i < _GuildMembers.size(); ++i)
 		{
 			if (!pSMC->getString (_GuildMembers[i].NameID, _GuildMembers[i].Name)) bAllValid = false;
-			else _GuildMembers[i].Name = CEntityCL::removeTitleAndShardFromName(_GuildMembers[i].Name.toUtf8());
+			else _GuildMembers[i].Name = CEntityCL::removeTitleAndShardFromName(_GuildMembers[i].Name);
 		}
 
 		// If all is valid no more need update and if guild is opened update the interface
@@ -369,13 +369,13 @@ void CGuildManager::update()
 			if (node && node->getValueBool())
 			{
 				// See if we need to show any online/offline messages
-				static map<ucstring, SGuildMember> CachedGuildMembers;
+				static map<string, SGuildMember> CachedGuildMembers;
 				const string &onlineMessage = CI18N::get("uiPlayerOnline");
 				const string &offlineMessage = CI18N::get("uiPlayerOffline");
 
 				for (uint i = 0; i < _GuildMembers.size(); ++i)
 				{
-					map<ucstring, SGuildMember>::const_iterator it = CachedGuildMembers.find(_GuildMembers[i].Name);
+					map<string, SGuildMember>::const_iterator it = CachedGuildMembers.find(_GuildMembers[i].Name);
 					if ( it != CachedGuildMembers.end() )
 					{
 						if ( (*it).second.Online == _GuildMembers[i].Online)
@@ -391,7 +391,7 @@ void CGuildManager::update()
 						}
 
 						string msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
-						strFindReplace(msg, "%s", _GuildMembers[i].Name.toUtf8());
+						strFindReplace(msg, "%s", _GuildMembers[i].Name);
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
@@ -418,7 +418,7 @@ void CGuildManager::update()
 			{
 				uint i;
 				_Grade = EGSPD::CGuildGrade::Member;
-				ucstring sUserName = toLower(UserEntity->getEntityName());
+				string sUserName = toLower(UserEntity->getEntityName());
 				for (i = 0; i < _GuildMembers.size(); ++i)
 				{
 					if (toLower(_GuildMembers[i].Name) == sUserName)
@@ -471,7 +471,7 @@ void CGuildManager::update()
 			{
 				CViewText *pJoinPropPhraseView = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_JOIN_PROPOSAL_PHRASE));
 				if (pJoinPropPhraseView != NULL)
-					pJoinPropPhraseView->setText(_JoinPropPhrase.toUtf8());
+					pJoinPropPhraseView->setText(_JoinPropPhrase);
 
 				pJoinProp->setActive(true);
 				CWidgetManager::getInstance()->setTopWindow(pJoinProp);
@@ -722,10 +722,10 @@ bool CDBGroupListAscensor::CSheetChildAscensor::isInvalidated(CDBGroupListSheetT
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 
 		uint32 nameID = NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:ASCENSOR:" + toString(Index) + ":NAME")->getValue32();
-		ucstring name;
+		string name;
 		if (nameID && pSMC->getDynString(nameID, name))
 		{
-			Text->setText(name.toUtf8());
+			Text->setText(name);
 
 			uint64 icon = NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:ASCENSOR:" + toString(Index) + ":ICON")->getValue64();
 
@@ -831,7 +831,7 @@ class CAHGuildSheetOpen : public IActionHandler
 				// Set name
 				CViewText *pViewName = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_NAME));
 				if (pViewName != NULL)
-					pViewName->setText (rGuildMembers[i].Name.toUtf8());
+					pViewName->setText (rGuildMembers[i].Name);
 
 				// Set Grade
 				CViewText *pViewGrade = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_GRADE));
@@ -875,7 +875,7 @@ class CAHGuildSheetOpen : public IActionHandler
 				
 				CCtrlBase *inviteButton = pLine->getCtrl("invite_button");
 				if (inviteButton != NULL)
-					inviteButton->setActive(rGuildMembers[i].Online != ccs_offline && rGuildMembers[i].Name.toUtf8() != UserEntity->getEntityName());
+					inviteButton->setActive(rGuildMembers[i].Online != ccs_offline && rGuildMembers[i].Name != UserEntity->getEntityName());
 
 				// Enter Date
 				CViewText *pViewEnterDate = dynamic_cast<CViewText*>(pLine->getView(TEMPLATE_GUILD_MEMBER_ENTER_DATE));
@@ -883,13 +883,13 @@ class CAHGuildSheetOpen : public IActionHandler
 				{
 					CRyzomTime rt;
 					rt.updateRyzomClock(rGuildMembers[i].EnterDate);
-					ucstring str = toString("%04d", rt.getRyzomYear()) + " ";
+					string str = toString("%04d", rt.getRyzomYear()) + " ";
 					str += CI18N::get("uiJenaYear") + " : ";
 					str += CI18N::get("uiAtysianCycle") + " ";
 					str += toString("%01d", rt.getRyzomCycle()+1) +", ";
 					str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)rt.getRyzomMonthInCurrentCycle() )) + ", ";
 					str += toString("%02d", rt.getRyzomDayOfMonth()+1);
-					pViewEnterDate->setText(str.toUtf8());
+					pViewEnterDate->setText(str);
 				}
 
 				// Add to the list
@@ -989,12 +989,12 @@ class CAHGuildSheetMenuOpen : public IActionHandler
 public:
 	// Current selection
 	static sint32	MemberIndexSelected;		// Index of the member selected when right clicked
-	static ucstring	MemberNameSelected;			// Name of the member selected when right clicked (for extra check)
+	static std::string	MemberNameSelected;			// Name of the member selected when right clicked (for extra check)
 };
 REGISTER_ACTION_HANDLER (CAHGuildSheetMenuOpen, "guild_member_menu_open");
 
 sint32		CAHGuildSheetMenuOpen::MemberIndexSelected= -1;
-ucstring	CAHGuildSheetMenuOpen::MemberNameSelected;
+std::string	CAHGuildSheetMenuOpen::MemberNameSelected;
 
 
 // ***************************************************************************
@@ -1084,17 +1084,17 @@ public:
 		MemberIndexSelected= nLineNb;
 		MemberNameSelected = rGuildMembers[nLineNb].Name;
 
-		CPeopleInterraction::displayTellInMainChat(MemberNameSelected.toUtf8());	
+		CPeopleInterraction::displayTellInMainChat(MemberNameSelected);	
 	}
 
 	// Current selection
 	static sint32	MemberIndexSelected;		// Index of the member selected when left clicked
-	static ucstring	MemberNameSelected;			// Name of the member selected when lef clicked
+	static std::string	MemberNameSelected;			// Name of the member selected when lef clicked
 };
 REGISTER_ACTION_HANDLER(CAHGuildSheetTellMember, "guild_tell_member");
 
 sint32		CAHGuildSheetTellMember::MemberIndexSelected= -1;
-ucstring	CAHGuildSheetTellMember::MemberNameSelected;
+string		CAHGuildSheetTellMember::MemberNameSelected;
 
 // ***************************************************************************
 class CAHGuildSheetSetLeader : public IActionHandler
diff --git a/ryzom/client/src/interface_v3/guild_manager.h b/ryzom/client/src/interface_v3/guild_manager.h
index 7b8b94df2..11c44210c 100644
--- a/ryzom/client/src/interface_v3/guild_manager.h
+++ b/ryzom/client/src/interface_v3/guild_manager.h
@@ -37,7 +37,7 @@ struct SGuildMember
 {
 	uint32		Index;	// Index in the DB
 	uint32		NameID;
-	ucstring	Name;
+	std::string	Name;
 	EGSPD::CGuildGrade::TGuildGrade Grade;
 	TCharConnectionState			Online;
 	uint32		EnterDate;
@@ -54,7 +54,7 @@ struct SGuildMember
 struct SGuild
 {
 	uint32		NameID;
-	ucstring	Name;
+	std::string	Name;
 	uint64		Icon;
 	bool		QuitGuildAvailable;
 
@@ -131,7 +131,7 @@ public:
 	bool isLeaderOfTheGuild();
 
 	/// If the player is in a guild get the guild name else return empty
-	ucstring getGuildName();
+	std::string getGuildName();
 
 	/// If the player is in a guild get the amount of money the guild owns else return zero
 	uint64 getMoney();
@@ -270,7 +270,7 @@ private:
 
 	// Join Proposal handling
 	uint32		_JoinPropPhraseID;
-	ucstring	_JoinPropPhrase;
+	std::string	_JoinPropPhrase;
 	bool		_JoinPropUpdate;
 };
 
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 4330782bc..0fa12432b 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -310,12 +310,12 @@ public:
 
 class CStringManagerTextProvider : public CViewTextID::IViewTextProvider
 {
-	bool getString( uint32 stringId, ucstring &result )
+	bool getString( uint32 stringId, string &result )
 	{
 		return STRING_MANAGER::CStringManagerClient::instance()->getString( stringId, result );
 	}
 
-	bool getDynString( uint32 dynStringId, ucstring &result )
+	bool getDynString( uint32 dynStringId, string &result )
 	{
 		return STRING_MANAGER::CStringManagerClient::instance()->getDynString( dynStringId, result );
 	}
@@ -400,7 +400,7 @@ public:
 						}
 					}
 					// get the title translated
-					ucstring sTitleTranslated = botName; // FIXME: UTF-8
+					string sTitleTranslated = botName; // FIXME: UTF-8
 					CStringPostProcessRemoveName spprn;
 					spprn.Woman = womanTitle;
 					spprn.cbIDStringReceived(sTitleTranslated);
@@ -412,14 +412,14 @@ public:
 					{
 						// But if there is no name, display only the title
 						if (botName.empty())
-							botName = sTitleTranslated.toUtf8();
+							botName = sTitleTranslated;
 					}
 					else
 					{
 						// Else we want the title !
 						if (!botName.empty())
 							botName += " ";
-						botName += sTitleTranslated.toUtf8();
+						botName += sTitleTranslated;
 					}
 
 					formatedResult += botName;
@@ -2347,7 +2347,7 @@ void CInterfaceManager::processServerIDString()
 	for (uint32 i = 0; i < _IDStringWaiters.size(); ++i)
 	{
 		bool bAffect = false;
-		ucstring ucstrToAffect;
+		string ucstrToAffect;
 		SIDStringWaiter *pISW = _IDStringWaiters[i];
 		if (pISW->IdOrString == true) // ID !
 		{
@@ -2374,7 +2374,7 @@ void CInterfaceManager::processServerIDString()
 			if (bValid)
 			{
 				ucstrToAffect = STRING_MANAGER::CStringManagerClient::getLocalizedName(ucstrToAffect);
-				val.setString (ucstrToAffect.toUtf8());
+				val.setString (ucstrToAffect);
 				CInterfaceLink::setTargetProperty (pISW->Target, val);
 			}
 
@@ -4243,10 +4243,10 @@ bool CInterfaceManager::parseTokens(string& ucstr)
 			else if (token_param == "guild")
 			{
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-				ucstring ucGuildName;
+				string ucGuildName;
 				if (pSMC->getString(pTokenSubjectEntity->getGuildNameID(), ucGuildName))
 				{
-					token_replacement = ucGuildName.empty() ? token_replacement : ucGuildName.toUtf8();
+					token_replacement = ucGuildName.empty() ? token_replacement : ucGuildName;
 				}
 			}
 			else if (token_param.substr(0, 3) == "gs(" &&
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 39fd12dc4..2aed09dc5 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -249,7 +249,7 @@ public:
 	{
 	public:
 		virtual ~IStringProcess() { }
-		virtual bool cbIDStringReceived(ucstring &inOut) = 0; // called when string or id is received (return true if valid the change)
+		virtual bool cbIDStringReceived(std::string &inOut) = 0; // called when string or id is received (return true if valid the change)
 	};
 
 	void addServerString (const std::string &sTarget, uint32 id, IStringProcess *cb = NULL);
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index fec5ff3fe..55d31bf54 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -3276,9 +3276,7 @@ void	CLuaIHMRyzom::browseNpcWebPage(const std::string &htmlId, const std::string
 			{
 				userName = UserEntity->getDisplayName();
 				STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
-				ucstring ucsTmp;
-				pSMC->getString(UserEntity->getGuildNameID(), ucsTmp);
-				guildName = ucsTmp.toString();
+				pSMC->getString(UserEntity->getGuildNameID(), guildName);
 
 				while (guildName.find(' ') != string::npos)
 				{
@@ -3329,16 +3327,16 @@ void		CLuaIHMRyzom::clearHtmlUndoRedo(const std::string &htmlId)
 ucstring	CLuaIHMRyzom::getDynString(sint32 dynStringId)
 {
 	//H_AUTO(Lua_CLuaIHM_getDynString)
-	ucstring result;
+	string result;
 	STRING_MANAGER::CStringManagerClient::instance()->getDynString(dynStringId,   result);
-	return result;
+	return ucstring::makeFromUtf8(result); // TODO: Lua UTF-8
 }
 
 // ***************************************************************************
 bool		CLuaIHMRyzom::isDynStringAvailable(sint32 dynStringId)
 {
 	//H_AUTO(Lua_CLuaIHM_isDynStringAvailable)
-	ucstring result;
+	string result;
 	bool res = STRING_MANAGER::CStringManagerClient::instance()->getDynString(dynStringId,   result);
 	return res;
 }
@@ -3490,7 +3488,7 @@ string CLuaIHMRyzom::getGuildMemberName(sint32 nMemberId)
 	if ((nMemberId < 0) || (nMemberId >= getNbGuildMembers()))
 		return "";
 
-	return CGuildManager::getInstance()->getGuildMembers()[nMemberId].Name.toString();
+	return CGuildManager::getInstance()->getGuildMembers()[nMemberId].Name;
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index eaf6386c2..e1a01400d 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -934,7 +934,7 @@ class CHandlerChatGroupFilter : public IActionHandler
 					case CChatGroup::dyn_chat:
 						uint32 index = PeopleInterraction.TheUserChat.Filter.getTargetDynamicChannelDbIndex();
 						uint32 textId = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:DYN_CHAT:CHANNEL"+toString(index)+":NAME")->getValue32();
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 						if (title.empty())
 						{
@@ -944,7 +944,7 @@ class CHandlerChatGroupFilter : public IActionHandler
 						}
 						else
 						{
-							pUserBut->setHardText(title.toUtf8());
+							pUserBut->setHardText(title);
 						}
 						break;
 				}
@@ -1297,7 +1297,7 @@ void CPeopleInterraction::addContactInList(uint32 contactId, const ucstring &nam
 //=================================================================================================================
 void CPeopleInterraction::addContactInList(uint32 contactId, uint32 nameID, TCharConnectionState online, uint8 nList)
 {
-	ucstring name;
+	string name;
 	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 	if (pSMC->getString(nameID, name))
 	{
@@ -1357,7 +1357,7 @@ void CPeopleInterraction::updateWaitingContacts()
 	for (uint32 i = 0; i < WaitingContacts.size();)
 	{
 		SWaitingContact &w = WaitingContacts[i];
-		ucstring name;
+		string name;
 		STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 		if (pSMC->getString(w.NameId, name))
 		{
@@ -1393,7 +1393,7 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 					// Only show the message if this player is not in my guild (because then the guild manager will show a message)
 					std::vector<SGuildMember> GuildMembers = CGuildManager::getInstance()->getGuildMembers();
 					bool bOnlyFriend = true;
-					ucstring name = toLower(FriendList.getName(index));
+					string name = toLower(FriendList.getName(index).toUtf8());
 					for (uint i = 0; i < GuildMembers.size(); ++i)
 					{
 						if (toLower(GuildMembers[i].Name) == name)
@@ -2635,12 +2635,12 @@ public:
 					uint32 canWrite = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:DYN_CHAT:CHANNEL"+s+":WRITE_RIGHT")->getValue32();
 					if (canWrite != 0)
 					{
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 
 						// replace dynamic channel name and shortcut
 						string res = CI18N::get("uiFilterMenuDynamic");
-						strFindReplace(res, "%channel", title.toUtf8());
+						strFindReplace(res, "%channel", title);
 						strFindReplace(res, "%shortcut", s);
 
 						pMenu->addLineAtIndex(5 + insertion_index, res, "chat_target_selected", "dyn"+s, "dyn"+s);
@@ -2828,9 +2828,9 @@ class CHandlerSelectChatSource : public IActionHandler
 					pVTM->setActive(active);
 					if (active)
 					{
-						ucstring title;
+						string title;
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-						pVTM->setText("["+s+"] " + title.toUtf8());
+						pVTM->setText("["+s+"] " + title);
 					}
 				}
 			}
@@ -2953,9 +2953,9 @@ class CHandlerSelectChatSource : public IActionHandler
 				bool active = (textId != 0);
 				if (active)
 				{
-					ucstring title;
+					string title;
 					STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-					menu->addLineAtIndex(insertionIndex, "["+s+"] " + title.toUtf8(), FILTER_TOGGLE, "dyn"+s);
+					menu->addLineAtIndex(insertionIndex, "["+s+"] " + title, FILTER_TOGGLE, "dyn"+s);
 					menu->setUserGroupLeft(insertionIndex, createMenuCheckBox(FILTER_TOGGLE, "dyn"+s, pi.ChatInput.DynamicChat[i].isListeningWindow(cw)));
 					++insertionIndex;
 				}
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index f4ceb511c..cdb4261c0 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -3266,8 +3266,8 @@ private:
 		STRING_MANAGER::CStringManagerClient		*pSMC= STRING_MANAGER::CStringManagerClient::instance();
 
 		// get the content string (should have been received!)
-		ucstring	contentStr;
-		ucstring	titleStr;
+		string	contentStr;
+		string	titleStr;
 		if(!pSMC->getDynString(_TextId[ContentType], contentStr))
 			return;
 
@@ -3294,8 +3294,8 @@ private:
 			}
 			if(i != digitMaxEnd)
 			{
-				ucstring web_app = contentStr.substr(digitStart, i-digitStart);
-				contentStr = ucstring(ClientCfg.WebIgMainDomain + "/") + web_app + ucstring("/index.php?") + contentStr.substr((size_t)i + 1);
+				string web_app = contentStr.substr(digitStart, i-digitStart);
+				contentStr = string(ClientCfg.WebIgMainDomain + "/") + web_app + string("/index.php?") + contentStr.substr((size_t)i + 1);
 			}
 			else
 			{
@@ -3329,7 +3329,7 @@ private:
 		if (is_webig)
 		{
 			CGroupHTML *groupHtml;
-			string group = titleStr.toString();
+			string group = titleStr;
 			// <missing:XXX>
 			group = group.substr(9, group.size()-10);
 			groupHtml = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:"+group+":content:html"));
@@ -3352,7 +3352,7 @@ private:
 					{
 						if (group == "webig")
 							pGC->setActive(true);
-						string url = contentStr.toString();
+						string url = contentStr;
 						addWebIGParams(url, true);
 						groupHtml->browse(url.c_str());
 						CWidgetManager::getInstance()->setTopWindow(pGC);
@@ -3372,7 +3372,7 @@ private:
 				// must set the text by hand
 				CViewText	*vt= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(CWidgetManager::getInstance()->getParser()->getDefine("server_message_box_content_view_text")));
 				if(vt)
-					vt->setTextFormatTaged(contentStr.toUtf8());
+					vt->setTextFormatTaged(contentStr);
 
 				// open
 				CWidgetManager::getInstance()->setTopWindow(pGC);
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index 5179318f4..e29f78b6f 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -64,11 +64,11 @@ public:
 	void flushStringCache();
 
 	bool getString(uint32 stringId, std::string &result);
-	bool getString(uint32 stringId, ucstring &result) { std::string temp; bool res = getString(stringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
+	// bool getString(uint32 stringId, ucstring &result) { std::string temp; bool res = getString(stringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
 	void waitString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitString(uint32 stringId, IStringWaitCallback *pcallback);
 	bool getDynString(uint32 dynStringId, std::string &result);
-	bool getDynString(uint32 dynStringId, ucstring &result) { std::string temp; bool res = getString(dynStringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
+	// bool getDynString(uint32 dynStringId, ucstring &result) { std::string temp; bool res = getString(dynStringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
 	void waitDynString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitDynString(uint32 stringId, IStringWaitCallback *pcallback);
 

From d201b8a39250df3cd6abfc93253d73c9e3d0939f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 13:47:52 +0800
Subject: [PATCH 113/292] UTF-8 various, ryzom/ryzomcore#335

---
 ryzom/client/src/candidate.h                  |  3 +-
 ryzom/client/src/character_cl.cpp             | 16 ++---
 ryzom/client/src/client_cfg.cpp               |  7 +--
 ryzom/client/src/client_cfg.h                 |  4 +-
 ryzom/client/src/client_chat_manager.cpp      | 24 ++++----
 ryzom/client/src/client_chat_manager.h        |  2 +-
 ryzom/client/src/commands.cpp                 | 14 ++---
 ryzom/client/src/connection.cpp               |  6 +-
 ryzom/client/src/continent.h                  |  2 +-
 ryzom/client/src/entities.cpp                 | 17 +++---
 ryzom/client/src/entities.h                   |  4 +-
 ryzom/client/src/entity_cl.cpp                | 14 ++---
 ryzom/client/src/entity_cl.h                  |  8 +--
 ryzom/client/src/far_tp.cpp                   |  4 +-
 ryzom/client/src/forage_source_cl.cpp         |  2 +-
 ryzom/client/src/init.cpp                     |  8 +--
 ryzom/client/src/init_main_loop.cpp           |  4 +-
 .../src/interface_v3/action_handler_game.cpp  | 58 +++++++++----------
 .../src/interface_v3/flying_text_manager.cpp  |  4 +-
 .../src/interface_v3/flying_text_manager.h    |  2 +-
 .../interface_v3/group_in_scene_bubble.cpp    | 51 +++++++---------
 .../src/interface_v3/group_in_scene_bubble.h  | 16 ++---
 ryzom/client/src/main_loop.cpp                |  2 +-
 ryzom/client/src/net_manager.cpp              |  8 +--
 .../src/r2/dmc/client_edition_module.cpp      |  2 +-
 ryzom/client/src/string_manager_client.h      |  2 -
 .../src/game_share/generic_xml_msg_mngr.cpp   | 10 ++++
 .../src/game_share/generic_xml_msg_mngr.h     |  8 +++
 28 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/ryzom/client/src/candidate.h b/ryzom/client/src/candidate.h
index aa190111a..41d04e681 100644
--- a/ryzom/client/src/candidate.h
+++ b/ryzom/client/src/candidate.h
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#if 0
 #ifndef CL_CANDIDATE_H
 #define CL_CANDIDATE_H
 
@@ -39,3 +39,4 @@ struct Candidate
 
 
 #endif // CL_CANDIDATE_H
+#endif
\ No newline at end of file
diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 676bf11f4..411795200 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -809,9 +809,9 @@ bool CCharacterCL::build(const CEntitySheet *sheet)	// virtual
 	if (Type == Fauna)
 	{
 		// Get the fauna name in the sheet
-		const ucstring creatureName(STRING_MANAGER::CStringManagerClient::getCreatureLocalizedName(_Sheet->Id));
-		if (creatureName.find(ucstring("<NotExist:")) != 0)
-			_EntityName = creatureName.toUtf8();
+		const char *creatureName = STRING_MANAGER::CStringManagerClient::getCreatureLocalizedName(_Sheet->Id);
+		if (!FINAL_VERSION || !NLMISC::startsWith(creatureName, "<NotExist:"))
+			_EntityName = creatureName;
 	}
 	else
 	{
@@ -7589,7 +7589,7 @@ void CCharacterCL::displayName()
 //---------------------------------------------------
 void CCharacterCL::drawName(const NLMISC::CMatrix &mat)	// virtual
 {
-	const ucstring &ucname = getEntityName();
+	const string &ucname = getEntityName();
 	if(!getEntityName().empty())
 	{
 		// If there is no extended name, just display the name
@@ -7616,8 +7616,8 @@ void CCharacterCL::drawName(const NLMISC::CMatrix &mat)	// virtual
 	{
 		if(_Sheet != 0)
 		{
-			const ucstring name(STRING_MANAGER::CStringManagerClient::getCreatureLocalizedName(_Sheet->Id));
-			if (name.find(ucstring("<NotExist:")) != 0)
+			const char *name = STRING_MANAGER::CStringManagerClient::getCreatureLocalizedName(_Sheet->Id);
+			if (!FINAL_VERSION || !NLMISC::startsWith(name, "<NotExist:"))
 				TextContext->render3D(mat, name);
 		}
 	}
@@ -7674,9 +7674,9 @@ void CCharacterCL::displayModifiers()	// virtual
 		}
 		else if (TimeInSec >= mod.Time)
 		{
-			ucstring hpModifier;
+			string hpModifier;
 			if (mod.Text.empty())
-				hpModifier = ucstring(toString("%d", mod.Value));
+				hpModifier = toString("%d", mod.Value);
 			else
 				hpModifier = mod.Text;
 			double t = TimeInSec-mod.Time;
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index 21d73859e..f7f91e7ad 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -2278,14 +2278,13 @@ string	CClientConfig::getHtmlLanguageCode() const
 }
 
 // ***************************************************************************
-ucstring CClientConfig::buildLoadingString( const ucstring& ucstr ) const
+string CClientConfig::buildLoadingString( const string& ucstr ) const
 {
 	if( LoadingStringCount > 0 )
 	{
 		uint index = rand()%LoadingStringCount;
-		string tipId = "uiLoadingString"+toString(index);
-		ucstring randomUCStr = CI18N::get(tipId);
-		return randomUCStr;
+		string tipId = "uiLoadingString" + toString(index);
+		return CI18N::get(tipId);
 	}
 	else
 		return ucstr;
diff --git a/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h
index a8404fb39..47c32d003 100644
--- a/ryzom/client/src/client_cfg.h
+++ b/ryzom/client/src/client_cfg.h
@@ -893,10 +893,10 @@ public:
 	float	getActualLandscapeThreshold() const;
 
 	// Return LanguageCode but if "wk", then return "en"
-	string	getHtmlLanguageCode() const;
+	std::string	getHtmlLanguageCode() const;
 
 	// return a random loading tip or, if there are not, return the string in argument
-	ucstring buildLoadingString( const ucstring& ucstr ) const;
+	std::string buildLoadingString(const std::string &ucstr) const;
 
 	/// get the path to client_default.cfg including the filename itself.
 	bool getDefaultConfigLocation(std::string& fileLocation) const;
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index a6ec40bdd..ec8da3eb1 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -285,11 +285,11 @@ void CClientChatManager::init( const string& /* staticDBFileName */ )
 void CClientChatManager::chat( const string& strIn, bool isChatTeam )
 {
 	// Truncate to 255 chars max (because of server restriction)
-	ucstring	str= ucstring(strIn).substr(0,255);
+	ucstring	str= ucstring(strIn).substr(0,255);  // FIXME: UTF-8 (serial)
 
 	// send str to IOS
 	CBitMemStream bms;
-	string msgType;
+	const char *msgType;
 
 	if (isChatTeam)
 	{
@@ -303,13 +303,13 @@ void CClientChatManager::chat( const string& strIn, bool isChatTeam )
 
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
-		bms.serial( str ); // FIXME: UTF-8
+		bms.serial( str ); // FIXME: UTF-8 (serial)
 		NetMngr.push( bms );
 		//nlinfo("impulseCallBack : %s %s sent", msgType.c_str(), str.toString().c_str());
 	}
 	else
 	{
-		nlwarning("<CClientChatManager::chat> unknown message name : %s", msgType.c_str());
+		nlwarning("<CClientChatManager::chat> unknown message name : %s", msgType);
 	}
 
 	if (UserEntity != NULL) UserEntity->setAFK(false);
@@ -324,8 +324,8 @@ void CClientChatManager::chat( const string& strIn, bool isChatTeam )
 void CClientChatManager::tell( const string& receiverIn, const string& strIn )
 {
 	// Truncate to 255 chars max (because of server restriction)
-	string		receiver= receiverIn.substr(0,255);
-	ucstring	str= ucstring(strIn).substr(0,255);
+	string		receiver= receiverIn.substr(0,255); // FIXME: UTF-8 (serial)
+	ucstring	str= ucstring(strIn).substr(0,255); // FIXME: UTF-8 (serial)
 
 	// *** send str
 	CBitMemStream bms;
@@ -454,7 +454,7 @@ void CClientChatManager::processTellString(NLMISC::CBitMemStream& bms, IChatDisp
 	// Serial. For tell message, there is no chat mode, coz we know we are in tell mode !
 	bms.serial (chatMsg.CompressedIndex);
 	bms.serial (chatMsg.SenderNameId);
-	bms.serial (chatMsg.Content); // FIXME: UTF-8
+	bms.serial (chatMsg.Content); // FIXME: UTF-8 (serial)
 
 	if (PermanentlyBanned) return;
 
@@ -718,7 +718,7 @@ string CClientChatManager::getString( CBitMemStream& bms, string& ucstr )
 		string::size_type idx = ucstr.find(ucstrTmp);
 
 		// if there's a parameter in the string
-		if( idx != ucstring::npos )
+		if( idx != string::npos )
 		{
 			char c = (char)ucstr[idx+ucstrTmp.size()];
 			switch( c )
@@ -967,8 +967,8 @@ void CClientChatManager::buildTellSentence(const string &sender, const string &m
 			name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
 			{
 				// Sometimes translation contains another title
-				ucstring::size_type pos = name.find('$');
-				if (pos != ucstring::npos)
+				string::size_type pos = name.find('$');
+				if (pos != string::npos)
 				{
 					name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
 				}
@@ -1048,8 +1048,8 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 			senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sender), bWoman);
 			{
 				// Sometimes translation contains another title
-				ucstring::size_type pos = senderName.find('$');
-				if (pos != ucstring::npos)
+				string::size_type pos = senderName.find('$');
+				if (pos != string::npos)
 				{
 					senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
 				}
diff --git a/ryzom/client/src/client_chat_manager.h b/ryzom/client/src/client_chat_manager.h
index 06792a50f..19afcab15 100644
--- a/ryzom/client/src/client_chat_manager.h
+++ b/ryzom/client/src/client_chat_manager.h
@@ -304,7 +304,7 @@ private :
 		uint8			ChatMode;
 		NLMISC::CEntityId	DynChatChanID;
 		// For Chat and Tell messages
-		ucstring		Content;
+		ucstring		Content; // FIXME: UTF-8 (serial)
 		// For Chat2 and Tell2 messages
 		uint32			PhraseId;
 		// Use PhraseId or Content?
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index 3fea9a2a7..e64796b28 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -924,9 +924,7 @@ NLMISC_COMMAND(a, "Execute an admin command on you","<cmd> <arg>")
 	cmd = args[0];
 	for (uint i = 1; i < args.size(); i++)
 	{
-		// temporary fix for utf-8
-		// servers commands are not decoded so convert them to ansi
-		std::string tmp = ucstring::makeFromUtf8(args[i]).toString();
+		std::string tmp = args[i];
 
 		if (!arg.empty())
 			arg += ' ';
@@ -968,9 +966,7 @@ NLMISC_COMMAND(b, "Execute an admin command on your target","<cmd> <arg>")
 	cmd = args[0];
 	for (uint i = 1; i < args.size(); i++)
 	{
-		// temporary fix for utf-8
-		// servers commands are not decoded so convert them to ansi
-		std::string tmp = ucstring::makeFromUtf8(args[i]).toString();
+		std::string tmp = args[i];
 
 		if (!arg.empty())
 			arg += ' ';
@@ -1015,9 +1011,7 @@ NLMISC_COMMAND(c, "Execute an admin command on character name","<Character Name>
 	cmd = args[1];
 	for (uint i = 2; i < args.size(); i++)
 	{
-		// temporary fix for utf-8
-		// servers commands are not decoded so convert them to ansi
-		std::string tmp = ucstring::makeFromUtf8(args[i]).toString();
+		std::string tmp = args[i];
 
 		if (!arg.empty())
 			arg += ' ';
@@ -3863,7 +3857,7 @@ NLMISC_COMMAND(testLongBubble, "To display a bubble with a long text", "<entity>
 	fromString(args[0], entityId);
 
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	ucstring text("test\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\n");
+	string text("test\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\ntest\n");
 	uint duration = CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionTimeoutBubbles).getValSInt32();
 
 	CEntityCL *entity = EntitiesMngr.entity(entityId);
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 6e5276755..6054b6a07 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -360,7 +360,7 @@ bool connection (const string &cookie, const string &fsaddr)
 
 	// Preload continents
 	{
-		const ucstring nmsg("Loading continents...");
+		const string nmsg("Loading continents...");
 		ProgressBar.newMessage (ClientCfg.buildLoadingString(nmsg) );
 		ContinentMngr.preloadSheets();
 
@@ -398,7 +398,7 @@ bool connection (const string &cookie, const string &fsaddr)
 	// Init out game
 	setOutGameFullScreen();
 
-	ucstring nmsg("Initializing outgame...");
+	string nmsg("Initializing outgame...");
 	ProgressBar.newMessage (ClientCfg.buildLoadingString(nmsg) );
 	pIM->initOutGame();
 
@@ -542,7 +542,7 @@ bool reconnection()
 
 	// Preload continents
 	{
-		const ucstring nmsg ("Loading continents...");
+		const string nmsg ("Loading continents...");
 		ProgressBar.newMessage (ClientCfg.buildLoadingString(nmsg) );
 		ContinentMngr.preloadSheets();
 	}
diff --git a/ryzom/client/src/continent.h b/ryzom/client/src/continent.h
index 7e0d599b4..f48b4b043 100644
--- a/ryzom/client/src/continent.h
+++ b/ryzom/client/src/continent.h
@@ -109,7 +109,7 @@ public:
 	};
 
 	NLMISC::CVector2f	Pos; // Pos in local map
-	ucstring			Title;
+	ucstring			Title; // FIXME: UTF-8 (serial)
 	uint8				Type;
 
 	//User LandMarks Colors
diff --git a/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
index 99caacf45..80d64c35a 100644
--- a/ryzom/client/src/entities.cpp
+++ b/ryzom/client/src/entities.cpp
@@ -2268,7 +2268,7 @@ void CEntityManager::dumpXML(class NLMISC::IStream &f)
 					f.xmlPushBegin("Name");
 					// Set a property name
 					f.xmlSetAttrib ("string");
-					ucstring n = _Entities[i]->getEntityName();
+					string n = _Entities[i]->getEntityName();
 					f.serial(n);
 					// Close the new node header
 					f.xmlPushEnd();
@@ -2361,11 +2361,11 @@ CEntityCL *CEntityManager::getEntityByName (uint32 stringId) const
 }
 
 //-----------------------------------------------
-CEntityCL *CEntityManager::getEntityByKeywords (const std::vector<ucstring> &keywords, bool onlySelectable) const
+CEntityCL *CEntityManager::getEntityByKeywords (const std::vector<string> &keywords, bool onlySelectable) const
 {
 	if (keywords.empty()) return NULL;
 
-	std::vector<ucstring> lcKeywords;
+	std::vector<string> lcKeywords;
 	lcKeywords.resize(keywords.size());
 	for(uint k = 0; k < keywords.size(); k++)
 	{
@@ -2382,14 +2382,13 @@ CEntityCL *CEntityManager::getEntityByKeywords (const std::vector<ucstring> &key
 
 		if (onlySelectable && !_Entities[i]->properties().selectable()) continue;
 
-		ucstring lcName;
-		lcName = toLower(_Entities[i]->getDisplayName());
+		string lcName = toLower(_Entities[i]->getDisplayName());
 		if (lcName.empty()) continue;
 
 		bool match = true;
 		for (uint k = 0; k < lcKeywords.size(); ++k)
 		{
-			if (lcName.find(lcKeywords[k]) == ucstring::npos)
+			if (lcName.find(lcKeywords[k]) == string::npos)
 			{
 				match = false;
 				break;
@@ -2418,9 +2417,9 @@ CEntityCL *CEntityManager::getEntityByKeywords (const std::vector<ucstring> &key
 }
 
 //-----------------------------------------------
-CEntityCL *CEntityManager::getEntityByName (const ucstring &name, bool caseSensitive, bool complete) const
+CEntityCL *CEntityManager::getEntityByName (const string &name, bool caseSensitive, bool complete) const
 {
-	ucstring source = name;
+	string source = name;
 	const uint size = (uint)source.size();
 	if (!caseSensitive)
 	{
@@ -2438,7 +2437,7 @@ CEntityCL *CEntityManager::getEntityByName (const ucstring &name, bool caseSensi
 	{
 		if(_Entities[i])
 		{
-			ucstring value = _Entities[i]->getDisplayName();
+			string value = _Entities[i]->getDisplayName();
 			bool foundEntity = false;
 
 			uint j;
diff --git a/ryzom/client/src/entities.h b/ryzom/client/src/entities.h
index 48707d5cf..d6d286ced 100644
--- a/ryzom/client/src/entities.h
+++ b/ryzom/client/src/entities.h
@@ -308,13 +308,13 @@ public:
 	  * \param caseSensitive type of test to perform
 	  * \param complete : if true, the name must match the full name of the entity.
 	  */
-	CEntityCL *getEntityByName (const ucstring &name, bool caseSensitive, bool complete) const;
+	CEntityCL *getEntityByName (const std::string &name, bool caseSensitive, bool complete) const;
 	/**
 	 * Case insensitive match against entity name. All listed keywords must match.
 	 * \param keywords to match
 	 * \param onlySelectable : if true, match only entity that can be selected
 	 */
-	CEntityCL *getEntityByKeywords (const std::vector<ucstring> &keywords, bool onlySelectable) const;
+	CEntityCL *getEntityByKeywords (const std::vector<std::string> &keywords, bool onlySelectable) const;
 	CEntityCL *getEntityBySheetName (const std::string &sheet) const;
 	/// Get an entity by dataset index. Returns NULL if the entity is not found.
 	CEntityCL *getEntityByCompressedIndex(TDataSetIndex compressedIndex) const;
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 5071f771d..77d1e3c65 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2276,11 +2276,11 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 
 	// check if there is any replacement tag in the string
 	string::size_type p1 = _EntityName.find('$');
-	if (p1 != ucstring::npos)
+	if (p1 != string::npos)
 	{
 		// we found a replacement point begin tag
 		string::size_type p2 = _EntityName.find('$', p1+1);
-		if (p2 != ucstring::npos)
+		if (p2 != string::npos)
 		{
 			// ok, we have the second replacement point!
 			// extract the replacement id
@@ -2300,7 +2300,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 			// Sometimes translation contains another title
 			{
 				string::size_type pos = replacement.find('$');
-				if (pos != ucstring::npos)
+				if (pos != string::npos)
 				{
 					_EntityName = _EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(sn.substr(0, pos));
 					string::size_type pos2 = replacement.find('$', pos + 1);
@@ -2318,7 +2318,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 				_EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(_EntityName.substr(0, p1));	// + _Name.substr(p2+1)
 				// Get extended name
 				_NameEx = replacement;
-				newtitle = _NameEx.toUtf8();
+				newtitle = _NameEx;
 			}
 			CHARACTER_TITLE::ECharacterTitle titleEnum = CHARACTER_TITLE::toCharacterTitle( _TitleRaw );
 			if ( titleEnum >= CHARACTER_TITLE::BeginGmTitle && titleEnum <= CHARACTER_TITLE::EndGmTitle )
@@ -2372,7 +2372,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 std::string CEntityCL::getTitleFromName(const std::string &name)
 {
 	std::string::size_type p1 = name.find('$');
-	if (p1 != ucstring::npos)
+	if (p1 != string::npos)
 	{
 		std::string::size_type p2 = name.find('$', p1 + 1);
 		if (p2 != std::string::npos)
@@ -2388,14 +2388,14 @@ std::string CEntityCL::getTitleFromName(const std::string &name)
 std::string CEntityCL::removeTitleFromName(const std::string &name)
 {
 	std::string::size_type p1 = name.find('$');
-	if (p1 == ucstring::npos)
+	if (p1 == string::npos)
 	{
 		return name;
 	}
 	else
 	{
 		std::string::size_type p2 = name.find('$', p1 + 1);
-		if (p2 != ucstring::npos)
+		if (p2 != string::npos)
 		{
 			return name.substr(0, p1) + name.substr(p2 + 1);
 		}
diff --git a/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
index 0f1296780..04689a3ac 100644
--- a/ryzom/client/src/entity_cl.h
+++ b/ryzom/client/src/entity_cl.h
@@ -638,7 +638,7 @@ public:
 
 	// Add hit points gain/lost by this entity.
 	void addHPOutput(sint16 hp, NLMISC::CRGBA color, float dt=0.0f) { if(_HPModifiers.size()<20) _HPModifiers.push_back(CHPModifier(hp,color,dt));}
-	void addHPOutput(const ucstring &text, NLMISC::CRGBA color, float dt=0.0f) { if(_HPModifiers.size()<20 && !text.empty()) _HPModifiers.push_back(CHPModifier(text,color,dt));}
+	void addHPOutput(const std::string &text, NLMISC::CRGBA color, float dt=0.0f) { if(_HPModifiers.size()<20 && !text.empty()) _HPModifiers.push_back(CHPModifier(text,color,dt));}
 
 	/// Return the entity sheet scale. (return 1.0 if there is any problem).
 	virtual float getSheetScale() const {return 1.0f;}
@@ -944,7 +944,7 @@ protected:
 	bool							_HasReservedTitle;
 
 	// Extended Name
-	ucstring						_NameEx;
+	std::string						_NameEx;
 	// String ID
 	uint32							_NameId;
 	// Primitive used for the collision in PACS
@@ -995,10 +995,10 @@ protected:
 		CHPModifier() {}
 		virtual ~CHPModifier() {}
 		CHPModifier (sint16 value, NLMISC::CRGBA color, float dt) : Value(value), Color(color), DeltaT(dt) {}
-		CHPModifier (const ucstring &text, NLMISC::CRGBA color, float dt) : Text(text), Color(color), DeltaT(dt) {}
+		CHPModifier (const std::string &text, NLMISC::CRGBA color, float dt) : Text(text), Color(color), DeltaT(dt) {}
 
 		sint16			Value;		// If Text.empty(), take the Value
-		ucstring		Text;
+		std::string		Text;
 		NLMISC::CRGBA	Color;
 		float			DeltaT;
 	};
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index c250aec95..fa3d9720d 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -927,7 +927,7 @@ retryJoinEdit:
 			}
 		}
 		pIM->messageBoxWithHelp(
-			CI18N::get(requestRetToMainland ? "uiSessionVanishedFarTP" : "uiSessionUnreachable") + ucstring(errorMsg),
+			CI18N::get(requestRetToMainland ? "uiSessionVanishedFarTP" : "uiSessionUnreachable") + errorMsg,
 			letReturnToCharSelect ? "ui:outgame:charsel" : "ui:interface");
 
 		// Info in the log
@@ -1117,7 +1117,7 @@ void CFarTP::disconnectFromPreviousShard()
 
 		// Start progress bar and display background
 		ProgressBar.reset (BAR_STEP_TP);
-		ucstring nmsg("Loading...");
+		string nmsg("Loading...");
 		ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 		ProgressBar.progress(0);
 
diff --git a/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
index e813912df..7141ad62f 100644
--- a/ryzom/client/src/forage_source_cl.cpp
+++ b/ryzom/client/src/forage_source_cl.cpp
@@ -623,7 +623,7 @@ void CForageSourceCL::displayModifiers()
 		{
 			uint16 qttyDelta = ((uint16)mod.Value) & 0xFF;
 			uint16 qlty = ((uint16)mod.Value) >> 8;
-			ucstring hpModifier = ucstring(toString("%u ", qttyDelta) + CI18N::get("uittQualityAbbrev") + toString(" %u", qlty));
+			string hpModifier = toString("%u ", qttyDelta) + CI18N::get("uittQualityAbbrev") + toString(" %u", qlty);
 			double t = TimeInSec-mod.Time;
 			// Compute the position for the Modifier.
 			CVector		pos= namePos + CVector(0.0f, 0.0f, 0.3f+(float)t*1.0f/totalDuration);
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index 41c924baf..b9e701e92 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -262,7 +262,7 @@ char *XmlStrdup4NeL (const char *str)
 #ifdef NL_OS_WINDOWS
 
 
-static ucstring CurrentErrorMessage;
+static std::wstring CurrentErrorMessage;
 
 static INT_PTR CALLBACK ExitClientErrorDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM /* lParam */)
 {
@@ -338,7 +338,7 @@ void ExitClientError (const char *format, ...)
 	}
 
 #ifdef NL_OS_WINDOWS
-	CurrentErrorMessage.fromUtf8(str);
+	CurrentErrorMessage = NLMISC::utf8ToWide(str);
 	DialogBox(HInstance, MAKEINTRESOURCE(IDD_ERROR_HELP_MESSAGE_BOX), NULL, ExitClientErrorDialogProc);
 	/*
 		ucstring ucstr;
@@ -937,7 +937,7 @@ void prelogInit()
 		initDebugMemory();
 
 		// Load the application configuration.
-		ucstring nmsg("Loading config file...");
+		string nmsg("Loading config file...");
 		ProgressBar.newMessage (nmsg);
 
 		ClientCfg.init(ConfigFileName);
@@ -1532,7 +1532,7 @@ void postlogInit()
 	Driver->clearBuffers(CRGBA::Black);
 	Driver->swapBuffers();
 	CNiceInputAuto niceInputs;
-	ucstring nmsg;
+	string nmsg;
 
 	try
 	{
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index e2566e48f..0714d1553 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -469,7 +469,7 @@ void initMainLoop()
 
 	// Progress bar for init_main_loop()
 	ProgressBar.reset (BAR_STEP_INIT_MAIN_LOOP);
-	ucstring nmsg;
+	string nmsg;
 
 	FPU_CHECKER_ONCE
 
@@ -1017,7 +1017,7 @@ void initMainLoop()
 	// PreLoad Fauna and Characters
 	if (!ClientCfg.Light && ClientCfg.PreCacheShapes)
 	{
-		ucstring nmsg("Loading character shapes ...");
+		string nmsg("Loading character shapes ...");
 		ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 
 
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 3b3738c38..ee243a5a2 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -192,9 +192,9 @@ public:
 		CEntityCL *selection = EntitiesMngr.entity(UserEntity->selection());
 		if (selection && selection->Type == CEntityCL::Player)
 		{
-			ucstring name = CEntityCL::removeTitleAndShardFromName(selection->getEntityName());
+			string name = CEntityCL::removeTitleAndShardFromName(selection->getEntityName());
 			if (name.empty()) return;
-			CAHManager::getInstance()->runActionHandler("enter_tell", pCaller, "player=" + name.toString());
+			CAHManager::getInstance()->runActionHandler("enter_tell", pCaller, "player=" + name);
 		}
 	}
 protected:
@@ -1963,7 +1963,7 @@ public:
 
 					// Sometimes translation contains another title
 					string::size_type pos = copyInout.find('$');
-					if (pos != ucstring::npos)
+					if (pos != string::npos)
 					{
 						copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
 					}
@@ -2038,8 +2038,8 @@ class CActionHandlerSetTargetName : public IActionHandler
 		{
 			sint32 nSlot = (sint32)evValue.getInteger();
 
-			ucstring TargetName;
-			ucstring TargetTitle;
+			string TargetName;
+			string TargetTitle;
 
 			// Get from nSlot
 			if (nSlot > -1)
@@ -2074,9 +2074,9 @@ class CActionHandlerSetTargetName : public IActionHandler
 			// Set to target
 			CInterfaceExprValue evUCStr;
 			TargetName = STRING_MANAGER::CStringManagerClient::getLocalizedName(TargetName);
-			evUCStr.setString(TargetName.toUtf8());
+			evUCStr.setString(TargetName);
 			CInterfaceLink::setTargetProperty(sNameTarget, evUCStr);
-			evUCStr.setString(TargetTitle.toUtf8());
+			evUCStr.setString(TargetTitle);
 			CInterfaceLink::setTargetProperty(sTitleTarget, evUCStr);
 		}
 	}
@@ -2424,28 +2424,27 @@ class CAHTarget : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
 	{
-		ucstring entityName;
-		entityName.fromUtf8(getParam(Params, "entity"));
+		string entityName = getParam(Params, "entity");
 		if (entityName.empty()) return;
 
 		string completeMatch = getParam(Params, "prefer_complete_match");
 		bool quiet = (getParam (Params, "quiet") == "true");
 
-		vector<ucstring> keywords;
-		NLMISC::splitUCString(entityName, ucstring(" "), keywords);
-		if (!keywords.empty() && keywords[0].size() > 0 && keywords[0][0] == (ucchar)'"')
+		vector<string> keywords;
+		NLMISC::splitString(entityName, " ", keywords);
+		if (!keywords.empty() && keywords[0].size() > 0 && keywords[0][0] == '"')
 		{
 			// entity name is in quotes, do old style match with 'starts with' filter
 			// search for optional second parameter from old command for prefer_complete_match param
 			keywords.clear();
 
-			ucstring::size_type lastOf = entityName.rfind(ucstring("\""));
+			string::size_type lastOf = entityName.rfind("\"");
 			if (lastOf == 0)
-				lastOf = ucstring::npos;
+				lastOf = string::npos;
 
 			// override the value only when there is no 'prefer_complete_match' parameter set
 			if (completeMatch.empty() && lastOf < entityName.size())
-				completeMatch = trim(entityName.substr(lastOf+1).toUtf8());
+				completeMatch = trim(entityName.substr(lastOf+1));
 
 			entityName = entityName.substr(1, lastOf-1);
 		}
@@ -2474,7 +2473,7 @@ class CAHTarget : public IActionHandler
 		if (entity == NULL)
 		{
 			//Get the entity with a sheetName
-			entity = EntitiesMngr.getEntityBySheetName(entityName.toUtf8());
+			entity = EntitiesMngr.getEntityBySheetName(entityName);
 		}
 
 		if (entity && entity->properties().selectable() && !entity->getDisplayName().empty())
@@ -2758,8 +2757,7 @@ class CAHAssist : public IActionHandler
 	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
 	{
 		// Get the entity name to target
-		ucstring entityName;
-		entityName.fromUtf8 (getParam (Params, "entity"));
+		string entityName = getParam (Params, "entity");
 		if (!entityName.empty())
 		{
 			// Get the entity
@@ -4026,7 +4024,7 @@ REGISTER_ACTION_HANDLER(CHandlerSelectProtectedSlot, "select_protected_slot");
 // ***************************************************************************
 // Common code
 //static	void	fillPlayerBarText(ucstring &str, const string &dbScore, const string &dbScoreMax, const string &ttFormat)
-static	void	fillPlayerBarText(ucstring &str, const string &dbScore, SCORES::TScores score, const string &ttFormat)
+static	void	fillPlayerBarText(std::string &str, const string &dbScore, SCORES::TScores score, const string &ttFormat)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CCDBNodeLeaf		*node;
@@ -4056,10 +4054,10 @@ public:
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
-		ucstring	str;
+		string	str;
 		fillPlayerBarText(str, "HP", SCORES::hit_points, "uittPlayerLifeFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTLife, "player_tt_life");
@@ -4073,10 +4071,10 @@ public:
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
-		ucstring	str;
+		string	str;
 		fillPlayerBarText(str, "STA", SCORES::stamina, "uittPlayerStaminaFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTStamina, "player_tt_stamina");
@@ -4090,10 +4088,10 @@ public:
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
-		ucstring	str;
+		string	str;
 		fillPlayerBarText(str, "SAP", SCORES::sap, "uittPlayerSapFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTSap, "player_tt_sap");
@@ -4107,10 +4105,10 @@ public:
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
-		ucstring	str;
+		string	str;
 		fillPlayerBarText(str, "FOCUS", SCORES::focus, "uittPlayerFocusFormat");
 
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerPlayerTTFocus, "player_tt_focus");
@@ -4137,10 +4135,10 @@ public:
 			maxVal= node->getValue32();
 
 		// Replace in the formated text
-		ucstring	str= CI18N::get("uittBulkFormat");
+		string	str= CI18N::get("uittBulkFormat");
 		strFindReplace(str, "%v", toString("%.2f", val) );
 		strFindReplace(str, "%m", toString(maxVal) );
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerGetTTBulk, "get_tt_bulk");
@@ -4552,7 +4550,7 @@ public:
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 			{
-				ucstring ucstr;
+				ucstring ucstr; // FIXME: UTF-8 (serial)
 				ucstr.fromUtf8(sCustomPhrase);
 
 				if( sCustomPhrase == "none" )
diff --git a/ryzom/client/src/interface_v3/flying_text_manager.cpp b/ryzom/client/src/interface_v3/flying_text_manager.cpp
index 3f2e510e1..37daf2f9e 100644
--- a/ryzom/client/src/interface_v3/flying_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/flying_text_manager.cpp
@@ -121,7 +121,7 @@ void	CFlyingTextManager::releaseInGame()
 }
 
 // ***************************************************************************
-void	CFlyingTextManager::addFlyingText(void *key, const ucstring &text, const NLMISC::CVector &pos, CRGBA color, float scale, sint offsetX)
+void	CFlyingTextManager::addFlyingText(void *key, const string &text, const NLMISC::CVector &pos, CRGBA color, float scale, sint offsetX)
 {
 	// key exist in the map?
 	TInSceneCurrentMap::iterator	it= _InSceneCurrent.find(key);
@@ -144,7 +144,7 @@ void	CFlyingTextManager::addFlyingText(void *key, const ucstring &text, const NL
 	gi.UsedThisFrame= true;
 
 	// update infos
-	gi.ViewText->setText(text.toUtf8());
+	gi.ViewText->setText(text);
 	gi.ViewText->setColor(color);
 	gi.GroupInScene->Position= pos;
 	gi.GroupInScene->Scale= scale;
diff --git a/ryzom/client/src/interface_v3/flying_text_manager.h b/ryzom/client/src/interface_v3/flying_text_manager.h
index 95746b6c0..14e24c887 100644
--- a/ryzom/client/src/interface_v3/flying_text_manager.h
+++ b/ryzom/client/src/interface_v3/flying_text_manager.h
@@ -49,7 +49,7 @@ public:
 	/** add a flying text at a position (called during entity display). NB: may fail if no more free groups
 	 *	\param offsetx: screen offsetx of the group in scene
 	 */
-	void	addFlyingText(void *key, const ucstring &text, const NLMISC::CVector &pos, NLMISC::CRGBA color, float scale, sint offsetX=0);
+	void	addFlyingText(void *key, const std::string &text, const NLMISC::CVector &pos, NLMISC::CRGBA color, float scale, sint offsetX=0);
 	/// release no more used flying text (called by CEntityManager at each draw)
 	void	releaseNotUsedFlyingText();
 
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 06f81f762..35cc56ebe 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -488,7 +488,7 @@ void CGroupInSceneBubbleManager::update ()
 
 // ***************************************************************************
 
-CGroupInSceneBubble *CGroupInSceneBubbleManager::newBubble (const ucstring &text)
+CGroupInSceneBubble *CGroupInSceneBubbleManager::newBubble (const string &text)
 {
 	if (!text.empty() && !_Bubbles.empty())
 	{
@@ -576,7 +576,7 @@ void CGroupInSceneBubbleManager::addSkillPopup (uint skillId, sint delta, uint t
 
 // ***************************************************************************
 
-void CGroupInSceneBubbleManager::addMessagePopup (const ucstring &message, CRGBA color, uint time)
+void CGroupInSceneBubbleManager::addMessagePopup (const string &message, CRGBA color, uint time)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
@@ -599,7 +599,7 @@ void CGroupInSceneBubbleManager::addMessagePopup (const ucstring &message, CRGBA
 		CViewText *pViewName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewName != NULL)
 		{
-			pViewName->setText (message.toUtf8());
+			pViewName->setText (message);
 			pViewName->setColor (color);
 		}
 
@@ -625,7 +625,7 @@ void CGroupInSceneBubbleManager::addMessagePopup (const ucstring &message, CRGBA
 
 // ***************************************************************************
 
-void CGroupInSceneBubbleManager::addMessagePopupCenter (const ucstring &message, CRGBA color, uint time)
+void CGroupInSceneBubbleManager::addMessagePopupCenter (const string &message, CRGBA color, uint time)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
@@ -648,7 +648,7 @@ void CGroupInSceneBubbleManager::addMessagePopupCenter (const ucstring &message,
 		CViewText *pViewName = dynamic_cast<CViewText*>(group->getView("name"));
 		if (pViewName != NULL)
 		{
-			pViewName->setTextFormatTaged(message.toUtf8());
+			pViewName->setTextFormatTaged(message);
 			pViewName->setColor (color);
 		}
 
@@ -757,9 +757,9 @@ CGroupInSceneBubbleManager::CPopupContext *CGroupInSceneBubbleManager::buildCont
 
 // ***************************************************************************
 
-void CGroupInSceneBubbleManager::addContextHelp (const ucstring &message, const string &targetName, uint time)
+void CGroupInSceneBubbleManager::addContextHelp (const string &message, const string &targetName, uint time)
 {
-	std::string finalMessage = message.toUtf8();
+	std::string finalMessage = message;
 	CInterfaceElement *target;
 	CPopupContext *context = CGroupInSceneBubbleManager::buildContextHelp ("context_help_", targetName, target, time);
 	if (context)
@@ -835,7 +835,7 @@ void CGroupInSceneBubbleManager::ignoreContextHelp (CInterfaceGroup *groupToRemo
 
 // ***************************************************************************
 
-void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const ucstring &ucsText, uint bubbleTimer)
+void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const std::string &ucsText, uint bubbleTimer)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
@@ -1065,9 +1065,7 @@ void CGroupInSceneBubbleManager::webIgChatOpen (uint32 nBotUID, string text, con
 
 	// Update the bubble's texts
 
-	ucstring ucText;
-	ucText.fromUtf8(text);
-	bubble->setText(ucText);
+	bubble->setText(text);
 	id = bubble->getId() + ":header_opened:window:";
 	CViewText *pVT;
 	CCtrlLink *pCL;
@@ -1092,9 +1090,8 @@ void CGroupInSceneBubbleManager::webIgChatOpen (uint32 nBotUID, string text, con
 		if (pVT != NULL)
 		{
 			pVT->setActive(true);
-			ucstring optionText;
-			optionText.fromUtf8(strs[j]);
-			pVT->setText(optionText.toUtf8());
+			string optionText = strs[j];
+			pVT->setText(optionText);
 			pCL = dynamic_cast<CCtrlLink*>(bubble->getElement(id+"optb"+toString(j)));
 			if (pCL != NULL)
 			{
@@ -1425,19 +1422,19 @@ void CGroupInSceneBubble::unlink ()
 
 // ***************************************************************************
 
-void CGroupInSceneBubble::setText (const ucstring &text)
+void CGroupInSceneBubble::setText (const string &text)
 {
 	if (text.empty()) return;
 	_TextParts.clear();
 
 	// Look for "{break}" in the message
-	ucstring finalMsg = text;
-	ucstring tmpMsg;
+	string finalMsg = text;
+	string tmpMsg;
 
 	for(;;)
 	{
-		ucstring::size_type index = finalMsg.find (ucstring("{break}"));
-		if (index == ucstring::npos) break;
+		string::size_type index = finalMsg.find ("{break}");
+		if (index == string::npos) break;
 		tmpMsg = finalMsg.substr (0, index);
 		if (!tmpMsg.empty())
 			_TextParts.push_back(tmpMsg);
@@ -1478,14 +1475,14 @@ void CGroupInSceneBubble::skip()
 
 // ***************************************************************************
 
-void CGroupInSceneBubble::setRawText (const ucstring &text)
+void CGroupInSceneBubble::setRawText (const string &text)
 {
 	_CanBeShown = !text.empty();
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CInterfaceElement *pVTIE = CWidgetManager::getInstance()->getElementFromId(getId()+":header_opened:window:text");
 	CViewText *pVT= dynamic_cast<CViewText*>(pVTIE);
 	if (pVT != NULL)
-		pVT->setText(text.toUtf8());
+		pVT->setText(text);
 }
 
 // ***************************************************************************
@@ -1584,8 +1581,7 @@ class CHandlerCharacterBubble : public IActionHandler
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		uint entityId;
 		fromString(getParam (sParams, "entity"), entityId);
-		ucstring text;
-		text.fromUtf8(getParam (sParams, "text"));
+		string text = getParam (sParams, "text");
 		string sTime = getParam (sParams, "time");
 		uint duration;
 		if (sTime.empty())
@@ -1633,10 +1629,8 @@ class CHandlerMessagePopup : public IActionHandler
 	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		ucstring text0;
-		text0.fromUtf8(getParam (sParams, "text0").c_str());
-		ucstring text1;
-		text1.fromUtf8(getParam (sParams, "text1").c_str());
+		string text0 = getParam (sParams, "text0");
+		string text1 = getParam (sParams, "text1");
 		string sTime = getParam (sParams, "time");
 		uint duration;
 		if (sTime.empty())
@@ -1660,8 +1654,7 @@ class CHandlerContextHelp : public IActionHandler
 
 		string targetName = getParam (sParams, "target");
 		string text = getParam (sParams, "text");
-		ucstring itext;
-		itext.fromUtf8 (getParam (sParams, "itext"));
+		string itext = getParam (sParams, "itext");
 		if (itext.empty())
 			itext = CI18N::get(text);
 
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.h b/ryzom/client/src/interface_v3/group_in_scene_bubble.h
index 288853488..f341153fa 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.h
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.h
@@ -39,19 +39,19 @@ public:
 	void update ();
 
 	// Get a CGroupBubble
-	class CGroupInSceneBubble *newBubble (const ucstring &text);
+	class CGroupInSceneBubble *newBubble (const std::string &text);
 
 	// Add a message popup. if 0, get the OptionTimeoutMessages
-	void addMessagePopup (const ucstring &message, NLMISC::CRGBA col = CRGBA::White, uint time = 0);
+	void addMessagePopup (const std::string &message, NLMISC::CRGBA col = CRGBA::White, uint time = 0);
 
 	// The same as previous but centered in the screen. if 0, get the OptionTimeoutMessages
-	void addMessagePopupCenter (const ucstring &message, NLMISC::CRGBA col = CRGBA::White, uint time = 0);
+	void addMessagePopupCenter (const std::string &message, NLMISC::CRGBA col = CRGBA::White, uint time = 0);
 
 	// Add a skill popup
 	void addSkillPopup (uint skillId, sint delta, uint time);
 
 	// Add a context help with a string
-	void addContextHelp (const ucstring &message, const std::string &target, uint time);
+	void addContextHelp (const std::string &message, const std::string &target, uint time);
 
 	// Add a context help
 	void addContextHelpHTML (const std::string &filename, const std::string &target, uint time);
@@ -60,7 +60,7 @@ public:
 	void ignoreContextHelp (CInterfaceGroup *groupToRemove);
 
 	// Open a bubble chat (with next and skip button)
-	void chatOpen (uint32 nUID, const ucstring &ucsText, uint bubbleTimer = 0);
+	void chatOpen (uint32 nUID, const std::string &ucsText, uint bubbleTimer = 0);
 
 	// Dynamic Chat
 
@@ -199,7 +199,7 @@ public:
 	void unlink ();
 
 	// Set text
-	void setText (const ucstring &text);
+	void setText (const std::string &text);
 
 	// Called from action handler
 	void next();
@@ -217,7 +217,7 @@ public:
 
 private:
 
-	void setRawText (const ucstring &text);
+	void setRawText (const std::string &text);
 	void displayNextAndSkip (bool show);
 
 private:
@@ -233,7 +233,7 @@ private:
 	CCharacterCL	*_Character;
 
 	// Multi part bubble
-	std::vector<ucstring>	_TextParts;
+	std::vector<std::string>	_TextParts;
 	uint32					_CurrentPart;
 };
 
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index 881e14431..299972b15 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -1124,7 +1124,7 @@ bool mainLoop()
 			//
 			#define BAR_STEP_TP 2
 			ProgressBar.reset (BAR_STEP_TP);
-			ucstring nmsg("Loading...");
+			string nmsg("Loading...");
 			ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 			ProgressBar.progress(0);
 			ContinentMngr.select(UserEntity->pos(), ProgressBar);
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index cdb4261c0..d412fa7c8 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -1527,7 +1527,7 @@ void impulseTPCommon2(NLMISC::CBitMemStream &impulse, bool hasSeason)
 
 	// start progress bar and display background
 	ProgressBar.reset (BAR_STEP_TP);
-	ucstring nmsg("Loading...");
+	string nmsg("Loading...");
 	ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 
 
@@ -3463,7 +3463,7 @@ void impulseCombatFlyingHpDelta(NLMISC::CBitMemStream &impulse)
 	CRGBA color((uint8)(rgba>>24&255), (uint8)(rgba>>16&255), (uint8)(rgba>>8&255), (uint8)(rgba&255));
 	CEntityCL *entity = EntitiesMngr.getEntityByCompressedIndex(entityID);
 	if (entity)
-		entity->addHPOutput(ucstring(toString("%d", hpDelta)), color);
+		entity->addHPOutput(toString("%d", hpDelta), color);
 }
 
 void impulseCombatFlyingTextItemSpecialEffectProc(NLMISC::CBitMemStream &impulse)
@@ -3477,7 +3477,7 @@ void impulseCombatFlyingTextItemSpecialEffectProc(NLMISC::CBitMemStream &impulse
 	impulse.serial(effect);
 	impulse.serial(param);
 	CRGBA color((uint8)(rgba>>24&255), (uint8)(rgba>>16&255), (uint8)(rgba>>8&255), (uint8)(rgba&255));
-	ucstring text = CI18N::get(toString("uiItemSpecialEffectFlyingText%s", ITEM_SPECIAL_EFFECT::toString((ITEM_SPECIAL_EFFECT::TItemSpecialEffect)effect).c_str()));
+	string text = CI18N::get(toString("uiItemSpecialEffectFlyingText%s", ITEM_SPECIAL_EFFECT::toString((ITEM_SPECIAL_EFFECT::TItemSpecialEffect)effect).c_str()));
 	strFindReplace(text, "%param", toString("%d", param));
 	CEntityCL *entity = EntitiesMngr.getEntityByCompressedIndex(entityID);
 	if (entity)
@@ -3493,7 +3493,7 @@ void impulseCombatFlyingText(NLMISC::CBitMemStream &impulse)
 	COMBAT_FLYING_TEXT::TCombatFlyingText type = (COMBAT_FLYING_TEXT::TCombatFlyingText)tmp;
 
 	CRGBA color(255, 255, 255);
-	ucstring text("");
+	string text("");
 	float dt = 0.0f;
 
 	switch (type)
diff --git a/ryzom/client/src/r2/dmc/client_edition_module.cpp b/ryzom/client/src/r2/dmc/client_edition_module.cpp
index 73e231d4a..0898711eb 100644
--- a/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -1868,7 +1868,7 @@ void CClientEditionModule::onTpPositionSimulated(NLNET::IModuleProxy * /* sender
 	beginLoading (LoadingBackground);
 	#define BAR_STEP_TP 2 // fixme : this define is duplicated....
 	ProgressBar.reset (BAR_STEP_TP);
-	ucstring nmsg("Loading...");
+	string nmsg("Loading...");
 	ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 	ProgressBar.progress(0);
 	ContinentMngr.select(dest, ProgressBar);
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index e29f78b6f..864c80c1f 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -64,11 +64,9 @@ public:
 	void flushStringCache();
 
 	bool getString(uint32 stringId, std::string &result);
-	// bool getString(uint32 stringId, ucstring &result) { std::string temp; bool res = getString(stringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
 	void waitString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitString(uint32 stringId, IStringWaitCallback *pcallback);
 	bool getDynString(uint32 dynStringId, std::string &result);
-	// bool getDynString(uint32 dynStringId, ucstring &result) { std::string temp; bool res = getString(dynStringId, temp); result.fromUtf8(temp); return res; } // FIXME: UTF-8
 	void waitDynString(uint32 stringId, const IStringWaiterRemover *premover, std::string *result);
 	void waitDynString(uint32 stringId, IStringWaitCallback *pcallback);
 
diff --git a/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp b/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
index 5e46d9923..3568cf7d2 100644
--- a/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
+++ b/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
@@ -159,6 +159,16 @@ bool	CGenericXmlMsgHeaderManager::pushNameToStream(const string &msgName, CBitMe
 	return res;
 }
 
+//
+bool	CGenericXmlMsgHeaderManager::pushNameToStream(const char *msgName, CBitMemStream &strm)
+{
+	bool res = (_Root->select(msgName, strm) != NULL);
+
+	if (!res) nlwarning("pushNameToStream failed: Unknown message name '%s'", msgName);
+
+	return res;
+}
+
 //
 void	CGenericXmlMsgHeaderManager::popNameFromStream(string &resultName, CBitMemStream &strm)
 {
diff --git a/ryzom/common/src/game_share/generic_xml_msg_mngr.h b/ryzom/common/src/game_share/generic_xml_msg_mngr.h
index a6a6a7167..45a89ec8c 100644
--- a/ryzom/common/src/game_share/generic_xml_msg_mngr.h
+++ b/ryzom/common/src/game_share/generic_xml_msg_mngr.h
@@ -231,6 +231,14 @@ public:
 	 */
 	bool	pushNameToStream(const std::string &msgName, NLMISC::CBitMemStream &strm);
 
+	/**
+	* Convert and write a Message Name into a stream.
+	* \param string msgName : Message Name to convert and write into the stream.
+	* \param CBitMemStream strm : the stream to receive the Message Name.
+	* \return bool : 'false' if the method cannot write the message Name into the stream (probably because de message name is wrong).
+	*/
+	bool	pushNameToStream(const char *msgName, NLMISC::CBitMemStream &strm);
+
 	/**
 	 * Convert and return the Message Name from a stream.
 	 * \param string resultName: The result for the Message Name.

From e2afa4db5bcd6ddbd91fa011f5755b1df78ea863 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 14:05:06 +0800
Subject: [PATCH 114/292] Sanitize downloaded HTML encoding

---
 nel/src/gui/group_html.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index d2c6d4cf3..508d60361 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -4177,7 +4177,8 @@ namespace NLGUI
 		}
 		else
 		{
-			renderHtmlString(content);
+			// Sanitize downloaded HTML UTF-8 encoding, and render
+			renderHtmlString(CUtfStringView(content).toUtf8(true));
 		}
 	}
 

From 32ce3667a32d7a762f25c862ed9fa2eac791be5a Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 14:24:31 +0800
Subject: [PATCH 115/292] Fix FV

---
 ryzom/client/src/commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index e64796b28..d756c938c 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -1344,7 +1344,7 @@ NLMISC_COMMAND(db, "Modify Database","<Property> <Value>")
 		else
 			pIM->displaySystemInfo(toString("DB '%s' does not exist.", args[0].c_str()));
 #else
-		pIM->displaySystemInfo(ucstring("Can't write to DB when in Final Version."));
+		pIM->displaySystemInfo("Can't write to DB when in Final Version.");
 #endif
 	}
 	else if (size == 1)

From 3a2922021e1d707869bc0261c4a4a3eb90a64167 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 14:53:20 +0800
Subject: [PATCH 116/292] Update cursor_functions.cpp

---
 ryzom/client/src/cursor_functions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/cursor_functions.cpp b/ryzom/client/src/cursor_functions.cpp
index 8773e84f7..0354e11f8 100644
--- a/ryzom/client/src/cursor_functions.cpp
+++ b/ryzom/client/src/cursor_functions.cpp
@@ -564,7 +564,7 @@ void checkUnderCursor()
 					
 					cursor->setCursor("r2ed_tool_select_move_over.tga");
 					InstanceId = instance_idx;
-					if (ContextCur.context("ARKITECT", 0.f, ucstring("Edit")))
+					if (ContextCur.context("ARKITECT", 0.f, "Edit"))
 						return;
 				}
 				else

From eac2aed175ad07180ff42fc3910e6998729784f6 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 14:58:23 +0800
Subject: [PATCH 117/292] Fix serial

---
 ryzom/client/src/interface_v3/group_compas.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index bee955ba4..a78c94681 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -75,11 +75,20 @@ void CCompassTarget::serial(NLMISC::IStream &f)
 		}
 	}
 	f.serialCheck(NELID("CTAR"));
-	f.serialVersion(0);
+	sint version = f.serialVersion(1);
 	f.serial(Pos);
 	// for the name, try to save a string identifier if possible, because language may be changed between
 	// save & reload
-	f.serial(Name);
+	if (version < 1)
+	{
+		ucstring name; // Serial old version
+		f.serial(name);
+		Name = name.toUtf8();
+	}
+	else
+	{
+		f.serial(Name);
+	}
 	std::string language = toLower(ClientCfg.LanguageCode);
 	f.serial(language);
 	f.serialEnum(_Type);

From 7249546db62bce93b6a46e94eff8cbb574581aba Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 16:20:21 +0800
Subject: [PATCH 118/292] Merge some things from atys branch

---
 CMakeLists.txt                       |  16 +-
 nel/include/nel/gui/ctrl_scroll.h    |   1 +
 nel/src/gui/ctrl_scroll.cpp          |  42 +++++
 nel/src/gui/widget_manager.cpp       |   4 +-
 ryzom/client/src/client_cfg.cpp      |   9 -
 ryzom/client/src/connection.cpp      | 246 ++++++++++++++++++++++++++-
 ryzom/client/src/events_listener.cpp |  19 +--
 7 files changed, 309 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54b133ac3..07fe11c8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 
 SET(RYZOM_VERSION_MAJOR 3)
-SET(RYZOM_VERSION_MINOR 5)
+SET(RYZOM_VERSION_MINOR 6)
 SET(RYZOM_VERSION_PATCH 0)
 
 #-----------------------------------------------------------------------------
@@ -175,6 +175,20 @@ IF(WITH_STATIC)
     IF(LIBLZMA_LIBRARIES)
       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
     ENDIF()
+
+    # under Linux and OS X, recent libxml2 versions are linked against libicu
+    # FIND_PACKAGE(Icu)
+    FIND_LIBRARY(ICU_LIBRARY icuuc)
+    IF(ICU_LIBRARY)
+       FIND_LIBRARY(ICU_DATA_LIBRARY icudata)
+       IF(ICU_LIBRARY)
+         MESSAGE(STATUS "ICU UC was found: ${ICU_LIBRARY}")
+       ELSE()
+         MESSAGE(STATUS "ICU UC was NOT found")
+       ENDIF()
+       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICU_DATA_LIBRARY} ${ICU_LIBRARY})
+    ENDIF()
+
   ENDIF()
 ENDIF()
 
diff --git a/nel/include/nel/gui/ctrl_scroll.h b/nel/include/nel/gui/ctrl_scroll.h
index 76827dd29..4052e6cea 100644
--- a/nel/include/nel/gui/ctrl_scroll.h
+++ b/nel/include/nel/gui/ctrl_scroll.h
@@ -177,6 +177,7 @@ namespace NLGUI
 		bool    _MouseDown  : 1;
 		bool	_CallingAH  : 1;
 		bool	_Cancelable : 1; // true if the slider may be cancelled when pressed on the mouse right button
+		bool	_Keyboard   : 1;
 		bool	_Frozen		: 1;
 		bool	_Scale		: 1;
 
diff --git a/nel/src/gui/ctrl_scroll.cpp b/nel/src/gui/ctrl_scroll.cpp
index b40498186..d9191e770 100644
--- a/nel/src/gui/ctrl_scroll.cpp
+++ b/nel/src/gui/ctrl_scroll.cpp
@@ -57,6 +57,7 @@ namespace NLGUI
 		_MouseDown = false;
 		_CallingAH = false;
 		_Cancelable = false;
+		_Keyboard = false;
 		_Target = NULL;
 		_Inverted = false;
 		_IsDBLink = false;
@@ -225,6 +226,11 @@ namespace NLGUI
 			return toString( _Cancelable );
 		}
 		else
+		if( name == "keyboard" )
+		{
+			return toString( _Keyboard );
+		}
+		else
 		if( name == "frozen" )
 		{
 			return toString( _Frozen );
@@ -405,6 +411,14 @@ namespace NLGUI
 			return;
 		}
 		else
+		if( name == "keyboard" )
+		{
+			bool b;
+			if( fromString( value, b ) )
+				_Keyboard = b;
+			return;
+		}
+		else
 		if( name == "frozen" )
 		{
 			bool b;
@@ -474,6 +488,7 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "target_stepy", BAD_CAST toString( _TargetStepY ).c_str() );
 		xmlSetProp( node, BAD_CAST "step_value", BAD_CAST toString( _StepValue ).c_str() );
 		xmlSetProp( node, BAD_CAST "cancelable", BAD_CAST toString( _Cancelable ).c_str() );
+		xmlSetProp( node, BAD_CAST "keyboard", BAD_CAST toString( _Keyboard ).c_str() );
 		xmlSetProp( node, BAD_CAST "frozen", BAD_CAST toString( _Frozen ).c_str() );
 
 		return node;
@@ -589,6 +604,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancelable" );
 		if (prop) _Cancelable = convertBool(prop);
 
+		prop = (char*) xmlGetProp( node, (xmlChar*)"keyboard" );
+		if (prop) _Keyboard = convertBool(prop);
+
 		prop= (char*) xmlGetProp (node, (xmlChar*)"frozen");
 		_Frozen = false;
 		if (prop)
@@ -912,6 +930,30 @@ namespace NLGUI
 				return true;
 			}
 		}
+		else if (event.getType() == NLGUI::CEventDescriptor::key)
+		{
+			const NLGUI::CEventDescriptorKey &eventDesc = (const NLGUI::CEventDescriptorKey &)event;
+
+			if (eventDesc.getKeyEventType() == NLGUI::CEventDescriptorKey::keydown)
+			{
+				if (_Keyboard)
+				{
+					sint32 i = 0;
+					// direction
+					if (eventDesc.getKey() == KeyNEXT)  i++;
+					else if (eventDesc.getKey() == KeyPRIOR) i--;
+					else
+						return false;
+
+					if (_Vertical)
+						moveTrackY(-(i * _TargetStepY));
+					else
+						moveTrackX(-(i * _TargetStepX));
+
+					return true;
+				}
+			}
+		}
 		return false;
 	}
 
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index 9ce889a95..df4f5d706 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -2297,7 +2297,7 @@ namespace NLGUI
 		// Hide menu if the key is pushed
 //		if ((eventDesc.getKeyEventType() == CEventDescriptorKey::keydown) && !_ModalStack.empty() && !eventDesc.getKeyAlt() && !eventDesc.getKeyCtrl() && !eventDesc.getKeyShift())
 		// Hide menu (or popup menu) is ESCAPE pressed
-		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
 		{
 			if( hasModal() )
 			{
@@ -2308,7 +2308,7 @@ namespace NLGUI
 		}
 
 		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
-		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
 		{
 			// Get the last escapable active top window. NB: this is ergonomically better.
 			CInterfaceGroup	*win= getLastEscapableTopWindow();
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index f7f91e7ad..41df9430f 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -326,17 +326,8 @@ CClientConfig::CClientConfig()
 	Local				= false;					// Default is Net Mode.
 	FSHost				= "";						// Default Host.
 
-#if 1 // Yubo hack
-	// The order is important here, because in a layer, global texture are rendered through this order
-	TexturesInterface.push_back("texture_interfaces_v3");
-	// DXTC contain all items and bricks bitmaps, they must come after standard texture
-	TexturesInterface.push_back("new_texture_interfaces_dxtc");
-	// Added icons by Yubo's Team 2009
-	TexturesInterface.push_back("texture_extra");
-#else
 	TexturesInterface.push_back("texture_interfaces_v3");
 	TexturesInterfaceDXTC.push_back("texture_interfaces_dxtc");
-#endif
 
 	TexturesOutGameInterface.push_back("texture_interfaces_v3_outgame_ui");
 
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 6054b6a07..cf0abdbfd 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -157,9 +157,11 @@ std::string RingEditorKeySet = "keys_r2ed.xml";
 string		ScenarioFileName;
 sint 		LoginCharsel = -1;
 
-static const char *KeySetVarName = "BuiltInKeySets";
+std::string ImportCharacter;
 
+static const char *KeySetVarName = "BuiltInKeySets";
 
+#define GROUP_LIST_CHARACTER            "ui:outgame:charsel_import:import_list"
 #define	GROUP_LIST_MAINLAND				"ui:outgame:appear_mainland:mainland_list"
 #define	GROUP_LIST_KEYSET				"ui:outgame:appear_keyset:keyset_list"
 vector<CMainlandSummary>	Mainlands;
@@ -2138,7 +2140,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
 		if (pList == NULL)
@@ -2217,7 +2219,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
 		pList->clearGroups();
 	}
@@ -2458,7 +2460,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET));
 		pList->clearGroups();
 	}
@@ -3435,3 +3437,239 @@ class CAHOpenRingSessions : public IActionHandler
 	}
 };
 REGISTER_ACTION_HANDLER (CAHOpenRingSessions, "open_ring_sessions");
+
+// ***************************************************************************
+class CAHInitImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (!list)
+		{
+			nlwarning("element " GROUP_LIST_CHARACTER " not found probably bad outgame.xml");
+			return;
+		}
+
+		// retrieve saved files
+		std::vector<string> savedCharacters;
+		CPath::getPathContent("save/", false, false, true, savedCharacters);
+
+		CInterfaceGroup *newLine;
+		CInterfaceGroup *prevLine;
+
+		for (uint i = 0; i < savedCharacters.size(); ++i)
+		{
+			// search saved characters only
+			if (testWildCard(CFile::getFilename(savedCharacters[i]), "character_*.save"))
+			{
+				const std::string id = CFile::getFilenameWithoutExtension(savedCharacters[i]).substr(strlen("character_"));
+				if (id.empty())
+					continue;
+
+				std::vector<pair<string, string>> params;
+				params.clear();
+				params.push_back(std::pair<string, string>("id", id));
+				// adjust ref
+				if (list->getNumGroup() > 0)
+					params.push_back(std::pair<string, string>("posref", "BL TL"));
+
+				newLine = CWidgetManager::getInstance()->getParser()->createGroupInstance("t_import", GROUP_LIST_CHARACTER, params);
+				if (newLine)
+				{
+					CViewText *text = dynamic_cast<CViewText*>(newLine->getView("name"));
+					if (text)
+						text->setText(ucstring(savedCharacters[i]));
+
+					// first button is pushed
+					CCtrlButton *button = dynamic_cast<CCtrlButton*>(newLine->getCtrl("but"));
+					if (button && list->getNumGroup() == 0)
+						button->setPushed(true);
+
+					// add to the list now
+					newLine->setParent(list);
+					newLine->setParentSize(list);
+					newLine->setParentPos(prevLine);
+
+					list->addGroup(newLine);
+
+					prevLine = newLine;
+				}
+			}
+		}
+		// none case
+		if (list->getNumGroup() == 0)
+			CLuaManager::getInstance().executeLuaScript("outgame:procCharselNotifaction(3)");
+
+		list->invalidateCoords();
+	}
+};
+REGISTER_ACTION_HANDLER( CAHInitImportCharacter, "import_char_init" );
+
+// ***************************************************************************
+class CAHResetImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (list)
+			list->clearGroups();
+
+		if (!ImportCharacter.empty())
+			ImportCharacter = "";
+	}
+};
+REGISTER_ACTION_HANDLER( CAHResetImportCharacter, "import_char_reset" );
+
+// ***************************************************************************
+class CAHSelectImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase *pCaller, const std::string &Params)
+	{
+		struct CUnpush : public CInterfaceElementVisitor
+		{
+			CCtrlBase *Ref;
+			virtual void visitCtrl(CCtrlBase *ctrl)
+			{
+				if (ctrl == Ref) return;
+				CCtrlBaseButton *but = dynamic_cast<CCtrlBaseButton*>(ctrl);
+				if (but)
+				{
+					but->setPushed(false);
+				}
+			}
+		};
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (!list)
+			return;
+
+		// unselect
+		if (Params.empty())
+		{
+			CUnpush unpusher;
+			unpusher.Ref = pCaller;
+			list->visit(&unpusher);
+		}
+
+		// now select
+		std::string name;
+		if (Params.empty())
+		{
+			CCtrlButton *pCB = dynamic_cast<CCtrlButton*>(pCaller);
+			if (!pCB)
+				return;
+
+			std::string id = pCB->getId();
+			id = id.substr(0, id.rfind(':'));
+
+			if (!fromString(id.substr(id.rfind(':')+1, id.size()), name))
+				return;
+
+			pCB->setPushed(true);
+		}
+		else
+			if (!fromString(Params, name))
+				return;
+
+		ImportCharacter = "";
+		// check filename and store
+		if (CFile::fileExists(toString("save/character_%s.save", name.c_str())))
+			ImportCharacter = name;
+	}
+};
+REGISTER_ACTION_HANDLER( CAHSelectImportCharacter, "import_char_select" );
+
+// ***************************************************************************
+class CAHImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		if (ImportCharacter.empty())
+			return;
+
+		if (!CFile::fileExists(toString("save/character_%s.save", ImportCharacter.c_str())))
+			return;
+
+		bool success = false;
+
+		CIFile fd;
+		CCharacterSummary CS;
+		// use temporary file until close()
+		if (fd.open(toString("save/character_%s.save", ImportCharacter.c_str())))
+		{
+			try
+			{
+				CS.serial(fd);
+				SCharacter3DSetup::setupDBFromCharacterSummary("UI:TEMP:CHAR3D", CS);
+
+				// validate import
+				CDBManager::getInstance()->getDbProp("UI:TEMP:IMPORT")->setValue32(1);
+				success = true;
+			}
+			catch (const EStream &e)
+			{
+				nlwarning(e.what());
+			}
+			fd.close();
+		}
+		else
+			nlwarning("Failed to open file: save/character_%s.save", ImportCharacter.c_str());
+
+		// user notification
+		if (!success)
+			CLuaManager::getInstance().executeLuaScript("outgame:procCharselNotifaction(2)");
+		else
+			CAHManager::getInstance()->runActionHandler("proc", NULL, "proc_charsel_create_new");
+	}
+};
+REGISTER_ACTION_HANDLER( CAHImportCharacter, "import_char" );
+
+// ***************************************************************************
+class CAHExportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const std::string &Params)
+	{
+		if (Params.empty())
+			return;
+
+		sint32 slot = -1;
+		if (!fromString(getParam(Params, "slot"), slot))
+			return;
+
+		if (slot >= CharacterSummaries.size() || slot < 0)
+			return;
+
+		// retrieve infos
+		CCharacterSummary &CS = CharacterSummaries[slot];
+		if (CS.Name.empty())
+			return;
+
+		// extract name
+		const std::string name = buildPlayerNameForSaveFile(CS.Name.toString());
+
+		COFile fd;
+		bool success = false;
+		// use temporary file until close()
+		if (fd.open(toString("save/character_%s.save", name.c_str()), false, false, true))
+		{
+			try
+			{
+				fd.serial(CS);
+				fd.flush();
+				// validate
+				success = true;
+			}
+			catch (const EStream &e)
+			{
+				nlwarning(e.what());
+			}
+			fd.close();
+		}
+		else
+			nlwarning("Failed to open file: save/character_%s.save", name.c_str());
+
+		const uint8 val = (success == true) ? 0 : 1;
+		// user notification
+		CLuaManager::getInstance().executeLuaScript(toString("outgame:procCharselNotifaction(%i)", val));
+	}
+};
+REGISTER_ACTION_HANDLER( CAHExportCharacter, "export_char" );
diff --git a/ryzom/client/src/events_listener.cpp b/ryzom/client/src/events_listener.cpp
index 879bd5a2a..cfa9d2b3c 100644
--- a/ryzom/client/src/events_listener.cpp
+++ b/ryzom/client/src/events_listener.cpp
@@ -172,16 +172,12 @@ void CEventsListener::operator()(const CEvent& event)
 			// Get in pixel space, centered
 			uint32 drW, drH;
 			Driver->getWindowSize(drW, drH);
-			float fX = mouseEvent->X; // from 0 to 1.0
-			float fY = (ClientCfg.FreeLookInverted ? -mouseEvent->Y : mouseEvent->Y);
-			sint scX = (sint32)(fX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-			sint scY = (sint32)(fY * (float)drH) - ((sint32)drH >> 1);
+			sint scX = (sint32)(mouseEvent->X * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
+			sint scY = (sint32)(mouseEvent->Y * (float)drH) - ((sint32)drH >> 1);
 			if (!s_MouseFreeLookReady)
 			{
-				float pfX = _MouseX;
-				float pfY = (ClientCfg.FreeLookInverted ? -_MouseY : _MouseY);
-				sint pscX = (sint32)(pfX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-				sint pscY = (sint32)(pfY * (float)drH) - ((sint32)drH >> 1);
+				sint pscX = (sint32)(_MouseX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
+				sint pscY = (sint32)(_MouseY * (float)drH) - ((sint32)drH >> 1);
 				s_MouseFreeLookReady = true;
 				s_MouseFreeLookLastX = pscX;
 				s_MouseFreeLookLastY = pscY;
@@ -199,13 +195,12 @@ void CEventsListener::operator()(const CEvent& event)
 			}
 
 			// Get delta since last center
-			sint scXd = scX - s_MouseFreeLookLastX;
-			sint scYd = scY - s_MouseFreeLookLastY;
+			s_MouseFreeLookFrameX += (scX - s_MouseFreeLookLastX);
+			s_MouseFreeLookFrameY += (scY - s_MouseFreeLookLastY) * (ClientCfg.FreeLookInverted ? -1 : 1);
+
 			s_MouseFreeLookLastX = scX;
 			s_MouseFreeLookLastY = scY;
 
-			s_MouseFreeLookFrameX += scXd;
-			s_MouseFreeLookFrameY += scYd;
 			// updateFreeLookPos is called in updateMouseSmoothing per frame
 
 			// Center cursor

From cd8ed8ab576747bce8f2273f87068e50c90bc4b7 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 16:23:41 +0800
Subject: [PATCH 119/292] Update entity_cl.cpp

---
 ryzom/client/src/entity_cl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 77d1e3c65..4c1b4a842 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2302,7 +2302,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 				string::size_type pos = replacement.find('$');
 				if (pos != string::npos)
 				{
-					_EntityName = _EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(sn.substr(0, pos));
+					_EntityName = _EntityName = STRING_MANAGER::CStringManagerClient::getLocalizedName(replacement.substr(0, pos));
 					string::size_type pos2 = replacement.find('$', pos + 1);
 					_TitleRaw = replacement.substr(pos+1, pos2 - pos - 1);
 					replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);

From 04805ec38c6807be2aa308d88565e6fa3ee767b0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 31 Oct 2020 16:46:00 +0800
Subject: [PATCH 120/292] Fix build

---
 ryzom/client/src/connection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index cf0abdbfd..2885ee1ac 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -3478,7 +3478,7 @@ class CAHInitImportCharacter : public IActionHandler
 				{
 					CViewText *text = dynamic_cast<CViewText*>(newLine->getView("name"));
 					if (text)
-						text->setText(ucstring(savedCharacters[i]));
+						text->setText(string(savedCharacters[i]));
 
 					// first button is pushed
 					CCtrlButton *button = dynamic_cast<CCtrlButton*>(newLine->getCtrl("but"));

From a1337dbda9ae73222cc7e68dc168362f7ddad10b Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 02:45:39 +0800
Subject: [PATCH 121/292] Update string_manager_client.cpp

---
 ryzom/client/src/string_manager_client.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 0ef667dc9..734b3bea6 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1178,9 +1178,9 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 // ***************************************************************************
 void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 {
-	ucstring womenNameColIdent = "women_name";
-	ucstring descColIdent = "description";
-	ucstring descColIdent2 = "description2";
+	ucstring womenNameColIdent = ucstring("women_name");
+	ucstring descColIdent = ucstring("description");
+	ucstring descColIdent2 = ucstring("description2");
 
 	// List of words to append to the local CI18N system.
 	static const char	*specialWords[]=

From da9254e7480dcf6551fb0977f3238539e2643c14 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 04:53:32 +0800
Subject: [PATCH 122/292] Update release.cpp

---
 ryzom/client/src/release.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index 889bcee11..7a7cc91eb 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -30,6 +30,7 @@
 #include "nel/misc/async_file_manager.h"
 #include "nel/misc/system_utils.h"
 #include "nel/misc/streamed_package_manager.h"
+#include "nel/web/http_package_provider.h"
 // 3D Interface.
 #include "nel/3d/bloom_effect.h"
 #include "nel/3d/fxaa.h"

From 6c247256d29f030093748adf3fb665f1ccc74e5d Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 04:55:29 +0800
Subject: [PATCH 123/292] Update string_manager_client.cpp

---
 ryzom/client/src/string_manager_client.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 734b3bea6..98483bd6b 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1629,13 +1629,13 @@ const char *CStringManagerClient::getTitleLocalizedName(const string &titleId, b
 }
 
 
-const ucchar *CStringManagerClient::getLocalizedName(const ucstring &uctext)
+const ucchar *CStringManagerClient::getLocalizedName(const string &uctext)
 {
-	string text = uctext.toUtf8();
+	string text = uctext;
 	if (text[0] == '[')
 	{
 		vector<string> textLocalizations;
-		static ucstring defaultText;
+		static string defaultText;
 		splitString(text.substr(1), "[", textLocalizations);
 		if (!textLocalizations.empty())
 		{
@@ -1643,12 +1643,12 @@ const ucchar *CStringManagerClient::getLocalizedName(const ucstring &uctext)
 			{
 				if (textLocalizations[i].substr(0, 3) == CI18N::getCurrentLanguageCode()+"]")
 				{
-					defaultText.fromUtf8(textLocalizations[i].substr(3));
+					defaultText = textLocalizations[i].substr(3);
 					return defaultText.c_str();
 				}
 				else if (textLocalizations[i].substr(0, 3) == "wk]")
 				{
-					defaultText.fromUtf8(textLocalizations[i].substr(3));
+					defaultText = extLocalizations[i].substr(3);
 				}
 			}
 		}

From afa22ee22bec1ee1722e38cc9ae48c1d0d6dd29b Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 06:15:03 +0800
Subject: [PATCH 124/292] Update string_manager_client.cpp

---
 ryzom/client/src/string_manager_client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 98483bd6b..623a66152 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1629,7 +1629,7 @@ const char *CStringManagerClient::getTitleLocalizedName(const string &titleId, b
 }
 
 
-const ucchar *CStringManagerClient::getLocalizedName(const string &uctext)
+const char *CStringManagerClient::getLocalizedName(const string &uctext)
 {
 	string text = uctext;
 	if (text[0] == '[')

From 2bb13937e85ef6418d7ce609e124ce3065bad11c Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 06:57:53 +0800
Subject: [PATCH 125/292] Update string_manager_client.cpp

---
 ryzom/client/src/string_manager_client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 623a66152..79a0ee36d 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1648,7 +1648,7 @@ const char *CStringManagerClient::getLocalizedName(const string &uctext)
 				}
 				else if (textLocalizations[i].substr(0, 3) == "wk]")
 				{
-					defaultText = extLocalizations[i].substr(3);
+					defaultText = textLocalizations[i].substr(3);
 				}
 			}
 		}

From 9d3891f1aa1ae5c7de2687b49bfd2814df7d7230 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 10:33:53 +0800
Subject: [PATCH 126/292] Update action_handler_item.cpp

---
 ryzom/client/src/interface_v3/action_handler_item.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 7a87719ab..8cbeaf678 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -161,28 +161,29 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 				}
 				else
 				{
+					const char *localDesc = STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id);
 					if (itemInfo.CustomText.empty())
-						display->setTextFormatTaged(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
+						display->setTextFormatTaged(localDesc);
 					else
 					{
-						ucstring text = itemInfo.CustomText;
+						string text = itemInfo.CustomText.toUtf8();
 						if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 						{
 							CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 							if (pGH)
-								pGH->browse(text.substr(4, text.size()-4).toString().c_str());
+								pGH->browse(text.substr(4, text.size()-4).c_str());
 							text = localDesc;
 						}
 						else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
 						{
-							string code = text.substr(4, text.size()-4).toString();
+							string code = text.substr(4, text.size()-4);
 							if (!code.empty())
 								CLuaManager::getInstance().executeLuaScript(code);
 							text = localDesc;
 						}
 						if (!text.empty())
 						{
-							display->setTextFormatTaged(text.toUtf8());
+							display->setTextFormatTaged(text);
 							group->setActive(true);
 						}
 					}

From f859a39da483f602db24f5d7ffd751eab6b7be4d Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 10:34:51 +0800
Subject: [PATCH 127/292] Update action_handler_item.cpp

---
 ryzom/client/src/interface_v3/action_handler_item.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 8cbeaf678..1f8cd61b0 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -305,27 +305,28 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					// Finish the display or add the waiter
 					if (getInventory().isItemInfoUpToDate(ItemSlotId))
 					{
+						const char *localDesc = STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id);
 						if (itemInfo.CustomText.empty())
-							display->setTextFormatTaged(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id));
+							display->setTextFormatTaged(localDesc);
 						else
 						{
-							ucstring text = itemInfo.CustomText;
+							string text = itemInfo.CustomText.toUtf8();
 							if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
 							{
 								CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
 								if (pGH)
-									pGH->browse(text.substr(4, text.size()-4).toUtf8().c_str());
+									pGH->browse(text.substr(4, text.size()-4).c_str());
 								text = localDesc;
 							}
 							else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
 							{
-								string code = text.substr(4, text.size()-4).toUtf8();
+								string code = text.substr(4, text.size()-4);
 								if (!code.empty())
 									CLuaManager::getInstance().executeLuaScript(code);
 								text = localDesc;
 							}
 							if (!text.empty())
-								display->setTextFormatTaged(text.toUtf8());
+								display->setTextFormatTaged(text);
 						}
 					}
 					else

From c069b70ce8ec156b9a3c1638fee2d6dbc1d321a6 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 05:13:39 +0800
Subject: [PATCH 128/292] UTF-8 various, ryzom/ryzomcore#335

---
 nel/include/nel/misc/utf_string_view.h        |   6 +
 nel/src/misc/utf_string_view.cpp              |  39 +++
 ryzom/client/src/actions.cpp                  |  41 ++-
 ryzom/client/src/actions.h                    |   4 +-
 ryzom/client/src/bg_downloader_access.cpp     |  25 +-
 ryzom/client/src/bg_downloader_access.h       |  16 +-
 ryzom/client/src/candidate.h                  |   3 +-
 ryzom/client/src/client_cfg.cpp               |   2 +-
 ryzom/client/src/client_chat_manager.cpp      |  10 +-
 ryzom/client/src/client_chat_manager.h        |  14 +-
 ryzom/client/src/commands.cpp                 |  60 ++---
 ryzom/client/src/commands.h                   |   2 +-
 ryzom/client/src/connection.cpp               | 123 +++++----
 ryzom/client/src/connection.h                 |   8 +-
 ryzom/client/src/continent.cpp                |   2 +
 ryzom/client/src/continent_manager_build.h    |   2 +-
 ryzom/client/src/entities.cpp                 |   2 +-
 ryzom/client/src/far_tp.cpp                   |   6 +
 ryzom/client/src/init.cpp                     |  20 +-
 .../src/interface_v3/action_handler_game.cpp  |   5 +-
 .../src/interface_v3/action_handler_help.cpp  | 249 +++++++++---------
 ryzom/client/src/interface_v3/chat_window.cpp |  35 +--
 .../client/src/interface_v3/dbctrl_sheet.cpp  |  20 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |   4 +-
 .../interface_v3/dbgroup_list_sheet_trade.cpp |   6 +-
 .../interface_v3/group_in_scene_bubble.cpp    |   2 +
 .../src/interface_v3/group_modal_get_key.cpp  |   4 +-
 .../src/interface_v3/interface_manager.cpp    |   2 +
 .../interface_v3/item_consumable_effect.cpp   |  20 +-
 .../src/interface_v3/item_consumable_effect.h |   2 +-
 .../src/interface_v3/item_special_effect.cpp  |   8 +-
 .../src/interface_v3/item_special_effect.h    |   4 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |   6 +
 ryzom/client/src/interface_v3/lua_ihm_ryzom.h |   4 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  16 +-
 .../src/interface_v3/macrocmd_manager.cpp     |  15 +-
 .../client/src/interface_v3/music_player.cpp  |   4 +-
 .../src/interface_v3/people_interraction.cpp  |  28 +-
 .../src/interface_v3/people_interraction.h    |   2 +-
 ryzom/client/src/interface_v3/people_list.cpp |  14 +-
 ryzom/client/src/interface_v3/people_list.h   |   4 +-
 .../src/interface_v3/req_skill_formula.cpp    |   4 +-
 .../src/interface_v3/req_skill_formula.h      |   2 +-
 .../src/interface_v3/sphrase_manager.cpp      |  50 ++--
 .../client/src/interface_v3/sphrase_manager.h |  12 +-
 ryzom/client/src/login.cpp                    |  22 +-
 ryzom/client/src/main_loop.cpp                |   4 +
 ryzom/client/src/net_manager.cpp              |  20 +-
 ryzom/client/src/progress.cpp                 |  13 +-
 ryzom/client/src/progress.h                   |  10 +-
 ryzom/client/src/release.cpp                  |   4 +
 .../common/src/game_share/character_summary.h |   2 +-
 ryzom/common/src/game_share/item_infos.h      |   6 +-
 .../common/src/game_share/mainland_summary.h  |   4 +-
 .../common/src/game_share/msg_client_server.h |   2 +-
 ryzom/common/src/game_share/sphrase_com.h     |   2 +-
 56 files changed, 550 insertions(+), 446 deletions(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 0aac8d2c3..572d39ac4 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -23,6 +23,8 @@
 
 namespace NLMISC {
 
+class IStream;
+
 /// String view for UTF-8 and UTF-32 iteration as 32-bit codepoints.
 /// This string view keeps the string as a reference, it does not make a copy.
 /// Only use this for iterating a string's codepoints.
@@ -141,6 +143,10 @@ public:
 
 	static void append(std::string &str, u32char c);
 
+	/// Encode or decode a single UTF-8 character in a stream (also useful for packing unsigned 20-bit integers)
+	static void append(IStream &s, u32char c);
+	static u32char get(IStream &s);
+
 private:
 	typedef u32char (*TIterator)(const void **addr);
 	static u32char utf8Iterator(const void **addr);
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 17dbaea58..64f2f8e55 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -18,6 +18,7 @@
 
 // Project includes
 #include <nel/misc/utf_string_view.h>
+#include <nel/misc/stream.h>
 
 // References:
 // - https://twiserandom.com/unicode/unicode-encoding-utf-8-utf-16-utf-32/
@@ -69,6 +70,44 @@ void CUtfStringView::append(std::string &str, u32char c)
 	appendUtf8(str, c);
 }
 
+void CUtfStringView::append(IStream &s, u32char c)
+{
+	nlassert(!s.isReading());
+	std::string tmp;
+	tmp.reserve(4);
+	append(tmp, c);
+	s.serialBuffer((uint8_t *)&tmp[0], tmp.size());
+}
+
+u32char CUtfStringView::get(IStream &s)
+{
+	nlassert(s.isReading());
+
+	std::string tmp;
+	tmp.reserve(4);
+	uint8_t c;
+	s.serial(c);
+
+	// Single byte
+	if (c < 0x80)
+		return c;
+
+	// Do a fast check of length
+	tmp += (char)c;
+	size_t len;
+	if ((c & 0xF0) == 0xF0) len = 4;
+	if ((c & 0xE0) == 0xE0) len = 3;
+	else len = 2;
+
+	// Read from stream
+	tmp.resize(len);
+	s.serialBuffer((uint8_t *)&tmp[1], len - 1);
+
+	// Decode
+	const void *str = tmp.c_str();
+	return utf8Iterator(&str);
+}
+
 std::string CUtfStringView::toUtf8(bool reEncode) const
 {
 	// Decode UTF and encode UTF-8
diff --git a/ryzom/client/src/actions.cpp b/ryzom/client/src/actions.cpp
index 67695a9d6..604343afd 100644
--- a/ryzom/client/src/actions.cpp
+++ b/ryzom/client/src/actions.cpp
@@ -42,7 +42,7 @@ extern CEventsListener EventsListener;
 // Hierarchical timer
 H_AUTO_DECL ( RZ_Client_Actions_Context_Mngr_Update )
 
-static bool getParam (CBaseAction::CParameter::TType type, ucstring &paramName, ucstring &paramValue, const std::string &argu, uint paramId);
+static bool getParam (CBaseAction::CParameter::TType type, string &paramName, string &paramValue, const std::string &argu, uint paramId);
 
 /////////////////////////////////////////////////////
 /////////////////////////////////////////////////////
@@ -243,8 +243,8 @@ bool CActionsManager::isActionPresentInContext(const CAction::CName &name) const
 			const CBaseAction::CParameter &parameter = baseAction->Parameters[i];
 			if (parameter.Type == CBaseAction::CParameter::Constant)
 			{
-				ucstring paramName;
-				ucstring paramValue = parameter.DefaultValue;
+				string paramName;
+				string paramValue = parameter.DefaultValue;
 
 				// Get the param from the argu
 				getParam (parameter.Type, paramName, paramValue, name.Argu, i);
@@ -252,7 +252,7 @@ bool CActionsManager::isActionPresentInContext(const CAction::CName &name) const
 				bool found = true;
 				for (uint k = 0; k < parameter.Values.size(); ++k)
 				{
-					if (parameter.Values[k].Value == paramValue.toUtf8())
+					if (parameter.Values[k].Value == paramValue)
 					{
 						if (!ActionsContext.matchContext(parameter.Values[k].Contexts)) return false;
 						found = true;
@@ -631,7 +631,7 @@ CBaseAction::CParameter::CParameter ()
 
 // ***************************************************************************
 
-static bool getParam (CBaseAction::CParameter::TType type, ucstring &paramName, ucstring &paramValue, const std::string &argu, uint paramId)
+static bool getParam (CBaseAction::CParameter::TType type, string &paramName, string &paramValue, const std::string &argu, uint paramId)
 {
 	const string separator = "|";
 	const string equal_separator = "=";
@@ -672,10 +672,7 @@ static bool getParam (CBaseAction::CParameter::TType type, ucstring &paramName,
 		}
 
 		// Value ?
-		if(type==CBaseAction::CParameter::User || type==CBaseAction::CParameter::UserName)
-			paramValue.fromUtf8(argu.substr(pos, end-pos));
-		else
-			paramValue = argu.substr(pos, end-pos);
+		paramValue = argu.substr(pos, end-pos);
 
 		// Ok
 		return true;
@@ -683,10 +680,10 @@ static bool getParam (CBaseAction::CParameter::TType type, ucstring &paramName,
 	return false;
 }
 
-ucstring CBaseAction::getActionLocalizedText (const CAction::CName &name) const
+string CBaseAction::getActionLocalizedText(const CAction::CName &name) const
 {
 	// Action base name
-	ucstring temp = CI18N::get(LocalizedName);
+	string temp = CI18N::get(LocalizedName);
 
 	// Get the parameter
 	uint i;
@@ -694,8 +691,8 @@ ucstring CBaseAction::getActionLocalizedText (const CAction::CName &name) const
 	{
 		bool parameterOk = false;
 		const CParameter &parameter = Parameters[i];
-		ucstring paramName;
-		ucstring paramValue;
+		string paramName;
+		string paramValue;
 
 		// Get the param from the argu
 		if (getParam (parameter.Type, paramName, paramValue, name.Argu, i))
@@ -703,7 +700,7 @@ ucstring CBaseAction::getActionLocalizedText (const CAction::CName &name) const
 			switch (parameter.Type)
 			{
 			case CParameter::Hidden:
-				if ((ucstring (parameter.DefaultValue) == paramValue) && (ucstring (parameter.Name) == paramName))
+				if ((parameter.DefaultValue == paramValue) && (parameter.Name == paramName))
 					parameterOk = true;
 				break;
 			case CParameter::Constant:
@@ -713,7 +710,7 @@ ucstring CBaseAction::getActionLocalizedText (const CAction::CName &name) const
 					{
 						// This value ?
 						const CParameter::CValue &value = parameter.Values[j];
-						if (ucstring(value.Value) == paramValue)
+						if (value.Value == paramValue)
 						{
 							temp += " ";
 
@@ -746,7 +743,7 @@ ucstring CBaseAction::getActionLocalizedText (const CAction::CName &name) const
 	if (i==Parameters.size ())
 		return temp;
 
-	return ucstring("");
+	return string();
 }
 
 // ***************************************************************************
@@ -791,8 +788,8 @@ const CActionsManager::CCategoryLocator *CActionsManager::getActionLocator (cons
 		{
 			bool parameterOk = false;
 			const CBaseAction::CParameter &parameter = baseAction.Parameters[i];
-			ucstring paramName;
-			ucstring paramValue;
+			string paramName;
+			string paramValue;
 
 			// Get the param from the argu
 			if (getParam (parameter.Type, paramName, paramValue, name.Argu, i))
@@ -800,7 +797,7 @@ const CActionsManager::CCategoryLocator *CActionsManager::getActionLocator (cons
 				switch (parameter.Type)
 				{
 				case CBaseAction::CParameter::Hidden:
-					if ((ucstring (parameter.DefaultValue) == paramValue) && (ucstring (parameter.Name) == paramName))
+					if ((parameter.DefaultValue == paramValue) && (parameter.Name == paramName))
 						parameterOk = true;
 					break;
 				case CBaseAction::CParameter::Constant:
@@ -810,7 +807,7 @@ const CActionsManager::CCategoryLocator *CActionsManager::getActionLocator (cons
 						for (j=0; j<parameter.Values.size (); j++)
 						{
 							const CBaseAction::CParameter::CValue &value = parameter.Values[j];
-							if (ucstring(value.Value) == paramValue)
+							if (value.Value == paramValue)
 							{
 								parameterOk = true;
 								break;
@@ -886,11 +883,11 @@ bool	CActionsManager::isActionDisplayForced(const CAction::CName &name) const
 }
 
 // ***************************************************************************
-ucstring CActionsManager::getActionLocalizedText (const CAction::CName &name) const
+string CActionsManager::getActionLocalizedText (const CAction::CName &name) const
 {
 	const CBaseAction *baseAction= getBaseAction(name);
 	if(!baseAction)
-		return ucstring();
+		return string();
 	return baseAction->getActionLocalizedText(name);
 }
 
diff --git a/ryzom/client/src/actions.h b/ryzom/client/src/actions.h
index f333782f5..df3d794c9 100644
--- a/ryzom/client/src/actions.h
+++ b/ryzom/client/src/actions.h
@@ -248,7 +248,7 @@ public:
 	std::string		Contexts;
 
 	/// Get an action localized text
-	ucstring getActionLocalizedText (const CAction::CName &name) const;
+	std::string getActionLocalizedText (const CAction::CName &name) const;
 
 	// see if there's at least one set of parameters for which this action is usable in current context
 	bool	isUsableInCurrentContext() const;
@@ -415,7 +415,7 @@ public:
 	const TActionsForceDisplaySet	&getActionsForceDisplaySet() const {return _ActionForceDisplay;}
 
 	/// Get an action localized text
-	ucstring getActionLocalizedText (const CAction::CName &name) const;
+	std::string getActionLocalizedText (const CAction::CName &name) const;
 
 	//@}
 
diff --git a/ryzom/client/src/bg_downloader_access.cpp b/ryzom/client/src/bg_downloader_access.cpp
index e2500eaa6..338b86f9a 100644
--- a/ryzom/client/src/bg_downloader_access.cpp
+++ b/ryzom/client/src/bg_downloader_access.cpp
@@ -19,6 +19,9 @@
 
 #include "stdpch.h"
 #include "bg_downloader_access.h"
+
+#ifdef RYZOM_BG_DOWNLOADER
+
 #include "global.h"
 #include "login_patch.h"
 //
@@ -84,7 +87,7 @@ CBGDownloaderAccess::CBGDownloaderAccess()
 //=====================================================
 void CBGDownloaderAccess::clearCurrentMessage()
 {
-	_CurrentMessage = ucstring();
+	_CurrentMessage = ucstring(); // OLD
 	_CurrentFilesToGet = 0;
 	_TotalFilesToGet = 0;
 	_PatchingSize = 0;
@@ -194,7 +197,7 @@ void CBGDownloaderAccess::startTask(const BGDownloader::CTaskDesc &taskDesc, con
 }
 
 //=====================================================
-bool CBGDownloaderAccess::isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const
+bool CBGDownloaderAccess::isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const // OLD
 {
 	if (_State == State_Finished)
 	{
@@ -354,7 +357,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
 	{
 		shutdownDownloader();
 		Parent->_TaskResult = TaskResult_Error;
-		Parent->_ErrorMsg = ucstring(e.what());
+		Parent->_ErrorMsg = ucstring(e.what()); // OLD
 		Parent->_DownloadThreadPriority = ThreadPriority_DownloaderError;
 	}
 	catch(const NLMISC::EStream &e)
@@ -362,7 +365,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
 		shutdownDownloader();
 		Parent->_TaskResult = TaskResult_Error;
 		nlwarning("BG DOWNLOADER PROTOCOL ERROR ! Stream error");
-		Parent->_ErrorMsg = CI18N::get("uiBGD_ProtocolError") + ucstring(" : ") + ucstring(e.what());
+		Parent->_ErrorMsg = CI18N::get("uiBGD_ProtocolError") + ucstring(" : ") + ucstring(e.what()); // OLD
 		Parent->_DownloadThreadPriority = ThreadPriority_DownloaderError;
 	}
 	catch (const EWaitMessageTimeoutException &e)
@@ -370,7 +373,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
 		shutdownDownloader();
 		Parent->_TaskResult = TaskResult_Error;
 		nlwarning("BG DOWNLOADER PROTOCOL ERROR ! Message timeout");
-		Parent->_ErrorMsg = CI18N::get("uiBGD_ProtocolError") + ucstring(" : ") + ucstring(e.what());
+		Parent->_ErrorMsg = CI18N::get("uiBGD_ProtocolError") + ucstring(" : ") + ucstring(e.what()); // OLD
 		Parent->_DownloadThreadPriority = ThreadPriority_DownloaderError;
 	}
 	Parent->_State = State_Finished;
@@ -614,7 +617,7 @@ TDownloaderMode CBGDownloaderAccess::CDownloadCoTask::getDownloaderMode()
 void  CBGDownloaderAccess::CDownloadCoTask::getTaskResult(TTaskResult &result,
 														  uint32 &availablePatchs,
 														  bool &mustLaunchBatFile,
-														  ucstring &errorMsg
+														  ucstring &errorMsg // OLD
 														 )
 {
 	sendSimpleMsg(CL_GetTaskResult);
@@ -623,7 +626,7 @@ void  CBGDownloaderAccess::CDownloadCoTask::getTaskResult(TTaskResult &result,
 	inMsg.serialEnum(result);
 	inMsg.serial(availablePatchs);
 	inMsg.serial(mustLaunchBatFile);
-	inMsg.serial(errorMsg);
+	inMsg.serial(errorMsg); // OLD
 }
 
 //=====================================================
@@ -687,7 +690,7 @@ void CBGDownloaderAccess::CDownloadCoTask::shutdownDownloader()
 		}
 	}
 	CWinProcess::terminateProcessFromModuleName(BGDownloaderName); // for safety
-	Parent->_CurrentMessage = ucstring();
+	Parent->_CurrentMessage = ucstring(); // OLD
 }
 
 //=====================================================
@@ -795,7 +798,7 @@ bool CBGDownloaderAccess::CDownloadCoTask::defaultMessageHandling(BGDownloader::
 		case BGD_Error:
 		{
 			Parent->_TaskResult = TaskResult_Error;
-			ucstring errorMsg;
+			ucstring errorMsg; // OLD
 			msg.serial(errorMsg);
 			throw EDownloadException(errorMsg.toUtf8());
 		}
@@ -885,7 +888,7 @@ void CBGDownloaderAccess::startTask(const BGDownloader::CTaskDesc &taskDesc, con
 }
 
 //=====================================================
-bool CBGDownloaderAccess::isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const
+bool CBGDownloaderAccess::isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const // OLD
 {
 	// TODO for Linux
 	return false;
@@ -956,3 +959,5 @@ void unpauseBGDownloader()
 		DownloaderPaused = false;
 	}
 }
+
+#endif
diff --git a/ryzom/client/src/bg_downloader_access.h b/ryzom/client/src/bg_downloader_access.h
index e27cadb3e..5b4e7094b 100644
--- a/ryzom/client/src/bg_downloader_access.h
+++ b/ryzom/client/src/bg_downloader_access.h
@@ -14,11 +14,12 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifdef RYZOM_BG_DOWNLOADER
 #ifndef CL_BG_DOWNLOADER_ACCESS
 #define CL_BG_DOWNLOADER_ACCESS
 
 #include "nel/misc/singleton.h"
-#include "nel/misc/ucstring.h"
+#include "nel/misc/ucstring.h" // OLD
 #include "nel/misc/inter_window_msg_queue.h"
 #include "nel/misc/co_task.h"
 //
@@ -36,7 +37,7 @@ public:
 	void release();
 	// jobs
 	void						startTask(const BGDownloader::CTaskDesc &taskDesc, const std::string &commandLine, bool showDownloader);
-	bool						isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const;
+	bool						isTaskEnded(BGDownloader::TTaskResult &result, ucstring &errorMsg) const; // OLD
 	// The following flag will be true after a 'patch' task has been completed successfully
 	bool						getPatchCompletionFlag(bool clearFlag);
 	//
@@ -50,7 +51,7 @@ public:
 	//
 	void update(); // call this at each frame to update the download process
 	// Get last displayed message by the background downloader
-	const ucstring				&getCurrentMessage() const { return _CurrentMessage; }
+	const ucstring				&getCurrentMessage() const { return _CurrentMessage; } // OLD
 	uint32						getCurrentFilesToGet() const { return _CurrentFilesToGet; }
 	uint32						getTotalFilesToGet() const { return _TotalFilesToGet; }
 	//
@@ -66,17 +67,17 @@ public:
 	bool						isDownloaderUIFrozen() const { return _FrozenUI; }
 	void						requestDownloadThreadPriority(BGDownloader::TThreadPriority newPriority, bool freezeUI);
 
-	const ucstring			    &getLastErrorMessage() const { return _ErrorMsg; }
+	const ucstring			    &getLastErrorMessage() const { return _ErrorMsg; } // OLD
 
 private:
 	enum TState { State_Idle, State_Patching, State_Finished };
 	TState							_State;
 
-	ucstring						_CurrentMessage;
+	ucstring						_CurrentMessage; // OLD
 #ifdef NL_OS_WINDOWS
 	NLMISC::CInterWindowMsgQueue	_DownloaderMsgQueue;
 #endif
-	ucstring						_ErrorMsg;
+	ucstring						_ErrorMsg; // OLD
 	std::string						_CommandLine;
 	BGDownloader::TTaskResult		_TaskResult;
 	uint32							_AvailablePatchs;
@@ -122,7 +123,7 @@ private:
 		void getTaskResult(BGDownloader::TTaskResult &result,
 						   uint32 &availablePatchs,
 						   bool &mustLaunchBatFile,
-						   ucstring &errorMsg
+						   ucstring &errorMsg // OLD
 						  );
 		void getDescFile();
 		BGDownloader::TDownloaderMode getDownloaderMode();
@@ -146,3 +147,4 @@ void unpauseBGDownloader();
 
 
 #endif
+#endif
diff --git a/ryzom/client/src/candidate.h b/ryzom/client/src/candidate.h
index 41d04e681..ee169f77d 100644
--- a/ryzom/client/src/candidate.h
+++ b/ryzom/client/src/candidate.h
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+// FIXME: Lost code
 
 #if 0
 #ifndef CL_CANDIDATE_H
@@ -33,7 +34,7 @@ struct Candidate
 	NLMISC::CEntityId	id;
 	std::string			name;
 	std::string			surname;
-	std::list<ucstring>	program;
+	std::list<std::string>	program;
 	uint32				nbVotes;
 };
 
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index 41df9430f..95bc6306b 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -2026,7 +2026,7 @@ void CClientConfig::init(const string &configFileName)
 	}
 
 	// read the exising config file (don't parse it yet!)
-	ucstring content;
+	ucstring content; // UTF-16 and UTF-8 textfile support
 	NLMISC::CI18N::readTextFile(configFileName, content);
 	std::string contentUtf8 = content.toUtf8();
 
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index ec8da3eb1..5515e8580 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -65,7 +65,7 @@ extern CEntityManager		EntitiesMngr;
 
 //#ifdef OLD_STRING_SYSTEM
 //
-//bool CNetworkString::getString (ucstring &result, CClientChatManager *mng)
+//bool CNetworkString::getString (ucstring &result, CClientChatManager *mng) // OLD
 //{
 //	result = StaticString + " / ";
 //	for (uint i = 0; i < Args.size(); i++)
@@ -86,7 +86,7 @@ extern CEntityManager		EntitiesMngr;
 //	return mng->getString (result, Args, StaticString);
 //}
 //
-//void CNetworkString::setString (const ucstring &staticStringId, CClientChatManager *mng)
+//void CNetworkString::setString (const ucstring &staticStringId, CClientChatManager *mng) // OLD
 //{
 //	CBitMemStream bms;
 //	mng->getStaticDB().getInfos(staticStringId, StaticString, bms);
@@ -96,11 +96,11 @@ extern CEntityManager		EntitiesMngr;
 ////	add
 ////
 ////-----------------------------------------------
-//uint32 CChatDynamicDatabase::add( uint32 index, ucstring& ucstr, vector<bool>& code )
+//uint32 CChatDynamicDatabase::add( uint32 index, ucstring& ucstr, vector<bool>& code ) // OLD
 //{
 //	nlinfo ("receive dynamic string association '%d' '%s'", index, ucstr.toString().c_str());
 //
-//	map<ucstring, uint32>::iterator itIdx = _StringToIndex.find( ucstr );
+//	map<ucstring, uint32>::iterator itIdx = _StringToIndex.find( ucstr ); // OLD
 //	if( itIdx == _StringToIndex.end() )
 //	{
 //		map<uint32,CDynamicStringInfos *>::iterator itStr = _Data.find( index );
@@ -162,7 +162,7 @@ extern CEntityManager		EntitiesMngr;
 ////	decodeString
 ////
 ////-----------------------------------------------
-//void CChatDynamicDatabase::decodeString( ucstring& str, CBitMemStream& bms )
+//void CChatDynamicDatabase::decodeString( ucstring& str, CBitMemStream& bms ) // OLD
 //{
 //	_Huffman.getId( str, bms );
 //
diff --git a/ryzom/client/src/client_chat_manager.h b/ryzom/client/src/client_chat_manager.h
index 19afcab15..014481c0f 100644
--- a/ryzom/client/src/client_chat_manager.h
+++ b/ryzom/client/src/client_chat_manager.h
@@ -54,7 +54,7 @@ class CCDBNodeLeaf;
 struct CDynamicStringInfos
 {
 	/// string
-	ucstring Str;
+	ucstring Str; // OLD
 
 	/// index in the infos buffer, same as the index in the client dynamic string known buffer
 	uint32 Index;
@@ -89,12 +89,12 @@ public :
 	/// \param str the string
 	/// \param huffCode the Huffman code(may be empty)
 	/// \return the index of the string
-	uint32 add( uint32 index, ucstring& str, std::vector<bool>& huffCode );
+	uint32 add( uint32 index, ucstring& str, std::vector<bool>& huffCode ); // OLD
 
 	/// Get the string from its Huffman code
 	/// \param str will be filled with the string
 	/// \param bms contains the Huffman code
-	void decodeString( ucstring& str, NLMISC::CBitMemStream& bms );
+	void decodeString( ucstring& str, NLMISC::CBitMemStream& bms ); // OLD
 
 	/// Get infos on the dynamic string
 	CDynamicStringInfos * getDynamicStringInfos( uint32 index );
@@ -111,7 +111,7 @@ private :
 	std::map< uint32, CDynamicStringInfos *> _Data;
 
 	/// Map to find index from the string (only for uncoded strings)
-	std::map< ucstring, uint32> _StringToIndex;
+	std::map< ucstring, uint32> _StringToIndex; // OLD
 
 };
 #endif
@@ -372,13 +372,13 @@ private :
 #ifdef OLD_STRING_SYSTEM
 class CNetworkString
 {
-	ucstring StaticString;
+	ucstring StaticString; // OLD
 public:
 	std::vector<uint64> Args;
 
-	bool getString (ucstring &result, CClientChatManager *mng);
+	bool getString (ucstring &result, CClientChatManager *mng); // OLD
 
-	void setString (const ucstring &staticStringId, CClientChatManager *mng);
+	void setString (const ucstring &staticStringId, CClientChatManager *mng); // OLD
 };
 #endif
 
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index d756c938c..ea14537be 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -241,7 +241,7 @@ NLMISC_COMMAND(equipGroup, "equip group <name>", "name")
 	if(CItemGroupManager::getInstance()->equipGroup(args[0]))
 	{
 		string msg = CI18N::get("cmdEquipGroupSuccess");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -250,7 +250,7 @@ NLMISC_COMMAND(equipGroup, "equip group <name>", "name")
 	else
 	{
 		string msg = CI18N::get("cmdEquipGroupError");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -273,7 +273,7 @@ NLMISC_COMMAND(moveGroup, "move group <name> to <dst>", "name dst")
 	if(CItemGroupManager::getInstance()->moveGroup(args[0], INVENTORIES::toInventory(args[1])))
 	{
 		string msg = CI18N::get("cmdMoveGroupSuccess");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		strFindReplace(msg, "%inventory", args[1]);
@@ -283,7 +283,7 @@ NLMISC_COMMAND(moveGroup, "move group <name> to <dst>", "name dst")
 	else
 	{
 		string msg = CI18N::get("cmdMoveGroupError");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		strFindReplace(msg, "%inventory", args[1]);
@@ -313,7 +313,7 @@ NLMISC_COMMAND(createGroup, "create group <name> [true](create a <remove> for ev
 			msg = CI18N::get("cmdCreateGroupSuccess2");
 		else
 			msg = CI18N::get("cmdCreateGroupSuccess1");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -322,7 +322,7 @@ NLMISC_COMMAND(createGroup, "create group <name> [true](create a <remove> for ev
 	else
 	{
 		string msg = CI18N::get("cmdCreateGroupError");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -345,7 +345,7 @@ NLMISC_COMMAND(deleteGroup, "delete group <name>", "name")
 	if(CItemGroupManager::getInstance()->deleteGroup(args[0]))
 	{
 		string msg = CI18N::get("cmdDeleteGroupSuccess");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -354,7 +354,7 @@ NLMISC_COMMAND(deleteGroup, "delete group <name>", "name")
 	else
 	{
 		string msg = CI18N::get("cmdDeleteGroupError");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = args[0];
 		strFindReplace(msg, "%name", nameUC);
 		pIM->displaySystemInfo(msg);
@@ -1672,10 +1672,10 @@ NLMISC_COMMAND(missionProgress, "debug"," ")
 NLMISC_COMMAND( displayDBModifs, "display server database modification in the chat window"," ")
 {
 	if ( VerboseDatabase )
-		CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already in verbose mode"),CRGBA(255,255,255,255));
+		CInterfaceManager::getInstance()->getChatOutput()->addTextChild("the database is already in verbose mode",CRGBA(255,255,255,255));
 	else
 	{
-		CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("database  is now in verbose mode"),CRGBA(255,255,255,255));
+		CInterfaceManager::getInstance()->getChatOutput()->addTextChild("database  is now in verbose mode",CRGBA(255,255,255,255));
 		VerboseDatabase = true;
 	}
 	return true;
@@ -1684,10 +1684,10 @@ NLMISC_COMMAND( displayDBModifs, "display server database modification in the ch
 NLMISC_COMMAND( hideDBModifs, "stop displaying server database modification in the chat window"," ")
 {
 	if ( !VerboseDatabase )
-		CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already not in verbose mode"),CRGBA(255,255,255,255));
+		CInterfaceManager::getInstance()->getChatOutput()->addTextChild("the database is already not in verbose mode",CRGBA(255,255,255,255));
 	else
 	{
-		CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("database is not in verbose mode anymore"),CRGBA(255,255,255,255));
+		CInterfaceManager::getInstance()->getChatOutput()->addTextChild("database is not in verbose mode anymore",CRGBA(255,255,255,255));
 		VerboseDatabase = false;
 	}
 	return true;
@@ -2297,7 +2297,7 @@ NLMISC_COMMAND(record, "Start Recording", "<name>")
 	// Warning when already recording.
 	if(NetMngr.isRecording())
 	{
-		IM->displaySystemInfo(ucstring("Already Recording. Stop the current Record first"));
+		IM->displaySystemInfo("Already Recording. Stop the current Record first");
 		return true;
 	}
 
@@ -2641,12 +2641,12 @@ NLMISC_COMMAND(magic, "Cast a spell", "\n"
 	if(args.size() != 6)
 	{
 		// Help
-//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 or 3 paramters :"));
-//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Slot> : the slot number of the entity to change"));
-//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Behaviour> : the behaviour to play for the entity, one of the following number :"));
+//		CInterfaceManager::getInstance()->displaySystemInfo("This command need 2 or 3 paramters :");
+//		CInterfaceManager::getInstance()->displaySystemInfo("  <Slot> : the slot number of the entity to change");
+//		CInterfaceManager::getInstance()->displaySystemInfo("  <Behaviour> : the behaviour to play for the entity, one of the following number :");
 //		for(uint i = 0; i<MBEHAV::EMOTE_BEGIN; ++i)
-//			CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i))));
-//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END)));
+//			CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i)));
+//		CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END));
 	}
 	else
 	{
@@ -2695,7 +2695,7 @@ NLMISC_COMMAND(magic, "Cast a spell", "\n"
 			entity->updateVisualProperty(NetMngr.getCurrentServerTick()+50, CLFECOMMON::PROPERTY_BEHAVIOUR);
 		}
 		else
-			CInterfaceManager::getInstance()->displaySystemInfo(ucstring("There is no entity in the given slot"));
+			CInterfaceManager::getInstance()->displaySystemInfo("There is no entity in the given slot");
 	}
 
 	// Command well done.
@@ -2714,12 +2714,12 @@ NLMISC_COMMAND(spell, "Cast a spell", "\n"
 	if(args.size() != 6)
 	{
 		// Help
-		//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 or 3 paramters :"));
-		//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Slot> : the slot number of the entity to change"));
-		//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring("  <Behaviour> : the behaviour to play for the entity, one of the following number :"));
+		//		CInterfaceManager::getInstance()->displaySystemInfo("This command need 2 or 3 paramters :");
+		//		CInterfaceManager::getInstance()->displaySystemInfo("  <Slot> : the slot number of the entity to change");
+		//		CInterfaceManager::getInstance()->displaySystemInfo("  <Behaviour> : the behaviour to play for the entity, one of the following number :");
 		//		for(uint i = 0; i<MBEHAV::EMOTE_BEGIN; ++i)
-		//			CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i))));
-		//		CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END)));
+		//			CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i)));
+		//		CInterfaceManager::getInstance()->displaySystemInfo(NLMISC::toString("    %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END));
 	}
 	else
 	{
@@ -5314,8 +5314,8 @@ void CUserCommand::release()
 
 // ***************************************************************************
 
-CUserCommand::CUserCommand(const string &commandName, const ucstring &help, const ucstring &argsHelp)
-		: ICommand("user", commandName.c_str(), toString(help).c_str(), toString(argsHelp).c_str())
+CUserCommand::CUserCommand(const string &commandName, const string &help, const string &argsHelp)
+		: ICommand("user", commandName.c_str(), help.c_str(), argsHelp.c_str())
 {
 	CommandName  = commandName;
 }
@@ -5369,7 +5369,7 @@ bool CUserCommand::execute(const std::string &/* rawCommandString */, const std:
 				else
 				{
 					if (keywords[i] == "$")
-						finalArgs += /*ucstring(*/args[index++]/*).toUtf8()*/;
+						finalArgs += args[index++];
 					else
 					{
 						while (index<args.size())
@@ -5447,13 +5447,13 @@ void CUserCommand::createCommand (const char *name, const char *action, const ch
 	}
 
 	// Find action name
-	ucstring help;
+	string help;
 	const CBaseAction *ab = Actions.getBaseAction (::CAction::CName (action, ptrParams));
 	if (ab)
 		help = CI18N::get(ab->LocalizedName);
 
 	// Build a argument help
-	ucstring argsHelp;
+	string argsHelp;
 
 	if (ab)
 	{
@@ -5477,7 +5477,7 @@ void CUserCommand::createCommand (const char *name, const char *action, const ch
 							// Add the string
 							if (!argsHelp.empty())
 								argsHelp += " ";
-							argsHelp += ucstring("<") + CI18N::get(ab->Parameters[j].LocalizedName) + ucstring(">");
+							argsHelp += "<" + CI18N::get(ab->Parameters[j].LocalizedName) + ">";
 							bFound = true;
 						}
 					}
diff --git a/ryzom/client/src/commands.h b/ryzom/client/src/commands.h
index 8a0b8764a..2d724f289 100644
--- a/ryzom/client/src/commands.h
+++ b/ryzom/client/src/commands.h
@@ -43,7 +43,7 @@ public:
 		std::vector<std::string>		Keywords;
 	};
 
-	CUserCommand (const std::string &commandName, const ucstring &help, const ucstring &argsHelp);
+	CUserCommand (const std::string &commandName, const std::string &help, const std::string &argsHelp);
 
 	void addMode (const std::string &action, uint numArg, bool infiniteAgr, const std::vector<std::string> &keywords);
 
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 2885ee1ac..63b8a6dd8 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -149,8 +149,8 @@ std::string	PlayerSelectedHomeShardName;
 std::string	PlayerSelectedHomeShardNameWithParenthesis;
 extern std::string CurrentCookie;
 
-ucstring NewKeysCharNameWanted; // name of the character for which a new keyset must be created
-ucstring NewKeysCharNameValidated;
+std::string NewKeysCharNameWanted; // name of the character for which a new keyset must be created
+std::string NewKeysCharNameValidated;
 std::string GameKeySet = "keys.xml";
 std::string RingEditorKeySet = "keys_r2ed.xml";
 
@@ -520,7 +520,9 @@ bool connection (const string &cookie, const string &fsaddr)
 	if (InterfaceState == GOGOGO_IN_THE_GAME)
 	{
 		// set background downloader to 'paused' to ease loading of client
+#ifdef RYZOM_BG_DOWNLOADER
 		pauseBGDownloader();
+#endif
 		return true;
 	}
 
@@ -659,7 +661,9 @@ bool reconnection()
 
 	if (InterfaceState == GOGOGO_IN_THE_GAME)
 	{
+#ifdef RYZOM_BG_DOWNLOADER
 		pauseBGDownloader();
+#endif
 		return true;
 	}
 	if (InterfaceState == QUIT_THE_GAME)
@@ -779,12 +783,12 @@ void globalMenuMovieShooter()
 
 // ------------------------------------------------------------------------------------------------
 // Build a valid PlayerName for file Save selection.
-std::string	buildPlayerNameForSaveFile(const ucstring &playerNameIn)
+std::string	buildPlayerNameForSaveFile(const std::string &playerNameIn)
 {
 	// remove any shard name appended
-	ucstring playerName = playerNameIn;
-	ucstring::size_type pos = playerNameIn.find('(');
-	if(pos!=ucstring::npos && pos>0)
+	string playerName = playerNameIn;
+	string::size_type pos = playerNameIn.find('(');
+	if(pos!=string::npos && pos>0)
 	{
 		playerName.resize(pos);
 	}
@@ -809,9 +813,9 @@ std::string	buildPlayerNameForSaveFile(const ucstring &playerNameIn)
 }
 
 
+#ifdef RYZOM_BG_DOWNLOADER
 static bool LuaBGDSuccessFlag = true; // tmp, for debug
 
-
 void updateBGDownloaderUI()
 {
 	CInterfaceManager *im = CInterfaceManager::getInstance();
@@ -909,11 +913,12 @@ void updateBGDownloaderUI()
 		nlwarning("Some scipt error occurred");
 	}
 }
-
+#endif
 
 // compute patcher priority, depending on the presence of one or more mainland characters : in this case, give the patch a boost
 void updatePatcherPriorityBasedOnCharacters()
 {
+#ifdef RYZOM_BG_DOWNLOADER
 	if (isBGDownloadEnabled())
 	{
 		if (CBGDownloaderAccess::getInstance().getDownloadThreadPriority() != BGDownloader::ThreadPriority_Paused)
@@ -932,6 +937,7 @@ void updatePatcherPriorityBasedOnCharacters()
 			CBGDownloaderAccess::getInstance().requestDownloadThreadPriority(hasMainlandChar ? BGDownloader::ThreadPriority_Normal : BGDownloader::ThreadPriority_Low, false);
 		}
 	}
+#endif
 }
 
 // Launch the interface to choose a character
@@ -940,6 +946,7 @@ TInterfaceState globalMenu()
 {
 	CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_CharacterSelection, "login_step_character_selection"));
 
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess &bgDownloader = CBGDownloaderAccess::getInstance();
 
 	if (isBGDownloadEnabled())
@@ -950,14 +957,14 @@ TInterfaceState globalMenu()
 			// if a task is already started, then this was a situation where player went back from game to the character selection,
 			// so just unpause
 			BGDownloader::TTaskResult dummyResult;
-			ucstring				  dummyMessage;
+			ucstring				  dummyMessage; // OLD
 			if (!bgDownloader.isTaskEnded(dummyResult, dummyMessage))
 			{
 				unpauseBGDownloader();
 			}
 		}
 	}
-
+#endif
 
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
@@ -1003,8 +1010,9 @@ TInterfaceState globalMenu()
 			}
 		#endif
 
+#ifdef RYZOM_BG_DOWNLOADER
 		updateBGDownloaderUI();
-
+#endif
 
 		// Update network.
 		try
@@ -1087,7 +1095,7 @@ TInterfaceState globalMenu()
 		{
 			if (noUserChar || userChar)
 			{
-
+#ifdef RYZOM_BG_DOWNLOADER
 				if (isBGDownloadEnabled())
 				{
 					// If there's a need for mainland download, then proceed
@@ -1096,7 +1104,7 @@ TInterfaceState globalMenu()
 						// if a task is already started, then this was a situation where player went back from game to the character selection,
 						// so just unpause
 						BGDownloader::TTaskResult dummyResult;
-						ucstring				  dummyMessage;
+						ucstring				  dummyMessage; // OLD
 						if (bgDownloader.isTaskEnded(dummyResult, dummyMessage))
 						{
 							// launch mainland patch as a background task
@@ -1111,6 +1119,7 @@ TInterfaceState globalMenu()
 						}
 					}
 				}
+#endif
 
 				//nlinfo("impulseCallBack : received userChars list");
 				noUserChar = userChar = false;
@@ -1260,8 +1269,8 @@ TInterfaceState globalMenu()
 	LoginSM.pushEvent(CLoginStateMachine::ev_global_menu_exited);
 
 	//  Init the current Player Name (for interface.cfg and sentence.name save). Make a good File Name.
-	ucstring	&playerName= CharacterSummaries[PlayerSelectedSlot].Name;
-	PlayerSelectedFileName= buildPlayerNameForSaveFile(playerName);
+	string playerName = CharacterSummaries[PlayerSelectedSlot].Name.toUtf8();
+	PlayerSelectedFileName = buildPlayerNameForSaveFile(playerName);
 
 	// Init the current Player Home shard Id and name
 	CharacterHomeSessionId = CharacterSummaries[PlayerSelectedSlot].Mainland;
@@ -1337,7 +1346,7 @@ public:
 REGISTER_ACTION_HANDLER (CAHNetInitCharSel, "net_init_char_sel");
 
 // ------------------------------------------------------------------------------------------------
-void setTarget(CCtrlBase *ctrl, const string &targetName, ucstring &value)
+void setTarget(CCtrlBase *ctrl, const string &targetName, std::string &value)
 {
 	std::vector<CInterfaceLink::CTargetInfo> targets;
 	// find first enclosing group
@@ -1352,7 +1361,7 @@ void setTarget(CCtrlBase *ctrl, const string &targetName, ucstring &value)
 	if (ig)
 	{
 		CInterfaceExprValue exprValue;
-		exprValue.setString(value.toUtf8());
+		exprValue.setString(value);
 
 		CInterfaceLink::splitLinkTargets(targetName, ig, targets);
 		for(uint k = 0; k < targets.size(); ++k)
@@ -1410,12 +1419,12 @@ public:
 		if (CharacterSummaries[PlayerSelectedSlot].Name.empty())
 			return;
 
-		ucstring sValue("");
+		string sValue;
 		uint32 nValue = 0;
 
 		if (sProp == "name")
 		{
-			sValue = CharacterSummaries[PlayerSelectedSlot].Name;
+			sValue = CharacterSummaries[PlayerSelectedSlot].Name.toUtf8();
 			setTarget (pCaller, sTarget, sValue);
 		}
 /*			else if (sProp == "surname")
@@ -1440,10 +1449,10 @@ Deprecated	{
 			sValue = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(titleStr, womanTitle);
 			{
 				// Sometimes translation contains another title
-				ucstring::size_type pos = sValue.find('$');
-				if (pos != ucstring::npos)
+				string::size_type pos = sValue.find('$');
+				if (pos != string::npos)
 				{
-					sValue = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sValue.toUtf8()), womanTitle);
+					sValue = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(sValue), womanTitle);
 				}
 			}
 			setTarget (pCaller, sTarget, sValue);
@@ -1684,11 +1693,11 @@ public:
 
 		// Setup the name
 		string sEditBoxPath = getParam (Params, "name");
-		ucstring sFirstName = ucstring("NotSet");
-		ucstring sSurName = ucstring("NotSet");
+		string sFirstName = "NotSet";
+		string sSurName = "NotSet";
 		CGroupEditBox *pGEB = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(sEditBoxPath));
 		if (pGEB != NULL)
-			sFirstName = pGEB->getInputStringAsUtf16();
+			sFirstName = pGEB->getInputString();
 		else
 			nlwarning ("can't get edit box name : %s",sEditBoxPath.c_str());
 
@@ -1803,8 +1812,8 @@ public:
 		out.serial (nSelectedSlot);
 
 		// Yoyo: delete the Local files. To avoid problem if recreate a character with same name.
-		ucstring	&playerName= CharacterSummaries[nSelectedSlot].Name;
-		string		playerDeletedFileName= buildPlayerNameForSaveFile(playerName);
+		string playerName = CharacterSummaries[nSelectedSlot].Name.toUtf8();
+		string playerDeletedFileName = buildPlayerNameForSaveFile(playerName);
 		// Delete the 2 Local files
 		pIM->deletePlayerConfig(playerDeletedFileName);
 		pIM->deletePlayerKeys(playerDeletedFileName);
@@ -1855,7 +1864,7 @@ string getTarget(CCtrlBase * /* ctrl */, const string &targetName)
 }
 
 // ------------------------------------------------------------------------------------------------
-ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName)
+ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName) // TODO: UTF-8 Lua
 {
 	string sTmp = targetName;
 	std::vector<CInterfaceLink::CTargetInfo> targetsVector;
@@ -1867,13 +1876,13 @@ ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName)
 	if (!elem)
 	{
 		nlwarning("<CInterfaceExpr::getprop> : Element is NULL");
-		return ucstring("");
+		return ucstring(""); // TODO: UTF-8 Lua
 	}
 	const CReflectedProperty *pRP = elem->getReflectedProperty(rTI.PropertyName);
 
 	if (pRP->Type == CReflectedProperty::UCString)
 		return ((elem->*(pRP->GetMethod.GetUCString))());
-	return ucstring("");
+	return ucstring(""); // TODO: UTF-8 Lua
 }
 
 /*// Ask the server to rename a character
@@ -1946,7 +1955,7 @@ public:
 		string sDBLink = getParam(Params, "dblink");
 		CharNameValidDBLink = sDBLink;
 
-		ucstring sName = getUCTarget(NULL,sTarget);
+		string sName = getUCTarget(NULL,sTarget).toUtf8(); // TODO: UTF-8 Lua
 
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		if (sName.empty())
@@ -1988,13 +1997,13 @@ public:
 					if (Mainlands[k].Id == MainlandSelected)
 					{
 						// extract name from mainland
-						/*ucstring::size_type first = Mainlands[k].Name.find('(');
-						ucstring::size_type last = Mainlands[k].Name.find(')');
-						if (first != ucstring::npos && last != ucstring::npos && first < last)
+						/*ucstring::size_type first = Mainlands[k].Name.find('('); // OLD
+						ucstring::size_type last = Mainlands[k].Name.find(')');// OLD
+						if (first != ucstring::npos && last != ucstring::npos && first < last)// OLD
 						{
 							NewKeysCharNameWanted += Mainlands[k].Name.substr(first, last - first + 1);
 						}*/
-						NewKeysCharNameWanted += ('(' + Mainlands[k].Name + ')');
+						NewKeysCharNameWanted += ('(' + Mainlands[k].Name.toUtf8() + ')');
 						break;
 					}
 				}
@@ -2017,7 +2026,7 @@ public:
 
 				for (uint i = 0; i < CharacterSummaries.size(); ++i)
 				{
-					ucstring ls = CharacterSummaries[i].Name.toString();
+					string ls = CharacterSummaries[i].Name.toString();
 					if (ls == sName)
 						CharNameValid = false;
 				}
@@ -2304,7 +2313,7 @@ public:
 	}
 
 	// add a new keyset in the list
-	void addKeySet(const std::string &filename, const ucstring &name, const ucstring tooltip)
+	void addKeySet(const std::string &filename, const std::string &name, const std::string tooltip)
 	{
 		nlassert(List);
 		CInterfaceGroup *pNewLine = buildTemplate("t_keyset", toString(filename));
@@ -2313,13 +2322,13 @@ public:
 			CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name"));
 			if (pVT != NULL)
 			{
-				pVT->setTextLocalized(name.toUtf8(), false);
+				pVT->setTextLocalized(name, false);
 			}
 
 			CCtrlBase *pBut = pNewLine->getCtrl("but");
 			if (pBut != NULL)
 			{
-				pBut->setDefaultContextHelp(tooltip.toUtf8());
+				pBut->setDefaultContextHelp(tooltip);
 			}
 			addGroupInList(pNewLine);
 		}
@@ -2355,12 +2364,12 @@ public:
 
 				std::string strId = "uiCP_KeysetName_" + keySetVar->asString(k);
 				strFindReplace(strId, ".", "_");
-				ucstring keySetName = CI18N::get(strId);
+				const string &keySetName = CI18N::get(strId);
 				strId = "uiCP_KeysetTooltip_" + keySetVar->asString(k);
 				strFindReplace(strId, ".", "_");
 				if (CI18N::hasTranslation(strId))
 				{
-					ucstring keySetTooltip = CI18N::get(strId);
+					const string &keySetTooltip = CI18N::get(strId);
 					addKeySet(keySetVar->asString(k), keySetName, keySetTooltip);
 				}
 			}
@@ -2369,8 +2378,8 @@ public:
 		{
 			nlwarning("'%s' var not found in config file, or list is empty, proposing default keyset only", KeySetVarName);
 			std::string defaultKeySet = "keys";
-			ucstring keySetName = CI18N::get("uiCP_KeysetName_" + defaultKeySet);
-			ucstring keySetTooltip = CI18N::get("uiCP_KeysetTooltip_" + defaultKeySet);
+			const string &keySetName = CI18N::get("uiCP_KeysetName_" + defaultKeySet);
+			const string &keySetTooltip = CI18N::get("uiCP_KeysetTooltip_" + defaultKeySet);
 			addKeySet(defaultKeySet, keySetName, keySetTooltip);
 		}
 
@@ -2396,19 +2405,19 @@ public:
 		{
 			for(TKeySetFileMap::iterator it = keySetFiles.begin(); it != keySetFiles.end(); ++it)
 			{
-				ucstring name;
+				string name;
 				if (ClientCfg.Local)
 				{
-					name = ucstring(it->first);
+					name = it->first;
 				}
 				else
 				{
-					// search matching ucstring name from character summaries
+					// search matching utf-8 string name from character summaries
 					for (uint k = 0; k < CharacterSummaries.size(); ++k)
 					{
-						if (it->first == buildPlayerNameForSaveFile(CharacterSummaries[k].Name))
+						if (it->first == buildPlayerNameForSaveFile(CharacterSummaries[k].Name.toUtf8()))
 						{
-							name = CharacterSummaries[k].Name;
+							name = CharacterSummaries[k].Name.toUtf8();
 						}
 					}
 				}
@@ -2419,7 +2428,7 @@ public:
 						addSeparator();
 						separatorAdded = true;
 					}
-					addKeySet(it->first, ucstring(it->first), CI18N::get(std::string("uiCP_KeysetImport") + (it->second & GameKeys ? "_Game" : "")
+					addKeySet(it->first, it->first, CI18N::get(std::string("uiCP_KeysetImport") + (it->second & GameKeys ? "_Game" : "")
 																						  + (it->second & EditorKeys ? "_Editor" : "")));
 				}
 			}
@@ -2554,26 +2563,24 @@ REGISTER_ACTION_HANDLER (CAHResetKeysetSelect, "keyset_select");
 // *************************** SCENARIO CONTROL WINDOW ***********************
 // ***************************************************************************
 // helper function for "setScenarioInformation"
-static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName, const ucstring &text)
+static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName, const std::string &text)
 {
 	CInterfaceElement *result = scenarioWnd->findFromShortId(uiName);
 	if(result)
 	{
 		CViewText* viewText = dynamic_cast<CViewText*>(result);
 		if(viewText)
-			viewText->setTextLocalized(text.toUtf8(), false);
+			viewText->setTextLocalized(text, false);
 		CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 		if(editBox)
-			editBox->setInputStringAsUtf16(text);
+			editBox->setInputString(text);
 
 	}
 }
 // helper function for "setScenarioInformation"
-static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName, const std::string &utf8Text)
+static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName, const ucstring &text) // TODO: UTF-8 Lua
 {
-	ucstring ucText;
-	ucText.fromUtf8(utf8Text);
-	setTextField(scenarioWnd, uiName, ucText);
+	setTextField(scenarioWnd, uiName, text.toUtf8());
 }
 // helper function for "setScenarioInformation"
 static std::string fieldLookup(const vector< pair< string, string > > &values, const std::string &id)
@@ -3455,7 +3462,7 @@ class CAHInitImportCharacter : public IActionHandler
 		CPath::getPathContent("save/", false, false, true, savedCharacters);
 
 		CInterfaceGroup *newLine;
-		CInterfaceGroup *prevLine;
+		CInterfaceGroup *prevLine = NULL;
 
 		for (uint i = 0; i < savedCharacters.size(); ++i)
 		{
@@ -3644,7 +3651,7 @@ class CAHExportCharacter : public IActionHandler
 			return;
 
 		// extract name
-		const std::string name = buildPlayerNameForSaveFile(CS.Name.toString());
+		const std::string name = buildPlayerNameForSaveFile(CS.Name.toUtf8());
 
 		COFile fd;
 		bool success = false;
diff --git a/ryzom/client/src/connection.h b/ryzom/client/src/connection.h
index bb6f4cd24..7c81b0c80 100644
--- a/ryzom/client/src/connection.h
+++ b/ryzom/client/src/connection.h
@@ -36,8 +36,8 @@ extern std::vector<CCharacterSummary>	CharacterSummaries;
 extern std::string UserPrivileges;
 extern sint LoginCharsel;
 
-extern ucstring NewKeysCharNameWanted;
-extern ucstring NewKeysCharNameValidated;
+extern std::string NewKeysCharNameWanted;
+extern std::string NewKeysCharNameValidated;
 extern std::string GameKeySet;
 extern std::string RingEditorKeySet;
 
@@ -71,12 +71,14 @@ enum TInterfaceState
 TInterfaceState autoLogin (const std::string &cookie, const std::string &fsaddr, bool firstConnection);
 
 
-std::string buildPlayerNameForSaveFile(const ucstring &playerNameIn);
+std::string buildPlayerNameForSaveFile(const std::string &playerNameIn);
 
 
 void globalMenuMovieShooter();
 
+#ifdef RYZOM_BG_DOWNLOADER
 void updateBGDownloaderUI();
+#endif
 
 // compute patcher priority, depending on the presence of one or more mainland characters : in this case, give the patch a boost
 void updatePatcherPriorityBasedOnCharacters();
diff --git a/ryzom/client/src/continent.cpp b/ryzom/client/src/continent.cpp
index 3a7dff52d..07fd6155a 100644
--- a/ryzom/client/src/continent.cpp
+++ b/ryzom/client/src/continent.cpp
@@ -413,7 +413,9 @@ static uint16 getZoneIdFromName(const string &zoneName)
 //-----------------------------------------------
 void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress, bool complete, bool unhibernate, EGSPD::CSeason::TSeason season)
 {
+#ifdef RYZOM_BG_DOWNLOADER
 	pauseBGDownloader();
+#endif
 	CNiceInputAuto niceInputs;
 	// Season has changed ?
 	Season = season;
diff --git a/ryzom/client/src/continent_manager_build.h b/ryzom/client/src/continent_manager_build.h
index 52719f9ad..b8d7a7e82 100644
--- a/ryzom/client/src/continent_manager_build.h
+++ b/ryzom/client/src/continent_manager_build.h
@@ -43,7 +43,7 @@ public:
 	TContLMType			Type;
 	NLMISC::CVector2f	Pos;			// Center of the zone
 	NLLIGO::CPrimZone	Zone;			// Region & Place
-	std::string			TitleTextID;	// should be converted with CStringManagerClient::getPlaceLocalizedName() to get the actual title in ucstring
+	std::string			TitleTextID;	// should be converted with CStringManagerClient::getPlaceLocalizedName() to get the actual title in utf-8 string
 
 	CContLandMark()
 	{
diff --git a/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
index 80d64c35a..11c403403 100644
--- a/ryzom/client/src/entities.cpp
+++ b/ryzom/client/src/entities.cpp
@@ -246,7 +246,7 @@ public :
 	}
 private:
 	std::list<CCDBNodeLeaf *> _PendingMissionTitle;
-//	std::set<ucstring> _AlreadyReceived;
+//	std::set<std::string> _AlreadyReceived;
 };
 
 //-----------------------------------------------
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index fa3d9720d..7f98d8b82 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -422,11 +422,13 @@ void CLoginStateMachine::run()
 
 			bool mustReboot = false;
 
+#ifdef RYZOM_BG_DOWNLOADER
 			if (isBGDownloadEnabled())
 			{
 				mustReboot = CBGDownloaderAccess::getInstance().mustLaunchBatFile();
 			}
 			else
+#endif
 			{
 				mustReboot = CPatchManager::getInstance()->mustLaunchBatFile();
 			}
@@ -470,11 +472,13 @@ void CLoginStateMachine::run()
 			}
 			initPatchCheck();
 			SM_BEGIN_EVENT_TABLE
+#ifdef RYZOM_BG_DOWNLOADER
 				if (isBGDownloadEnabled())
 				{
 					SM_EVENT(ev_patch_needed, st_patch); // no choice for patch content when background downloader is used
 				}
 				else
+#endif
 				{
 					SM_EVENT(ev_patch_needed, st_display_cat);
 				}
@@ -600,7 +604,9 @@ void CLoginStateMachine::run()
 			break;
 		case st_enter_far_tp_main_loop:
 			// if bgdownloader is used, then pause it
+#ifdef RYZOM_BG_DOWNLOADER
 			pauseBGDownloader();
+#endif
 
 
 			// Far TP part 1.2: let the main loop finish the current frame.
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index b9e701e92..dbaa9a5c8 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -341,9 +341,7 @@ void ExitClientError (const char *format, ...)
 	CurrentErrorMessage = NLMISC::utf8ToWide(str);
 	DialogBox(HInstance, MAKEINTRESOURCE(IDD_ERROR_HELP_MESSAGE_BOX), NULL, ExitClientErrorDialogProc);
 	/*
-		ucstring ucstr;
-		ucstr.fromUtf8 (str);
-		MessageBoxW (NULL, (WCHAR *)ucstr.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONERROR);
+		MessageBoxW (NULL, nlUtf8ToWide(str.c_str()), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONERROR);
 	*/
 #else
 	fprintf (stderr, "%s\n", str);
@@ -357,18 +355,18 @@ void ExitClientError (const char *format, ...)
 }
 
 // Use this function to return an information to the final user
-void ClientInfo (const ucstring &message)
+void ClientInfo (const std::string &message)
 {
 #ifdef NL_OS_WINDOWS
-	MessageBoxW(NULL, (WCHAR *)message.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONINFORMATION);
+	MessageBoxW(NULL, nlUtf8ToWide(message.c_str()), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_OK|MB_ICONINFORMATION);
 #endif
 }
 
 // Use this function to ask a question to the final user
-bool ClientQuestion (const ucstring &message)
+bool ClientQuestion (const std::string &message)
 {
 #ifdef NL_OS_WINDOWS
-	return MessageBoxW(NULL, (WCHAR *)message.c_str(), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_YESNO|MB_ICONQUESTION) != IDNO;
+	return MessageBoxW(NULL, nlUtf8ToWide(message.c_str()), nlUtf8ToWide(CI18N::get("TheSagaOfRyzom").c_str()), MB_YESNO|MB_ICONQUESTION) != IDNO;
 #else
 	return false;
 #endif
@@ -379,7 +377,7 @@ void selectTipsOfTheDay (uint /* tips */)
 	/* todo tips of the day uncomment
 	tips %= RZ_NUM_TIPS;
 	TipsOfTheDayIndex = tips;
-	ucstring title = CI18N::get ("uiTipsTitle");
+	string title = CI18N::get ("uiTipsTitle");
 	title += toString (tips+1);
 	title += " : ";
 	TipsOfTheDay = title+CI18N::get ("uiTips"+toString (tips));*/
@@ -541,7 +539,7 @@ void checkDriverVersion()
 			{
 				if (driverVersion < driversVersion[i])
 				{
-					ucstring message = CI18N::get ("uiUpdateDisplayDriversNotUpToDate") + "\n\n";
+					string message = CI18N::get ("uiUpdateDisplayDriversNotUpToDate") + "\n\n";
 					// message += CI18N::get ("uiUpdateDisplayDriversVendor") + driversVendor[i] + "\n";
 					message += CI18N::get ("uiUpdateDisplayDriversCard") + deviceName + "\n";
 					message += CI18N::get ("uiUpdateDisplayDriversCurrent") + getVersionString (driverVersion) + "\n";
@@ -999,7 +997,7 @@ void prelogInit()
 
 			FPU_CHECKER_ONCE
 			// Set the data path for the localisation.
-			const ucstring nmsg("Loading I18N...");
+			const string nmsg("Loading I18N...");
 			ProgressBar.newMessage ( nmsg );
 
 			FPU_CHECKER_ONCE
@@ -1177,7 +1175,9 @@ void prelogInit()
 
 #ifdef NL_OS_WINDOWS
 
+#ifdef RYZOM_BG_DOWNLOADER
 		CBGDownloaderAccess::getInstance().init();
+#endif
 
 		if (SlashScreen)
 			DestroyWindow (SlashScreen);
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index ee243a5a2..b43e8e19a 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -732,7 +732,7 @@ public:
 			CEntityCL *entity = EntitiesMngr.entity(trader);
 			if (entity)
 			{
-				ucstring playerName = entity->getEntityName();
+				string playerName = entity->getEntityName();
 				if (!playerName.empty())
 				{
 					PeopleInterraction.askAddContact(playerName, &PeopleInterraction.FriendList);
@@ -4023,7 +4023,6 @@ REGISTER_ACTION_HANDLER(CHandlerSelectProtectedSlot, "select_protected_slot");
 
 // ***************************************************************************
 // Common code
-//static	void	fillPlayerBarText(ucstring &str, const string &dbScore, const string &dbScoreMax, const string &ttFormat)
 static	void	fillPlayerBarText(std::string &str, const string &dbScore, SCORES::TScores score, const string &ttFormat)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
@@ -4567,7 +4566,7 @@ public:
 				}
 				else
 				{
-					ucstr = ucstring("&EMT&") + UserEntity->getDisplayName() + ucstring(" ") + ucstr;
+					ucstr = ucstring("&EMT&") + UserEntity->getDisplayName() + ucstring(" ") + ucstr; // FIXME: UTF-8 (serial)
 				}
 
 				out.serialEnum(behavToSend);
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index e8c36809f..3ba05a570 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -89,14 +89,14 @@ using namespace STRING_MANAGER;
 // STATIC FUNCTIONS DECLARATIONS //
 ///////////////////////////////////
 static void setupCreatorName(CSheetHelpSetup &setup);
-static void setHelpText(CSheetHelpSetup &setup, const ucstring &text);
+static void setHelpText(CSheetHelpSetup &setup, const string &text);
 static void setHelpTextID(CSheetHelpSetup &setup, sint32 id);
 static void fillSabrinaPhraseListBrick(const CSPhraseCom &phrase, IListSheetBase *listBrick);
 static void setupListBrickHeader(CSheetHelpSetup &setup);
 static void hideListBrickHeader(CSheetHelpSetup &setup);
 
 static void setupHelpPage(CInterfaceGroup *window, const string &url);
-static void setupHelpTitle(CInterfaceGroup	*group, const ucstring &title);
+static void setupHelpTitle(CInterfaceGroup	*group, const string &title);
 static void setHelpCtrlSheet(CSheetHelpSetup &setup, uint32 sheetId);
 
 // Setup help for an item in a window (type is known)
@@ -187,7 +187,7 @@ void	CInterfaceHelp::initWindows()
 	// add observers for the update of phrase help texts (depends of weight of equipped weapons)
 	for (uint i = 0; i < MAX_HANDINV_ENTRIES; ++i)
 	{
-		CCDBNodeLeaf *pNodeLeaf = NLGUI::CDBManager::getInstance()->getDbProp(std::string(LOCAL_INVENTORY) + ":HAND:" + toString(i), false);
+		CCDBNodeLeaf *pNodeLeaf = NLGUI::CDBManager::getInstance()->getDbProp(string(LOCAL_INVENTORY) + ":HAND:" + toString(i), false);
 		if(pNodeLeaf)
 		{
 			ICDBNode::CTextId textId;
@@ -210,7 +210,7 @@ void	CInterfaceHelp::release()
 	// add observers for the update of phrase help texts (depends of weight of equipped weapons)
 	for (uint i = 0; i < MAX_HANDINV_ENTRIES; ++i)
 	{
-		CCDBNodeLeaf *pNodeLeaf = NLGUI::CDBManager::getInstance()->getDbProp(std::string(LOCAL_INVENTORY) + ":HAND:" + toString(i), false);
+		CCDBNodeLeaf *pNodeLeaf = NLGUI::CDBManager::getInstance()->getDbProp(string(LOCAL_INVENTORY) + ":HAND:" + toString(i), false);
 		if(pNodeLeaf)
 		{
 			ICDBNode::CTextId textId;
@@ -565,7 +565,7 @@ void			CInterfaceHelp::updateWindowSPhraseTexts()
  */
 class CHandlerCloseHelp : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CInterfaceHelp::closeAll();
 	}
@@ -578,7 +578,7 @@ REGISTER_ACTION_HANDLER( CHandlerCloseHelp, "close_help");
  */
 class CHandlerOpenItemHelp : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CDBCtrlSheet *cs = dynamic_cast<CDBCtrlSheet*>(pCaller);
 		if (cs != NULL && cs->getSheetId()!=0 )
@@ -609,7 +609,7 @@ REGISTER_ACTION_HANDLER( CHandlerOpenItemHelp, "open_item_help");
  */
 class CHandlerOpenPactHelp : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CDBCtrlSheet *cs = dynamic_cast<CDBCtrlSheet*>(pCaller);
 		if (cs != NULL && cs->getSheetId()!=0 )
@@ -633,7 +633,7 @@ REGISTER_ACTION_HANDLER( CHandlerOpenPactHelp, "open_pact_help");
  */
 class CHandlerOpenTitleHelp : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		// display web profile if necessary
 		if (getParam(sParams, "from") == "contact")
@@ -656,10 +656,10 @@ class CHandlerOpenTitleHelp : public IActionHandler
 			sint index = peopleList->getIndexFromContainerID(fatherGC->getId());
 			if (index == -1)
 				return;
-			ucstring name = peopleList->getName(index);
+			string name = peopleList->getName(index);
 			if ( ! name.empty())
 			{
-				CAHManager::getInstance()->runActionHandler("show_hide", pCaller, "profile|pname="+name.toUtf8()+"|ptype="+toString((int)CEntityCL::Player));
+				CAHManager::getInstance()->runActionHandler("show_hide", pCaller, "profile|pname="+name+"|ptype="+toString((int)CEntityCL::Player));
 			}
 			return;
 		}
@@ -670,7 +670,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 			if (selection == NULL) return;
 			//if(selection->isNPC())
 			{
-				std::string name = selection->getEntityName();
+				string name = selection->getEntityName();
 				if(name.empty())
 				{
 					// try to get the name from the string manager (for npc)
@@ -679,7 +679,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 					{
 						STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 						pSMC->getString (nDBid, name);
-						std::string copyName = name;
+						string copyName = name;
 						name = CEntityCL::removeTitleAndShardFromName(name);
 						if (name.empty())
 						{
@@ -689,7 +689,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 								woman = pChar->getGender() == GSGENDER::female;
 
 							// extract the replacement id
-							std::string strNewTitle = CEntityCL::getTitleFromName(copyName);
+							string strNewTitle = CEntityCL::getTitleFromName(copyName);
 
 							// retrieve the translated string
 							if (!strNewTitle.empty())
@@ -716,8 +716,8 @@ class CHandlerOpenTitleHelp : public IActionHandler
 
 		// Get name and title
 		// ------------------
-		ucstring name;
-		ucstring title;
+		string name;
+		string title;
 		bool reservedTitle = false;
 		string sFrom = getParam(sParams, "from");
 		if (sFrom == "target")
@@ -752,7 +752,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 		for (titleIDnb = 0; titleIDnb < CHARACTER_TITLE::NB_CHARACTER_TITLE; ++titleIDnb)
 		{
 			bool women = UserEntity && UserEntity->getGender()==GSGENDER::female;
-			if (CStringManagerClient::getTitleLocalizedName(CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)titleIDnb),women) == title.toUtf8())
+			if (CStringManagerClient::getTitleLocalizedName(CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)titleIDnb),women) == title)
 				break;
 		}
 
@@ -764,21 +764,21 @@ class CHandlerOpenTitleHelp : public IActionHandler
 
 		// Display all infos found
 		// -----------------------
-		ucstring titleText = CI18N::get("uihelpTitleFormat");
-		strFindReplace(titleText, "%name", name.toString());
+		string titleText = CI18N::get("uihelpTitleFormat");
+		strFindReplace(titleText, "%name", name);
 
 		// Display title
-		ucstring::size_type p1 = title.find('(');
-		if (p1 != ucstring::npos)
+		string::size_type p1 = title.find('(');
+		if (p1 != string::npos)
 		{
-			ucstring::size_type p2 = title.find(')', p1+1);
-			if (p2 != ucstring::npos)
+			string::size_type p2 = title.find(')', p1+1);
+			if (p2 != string::npos)
 				title = title.substr(p1+1, p2-p1-1);
 		}
 		strFindReplace(titleText, "%title", title);
 
 		// Display all skills needed to obtain this title
-		ucstring sSkillsNeeded;
+		string sSkillsNeeded;
 		if (!title.empty() && pTU == NULL)
 			sSkillsNeeded = CI18N::get("uiTitleCantObtain");
 
@@ -822,7 +822,7 @@ class CHandlerOpenTitleHelp : public IActionHandler
 		strFindReplace(titleText, "%skills", sSkillsNeeded);
 
 		// Display all bricks needed to obtain this title
-		ucstring sBricksNeeded;
+		string sBricksNeeded;
 		if (pTU != NULL)
 		{
 			sBricksNeeded = CI18N::get("uiTitleBrickHeader");
@@ -861,7 +861,7 @@ REGISTER_ACTION_HANDLER( CHandlerOpenTitleHelp, "open_title_help");
  */
 class CHandlerOpenSkillToTradeHelp : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CDBCtrlSheet *cs = dynamic_cast<CDBCtrlSheet*>(pCaller);
 		if (cs != NULL)
@@ -884,7 +884,7 @@ REGISTER_ACTION_HANDLER( CHandlerOpenSkillToTradeHelp, "open_skill_to_trade_help
  */
 class CHandlerOpenHelpAuto : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CDBCtrlSheet *cs = dynamic_cast<CDBCtrlSheet*>(pCaller);
 		if (!cs)
@@ -914,7 +914,7 @@ REGISTER_ACTION_HANDLER( CHandlerOpenHelpAuto, "open_help_auto");
  */
 class CHandlerBrowse : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		string container = getParam (sParams, "name");
 		CInterfaceElement *element = CWidgetManager::getInstance()->getElementFromId(container);
@@ -1052,7 +1052,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowse, "browse");
 class CHandlerBrowseUndo : public IActionHandler
 {
 public:
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 		string container = getParam (sParams, "name");
@@ -1071,7 +1071,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowseUndo, "browse_undo");
 class CHandlerBrowseRedo : public IActionHandler
 {
 public:
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 		string container = getParam (sParams, "name");
@@ -1090,7 +1090,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowseRedo, "browse_redo");
 class CHandlerBrowseRefresh : public IActionHandler
 {
 public:
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 		string container = getParam (sParams, "name");
@@ -1108,7 +1108,7 @@ REGISTER_ACTION_HANDLER( CHandlerBrowseRefresh, "browse_refresh");
 // ***************************************************************************
 class CHandlerHTMLSubmitForm : public IActionHandler
 {
-	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	void execute (CCtrlBase *pCaller, const string &sParams)
 	{
 		string container = getParam (sParams, "name");
 
@@ -1153,9 +1153,9 @@ static void setupHelpPage(CInterfaceGroup *window, const string &url)
 }
 
 // ***************************************************************************
-void setHelpText(CSheetHelpSetup &setup, const ucstring &text)
+void setHelpText(CSheetHelpSetup &setup, const string &text)
 {
-	ucstring	copyStr= text;
+	string	copyStr= text;
 	// remove trailing \n
 	while(!copyStr.empty() && copyStr[copyStr.size()-1]=='\n')
 	{
@@ -1166,7 +1166,7 @@ void setHelpText(CSheetHelpSetup &setup, const ucstring &text)
 	CViewText *viewText= dynamic_cast<CViewText *>(setup.HelpWindow->getView(setup.ViewText));
 	if(viewText)
 	{
-		viewText->setTextFormatTaged(copyStr.toUtf8());
+		viewText->setTextFormatTaged(copyStr);
 	}
 	CInterfaceGroup *viewTextGroup = setup.HelpWindow->getGroup(setup.ScrollTextGroup);
 	if (viewTextGroup) viewTextGroup->setActive(true);
@@ -1203,12 +1203,12 @@ void setHelpTextID(CSheetHelpSetup &setup, sint32 id)
 }
 
 // ***************************************************************************
-static void setupHelpTitle(CInterfaceGroup	*group, const ucstring &title)
+static void setupHelpTitle(CInterfaceGroup	*group, const string &title)
 {
 	CGroupContainer	*pGC= dynamic_cast<CGroupContainer*>(group);
 	if(!group)
 		return;
-	pGC->setUCTitle(title);
+	pGC->setTitle(title);
 }
 
 // ***************************************************************************
@@ -1237,10 +1237,10 @@ static void setupSkillToTradeHelp(CSheetHelpSetup &setup)
 		setup.DestSheet->setActive(true);
 	}
 
-	ucstring	skillText;
+	string	skillText;
 
 	// Name in title
-	const ucstring title(CStringManagerClient::getSkillLocalizedName(skill));
+	const char *title = CStringManagerClient::getSkillLocalizedName(skill);
 	setupHelpTitle(setup.HelpWindow, title);
 
 	// search all job that have minimum required level for that skill
@@ -1249,7 +1249,7 @@ static void setupSkillToTradeHelp(CSheetHelpSetup &setup)
 //	{
 //		for (uint job = 0; job < 8; ++job)
 //		{
-//			std::string dbPath = toString("CHARACTER_INFO:CAREER%d:JOB%d:JOB_CAP", (int) career, (int) job);
+//			string dbPath = toString("CHARACTER_INFO:CAREER%d:JOB%d:JOB_CAP", (int) career, (int) job);
 //			uint level = (uint) NLGUI::CDBManager::getInstance()->getDbProp(dbPath)->getValue32();
 //			if (level != 0) // has the player this job ?
 //			{
@@ -1265,10 +1265,11 @@ static void setupSkillToTradeHelp(CSheetHelpSetup &setup)
 //	}
 
 	// setup skill desc if available.
-	const ucstring desc(CStringManagerClient::getSkillLocalizedDescription(skill));
-	if( !desc.empty() )
+	const char *desc = CStringManagerClient::getSkillLocalizedDescription(skill);
+	if (*desc)
 	{
-		skillText+= "\n" + desc;
+		skillText += "\n";
+		skillText += desc;
 	}
 
 	setHelpText(setup, skillText);
@@ -1305,7 +1306,7 @@ static	string	toPercentageText(float val)
 }
 
 // ***************************************************************************
-void	getItemDefenseText(CDBCtrlSheet *item, ucstring &itemText)
+void	getItemDefenseText(CDBCtrlSheet *item, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1322,7 +1323,7 @@ void	getItemDefenseText(CDBCtrlSheet *item, ucstring &itemText)
 }
 
 
-void	getDamageText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText, bool displayAsMod)
+void	getDamageText(CDBCtrlSheet *item, const CItemSheet*pIS, string &itemText, bool displayAsMod)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1347,7 +1348,7 @@ void	getDamageText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText,
 	}
 }
 
-void	getSpeedText(CDBCtrlSheet *item, ucstring &itemText, bool displayAsMod)
+void	getSpeedText(CDBCtrlSheet *item, string &itemText, bool displayAsMod)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1358,7 +1359,7 @@ void	getSpeedText(CDBCtrlSheet *item, ucstring &itemText, bool displayAsMod)
 	strFindReplace(itemText, "%speed", strMod + toReadableFloat(itemInfo.HitRate));
 }
 
-void	getRangeText(CDBCtrlSheet *item, ucstring &itemText, bool displayAsMod)
+void	getRangeText(CDBCtrlSheet *item, string &itemText, bool displayAsMod)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1369,7 +1370,7 @@ void	getRangeText(CDBCtrlSheet *item, ucstring &itemText, bool displayAsMod)
 	strFindReplace(itemText, "%range", strMod + toReadableFloat(itemInfo.Range/1000.f));
 }
 
-void	getHPAndSapLoadText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
+void	getHPAndSapLoadText(CDBCtrlSheet *item, const CItemSheet*pIS, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1386,7 +1387,7 @@ void	getHPAndSapLoadText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &ite
 }
 
 
-void	getBuffText(CDBCtrlSheet *item, ucstring &itemText)
+void	getBuffText(CDBCtrlSheet *item, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1394,7 +1395,7 @@ void	getBuffText(CDBCtrlSheet *item, ucstring &itemText)
 	const string valIds[]={"Hp", "Sap", "Sta", "Focus"};
 	sint32		 vals[]= {itemInfo.HpBuff, itemInfo.SapBuff, itemInfo.StaBuff, itemInfo.FocusBuff};
 	uint		numVals= sizeof(vals) / sizeof(vals[0]);
-	ucstring	bufInfo;
+	string	bufInfo;
 
 	// For each buf, append a line if !=0
 	for(uint i=0;i<numVals;i++)
@@ -1402,7 +1403,7 @@ void	getBuffText(CDBCtrlSheet *item, ucstring &itemText)
 		sint32	modifier= vals[i];
 		if(modifier!=0)
 		{
-			ucstring	line= CI18N::get( "uihelpItem" + valIds[i] + (modifier>0?"Bonus":"Malus") );
+			string	line= CI18N::get( "uihelpItem" + valIds[i] + (modifier>0?"Bonus":"Malus") );
 			strFindReplace(line, "%val", toString(modifier) );
 			bufInfo+= line;
 		}
@@ -1416,13 +1417,13 @@ void	getBuffText(CDBCtrlSheet *item, ucstring &itemText)
 	strFindReplace(itemText, "%buffs", bufInfo);
 }
 
-void	getMagicProtection(CDBCtrlSheet	*item, ucstring &itemText)
+void	getMagicProtection(CDBCtrlSheet	*item, string &itemText)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 
-	ucstring	mProtInfo;
+	string	mProtInfo;
 
 	// Header (always here, because at least max absorb)
 	mProtInfo= CI18N::get("uihelpMagicProtectFormatHeader");
@@ -1433,7 +1434,7 @@ void	getMagicProtection(CDBCtrlSheet	*item, ucstring &itemText)
 		if(itemInfo.MagicProtection[i] != PROTECTION_TYPE::None)
 		{
 			// Protection info
-			ucstring	str= CI18N::get("uihelpMagicProtectFormat");
+			string	str= CI18N::get("uihelpMagicProtectFormat");
 			strFindReplace(str, "%t", CI18N::get("pt"+PROTECTION_TYPE::toString(itemInfo.MagicProtection[i])) );
 			strFindReplace(str, "%v", toString(itemInfo.MagicProtectionFactor[i]) );
 			mProtInfo+= str;
@@ -1449,7 +1450,7 @@ void	getMagicProtection(CDBCtrlSheet	*item, ucstring &itemText)
 			maxAbsorb= maxAbsorb*nodeFactor->getValue32()/100;
 
 		// Add to text
-		ucstring	str= CI18N::get("uihelpMagicProtectMaxAbsorbFormat");
+		string	str= CI18N::get("uihelpMagicProtectMaxAbsorbFormat");
 		strFindReplace(str, "%v", toString(maxAbsorb) );
 		mProtInfo+= str;
 	}
@@ -1458,12 +1459,12 @@ void	getMagicProtection(CDBCtrlSheet	*item, ucstring &itemText)
 	strFindReplace(itemText, "%magic_protection", mProtInfo);
 }
 
-void	getMagicResistance(CDBCtrlSheet	*item, ucstring &itemText)
+void	getMagicResistance(CDBCtrlSheet	*item, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 
-	ucstring	mResistInfo;
+	string	mResistInfo;
 
 	// Header (always here, because at least max absorb)
 	mResistInfo= CI18N::get("uihelpMagicResistFormatHeader");
@@ -1481,7 +1482,7 @@ void	getMagicResistance(CDBCtrlSheet	*item, ucstring &itemText)
 		if(resist[i] != 0)
 		{
 			// Resist info
-			ucstring	str= CI18N::get("uihelpMagicResistFormat");
+			string	str= CI18N::get("uihelpMagicResistFormat");
 			strFindReplace(str, "%t", CI18N::get("rs"+RESISTANCE_TYPE::toString((RESISTANCE_TYPE::TResistanceType)i) ));
 			strFindReplace(str, "%v", toReadableFloat(float(resist[i])/100) );
 			mResistInfo+= str;
@@ -1492,7 +1493,7 @@ void	getMagicResistance(CDBCtrlSheet	*item, ucstring &itemText)
 	strFindReplace(itemText, "%magic_resistance", mResistInfo);
 }
 
-void	getActionMalus(CDBCtrlSheet *item, ucstring &itemText)
+void	getActionMalus(CDBCtrlSheet *item, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1500,7 +1501,7 @@ void	getActionMalus(CDBCtrlSheet *item, ucstring &itemText)
 	strFindReplace(itemText, "%actmalus", toPercentageText(itemInfo.WearEquipmentMalus) );
 }
 
-void	getBulkText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
+void	getBulkText(CDBCtrlSheet *item, const CItemSheet*pIS, string &itemText)
 {
 	// Display direct value: because cannot know where this item will be drop!! (bag, mektoub etc...)
 	float	slotBulkTotal= max((sint32)1, item->getQuantity()) * pIS->Bulk;
@@ -1513,7 +1514,7 @@ void	getBulkText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
 		strFindReplace(itemText, "%bulk", toString("%.2f", slotBulkTotal) );
 }
 
-void	getWeightText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
+void	getWeightText(CDBCtrlSheet *item, const CItemSheet*pIS, string &itemText)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
@@ -1550,14 +1551,14 @@ void	getWeightText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
 		strFindReplace(itemText, "%weight", "???" );
 }
 
-void	getMagicBonus(CDBCtrlSheet *item, ucstring &itemText)
+void	getMagicBonus(CDBCtrlSheet *item, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 
 	nlctassert(CClientItemInfo::NumMagicFactorType==4);
 	const string valIds[CClientItemInfo::NumMagicFactorType]={"OffElemental", "OffAffliction", "DefHeal", "DefAffliction"};
-	ucstring	mbInfo;
+	string	mbInfo;
 
 	// For each magic bonus, test first if equal
 	sint32	allCastSpeedFactor= sint(itemInfo.CastingSpeedFactor[0]*100);
@@ -1582,7 +1583,7 @@ void	getMagicBonus(CDBCtrlSheet *item, ucstring &itemText)
 		if(allCastSpeedFactor!=0 || allMagicPowerFactor!=0)
 		{
 			// else display "all"
-			ucstring	line= CI18N::get( "uihelpItemMagicBonusAll");
+			string	line= CI18N::get( "uihelpItemMagicBonusAll");
 			strFindReplace(line, "%cs", toString("%+d", allCastSpeedFactor) );
 			strFindReplace(line, "%mp", toString("%+d", allMagicPowerFactor) );
 			mbInfo+= line;
@@ -1597,7 +1598,7 @@ void	getMagicBonus(CDBCtrlSheet *item, ucstring &itemText)
 			sint32		mp= sint(itemInfo.MagicPowerFactor[i]*100);
 			if(cs!=0 || mp!=0)
 			{
-				ucstring	line= CI18N::get( string("uihelpItemMagicBonus") + valIds[i] );
+				string	line= CI18N::get( string("uihelpItemMagicBonus") + valIds[i] );
 				strFindReplace(line, "%cs", toString("%+d", cs) );
 				strFindReplace(line, "%mp", toString("%+d", mp) );
 				mbInfo+= line;
@@ -1609,7 +1610,7 @@ void	getMagicBonus(CDBCtrlSheet *item, ucstring &itemText)
 	if(!mbInfo.empty())
 	{
 		// add spell level header
-		ucstring	spellRuleFmt= CI18N::get("uihelpItemMagicBonusHeader");
+		string	spellRuleFmt= CI18N::get("uihelpItemMagicBonusHeader");
 		strFindReplace(spellRuleFmt, "%mglvl", toString(item->getQuality()));
 		mbInfo= spellRuleFmt + mbInfo;
 	}
@@ -1618,11 +1619,11 @@ void	getMagicBonus(CDBCtrlSheet *item, ucstring &itemText)
 	strFindReplace(itemText, "%magic_bonus", mbInfo);
 }
 
-void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText)
+void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, string &itemText)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	bool requiredNeeded= false;
-	ucstring	fmt, fmtc;
+	string	fmt, fmtc;
 
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
@@ -1655,7 +1656,7 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 				fmt = CI18N::get("uihelpItemSkillReqNotMetFmt");
 
 			strFindReplace(fmt, "%d", toString((uint)itemInfo.RequiredSkillLevel));
-			const ucstring skillName(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill));
+			const char *skillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill);
 			strFindReplace(fmt, "%s", skillName);
 		}
 		else
@@ -1686,7 +1687,7 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 				fmt = CI18N::get("uihelpItemSkillReqNotMetFmt");
 
 			strFindReplace(fmt, "%d", toString((uint)itemInfo.RequiredSkillLevel2));
-			const ucstring skillName(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill2));
+			const char *skillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill2);
 			strFindReplace(fmt, "%s", skillName);
 		}
 		else
@@ -1749,7 +1750,7 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 	if(req)
 	{
 		// Build the req string
-		ucstring	fmt;
+		string	fmt;
 		if(pIM->isItemCaracRequirementMet(caracType, (sint32)caracValue))
 			fmt= CI18N::get("uihelpItemCaracReqMetFmt");
 		else
@@ -1784,7 +1785,7 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 	if (skillReq)
 	{
 		// Build the req string
-		ucstring	fmt;
+		string	fmt;
 		if (req)
 			fmt = CI18N::get("uihelpItemCaracReqAnd");
 
@@ -1793,7 +1794,7 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 		else
 			fmt += CI18N::get("uihelpItemSkillReqNotMetFmt");
 		strFindReplace(fmt, "%d", toString((uint)itemInfo.MinRequiredSkillLevel));
-		const ucstring skillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill);
+		const char *skillName = STRING_MANAGER::CStringManagerClient::getSkillLocalizedName(itemInfo.RequiredSkill);
 		strFindReplace(fmt, "%s", skillName);
 
 		strFindReplace(itemText, "%skillreq", fmt );
@@ -1805,12 +1806,12 @@ void	getItemRequirementText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &
 #endif
 }
 
-void	getSkillModVsType(CDBCtrlSheet	*item, const CItemSheet*pIS, ucstring &itemText)
+void	getSkillModVsType(CDBCtrlSheet	*item, const CItemSheet*pIS, string &itemText)
 {
 	// retrieve the current itemInfo
 	const	CClientItemInfo	&itemInfo= getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 
-	ucstring	sMod;
+	string	sMod;
 	// check skill mod
 	if(!itemInfo.TypeSkillMods.empty())
 	{
@@ -1831,9 +1832,9 @@ void	getSkillModVsType(CDBCtrlSheet	*item, const CItemSheet*pIS, ucstring &itemT
 	strFindReplace(itemText, "%skill_mod_vs_type", sMod);
 }
 
-void getArmorBonus(CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
+void getArmorBonus(CDBCtrlSheet *item, string &itemText, const CItemSheet*pIS)
 {
-	ucstring armor_bonus("");
+	string armor_bonus;
 	sint32 level = 0;
 
 	if (pIS->Armor.ArmorType == ARMORTYPE::HEAVY)
@@ -1848,7 +1849,7 @@ void getArmorBonus(CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 }
 
 // ***************************************************************************
-void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
+void getItemText (CDBCtrlSheet *item, string &itemText, const CItemSheet*pIS)
 {
 	if ((item == NULL) || (pIS == NULL))
 		return;
@@ -1894,24 +1895,24 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 	CItemSpecialEffectHelper::getInstance()->getItemSpecialEffectText(pIS, itemText);
 
 	// Description
-	const ucstring desc(CStringManagerClient::getItemLocalizedDescription(pIS->Id));
-	if(!desc.empty())
+	const char *desc = CStringManagerClient::getItemLocalizedDescription(pIS->Id);
+	if (*desc)
 	{
 		strFindReplace(itemText, "%desc", "@{FFF9}" + CI18N::get("uiMissionDesc") + "\n@{FFFF}" + desc + "\n" );
 	}
 	else
-		strFindReplace(itemText, "%desc", ucstring() );
+		strFindReplace(itemText, "%desc", string() );
 
 	// Custom text
 	const	CClientItemInfo	&itemInfo = getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 	if (!itemInfo.CustomText.empty())
 	{
-		strFindReplace(itemText, "%custom_text", "\n@{FFFF}" + itemInfo.CustomText + "\n");
-		ucstring itemMFC = CI18N::get("uiItemTextMessageFromCrafter");
+		strFindReplace(itemText, "%custom_text", "\n@{FFFF}" + itemInfo.CustomText.toUtf8() + "\n");
+		string itemMFC = CI18N::get("uiItemTextMessageFromCrafter");
 		strFindReplace(itemText, "%mfc", itemMFC);
 	}
 	else
-		strFindReplace(itemText, "%custom_text", ucstring() );
+		strFindReplace(itemText, "%custom_text", string() );
 
 	if ( pIS->Family == ITEMFAMILY::COSMETIC )
 	{
@@ -1919,10 +1920,10 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 		if ( UserEntity->getGender() != pIS->Cosmetic.Gender || UserEntity->people() != people )
 			strFindReplace(itemText, "%cansell", CI18N::get("uihelpItemCosmeticDontFit") );
 		else
-			strFindReplace(itemText, "%cansell", ucstring() );
+			strFindReplace(itemText, "%cansell", string() );
 	}
 	else if(pIS->DropOrSell )
-		strFindReplace(itemText, "%cansell", ucstring() );
+		strFindReplace(itemText, "%cansell", string() );
 	else
 		strFindReplace(itemText, "%cansell", CI18N::get("uihelpItemCantSell") );
 
@@ -2012,8 +2013,8 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 			// Craft some part?
 			if(pIS->canBuildSomeItemPart())
 			{
-				ucstring	fmt= CI18N::get("uihelpItemMPCraft");
-				std::string	ipList;
+				string	fmt= CI18N::get("uihelpItemMPCraft");
+				string	ipList;
 				pIS->getItemPartListAsText(ipList);
 				strFindReplace(fmt, "%ip", ipList);
 				strFindReplace(itemText, "%craft", fmt);
@@ -2111,11 +2112,11 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 
 
 // ***************************************************************************
-static void	setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
+static void	setupEnchantedItem(CSheetHelpSetup &setup, string &itemText)
 {
 	// if don't find the tag in the text (eg: if not useful), no-op
-	static const	ucstring	enchantTag("%enchantment");
-	if( itemText.find(enchantTag) == ucstring::npos )
+	static const	string	enchantTag("%enchantment");
+	if( itemText.find(enchantTag) == string::npos )
 		return;
 
 	// retrieve the current itemInfo
@@ -2132,7 +2133,7 @@ static void	setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
 		CSPhraseManager	*pPM= CSPhraseManager::getInstance();
 
 		// fill the enchantement info
-		ucstring	enchantInfo;
+		string	enchantInfo;
 		const CItemSheet	*pIS= ctrl->asItemSheet();
 		if(pIS && pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL)
 			pPM->buildPhraseDesc(enchantInfo, itemInfo.Enchantment, 0, false, "uihelpPhraseCrystalSpellFormat");
@@ -2159,7 +2160,7 @@ static void	setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
 		hideListBrickHeader(setup);
 
 		// hide the text
-		strFindReplace(itemText, enchantTag, ucstring());
+		strFindReplace(itemText, enchantTag, string());
 	}
 }
 
@@ -2500,14 +2501,14 @@ void refreshItemHelp(CSheetHelpSetup &setup)
 	setupCreatorName(setup);
 
 	// **** setup the item Text info
-	ucstring	itemText;
+	string	itemText;
 	CEntitySheet *pES = SheetMngr.get ( CSheetId(setup.SrcSheet->getSheetId()) );
 	if ((pES != NULL) && (pES->type() == CEntitySheet::ITEM))
 	{
 		CItemSheet *pIS = (CItemSheet*)pES;
 
 		// ---- Common
-		ucstring title = setup.SrcSheet->getItemActualName();
+		string title = setup.SrcSheet->getItemActualName().toUtf8();
 		setupHelpTitle(setup.HelpWindow, title );
 		getItemText (setup.SrcSheet, itemText, pIS);
 
@@ -2591,7 +2592,7 @@ static void setupPactHelp(CSheetHelpSetup &setup)
 
 	const CPactSheet::SPact &pactLose = pact->PactLose[pactLevel];
 	// **** setup the brick Text info
-	ucstring	pactText;
+	string	pactText;
 
 	// TODO Localisation
 	setupHelpTitle(setup.HelpWindow, pactLose.Name);
@@ -2698,7 +2699,7 @@ void refreshMissionHelp(CSheetHelpSetup &setup, const CPrerequisitInfos &infos)
 		// fill text, choose color according to conditions and block
 		for (uint j = i ; j < orIndexMax ; ++j )
 		{
-			const std::string text = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_%u",j+1);
+			const string text = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_%u",j+1);
 			CViewText *viewText = dynamic_cast<CViewText *>(setup.HelpWindow->getElement(text));
 			if (viewText)
 			{
@@ -2709,7 +2710,7 @@ void refreshMissionHelp(CSheetHelpSetup &setup, const CPrerequisitInfos &infos)
 					viewText->setHardText("uiMissionOr");
 			}
 
-			const std::string textId = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_id_prereq_%u",j+1);
+			const string textId = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_id_prereq_%u",j+1);
 
 			CViewTextID	*viewTextID = dynamic_cast<CViewTextID *>(setup.HelpWindow->getElement(textId));
 			if(viewTextID)
@@ -2737,12 +2738,12 @@ void refreshMissionHelp(CSheetHelpSetup &setup, const CPrerequisitInfos &infos)
 	// inactivate other lines
 	for (uint i = (uint)infos.Prerequisits.size(); i < 15	; ++i)
 	{
-		const std::string text = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_%u",i+1);
+		const string text = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_%u",i+1);
 		CViewText *viewText = dynamic_cast<CViewText *>(setup.HelpWindow->getElement(text));
 		if (viewText)
 			viewText->setActive(false);
 
-		const std::string textId = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_id_prereq_%u",i+1);
+		const string textId = setup.HelpWindow->getId() + ":content:scroll_text_id:text_list:" + NLMISC::toString("text_id_prereq_%u",i+1);
 		CViewTextID	*viewTextID = dynamic_cast<CViewTextID *>(setup.HelpWindow->getElement(textId));
 		if(viewTextID)
 			viewTextID->setActive(false);
@@ -2873,12 +2874,12 @@ void setupOutpostBuildingHelp(CSheetHelpSetup &setup)
 
 	setupHelpTitle(setup.HelpWindow, CI18N::get("uihelpOutpostBuilding"));
 
-	ucstring	sOBText;
+	string	sOBText;
 
 	sOBText = CI18N::get("uihelpOBFormat_"+COutpostBuildingSheet::toString(pOBS->OBType));
 
 	{
-		ucstring timeText;
+		string timeText;
 		timeText = toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute");
 		if ((pOBS->CostTime % 60) != 0)
 			timeText += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond");
@@ -2944,7 +2945,7 @@ static sint		getBonusMalusSpecialTT(CDBCtrlSheet *cs)
 
 
 // ***************************************************************************
-void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
+void getSabrinaBrickText(CSBrickSheet *pBR, string &brickText)
 {
 	if(!pBR)
 		return;
@@ -2963,15 +2964,15 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 	// Level
 	strFindReplace(brickText, "%lvl", toString(pBR->Level));
 	// Kill the whole text between %ks, if the skill is unknown
-	const ucstring killSkill("%ks");
+	const string killSkill("%ks");
 	if( pBR->getSkill()==SKILLS::unknown )
 	{
-		ucstring::size_type	pos0= brickText.find(killSkill);
+		string::size_type	pos0= brickText.find(killSkill);
 		if(pos0 != ucstring::npos)
 		{
-			ucstring::size_type	pos1= brickText.find(killSkill, pos0 + killSkill.size() );
-			if(pos1 != ucstring::npos)
-				brickText.replace(pos0, pos1+killSkill.size()-pos0, ucstring() );
+			string::size_type	pos1= brickText.find(killSkill, pos0 + killSkill.size() );
+			if(pos1 != string::npos)
+				brickText.replace(pos0, pos1+killSkill.size()-pos0, string() );
 		}
 	}
 	else
@@ -2984,7 +2985,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 			strFindReplace(brickText, "%skill", CStringManagerClient::getSkillLocalizedName(pBR->getSkill()));
 		else
 		{
-			ucstring	fullSkillText;
+			string	fullSkillText;
 			bool		first= true;
 			for(uint i=0;i<pBR->UsedSkills.size();i++)
 			{
@@ -3014,13 +3015,13 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 	// Kill the whole text between %krc, if the relative cost is 0
 	if(pBR->SabrinaRelativeCost==0.f)
 	{
-		const ucstring killRC("%krc");
-		ucstring::size_type	pos0= brickText.find(killRC);
-		if(pos0 != ucstring::npos)
+		const string killRC("%krc");
+		string::size_type	pos0= brickText.find(killRC);
+		if(pos0 != string::npos)
 		{
-			ucstring::size_type	pos1= brickText.find(killRC, pos0 + killRC.size() );
-			if(pos1 != ucstring::npos)
-				brickText.replace(pos0, pos1+killRC.size()-pos0, ucstring() );
+			string::size_type	pos1= brickText.find(killRC, pos0 + killRC.size() );
+			if(pos1 != string::npos)
+				brickText.replace(pos0, pos1+killRC.size()-pos0, string() );
 		}
 	}
 	else
@@ -3053,7 +3054,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 		}
 		else
 		{
-			ucstring	mpInfo;
+			string	mpInfo;
 			for(uint i=0;i<pBR->FaberPlan.ItemPartMps.size();i++)
 			{
 				CSBrickSheet::CFaberPlan::CItemPartMP		&mpSlot= pBR->FaberPlan.ItemPartMps[i];
@@ -3074,7 +3075,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 		}
 		else
 		{
-			ucstring mpInfo;
+			string mpInfo;
 			for(uint i=0;i<pBR->FaberPlan.FormulaMps.size();i++)
 			{
 				CSBrickSheet::CFaberPlan::CFormulaMP		&mpSlot= pBR->FaberPlan.FormulaMps[i];
@@ -3090,7 +3091,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText)
 	}
 
 	// *** Magic
-	ucstring	magicResistStr;
+	string	magicResistStr;
 	// Has Some Magic Resistance setuped?
 	if( pBR->isMagic() && pBR->MagicResistType!=RESISTANCE_TYPE::None)
 	{
@@ -3190,10 +3191,10 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u
 	}
 
 	// **** setup the phrase Text info
-	setupHelpTitle(setup.HelpWindow, phrase.Name);
+	setupHelpTitle(setup.HelpWindow, phrase.Name.toUtf8());
 
 	// get the phraseText
-	ucstring	phraseText;
+	string	phraseText;
 	// if required, add the .sphrase requirements.
 	// NB: don't add if from bot chat validation (useless cause already filtered by server)
 	pPM->buildPhraseDesc(phraseText, phrase, phraseSheetId, !setup.FromBotChat);
@@ -3261,12 +3262,12 @@ static void setupSabrinaBrickHelp(CSheetHelpSetup &setup, bool auraDisabled)
 
 
 	// **** setup the brick Text info
-	ucstring	brickText;
+	string	brickText;
 	CSBrickManager	*pBM= CSBrickManager::getInstance();
 	CSBrickSheet	*pBR= pBM->getBrick(CSheetId(setup.SrcSheet->getSheetId()));
 	if(pBR)
 	{
-		const ucstring title(CStringManagerClient::getSBrickLocalizedName(pBR->Id));
+		const char *title = CStringManagerClient::getSBrickLocalizedName(pBR->Id);
 		setupHelpTitle(setup.HelpWindow, title);
 
 		// add brick info
@@ -3596,7 +3597,7 @@ public:
 		else if( getAuraDisabledState(cs) )
 		{
 			// get the normal string, and append a short info.
-			std::string	str;
+			string	str;
 			cs->getContextHelp(str);
 
 			str+= CI18N::get("uittAuraDisabled");
@@ -3735,7 +3736,7 @@ REGISTER_ACTION_HANDLER( CAHMilkoKick, "milko_kick");
 
 
 // ***************************************************************************
-static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const std::string &statPrefixId)
+static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const string &statPrefixId)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
@@ -3939,7 +3940,7 @@ public:
 		s += getSystemInformation();
 
 		string progname;
-		std::string moduleName;
+		string moduleName;
 #ifdef NL_OS_WINDOWS
 		wchar_t name[1024];
 		GetModuleFileNameW(NULL, name, 1023);
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index eef48509e..58dc5d52a 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -932,7 +932,7 @@ void CChatGroupWindow::removeAllFreeTellers()
 //=================================================================================
 void CChatGroupWindow::saveFreeTeller(NLMISC::IStream &f)
 {
-	f.serialVersion(2);
+	f.serialVersion(3);
 
 	// Save the free teller only if it is present in the friend list to avoid the only-growing situation
 	// because free tellers are never deleted in game if we save/load all the free tellers, we just create more
@@ -940,7 +940,7 @@ void CChatGroupWindow::saveFreeTeller(NLMISC::IStream &f)
 
 	uint32 i, nNbFreeTellerSaved = 0;
 	for (i = 0; i < _FreeTellers.size(); ++i)
-		if (PeopleInterraction.FriendList.getIndexFromName(_FreeTellers[i]->getUCTitle()) != -1)
+		if (PeopleInterraction.FriendList.getIndexFromName(_FreeTellers[i]->getTitle()) != -1)
 			nNbFreeTellerSaved++;
 
 	f.serial(nNbFreeTellerSaved);
@@ -949,9 +949,9 @@ void CChatGroupWindow::saveFreeTeller(NLMISC::IStream &f)
 	{
 		CGroupContainer *pGC = _FreeTellers[i];
 
-		if (PeopleInterraction.FriendList.getIndexFromName(pGC->getUCTitle()) != -1)
+		if (PeopleInterraction.FriendList.getIndexFromName(pGC->getTitle()) != -1)
 		{
-			ucstring sTitle = pGC->getUCTitle();
+			string sTitle = pGC->getTitle();
 			f.serial(sTitle);
 		}
 	}
@@ -960,7 +960,7 @@ void CChatGroupWindow::saveFreeTeller(NLMISC::IStream &f)
 //=================================================================================
 void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f)
 {
-	sint ver = f.serialVersion(2);
+	sint ver = f.serialVersion(3);
 
 	if (ver == 1)
 	{
@@ -980,10 +980,15 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f)
 			string sID;
 			f.serial(sID);
 		}
-		ucstring sTitle;
-		f.serial(sTitle);
+		string title;
+		if (ver < 3)
+		{
+			ucstring sTitle; // Old UTF-16 serial
+			f.serial(sTitle);
+			title = sTitle.toUtf8();
+		}
 
-		CGroupContainer *pGC = createFreeTeller(sTitle, "");
+		CGroupContainer *pGC = createFreeTeller(title, "");
 
 		// With version 1 all tells are active because windows information have "title based" ids and no "sID based".
 		if ((ver == 1) && (pGC != NULL))
@@ -1334,13 +1339,13 @@ REGISTER_ACTION_HANDLER(CHandlerChatBoxEntry, "chat_box_entry");
 
 
 
-static ucstring getFreeTellerName(CInterfaceElement *pCaller)
+static string getFreeTellerName(CInterfaceElement *pCaller)
 {
-	if (!pCaller) return ucstring();
+	if (!pCaller) return string();
 	CChatGroupWindow *cgw = PeopleInterraction.getChatGroupWindow();
-	if (!cgw) return ucstring();
+	if (!cgw) return string();
 	CInterfaceGroup *freeTeller = pCaller->getParentContainer();
-	if (!freeTeller) return ucstring();
+	if (!freeTeller) return string();
 	return cgw->getFreeTellerName( freeTeller->getId() );
 }
 
@@ -1350,7 +1355,7 @@ class CHandlerAddTellerToFriendList : public IActionHandler
 public:
 	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
 	{
-		ucstring playerName = ::getFreeTellerName(pCaller);
+		string playerName = ::getFreeTellerName(pCaller);
 		if (!playerName.empty())
 		{
 			sint playerIndex = PeopleInterraction.IgnoreList.getIndexFromName(playerName);
@@ -1378,7 +1383,7 @@ public:
 		CInterfaceManager *im = CInterfaceManager::getInstance();
 		std::string callerId = getParam(sParams, "id");
 		CInterfaceElement *prevCaller = CWidgetManager::getInstance()->getElementFromId(callerId);
-		ucstring playerName = ::getFreeTellerName(prevCaller);
+		string playerName = ::getFreeTellerName(prevCaller);
 		if (!playerName.empty())
 		{
 			// if already in friend list, ask to move rather than add
@@ -1410,7 +1415,7 @@ class CHandlerInviteToRingSession : public IActionHandler
 public:
 	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
 	{
-		string playerName = ::getFreeTellerName(pCaller).toUtf8();
+		string playerName = ::getFreeTellerName(pCaller);
 		if (!playerName.empty())
 		{
 			// ask the SBS to invite the character in the session
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 7196bdac9..63392c583 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -3394,22 +3394,22 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 		if (!macro)
 			return;
 
-		ucstring macroName = macro->Name;
+		string macroName = macro->Name;
 		if (macroName.empty())
 			macroName = CI18N::get("uiNotAssigned");
 
-		ucstring assignedTo = macro->Combo.toString();
+		string assignedTo = macro->Combo.toString();
 		if (assignedTo.empty())
 			assignedTo = CI18N::get("uiNotAssigned");
 
-		ucstring dispText;
-		ucstring dispCommands;
+		string dispText;
+		string dispCommands;
 		const CMacroCmdManager *pMCM = CMacroCmdManager::getInstance();
 
 		uint nb = 0;
 		for (uint i = 0; i < macro->Commands.size(); ++i)
 		{
-			ucstring commandName;
+			string commandName;
 			for (uint j = 0; j < pMCM->ActionManagers.size(); ++j)
 			{
 				CAction::CName c(macro->Commands[i].Name.c_str(), macro->Commands[i].Params.c_str());
@@ -3425,14 +3425,14 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 			}
 		}
 		// formats
-		dispText = ucstring("%n (@{6F6F}%k@{FFFF})\n%c");
+		dispText = "%n (@{6F6F}%k@{FFFF})\n%c";
 		if (nb > 5) // more?
 			dispCommands += toString(" ... @{6F6F}%i@{FFFF}+", nb-5);
 
-		strFindReplace(dispText, ucstring("%n"), macroName);
-		strFindReplace(dispText, ucstring("%k"), assignedTo);
-		strFindReplace(dispText, ucstring("%c"), dispCommands);
-		help = dispText.toUtf8();
+		strFindReplace(dispText, "%n", macroName);
+		strFindReplace(dispText, "%k", assignedTo);
+		strFindReplace(dispText, "%c", dispCommands);
+		help = dispText;
 	}
 	else if(getType() == CCtrlSheetInfo::SheetType_Item)
 	{
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index be0df19ad..4f173088d 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -1242,9 +1242,9 @@ void			CDBGroupBuildPhrase::updateAllDisplay(const CSPhraseCom &phrase)
 	// **** Setup the phrase Desc
 	if(_TextPhraseDesc)
 	{
-		ucstring	text;
+		string	text;
 		pPM->buildPhraseDesc(text, phrase, 0, false, "composition");
-		_TextPhraseDesc->setTextFormatTaged(text.toUtf8());
+		_TextPhraseDesc->setTextFormatTaged(text);
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 21a56ec4f..f8b5d4b56 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -281,15 +281,15 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 	if(Ctrl->getSheetCategory() == CDBCtrlSheet::Phrase)
 	{
 		// For combat action, Append weapon restriction
-		ucstring	weaponRestriction;
+		string	weaponRestriction;
 		CSPhraseManager	*pPM= CSPhraseManager::getInstance();
 		bool melee,range;
 		pPM->getCombatWeaponRestriction(weaponRestriction, Ctrl->getSheetId(),melee,range);
 		// don't add also if no combat restriction
-		if(!weaponRestriction.empty() && weaponRestriction!=CI18N::getAsUtf16("uiawrSF"))
+		if(!weaponRestriction.empty() && weaponRestriction!=CI18N::get("uiawrSF"))
 		{
 			weaponRestriction= CI18N::get("uiPhraseWRHeader") + weaponRestriction;
-			text+= "\n" + weaponRestriction.toUtf8();
+			text+= "\n" + weaponRestriction;
 		}
 	}
 
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 35cc56ebe..9f03834c8 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -1311,6 +1311,7 @@ class CAHDynChatClickOption : public IActionHandler
 		uint32 optStrId = InSceneBubbleManager.dynChatGetOptionStringId(nBubbleNb, nOpt);
 		if (!optStrId) return;
 
+#ifdef RYZOM_BG_DOWNLOADER
 		if (isBGDownloadEnabled())
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
@@ -1330,6 +1331,7 @@ class CAHDynChatClickOption : public IActionHandler
 				}
 			}
 		}
+#endif
 
 		static const string sMsg = "BOTCHAT:DYNCHAT_SEND";
 		CBitMemStream out;
diff --git a/ryzom/client/src/interface_v3/group_modal_get_key.cpp b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
index b79f6c38a..1bd1f0936 100644
--- a/ryzom/client/src/interface_v3/group_modal_get_key.cpp
+++ b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
@@ -111,8 +111,8 @@ bool CGroupModalGetKey::handleEvent (const NLGUI::CEventDescriptor &event)
 						const CBaseAction *baseAction = pCurAM->getBaseAction(it->second);
 						if (baseAction && pCurAM->isActionPresentInContext(it->second))
 						{
-							ucstring shortcutName = baseAction->getActionLocalizedText(it->second);
-							if (pVT != NULL) pVT->setText(shortcutName.toUtf8());
+							string shortcutName = baseAction->getActionLocalizedText(it->second);
+							if (pVT != NULL) pVT->setText(shortcutName);
 						}
 					}
 					else
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 0fa12432b..963093235 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1605,7 +1605,9 @@ void CInterfaceManager::updateFrameEvents()
 	// handle gc for lua
 	CLuaManager::getInstance().getLuaState()->handleGC();
 
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess::getInstance().update();
+#endif
 
 	CItemGroupManager::getInstance()->update();
 
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
index a91394390..38b22a3e4 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
@@ -33,10 +33,10 @@ CItemConsumableEffectHelper* CItemConsumableEffectHelper::getInstance()
 	return instance;
 }
 
-void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *pIS, ucstring &itemText, sint32 itemQuality)
+void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *pIS, string &itemText, sint32 itemQuality)
 {
 	// check if some effects are present on this item
-	ucstring effects("");
+	string effects("");
 
 	uint i;
 	for( i=0; i<pIS->Consumable.Properties.size(); ++i )
@@ -71,7 +71,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 timeInSec;
 			fromString(params[3].c_str(), timeInSec);
 
-			ucstring result;
+			string result;
 
 			if (bonus >= 0)
 				result = CI18N::get("uiItemConsumableEffectUpCharac");
@@ -101,7 +101,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectLifeAura");
+			string result = CI18N::get("uiItemConsumableEffectLifeAura");
 			strFindReplace(result, "%modifier", toString(regenMod));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -128,7 +128,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectLifeAura");
+			string result = CI18N::get("uiItemConsumableEffectLifeAura");
 			strFindReplace(result, "%modifier", toString(bonus));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -154,7 +154,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectStaminaAura");
+			string result = CI18N::get("uiItemConsumableEffectStaminaAura");
 			strFindReplace(result, "%modifier", toString(regenMod));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -182,7 +182,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectStaminaAura");
+			string result = CI18N::get("uiItemConsumableEffectStaminaAura");
 			strFindReplace(result, "%modifier", toString(bonus));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -208,7 +208,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectSapAura");
+			string result = CI18N::get("uiItemConsumableEffectSapAura");
 			strFindReplace(result, "%modifier", toString(regenMod));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -235,7 +235,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			uint32 userDisableTime;
 			fromString(params[4].c_str(), userDisableTime);
 
-			ucstring result = CI18N::get("uiItemConsumableEffectSapAura");
+			string result = CI18N::get("uiItemConsumableEffectSapAura");
 			strFindReplace(result, "%modifier", toString(bonus));
 			strFindReplace(result, "%minutes", toString(duration/60));
 			strFindReplace(result, "%secondes", toString(duration%60));
@@ -249,7 +249,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 
 		// skill modifier consumables
 		//---------------------------
-		ucstring result("");
+		string result("");
 		uint8 paramIdx = 0;
 		if( name == "SP_MOD_DEFENSE" )
 		{
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.h b/ryzom/client/src/interface_v3/item_consumable_effect.h
index 69a0472ad..a6150204a 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.h
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.h
@@ -32,7 +32,7 @@ public:
 	static CItemConsumableEffectHelper* getInstance();
 
 	// Fill itemText with consumable effects from item sheet
-	void getItemConsumableEffectText(const CItemSheet *pIS, ucstring &itemText, sint32 itemQuality);
+	void getItemConsumableEffectText(const CItemSheet *pIS, std::string &itemText, sint32 itemQuality);
 
 private:
 	CItemConsumableEffectHelper() {}
diff --git a/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
index 5d696738a..7b659fe6d 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_special_effect.cpp
@@ -76,11 +76,11 @@ void CItemSpecialEffectHelper::registerItemSpecialEffect(const string &name)
 	effectMap.insert(make_pair(name, params));
 }
 
-void CItemSpecialEffectHelper::getItemSpecialEffectText(const CItemSheet *pIS, ucstring &itemText)
+void CItemSpecialEffectHelper::getItemSpecialEffectText(const CItemSheet *pIS, string &itemText)
 {
 	// check if some effects are present on this item
 	bool firstEffect = false;
-	ucstring effects;
+	string effects;
 	effects += getEffect(pIS->getEffect1(), firstEffect);
 	effects += getEffect(pIS->getEffect2(), firstEffect);
 	effects += getEffect(pIS->getEffect3(), firstEffect);
@@ -92,9 +92,9 @@ void CItemSpecialEffectHelper::getItemSpecialEffectText(const CItemSheet *pIS, u
 	strFindReplace(itemText, "%special_effects", effects);
 }
 
-ucstring CItemSpecialEffectHelper::getEffect(const std::string &effect, bool &first)
+string CItemSpecialEffectHelper::getEffect(const std::string &effect, bool &first)
 {
-	ucstring result;
+	string result;
 	CSString eff = effect;
 
 	if (eff.empty())
diff --git a/ryzom/client/src/interface_v3/item_special_effect.h b/ryzom/client/src/interface_v3/item_special_effect.h
index a97437958..201c83927 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.h
+++ b/ryzom/client/src/interface_v3/item_special_effect.h
@@ -32,7 +32,7 @@ public:
 	static CItemSpecialEffectHelper* getInstance();
 
 	// Fill itemText with special effects from item sheet
-	void getItemSpecialEffectText(const CItemSheet *pIS, ucstring &itemText);
+	void getItemSpecialEffectText(const CItemSheet *pIS, std::string &itemText);
 
 	// Register a new item special effect
 	void registerItemSpecialEffect(const std::string &name);
@@ -42,7 +42,7 @@ private:
 	CItemSpecialEffectHelper(const CItemSpecialEffectHelper&);
 
 	// Get UI text with values filled from 'effect' string
-	ucstring getEffect(const std::string &effect, bool &first);
+	std::string getEffect(const std::string &effect, bool &first);
 
 	// Map effects name with parameters
 	typedef std::vector<std::string> stringVector;
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 55d31bf54..4e6599fa1 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -533,10 +533,12 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
 		luabind::def("messageBoxWithHelp", (void(*)(const std::string &)) &messageBoxWithHelp),
 		LUABIND_FUNC(replacePvpEffectParam),
 		LUABIND_FUNC(secondsSince1970ToHour),
+#ifdef RYZOM_BG_DOWNLOADER
 		LUABIND_FUNC(pauseBGDownloader),
 		LUABIND_FUNC(unpauseBGDownloader),
 		LUABIND_FUNC(requestBGDownloaderPriority),
 		LUABIND_FUNC(getBGDownloaderPriority),
+#endif
 		LUABIND_FUNC(loadBackground),
 		LUABIND_FUNC(getPatchLastErrorMessage),
 		LUABIND_FUNC(getPlayerSelectedSlot),
@@ -3080,6 +3082,7 @@ sint32 CLuaIHMRyzom::secondsSince1970ToHour(sint32 seconds)
 	return tstruct->tm_hour;	// 0-23
 }
 
+#ifdef RYZOM_BG_DOWNLOADER
 // ***************************************************************************
 void CLuaIHMRyzom::pauseBGDownloader()
 {
@@ -3108,6 +3111,7 @@ sint CLuaIHMRyzom::getBGDownloaderPriority()
 {
 	return CBGDownloaderAccess::getInstance().getDownloadThreadPriority();
 }
+#endif
 
 // ***************************************************************************
 void CLuaIHMRyzom::loadBackground(const std::string &bg)
@@ -3120,11 +3124,13 @@ void CLuaIHMRyzom::loadBackground(const std::string &bg)
 // ***************************************************************************
 ucstring CLuaIHMRyzom::getPatchLastErrorMessage()
 {
+#ifdef RYZOM_BG_DOWNLOADER
 	if (isBGDownloadEnabled())
 	{
 		return CBGDownloaderAccess::getInstance().getLastErrorMessage();
 	}
 	else
+#endif
 	{
 		CPatchManager *pPM = CPatchManager::getInstance();
 		return pPM->getLastErrorMessage();
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
index abf09594e..44e841636 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
@@ -174,12 +174,14 @@ private:
 	static void	messageBoxWithHelp(const ucstring &text, const std::string &masterGroup, int caseMode);
 	static void	messageBoxWithHelp(const std::string &text);
 
-	static ucstring	replacePvpEffectParam(const ucstring &str, sint32 parameter);
+	static ucstring	replacePvpEffectParam(const ucstring &str, sint32 parameter); // TODO: UTF-8 Lua
 	static sint32 secondsSince1970ToHour(sint32 seconds);
+#ifdef RYZOM_BG_DOWNLOADER
 	static void	pauseBGDownloader();
 	static void	unpauseBGDownloader();
 	static void	requestBGDownloaderPriority(uint priority);
 	static sint	getBGDownloaderPriority();
+#endif
 	static void	loadBackground(const std::string &bg);
 	static ucstring	getPatchLastErrorMessage();
 	static bool	isInGame();
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 81033f5aa..aa6ffe213 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -125,7 +125,7 @@ struct CComboActionName
 	CCombo				Combo;		// KeyCount <=> action name unbound
 	CAction::CName		ActionName;
 };
-void buildActionToComboMap(uint8 nAM, CGroupList * /* pList */, string catName, map<ucstring, CComboActionName> &remaped)
+void buildActionToComboMap(uint8 nAM, CGroupList * /* pList */, string catName, map<string, CComboActionName> &remaped)
 {
 	CMacroCmdManager *pMCM = CMacroCmdManager::getInstance();
 	CActionsManager *pAM = pMCM->ActionManagers[nAM];
@@ -148,7 +148,7 @@ void buildActionToComboMap(uint8 nAM, CGroupList * /* pList */, string catName,
 			// see if action active in current context
 			if (pAM->isActionPresentInContext(it->second))
 			{
-				pair<ucstring, CComboActionName>	value;
+				pair<string, CComboActionName>	value;
 				// Don't take any risk: avoid any bug if the localisation is buggy and give same text for 2 differents CAction::CName
 				// Use the localized text first, to have correct sort according to language
 				value.first= pAM->getActionLocalizedText(rName) + rName.Name + rName.Argu;
@@ -177,7 +177,7 @@ void buildActionToComboMap(uint8 nAM, CGroupList * /* pList */, string catName,
 			// see if action active in current context
 			if (pAM->isActionPresentInContext(rName))
 			{
-				pair<ucstring, CComboActionName>	value;
+				pair<string, CComboActionName>	value;
 				// Don't take any risk: avoid any bug if the localisation is buggy and give same text for 2 differents CAction::CName
 				// Use the localized text first, to have correct sort according to language
 				value.first= pAM->getActionLocalizedText(rName) + rName.Name + rName.Argu;
@@ -197,15 +197,15 @@ void buildActionToComboMap(uint8 nAM, CGroupList * /* pList */, string catName,
 
 
 // Get all the couple (combo,action) from the action manager nAM and insert them into pList (with the template)
-void getAllComboAction(uint8 nAM, CGroupList *pList, const map<ucstring, CComboActionName> &remaped)
+void getAllComboAction(uint8 nAM, CGroupList *pList, const map<string, CComboActionName> &remaped)
 {
 	CMacroCmdManager *pMCM = CMacroCmdManager::getInstance();
 	CActionsManager *pAM = pMCM->ActionManagers[nAM];
 	// *** Fill Actions
-	map<ucstring, CComboActionName>::const_iterator remapIT = remaped.begin();
+	map<string, CComboActionName>::const_iterator remapIT = remaped.begin();
 	while (remapIT != remaped.end())
 	{
-		ucstring keyName;
+		string keyName;
 		if(remapIT->second.Combo.Key==KeyCount)
 			keyName= CI18N::get("uiNotAssigned");
 		else
@@ -213,7 +213,7 @@ void getAllComboAction(uint8 nAM, CGroupList *pList, const map<ucstring, CComboA
 		const CBaseAction *baseAction = pAM->getBaseAction(remapIT->second.ActionName);
 		if (baseAction)
 		{
-			ucstring shortcutName = baseAction->getActionLocalizedText(remapIT->second.ActionName);
+			string shortcutName = baseAction->getActionLocalizedText(remapIT->second.ActionName);
 
 			addKeyLine(pList, keyName, shortcutName, remapIT->second.Combo.Key==KeyCount);
 			CModalContainerEditCmd::CLine	line;
@@ -274,7 +274,7 @@ public:
 					pList->clearGroups();
 					pList->setDynamicDisplaySize(true);
 
-					map<ucstring, CComboActionName> remaped;
+					map<string, CComboActionName> remaped;
 					buildActionToComboMap(nAM, pList, rCats[i].Name, remaped);
 					if (!remaped.empty())
 					{
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 03e53c06b..54bc39d29 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -65,7 +65,7 @@ void CMacroCmd::writeTo (xmlNodePtr node) const
 	xmlNodePtr macroNode = xmlNewChild ( node, NULL, (const xmlChar*)"macro", NULL );
 
 	// Props
-	xmlSetProp (macroNode, (const xmlChar*)"name", (const xmlChar*)ucstring(Name).toUtf8().c_str());
+	xmlSetProp (macroNode, (const xmlChar*)"name", (const xmlChar*)Name.c_str());
 	xmlSetProp (macroNode, (const xmlChar*)"id",   (const xmlChar*)toString(ID).c_str());
 	xmlSetProp (macroNode, (const xmlChar*)"back", (const xmlChar*)toString(BitmapBack).c_str());
 	xmlSetProp (macroNode, (const xmlChar*)"icon", (const xmlChar*)toString(BitmapIcon).c_str());
@@ -86,12 +86,7 @@ bool CMacroCmd::readFrom (xmlNodePtr node)
 	CXMLAutoPtr ptrName;
 
 	ptrName = (char*) xmlGetProp( node, (xmlChar*)"name" );
-	if (ptrName)
-	{
-		ucstring ucName;
-		ucName.fromUtf8((const char*)ptrName);
-		Name = ucName.toString();
-	}
+	if (ptrName) Name = (const char *)ptrName;
 
 	ptrName = (char*) xmlGetProp( node, (xmlChar*)"id" );
 	if (ptrName) fromString((const char*)ptrName, ID);
@@ -818,7 +813,7 @@ public:
 REGISTER_ACTION_HANDLER( CHandlerNewMacroCmdDelete, "new_macro_cmd_delete");
 
 // ***************************************************************************
-void addCommandLine (CGroupList *pParent, uint cmdNb, const ucstring &cmdName)
+void addCommandLine (CGroupList *pParent, uint cmdNb, const string &cmdName)
 {
 	CInterfaceManager	*pIM = CInterfaceManager::getInstance();
 
@@ -828,7 +823,7 @@ void addCommandLine (CGroupList *pParent, uint cmdNb, const ucstring &cmdName)
 	if (pNewCmd == NULL) return;
 
 	CViewText *pVT = dynamic_cast<CViewText*>(pNewCmd->getView(TEMPLATE_NEWMACRO_COMMAND_TEXT));
-	if (pVT != NULL) pVT->setText(cmdName.toUtf8());
+	if (pVT != NULL) pVT->setText(cmdName);
 
 	pNewCmd->setParent (pParent);
 	pParent->addChild (pNewCmd);
@@ -906,7 +901,7 @@ public:
 
 		for (uint i = 0; i < pMCM->CurrentEditMacro.Commands.size(); ++i)
 		{
-			ucstring commandName;
+			string commandName;
 			for (uint j = 0; j < pMCM->ActionManagers.size(); ++j)
 			{
 				CAction::CName c(pMCM->CurrentEditMacro.Commands[i].Name.c_str(), pMCM->CurrentEditMacro.Commands[i].Params.c_str());
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index b45af6c7b..790949352 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -327,9 +327,7 @@ void CMusicPlayer::rebuildPlaylist()
 				CViewText *pVT = dynamic_cast<CViewText *>(pNew->getView(TEMPLATE_PLAYLIST_SONG_TITLE));
 				if (pVT)
 				{
-					ucstring title;
-					title.fromUtf8(_Songs[i].Title);
-					pVT->setText(title.toUtf8());
+					pVT->setText(_Songs[i].Title);
 				}
 
 				pVT = dynamic_cast<CViewText *>(pNew->getView(TEMPLATE_PLAYLIST_SONG_DURATION));
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index e1a01400d..e2f880744 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1089,7 +1089,7 @@ CFilteredChat *CPeopleInterraction::getFilteredChatFromChatWindow(CChatWindow *c
 }
 
 //===========================================================================================================
-void CPeopleInterraction::askAddContact(const ucstring &contactName, CPeopleList *pl)
+void CPeopleInterraction::askAddContact(const string &contactName, CPeopleList *pl)
 {
 	if (pl == NULL)
 		return;
@@ -1109,7 +1109,7 @@ void CPeopleInterraction::askAddContact(const ucstring &contactName, CPeopleList
 	}
 
 	// add into server (NB: will be added by the server response later)
-	const std::string sMsg = "TEAM:CONTACT_ADD";
+	const char *sMsg = "TEAM:CONTACT_ADD";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 	{
@@ -1121,14 +1121,14 @@ void CPeopleInterraction::askAddContact(const ucstring &contactName, CPeopleList
 		if (pl == &FriendList)
 			list = 0;
 
-		ucstring temp = contactName;
+		ucstring temp = contactName; // TODO: UTF-8 serial
 		out.serial(temp);
 		out.serial(list);
 		NetMngr.push(out);
 		//nlinfo("impulseCallBack : %s %s %d sent", sMsg.c_str(), contactName.toString().c_str(), list);
 	}
 	else
-		nlwarning("impulseCallBack : unknown message name : '%s'.", sMsg.c_str());
+		nlwarning("impulseCallBack : unknown message name : '%s'.", sMsg);
 
 	// NB: no client prediction, will be added by server later
 
@@ -1275,7 +1275,7 @@ void CPeopleInterraction::addContactInList(uint32 contactId, const ucstring &nam
 	CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 
 	// remove the shard name if possible
-	ucstring	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
+	string	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
 
 	// add the contact to this list
 	sint index = pl.getIndexFromName(name);
@@ -1326,7 +1326,7 @@ bool CPeopleInterraction::isContactInList(const ucstring &nameIn, uint8 nList) c
 	// select correct people list
 	const CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 	// remove the shard name if possible
-	ucstring	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
+	string	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
 	return pl.getIndexFromName(name) != -1;
 }
 
@@ -1393,7 +1393,7 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 					// Only show the message if this player is not in my guild (because then the guild manager will show a message)
 					std::vector<SGuildMember> GuildMembers = CGuildManager::getInstance()->getGuildMembers();
 					bool bOnlyFriend = true;
-					string name = toLower(FriendList.getName(index).toUtf8());
+					string name = toLower(FriendList.getName(index));
 					for (uint i = 0; i < GuildMembers.size(); ++i)
 					{
 						if (toLower(GuildMembers[i].Name) == name)
@@ -1410,7 +1410,7 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 					if (showMsg)
 					{
 						string msg = (online != ccs_offline) ? CI18N::get("uiPlayerOnline") : CI18N::get("uiPlayerOffline");
-						strFindReplace(msg, "%s", FriendList.getName(index).toUtf8());
+						strFindReplace(msg, "%s", FriendList.getName(index));
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
@@ -1471,9 +1471,9 @@ bool CPeopleInterraction::testValidPartyChatName(const ucstring &title)
 	if (GuildChat && title == GuildChat->getTitle()) return false;
 	if (TeamChat && title == TeamChat->getTitle()) return false;
 	sint index;
-	index = FriendList.getIndexFromName(title);
+	index = FriendList.getIndexFromName(title.toUtf8());
 	if (index != -1) return false;
-	index = IgnoreList.getIndexFromName(title);
+	index = IgnoreList.getIndexFromName(title.toUtf8());
 	if (index != -1) return false;
 	// TODO_GAMEDEV server test for the name (not only local), & modify callers of this function
     // The party chat should NOT have the name of a player
@@ -2137,7 +2137,7 @@ public:
 		uint peopleIndex;
 		if (PeopleInterraction.getPeopleFromCurrentMenu(list, peopleIndex))
 		{
-			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex).toUtf8());
+			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex));
 		}
 	}
 };
@@ -2159,7 +2159,7 @@ class CHandlerTellContact : public IActionHandler
 		uint peopleIndex;
 		if (PeopleInterraction.getPeopleFromContainerID(gc->getId(), list, peopleIndex))
 		{
-			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex).toUtf8());
+			CPeopleInterraction::displayTellInMainChat(list->getName(peopleIndex));
 		}
 
 	}
@@ -2255,7 +2255,7 @@ public:
 							}
 							else
 							{
-								PeopleInterraction.askAddContact(geb->getInputStringAsUtf16(), peopleList);
+								PeopleInterraction.askAddContact(geb->getInputString(), peopleList);
 								geb->setInputString(std::string());
 							}
 						}
@@ -3176,7 +3176,7 @@ NLMISC_COMMAND(ignore, "add or remove a player from the ignore list", "<player n
 	}
 
 	// NB: playernames cannot have special characters
-	ucstring playerName = ucstring(args[0]);
+	const string &playerName = args[0];
 
 	// add to the ignore list
 	PeopleInterraction.askAddContact(playerName, &PeopleInterraction.IgnoreList);
diff --git a/ryzom/client/src/interface_v3/people_interraction.h b/ryzom/client/src/interface_v3/people_interraction.h
index a88db2a65..59230853f 100644
--- a/ryzom/client/src/interface_v3/people_interraction.h
+++ b/ryzom/client/src/interface_v3/people_interraction.h
@@ -208,7 +208,7 @@ public:
 	/// \name CONTACT LIST
 	// @{
 	// ask the server to add/move/remove a contact
-	void askAddContact(const ucstring &contactName, CPeopleList *pl);
+	void askAddContact(const std::string &contactName, CPeopleList *pl);
 	void askMoveContact(uint peopleIndexInSrc, CPeopleList *plSRC, CPeopleList *plDST);
 	void askRemoveContact(uint peopleIndex, CPeopleList *pl);
 
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index e5426ccfb..f056f4cc5 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -157,12 +157,12 @@ bool CPeopleList::create(const CPeopleListDesc &desc, const CChatWindowDesc *cha
 }
 
 //==================================================================
-sint CPeopleList::getIndexFromName(const ucstring &name) const
+sint CPeopleList::getIndexFromName(const string &name) const
 {
-	string sNameIn = toLower(name.toString());
+	string sNameIn = toLower(name);
 	for(uint k = 0; k < _Peoples.size(); ++k)
 	{
-		string sPeopleName = toLower(_Peoples[k].getName().toString());
+		string sPeopleName = toLower(_Peoples[k].getName().toUtf8());
 		if (sPeopleName == sNameIn) return k;
 	}
 	return -1;
@@ -335,7 +335,7 @@ sint CPeopleList::addPeople(const ucstring &name, uint teamMateIndex /*= 0*/)
 {
 	if (!_BaseContainer) return - 1;
 	// check if not already inserted
-	if (getIndexFromName(name) != -1)
+	if (getIndexFromName(name.toUtf8()) != -1)
 	{
 		nlwarning("<CPeopleList::addPeople> people %s inserted twice.", name.toString().c_str());
 	}
@@ -687,14 +687,14 @@ void CPeopleList::updatePeopleMenu(uint index)
 }
 
 //==================================================================
-ucstring CPeopleList::getName(uint index) const
+std::string CPeopleList::getName(uint index) const
 {
 	if (index >= _Peoples.size())
 	{
 		nlwarning("bad index");
-		return ucstring("BAD INDEX!");
+		return "BAD INDEX!";
 	}
-	return _Peoples[index].getName();
+	return _Peoples[index].getName().toUtf8();
 }
 
 //==================================================================
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index da7556aa5..91dbf50d3 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -75,13 +75,13 @@ public:
 	  */
 	bool create(const CPeopleListDesc &desc, const CChatWindowDesc *chat = NULL);
 	// Get index from the name of a people, or -1 if not found
-	sint getIndexFromName(const ucstring &name) const;
+	sint getIndexFromName(const std::string &name) const;
 	// Get index from the id of the container that represent the people
 	sint getIndexFromContainerID(const std::string &id) const;
 	// Get the number of people in this list
 	uint getNumPeople() const { return (uint)_Peoples.size(); }
 	// Get name of a people
-	ucstring getName(uint index) const;
+	std::string getName(uint index) const;
 	// Sort people alphabetically
 	void sort();
 
diff --git a/ryzom/client/src/interface_v3/req_skill_formula.cpp b/ryzom/client/src/interface_v3/req_skill_formula.cpp
index 1165dccc5..5099d325f 100644
--- a/ryzom/client/src/interface_v3/req_skill_formula.cpp
+++ b/ryzom/client/src/interface_v3/req_skill_formula.cpp
@@ -343,7 +343,7 @@ void		CReqSkillFormula::log(const char *prefix) const
 }
 
 // ***************************************************************************
-void		CReqSkillFormula::getInfoText(ucstring &info) const
+void		CReqSkillFormula::getInfoText(string &info) const
 {
 	info.clear();
 
@@ -363,7 +363,7 @@ void		CReqSkillFormula::getInfoText(ucstring &info) const
 			{
 				const CSkillValue	&sv= *itSv;
 				// get the colored line if the skill don't reach the req level
-				ucstring	line;
+				string	line;
 				if(!isSkillValueTrained(sv))
 					line= CI18N::get("uihelpPhraseRequirementNotMetLine");
 				else
diff --git a/ryzom/client/src/interface_v3/req_skill_formula.h b/ryzom/client/src/interface_v3/req_skill_formula.h
index 7286172ce..bf0ef5dc0 100644
--- a/ryzom/client/src/interface_v3/req_skill_formula.h
+++ b/ryzom/client/src/interface_v3/req_skill_formula.h
@@ -101,7 +101,7 @@ public:
 	void		log(const char *prefix) const;
 
 	// For SPhrase Info
-	void		getInfoText(ucstring &info) const;
+	void		getInfoText(std::string &info) const;
 
 	// return true if the requirement formula completes regarding the actual player state (through CSkillMananger). return true if empty()
 	bool		evaluate() const;
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index f6a89df7a..c42d544d1 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -960,7 +960,7 @@ bool CSPhraseManager::isPhraseKnown(const CSPhraseCom &phrase) const
 }
 
 // ***************************************************************************
-ucstring	CSPhraseManager::formatMalus(sint base, sint malus)
+string	CSPhraseManager::formatMalus(sint base, sint malus)
 {
 	if(malus)
 		return toString("@{F80F}%d@{FFFF}  (%d)", base+malus, base);
@@ -969,7 +969,7 @@ ucstring	CSPhraseManager::formatMalus(sint base, sint malus)
 }
 
 // ***************************************************************************
-ucstring	CSPhraseManager::formatMalus(float base, float malus)
+string	CSPhraseManager::formatMalus(float base, float malus)
 {
 	if(malus)
 		return toString("@{F80F}%.1f@{FFFF}  (%.1f)", base+malus, base);
@@ -1008,7 +1008,7 @@ string	CSPhraseManager::formatBonusMalus(sint32 base, sint32 mod)
 }
 
 // ***************************************************************************
-void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase, uint32 phraseSheetId, bool wantRequirement, const std::string &specialPhraseFormat)
+void CSPhraseManager::buildPhraseDesc(string &text, const CSPhraseCom &phrase, uint32 phraseSheetId, bool wantRequirement, const std::string &specialPhraseFormat)
 {
 	CSBrickManager	*pBM= CSBrickManager::getInstance();
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
@@ -1029,7 +1029,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 		if(rootBrick)
 		{
 			static const string		compoId= "composition";
-			static const ucstring	compoTag("%compostart");
+			static const string	compoTag("%compostart");
 			bool	isComposition= specialPhraseFormat==compoId;
 
 			// if format not given by user, auto select it.
@@ -1053,14 +1053,14 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 				// if composition, cut the text before the tag (including)
 				if(isComposition)
 				{
-					ucstring::size_type	pos= text.find(compoTag);
-					if(pos!=ucstring::npos)
+					string::size_type	pos= text.find(compoTag);
+					if(pos!=string::npos)
 						text.erase(0, pos+compoTag.size());
 				}
 				// else just clear the tag
 				else
 				{
-					strFindReplace(text, compoTag, ucstring() );
+					strFindReplace(text, compoTag, string() );
 				}
 			}
 			else
@@ -1071,7 +1071,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 
 		// **** Phrase info basics
 		// replace name
-		strFindReplace(text, "%name", phrase.Name);
+		strFindReplace(text, "%name", phrase.Name.toUtf8());
 		// replace Sabrina Cost and credit.
 		uint32	cost, credit;
 		pBM->getSabrinaCom().getPhraseCost(phrase.Bricks, cost, credit);
@@ -1079,7 +1079,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 		strFindReplace(text, "%credit", toString(credit));
 
 		// for combat, fill weapon compatibility
-		ucstring	weaponRestriction;
+		string	weaponRestriction;
 		bool		usableWithMelee;
 		bool		usableWithRange;
 		if(rootBrick && rootBrick->isCombat())
@@ -1099,7 +1099,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 			bool		resistMagic[RESISTANCE_TYPE::NB_RESISTANCE_TYPE];
 			getResistMagic(resistMagic, phrase.Bricks);
 			bool		first= true;
-			ucstring	resList;
+			string	resList;
 			for(uint i=0;i<RESISTANCE_TYPE::NB_RESISTANCE_TYPE;i++)
 			{
 				if(resistMagic[i])
@@ -1114,13 +1114,13 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 			// If have some resist
 			if(!resList.empty())
 			{
-				ucstring	fmt= CI18N::get("uihelpPhraseMagicResist");
+				string	fmt= CI18N::get("uihelpPhraseMagicResist");
 				strFindReplace(fmt, "%t", resList);
 				strFindReplace(text, "%magicresist", fmt);
 			}
 			else
 			{
-				strFindReplace(text, "%magicresist", ucstring());
+				strFindReplace(text, "%magicresist", string());
 			}
 
 		}
@@ -1208,7 +1208,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 			strFindReplace(text, "%range", CI18N::get("uihelpPhraseRangeSelf"));
 		else
 		{
-			ucstring	fmt= CI18N::get("uihelpPhraseRangeMeters");
+			string	fmt= CI18N::get("uihelpPhraseRangeMeters");
 			strFindReplace(fmt, "%dist", formatMalus(range, rangeMalus));
 			strFindReplace(text, "%range", fmt);
 		}
@@ -1217,7 +1217,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 		if(rootBrick->isForageExtraction())
 		{
 			// Choose the fmt text
-			ucstring	fmt= getForageExtractionPhraseEcotypeFmt(phrase);
+			string	fmt= getForageExtractionPhraseEcotypeFmt(phrase);
 
 			// Replace forage success rate in any ecotype
 			successModifier = 0;
@@ -1292,16 +1292,16 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 	}
 
 	// **** Special .sphrase description
-	if(phraseSheetId)
+	if (phraseSheetId)
 	{
 		// get the text
-		ucstring	desc(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(CSheetId(phraseSheetId)));
-		if(desc.empty())
-			strFindReplace(text, "%desc", ucstring());
+		string desc = STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(CSheetId(phraseSheetId));
+		if (desc.empty())
+			strFindReplace(text, "%desc", string());
 		else
 		{
 			// append an \n before, for clearness
-			desc= ucstring("\n") + desc;
+			desc= string("\n") + desc;
 			// append \n at end if not done
 			if(desc[desc.size()-1]!='\n')
 				desc+= '\n';
@@ -1311,13 +1311,13 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 	}
 	else
 	{
-		strFindReplace(text, "%desc", ucstring());
+		strFindReplace(text, "%desc", string());
 	}
 
 	// **** Special .sphrase requirement
 	if(phraseSheetId && wantRequirement)
 	{
-		ucstring	reqText;
+		string	reqText;
 		reqText= CI18N::get("uihelpPhraseRequirementHeader");
 
 		// replace the skill point cost
@@ -1331,7 +1331,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
 			const CReqSkillFormula	&formula= it->second;
 
 			// from this formula, build the requirement tex
-			ucstring	textForm;
+			string	textForm;
 			formula.getInfoText(textForm);
 			reqText+= textForm;
 		}
@@ -4089,7 +4089,7 @@ bool				CSPhraseManager::allowListBrickInHelp(const CSPhraseCom &phrase) const
 }
 
 // ***************************************************************************
-void				CSPhraseManager::getCombatWeaponRestriction(ucstring &text, const CSPhraseCom &phrase, bool& usableWithMelee, bool& usableWithRange)
+void				CSPhraseManager::getCombatWeaponRestriction(string &text, const CSPhraseCom &phrase, bool& usableWithMelee, bool& usableWithRange)
 {
 	text.clear();
 
@@ -4165,7 +4165,7 @@ void				CSPhraseManager::getCombatWeaponRestriction(ucstring &text, const CSPhra
 }
 
 // ***************************************************************************
-void				CSPhraseManager::getCombatWeaponRestriction(ucstring &text, sint32 phraseSheetId, bool& usableWithMelee, bool& usableWithRange)
+void				CSPhraseManager::getCombatWeaponRestriction(string &text, sint32 phraseSheetId, bool& usableWithMelee, bool& usableWithRange)
 {
 	CSPhraseCom	phrase;
 	buildPhraseFromSheet(phrase, phraseSheetId);
@@ -4279,7 +4279,7 @@ void		CSPhraseManager::fullDeletePhraseIfLast(uint32 memoryLine, uint32 memorySl
 
 
 // ***************************************************************************
-ucstring	CSPhraseManager::getForageExtractionPhraseEcotypeFmt(const CSPhraseCom &phrase)
+string	CSPhraseManager::getForageExtractionPhraseEcotypeFmt(const CSPhraseCom &phrase)
 {
 	CSBrickManager	*pBM= CSBrickManager::getInstance();
 
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.h b/ryzom/client/src/interface_v3/sphrase_manager.h
index 03c0f1718..59150927e 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.h
+++ b/ryzom/client/src/interface_v3/sphrase_manager.h
@@ -338,7 +338,7 @@ public:
 	 *  \specialPhraseFormat if empty, format is auto selected. if "composition", same but the text is cut under the %compostart tag.
 	 *		else take directly this format.
 	 */
-	void				buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase, uint32 phraseSheetId, bool wantRequirement, const std::string &specialPhraseFormat= std::string());
+	void				buildPhraseDesc(std::string &text, const CSPhraseCom &phrase, uint32 phraseSheetId, bool wantRequirement, const std::string &specialPhraseFormat= std::string());
 	// Get the Phrase Success Rate %
 	sint				getPhraseSuccessRate(const CSPhraseCom &phrase);
 	// Get the Phrase Success Rate %. Manually gives the Skill to do the comparison (for craft)
@@ -346,7 +346,7 @@ public:
 	// Get the Phrase Success Rate %. Manually gives the Skill to do the comparison (for Forage Extraction)
 	sint				getForageExtractionPhraseSuccessRate(const CSPhraseCom &phrase, SKILLS::ESkills skill);
 	// return the fmt according to forage terrain specializing
-	ucstring			getForageExtractionPhraseEcotypeFmt(const CSPhraseCom &phrase);
+	std::string			getForageExtractionPhraseEcotypeFmt(const CSPhraseCom &phrase);
 	// Get the Phrase Sap Cost
 	void				getPhraseSapCost(const CSPhraseCom &phrase, uint32 totalActionMalus, sint &cost, sint &costMalus);
 	// Get the Phrase Sta Cost
@@ -370,8 +370,8 @@ public:
 	/// true if interesting to list the bricks of this phrase in help
 	bool				allowListBrickInHelp(const CSPhraseCom &phrase) const;
 	/// return the combat restriction text (empty if not combat)
-	void				getCombatWeaponRestriction(ucstring &text, const CSPhraseCom &phrase, bool& usableWithMelee, bool& usableWithRange);
-	void				getCombatWeaponRestriction(ucstring &text, sint32 phraseSheetId, bool& usableWithMelee, bool& usableWithRange);
+	void				getCombatWeaponRestriction(std::string &text, const CSPhraseCom &phrase, bool& usableWithMelee, bool& usableWithRange);
+	void				getCombatWeaponRestriction(std::string &text, sint32 phraseSheetId, bool& usableWithMelee, bool& usableWithRange);
 	// return true if any of the Bricks contains AvoidCyclic==true (the phrase cannot be cyclic)
 	bool				avoidCyclicForPhrase(const CSPhraseCom &phrase) const;
 	bool				avoidCyclicForPhrase(sint32 phraseSheetId) const;
@@ -693,8 +693,8 @@ private:
 
 	// @}
 
-	ucstring	formatMalus(sint base, sint malus);
-	ucstring	formatMalus(float base, float malus);
+	std::string	formatMalus(sint base, sint malus);
+	std::string	formatMalus(float base, float malus);
 	std::string		formatBonusMalus(sint32 base, sint32 mod);
 
 	// Special for combat: Build the "phrase skill compatible" formula
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index a5b94c879..e39d406ff 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -357,6 +357,7 @@ static void setPatcherProgressText(const std::string &baseUIPath, const ucstring
 static void updatePatchingInfoText(const std::string &baseUIPath)
 {
 	CPatchManager *pPM = CPatchManager::getInstance();
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess &bgDownloader = CBGDownloaderAccess::getInstance();
 	if (isBGDownloadEnabled())
 	{
@@ -380,6 +381,7 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
 		}
 	}
 	else
+#endif
 	{
 		ucstring state;
 		vector<ucstring> log;
@@ -406,7 +408,9 @@ void loginMainLoop()
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CPatchManager *pPM = CPatchManager::getInstance();
 
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess &bgDownloader = CBGDownloaderAccess::getInstance();
+#endif
 
 	bool windowBlinkDone = false;
 	bool fatalMessageBoxShown = false;
@@ -464,11 +468,13 @@ void loginMainLoop()
 			BGDownloader::TTaskResult taskResult = BGDownloader::TaskResult_Unknown;
 			bool finished = false;
 			ucstring bgDownloaderError;
+#ifdef RYZOM_BG_DOWNLOADER
 			if (isBGDownloadEnabled())
 			{
 				finished = bgDownloader.isTaskEnded(taskResult, bgDownloaderError);
 			}
 			else
+#endif
 			{
 				finished = pPM->isCheckThreadEnded(res);
 			}
@@ -478,6 +484,7 @@ void loginMainLoop()
 				setPatcherStateText("ui:login:checking", ucstring());
 				setPatcherProgressText("ui:login:checking", ucstring());
 
+#ifdef RYZOM_BG_DOWNLOADER
 				if (isBGDownloadEnabled())
 				{
 					AvailablePatchs = bgDownloader.getAvailablePatchs();
@@ -529,6 +536,7 @@ void loginMainLoop()
 
 				}
 				else
+#endif
 				{
 					if(res)
 					{
@@ -642,7 +650,7 @@ void loginMainLoop()
 			int currentPatchingSize;
 			int totalPatchSize;
 
-
+#ifdef RYZOM_BG_DOWNLOADER
 			if (isBGDownloadEnabled())
 			{
 				currentPatchingSize = bgDownloader.getPatchingSize();
@@ -683,6 +691,7 @@ void loginMainLoop()
 				}
 			}
 			else
+#endif
 			{
 				totalPatchSize = TotalPatchSize;
 				currentPatchingSize = pPM->getPatchingSize();
@@ -1130,18 +1139,22 @@ void initPatchCheck()
 		LoginShardId = Shards[ShardSelected].ShardId;
 	}
 
+#ifdef RYZOM_BG_DOWNLOADER
 	if (!isBGDownloadEnabled())
+#endif
 	{
 		getPatchParameters(url, ver, patchURIs);
 		pPM->init(patchURIs, url, ver);
 		pPM->startCheckThread(true /* include background patchs */);
 	}
+#ifdef RYZOM_BG_DOWNLOADER
 	else
 	{
 		BGDownloader::CTaskDesc taskDesc(BGDownloader::DLState_CheckPatch);
 		CBGDownloaderAccess::getInstance().requestDownloadThreadPriority(BGDownloader::ThreadPriority_Normal, false);
 		CBGDownloaderAccess::getInstance().startTask(taskDesc, getBGDownloaderCommandLine(), true /* showDownloader */);
 	}
+#endif
 	NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_CHECKING);
 
 	setPatcherStateText("ui:login:checking", ucstring());
@@ -1650,8 +1663,9 @@ void initPatch()
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CPatchManager *pPM = CPatchManager::getInstance();
 
-
+#ifdef RYZOM_BG_DOWNLOADER
 	if (!isBGDownloadEnabled())
+#endif
 	{
 		// Get the list of optional categories to patch
 		vector<string> vCategories;
@@ -1686,6 +1700,7 @@ void initPatch()
 		}
 		pPM->startPatchThread(vCategories, true);
 	}
+#ifdef RYZOM_BG_DOWNLOADER
 	else
 	{
 		// NB : here we only do a part of the download each time
@@ -1695,6 +1710,7 @@ void initPatch()
 		NLMISC::CBigFile::getInstance().removeAll();
 		NLMISC::CStreamedPackageManager::getInstance().unloadAll();
 	}
+#endif
 	NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_PATCHING);
 
 	CInterfaceElement *closeBtn = CWidgetManager::getInstance()->getElementFromId(CTRL_BUTTON_CLOSE_PATCH);
@@ -1840,11 +1856,13 @@ class CAHReboot : public IActionHandler
 		CInterfaceManager *im = CInterfaceManager::getInstance();
 		try
 		{
+#ifdef RYZOM_BG_DOWNLOADER
 			if (isBGDownloadEnabled())
 			{
 				CBGDownloaderAccess::getInstance().reboot();
 			}
 			else
+#endif
 			{
 				CPatchManager::getInstance()->reboot();
 			}
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index 299972b15..bab17a7b6 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -1100,6 +1100,7 @@ bool mainLoop()
 		// Start Bench
 		H_AUTO_USE ( RZ_Client_Main_Loop )
 
+#ifdef RYZOM_BG_DOWNLOADER
 		if (isBGDownloadEnabled())
 		{
 			CBGDownloaderAccess &bgDownloader = CBGDownloaderAccess::getInstance();
@@ -1110,6 +1111,7 @@ bool mainLoop()
 				unpauseBGDownloader();
 			}
 		}
+#endif
 
 		FPU_CHECKER_ONCE
 
@@ -1281,7 +1283,9 @@ bool mainLoop()
 			// Get Mouse Position.
 			OldMouseX = MouseX; OldMouseY = MouseY;
 
+#ifdef RYZOM_BG_DOWNLOADER
 			updateBGDownloaderUI();
+#endif
 		}
 
 		// Get the pointer pos
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index d412fa7c8..c06389f0c 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -404,7 +404,7 @@ void impulseUserChars(NLMISC::CBitMemStream &impulse)
 		// if there's a new char for which a key set was wanted, create it now
 		for (uint k = 0; k < CharacterSummaries.size(); ++k)
 		{
-			if (toLower(CharacterSummaries[k].Name) == toLower(NewKeysCharNameValidated))
+			if (toLower(CharacterSummaries[k].Name.toUtf8()) == toLower(NewKeysCharNameValidated))
 			{
 				// first, stripes server name
 				copyKeySet(lookupSrcKeyFile(GameKeySet), "save/keys_" + buildPlayerNameForSaveFile(NewKeysCharNameValidated) + ".xml");
@@ -1582,8 +1582,8 @@ void impulseTPCommon2(NLMISC::CBitMemStream &impulse, bool hasSeason)
 
 	R2::TTeleportContext tpContext = R2::TPContext_Unknown;
 
-	ucstring tpReason;
-	ucstring tpCancelText;
+	string tpReason;
+	string tpCancelText;
 
 	try
 	{
@@ -1597,14 +1597,14 @@ void impulseTPCommon2(NLMISC::CBitMemStream &impulse, bool hasSeason)
 
 			uint32 size = (uint32)tpInfos.TpReasonParams.size();
 			uint32 first = 0;
-			CSString  str(tpReason.toString());
+			CSString  str(tpReason);
 			for (;first != size ; ++first)
 			{
 				std::string value = tpInfos.TpReasonParams[first];
 				std::string key = NLMISC::toString("%%%u", first +1);
 				str = str.replace( key.c_str(), value.c_str());
 			}
-			tpReason = ucstring(str);
+			tpReason = string(str);
 			tpCancelText = CI18N::get(tpInfos.TpCancelTextId);
 			tpContext = tpInfos.TpContext;
 		}
@@ -1612,16 +1612,16 @@ void impulseTPCommon2(NLMISC::CBitMemStream &impulse, bool hasSeason)
 	}
 	catch (const EStream &)
 	{
-		tpReason = ucstring("TP Reason");
-		tpCancelText = ucstring("Cancel TP"); // for test
+		tpReason = "TP Reason";
+		tpCancelText = "Cancel TP"; // for test
 		// try to deduce tp context from current editor mode
 		switch (R2::getEditor().getMode())
 		{
 			case R2::CEditor::EditionMode:
 			case R2::CEditor::NotInitialized:
 				tpContext = R2::TPContext_Unknown;
-				tpReason = ucstring();
-				tpCancelText = ucstring();
+				tpReason = string();
+				tpCancelText = string();
 			break;
 			case R2::CEditor::GoingToDMMode:
 			case R2::CEditor::TestMode:
@@ -1667,7 +1667,7 @@ void impulseTPCommon2(NLMISC::CBitMemStream &impulse, bool hasSeason)
 	//InitMouseWithCursor(oldHardwareCursor);
 
 	// reset 'cancel' button
-	ProgressBar.setTPMessages(ucstring(), ucstring(), "");
+	ProgressBar.setTPMessages(string(), string(), "");
 
 
 	// ProgressBar.enableQuitButton(false); // TMP TMP
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index c27e285e1..534ae46e9 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -71,7 +71,7 @@ void CProgress::setFontFactor(float temp)
 	_FontFactor = temp;
 }
 
-void CProgress::newMessage (const ucstring& message)
+void CProgress::newMessage (const string& message)
 {
 	popCropedValues ();
 	_CurrentRootStep++;
@@ -249,7 +249,7 @@ void CProgress::internalProgress (float value)
 			for(uint i = 0; i < ClientCfg.Logos.size(); i++)
 			{
 				std::vector<string> res;
-				explode(ClientCfg.Logos[i], std::string(":"), res);
+				explode(ClientCfg.Logos[i], string(":"), res);
 				if(res.size()==9 && i<LogoBitmaps.size() && LogoBitmaps[i]!=NULL)
 				{
 					fromString(res[1], x);
@@ -338,7 +338,7 @@ void CProgress::internalProgress (float value)
 						TextContext->setFontSize((uint)(15.f * fontFactor));
 						TextContext->setHotSpot(UTextContext::BottomLeft);
 
-						string uc = CI18N::get("uiR2EDTPEscapeToInteruptLoading") + " (" + _TPCancelText.toUtf8() + ") - " + CI18N::get("uiDelayedTPCancel");
+						string uc = CI18N::get("uiR2EDTPEscapeToInteruptLoading") + " (" + _TPCancelText + ") - " + CI18N::get("uiDelayedTPCancel");
 						UTextContext::CStringInfo info = TextContext->getStringInfo(uc);
 						float stringX = 0.5f - info.StringWidth/(ClientCfg.Width*2);
 						TextContext->printAt(stringX, 7.f / ClientCfg.Height, uc);
@@ -452,8 +452,9 @@ void CProgress::internalProgress (float value)
 		_TPCancelFlag = true;
 	}
 
-
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess::getInstance().update();
+#endif
 	// Display to screen.
 	Driver->swapBuffers();
 
@@ -474,7 +475,7 @@ void CProgress::internalProgress (float value)
 }
 
 
-void CProgress::setTPMessages(const ucstring &tpReason,const ucstring &tpCancelText, const std::string &/* iconName */)
+void CProgress::setTPMessages(const string &tpReason,const string &tpCancelText, const string &/* iconName */)
 {
 	_TPReason = tpReason;
 	_TPCancelText = tpCancelText;
@@ -497,7 +498,7 @@ bool CProgress::getTPCancelFlag(bool clearFlag /*=true*/)
 
 void CProgress::release()
 {
-	setTPMessages(ucstring(), ucstring(), "");
+	setTPMessages(string(), string(), string());
 	_TPCancelFlag = false;
 }
 
diff --git a/ryzom/client/src/progress.h b/ryzom/client/src/progress.h
index 2d50b573f..ee9495028 100644
--- a/ryzom/client/src/progress.h
+++ b/ryzom/client/src/progress.h
@@ -64,7 +64,7 @@ public:
 	void			finish ();
 
 	// New message
-	void			newMessage (const ucstring& message);
+	void			newMessage (const std::string& message);
 
 	void			setFontFactor(float f);
 
@@ -72,7 +72,7 @@ public:
 	bool			ApplyTextCommands;
 
 	// Set teleport specific message
-	void			setTPMessages(const ucstring &tpReason, const ucstring &tpCancelText, const std::string &iconName);
+	void			setTPMessages(const std::string &tpReason, const std::string &tpCancelText, const std::string &iconName);
 
 	bool			getTPCancelFlag(bool clearFlag = true);
 
@@ -83,7 +83,7 @@ private:
 
 	// Display a text to describe what is the application going to do.
 	// this function can be call even if texture is NULL, driver or textcontext not initialised
-	ucstring		_ProgressMessage;
+	std::string		_ProgressMessage;
 
 	// Time since last update
 	sint64			_LastUpdate;
@@ -92,8 +92,8 @@ private:
 	uint			_CurrentRootStep;
 	uint			_RootStepCount;
 
-	ucstring		_TPReason;
-	ucstring		_TPCancelText;
+	std::string		_TPReason;
+	std::string		_TPCancelText;
 
 	bool			_TPCancelFlag;
 
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index 7a7cc91eb..bcbf7259f 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -489,7 +489,9 @@ void releaseMainLoop(bool closeConnection)
 // Called when Quit from OutGame
 void releaseOutGame()
 {
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess::getInstance().release();
+#endif
 
 	ProgressBar.release();
 
@@ -571,7 +573,9 @@ void release()
 		CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_GameExit, "login_step_game_exit&play_time=" + toString((NLMISC::CTime::getLocalTime() - StartPlayTime) / 1000)));
 	}
 
+#ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess::getInstance().release();
+#endif
 
 	ProgressBar.release();
 
diff --git a/ryzom/common/src/game_share/character_summary.h b/ryzom/common/src/game_share/character_summary.h
index 34b0f2a86..4397d1146 100644
--- a/ryzom/common/src/game_share/character_summary.h
+++ b/ryzom/common/src/game_share/character_summary.h
@@ -54,7 +54,7 @@ struct CCharacterSummary
 	TSessionId Mainland;
 
 	/// name
-	ucstring Name;
+	ucstring Name; // TODO: UTF-8 (serial)
 
 	/// Localisation
 	uint32 Location;
diff --git a/ryzom/common/src/game_share/item_infos.h b/ryzom/common/src/game_share/item_infos.h
index 1cb32ae41..1a0746f3b 100644
--- a/ryzom/common/src/game_share/item_infos.h
+++ b/ryzom/common/src/game_share/item_infos.h
@@ -136,9 +136,9 @@ public:
 	CSPhraseCom	Enchantment;
 	float  WearEquipmentMalus; // Malus for wearing this equipment (malus is used when execute an magic, forage action, craft action...), malus is only applicable for weapon and armor pieces
 
-	ucstring	CustomText;
-	ucstring	R2ItemDescription;
-	ucstring	R2ItemComment;
+	ucstring	CustomText; // TODO: UTF-8 (serial)
+	ucstring	R2ItemDescription; // TODO: UTF-8 (serial)
+	ucstring	R2ItemComment; // TODO: UTF-8 (serial)
 	uint8		PetNumber; // 1 based pet index
 	//@}
 };
diff --git a/ryzom/common/src/game_share/mainland_summary.h b/ryzom/common/src/game_share/mainland_summary.h
index 81c001caa..98f73439a 100644
--- a/ryzom/common/src/game_share/mainland_summary.h
+++ b/ryzom/common/src/game_share/mainland_summary.h
@@ -41,10 +41,10 @@ struct CMainlandSummary
 	TSessionId Id;
 
 	/// description
-	ucstring Name;
+	ucstring Name; // TODO: UTF-8 (serial)
 
 	/// description
-	ucstring Description;
+	ucstring Description; // TODO: UTF-8 (serial)
 
 	/// language code
 	std::string LanguageCode;
diff --git a/ryzom/common/src/game_share/msg_client_server.h b/ryzom/common/src/game_share/msg_client_server.h
index c66e7856a..ce942291e 100644
--- a/ryzom/common/src/game_share/msg_client_server.h
+++ b/ryzom/common/src/game_share/msg_client_server.h
@@ -88,7 +88,7 @@ public:
 class CCheckNameMsg
 {
 public:
-	ucstring	Name;
+	ucstring	Name; // TODO: UTF-8 (serial)
 	TSessionId	HomeSessionId;
 
 	void serialBitMemStream(NLMISC::CBitMemStream &f)
diff --git a/ryzom/common/src/game_share/sphrase_com.h b/ryzom/common/src/game_share/sphrase_com.h
index 476034b2f..dd2c053ae 100644
--- a/ryzom/common/src/game_share/sphrase_com.h
+++ b/ryzom/common/src/game_share/sphrase_com.h
@@ -63,7 +63,7 @@ public:
 	std::vector<NLMISC::CSheetId>	Bricks;
 
 	// Name Of the Phrase. Saved on server, read on client.
-	ucstring						Name;
+	ucstring						Name; // FIXME: UTF-8 (serial)
 
 	/// The comparison is made only on Bricks
 	bool	operator==(const CSPhraseCom &p) const;

From 298e9129491c39b9da159733872f1f34eda0f1b0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 05:22:31 +0800
Subject: [PATCH 129/292] UTF-8 login patcher, ryzom/ryzomcore#335

---
 ryzom/client/src/item_group_manager.cpp    |  2 +-
 ryzom/client/src/login.cpp                 | 90 +++++++++++-----------
 ryzom/client/src/login_patch.cpp           | 86 ++++++++++-----------
 ryzom/client/src/login_patch.h             | 20 ++---
 ryzom/tools/client/client_patcher/main.cpp |  4 +-
 5 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index ad35a2a97..2cbb86dac 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -698,7 +698,7 @@ void CItemGroupManager::listGroup()
 	{
 		CItemGroup group = _Groups[i];
 		string msg = NLMISC::CI18N::get("cmdListGroupLine");
-		//Use ucstring because group name can contain accentued characters (and stuff like that)
+		//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 		string nameUC = group.name;
 		NLMISC::strFindReplace(msg, "%name", nameUC);
 		NLMISC::strFindReplace(msg, "%size", NLMISC::toString(group.Items.size()));
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index e39d406ff..d0f6243b8 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -199,7 +199,7 @@ void setLoginFinished( bool f )
 
 // ***************************************************************************
 // Pop a fatal error message box, giving the option to 'quit' the client, plus a help button
-static void fatalMessageBox(const ucstring &msg)
+static void fatalMessageBox(const std::string &msg)
 {
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	im->messageBoxWithHelp(msg, "ui:login", "login_quit");
@@ -207,7 +207,7 @@ static void fatalMessageBox(const ucstring &msg)
 
 // ***************************************************************************
 // Pop an error message box, giving the option to go back to main menu, plus a help button
-static void errorMessageBox(const ucstring &msg)
+static void errorMessageBox(const std::string &msg)
 {
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	im->messageBoxWithHelp(msg, "ui:login", "on_back_to_login");
@@ -281,25 +281,25 @@ void initEula()
 }
 
 // ***************************************************************************
-static void setDataScanLog(const ucstring &text)
+static void setDataScanLog(const std::string &text)
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:log_txt:log"));
 	if (pVT != NULL)
 	{
-		pVT->setText(text.toUtf8());
+		pVT->setText(text);
 	}
 }
 
 // ***************************************************************************
-static void setDataScanState(const ucstring &text, ucstring progress= ucstring())
+static void setDataScanState(const std::string &text, const std::string &progress = string())
 {
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:state"));
-	if (pVT != NULL) pVT->setText(text.toUtf8());
+	if (pVT != NULL) pVT->setText(text);
 
 	pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:progress"));
-	if (pVT != NULL) pVT->setText(progress.toUtf8());
+	if (pVT != NULL) pVT->setText(progress);
 }
 
 void initCatDisplay()
@@ -332,24 +332,24 @@ void initReboot()
 
 
 // ***************************************************************************
-static void setPatcherStateText(const std::string &baseUIPath, const ucstring &str)
+static void setPatcherStateText(const std::string &baseUIPath, const std::string &str)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:state"));
 	if (pVT != NULL)
 	{
-		pVT->setText(str.toUtf8());
+		pVT->setText(str);
 	}
 }
 
 // ***************************************************************************
-static void setPatcherProgressText(const std::string &baseUIPath, const ucstring &str)
+static void setPatcherProgressText(const std::string &baseUIPath, const std::string &str)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:progress"));
 	if (pVT != NULL)
 	{
-		pVT->setText(str.toUtf8());
+		pVT->setText(str);
 	}
 }
 
@@ -365,7 +365,7 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
 		if (bgDownloader.getDownloadThreadPriority() == BGDownloader::ThreadPriority_Paused)
 		{
 			setPatcherStateText(baseUIPath, CI18N::get("uiBGD_Paused"));
-			setPatcherProgressText(baseUIPath, ucstring());
+			setPatcherProgressText(baseUIPath, string());
 		}
 		else
 		{
@@ -376,15 +376,15 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
 			}
 			else
 			{
-				setPatcherProgressText(baseUIPath, ucstring());
+				setPatcherProgressText(baseUIPath, string());
 			}
 		}
 	}
 	else
 #endif
 	{
-		ucstring state;
-		vector<ucstring> log;
+		string state;
+		vector<string> log;
 		if(pPM->getThreadState(state, log))
 		{
 			setPatcherStateText(baseUIPath, state);
@@ -394,7 +394,7 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
 			}
 			else
 			{
-				setPatcherProgressText(baseUIPath, ucstring());
+				setPatcherProgressText(baseUIPath, string());
 			}
 		}
 	}
@@ -481,8 +481,8 @@ void loginMainLoop()
 
 			if (finished)
 			{
-				setPatcherStateText("ui:login:checking", ucstring());
-				setPatcherProgressText("ui:login:checking", ucstring());
+				setPatcherStateText("ui:login:checking", string());
+				setPatcherProgressText("ui:login:checking", string());
 
 #ifdef RYZOM_BG_DOWNLOADER
 				if (isBGDownloadEnabled())
@@ -561,7 +561,7 @@ void loginMainLoop()
 					}
 					else
 					{
-						ucstring errMsg = CI18N::get("uiErrChecking");
+						string errMsg = CI18N::get("uiErrChecking");
 						if (!pPM->getLastErrorMessage().empty())
 						{
 							errMsg = pPM->getLastErrorMessage();
@@ -604,14 +604,14 @@ void loginMainLoop()
 							setDataScanState(CI18N::get("uiScanDataSucess"));
 						else
 						{
-							ucstring	fmt= CI18N::get("uiScanDataErrors");
+							string	fmt= CI18N::get("uiScanDataErrors");
 							strFindReplace(fmt, "%d", toString(numFiles));
 							setDataScanState(fmt);
 						}
 					}
 					else
 					{
-						ucstring errMsg = CI18N::get("uiErrDataScanning");
+						string errMsg = CI18N::get("uiErrDataScanning");
 						if (!pPM->getLastErrorMessage().empty())
 						{
 							errMsg = pPM->getLastErrorMessage();
@@ -620,7 +620,7 @@ void loginMainLoop()
 					}
 
 					// the log may have changed
-					ucstring	dsLog;
+					string	dsLog;
 					if(pPM->getDataScanLog(dsLog))
 						setDataScanLog(dsLog);
 				}
@@ -628,8 +628,8 @@ void loginMainLoop()
 			else
 			{
 				// update inteface content
-				ucstring state;
-				vector<ucstring> log;
+				string state;
+				vector<string> log;
 				// get state
 				if(pPM->getThreadState(state, log))
 				{
@@ -637,7 +637,7 @@ void loginMainLoop()
 					setDataScanState(state, toString("%d/%d", pPM->getCurrentFilesToGet(), pPM->getTotalFilesToGet()));
 				}
 				// set special data scan log
-				ucstring	dsLog;
+				string	dsLog;
 				if(pPM->getDataScanLog(dsLog))
 					setDataScanLog(dsLog);
 			}
@@ -704,7 +704,7 @@ void loginMainLoop()
 					}
 					else
 					{
-						ucstring errMsg = CI18N::get("uiErrPatchApply");
+						string errMsg = CI18N::get("uiErrPatchApply");
 						if (!pPM->getLastErrorMessage().empty())
 						{
 							errMsg = pPM->getLastErrorMessage();
@@ -1157,8 +1157,8 @@ void initPatchCheck()
 #endif
 	NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_CHECKING);
 
-	setPatcherStateText("ui:login:checking", ucstring());
-	setPatcherProgressText("ui:login:checking", ucstring());
+	setPatcherStateText("ui:login:checking", string());
+	setPatcherProgressText("ui:login:checking", string());
 }
 
 void initShardDisplay()
@@ -1717,8 +1717,8 @@ void initPatch()
 	if (closeBtn)
 		closeBtn->setActive(false);
 
-	setPatcherStateText("ui:login:patching", ucstring());
-	setPatcherProgressText("ui:login:patching", ucstring());
+	setPatcherStateText("ui:login:patching", string());
+	setPatcherProgressText("ui:login:patching", string());
 }
 
 // ***************************************************************************
@@ -2274,7 +2274,7 @@ void initDataScan()
 	CPatchManager *pPM = CPatchManager::getInstance();
 
 	// reset the log
-	setDataScanLog(ucstring());
+	setDataScanLog(string());
 
 	// Start Scanning
 	pPM->startScanDataThread();
@@ -2442,26 +2442,26 @@ bool initCreateAccount()
 
 		if(!CurlHttpClient.sendGet(url, params, pPM->isVerboseLog()))
 		{
-			ucstring errorMessage("Can't send (error code 60)");
+			string errorMessage("Can't send (error code 60)");
 			errorMessageBox(errorMessage);
-			nlwarning(errorMessage.toString().c_str());
+			nlwarning(errorMessage.c_str());
 			return false;
 		}
 
 		string res;
 		if(!CurlHttpClient.receive(res, pPM->isVerboseLog()))
 		{
-			ucstring errorMessage("Can't receive (error code 61)");
+			string errorMessage("Can't receive (error code 61)");
 			errorMessageBox(errorMessage);
-			nlwarning(errorMessage.toString().c_str());
+			nlwarning(errorMessage.c_str());
 			return false;
 		}
 
 		if(res.empty())
 		{
-			ucstring errorMessage("Empty result (error code 13)");
+			string errorMessage("Empty result (error code 13)");
 			errorMessageBox(errorMessage);
-			nlwarning(errorMessage.toString().c_str());
+			nlwarning(errorMessage.c_str());
 			return false;
 		}
 
@@ -2618,9 +2618,9 @@ class CAHOnCreateAccountSubmit : public IActionHandler
 
 			if (!CurlHttpClient.connect(url))
 			{
-				ucstring errorMessage("Can't connect");
+				string errorMessage("Can't connect");
 				errorMessageBox(errorMessage);
-				nlwarning(errorMessage.toString().c_str());
+				nlwarning(errorMessage.c_str());
 				return;
 			}
 
@@ -2645,26 +2645,26 @@ class CAHOnCreateAccountSubmit : public IActionHandler
 
 			if(!CurlHttpClient.sendPost(url, params, pPM->isVerboseLog()))
 			{
-				ucstring errorMessage("Can't send (error code 60)");
+				string errorMessage("Can't send (error code 60)");
 				errorMessageBox(errorMessage);
-				nlwarning(errorMessage.toString().c_str());
+				nlwarning(errorMessage.c_str());
 				return;
 			}
 
 			string res;
 			if(!CurlHttpClient.receive(res, pPM->isVerboseLog()))
 			{
-				ucstring errorMessage("Can't receive (error code 61)");
+				string errorMessage("Can't receive (error code 61)");
 				errorMessageBox(errorMessage);
-				nlwarning(errorMessage.toString().c_str());
+				nlwarning(errorMessage.c_str());
 				return;
 			}
 
 			if(res.empty())
 			{
-				ucstring errorMessage("Empty result (error code 13)");
+				string errorMessage("Empty result (error code 13)");
 				errorMessageBox(errorMessage);
-				nlwarning(errorMessage.toString().c_str());
+				nlwarning(errorMessage.c_str());
 				return;
 			}
 
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 650531773..2b7d0c1ba 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -189,7 +189,7 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
 }
 
 // ****************************************************************************
-void CPatchManager::setErrorMessage(const ucstring &message)
+void CPatchManager::setErrorMessage(const std::string &message)
 {
 	_ErrorMessage = message;
 }
@@ -656,7 +656,7 @@ bool CPatchManager::isPatchThreadEnded (bool &ok)
 
 // ****************************************************************************
 // Called in main thread
-bool CPatchManager::getThreadState (ucstring &stateOut, vector<ucstring> &stateLogOut)
+bool CPatchManager::getThreadState (std::string &stateOut, vector<string> &stateLogOut)
 {
 	if ((PatchThread == NULL) && (CheckThread == NULL) && (ScanDataThread==NULL))
 		return false;
@@ -685,7 +685,7 @@ bool CPatchManager::getThreadState (ucstring &stateOut, vector<ucstring> &stateL
 	// verbose log
 	if (isVerboseLog() && !stateLogOut.empty())
 		for (uint32 i = 0; i < stateLogOut.size(); ++i)
-			nlinfo("%s", stateLogOut[i].toUtf8().c_str());
+			nlinfo("%s", stateLogOut[i].c_str());
 
 	return changed;
 }
@@ -1120,28 +1120,28 @@ float CPatchManager::getCurrentFileProgress() const
 // ****************************************************************************
 void CPatchManager::setRWAccess (const string &filename, bool bThrowException)
 {
-	ucstring s = CI18N::get("uiSetAttrib") + " " + CFile::getFilename(filename);
+	string s = CI18N::get("uiSetAttrib") + " " + CFile::getFilename(filename);
 	setState(true, s);
 
 	if (!NLMISC::CFile::setRWAccess(filename) && bThrowException)
 	{
 		s = CI18N::get("uiAttribErr") + " " + CFile::getFilename(filename) + " (" + toString(errno) + "," + strerror(errno) + ")";
 		setState(true, s);
-		throw Exception (s.toUtf8());
+		throw Exception (s);
 	}
 }
 
 // ****************************************************************************
 string CPatchManager::deleteFile (const string &filename, bool bThrowException, bool bWarning)
 {
-	ucstring s = CI18N::get("uiDelFile") + " " + CFile::getFilename(filename);
+	string s = CI18N::get("uiDelFile") + " " + CFile::getFilename(filename);
 	setState(true, s);
 
 	if (!NLMISC::CFile::fileExists(filename))
 	{
 		s = CI18N::get("uiDelNoFile");
 		setState(true, s);
-		return s.toUtf8();
+		return s;
 	}
 
 	if (!NLMISC::CFile::deleteFile(filename))
@@ -1150,8 +1150,8 @@ string CPatchManager::deleteFile (const string &filename, bool bThrowException,
 		if(bWarning)
 			setState(true, s);
 		if(bThrowException)
-			throw Exception (s.toUtf8());
-		return s.toUtf8();
+			throw Exception (s);
+		return s;
 	}
 	return "";
 }
@@ -1159,20 +1159,20 @@ string CPatchManager::deleteFile (const string &filename, bool bThrowException,
 // ****************************************************************************
 void CPatchManager::renameFile (const string &src, const string &dst)
 {
-	ucstring s = CI18N::get("uiRenameFile") + " " + NLMISC::CFile::getFilename(src);
+	string s = CI18N::get("uiRenameFile") + " " + NLMISC::CFile::getFilename(src);
 	setState(true, s);
 
 	if (!NLMISC::CFile::moveFile(dst, src))
 	{
 		s = CI18N::get("uiRenameErr") + " " + src + " -> " + dst + " (" + toString(errno) + "," + strerror(errno) + ")";
 		setState(true, s);
-		throw Exception (s.toUtf8());
+		throw Exception (s);
 	}
 }
 
 // ****************************************************************************
 // Take care this function is called by the thread
-void CPatchManager::setState (bool bOutputToLog, const ucstring &ucsNewState)
+void CPatchManager::setState (bool bOutputToLog, const string &ucsNewState)
 {
 	{
 		CSynchronized<CState>::CAccessor as(&State);
@@ -1342,7 +1342,7 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
 
 		try
 		{
-			ucstring s = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename(srcName);
+			string s = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename(srcName);
 			setState(true, s);
 
 			// get the new file
@@ -1364,13 +1364,13 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
 			// if emergency patch server, this is a real issue, rethrow exception
 			if (UsedServer < 0)
 			{
-				ucstring s = CI18N::get("uiDLFailed");
+				string s = CI18N::get("uiDLFailed");
 				setState(true, s);
 
 				throw Exception(e.what());
 			}
 
-			ucstring s = CI18N::get("uiDLURIFailed") + " " + serverDisplayPath;
+			string s = CI18N::get("uiDLURIFailed") + " " + serverDisplayPath;
 			setState(true, s);
 
 			// this server is unavailable
@@ -1384,7 +1384,7 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
 			// scanned all servers? use alternative
 			if (nextServer == UsedServer)
 			{
-				ucstring s = CI18N::get("uiNoMoreURI");
+				string s = CI18N::get("uiNoMoreURI");
 				setState(true, s);
 				UsedServer = -1;
 				nlwarning("EXCEPTION CATCH: getServerFile() failed - no alternative found");
@@ -1409,7 +1409,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 	try
 	{
 #ifdef USE_CURL
-		ucstring s = CI18N::get("uiDLWithCurl") + " " + CFile::getFilename(dest);
+		string s = CI18N::get("uiDLWithCurl") + " " + CFile::getFilename(dest);
 		setState(true, s);
 
 		// user agent = nel_launcher
@@ -1417,7 +1417,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 		CURL *curl;
 		CURLcode res;
 
-		ucstring sTranslate = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename (source);
+		string sTranslate = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename (source);
 		setState(true, sTranslate);
 		CurrentFile = NLMISC::CFile::getFilename (source);
 
@@ -1566,7 +1566,7 @@ void CPatchManager::downloadFile (const string &source, const string &dest, NLMI
 
 void CPatchManager::decompressFile (const string &filename)
 {
-	ucstring sTranslate = CI18N::get("uiDecompressing") + " " + NLMISC::CFile::getFilename(filename);
+	string sTranslate = CI18N::get("uiDecompressing") + " " + NLMISC::CFile::getFilename(filename);
 	setState(true, sTranslate);
 
 	//if(isVerboseLog()) nlinfo("Calling gzopen('%s','rb')", filename.c_str());
@@ -1664,7 +1664,7 @@ void CPatchManager::applyDate (const string &sFilename, uint32 nDate)
 	if(nDate != 0)
 	{
 		setRWAccess(sFilename, false);
-		ucstring s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + timestampToHumanReadable(NLMISC::CFile::getFileModificationDate (sFilename)) +
+		string s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + timestampToHumanReadable(NLMISC::CFile::getFileModificationDate (sFilename)) +
 						" -> " + timestampToHumanReadable(nDate);
 		setState(true,s);
 
@@ -1786,7 +1786,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
 		// If the version cannot be found with size and time try with sha1
 		if (nVersionFound == 0xFFFFFFFF)
 		{
-			ucstring sTranslate = CI18N::get("uiCheckInt") + " " + rFilename;
+			string sTranslate = CI18N::get("uiCheckInt") + " " + rFilename;
 			setState(true, sTranslate);
 			CHashKey hkLocalSHA1 = getSHA1(sFilePath);
 			for (j = 0; j < rFile.versionCount(); ++j)
@@ -1806,7 +1806,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
 		// No version available found
 		if (nVersionFound == 0xFFFFFFFF)
 		{
-			ucstring sTranslate = CI18N::get("uiNoVersionFound");
+			string sTranslate = CI18N::get("uiNoVersionFound");
 			setState(true, sTranslate);
 			// Get all patches from beginning (first patch is reference file)
 			ftpOut.FileName = rFilename;
@@ -1827,7 +1827,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
 		}
 		else // A version of the file has been found
 		{
-			ucstring sTranslate = CI18N::get("uiVersionFound") + " " + toString(nVersionFound);
+			string sTranslate = CI18N::get("uiVersionFound") + " " + toString(nVersionFound);
 			setState(true, sTranslate);
 			// Get All patches from this version !
 			ftpOut.FileName = rFilename;
@@ -1883,7 +1883,7 @@ bool CPatchManager::bnpUnpack(const string &srcBigfile, const string &dstPath, v
 	else
 		DestPath = CPath::standardizePath (dstPath);
 
-	ucstring s = CI18N::get("uiUnpack") + " " + NLMISC::CFile::getFilename(SourceName);
+	string s = CI18N::get("uiUnpack") + " " + NLMISC::CFile::getFilename(SourceName);
 	setState(true,s);
 
 	// Read Header of the BNP File
@@ -1892,7 +1892,7 @@ bool CPatchManager::bnpUnpack(const string &srcBigfile, const string &dstPath, v
 
 	if (!bnpFile.readHeader())
 	{
-		ucstring s = CI18N::get("uiUnpackErrHead") + " " + CFile::getFilename(SourceName);
+		string s = CI18N::get("uiUnpackErrHead") + " " + CFile::getFilename(SourceName);
 		setState(true,s);
 		return false;
 	}
@@ -1938,8 +1938,8 @@ int CPatchManager::validateProgress(void *foo, double t, double d, double /* ult
 
 	CPatchManager *pPM = CPatchManager::getInstance();
 	double pour1 = t!=0.0?d*100.0/t:0.0;
-	ucstring sTranslate = CI18N::get("uiLoginGetFile") + ucstring::makeFromUtf8(toString(" %s : %s / %s (%.02f %%)", NLMISC::CFile::getFilename(pPM->CurrentFile).c_str(),
-		NLMISC::bytesToHumanReadableUnits((uint64)d, units).c_str(), NLMISC::bytesToHumanReadableUnits((uint64)t, units).c_str(), pour1));
+	string sTranslate = CI18N::get("uiLoginGetFile") + toString(" %s : %s / %s (%.02f %%)", NLMISC::CFile::getFilename(pPM->CurrentFile).c_str(),
+		NLMISC::bytesToHumanReadableUnits((uint64)d, units).c_str(), NLMISC::bytesToHumanReadableUnits((uint64)t, units).c_str(), pour1);
 	pPM->setState(false, sTranslate);
 	if (foo)
 	{
@@ -1953,7 +1953,7 @@ void CPatchManager::MyPatchingCB::progress(float f)
 {
 	CPatchManager *pPM = CPatchManager::getInstance();
 	double p = 100.0*f;
-	ucstring sTranslate = CI18N::get("uiApplyingDelta") + ucstring::makeFromUtf8(toString(" %s (%.02f %%)", CFile::getFilename(patchFilename).c_str(), p));
+	string sTranslate = CI18N::get("uiApplyingDelta") + toString(" %s (%.02f %%)", CFile::getFilename(patchFilename).c_str(), p);
 	pPM->setState(false, sTranslate);
 }
 
@@ -2079,7 +2079,7 @@ uint CPatchManager::applyScanDataResult()
 }
 
 // ***************************************************************************
-bool CPatchManager::getDataScanLog(ucstring &text)
+bool CPatchManager::getDataScanLog(string &text)
 {
 	text.clear();
 	bool	changed= false;
@@ -2092,7 +2092,7 @@ bool CPatchManager::getDataScanLog(ucstring &text)
 		{
 			for(uint i=0;i<val.FilesWithScanDataError.size();i++)
 			{
-				ucstring	str;
+				string	str;
 				getCorruptedFileInfo(val.FilesWithScanDataError[i], str);
 				text+= str + "\n";
 			}
@@ -2127,9 +2127,9 @@ void CPatchManager::clearDataScanLog()
 }
 
 // ***************************************************************************
-void CPatchManager::getCorruptedFileInfo(const SFileToPatch &ftp, ucstring &sTranslate)
+void CPatchManager::getCorruptedFileInfo(const SFileToPatch &ftp, string &sTranslate)
 {
-	sTranslate = CI18N::get("uiCorruptedFile") + " " + ucstring::makeFromUtf8(ftp.FileName) + " (" +
+	sTranslate = CI18N::get("uiCorruptedFile") + " " + ftp.FileName + " (" +
 		toString("%.1f ", (float)ftp.FinalFileSize/1000000.f) + CI18N::get("uiMb") + ")";
 }
 
@@ -2167,7 +2167,7 @@ void CCheckThread::run ()
 		// Check if the client version is the same as the server version
 		string sClientVersion = pPM->getClientVersion();
 		string sServerVersion = pPM->getServerVersion();
-		ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
+		string sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
 		sTranslate += CI18N::get("uiServerVersion") + " (" + sServerVersion + ")";
 		pPM->setState(true, sTranslate);
 
@@ -2216,7 +2216,7 @@ void CCheckThread::run ()
 		for (i = 0; i < rDescFiles.fileCount(); ++i)
 		{
 			CPatchManager::SFileToPatch ftp;
-			sTranslate = CI18N::get("uiCheckingFile") + " " + ucstring::makeFromUtf8(rDescFiles.getFile(i).getFileName());
+			sTranslate = CI18N::get("uiCheckingFile") + " " + rDescFiles.getFile(i).getFileName();
 			pPM->setState(true, sTranslate);
 			// get list of patch to apply to this file. don't to a full checksum test if possible
 			nlwarning(rDescFiles.getFile(i).getFileName().c_str());
@@ -2408,7 +2408,7 @@ void CCheckThread::run ()
 	catch (const Exception &e)
 	{
 		nlwarning("EXCEPTION CATCH: CCheckThread::run() failed");
-		ucstring sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
+		string sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
 		pPM->setState(true, CI18N::get("uiCheckEndWithErr"));
 		pPM->setErrorMessage(sTranslate);
 		CheckOk = false;
@@ -2478,7 +2478,7 @@ void CPatchThread::run()
 
 	CurrentFilePatched = 0.f;
 
-	ucstring sTranslate;
+	string sTranslate;
 	try
 	{
 		// First do all ref files
@@ -2536,7 +2536,7 @@ void CPatchThread::run()
 	catch(const Exception &e)
 	{
 		nlwarning("EXCEPTION CATCH: CPatchThread::run() failed");
-		pPM->setState(true, ucstring(e.what()));
+		pPM->setState(true, string(e.what()));
 		sTranslate = CI18N::get("uiPatchEndWithErr");
 		bErr = true;
 	}
@@ -2649,7 +2649,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 		rFTP.LocalFileExists = false;
 	}
 
-	ucstring sTranslate;
+	string sTranslate;
 	sTranslate = CI18N::get("uiProcessing") + " " + rFTP.FileName;
 	pPM->setState(true, sTranslate);
 
@@ -2984,7 +2984,7 @@ void CScanDataThread::run ()
 		uint32 i;
 		// Check if the client version is the same as the server version
 		string sClientVersion = pPM->getClientVersion();
-		ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
+		string sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
 		pPM->setState(true, sTranslate);
 
 		// For all bnp in the description file get all patches to apply
@@ -3023,7 +3023,7 @@ void CScanDataThread::run ()
 	catch (const Exception &e)
 	{
 		nlwarning("EXCEPTION CATCH: CScanDataThread::run() failed");
-		ucstring sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
+		string sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
 		pPM->setState(true, sTranslate);
 		CheckOk = false;
 		Ended = true;
@@ -3157,7 +3157,7 @@ bool CPatchManager::download(const std::string& patchFullname, const std::string
 	catch ( const std::exception& e)
 	{
 		nlwarning("%s", e.what());
-		pPM->setState(true, ucstring(e.what()) );
+		pPM->setState(true, string(e.what()) );
 		return false;
 	}
 
@@ -3408,7 +3408,7 @@ void CDownloadThread::run()
 				catch ( const std::exception& e)
 				{
 					nlwarning("%s", e.what());
-					pPM->setState(true, ucstring(e.what()) );
+					pPM->setState(true, string(e.what()) );
 					pPM->fatalError("uiCanNotDownload", patchName.c_str(), "");
 				}
 				catch (...)
@@ -3525,7 +3525,7 @@ void CInstallThread::run()
 			catch ( const std::exception& e)
 			{
 				nlwarning("%s", e.what());
-				pPM->setState(true, ucstring(e.what()) );
+				pPM->setState(true, string(e.what()) );
 				pPM->fatalError("uiCanNotInstall", patchName.c_str(), "");
 				return;
 
diff --git a/ryzom/client/src/login_patch.h b/ryzom/client/src/login_patch.h
index 2b108994d..dfd46b49c 100644
--- a/ryzom/client/src/login_patch.h
+++ b/ryzom/client/src/login_patch.h
@@ -56,7 +56,7 @@ public:
 class IPatchManagerStateListener
 {
 public:
-	virtual void setState (bool /* bOutputToLog */, const ucstring &/* ucsNewState */){}
+	virtual void setState (bool /* bOutputToLog */, const std::string &/* ucsNewState */){}
 };
 
 // Get Info of file to install
@@ -154,12 +154,12 @@ public:
 
 	// Get the string information about what the threads are doing
 	// Return true if the state has changed
-	bool getThreadState (ucstring &state, std::vector<ucstring> &stateLog);
+	bool getThreadState (std::string &state, std::vector<std::string> &stateLog);
 
 	/** Get the error message (filled after a patch of check)
 	  * May be empty if the cause of error is unknown or unhandled
 	  */
-	const ucstring &getLastErrorMessage() { return _ErrorMessage; }
+	const std::string &getLastErrorMessage() { return _ErrorMessage; }
 
 	// ---------------------
 	// First Part : Checking
@@ -235,7 +235,7 @@ public:
 	uint applyScanDataResult();
 
 	// get the current info Log for data Scan (true if some change from last get, else text is not filled)
-	bool getDataScanLog(ucstring &text);
+	bool getDataScanLog(std::string &text);
 
 	CProductDescriptionForClient &getDescFile() { return DescFile; }
 
@@ -284,7 +284,7 @@ private:
 	friend class CPatchThreadDownloadProgress;
 
 	// Set the thread state (called by threads to let us know what they are doing)
-	void setState (bool bOutputToLog, const ucstring &ucsState);
+	void setState (bool bOutputToLog, const std::string &ucsState);
 	void touchState();
 
 	/// Get the version of the server given during init()
@@ -330,7 +330,7 @@ private:
 	// add a file to the scan data log
 	void addDataScanLogCorruptedFile(const SFileToPatch &ftp);
 	void clearDataScanLog();
-	static void getCorruptedFileInfo(const SFileToPatch &ftp, ucstring &sTranslate);
+	static void getCorruptedFileInfo(const SFileToPatch &ftp, std::string &sTranslate);
 
 	static bool downloadAndUnpack(const std::string& patchPath, const std::string& sourceFilename, const std::string& extractPath, const std::string& tmpDirectory, uint32 timestamp);
 	// Forward message to Installation Software
@@ -404,7 +404,7 @@ private:
 	std::vector<SFileToPatch>		FilesToPatch;
 	std::vector<std::string>		OptionalCat;
 
-	ucstring						_ErrorMessage;
+	std::string						_ErrorMessage;
 
 	// Threads
 	CPatchThread	*PatchThread;
@@ -417,8 +417,8 @@ private:
 	// State
 	struct CState
 	{
-		ucstring					State;
-		std::vector<ucstring>		StateLog;
+		std::string					State;
+		std::vector<std::string>		StateLog;
 		bool						StateChanged;
 		CState()
 		{
@@ -470,7 +470,7 @@ private:
 	bool _StartRyzomAtEnd;
 public:
 	// used by threads to signal error at the end of execution
-	void setErrorMessage(const ucstring &message);
+	void setErrorMessage(const std::string &message);
 };
 
 /**
diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
index e7d57a335..3f5cb04ee 100644
--- a/ryzom/tools/client/client_patcher/main.cpp
+++ b/ryzom/tools/client/client_patcher/main.cpp
@@ -252,8 +252,8 @@ int main(int argc, char *argv[])
 	pPM->init(patchURLs, PatchUrl, "");
 	pPM->startCheckThread(true /* include background patchs */);
 
-	ucstring state;
-	vector<ucstring> log;
+	string state;
+	vector<string> log;
 	bool res = false;
 	bool finished = false;
 

From 52e3ca024fed660ecc925466c7bc960668d7a12a Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 05:40:32 +0800
Subject: [PATCH 130/292] UTF-8 various, ryzom/ryzomcore#335

---
 .../src/interface_v3/group_html_forum.cpp     |  8 +--
 .../src/interface_v3/group_html_mail.cpp      |  8 +--
 .../src/interface_v3/group_html_webig.cpp     |  6 +--
 ryzom/client/src/net_manager.cpp              | 54 +++++++++----------
 ryzom/client/src/progress.cpp                 |  6 +--
 .../client/src/r2/displayer_visual_entity.cpp | 10 ++--
 ryzom/client/src/string_manager_client.cpp    | 28 +++++-----
 ryzom/client/src/string_manager_client.h      | 12 ++---
 ryzom/client/src/text_manager.cpp             | 13 ++---
 ryzom/client/src/text_manager.h               | 12 +++--
 ryzom/client/src/user_entity.cpp              |  7 ++-
 ryzom/client/src/user_entity.h                |  4 +-
 12 files changed, 82 insertions(+), 86 deletions(-)

diff --git a/ryzom/client/src/interface_v3/group_html_forum.cpp b/ryzom/client/src/interface_v3/group_html_forum.cpp
index 4b74732f3..e6e6ff34f 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.cpp
+++ b/ryzom/client/src/interface_v3/group_html_forum.cpp
@@ -58,7 +58,7 @@ CGroupHTMLForum::~CGroupHTMLForum()
 
 void CGroupHTMLForum::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
- 	ucstring user_name = UserEntity->getLoginName ();
+ 	string user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
 	string	gname = guild.Name;
 
@@ -76,7 +76,7 @@ void CGroupHTMLForum::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 
 		url += ((url.find('?') != string::npos) ? "&" : "?") +
 		string("shard=") + toString(CharacterHomeSessionId) +
-		string("&user_login=") + user_name.toString() +
+		string("&user_login=") + user_name +
 		string("&forum=") + gname +
 		string("&session_cookie=") + NetMngr.getLoginCookie().toString();
 	}
@@ -90,14 +90,14 @@ void CGroupHTMLForum::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 
 void CGroupHTMLForum::addHTTPPostParams (SFormFields &formfields, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getLoginName ();
+	string user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
 	string	gname = guild.Name;
 
 	if (!gname.empty())
 	{
 		formfields.add("shard", toString(CharacterHomeSessionId));
-		formfields.add("user_login", user_name.toString());
+		formfields.add("user_login", user_name);
 		formfields.add("forum", gname);
 		formfields.add("session_cookie", NetMngr.getLoginCookie().toString());
 	}
diff --git a/ryzom/client/src/interface_v3/group_html_mail.cpp b/ryzom/client/src/interface_v3/group_html_mail.cpp
index ac2241523..eb49e5d78 100644
--- a/ryzom/client/src/interface_v3/group_html_mail.cpp
+++ b/ryzom/client/src/interface_v3/group_html_mail.cpp
@@ -57,10 +57,10 @@ CGroupHTMLMail::~CGroupHTMLMail()
 
 void CGroupHTMLMail::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getLoginName ();
+	string user_name = UserEntity->getLoginName ();
 	url += ((url.find('?') != string::npos) ? "&" : "?") +
 		string("shard=") + toString(CharacterHomeSessionId) +
-		string("&user_login=") + user_name.toString() +
+		string("&user_login=") + user_name + // FIXME: UrlEncode
 		string("&session_cookie=") + NetMngr.getLoginCookie().toString() + 
 		string("&lang=") + CI18N::getCurrentLanguageCode();
 }
@@ -69,9 +69,9 @@ void CGroupHTMLMail::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 
 void CGroupHTMLMail::addHTTPPostParams (SFormFields &formfields, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getLoginName ();
+	string user_name = UserEntity->getLoginName ();
 	formfields.add("shard", toString(CharacterHomeSessionId));
-	formfields.add("user_login", user_name.toString());
+	formfields.add("user_login", user_name); // FIXME: UrlEncode
 	formfields.add("session_cookie", NetMngr.getLoginCookie().toString());
 	formfields.add("lang", CI18N::getCurrentLanguageCode());
 }
diff --git a/ryzom/client/src/interface_v3/group_html_webig.cpp b/ryzom/client/src/interface_v3/group_html_webig.cpp
index d190b83b6..7dda8b004 100644
--- a/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -66,7 +66,7 @@ static string getWebAuthKey()
 	// authkey = <sharid><name><cid><cookie>
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	string rawKey = toString(CharacterHomeSessionId) +
-		UserEntity->getLoginName().toString() +
+		UserEntity->getLoginName() +
 		toString(cid) +
 		NetMngr.getLoginCookie().toString();
 	string key = getMD5((const uint8*)rawKey.c_str(), (uint32)rawKey.size()).toString();
@@ -85,7 +85,7 @@ void addWebIGParams (string &url, bool trustedDomain)
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	url += ((url.find('?') != string::npos) ? "&" : "?") +
 		string("shardid=") + toString(CharacterHomeSessionId) +
-		string("&name=") + UserEntity->getLoginName().toUtf8() +
+		string("&name=") + UserEntity->getLoginName() + // FIXME: UrlEncode
 		string("&lang=") + CI18N::getCurrentLanguageCode() +
 		string("&datasetid=") + toString(UserEntity->dataSetId()) +
 		string("&ig=1");
@@ -384,7 +384,7 @@ void CGroupHTMLAuth::addHTTPPostParams (SFormFields &formfields, bool trustedDom
 
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	formfields.add("shardid", toString(CharacterHomeSessionId));
-	formfields.add("name", UserEntity->getLoginName().toUtf8());
+	formfields.add("name", UserEntity->getLoginName());
 	formfields.add("lang", CI18N::getCurrentLanguageCode());
 	formfields.add("ig", "1");
 	if (trustedDomain)
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index c06389f0c..2c94b956d 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -614,8 +614,8 @@ static CInterfaceChatDisplayer	InterfaceChatDisplayer;
 void CInterfaceChatDisplayer::colorizeSender(string &text, const string &senderName, CRGBA baseColor)
 {
 	// find the sender/text separator to put color tags
-	ucstring::size_type pos = senderName.length() - 1;
-	if (pos != ucstring::npos)
+	string::size_type pos = senderName.length() - 1;
+	if (pos != string::npos)
 	{
 		string str;
 
@@ -666,7 +666,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		for(;;)
 		{
 			string::size_type index = finalString.find("{break}");
-			if (index == ucstring::npos) break;
+			if (index == string::npos) break;
 			finalString = finalString.substr(0, index) + finalString.substr(index+7,finalString.size());
 		}
 
@@ -819,7 +819,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		else
 		{
 			string::size_type index = finalString.find("<BPFX>");
-			if (index != ucstring::npos)
+			if (index != string::npos)
 			{
 				bubbleWanted = false;
 				finalString = finalString.substr(index+6,finalString.size());
@@ -1015,7 +1015,7 @@ void inpulseDynStringInChatGroup(NLMISC::CBitMemStream &impulse)
 //	impulse.serialBit(huff);
 //
 //	uint32 index;
-//	ucstring ucstr;
+//	ucstring ucstr; // OLD
 //
 //	impulse.serial( index );
 //	impulse.serial( ucstr );
@@ -1109,15 +1109,15 @@ void setFakeNews ()
 
 			CViewText *inter2 = (CViewText *)inter->getView("title0");
 			nlassert (inter2 != NULL);
-			inter2->setText(ucstring(shortNews[rnd*3]));
+			inter2->setText(ucstring(shortNews[rnd*3])); // OLD
 
 			CViewText *inter3 = (CViewText *)inter->getView("title1");
 			nlassert (inter3 != NULL);
-			inter3->setText(ucstring(shortNews[rnd*3+1]));
+			inter3->setText(ucstring(shortNews[rnd*3+1])); // OLD
 
 			CViewText *inter4 = (CViewText *)inter->getView("title2");
 			nlassert (inter4 != NULL);
-			inter4->setText(ucstring(shortNews[rnd*3+2]));
+			inter4->setText(ucstring(shortNews[rnd*3+2])); // OLD
 		}
 		{ // set test for the neutral main
 			string iname;
@@ -1134,11 +1134,11 @@ void setFakeNews ()
 
 			CViewText *inter2 = (CViewText *)inter->getView("title0");
 			nlassert (inter2 != NULL);
-			inter2->setText(ucstring(shortNews[rnd*3]));
+			inter2->setText(ucstring(shortNews[rnd*3])); // OLD
 
 			CViewText *inter3 = (CViewText *)inter->getView("title1");
 			nlassert (inter3 != NULL);
-			inter3->setText(ucstring(shortNews[rnd*3+1]));
+			inter3->setText(ucstring(shortNews[rnd*3+1])); // OLD
 		}
 		{ // set test for the more news
 			string iname;
@@ -1155,15 +1155,15 @@ void setFakeNews ()
 
 			CViewText *inter2 = (CViewText *)inter->getView("title0");
 			nlassert (inter2 != NULL);
-			inter2->setText(ucstring(longNews[rnd*3]));
+			inter2->setText(ucstring(longNews[rnd*3])); // OLD
 
 			CViewText *inter3 = (CViewText *)inter->getView("title1");
 			nlassert (inter3 != NULL);
-			inter3->setText(ucstring(longNews[rnd*3+1]));
+			inter3->setText(ucstring(longNews[rnd*3+1])); // OLD
 
 			CViewText *inter4 = (CViewText *)inter->getView("title2");
 			nlassert (inter4 != NULL);
-			inter4->setText(ucstring(longNews[rnd*3+2]));
+			inter4->setText(ucstring(longNews[rnd*3+2])); // OLD
 		}
 	}
 }
@@ -1180,7 +1180,7 @@ void setFakeNews ()
 static void setupBotChatChoiceList(CInterfaceGroup *botChatGroup)
 {
 	// Temp for test. Should then be read from server msg
-	std::vector<ucstring> choices;
+	std::vector<string> choices;
 	for(uint k = 0; k < 90; ++k)
 	{
 		choices.push_back("Choice " + toString(k));
@@ -1195,7 +1195,7 @@ static void setupBotChatChoiceList(CInterfaceGroup *botChatGroup)
 /*
 static void setupBotChatDescription(CInterfaceGroup *botChatGroup)
 {
-	ucstring desc;
+	string desc;
 	for(uint k = 0; k < 90; ++k)
 	{
 		desc += "This is a multi line description. ";
@@ -1216,7 +1216,7 @@ static void setupBotChatBotGift(CInterfaceGroup *botChatGroup)
 	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:20:0:QUALITY")->setValue32(0);
 	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:20:1:SHEET")->setValue32(CSheetId("fyros_sword_lvl_01_05.item").asInt());
 	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:20:1:QUALITY")->setValue32(2);
-	CBotChat::setBotGift(botChatGroup, ucstring("Thanks to have succeeded the mission"), ucstring("Here's your reward"), ucstring("The bot has taken the object quest from your inventory"));
+	CBotChat::setBotGift(botChatGroup, "Thanks to have succeeded the mission", "Here's your reward", "The bot has taken the object quest from your inventory");
 }
 */
 
@@ -1798,7 +1798,7 @@ void impulseTeamContactInit(NLMISC::CBitMemStream &impulse)
 {
 	vector<uint32> vFriendListName;
 	vector<TCharConnectionState> vFriendListOnline;
-	vector<ucstring> vIgnoreListName;
+	vector<ucstring> vIgnoreListName; // TODO: UTF-8 (serial)
 
 	impulse.serialCont(vFriendListName);
 	uint32 nbState;
@@ -2136,9 +2136,9 @@ void impulseWhere(NLMISC::CBitMemStream &impulse)
 void impulseWho(NLMISC::CBitMemStream &impulse)
 {
 	nlinfo("impulseWho Received");
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring("Players currently in the game :"));
+	CInterfaceManager::getInstance()->displaySystemInfo("Players currently in the game :");
 
-	ucstring name;
+	ucstring name; // OLD
 	uint32 loginId;
 	uint16 dist;
 	uint8 dirshort;
@@ -2176,7 +2176,7 @@ void impulseWho(NLMISC::CBitMemStream &impulse)
 		};
 
 		str = toString (" - uid %d - distance %hu meters - direction ", loginId, dist);
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring(name + ucstring(str) + CI18N::get(txts[direction])));
+		CInterfaceManager::getInstance()->displaySystemInfo(name + str + CI18N::get(txts[direction]));
 	}
 }// impulseWho //
 */
@@ -2185,9 +2185,9 @@ void impulseWho(NLMISC::CBitMemStream &impulse)
 void impulseWhoGM(NLMISC::CBitMemStream &impulse)
 {
 	nlinfo("impulseWhoGM Received");
-	CInterfaceManager::getInstance()->displaySystemInfo(ucstring("Players currently in the game :"));
+	CInterfaceManager::getInstance()->displaySystemInfo("Players currently in the game :");
 
-	ucstring name;
+	ucstring name; // OLD
 	uint32 loginId;
 	uint16 dist;
 	uint8 dirshort;
@@ -2225,7 +2225,7 @@ void impulseWhoGM(NLMISC::CBitMemStream &impulse)
 		};
 
 		str = toString (" - uid %d - distance %hu meters - direction ", loginId, dist);
-		CInterfaceManager::getInstance()->displaySystemInfo(ucstring(name + ucstring(str) + CI18N::get(txts[direction])));
+		CInterfaceManager::getInstance()->displaySystemInfo(name + str + CI18N::get(txts[direction]));
 	}
 }// impulseWho //
 */
@@ -3115,12 +3115,12 @@ void impulsePVPChooseClan(NLMISC::CBitMemStream &impulse)
 	CCtrlTextButton * butClan1 = dynamic_cast<CCtrlTextButton*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:join_pvp_clan_proposal:content:clan1"));
 	if( butClan1 == NULL )
 		return;
-	butClan1->setText( ucstring(EGSPD::CPeople::toString( clan1 )) );
+	butClan1->setText( EGSPD::CPeople::toString( clan1 ) );
 
 	CCtrlTextButton * butClan2 = dynamic_cast<CCtrlTextButton*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:join_pvp_clan_proposal:content:clan2"));
 	if( butClan2 == NULL )
 		return;
-	butClan2->setText( ucstring(EGSPD::CPeople::toString( clan2 )) );
+	butClan2->setText( EGSPD::CPeople::toString( clan2 ) );
 }
 */
 
@@ -3316,8 +3316,8 @@ private:
 			if(i!=digitMaxEnd)
 			{
 				// get the width
-				ucstring	digitStr= contentStr.substr(digitStart, i-digitStart);
-				fromString(digitStr.toString(), w);
+				string	digitStr= contentStr.substr(digitStart, i-digitStart);
+				fromString(digitStr, w);
 				// remove the first tag
 				contentStr= contentStr.substr(i+1);
 			}
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index 534ae46e9..620b5486d 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -312,7 +312,7 @@ void CProgress::internalProgress (float value)
 					// More help
 					TextContext->setFontSize((uint)(12.f * fontFactor));
 					/* todo tips of the day uncomment
-					ucstring ucstr = CI18N::get ("uiTipsEnd");
+					string ucstr = CI18N::get ("uiTipsEnd");
 					TextContext->printAt(0.5f, fY, ucstr); */
 					fY = nextLine (TextContext->getFontSize(), Driver->getWindowHeight(), fY);
 					fY = nextLine (TextContext->getFontSize(), Driver->getWindowHeight(), fY);
@@ -360,11 +360,9 @@ void CProgress::internalProgress (float value)
 						(uint)RT.getRyzomTime(),
 						CI18N::get ("uiSeason"+toStringEnum(CRyzomTime::getSeasonByDay(day))).c_str(),
 						CI18N::get (WeatherManager.getCurrWeatherState().LocalizedName).c_str());
-					ucstring ucstr;
-					ucstr.fromUtf8 (str);
 					TextContext->setHotSpot(UTextContext::MiddleBottom);
 					TextContext->setColor(CRGBA(186, 179, 163, 255));
-					TextContext->printAt(0.5f, 25/768.f, ucstr);
+					TextContext->printAt(0.5f, 25/768.f, str);
 				}
 
 				// apply text commands
diff --git a/ryzom/client/src/r2/displayer_visual_entity.cpp b/ryzom/client/src/r2/displayer_visual_entity.cpp
index 01eaf0bc0..81c24342a 100644
--- a/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -968,9 +968,7 @@ void CDisplayerVisualEntity::updateName()
 	//H_AUTO(R2_CDisplayerVisualEntity_updateName)
 	if (!_Entity) return;
 
-	std::string name = getString(&getProps(), "Name");
-	ucstring ucName;
-	ucName.fromUtf8(name);
+	std::string ucName = getString(&getProps(), "Name");
 	if (ucName.empty())
 	{
 		ucName = CI18N::get("uiR2EDNoName");
@@ -1011,13 +1009,11 @@ void CDisplayerVisualEntity::updateName()
 
 	actName = NLMISC::toString(" [%s]", actName.c_str());
 
-	ucstring ucActName;
-	ucActName.fromUtf8(actName);
-	ucName += ucActName;
+	ucName += actName;
 
 	{
 		//BENCH(setEntityName)
-		_Entity->setEntityName(ucName.toUtf8());
+		_Entity->setEntityName(ucName);
 	}
 	{
 		//BENCH(buildInSceneInterface)
diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 79a0ee36d..71b8ddc81 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -971,7 +971,7 @@ restartLoop:
 		return referenceFile;
 	}
 
-	void CLoadProxy::loadStringFile(const string &filename, ucstring &text)
+	void CLoadProxy::loadStringFile(const string &filename, ucstring &text) // TODO: UTF-8 (serial)
 	{
 		vector<TStringInfo>	reference;
 		vector<TStringInfo> addition;
@@ -1015,7 +1015,7 @@ restartLoop:
 		context.Diff.push_back(context.Addition[addIndex]);
 		//nldebug("Adding new string '%s' in CI18N", context.Addition[addIndex].Identifier.c_str());
 		if (ClientCfg.DebugStringManager)
-			context.Diff.back().Text = ucstring("<NEW>")+context.Diff.back().Text;
+			context.Diff.back().Text = ucstring("<NEW>")+context.Diff.back().Text; // TODO: UTF-8 (serial)
 	}
 	void CLoadProxy::onRemove(uint /* addIndex */, uint /* refIndex */, TStringDiffContext &/* context */)
 	{
@@ -1027,7 +1027,7 @@ restartLoop:
 		context.Diff.push_back(context.Addition[addIndex]);
 		//nldebug("Using changed string '%s' in CI18N", context.Addition[addIndex].Identifier.c_str());
 		if (ClientCfg.DebugStringManager)
-			context.Diff.back().Text = ucstring("<CHG>")+context.Diff.back().Text;
+			context.Diff.back().Text = ucstring("<CHG>")+context.Diff.back().Text; // TODO: UTF-8 (serial)
 	}
 	void CLoadProxy::onSwap(uint /* newIndex */, uint /* refIndex */, TStringDiffContext &/* context */)
 	{
@@ -1041,7 +1041,7 @@ restartLoop:
 class CReadWorkSheetFile : public TWorkSheetDiff::IDiffCallback
 {
 public:
-	void readWorkSheetFile(const string &filename, ucstring &text)
+	void readWorkSheetFile(const string &filename, ucstring &text) // TODO: UTF-8 (serial)
 	{
 		TWorksheet	addition;
 		TWorksheet	reference;
@@ -1178,9 +1178,9 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
 // ***************************************************************************
 void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 {
-	ucstring womenNameColIdent = ucstring("women_name");
-	ucstring descColIdent = ucstring("description");
-	ucstring descColIdent2 = ucstring("description2");
+	ucstring womenNameColIdent = ucstring("women_name"); // TODO: UTF-8 (serial)
+	ucstring descColIdent = ucstring("description"); // TODO: UTF-8 (serial)
+	ucstring descColIdent2 = ucstring("description2"); // TODO: UTF-8 (serial)
 
 	// List of words to append to the local CI18N system.
 	static const char	*specialWords[]=
@@ -1219,11 +1219,11 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 		{
 			uint32	profile0= (uint32)ryzomGetLocalTime();
 
-			ucstring ucs;
+			ucstring ucs; // TODO: UTF-8 (serial)
 			string fileName = fileNames[i];
 			string keyExtenstion = specialWords[i*3+2];
 
-			// read the ucstring and make diffs with data in ./translation/work.
+			// read the ucstring and make diffs with data in ./translation/work. // TODO: UTF-8 (serial)
 			CReadWorkSheetFile	rwsf;
 			rwsf.readWorkSheetFile(fileName, ucs);
 			if(ucs.empty())
@@ -1235,9 +1235,9 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 
 			// Get the Key and Data ColIndex.
 			uint	nameColIndex = 0, keyColIndex = 0;
-			if( !ws.findCol(ucstring("name"), nameColIndex) )
+			if( !ws.findCol(ucstring("name"), nameColIndex) ) // TODO: UTF-8 (serial)
 				continue;
-			if( !ws.findCol(ucstring(specialWords[i*3+1]), keyColIndex) )
+			if( !ws.findCol(ucstring(specialWords[i*3+1]), keyColIndex) ) // TODO: UTF-8 (serial)
 				continue;
 
 			// Get the women name index if possible.
@@ -1282,7 +1282,7 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 					// insert in map of Women Name if OK.
 					if(womenNameColIndex!=std::numeric_limits<uint>::max())
 					{
-						const ucstring &womenName= ws.getData(j, womenNameColIndex);
+						const ucstring &womenName= ws.getData(j, womenNameColIndex); // TODO: UTF-8 (serial)
 						_SpecItem_TempMap[keyStr].WomenName= womenName.toUtf8();
 						// replace all \n in the women name with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].WomenName, "\\n", "\n"));
@@ -1291,7 +1291,7 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 					// insert in map of Description if OK.
 					if(descColIndex!=std::numeric_limits<uint>::max())
 					{
-						const ucstring &desc= ws.getData(j, descColIndex);
+						const ucstring &desc= ws.getData(j, descColIndex); // TODO: UTF-8 (serial)
 						_SpecItem_TempMap[keyStr].Desc= desc.toUtf8();
 						// replace all \n in the desc with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].Desc, "\\n", "\n"));
@@ -1300,7 +1300,7 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 					// insert in map of Description2 if OK.
 					if(descColIndex2!=std::numeric_limits<uint>::max())
 					{
-						const ucstring &desc= ws.getData(j, descColIndex2);
+						const ucstring &desc= ws.getData(j, descColIndex2); // TODO: UTF-8 (serial)
 						_SpecItem_TempMap[keyStr].Desc2= desc.toUtf8();
 						// replace all \n in the desc with true \n
 						while(strFindReplace(_SpecItem_TempMap[keyStr].Desc2, "\\n", "\n"));
diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index 864c80c1f..e3cd736fd 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -187,7 +187,7 @@ private:
 
 	struct TStringWaiter
 	{
-		/// Pointer to the ucstring to fill
+		/// Pointer to the utf-8 string to fill
 		std::string					*Result;
 		/// Pointer to the remover that contains this string reference
 		const IStringWaiterRemover	*Remover;
@@ -277,10 +277,10 @@ private:
 			else
 			{
 				nlassert(f.isReading());
-				ucstring name;
-				ucstring womenName;
-				ucstring desc;
-				ucstring desc2;
+				ucstring name; // Old UTF-16 serial
+				ucstring womenName; // Old UTF-16 serial
+				ucstring desc; // Old UTF-16 serial
+				ucstring desc2; // Old UTF-16 serial
 				f.serial(name);
 				if (ver >= 1)
 					f.serial(womenName);
@@ -419,7 +419,7 @@ public:
  */
 class CLoadProxy : public NLMISC::CI18N::ILoadProxy, public TStringDiff::IDiffCallback
 {
-	void loadStringFile(const std::string &filename, ucstring &text);
+	void loadStringFile(const std::string &filename, ucstring &text); // TODO: UTF-8 (serial)
 
 	void onEquivalent(uint addIndex, uint refIndex, TStringDiffContext &context);
 	void onAdd(uint addIndex, uint refIndex, TStringDiffContext &context);
diff --git a/ryzom/client/src/text_manager.cpp b/ryzom/client/src/text_manager.cpp
index bb78bffff..9873b4986 100644
--- a/ryzom/client/src/text_manager.cpp
+++ b/ryzom/client/src/text_manager.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#if 0
 #include "stdpch.h"
 
 
@@ -55,14 +55,14 @@ CTextManager::CTextManager()
 //-----------------------------------------------
 /// Return the text according to the Id.
 //-----------------------------------------------
-ucstring CTextManager::text(uint textId)
+ucstring CTextManager::text(uint textId) // OLD
 {
-	map<uint, ucstring>::iterator it = _Texts.find(textId);
+	map<uint, ucstring>::iterator it = _Texts.find(textId); // OLD
 	if(it != _Texts.end())
 		return (*it).second;
 
 	// Return an empty string.
-	return ucstring();
+	return ucstring(); // OLD
 }
 
 //-----------------------------------------------
@@ -70,13 +70,14 @@ ucstring CTextManager::text(uint textId)
 //-----------------------------------------------
 void CTextManager::text(uint textId, const std::string &str)
 {
-	_Texts.insert(make_pair(textId, ucstring(str)));
+	_Texts.insert(make_pair(textId, ucstring(str))); // OLD
 }
 
 //-----------------------------------------------
 /// Set the text for 'textId'.
 //-----------------------------------------------
-void CTextManager::text(uint textId, const ucstring &str)
+void CTextManager::text(uint textId, const ucstring &str) // OLD
 {
 	_Texts.insert(make_pair(textId, str));
 }
+#endif
diff --git a/ryzom/client/src/text_manager.h b/ryzom/client/src/text_manager.h
index 371d6bac9..d154541e3 100644
--- a/ryzom/client/src/text_manager.h
+++ b/ryzom/client/src/text_manager.h
@@ -14,8 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+// Lost code
 
-
+#if 0
 #ifndef NL_TEXT_MANAGER_H
 #define NL_TEXT_MANAGER_H
 
@@ -25,7 +26,7 @@
 /////////////
 // Misc
 #include "nel/misc/types_nl.h"
-#include "nel/misc/ucstring.h"
+#include "nel/misc/ucstring.h" // OLD
 // Std
 #include <map>
 
@@ -42,18 +43,18 @@
 class CTextManager
 {
 protected:
-	std::map<uint, ucstring> _Texts;
+	std::map<uint, ucstring> _Texts; // OLD
 
 public:
 	/// Constructor
 	CTextManager();
 
 	/// Return the text according to the Id.
-	ucstring text(uint textId);
+	ucstring text(uint textId); // OLD
 	/// Set the text for 'textId'.
 	void text(uint textId, const std::string &str);
 	/// Set the text for 'textId'.
-	void text(uint textId, const ucstring &str);
+	void text(uint textId, const ucstring &str); // OLD
 };
 
 
@@ -65,5 +66,6 @@ extern CTextManager TextMngr;
 
 
 #endif // NL_TEXT_MANAGER_H
+#endif
 
 /* End of text_manager.h */
diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index b2dcb0cab..dce3191dd 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -3078,7 +3078,7 @@ void CUserEntity::setAFK(bool b, string afkTxt)
 		nlwarning("CUserEntity:setAFK: unknown message named '%s'.", msgName.c_str());
 
 	// custom afk txt
-	ucstring ucstr;
+	ucstring ucstr; // TODO: UTF-8 (serial)
 	ucstr.fromUtf8( afkTxt );
 	CBitMemStream outTxt;
 	static const string msgNameTxt = "STRING:AFK_TXT";
@@ -3828,11 +3828,10 @@ void CUserEntity::CSkillPointsObserver::update(ICDBNode* node )
 			string deltaStr = toString("%+d", delta);
 
 			// get the sp title
-			ucstring	spTitle;
-			spTitle= CI18N::get(toString("uiSkillPointsBold%d",SpType));
+			const string &spTitle = CI18N::get(toString("uiSkillPointsBold%d",SpType));
 
 			// run the popup
-			CAHManager::getInstance()->runActionHandler("message_popup", NULL, "text1="+deltaStr+"|text0="+spTitle.toUtf8());
+			CAHManager::getInstance()->runActionHandler("message_popup", NULL, "text1="+deltaStr+"|text0="+spTitle);
 
 			// Context help
 			contextHelp ("skill_point");
diff --git a/ryzom/client/src/user_entity.h b/ryzom/client/src/user_entity.h
index 382a7d810..3dccc362a 100644
--- a/ryzom/client/src/user_entity.h
+++ b/ryzom/client/src/user_entity.h
@@ -485,7 +485,7 @@ public:
 	/// true if current behaviour allows to change front
 	bool canChangeFront();
 
-	ucstring getLoginName()
+	string getLoginName()
 	{
 		if (_LoginName.empty())
 			_LoginName = getDisplayName();
@@ -772,7 +772,7 @@ private:
 	CItemSnapshot			_PreviousRightHandItem;
 	CItemSnapshot			_PreviousLeftHandItem;
 
-	ucstring _LoginName;
+	std::string _LoginName;
 };
 
 /// Out game received position

From c27547c3a3bfc2f53130a186a862212f76e2f707 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 06:23:58 +0800
Subject: [PATCH 131/292] UTF-8 various, ryzom/ryzomcore#335

---
 .../src/interface_v3/interface_manager.cpp    |  2 +-
 .../src/interface_v3/interface_manager.h      |  2 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp | 18 +++++-----
 ryzom/client/src/login.cpp                    | 34 +++++++------------
 ryzom/client/src/misc.cpp                     |  4 +--
 ryzom/client/src/misc.h                       |  4 +--
 ryzom/client/src/net_manager.cpp              |  2 +-
 .../src/game_share/bg_downloader_msg.cpp      |  4 +--
 .../common/src/game_share/bg_downloader_msg.h |  2 +-
 9 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 963093235..1b36c91d5 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2413,7 +2413,7 @@ void	CInterfaceManager::messageBox(const ucstring &text, const string &masterGro
 
 
 // ------------------------------------------------------------------------------------------------
-void CInterfaceManager::messageBoxWithHelp(const ucstring &text, const std::string &masterGroup,
+void CInterfaceManager::messageBoxWithHelp(const std::string &text, const std::string &masterGroup,
 										   const std::string &ahOnOk, const std::string &paramsOnOk,
 										   TCaseMode caseMode)
 {
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 2aed09dc5..91178677d 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -310,7 +310,7 @@ public:
 	 *  The help button with open a browser on ryzom.com faq
 	 *	ui:interface:message_box_with_help must be defined in xml, with a "text" ViewText son
 	 */
-	void	messageBoxWithHelp(const ucstring &text, const std::string &masterGroup="ui:interface",
+	void	messageBoxWithHelp(const std::string &text, const std::string &masterGroup="ui:interface",
 							   const std::string &ahOnOk = std::string(), const std::string &paramsOnOk= std::string(),
 							   TCaseMode caseMode = CaseFirstSentenceLetterUp);
 
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 4e6599fa1..0e97c73f7 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -527,9 +527,9 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
 		luabind::def("messageBox", (void(*)(const ucstring &, const std::string &)) &messageBox),
 		luabind::def("messageBox", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox),
 		luabind::def("messageBox", (void(*)(const std::string &)) &messageBox),
-		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &)) &messageBoxWithHelp),
-		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp),
-		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp),
+		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &)) &messageBoxWithHelp), // TODO: Lua UTF-8
+		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp), // TODO: Lua UTF-8
+		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp), // TODO: Lua UTF-8
 		luabind::def("messageBoxWithHelp", (void(*)(const std::string &)) &messageBoxWithHelp),
 		LUABIND_FUNC(replacePvpEffectParam),
 		LUABIND_FUNC(secondsSince1970ToHour),
@@ -2929,23 +2929,23 @@ void		CLuaIHMRyzom::messageBox(const std::string &text)
 }
 
 // ***************************************************************************
-void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text)
+void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text) // TODO: Lua UTF-8
 {
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBoxWithHelp(text);
+	pIM->messageBoxWithHelp(text.toUtf8());
 }
 
 // ***************************************************************************
-void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &masterGroup)
+void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &masterGroup) // TODO: Lua UTF-8
 {
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBoxWithHelp(text, masterGroup);
+	pIM->messageBoxWithHelp(text.toUtf8(), masterGroup);
 }
 
 // ***************************************************************************
-void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &masterGroup, int caseMode)
+void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &masterGroup, int caseMode) // TODO: Lua UTF-8
 {
 	if (caseMode < 0 || caseMode >= CaseCount)
 	{
@@ -2954,7 +2954,7 @@ void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &
 
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBoxWithHelp(text, masterGroup, "" , "", (TCaseMode) caseMode);
+	pIM->messageBoxWithHelp(text.toUtf8(), masterGroup, "" , "", (TCaseMode) caseMode);
 }
 
 // ***************************************************************************
diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
index d0f6243b8..bedd66f7c 100644
--- a/ryzom/client/src/login.cpp
+++ b/ryzom/client/src/login.cpp
@@ -243,7 +243,7 @@ void createOptionalCatUI()
 			pVT = dynamic_cast<CViewText*>(pNewLine->getView("size"));
 			if (pVT != NULL)
 			{
-				pVT->setText(BGDownloader::getWrittenSize(InfoOnPatch.OptCat[i].Size).toUtf8());
+				pVT->setText(BGDownloader::getWrittenSize(InfoOnPatch.OptCat[i].Size));
 			}
 
 			// Add to the list
@@ -467,8 +467,8 @@ void loginMainLoop()
 			bool res = false;
 			BGDownloader::TTaskResult taskResult = BGDownloader::TaskResult_Unknown;
 			bool finished = false;
-			ucstring bgDownloaderError;
 #ifdef RYZOM_BG_DOWNLOADER
+			string bgDownloaderError;
 			if (isBGDownloadEnabled())
 			{
 				finished = bgDownloader.isTaskEnded(taskResult, bgDownloaderError);
@@ -657,7 +657,7 @@ void loginMainLoop()
 				totalPatchSize = bgDownloader.getTotalSize();
 				BGDownloader::TTaskResult taskResult;
 				bool finished = false;
-				ucstring bgDownloaderError;
+				string bgDownloaderError;
 				finished = bgDownloader.isTaskEnded(taskResult, bgDownloaderError);
 				if (finished)
 				{
@@ -670,8 +670,8 @@ void loginMainLoop()
 
 					if (taskResult == BGDownloader::TaskResult_Error)
 					{
-						setPatcherStateText("ui:login:patching", ucstring());
-						setPatcherProgressText("ui:login:patching", ucstring());
+						setPatcherStateText("ui:login:patching", string());
+						setPatcherProgressText("ui:login:patching", string());
 
 						if (!fatalMessageBoxShown)
 						{
@@ -723,10 +723,10 @@ void loginMainLoop()
 			}
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_TOTAL_SIZE_PATCH));
-			ucstring sTmp;
+			string sTmp;
 			sTmp = BGDownloader::getWrittenSize(currentPatchingSize);
 			sTmp += " / " + BGDownloader::getWrittenSize(totalPatchSize);
-			if (pVT != NULL) pVT->setText(sTmp.toUtf8());
+			if (pVT != NULL) pVT->setText(sTmp);
 		}
 //		else if (screen == UI_VARIABLES_SCREEN_CATDISP) // If we are displaying patch info
 		else if (LoginSM.getCurrentState() == CLoginStateMachine::st_display_cat)
@@ -775,10 +775,10 @@ void loginMainLoop()
 			// Total size of the patches is optional cats + required cat (f(optCat)) + non opt cat
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_TOTAL_SIZE));
-			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(TotalPatchSize).toUtf8());
+			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(TotalPatchSize));
 
 			pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_NON_OPTIONAL_SIZE));
-			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(nNonOptSize).toUtf8());
+			if (pVT != NULL) pVT->setText(BGDownloader::getWrittenSize(nNonOptSize));
 		}
 	}
 }
@@ -802,7 +802,7 @@ void initLoginScreen()
 
 	// version
 	std::string ext;
-	if (ClientApp.find("ryzom_") != ucstring::npos)
+	if (ClientApp.find("ryzom_") != string::npos)
 		ext = " (" + ClientApp.substr(6) + ")";
 
 	CViewText *pV = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:ver_value"));
@@ -1878,7 +1878,7 @@ class CAHReboot : public IActionHandler
 		}
 		catch (const std::exception &e)
 		{
-			im->messageBoxWithHelp(ucstring::makeFromUtf8(e.what()), "ui:login", "login_quit");
+			im->messageBoxWithHelp(e.what(), "ui:login", "login_quit");
 		}
 	}
 };
@@ -2354,10 +2354,6 @@ inline string parseTooltip(const string & initString, const string & tagName)
 		tooltip = tooltip.substr(0, tooltip.find("<"));
 	}
 
-	ucstring uc;
-	uc.fromUtf8(tooltip);;
-	tooltip = uc.toString();
-
 	return tooltip;
 }
 
@@ -2377,10 +2373,6 @@ inline string parseCommentError(const string & initString, const string & tagNam
 		error = error.substr(0, error.find("<"));
 	}
 
-	ucstring uc;
-	uc.fromUtf8(error);;
-	error = uc.toString();
-
 	return error;
 }
 
@@ -3304,7 +3296,7 @@ void loginIntro()
 		if (i != 0)
 		{
 			beginLoading(IntroNVidia);
-			ucstring nmsg("");
+			string nmsg("");
 			ProgressBar.newMessage (nmsg);
 		}
 
@@ -3330,7 +3322,7 @@ void loginIntro()
 				Driver->AsyncListener.isKeyPushed (KeySPACE))
 				break;
 
-			const ucstring nmsg("");
+			const string nmsg("");
 			ProgressBar.newMessage (nmsg);
 			IngameDbMngr.flushObserverCalls();
 			NLGUI::CDBManager::getInstance()->flushObserverCalls();
diff --git a/ryzom/client/src/misc.cpp b/ryzom/client/src/misc.cpp
index 9816202d4..4e35cfc2a 100644
--- a/ryzom/client/src/misc.cpp
+++ b/ryzom/client/src/misc.cpp
@@ -879,7 +879,7 @@ NLMISC::CRGBA interpClientCfgColor(const string &src, string &dest)
 		if (src[0] == '&')
 		{
 			string::size_type nextPos = src.find('&', 1);
-			if (nextPos != ucstring::npos)
+			if (nextPos != string::npos)
 			{
 				std::string colorCode;
 				colorCode.resize(nextPos - 1);
@@ -980,7 +980,7 @@ std::string getStringCategoryIfAny(const string &src, string &dest)
 
 
 // ***************************************************************************
-sint ucstrnicmp(const ucstring &s0, uint p0, uint n0, const ucstring &s1)
+sint ucstrnicmp(const ucstring &s0, uint p0, uint n0, const ucstring &s1) // OLD
 {
 	// start
 	const ucchar	*start1= s1.c_str();
diff --git a/ryzom/client/src/misc.h b/ryzom/client/src/misc.h
index 96568c22e..c48b18137 100644
--- a/ryzom/client/src/misc.h
+++ b/ryzom/client/src/misc.h
@@ -193,8 +193,8 @@ enum TFilter3d
 	RYZOM_MAX_FILTER_3D,
 };
 
-// compare 2 ucstring s0 and s1, without regard to case. give start and size for sequence p0
-sint ucstrnicmp(const ucstring &s0, uint p0, uint n0, const ucstring &s1);
+// compare 2 ucstring s0 and s1, without regard to case. give start and size for sequence p0 // OLD
+sint ucstrnicmp(const ucstring &s0, uint p0, uint n0, const ucstring &s1); // OLD
 
 /** Compute a non-continuous noise with uniform repartition in [0, 1], with the given noise object
   * By default repartition is not uniform for noise
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 2c94b956d..6b73acba2 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -4340,7 +4340,7 @@ NLMISC_COMMAND(testDuelInvite, "","")
 //{
 //	uint32 index;
 //	fromString(args[0], index);
-//	ucstring ucstr = args[1];
+//	ucstring ucstr = args[1]; // OLD
 //
 //	vector<bool> code;
 //
diff --git a/ryzom/common/src/game_share/bg_downloader_msg.cpp b/ryzom/common/src/game_share/bg_downloader_msg.cpp
index 297770ddb..e26aad9be 100644
--- a/ryzom/common/src/game_share/bg_downloader_msg.cpp
+++ b/ryzom/common/src/game_share/bg_downloader_msg.cpp
@@ -26,10 +26,10 @@ namespace BGDownloader
 
 const wchar_t *DownloaderMutexName = L"RyzomBgDownloader";
 
-ucstring getWrittenSize(uint32 nSize)
+std::string getWrittenSize(uint32 nSize)
 {
 	float fSize = ((float)nSize)/(1024.0f*1024.0f);
-	ucstring ucs = NLMISC::toString("%.1f", fSize) + " " + NLMISC::CI18N::get("uiMb");
+	std::string ucs = NLMISC::toString("%.1f", fSize) + " " + NLMISC::CI18N::get("uiMb");
 	return ucs;
 }
 
diff --git a/ryzom/common/src/game_share/bg_downloader_msg.h b/ryzom/common/src/game_share/bg_downloader_msg.h
index da903493f..4ed562168 100644
--- a/ryzom/common/src/game_share/bg_downloader_msg.h
+++ b/ryzom/common/src/game_share/bg_downloader_msg.h
@@ -137,7 +137,7 @@ extern const wchar_t *DownloaderMutexName;
 
 
 // get patch written size in megabytes
-ucstring getWrittenSize(uint32 nSize);
+std::string getWrittenSize(uint32 nSize);
 
 std::string toString(TMsgType msgType);
 

From 0dfff69c6f9d17c71c71b8f8bea1b47a71b5268e Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 09:57:33 +0800
Subject: [PATCH 132/292] UTF-8 various, ryzom/ryzomcore#335

---
 nel/include/nel/misc/utf_string_view.h        |  3 +
 nel/src/misc/utf_string_view.cpp              | 15 +++++
 ryzom/client/src/connection.cpp               |  2 +-
 ryzom/client/src/entities.cpp                 | 26 ++------
 ryzom/client/src/entity_cl.cpp                |  2 +-
 .../src/interface_v3/action_handler_help.cpp  |  8 +--
 .../src/interface_v3/action_handler_misc.cpp  |  6 +-
 .../interface_v3/action_handler_phrase.cpp    |  4 +-
 .../src/interface_v3/action_phrase_faber.cpp  |  8 +--
 .../src/interface_v3/bot_chat_page_trade.cpp  |  2 +-
 .../src/interface_v3/bot_chat_page_trade.h    |  4 +-
 ryzom/client/src/interface_v3/chat_filter.cpp |  3 +-
 ryzom/client/src/interface_v3/chat_window.cpp | 59 +++++++++----------
 ryzom/client/src/interface_v3/chat_window.h   | 30 +++++-----
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 20 +++----
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  4 +-
 .../client/src/interface_v3/group_career.cpp  |  6 +-
 .../interface_expr_user_fct_game.cpp          |  4 +-
 .../interface_expr_user_fct_items.cpp         |  2 +-
 .../src/interface_v3/interface_manager.cpp    |  2 +-
 .../src/interface_v3/inventory_manager.cpp    | 26 ++++----
 .../src/interface_v3/inventory_manager.h      | 10 ++--
 .../src/interface_v3/item_special_effect.cpp  |  4 +-
 .../client/src/interface_v3/macrocmd_key.cpp  |  6 +-
 .../client/src/interface_v3/music_player.cpp  | 10 +++-
 .../src/interface_v3/people_interraction.cpp  | 40 +++++++------
 .../src/interface_v3/people_interraction.h    | 14 ++---
 ryzom/client/src/interface_v3/people_list.cpp | 27 ++++-----
 ryzom/client/src/interface_v3/people_list.h   |  7 +--
 .../client/src/interface_v3/skill_manager.cpp |  8 +--
 .../src/interface_v3/sphrase_manager.cpp      | 13 ++--
 .../src/interface_v3/view_bitmap_faber_mp.cpp |  6 +-
 ryzom/client/src/misc.cpp                     |  4 +-
 ryzom/client/src/net_manager.cpp              |  2 +-
 ryzom/client/src/zone_util.cpp                |  4 +-
 35 files changed, 198 insertions(+), 193 deletions(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 572d39ac4..309377578 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -147,6 +147,9 @@ public:
 	static void append(IStream &s, u32char c);
 	static u32char get(IStream &s);
 
+	/// Get an UTF-8 string from an undefined ASCII-based codepage
+	static std::string fromAscii(std::string &str);
+
 private:
 	typedef u32char (*TIterator)(const void **addr);
 	static u32char utf8Iterator(const void **addr);
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 64f2f8e55..dd7a88868 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -174,6 +174,21 @@ std::string CUtfStringView::toAscii() const
 	return res;
 }
 
+std::string CUtfStringView::fromAscii(std::string &str)
+{
+	std::string res;
+	res.reserve(str.size());
+	for (std::string::iterator it(str.begin()), end(str.end()); it != end; ++it)
+	{
+		unsigned char c = *it;
+		if (c < 0x80)
+			res += (char)c;
+		else
+			res += '?';
+	}
+	return res;
+}
+
 std::wstring CUtfStringView::toWide() const
 {
 #ifdef NL_OS_WINDOWS
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 63b8a6dd8..e31bd37fd 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -804,7 +804,7 @@ std::string	buildPlayerNameForSaveFile(const std::string &playerNameIn)
 			(c>='0' && c<='9') ||
 			(c=='_') )
 		{
-			ret[i]= tolower(c);
+			ret[i]= tolower(c); // TODO: toLowerAscii
 		}
 		else
 			ret[i]= '_';
diff --git a/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
index 11c403403..7743cb02e 100644
--- a/ryzom/client/src/entities.cpp
+++ b/ryzom/client/src/entities.cpp
@@ -2419,14 +2419,8 @@ CEntityCL *CEntityManager::getEntityByKeywords (const std::vector<string> &keywo
 //-----------------------------------------------
 CEntityCL *CEntityManager::getEntityByName (const string &name, bool caseSensitive, bool complete) const
 {
-	string source = name;
-	const uint size = (uint)source.size();
-	if (!caseSensitive)
-	{
-		uint j;
-		for (j=0; j<size; j++)
-			source[j] = tolower (source[j]);
-	}
+	string source;
+	source = caseSensitive ? name : toLower(name); // TODO: toLowerInsensitive
 
 	uint i;
 	const uint count = (uint)_Entities.size();
@@ -2437,16 +2431,9 @@ CEntityCL *CEntityManager::getEntityByName (const string &name, bool caseSensiti
 	{
 		if(_Entities[i])
 		{
-			string value = _Entities[i]->getDisplayName();
+			string value = caseSensitive ? _Entities[i]->getDisplayName() : toLower(_Entities[i]->getDisplayName()); // TODO: toLowerInsensitive
 			bool foundEntity = false;
 
-			uint j;
-			if (!caseSensitive)
-			{
-				for (j=0; j<value.size(); j++)
-					value[j] = tolower (value[j]);
-			}
-
 			// Complete test ?
 			if (complete)
 			{
@@ -2455,11 +2442,8 @@ CEntityCL *CEntityManager::getEntityByName (const string &name, bool caseSensiti
 			}
 			else
 			{
-				if (value.size() >= size)
-				{
-					if (std::operator==(source, value.substr (0, size)))
-						foundEntity = true;
-				}
+				if (NLMISC::startsWith(value, source))
+					foundEntity = true;
 			}
 
 			if (foundEntity)
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 4c1b4a842..8f96cb96b 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -2355,7 +2355,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const std::string &value)
 		if (pVT != NULL) pVT->setText(_Title);
 
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:player"));
-		if (pGC != NULL) pGC->setUCTitle(_EntityName);
+		if (pGC != NULL) pGC->setTitle(_EntityName);
 
 		CSkillManager *pSM = CSkillManager::getInstance();
 		pSM->setPlayerTitle(_TitleRaw);
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 3ba05a570..9cad50e25 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -973,12 +973,12 @@ class CHandlerBrowse : public IActionHandler
 				{
 					if(params[i]=='%' && i<params.size()-2)
 					{
-						if(isxdigit(params[i+1]) && isxdigit(params[i+2]))
+						if(isxdigit(params[i+1]) && isxdigit(params[i+2])) // FIXME: Locale dependent
 						{
 							// read value from heax decimal
 							uint8	val= 0;
-							params[i+1]= tolower(params[i+1]);
-							params[i+2]= tolower(params[i+2]);
+							params[i+1]= tolower(params[i+1]); // FIXME: toLowerAscii
+							params[i+2]= tolower(params[i+2]); // FIXME: toLowerAscii
 							if(isdigit(params[i+1]))	val= params[i+1]-'0';
 							else						val= 10+ params[i+1]-'a';
 							val*=16;
@@ -2508,7 +2508,7 @@ void refreshItemHelp(CSheetHelpSetup &setup)
 		CItemSheet *pIS = (CItemSheet*)pES;
 
 		// ---- Common
-		string title = setup.SrcSheet->getItemActualName().toUtf8();
+		string title = setup.SrcSheet->getItemActualName();
 		setupHelpTitle(setup.HelpWindow, title );
 		getItemText (setup.SrcSheet, itemText, pIS);
 
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 8b144f844..73c967bcb 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -836,7 +836,7 @@ class CAHReplyTeller : public IActionHandler
 			{
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				PeopleInterraction.ChatGroup.Filter.setTargetPlayer(CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName.toUtf8()));
+				PeopleInterraction.ChatGroup.Filter.setTargetPlayer(CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName));
 				CGroupEditBox *eb = w->getEditBox();
 				if (eb != NULL)
 				{
@@ -863,7 +863,7 @@ class CAHReplyTellerOnce : public IActionHandler
 			{
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName.toUtf8()) + ucstring(" "), false);
+				w->setCommand("tell " + CEntityCL::removeTitleAndShardFromName(PeopleInterraction.LastSenderName) + " ", false);
 				CGroupEditBox *eb = w->getEditBox();
 				if (eb != NULL)
 				{
@@ -908,7 +908,7 @@ REGISTER_ACTION_HANDLER (CAHCycleTell, "cycle_tell")
 NLMISC_COMMAND(slsn, "Temp : set the name of the last sender.", "<name>")
 {
 	if (args.size() != 1) return false;
-	PeopleInterraction.LastSenderName = ucstring(args[0]);
+	PeopleInterraction.LastSenderName = args[0];
 	return true;
 }
 
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 56382bf54..16a65e336 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -279,9 +279,9 @@ void	launchPhraseComposition(bool creation)
 
 			// Set the Text of the Window
 			if(creation)
-				window->setUCTitle(CI18N::get("uiPhraseCreate"));
+				window->setTitle(CI18N::get("uiPhraseCreate"));
 			else
-				window->setUCTitle(CI18N::get("uiPhraseEdit"));
+				window->setTitle(CI18N::get("uiPhraseEdit"));
 
 			// clear the sentence for a New Phrase creation.
 			buildSentenceTarget->clearBuildingPhrase();
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 3eacf8a60..47fda6d00 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -188,8 +188,8 @@ void		CActionPhraseFaber::launchFaberCastWindow(sint32 memoryLine, uint memoryIn
 		window->setActive(true);
 
 		// Setup the Title with a default text
-		ucstring	title= CI18N::get("uiPhraseFaberExecuteNoPlan");
-		window->setUCTitle (title);
+		string	title= CI18N::get("uiPhraseFaberExecuteNoPlan");
+		window->setTitle (title);
 	}
 
 	// **** setup DB observer!
@@ -570,9 +570,9 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 	if(window)
 	{
 		// Setup the Title with the item built
-		ucstring	title= CI18N::get("uiPhraseFaberExecute");
+		string	title= CI18N::get("uiPhraseFaberExecute");
 		strFindReplace(title, "%item", STRING_MANAGER::CStringManagerClient::getItemLocalizedName(_ExecuteFromItemPlanBrick->FaberPlan.ItemBuilt) );
-		window->setUCTitle (title);
+		window->setTitle (title);
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index ce4ec3173..13e60fff8 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -250,7 +250,7 @@ void CBotChatPageTrade::begin()
 	if (gc)
 	{
 		// set the title
-		gc->setUCTitle(_Title);
+		gc->setTitle(_Title);
 		// show the buy mean
 		CInterfaceGroup *money = dynamic_cast<CInterfaceGroup *>(gc->getGroup("money"));
 		if (money) money->setActive((_BuyMean == Money) || (_BuyMean == MoneyFactionPoints));
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.h b/ryzom/client/src/interface_v3/bot_chat_page_trade.h
index ae11a2008..58a4e572d 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.h
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.h
@@ -72,7 +72,7 @@ public:
 	// set the buy mean (must be called before 'begin' is called)
 	void		 setBuyMean(TBuyMean buyMean) { _BuyMean = buyMean; }
 	// set the title of the window (actually applied when 'begin' is called)
-	void		 setTitle(const ucstring &title) { _Title = title; }
+	void		 setTitle(const std::string &title) { _Title = title; }
 	// update the 'buy' dialog window for the given sphrase sheet (the player has changed an equipped weapon => action stats change)
 	void		 updateSPhraseBuyDialog();
 	// invalidate window coords
@@ -134,7 +134,7 @@ private:
 	uint32						_CurrItemInventory;
 	bool						_BuyOnly;
 	TBuyMean					_BuyMean;
-	ucstring					_Title;
+	std::string					_Title;
 	bool						_ResaleEdit;
 	bool						_QuantityEdit;
 	sint32						_QuantityCheck;
diff --git a/ryzom/client/src/interface_v3/chat_filter.cpp b/ryzom/client/src/interface_v3/chat_filter.cpp
index 237106170..c77a93fa5 100644
--- a/ryzom/client/src/interface_v3/chat_filter.cpp
+++ b/ryzom/client/src/interface_v3/chat_filter.cpp
@@ -363,8 +363,7 @@ void CChatTargetFilter::setTargetGroup(CChatGroup::TGroupType groupType, uint32
 	if (_Chat)
 	{
 		// set the prompt
-		const ucstring prompt("");
-		_Chat->setPrompt(prompt + (ucchar) '>');
+		_Chat->setPrompt(">");
 
 		// set the color
 		string entry="UI:SAVE:CHAT:COLORS:";
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 58dc5d52a..816a2016a 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -135,10 +135,7 @@ bool CChatWindow::create(const CChatWindowDesc &desc, const std::string &chatId)
 			return false;
 		}
 		_Chat->setLocalize (desc.Localize);
-		if (desc.Localize)
-			_Chat->setTitle(desc.Title.toString());
-		else
-			_Chat->setUCTitle(desc.Title);
+		_Chat->setTitle(desc.Title);
 		_Chat->setSavable(desc.Savable);
 
 		// groups like system info don't have edit box.
@@ -259,12 +256,12 @@ void CChatWindow::setMenu(const std::string &menuName)
 }
 
 //=================================================================================
-void CChatWindow::setPrompt(const ucstring &prompt)
+void CChatWindow::setPrompt(const string &prompt)
 {
 	if (!_Chat) return;
 	CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(_Chat->getGroup("eb"));
 	if (!eb) return;
-	eb->setPrompt(prompt.toUtf8());
+	eb->setPrompt(prompt);
 }
 
 void CChatWindow::setPromptColor(NLMISC::CRGBA col)
@@ -312,7 +309,7 @@ void CChatWindow::deleteContainer()
 }
 
 //=================================================================================
-bool CChatWindow::rename(const ucstring &newName, bool newNameLocalize)
+bool CChatWindow::rename(const string &newName, bool newNameLocalize)
 {
 	return getChatWndMgr().rename(getTitle(), newName, newNameLocalize);
 }
@@ -362,22 +359,22 @@ void CChatWindow::setCommand(const ucstring &command,bool execute)
 
 
 //=================================================================================
-void CChatWindow::setEntry(const ucstring &entry)
+void CChatWindow::setEntry(const string &entry)
 {
 	if (!_EB) return;
-	_EB->setInputStringAsUtf16(entry);
+	_EB->setInputString(entry);
 }
 
 //=================================================================================
-ucstring CChatWindow::getTitle() const
+string CChatWindow::getTitle() const
 {
 	if (!_Chat)
 	{
-		return ucstring("");
+		return string();
 	}
 	else
 	{
-		return _Chat->getUCTitle();
+		return _Chat->getTitle();
 	}
 }
 
@@ -472,7 +469,7 @@ void CChatWindow::setHeaderColor(const std::string &n)
 }
 
 //=================================================================================
-void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstring &msg, uint numBlinks /*= 0*/)
+void CChatWindow::displayLocalPlayerTell(const string &receiver, const string &msg, uint numBlinks /*= 0*/)
 {
 	string finalMsg;
 	CInterfaceProperty prop;
@@ -483,10 +480,10 @@ void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstrin
 	finalMsg += csr + CI18N::get("youTell") + ": ";
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 	encodeColorTag(prop.getRGBA(), finalMsg, true);
-	finalMsg += msg.toUtf8();
+	finalMsg += msg;
 
 	string s = CI18N::get("youTellPlayer");
-	strFindReplace(s, "%name", receiver.toUtf8());
+	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
 	displayMessage(finalMsg, prop.getRGBA(), CChatGroup::tell, 0, numBlinks);
 	CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
@@ -730,13 +727,13 @@ const string CChatGroupWindow::getValidUiStringId(const string &stringId)
 }
 
 //=================================================================================
-CGroupContainer *CChatGroupWindow::createFreeTeller(const ucstring &winNameIn, const string &winColor)
+CGroupContainer *CChatGroupWindow::createFreeTeller(const string &winNameIn, const string &winColor)
 {
 	// must parse the entity name, and eventually make it Full with shard name (eg: 'ani.yoyo' becomes 'yoyo(Aniro)')
-	string winNameFull= CShardNames::getInstance().makeFullNameFromRelative(PlayerSelectedMainland, winNameIn.toString());
+	string winNameFull= CShardNames::getInstance().makeFullNameFromRelative(PlayerSelectedMainland, winNameIn);
 
 	// remove shard name if necessary
-	ucstring winName= CEntityCL::removeShardFromName(winNameFull);
+	string winName= CEntityCL::removeShardFromName(winNameFull);
 
 	// get the color
 	string sWinColor = winColor;
@@ -745,12 +742,12 @@ CGroupContainer *CChatGroupWindow::createFreeTeller(const ucstring &winNameIn, c
 
 	// Look if the free teller do not already exists
 	uint32 i;
-	string sWinName = winName.toString();
+	string sWinName = winName;
 	sWinName = toLower(sWinName);
 	for (i = 0; i < _FreeTellers.size(); ++i)
 	{
 		CGroupContainer *pGC = _FreeTellers[i];
-		if (toLower(pGC->getUCTitle().toString()) == sWinName)
+		if (toLower(pGC->getTitle()) == sWinName)
 			break;
 	}
 	// Create container if not present
@@ -772,11 +769,11 @@ CGroupContainer *CChatGroupWindow::createFreeTeller(const ucstring &winNameIn, c
 		if (!pGC)
 		{
 			delete pIG;
-			nlwarning("<CChatGroupWindow::createFreeTeller> group is not a container.(%s)", winName.toString().c_str());
+			nlwarning("<CChatGroupWindow::createFreeTeller> group is not a container.(%s)", winName.c_str());
 			return NULL;
 		}
 		// set title from the name
-		pGC->setUCTitle(winName);
+		pGC->setTitle(winName);
 		//
 		pGC->setSavable(true);
 		pGC->setEscapable(true);
@@ -834,7 +831,7 @@ void CChatGroupWindow::updateAllFreeTellerHeaders()
 //=================================================================================
 void CChatGroupWindow::updateFreeTellerHeader(CGroupContainer &ft)
 {
-	ucstring name = ft.getUCTitle();
+	string name = ft.getTitle();
 	CCtrlBaseButton *newFriendBut = dynamic_cast<CCtrlBaseButton *>(ft.getCtrl("new_friend"));
 	CCtrlBaseButton *ignoreBut = dynamic_cast<CCtrlBaseButton *>(ft.getCtrl("ignore"));
 	CCtrlBaseButton *inviteBut = dynamic_cast<CCtrlBaseButton *>(ft.getCtrl("invite"));
@@ -868,7 +865,7 @@ void CChatGroupWindow::updateFreeTellerHeader(CGroupContainer &ft)
 }
 
 //=================================================================================
-void CChatGroupWindow::setActiveFreeTeller(const ucstring &winName, bool bActive)
+void CChatGroupWindow::setActiveFreeTeller(const string &winName, bool bActive)
 {
 	CGroupContainer *pGC = createFreeTeller(winName);
 	if (pGC != NULL)
@@ -1166,7 +1163,7 @@ CChatWindow *CChatWindowManager::createChatGroupWindow(const CChatWindowDesc &de
 }
 
 //=================================================================================
-CChatWindow *CChatWindowManager::getChatWindow(const ucstring &title)
+CChatWindow *CChatWindowManager::getChatWindow(const string &title)
 {
 	TChatWindowMap::iterator it = _ChatWindowMap.find(title);
 	if (it == _ChatWindowMap.end())
@@ -1179,12 +1176,12 @@ CChatWindow *CChatWindowManager::getChatWindow(const ucstring &title)
 }
 
 //=================================================================================
-void CChatWindowManager::removeChatWindow(const ucstring &title)
+void CChatWindowManager::removeChatWindow(const string &title)
 {
 	TChatWindowMap::iterator it = _ChatWindowMap.find(title);
 	if (it == _ChatWindowMap.end())
 	{
-		nlwarning("Unknown chat window '%s'", title.toUtf8().c_str());
+		nlwarning("Unknown chat window '%s'", title.c_str());
 		return;
 	}
 	it->second->deleteContainer();
@@ -1213,11 +1210,11 @@ CChatWindow *CChatWindowManager::getChatWindowFromCaller(CCtrlBase *caller)
 	}
 	if (!father) return NULL;
 
-	return  getChatWindow(father->getUCTitle());
+	return  getChatWindow(father->getTitle());
 }
 
 //=================================================================================
-bool CChatWindowManager::rename(const ucstring &oldName, const ucstring &newName, bool newNameLocalize)
+bool CChatWindowManager::rename(const string &oldName, const string &newName, bool newNameLocalize)
 {
 	// if (oldName == newName) return true;
 	CChatWindow *newWin = getChatWindow(newName);
@@ -1225,8 +1222,8 @@ bool CChatWindowManager::rename(const ucstring &oldName, const ucstring &newName
 	TChatWindowMap::iterator it = _ChatWindowMap.find(oldName);
 	if (it == _ChatWindowMap.end()) return false;
 	_ChatWindowMap[newName] = it->second;
-	it->second->getContainer()->setLocalize(false);
-	it->second->getContainer()->setTitle(newName.toUtf8());
+	it->second->getContainer()->setLocalize(newNameLocalize);
+	it->second->getContainer()->setTitle(newName);
 	_ChatWindowMap.erase(it);
 	return true;
 }
diff --git a/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
index 39fc448f9..9a299ebfb 100644
--- a/ryzom/client/src/interface_v3/chat_window.h
+++ b/ryzom/client/src/interface_v3/chat_window.h
@@ -23,7 +23,7 @@
 #ifndef CL_CHAT_WINDOW_H
 #define CL_CHAT_WINDOW_H
 
-#include "nel/misc/ucstring.h"
+#include "nel/misc/ucstring.h" // REMOVE
 #include "nel/misc/smart_ptr.h"
 
 #include "game_share/chat_group.h"
@@ -57,7 +57,7 @@ struct CChatWindowDesc
 {
 	typedef	std::vector<std::pair<std::string,std::string> >	TTemplateParams;
 
-	ucstring				Title;                // unique title for the window
+	std::string				Title;                // unique title for the window
 	std::string				FatherContainer;      // name of the father container. If empty, the chat box must be added manually in the hierarchy
 	std::string				ChatTemplate;         // Template for the chat interface, or "" to use the default one
 	TTemplateParams			ChatTemplateParams;	  // optional template parameters
@@ -94,7 +94,7 @@ public:
 		// called by a CChatWindow when it is deleted
 		virtual void chatWindowRemoved(CChatWindow * /* cw */) {}
 		// called by a CChatWindow when a msg has been displayed in it ('displayMessage' has been called)
-		//virtual void displayMessage(CChatWindow *cw, const ucstring &msg, NLMISC::CRGBA col, uint numBlinks = 0) {}
+		//virtual void displayMessage(CChatWindow *cw, const std::string &msg, NLMISC::CRGBA col, uint numBlinks = 0) {}
 	};
 public:
 	// display a message in this chat box with the given color
@@ -110,16 +110,16 @@ public:
 	// set a command to be displayed and eventually executed in this chat window. std::string version for backward compatibility
 	void setCommand(const std::string &command, bool execute);
 	// set a command to be displayed and eventually executed in this chat window
-	void setCommand(const ucstring &command, bool execute);
+	void setCommand(const ucstring &command, bool execute); // REMOVE
 	// set a string to be displayed in the edit box of this window (if it has one)
-	void setEntry(const ucstring &entry);
+	void setEntry(const std::string &entry);
 	// Set listener to react to a chat entry
 	void setListener(IChatWindowListener *listener) { _Listener = listener; }
 	IChatWindowListener *getListener() const { return _Listener; }
 	// Set the menu for the chat
 	void setMenu(const std::string &menuName);
 	// Set a new prompt for the chat window
-	void setPrompt(const ucstring &prompt);
+	void setPrompt(const std::string &prompt);
 	// Set the color for the chat window
 	void setPromptColor(NLMISC::CRGBA col);
 	/** Get the container associated with this chat window
@@ -131,7 +131,7 @@ public:
 	/** try to rename the chat window
 	  * \return true if success
 	  */
-	bool rename(const ucstring &newName, bool newNameLocalize);
+	bool rename(const std::string &newName, bool newNameLocalize);
 	/** delete the container
 	  * Don't do it in the dtor, because done automatically at the end of the app by the interface manager.
 	  * Useful only if querried by the user
@@ -140,7 +140,7 @@ public:
 	// get the last chat window from which a command has been called
 	static CChatWindow *getChatWindowLaunchingCommand() { return _ChatWindowLaunchingCommand; }
 	// get the title of this chat window
-	ucstring getTitle() const;
+	std::string getTitle() const;
 	// observers
 	void addObserver(IObserver *obs);
 	void removeObserver(IObserver *obs);
@@ -154,7 +154,7 @@ public:
 	void setAHOnCloseButtonParams(const std::string &n);
 	void setHeaderColor(const std::string &n);
 	//
-	void displayLocalPlayerTell(const ucstring &receiver, const ucstring &msg, uint numBlinks = 0);
+	void displayLocalPlayerTell(const std::string &receiver, const std::string &msg, uint numBlinks = 0);
 
 	/// Encode a color tag '@{RGBA}' in the text. If append is true, append at end of text, otherwise, replace the text
 	static void encodeColorTag(const NLMISC::CRGBA &color, std::string &text, bool append=true);
@@ -196,8 +196,8 @@ public:
 	void setTabIndex(sint32 n);
 
 	// Free Teller
-	NLGUI::CGroupContainer *createFreeTeller(const ucstring &winName, const std::string &winColor="");
-	void setActiveFreeTeller(const ucstring &winName, bool bActive=true);
+	NLGUI::CGroupContainer *createFreeTeller(const std::string &winName, const std::string &winColor="");
+	void setActiveFreeTeller(const std::string &winName, bool bActive=true);
 	std::string getFreeTellerName(const std::string &containerID);
 	bool removeFreeTeller(const std::string &containerID); // Return true if free teller found
 	void removeAllFreeTellers();
@@ -245,9 +245,9 @@ public:
 	CChatWindow *createChatGroupWindow(const CChatWindowDesc &desc);
 
 	// Get a chat window by its title
-	CChatWindow *getChatWindow(const ucstring &title);
+	CChatWindow *getChatWindow(const std::string &title);
 	/// Remove a chat window by its title
-	void		 removeChatWindow(const ucstring &title);
+	void		 removeChatWindow(const std::string &title);
 	// Remove a chat window by its pointer
 	void		 removeChatWindow(CChatWindow *cw);
 	/// from a ctrl of a chat box that triggered a menu, or an event, retrieve the associated chat box
@@ -255,14 +255,14 @@ public:
 	// Singleton pattern applied to the chat window manager
 	static CChatWindowManager &getInstance();
 	// try to rename a window
-	bool rename(const ucstring &oldName, const ucstring &newName, bool newNameLocalize);
+	bool rename(const std::string &oldName, const std::string &newName, bool newNameLocalize);
 	// warning : this is slow
 	uint getNumChatWindow() const { return (uint)_ChatWindowMap.size(); }
 	// warning : this is slow : for debug only
 	CChatWindow *getChatWindowByIndex(uint index);
 ///////////////////////////////////////////////////////////////////////////////////////
 private:
-	typedef std::map<ucstring, NLMISC::CRefPtr<CChatWindow> > TChatWindowMap;
+	typedef std::map<std::string, NLMISC::CRefPtr<CChatWindow> > TChatWindowMap;
 private:
 	//
 	TChatWindowMap	_ChatWindowMap;
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 63392c583..dcfdc1fc9 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -102,9 +102,9 @@ void CControlSheetInfoWaiter::infoReceived()
 }
 
 
-ucstring CControlSheetInfoWaiter::infoValidated() const
+string CControlSheetInfoWaiter::infoValidated() const
 {
-	ucstring help;
+	ucstring help; // FIXME: Lua UTF-8
 	if (CtrlSheet && !LuaMethodName.empty())
 	{
 		// delegate setup of context he help ( & window ) to lua
@@ -131,7 +131,7 @@ ucstring CControlSheetInfoWaiter::infoValidated() const
 		}
 	}
 
-	return help;
+	return help.toUtf8();
 }
 
 // ***************************************************************************
@@ -3443,10 +3443,10 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 			{
 				// call lua function to update tooltip window
 				_ItemInfoWaiter.sendRequest();
-				help = _ItemInfoWaiter.infoValidated().toUtf8();
+				help = _ItemInfoWaiter.infoValidated();
 				// its expected to get at least item name back
 				if (help.empty())
-					help = getItemActualName().toUtf8();
+					help = getItemActualName();
 			}
 			else if (!_ContextHelp.empty())
 			{
@@ -3454,7 +3454,7 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 			}
 			else
 			{
-				help = getItemActualName().toUtf8();;
+				help = getItemActualName();;
 			}
 		}
 		else
@@ -3575,7 +3575,7 @@ void	CDBCtrlSheet::getContextHelpToolTip(std::string &help) const
 			if (useItemInfoForFamily(item->Family))
 			{
 				_ItemInfoWaiter.sendRequest();
-				help = _ItemInfoWaiter.infoValidated().toUtf8();
+				help = _ItemInfoWaiter.infoValidated();
 				return;
 			}
 		}
@@ -4563,11 +4563,11 @@ void CDBCtrlSheet::initArmourColors()
 
 
 // ***************************************************************************
-ucstring CDBCtrlSheet::getItemActualName() const
+string CDBCtrlSheet::getItemActualName() const
 {
 	const CItemSheet *pIS= asItemSheet();
 	if(!pIS)
-		return ucstring();
+		return string();
 	else
 	{
 		string ret;
@@ -4587,7 +4587,7 @@ ucstring CDBCtrlSheet::getItemActualName() const
 		if (pIS->Family == ITEMFAMILY::SCROLL_R2)
 		{
 			const R2::TMissionItem *mi = R2::getEditor().getPlotItemInfos(getSheetId());
-			if (mi) return mi->Name;
+			if (mi) return mi->Name.toUtf8();
 		}
 		// if item is not a mp, append faber_quality & faber_stat_type
 		// Don't append quality and stat type for Named Items!!!
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index 9440222f4..dfe3b7140 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -73,7 +73,7 @@ public:
 		: IItemInfoWaiter(), Requesting(false)
 	{ }
 public:
-	ucstring infoValidated() const;
+	std::string infoValidated() const;
 	void sendRequest();
 	virtual void infoReceived();
 };
@@ -582,7 +582,7 @@ public:
 	void	setItemColor(sint32 val) {if(_UserColor) _UserColor->setValue32(val);}
 
 	// Get the Actual item name. Localized version of SheetId, or given by server through NAMEID.
-	ucstring getItemActualName() const;
+	std::string getItemActualName() const;
 
 	/// true if support drag copy (with CTRL). action handler has to check control.
 	bool	canDragCopy() const {return _DragCopy;}
diff --git a/ryzom/client/src/interface_v3/group_career.cpp b/ryzom/client/src/interface_v3/group_career.cpp
index d3f3e2563..10cfca35e 100644
--- a/ryzom/client/src/interface_v3/group_career.cpp
+++ b/ryzom/client/src/interface_v3/group_career.cpp
@@ -63,13 +63,13 @@ bool CGroupCareer::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (Career >= ROLES::NB_ROLES)
 		Career = ROLES::fighter;
 
-	ucstring sTmp = ROLES::roleToUCString(Career);
+	string sTmp = ROLES::roleToUCString(Career);
 	for (uint32 i= 0; i < sTmp.size(); ++i)
 		if (sTmp[i] < 128)
 			if ( (sTmp[i] >= 'a') && (sTmp[i] <= 'z') )
 				sTmp[i] = sTmp[i] - 'a' + 'A';
 
-	setUCTitle (sTmp);
+	setTitle (sTmp);
 
 	return true;
 }
@@ -133,7 +133,7 @@ bool CGroupJob::parse (xmlNodePtr /* cur */, CInterfaceGroup * /* parentGroup */
 //		if (sTmp[i] < 128)
 //			if ( (sTmp[i] >= 'a') && (sTmp[i] <= 'z') )
 //				sTmp[i] = sTmp[i] - 'a' + 'A';
-//	setUCTitle (sTmp);
+//	seUCTitle (sTmp);
 //
 //	return true;
 }
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
index 9494deacf..4c21fee47 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@@ -626,11 +626,11 @@ static DECLARE_INTERFACE_USER_FCT(getChatWin)
 
 
 	CChatWindowManager &rCWM = CChatWindowManager::getInstance();
-	ucstring title = CI18N::get(args[0].getString());
+	string title = CI18N::get(args[0].getString());
 	CChatWindow *window = rCWM.getChatWindow(title);
 	if (!window)
 	{
-		nlwarning("Can't find window named %s", title.toString().c_str());
+		nlwarning("Can't find window named %s", title.c_str());
 		return false;
 	}
 	string sTmp = window->getContainer()->getId();
diff --git a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
index cae4b9d77..7744be7eb 100644
--- a/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
+++ b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
@@ -313,7 +313,7 @@ static DECLARE_INTERFACE_USER_FCT(getSheetName)
 	// if from ctrlSheet, then take the correct ACTUAL name (ie from NAMEID if not 0)
 	if(ctrlSheet)
 	{
-		result.setString(ctrlSheet->getItemActualName().toUtf8());
+		result.setString(ctrlSheet->getItemActualName());
 		return true;
 	}
 	// Standard (but less accurate) way
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 1b36c91d5..aa38b6dbf 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -982,7 +982,7 @@ void CInterfaceManager::initInGame()
 	// flush system msg buffer
 	for( uint i=0; i<PeopleInterraction.SystemMessageBuffer.size(); ++i )
 	{
-		displaySystemInfo(PeopleInterraction.SystemMessageBuffer[i].Str.toUtf8(), PeopleInterraction.SystemMessageBuffer[i].Cat);
+		displaySystemInfo(PeopleInterraction.SystemMessageBuffer[i].Str, PeopleInterraction.SystemMessageBuffer[i].Cat);
 	}
 	PeopleInterraction.SystemMessageBuffer.clear();
 
diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
index 3b16c41d2..3122d3f46 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -2021,11 +2021,11 @@ void CTempInvManager::updateForageQQ( uint whichOne )
 			break;
 		default:;
 		}
-		ucstring title = CI18N::get( WIN_TEMPINV_TITLE_FORAGING );
+		string title = CI18N::get( WIN_TEMPINV_TITLE_FORAGING );
 		strFindReplace( title, "%qt", toString( "%.1f", qt ) );
 		strFindReplace( title, "%ql", toString( "%.1f", ql ) );
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId(WIN_TEMPINV));
-		pGC->setUCTitle( title );
+		pGC->setTitle( title );
 	}
 
 	isInUpdateForageQQ = false;
@@ -2199,7 +2199,7 @@ bool SBagOptions::parse(xmlNodePtr cur, CInterfaceGroup * /* parentGroup */)
 }
 
 // ***************************************************************************
-void SBagOptions::setSearchFilter(const ucstring &s)
+void SBagOptions::setSearchFilter(const string &s)
 {
 	SearchQualityMin = 0;
 	SearchQualityMax = 999;
@@ -2208,13 +2208,13 @@ void SBagOptions::setSearchFilter(const ucstring &s)
 
 	if (!s.empty())
 	{
-		std::vector<ucstring> words;
-		splitUCString(toLower(s), ucstring(" "), words);
+		std::vector<string> words;
+		splitString(toLower(s), string(" "), words);
 
 		size_t pos;
 		for(int i = 0; i<words.size(); ++i)
 		{
-			std::string kw = words[i].toUtf8();
+			std::string kw = words[i];
 
 			pos = kw.find("-");
 			if (pos != std::string::npos)
@@ -2318,17 +2318,17 @@ bool SBagOptions::canDisplay(CDBCtrlSheet *pCS) const
 		if (SearchFilter.size() > 0)
 		{
 			bool match = true;
-			ucstring lcName = toLower(pCS->getItemActualName());
+			string lcName = toLower(pCS->getItemActualName());
 
 			// add item quality as a keyword to match
 			if (pCS->getQuality() > 1)
 			{
-				lcName += ucstring(" " + toString(pCS->getQuality()));
+				lcName += string(" " + toString(pCS->getQuality()));
 			}
 
 			for (uint i = 0; i< SearchFilter.size(); ++i)
 			{
-				if (lcName.find(SearchFilter[i]) == ucstring::npos)
+				if (lcName.find(SearchFilter[i]) == string::npos)
 				{
 					return false;
 				}
@@ -2741,7 +2741,7 @@ class CHandlerInvSearchButton : public IActionHandler
 			return;
 		}
 
-		ucstring filter;
+		string filter;
 		std::string id = btn->getParent()->getId() + ":" + sParams + ":eb";
 		CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(id));
 		if (!eb)
@@ -2755,7 +2755,7 @@ class CHandlerInvSearchButton : public IActionHandler
 		{
 			CWidgetManager::getInstance()->setCaptureKeyboard(eb);
 			eb->setSelectionAll();
-			filter = eb->getInputStringAsUtf16();
+			filter = eb->getInputString();
 		}
 
 		CDBGroupListSheetBag *pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(btn->getParent()->getId() + ":bag_list"));
@@ -2805,10 +2805,10 @@ class CHandlerInvSetSearch : public IActionHandler
 		std::string id = pCaller->getParent()->getParent()->getId();
 
 		CDBGroupListSheetBag *pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(id + ":bag_list"));
-		if (pList != NULL) pList->setSearchFilter(eb->getInputStringAsUtf16());
+		if (pList != NULL) pList->setSearchFilter(eb->getInputString());
 
 		CDBGroupIconListBag *pIcons = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(id + ":bag_icons"));
-		if (pIcons != NULL) pIcons->setSearchFilter(eb->getInputStringAsUtf16());
+		if (pIcons != NULL) pIcons->setSearchFilter(eb->getInputString());
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerInvSetSearch, "inv_set_search" );
diff --git a/ryzom/client/src/interface_v3/inventory_manager.h b/ryzom/client/src/interface_v3/inventory_manager.h
index 8c365a0be..6af8414de 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.h
+++ b/ryzom/client/src/interface_v3/inventory_manager.h
@@ -520,7 +520,7 @@ struct SSortStruct
 {
 	CDBGroupListSheetText::CSheetChild	*SheetText;
 	CDBGroupListSheet::CSheetChild		*SheetIcon;
-	ucstring Pos;
+	std::string Pos;
 	bool operator < (const SSortStruct &o) const { return Pos < o.Pos; }
 };
 
@@ -558,7 +558,7 @@ struct SBagOptions
 	bool SearchFilterChanged;
 	uint16 SearchQualityMin;
 	uint16 SearchQualityMax;
-	std::vector<ucstring> SearchFilter;
+	std::vector<std::string> SearchFilter;
 
 	// -----------------------
 	SBagOptions()
@@ -576,7 +576,7 @@ struct SBagOptions
 	bool isSomethingChanged(); // From last call ?
 
 	bool isSearchFilterChanged() const { return SearchFilterChanged; }
-	void setSearchFilter(const ucstring &s);
+	void setSearchFilter(const std::string &s);
 
 	bool getFilterArmor() const
 	{
@@ -674,7 +674,7 @@ public:
 	// Return true if the sheet can be displayed due to filters
 	bool canDisplay(CDBCtrlSheet *pCS) { return _BO.canDisplay(pCS); }
 
-	void setSearchFilter(const ucstring &s) { _BO.setSearchFilter(s); }
+	void setSearchFilter(const std::string &s) { _BO.setSearchFilter(s); }
 
 private:
 
@@ -707,7 +707,7 @@ public:
 	// Return true if the sheet can be displayed due to filters
 	bool canDisplay(CDBCtrlSheet *pCS) const { return _BO.canDisplay(pCS); }
 
-	void setSearchFilter(const ucstring &s) { _BO.setSearchFilter(s); }
+	void setSearchFilter(const std::string &s) { _BO.setSearchFilter(s); }
 
 	//////////////////////////////////////////////////////////////////////////
 
diff --git a/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
index 7b659fe6d..fdb53a0ec 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_special_effect.cpp
@@ -51,8 +51,8 @@ void CItemSpecialEffectHelper::registerItemSpecialEffect(const string &name)
 	vector<string> params;
 
 	// get ui string
-	ucstring ucs = CI18N::get("uiItemFX_" + name);
-	CSString p, s = ucs.toString();
+	string ucs = CI18N::get("uiItemFX_" + name);
+	CSString p, s = ucs;
 
 	// locate and store parameters
 	// %p : percent
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index aa6ffe213..21977f0bc 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -87,7 +87,7 @@ using namespace NLMISC;
 
 // ***************************************************************************
 // Add the template key to the parent
-void addKeyLine (CGroupList *pParent, const ucstring &keyName, const ucstring &shortcutName, bool grayed)
+void addKeyLine (CGroupList *pParent, const string &keyName, const string &shortcutName, bool grayed)
 {
 	CInterfaceManager	*pIM = CInterfaceManager::getInstance();
 	CMacroCmdManager	*pMCM = CMacroCmdManager::getInstance();
@@ -104,14 +104,14 @@ void addKeyLine (CGroupList *pParent, const ucstring &keyName, const ucstring &s
 	CViewText *pViewKeyName = dynamic_cast<CViewText*>(pKeysLine->getView(TEMPLATE_KEYS_KEY_NAME));
 	if (pViewKeyName != NULL)
 	{
-		pViewKeyName->setText (keyName.toUtf8());
+		pViewKeyName->setText (keyName);
 		pViewKeyName->setColor(grayed?CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionCtrlTextGrayColor).getValColor():CRGBA::White);
 	}
 
 	CViewText *pViewShortcutName = dynamic_cast<CViewText*>(pKeysLine->getView(TEMPLATE_KEYS_SHORTCUT_NAME));
 	if (pViewShortcutName != NULL)
 	{
-		pViewShortcutName->setText (shortcutName.toUtf8());
+		pViewShortcutName->setText (shortcutName);
 		pViewShortcutName->setColor(grayed?CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionCtrlTextGrayColor).getValColor():CRGBA::White);
 	}
 
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 790949352..c7c9e89eb 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -586,9 +586,17 @@ static void addFromPlaylist(const std::string &playlist, const std::vector<std::
 
 			if (!useUtf8)
 			{
-				lineStr = ucstring(line).toUtf8();
+				lineStr = NLMISC::mbcsToUtf8(line); // Attempt local codepage first
+				if (lineStr.empty())
+					lineStr = CUtfStringView::fromAscii(std::string(line));
 				lineStr = trim(lineStr);
 			}
+			else
+			{
+				lineStr = trim(std::string(line + 3));
+			}
+
+			lineStr = CUtfStringView(lineStr).toUtf8(true); // Re-encode external string
 
 			// Not a comment line
 			if (lineStr[0] != '#')
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index e2f880744..98432cdb8 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -355,7 +355,7 @@ void CPeopleInterraction::release()
 		uint numCW = cwm.getNumChatWindow();
 		for(uint k = 0; k < numCW; ++k)
 		{
-			nlwarning("Window %d : %s", (int) k, (cwm.getChatWindowByIndex(k)->getTitle().toString()).c_str());
+			nlwarning("Window %d : %s", (int) k, (cwm.getChatWindowByIndex(k)->getTitle()).c_str());
 		}
 	}
 }
@@ -1121,7 +1121,7 @@ void CPeopleInterraction::askAddContact(const string &contactName, CPeopleList *
 		if (pl == &FriendList)
 			list = 0;
 
-		ucstring temp = contactName; // TODO: UTF-8 serial
+		ucstring temp = ucstring::makeFromUtf8(contactName); // TODO: UTF-8 (serial)
 		out.serial(temp);
 		out.serial(list);
 		NetMngr.push(out);
@@ -1192,7 +1192,7 @@ void CPeopleInterraction::askMoveContact(uint peopleIndexInSrc, CPeopleList *plS
 	// Fake Local simulation
 	if (ClientCfg.Local)
 	{
-		ucstring peopleName= plSRC->getName(peopleIndexInSrc);
+		string peopleName= plSRC->getName(peopleIndexInSrc);
 		plSRC->removePeople(peopleIndexInSrc);
 		sint dstIndex = plDST->addPeople(peopleName);
 		plDST->setOnline(dstIndex, ccs_online);
@@ -1252,7 +1252,7 @@ void CPeopleInterraction::askRemoveContact(uint peopleIndex, CPeopleList *pl)
 //=================================================================================================================
 void CPeopleInterraction::initContactLists( const std::vector<uint32> &vFriendListName,
 											const std::vector<TCharConnectionState> &vFriendListOnline,
-											const std::vector<ucstring> &vIgnoreListName	)
+											const std::vector<ucstring> &vIgnoreListName	) // TODO: UTF-8 (serial)
 
 {
 	// clear the current lists if any
@@ -1264,18 +1264,18 @@ void CPeopleInterraction::initContactLists( const std::vector<uint32> &vFriendLi
 	for (uint i = 0; i < vFriendListName.size(); ++i)
 		addContactInList(contactIdPool++, vFriendListName[i], vFriendListOnline[i], 0);
 	for (uint i = 0; i < vIgnoreListName.size(); ++i)
-		addContactInList(contactIdPool++, vIgnoreListName[i], ccs_offline, 1);
+		addContactInList(contactIdPool++, vIgnoreListName[i].toUtf8(), ccs_offline, 1);
 	updateAllFreeTellerHeaders();
 }
 
 //=================================================================================================================
-void CPeopleInterraction::addContactInList(uint32 contactId, const ucstring &nameIn, TCharConnectionState online, uint8 nList)
+void CPeopleInterraction::addContactInList(uint32 contactId, const string &nameIn, TCharConnectionState online, uint8 nList)
 {
 	// select correct people list
 	CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 
 	// remove the shard name if possible
-	string	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
+	string	name= CEntityCL::removeShardFromName(nameIn);
 
 	// add the contact to this list
 	sint index = pl.getIndexFromName(name);
@@ -1321,12 +1321,12 @@ void CPeopleInterraction::addContactInList(uint32 contactId, uint32 nameID, TCha
 }
 
 //=================================================================================================================
-bool CPeopleInterraction::isContactInList(const ucstring &nameIn, uint8 nList) const
+bool CPeopleInterraction::isContactInList(const string &nameIn, uint8 nList) const
 {
 	// select correct people list
 	const CPeopleList	&pl= nList==0?FriendList:IgnoreList;
 	// remove the shard name if possible
-	string	name= CEntityCL::removeShardFromName(nameIn.toUtf8());
+	string	name= CEntityCL::removeShardFromName(nameIn);
 	return pl.getIndexFromName(name) != -1;
 }
 
@@ -1455,12 +1455,14 @@ void CPeopleInterraction::removeContactFromList(uint32 contactId, uint8 nList)
 }
 
 //=================================================================================================================
-bool CPeopleInterraction::testValidPartyChatName(const ucstring &title)
+bool CPeopleInterraction::testValidPartyChatName(const string &title)
 {
 	if (title.empty()) return false;
 	// shouldn't begin like 'user chat 1-5'
-	ucstring userChatStr = CI18N::get("uiUserChat");
-	if (title.substr(0, userChatStr.length()) == userChatStr) return false;
+	const string &userChatStr = CI18N::get("uiUserChat");
+	if (NLMISC::startsWith(title, userChatStr)) return false;
+	// can't match a translation identifier
+	if (CI18N::hasTranslation(title)) return false;
 	for(uint k = 0; k < PartyChats.size(); ++k) // there shouldn't be that much party chat simultaneously so a linear search is ok
 	{
 		if (PartyChats[k].Window->getTitle() == title) return false;
@@ -1471,9 +1473,9 @@ bool CPeopleInterraction::testValidPartyChatName(const ucstring &title)
 	if (GuildChat && title == GuildChat->getTitle()) return false;
 	if (TeamChat && title == TeamChat->getTitle()) return false;
 	sint index;
-	index = FriendList.getIndexFromName(title.toUtf8());
+	index = FriendList.getIndexFromName(title);
 	if (index != -1) return false;
-	index = IgnoreList.getIndexFromName(title.toUtf8());
+	index = IgnoreList.getIndexFromName(title);
 	if (index != -1) return false;
 	// TODO_GAMEDEV server test for the name (not only local), & modify callers of this function
     // The party chat should NOT have the name of a player
@@ -1526,7 +1528,7 @@ void CPeopleInterraction::assignPartyChatMenu(CChatWindow *partyChat)
 }
 
 //=================================================================================================================
-bool CPeopleInterraction::createNewPartyChat(const ucstring &title)
+bool CPeopleInterraction::createNewPartyChat(const string &title)
 {
 	// now there are no party chat windows, party chat phrases must be filtered from the main chat
 
@@ -1851,8 +1853,8 @@ void CPeopleInterraction::createUserChat(uint index)
 		return;
 	}
 	CChatWindowDesc chatDesc;
-	ucstring userChatStr = CI18N::get("uiUserChat");
-	userChatStr += ucchar(' ') + ucstring(toString(index + 1));
+	string userChatStr = CI18N::get("uiUserChat");
+	userChatStr += ' ' + toString(index + 1);
 	//chatDesc.FatherContainer = "ui:interface:communication";
 	chatDesc.FatherContainer = "ui:interface:contact_list";
 	chatDesc.Title = userChatStr;
@@ -2592,7 +2594,7 @@ public:
 		{
 			for(uint l = 0; l < pl.PartyChats.size(); ++l)
 			{
-				menu->addLineAtIndex(insertionIndex, pl.PartyChats[l].Window->getTitle().toUtf8(), "chat_target_selected", toString(pl.PartyChats[l].ID));
+				menu->addLineAtIndex(insertionIndex, pl.PartyChats[l].Window->getTitle(), "chat_target_selected", toString(pl.PartyChats[l].ID));
 				++ insertionIndex;
 			}
 		}
@@ -2939,7 +2941,7 @@ class CHandlerSelectChatSource : public IActionHandler
 			{
 				if (pc[l].Filter != NULL)
 				{
-					menu->addLineAtIndex(insertionIndex, pc[l].Window->getTitle().toUtf8(), FILTER_TOGGLE, toString(pc[l].ID));
+					menu->addLineAtIndex(insertionIndex, pc[l].Window->getTitle(), FILTER_TOGGLE, toString(pc[l].ID));
 					menu->setUserGroupLeft(insertionIndex, createMenuCheckBox(FILTER_TOGGLE, toString(pc[l].ID), pc[l].Filter->isListeningWindow(cw)));
 					++ insertionIndex;
 				}
diff --git a/ryzom/client/src/interface_v3/people_interraction.h b/ryzom/client/src/interface_v3/people_interraction.h
index 59230853f..8181c1705 100644
--- a/ryzom/client/src/interface_v3/people_interraction.h
+++ b/ryzom/client/src/interface_v3/people_interraction.h
@@ -156,12 +156,12 @@ public:
 	CFilteredChat			    UserChat[MaxNumUserChats];
 	CFilteredChat			    TheUserChat;
 	// Id of last people who talked
-	ucstring					LastSenderName;
+	std::string					LastSenderName;
 
 	// system message
 	struct CSysMsg
 	{
-		ucstring Str;
+		std::string Str;
 		std::string Cat;
 	};
 	// system message buffer
@@ -195,13 +195,13 @@ public:
 	  */
 	CFilteredChat		*getFilteredChatFromChatWindow(CChatWindow *cw);
 
-	bool				testValidPartyChatName(const ucstring &name);
+	bool				testValidPartyChatName(const std::string &name);
 	bool				removePartyChat(CChatWindow *window);
 	void				removeAllPartyChat();
 	/**
 	  * create a named party chat.
 	  */
-	bool				createNewPartyChat(const ucstring &title);
+	bool				createNewPartyChat(const std::string &title);
 
 	static void			assignPartyChatMenu(CChatWindow *partyChat);
 
@@ -215,11 +215,11 @@ public:
 	// init contact list (from server typically)
 	void initContactLists(	const std::vector<uint32> &vFriendListName,
 							const std::vector<TCharConnectionState> &vFriendListOnline,
-							const std::vector<ucstring> &vIgnoreListName	);
+							const std::vector<ucstring> &vIgnoreListName	); // TODO: UTF-8 (serial)
 	// Friend list == 0 // Ignore list == 1
 	void addContactInList(uint32 contactId, uint32 nameID, TCharConnectionState Online, uint8 nList);
-	void addContactInList(uint32 contactId, const ucstring &name, TCharConnectionState Online, uint8 nList);
-	bool isContactInList(const ucstring &name, uint8 nList) const;
+	void addContactInList(uint32 contactId, const std::string &name, TCharConnectionState Online, uint8 nList);
+	bool isContactInList(const std::string &name, uint8 nList) const;
 	// Called each frame to receive name from IOS
 	void updateWaitingContacts();
 	// server decide to remove a contact (if it does not exists anymore)
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index f056f4cc5..6650b7ef2 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -127,10 +127,7 @@ bool CPeopleList::create(const CPeopleListDesc &desc, const CChatWindowDesc *cha
 
 	_BaseContainer->setSavable(desc.Savable);
 	_BaseContainer->setLocalize(desc.Localize);
-	if (desc.Localize)
-		_BaseContainer->setTitle(desc.PeopleListTitle.toString());
-	else
-		_BaseContainer->setUCTitle(desc.PeopleListTitle);
+	_BaseContainer->setTitle(desc.PeopleListTitle);
 	//_BaseContainer->setId("ui:interface:" + desc.Id);
 
 	// create the chat window if there's one
@@ -162,7 +159,7 @@ sint CPeopleList::getIndexFromName(const string &name) const
 	string sNameIn = toLower(name);
 	for(uint k = 0; k < _Peoples.size(); ++k)
 	{
-		string sPeopleName = toLower(_Peoples[k].getName().toUtf8());
+		string sPeopleName = toLower(_Peoples[k].getName());
 		if (sPeopleName == sNameIn) return k;
 	}
 	return -1;
@@ -198,8 +195,8 @@ bool CPeopleList::sortExByContactId(const CPeople& a, const CPeople& b)
 //==================================================================
 bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 {
-	ucstring name_a = toUpper(a.getName());
-	ucstring name_b = toUpper(b.getName());
+	string name_a = toUpper(a.getName());
+	string name_b = toUpper(b.getName());
 	
 	return (name_a < name_b);
 }
@@ -207,8 +204,8 @@ bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 //==================================================================
 bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 {
-	ucstring name_a = toUpper(a.getName());
-	ucstring name_b = toUpper(b.getName());
+	string name_a = toUpper(a.getName());
+	string name_b = toUpper(b.getName());
 	
 	// We want order: online/alpha, offworld/alpha, offline/alpha
 	if (a.Online == b.Online)
@@ -331,13 +328,13 @@ bool CPeopleList::isPeopleWindowVisible(uint index) const
 */
 
 //==================================================================
-sint CPeopleList::addPeople(const ucstring &name, uint teamMateIndex /*= 0*/)
+sint CPeopleList::addPeople(const string &name, uint teamMateIndex /*= 0*/)
 {
 	if (!_BaseContainer) return - 1;
 	// check if not already inserted
-	if (getIndexFromName(name.toUtf8()) != -1)
+	if (getIndexFromName(name) != -1)
 	{
-		nlwarning("<CPeopleList::addPeople> people %s inserted twice.", name.toString().c_str());
+		nlwarning("<CPeopleList::addPeople> people %s inserted twice.", name.c_str());
 	}
 
 	vector<pair<string ,string> > properties;
@@ -371,11 +368,11 @@ sint CPeopleList::addPeople(const ucstring &name, uint teamMateIndex /*= 0*/)
 	if (!gc)
 	{
 		delete group;
-		nlwarning("<CPeopleList::addPeople> group is not a container.", name.toString().c_str());
+		nlwarning("<CPeopleList::addPeople> group is not a container.", name.c_str());
 		return -1;
 	}
 	// set title from the name
-	gc->setUCTitle(name);
+	gc->setTitle(name);
 	// People inside list are not savable !
 	gc->setSavable(false);
 	//
@@ -694,7 +691,7 @@ std::string CPeopleList::getName(uint index) const
 		nlwarning("bad index");
 		return "BAD INDEX!";
 	}
-	return _Peoples[index].getName().toUtf8();
+	return _Peoples[index].getName();
 }
 
 //==================================================================
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index 91dbf50d3..ccd8e2f41 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -28,7 +28,6 @@
 #include "chat_window.h"
 #include "interface_pointer.h"
 // NeL
-#include "nel/misc/ucstring.h"
 #include "nel/misc/rgba.h"
 
 
@@ -40,7 +39,7 @@
 struct CPeopleListDesc
 {
 	enum TContactType { Team, Contact, Ignore, Unknown };
-	ucstring     PeopleListTitle;    // title of the people list
+	std::string     PeopleListTitle;    // title of the people list
 	TContactType ContactType;
 	std::string  FatherContainer;           // name of the father container
 	std::string  BaseContainerTemplateName; // name of the template for the base container
@@ -99,7 +98,7 @@ public:
 	/** Add a people to the list, and returns its index or -1 if the creation failed
 	  * If this is a team mate, tells its index so that ic can be bound to the database in the right location
 	  */
-	sint addPeople(const ucstring &name, uint teamMateIndex = 0);
+	sint addPeople(const std::string &name, uint teamMateIndex = 0);
 	// swap people position between the 2 given indexs
 	void swapPeople(uint index1, uint index2);
 	// Remove the people at the given index
@@ -159,7 +158,7 @@ private:
 		bool							Blocked;
 		uint32							ContactId;
 		bool operator < (const CPeople &other) const { return getName() < other.getName(); }
-		ucstring		getName() const { return Container->getUCTitle(); }
+		std::string getName() const { return Container->getTitle(); }
 	};
 	typedef std::vector<CPeople> TPeopleVect;
 private:
diff --git a/ryzom/client/src/interface_v3/skill_manager.cpp b/ryzom/client/src/interface_v3/skill_manager.cpp
index cf35e6bd6..9d10cde0a 100644
--- a/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -588,8 +588,8 @@ void CSkillManager::checkTitleUnblocked(CHARACTER_TITLE::ECharacterTitle i, bool
 				// This is a new title, send a message
 				string titleStr = CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)i);
 				bool womenTitle = (UserEntity && UserEntity->getGender() == GSGENDER::female);
-				const ucstring newtitle(CStringManagerClient::getTitleLocalizedName(titleStr, womenTitle));
-				CAHManager::getInstance()->runActionHandler("message_popup", NULL, "text1="+newtitle.toUtf8()+"|text0="+CI18N::get("uiNewTitleBold"));
+				const char *newtitle(CStringManagerClient::getTitleLocalizedName(titleStr, womenTitle));
+				CAHManager::getInstance()->runActionHandler("message_popup", NULL, string("text1=") + newtitle + "|text0=" + CI18N::get("uiNewTitleBold"));
 			}
 			else
 			{
@@ -1097,8 +1097,8 @@ public:
 				{
 					string titleStr = CHARACTER_TITLE::toString((CHARACTER_TITLE::ECharacterTitle)i);
 					bool womenTitle = (UserEntity && UserEntity->getGender() == GSGENDER::female);
-					const ucstring s(CStringManagerClient::getTitleLocalizedName(titleStr,womenTitle));
-					pCB->addText(s.toUtf8());
+					const char *s = CStringManagerClient::getTitleLocalizedName(titleStr, womenTitle);
+					pCB->addText(s);
 					pSM->_UIUnblockedTitles.push_back((CHARACTER_TITLE::ECharacterTitle)i);
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index c42d544d1..cf4950fdd 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -3632,7 +3632,7 @@ public:
 	bool		Castable;
 	uint32		Type;
 	uint32		Icon;
-	ucstring	Text;
+	string	Text;
 
 	bool	operator<(const CPhraseSortEntry &pse) const
 	{
@@ -3840,9 +3840,9 @@ void				CSPhraseManager::computePhraseProgression()
 			// replace each number with 001 format. toLower
 			for(uint k=0;k<pse.Text.size();k++)
 			{
-				if(pse.Text[k] < 256 && isalpha(pse.Text[k]))
-					pse.Text[k]= tolower(pse.Text[k]);
-				else if(pse.Text[k] < 256 && isdigit(pse.Text[k]))
+				if((unsigned char)pse.Text[k] < 0x80 && isalpha(pse.Text[k]))
+					pse.Text[k]= tolower(pse.Text[k]); // FIXME: toLowerAscii
+				else if((unsigned char)pse.Text[k] < 0x80 && isdigit(pse.Text[k]))
 				{
 					uint32	number= 0;
 					uint32	start= k;
@@ -3853,7 +3853,7 @@ void				CSPhraseManager::computePhraseProgression()
 						number+= pse.Text[k] - '0';
 					}
 					// format, and replace in string
-					ucstring	newNumber= toString("%3d", number);
+					string	newNumber= toString("%3d", number);
 					pse.Text.replace(start, k-start, newNumber);
 					// and skip this number
 					k= start + (uint)newNumber.size();
@@ -4688,7 +4688,8 @@ int CSPhraseComAdpater::luaGetDesc(CLuaState &ls)
 	if (phraseSheetID != 0)
 	{
 		// is it a built-in phrase?
-		ucstring desc(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID)));
+		ucstring desc; // FIXME: UTF-8 Lua
+		desc.fromUtf8(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID)));
 		if (!desc.empty())
 		{
 			CLuaIHM::push(ls, desc);
diff --git a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
index cbfdf8f42..44127e630 100644
--- a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
+++ b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
@@ -110,13 +110,13 @@ void CViewBitmapFaberMp::draw ()
 	///\todo nico : draw icon
 	/*xOffset+=_XReal;
 	yOffset+=_YReal;
-	_SheetText->setText(ucstring(toString(_SheetId.getSInt32())));
+	_SheetText->setText(toString(_SheetId.getSInt32()));
 	_SheetText->draw(xOffset,yOffset+20);
 
-	_QuantityText->setText(ucstring(toString(_Quantity.getSInt32())));
+	_QuantityText->setText(toString(_Quantity.getSInt32()));
 	_QuantityText->draw(xOffset,yOffset+10);
 
-	_QualityText->setText(ucstring(toString(_Quality.getSInt32())));
+	_QualityText->setText(toString(_Quality.getSInt32()));
 	_QualityText->draw(xOffset,yOffset);
 */
 
diff --git a/ryzom/client/src/misc.cpp b/ryzom/client/src/misc.cpp
index 4e35cfc2a..0432abf1a 100644
--- a/ryzom/client/src/misc.cpp
+++ b/ryzom/client/src/misc.cpp
@@ -885,7 +885,7 @@ NLMISC::CRGBA interpClientCfgColor(const string &src, string &dest)
 				colorCode.resize(nextPos - 1);
 				for(uint k = 0; k < nextPos - 1; ++k)
 				{
-					colorCode[k] = tolower((char) src[k + 1]);
+					colorCode[k] = tolower((char) src[k + 1]); // TODO: toLowerAscii
 				}
 				std::map<std::string, CClientConfig::SSysInfoParam>::const_iterator it = ClientCfg.SystemInfoParams.find(colorCode);
 				if (it != ClientCfg.SystemInfoParams.end())
@@ -953,7 +953,7 @@ std::string getStringCategoryIfAny(const string &src, string &dest)
 				colorCode.resize( codeSize );
 				for(ptrdiff_t k = 0; k < (ptrdiff_t)codeSize; ++k)
 				{
-					colorCode[k] = tolower((char) src[k + startPos + 1]);
+					colorCode[k] = tolower((char) src[k + startPos + 1]); // TODO: toLowerAscii
 				}
 				string destTmp;
 				if ( startPos != 0 )
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 6b73acba2..e98d13fe9 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -2494,7 +2494,7 @@ void impulseRemoteAdmin (NLMISC::CBitMemStream &impulse)
 	impulse.serial (cmd);
 
 	// remove the 2 first rc character if exists, only there to say to the EGS that is a remote command
-	if (cmd.size()>2 && tolower(cmd[0])=='r' && tolower(cmd[1])=='c')
+	if (cmd.size()>2 && tolower(cmd[0])=='r' && tolower(cmd[1])=='c') // FIXME: toLowerAscii
 		cmd = cmd.substr(2);
 
 	mdDisplayVars.clear ();
diff --git a/ryzom/client/src/zone_util.cpp b/ryzom/client/src/zone_util.cpp
index 33b7fdf68..d7da6810c 100644
--- a/ryzom/client/src/zone_util.cpp
+++ b/ryzom/client/src/zone_util.cpp
@@ -53,7 +53,7 @@ bool getPosFromZoneName(const std::string &name,NLMISC::CVector2f &dest)
 	while (i < zoneName.size())
 	{
 		if (!::isalpha(zoneName[i])) return false;
-		xStr += (char) ::toupper(zoneName[i]); ++i;
+		xStr += (char) NLMISC::toUpper(zoneName[i]); ++i;
 	}
 	if (xStr.size() != 2) return false;
 	dest.x = 160.f * ((xStr[0] - 'A') * 26 + (xStr[1] - 'A'));
@@ -89,7 +89,7 @@ bool getZonePosFromZoneName(const std::string &name, sint &x, sint &y)
 	while (i < zoneName.size())
 	{
 		if (!::isalpha(zoneName[i])) return false;
-		xStr += (char) ::toupper(zoneName[i]); ++i;
+		xStr += (char) NLMISC::toUpper(zoneName[i]); ++i;
 	}
 	if (xStr.size() != 2) return false;
 	x = (xStr[0] - 'A') * 26 + (xStr[1] - 'A');

From 11b453baaa0d5de55eedc08277be3f66c78f443f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 10:10:48 +0800
Subject: [PATCH 133/292] Safe 7-bit upper- and lowercase

---
 nel/include/nel/misc/common.h | 11 ++++++++
 nel/src/misc/common.cpp       | 50 +++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index bca3372bd..1e99b5e70 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -255,6 +255,17 @@ int compareCaseInsensitive(const char *a, const char *b);
 int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB);
 inline int compareCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()); }
 
+/** ASCII to lowercase. Useful for internal identifiers.
+* Characters outside of the 7-bit ASCII space, and control characters, are replaced.
+*/
+std::string toLowerAscii(const std::string &str, char replacement);
+void toLowerAscii(char *str, char replacement);
+
+/** ASCII to uppercase. Useful for internal identifiers.
+* Characters outside of the 7-bit ASCII space, and control characters, are replaced.
+*/
+std::string toUpperAscii(const std::string &str, char replacement);
+void toUpperAscii(char *str, char replacement);
 
 /**
  *  Convert to an hexadecimal std::string
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index 8d046c97c..fce6af69c 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -689,6 +689,56 @@ void toUpper(char *str)
 	}
 }
 
+std::string toLowerAscii(const std::string &str, char replacement)
+{
+	std::string res;
+	res.reserve(str.size());
+	for (std::string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+	{
+		char c = *it;
+		if ((sint8)(c + '\x01') < (sint8)(' ' + '\x01')) res += replacement;
+		else if (c >= 'A' && c <= 'Z') res += c + ('a' - 'A');
+		else res += c;
+	}
+	return res;
+}
+
+void toLowerAscii(char *str, char replacement)
+{
+	for (ptrdiff_t i = 0; str[i]; ++i)
+	{
+		char c = str[i];
+		if ((sint8)(c + '\x01') < (sint8)(' ' + '\x01')) str[i] = replacement;
+		else if (c >= 'A' && c <= 'Z') str[i] = c + ('a' - 'A');
+		else str[i] = c;
+	}
+}
+
+std::string toUpperAscii(const std::string &str, char replacement)
+{
+	std::string res;
+	res.reserve(str.size());
+	for (std::string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+	{
+		char c = *it;
+		if ((sint8)(c + '\x01') < (sint8)(' ' + '\x01')) res += replacement;
+		else if (c >= 'a' && c <= 'z') res += c - ('a' - 'A');
+		else res += c;
+	}
+	return res;
+}
+
+void toUpperAscii(char *str, char replacement)
+{
+	for (ptrdiff_t i = 0; str[i]; ++i)
+	{
+		char c = str[i];
+		if ((sint8)(c + '\x01') < (sint8)(' ' + '\x01')) str[i] = replacement;
+		else if (c >= 'a' && c <= 'z') str[i] = c - ('a' - 'A');
+		else str[i] = c;
+	}
+}
+
 std::string toHexa(const uint8 &b)
 {
 	return toString("%02hhx", b);

From 73b8ba9e4ec054610d345a89f931ab22957207a9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 1 Nov 2020 11:37:22 +0800
Subject: [PATCH 134/292] UTF-8 various, ryzom/ryzomcore#335

---
 nel/include/nel/gui/view_text_id.h            |  2 +-
 nel/src/gui/view_text_id.cpp                  |  4 +--
 .../src/interface_v3/action_handler_help.cpp  | 22 ++++++------
 .../src/interface_v3/action_handler_item.cpp  | 25 +++++++-------
 .../src/interface_v3/action_handler_misc.cpp  |  4 +--
 .../interface_v3/action_handler_phrase.cpp    |  4 +--
 .../src/interface_v3/action_phrase_faber.cpp  |  8 ++---
 .../bot_chat_page_create_guild.cpp            |  6 ++--
 .../src/interface_v3/bot_chat_page_trade.cpp  | 12 +++----
 .../src/interface_v3/chat_text_manager.cpp    |  6 ++--
 .../src/interface_v3/chat_text_manager.h      |  1 -
 ryzom/client/src/interface_v3/chat_window.cpp |  9 +----
 ryzom/client/src/interface_v3/chat_window.h   |  3 --
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 16 ++++-----
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  2 +-
 .../src/interface_v3/dbgroup_build_phrase.cpp |  4 +--
 .../dbgroup_list_sheet_icon_phrase.cpp        |  4 +--
 .../interface_v3/dbgroup_list_sheet_mission.h |  2 +-
 ...roup_list_sheet_text_brick_composition.cpp | 16 ++++-----
 .../dbgroup_list_sheet_text_phrase.cpp        |  4 +--
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  2 +-
 .../interface_v3/dbgroup_list_sheet_trade.h   |  2 +-
 .../client/src/interface_v3/group_career.cpp  |  2 +-
 .../client/src/interface_v3/group_compas.cpp  |  4 +--
 .../interface_v3/group_in_scene_bubble.cpp    |  6 ++--
 .../interface_v3/group_in_scene_user_info.cpp | 20 +++++------
 ryzom/client/src/interface_v3/group_map.cpp   |  2 +-
 .../group_phrase_skill_filter.cpp             |  6 ++--
 .../client/src/interface_v3/guild_manager.cpp |  2 +-
 .../client/src/interface_v3/interface_ddx.cpp |  4 +--
 ryzom/client/src/interface_v3/interface_ddx.h |  2 +-
 .../src/interface_v3/interface_manager.cpp    | 34 +++++++++----------
 .../src/interface_v3/interface_manager.h      | 10 +++---
 .../src/interface_v3/item_special_effect.cpp  |  2 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp | 10 +++---
 .../src/interface_v3/people_interraction.cpp  |  8 ++---
 .../src/interface_v3/sbrick_manager.cpp       |  2 +-
 .../src/interface_v3/sphrase_manager.cpp      |  6 ++--
 ryzom/client/src/r2/editor.cpp                |  6 ++--
 ryzom/client/src/zone_util.cpp                |  8 ++---
 ryzom/common/src/game_share/character_title.h |  4 +--
 ryzom/common/src/game_share/utils.h           |  9 +++--
 42 files changed, 148 insertions(+), 157 deletions(-)

diff --git a/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
index 292f1728a..d29721481 100644
--- a/nel/include/nel/gui/view_text_id.h
+++ b/nel/include/nel/gui/view_text_id.h
@@ -39,7 +39,7 @@ namespace NLGUI
 	public:
 		virtual ~IOnReceiveTextId() {}
 		// the deriver may change the input text
-		virtual	void	onReceiveTextId(ucstring &str) =0;
+		virtual	void	onReceiveTextId(std::string &str) =0;
 	};
 
 	// ***************************************************************************
diff --git a/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
index 61d97b523..bea55a04d 100644
--- a/nel/src/gui/view_text_id.cpp
+++ b/nel/src/gui/view_text_id.cpp
@@ -231,9 +231,7 @@ namespace NLGUI
 			// Modify the text?
 			if (_StringModifier)
 			{
-				ucstring tmp = ucstring::makeFromUtf8(result);
-				_StringModifier->onReceiveTextId(tmp); // FIXME: UTF-8
-				result = tmp.toUtf8();
+				_StringModifier->onReceiveTextId(result);
 			}
 
 			// Set the Text
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 9cad50e25..102307909 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -2104,9 +2104,7 @@ void getItemText (CDBCtrlSheet *item, string &itemText, const CItemSheet*pIS)
 	INVENTORIES::TInventory inventory = (INVENTORIES::TInventory)item->getInventoryIndex();
 	sint32 slot = item->getIndexInDB();
 	string debugText = NLMISC::toString("inventory: %s\nslot: %d\n", INVENTORIES::toString(inventory).c_str(), slot);
-	ucstring debugText2;
-	debugText2.fromUtf8(debugText);
-	itemText = debugText2 + itemText;
+	itemText = debugText + itemText;
 #endif
 }
 
@@ -2536,10 +2534,10 @@ void refreshItemHelp(CSheetHelpSetup &setup)
 //				itemText += CI18N::get("uiRingPlotItemDesc");
 //				itemText += mi->Description.empty() ? CI18N::get("uiRingPlotItemEmpty")
 //													: mi->Description;
-//				//itemText += ucstring("\n@{6F6F}") + CI18N::get("uiRingPlotItemComment") + ucstring("\n");
+//				//itemText += "\n@{6F6F}" + CI18N::get("uiRingPlotItemComment") + "\n";
 //				/*
 //				itemText += mi->Comment.empty() ? CI18N::get("uiRingPlotItemEmpty")
-//												: (ucstring("\n") + mi->Comment);
+//												: ("\n" + mi->Comment);
 //												*/
 //			}
 //		}
@@ -2761,9 +2759,9 @@ void refreshMissionHelp(CSheetHelpSetup &setup, const CPrerequisitInfos &infos)
 // ***************************************************************************
 class CPlayerShardNameRemover : public IOnReceiveTextId
 {
-	virtual	void	onReceiveTextId(ucstring &str)
+	virtual	void	onReceiveTextId(std::string &str)
 	{
-		str= CEntityCL::removeShardFromName(str.toUtf8());
+		str= CEntityCL::removeShardFromName(str);
 	}
 };
 static CPlayerShardNameRemover	PlayerShardNameRemover;
@@ -2968,7 +2966,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, string &brickText)
 	if( pBR->getSkill()==SKILLS::unknown )
 	{
 		string::size_type	pos0= brickText.find(killSkill);
-		if(pos0 != ucstring::npos)
+		if(pos0 != string::npos)
 		{
 			string::size_type	pos1= brickText.find(killSkill, pos0 + killSkill.size() );
 			if(pos1 != string::npos)
@@ -3668,7 +3666,7 @@ public:
 			}
 		}
 
-		ucstring str;
+		string str;
 		BOMB_IF( minTimeRemaining < 0, "at least one animal should be dead", return; );
 
 		str += CI18N::get("uittAnimalDeadPopupToolTip");
@@ -3676,7 +3674,7 @@ public:
 		str += toString(minTimeRemaining);
 
 		// replace the context help that is required.
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerAnimalDeadPopupTooltip, "animal_dead_popup_tooltip");
@@ -3800,13 +3798,13 @@ static	void	onMpChangeItemPart(CInterfaceGroup *wnd, uint32 itemSheetId, const s
 	CViewText	*viewText= dynamic_cast<CViewText*>(groupMp->getElement(groupMp->getId()+":text" ));
 	if(viewText)
 	{
-		ucstring	mpCraft;
+		string	mpCraft;
 
 		// add the Origin filter.
 		string	originFilterKey= "iompf" + ITEM_ORIGIN::enumToString((ITEM_ORIGIN::EItemOrigin)itemPart.OriginFilter);
 		mpCraft+= CI18N::get(originFilterKey);
 
-		viewText->setText(mpCraft.toUtf8());
+		viewText->setText(mpCraft);
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 1f8cd61b0..cdd47be2a 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -141,14 +141,14 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 					}
 					else
 					{
-						ucstring customText;
+						string customText;
 						if (!itemInfo.CustomText.empty())
 						{
-							customText = itemInfo.CustomText;
-							strFindReplace(customText, "%mfc", ucstring());
+							customText = itemInfo.CustomText.toUtf8(); // TODO: UTF-8 (serial)
+							strFindReplace(customText, "%mfc", string());
 						}
 
-						editBoxShort->setInputStringAsUtf16(customText);
+						editBoxShort->setInputString(customText);
 						editShort->setActive(true);
 						editBoxShort->setActive(true);
 
@@ -263,14 +263,14 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 						else
 						{
 
-							ucstring customText;
+							string customText;
 							if (!itemInfo.CustomText.empty())
 							{
-								customText = itemInfo.CustomText;
-								strFindReplace(customText, "%mfc", ucstring());
+								customText = itemInfo.CustomText.toUtf8();
+								strFindReplace(customText, "%mfc", string());
 							}
 
-							editBoxShort->setInputStringAsUtf16(customText);
+							editBoxShort->setInputString(customText);
 							editShort->setActive(true);
 							editBoxShort->setActive(true);
 
@@ -407,11 +407,11 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
 		if (group && editShort && editBoxShort && editLarge && editBoxLarge && display && editButtons && closeButton && background)
 		{
 			bool textValid = editShort->getActive();
-			ucstring text = editBoxShort->getInputStringAsUtf16();
+			string text = editBoxShort->getInputString();
 			if (!textValid)
 			{
 				textValid = editLarge->getActive();
-				text = editBoxLarge->getInputStringAsUtf16();
+				text = editBoxLarge->getInputString();
 			}
 			 
 			if (textValid)
@@ -428,7 +428,8 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
 					out.serial(uiInventory);
 					uint32 uiSlot = (uint32)pCSItem->getIndexInDB();
 					out.serial(uiSlot);
-					out.serial(text);
+					ucstring ucText = ucstring::makeFromUtf8(text); // TODO: UTF-8 (serial)
+					out.serial(ucText);
 					NetMngr.push(out);
 					//nlinfo("impulseCallBack : %s %s %d \"%s\" sent", msgName.c_str(), INVENTORIES::toString((INVENTORIES::TInventory)pCSItem->getInventoryIndex()).c_str(), pCSItem->getIndexInDB(), text.toUtf8().c_str());
 				}
@@ -2123,7 +2124,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			{
 				std::string name = groupNames[i];
 				std::string ahParams = "name=" + name;
-				//Use ucstring because group name can contain accentued characters (and stuff like that)
+				//Use utf-8 string because group name can contain accentued characters (and stuff like that)
 				pGroupMenu->addLine(name, "", "", name);
 				CGroupSubMenu* pNewSubMenu = new CGroupSubMenu(CViewBase::TCtorParam());
 				pGroupMenu->setSubMenu(pGroupMenu->getNumLine()-1, pNewSubMenu);
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 73c967bcb..b9c71bc56 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -924,8 +924,8 @@ bool CStringPostProcessRemoveName::cbIDStringReceived(string &inOut)
 		inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(strNewTitle, Woman);
 		{
 			// Sometimes translation contains another title
-			ucstring::size_type pos = inOut.find('$');
-			if (pos != ucstring::npos)
+			string::size_type pos = inOut.find('$');
+			if (pos != string::npos)
 			{
 				inOut = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(inOut), Woman);
 			}
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 16a65e336..489dcbc35 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1692,7 +1692,7 @@ public:
 		if(!ctrlSheet)
 			return;
 
-		ucstring	str(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(CSheetId(ctrlSheet->getSheetId())));
+		string	str(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(CSheetId(ctrlSheet->getSheetId())));
 
 		// According to locked state
 		if(ctrlSheet->getGrayed())
@@ -1700,7 +1700,7 @@ public:
 		else
 			strFindReplace(str, "%comp", CI18N::get("uittPhraseCombatRestrictOK"));
 
-		CWidgetManager::getInstance()->setContextHelpText(str.toUtf8());
+		CWidgetManager::getInstance()->setContextHelpText(str);
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerCombatRestrictTooltip, "phrase_combat_restrict_tooltip");
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 47fda6d00..f23152b8a 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -510,7 +510,7 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 				CViewText	*viewText= dynamic_cast<CViewText*>(itemReqLineGroup->getView(FaberPhraseText));
 				if(viewText)
 				{
-					ucstring	text;
+					string	text;
 					if(mpBuild.RequirementType==CMPBuild::ItemPartReq)
 					{
 						text= CI18N::get("uihelpFaberMpHeader");
@@ -524,7 +524,7 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 					{
 						nlstop;
 					}
-					viewText->setText( text.toUtf8() );
+					viewText->setText(text);
 				}
 
 				// Set as Icon the required MP FaberType / or Sheet Texture (directly...)
@@ -1687,7 +1687,7 @@ void	CActionPhraseFaber::updateItemResult()
 	CViewText	*successView= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(FaberPhraseFpSuccessText));
 	if(successView)
 	{
-		ucstring	text= CI18N::get("uiPhraseFaberSuccessRate");
+		string	text= CI18N::get("uiPhraseFaberSuccessRate");
 		// Get the success rate of the related phrase
 		uint		phraseSlot= pPM->getMemorizedPhrase(_ExecuteFromMemoryLine, _ExecuteFromMemoryIndex);
 
@@ -1725,7 +1725,7 @@ void	CActionPhraseFaber::updateItemResult()
 				+ "@{FFFF})";
 		}
 		strFindReplace(text, "%success", successStr );
-		successView->setTextFormatTaged(text.toUtf8());
+		successView->setTextFormatTaged(text);
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
index 143a71837..649f2bd16 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
@@ -71,10 +71,10 @@ class CHandlerGuildCreate : public IActionHandler
 
 		CGroupEditBox *pDesc = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(guildDescWin));
 
-		ucstring guildName = pGEB->getInputStringAsUtf16();
+		ucstring guildName = pGEB->getInputStringAsUtf16(); // FIXME: UTF-8 (serial)
 
-		ucstring guildDesc;
-		if (pDesc != NULL) guildDesc = pDesc->getInputStringAsUtf16();
+		ucstring guildDesc; // FIXME: UTF-8 (serial)
+		if (pDesc != NULL) guildDesc = pDesc->getInputStringAsUtf16(); // FIXME: UTF-8 (serial)
 
 		uint64 icon = CGuildManager::iconMake((uint8)pCS->getGuildBack(), (uint8)pCS->getGuildSymbol(),
 								pCS->getInvertGuildSymbol(), pCS->getGuildColor1(), pCS->getGuildColor2());
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 13e60fff8..2725eedc9 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -1011,9 +1011,9 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	CViewText *itemNameView = dynamic_cast<CViewText *>(ig->getView("object_name"));
 	if (itemNameView)
 	{
-		ucstring itemName;
+		string itemName;
 		itemName = sheet->getItemActualName();
-		itemNameView->setText(itemName.toUtf8());
+		itemNameView->setText(itemName);
 	}
 
 	// set help for item
@@ -1678,16 +1678,16 @@ void	CBotChatPageTrade::setupFactionPointPrice(bool /* sellMode */, uint default
 		CViewText	*vt= dynamic_cast<CViewText*>(fpGroup->getView("unit_price_header"));
 		if(vt)
 		{
-			ucstring	fmt= CI18N::get("uiUnitFPPrice");
+			string	fmt= CI18N::get("uiUnitFPPrice");
 			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt.toUtf8());
+			vt->setText(fmt);
 		}
 		vt= dynamic_cast<CViewText*>(fpGroup->getView("total_price_header"));
 		if(vt)
 		{
-			ucstring	fmt= CI18N::get("uiTotalFPPrice");
+			string	fmt= CI18N::get("uiTotalFPPrice");
 			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt.toUtf8());
+			vt->setText(fmt);
 		}
 
 		// setup icon according to pvp clan
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 3e99cd8b5..eb79f4211 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -156,14 +156,14 @@ static CInterfaceGroup *buildLineWithCommand(CInterfaceGroup *commandGroup, CVie
 	return group;
 }
 
-static inline bool	isUrlTag(const ucstring &s, ucstring::size_type index, ucstring::size_type textSize)
+static inline bool	isUrlTag(const string &s, string::size_type index, string::size_type textSize)
 {
 	// Format http://, https://
 	// or markdown style (title)[http://..]
 	if(textSize > index+7)
 	{
 		bool markdown = false;
-		ucstring::size_type i = index;
+		string::size_type i = index;
 		// advance index to url section if markdown style link is detected
 		if (s[i] == '(')
 		{
@@ -188,7 +188,7 @@ static inline bool	isUrlTag(const ucstring &s, ucstring::size_type index, ucstri
 
 		if (textSize > i + 7)
 		{
-			bool isUrl = (toLower(s.substr(i, 7)) == ucstring("http://") || toLower(s.substr(i, 8)) == ucstring("https://"));
+			bool isUrl = (toLower(s.substr(i, 7)) == "http://" || toLower(s.substr(i, 8)) == "https://");
 			// match "text http://" and not "texthttp://"
 			if (isUrl && i > 0 && !markdown)
 			{
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.h b/ryzom/client/src/interface_v3/chat_text_manager.h
index 1cf66730e..2cc71dd0e 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.h
+++ b/ryzom/client/src/interface_v3/chat_text_manager.h
@@ -30,7 +30,6 @@ namespace NLGUI
 	class CInterfaceGroup;
 }
 
-class ucstring;
 namespace NLMISC{
 	class CCDBNodeLeaf;
 }
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 816a2016a..e1667839d 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -351,13 +351,6 @@ void CChatWindow::setCommand(const std::string &command, bool execute)
 	_EB->setCommand(command, execute);
 }
 
-void CChatWindow::setCommand(const ucstring &command,bool execute)
-{
-	if (!_EB) return;
-	_EB->setCommand(command.toUtf8(), execute);
-}
-
-
 //=================================================================================
 void CChatWindow::setEntry(const string &entry)
 {
@@ -624,7 +617,7 @@ void CChatGroupWindow::displayMessage(const string &msg, NLMISC::CRGBA col, CCha
 						prefix = (title.empty() ? "" : " ") + title;
 						pos = newmsg.find("] ");
 
-						if (pos == ucstring::npos)
+						if (pos == string::npos)
 							newmsg = prefix + newmsg;
 						else
 							newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
diff --git a/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
index 9a299ebfb..88104e4f9 100644
--- a/ryzom/client/src/interface_v3/chat_window.h
+++ b/ryzom/client/src/interface_v3/chat_window.h
@@ -23,7 +23,6 @@
 #ifndef CL_CHAT_WINDOW_H
 #define CL_CHAT_WINDOW_H
 
-#include "nel/misc/ucstring.h" // REMOVE
 #include "nel/misc/smart_ptr.h"
 
 #include "game_share/chat_group.h"
@@ -109,8 +108,6 @@ public:
 	void enableBlink(uint numBlinks);
 	// set a command to be displayed and eventually executed in this chat window. std::string version for backward compatibility
 	void setCommand(const std::string &command, bool execute);
-	// set a command to be displayed and eventually executed in this chat window
-	void setCommand(const ucstring &command, bool execute); // REMOVE
 	// set a string to be displayed in the edit box of this window (if it has one)
 	void setEntry(const std::string &entry);
 	// Set listener to react to a chat entry
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index dcfdc1fc9..ee01fc913 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -1665,7 +1665,7 @@ void CDBCtrlSheet::setupSBrick ()
 }
 
 // ***************************************************************************
-void CDBCtrlSheet::setupDisplayAsPhrase(const std::vector<NLMISC::CSheetId> &bricks, const ucstring &phraseName)
+void CDBCtrlSheet::setupDisplayAsPhrase(const std::vector<NLMISC::CSheetId> &bricks, const string &phraseName)
 {
 	CSBrickManager		*pBM = CSBrickManager::getInstance();
 
@@ -1718,7 +1718,7 @@ void CDBCtrlSheet::setupDisplayAsPhrase(const std::vector<NLMISC::CSheetId> &bri
 	{
 		// Compute the text from the phrase only if needed
 //		string	iconName= phraseName.toString();
-		string	iconName= phraseName.toUtf8();
+		const string &iconName = phraseName;
 		if( _NeedSetup || iconName != _OptString )
 		{
 			// recompute text
@@ -1741,7 +1741,7 @@ void CDBCtrlSheet::setupSPhrase()
 		CSPhraseSheet *pSPS = dynamic_cast<CSPhraseSheet*>(SheetMngr.get(CSheetId(sheet)));
 		if (pSPS && !pSPS->Bricks.empty())
 		{
-			const ucstring phraseName(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(CSheetId(sheet)));
+			const char *phraseName = STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(CSheetId(sheet));
 			setupDisplayAsPhrase(pSPS->Bricks, phraseName);
 		}
 		else
@@ -1799,7 +1799,7 @@ void CDBCtrlSheet::setupSPhraseId ()
 			}
 			else
 			{
-				setupDisplayAsPhrase(phrase.Bricks, phrase.Name);
+				setupDisplayAsPhrase(phrase.Bricks, phrase.Name.toUtf8()); // FIXME: UTF-8 (serial)
 			}
 		}
 
@@ -3512,11 +3512,11 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 				game = game["game"];
 				game.callMethodByNameNoThrow("updatePhraseTooltip", 1, 1);
 				// retrieve result from stack
-				ucstring tmpHelp;
+				ucstring tmpHelp; // FIXME: Lua UTF-8
 				if (!ls->empty())
 				{
 					CLuaIHM::pop(*ls, tmpHelp); // FIXME: Lua UTF-8
-					help = tmpHelp.toUtf8();
+					help = tmpHelp.toUtf8(); // FIXME: Lua UTF-8
 				}
 				else
 				{
@@ -3537,10 +3537,10 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 		if (phraseSheetID != 0)
 		{
 			// is it a built-in phrase?
-			ucstring desc = STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID));
+			string desc = STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID));
 			if (!desc.empty())
 			{
-				help += ucstring("\n\n@{CCCF}") + desc;
+				help += "\n\n@{CCCF}" + desc;
 			}
 		}
 		*/
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index dfe3b7140..a26a74b22 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -626,7 +626,7 @@ protected:
 	// optSheet is for special faber
 	void setupDisplayAsSBrick(sint32 sheet, sint32 optSheet= 0);
 	// setup icon from phrases
-	void setupDisplayAsPhrase(const std::vector<NLMISC::CSheetId> &bricks, const ucstring &phraseName);
+	void setupDisplayAsPhrase(const std::vector<NLMISC::CSheetId> &bricks, const std::string &phraseName);
 
 	// draw a number and returns the width of the drawn number
 	sint32 drawNumber(sint32 x, sint32 y, sint32 wSheet, sint32 hSheet, NLMISC::CRGBA color, sint32 value, bool rightAlign=true);
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index 4f173088d..cbc183f35 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -296,7 +296,7 @@ void			CDBGroupBuildPhrase::startComposition(const CSPhraseCom &phrase)
 	CSBrickManager		*pBM= CSBrickManager::getInstance();
 
 
-	ucstring	name;
+	string	name;
 
 	// if phrase empty (new phrase), invent a new name
 	if(phrase.empty())
@@ -310,7 +310,7 @@ void			CDBGroupBuildPhrase::startComposition(const CSPhraseCom &phrase)
 	else
 	{
 		// copy name
-		name= phrase.Name;
+		name= phrase.Name.toUtf8();
 
 		// get the root Brick. Must exist.
 		CSBrickSheet	*rootBrick= pBM->getBrick(phrase.Bricks[0]);
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
index 19083e4ee..e0d4654c8 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
@@ -136,13 +136,13 @@ void				CDBGroupListSheetIconPhrase::setSectionGroupId(CInterfaceGroup	*pIG, uin
 	CViewText *name = dynamic_cast<CViewText*>(pIG->getView("name"));
 	if (name != NULL)
 	{
-		ucstring	sectionText= CI18N::get("uiPhraseSectionFmt");
+		string	sectionText= CI18N::get("uiPhraseSectionFmt");
 		uint32	minLevel, maxLevel;
 		CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 		pPM->getPhraseLevelFromSection(sectionId, minLevel, maxLevel);
 		strFindReplace(sectionText, "%min", toString(minLevel));
 		strFindReplace(sectionText, "%max", toString(maxLevel));
-		name->setText (sectionText.toUtf8());
+		name->setText (sectionText);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
index b2781eff6..59913998d 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
@@ -36,7 +36,7 @@ public:
 	// A child node
 	struct	CSheetChildMission : public CDBGroupListSheetText::CSheetChild
 	{
-		virtual void updateText(CDBGroupListSheetText * /* pFather */, ucstring &/* text */) {}
+		//virtual void updateText(CDBGroupListSheetText * /* pFather */, std::string &/* text */) {}
 		virtual CViewText *createViewText() const;
 		virtual void updateViewText(CDBGroupListSheetText *pFather);
 		virtual bool isInvalidated(CDBGroupListSheetText *pFather);
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
index e8ad3a2e8..842cb4ba7 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
@@ -110,11 +110,11 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::init(CDBGroupListS
 
 
 // ***************************************************************************
-bool	hasOnlyBlankChars(const ucstring &str)
+bool hasOnlyBlankChars(const char *str)
 {
-	for(uint i=0;i!=str.size();++i)
+	for (ptrdiff_t i = 0; str[i]; ++i)
 	{
-		if(str[i]!=' ')
+		if (str[i] != ' ')
 			return false;
 	}
 
@@ -128,20 +128,20 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::updateViewText(CDB
 	CSBrickManager	*pBM= CSBrickManager::getInstance();
 	CDBGroupListSheetTextBrickComposition	*compoList= (CDBGroupListSheetTextBrickComposition*)pFather;
 
-	ucstring	text;
+	string	text;
 	if(Ctrl->getType()!=CCtrlSheetInfo::SheetType_SBrick)
 		return;
 
 	// Get the compo description of the phrase (Desc2)
 	CSheetId	brickSheetId= CSheetId(Ctrl->getSheetId());
 	// Temp if the Desc2 is empty, set Name
-	ucstring desc2(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(brickSheetId));
-	if( !desc2.empty() && !hasOnlyBlankChars(desc2))	// tolerate Blank error in translation
-		Text->setText(desc2.toUtf8());
+	const char *desc2(STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(brickSheetId));
+	if( *desc2 && !hasOnlyBlankChars(desc2))	// tolerate Blank error in translation
+		Text->setText(desc2);
 	else
 	{
 		desc2 = STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brickSheetId);
-		Text->setText(desc2.toUtf8());
+		Text->setText(desc2);
 	}
 
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
index cad06e699..80209c99e 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
@@ -168,13 +168,13 @@ void				CDBGroupListSheetTextPhrase::setSectionGroupId(CInterfaceGroup	*pIG, uin
 	CViewText *name = dynamic_cast<CViewText*>(pIG->getView("name"));
 	if (name != NULL)
 	{
-		ucstring	sectionText= CI18N::get("uiPhraseSectionFmt");
+		string	sectionText= CI18N::get("uiPhraseSectionFmt");
 		uint32	minLevel, maxLevel;
 		CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 		pPM->getPhraseLevelFromSection(sectionId, minLevel, maxLevel);
 		strFindReplace(sectionText, "%min", toString(minLevel));
 		strFindReplace(sectionText, "%max", toString(maxLevel));
-		name->setText (sectionText.toUtf8());
+		name->setText (sectionText);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index f8b5d4b56..a09e69801 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -432,7 +432,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						// else display the name of the vendor (not if this is the player himself, to avoid flood)
 						else if (LastSellerType == BOTCHATTYPE::Resale)
 						{
-							text+= "\n" + CI18N::get("uiBotChatVendorTag") + VendorNameString.toUtf8();
+							text+= "\n" + CI18N::get("uiBotChatVendorTag") + VendorNameString;
 						}
 					}
 				}
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
index 5d6e121d5..0678ab145 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
@@ -96,7 +96,7 @@ public:
 		CInterfaceProperty	CurrentVendorNameId;
 		CInterfaceProperty	CurrentFactionType;
 		CInterfaceProperty	CurrentFactionPointPrice;
-		ucstring			VendorNameString;
+		std::string			VendorNameString;
 
 		virtual void init(CDBGroupListSheetText *pFather, uint index);
 		virtual bool isInvalidated(CDBGroupListSheetText *pFather);
diff --git a/ryzom/client/src/interface_v3/group_career.cpp b/ryzom/client/src/interface_v3/group_career.cpp
index 10cfca35e..c04d98841 100644
--- a/ryzom/client/src/interface_v3/group_career.cpp
+++ b/ryzom/client/src/interface_v3/group_career.cpp
@@ -128,7 +128,7 @@ bool CGroupJob::parse (xmlNodePtr /* cur */, CInterfaceGroup * /* parentGroup */
 //		return false;
 //	}
 //
-//	ucstring sTmp = JOBS::jobToUCString(Job);
+//	string sTmp = JOBS::jobToUCString(Job);
 //	for (uint32 i= 0; i < sTmp.size(); ++i)
 //		if (sTmp[i] < 128)
 //			if ( (sTmp[i] >= 'a') && (sTmp[i] <= 'z') )
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index a78c94681..f36e6a637 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -750,8 +750,8 @@ void CGroupCompasMenu::setActive (bool state)
 				/*CEntityCL *entity = EntitiesMngr.entity(UserEntity->selection());
 				if (entity != NULL)
 				{*/
-					//ucstring targetName = CI18N::get("uiTargetTwoPoint") + entity->removeTitleAndShardFromName(entity->getEntityName());
-					std::string targetName = CI18N::get("uiTarget");
+					//string targetName = CI18N::get("uiTargetTwoPoint") + entity->removeTitleAndShardFromName(entity->getEntityName());
+					string targetName = CI18N::get("uiTarget");
 					ct.setType(CCompassTarget::Selection);
 					ct.Name = targetName;
 					Targets.push_back(ct);
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 9f03834c8..ab9f1c6c7 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -472,11 +472,11 @@ void CGroupInSceneBubbleManager::update ()
 				// Send to the around me window
 				// TODO must get the name of the bot etc...
 				/*
-				ucstring finalString = res;
+				string finalString = res;
 				for(;;)
 				{
-					std::string::size_type index = finalString.find (ucstring("{break}"));
-					if (index == ucstring::npos) break;
+					std::string::size_type index = finalString.find ("{break}");
+					if (index == string::npos) break;
 					finalString = finalString.substr (0, index) + finalString.substr(index+7,finalString.size());
 				}
 
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index ee2f6c526..276f248a5 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -212,10 +212,10 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 		entityTitle.clear();
 	}
 
-	ucstring entityTag1 = entity->getTag(1);
-	ucstring entityTag2 = entity->getTag(2);
-	ucstring entityTag3 = entity->getTag(3);
-	ucstring entityTag4 = entity->getTag(4);
+	string entityTag1 = entity->getTag(1);
+	string entityTag2 = entity->getTag(2);
+	string entityTag3 = entity->getTag(3);
+	string entityTag4 = entity->getTag(4);
 
 	string entityPermanentContent = entity->getPermanentStatutIcon();
 
@@ -471,17 +471,17 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				{
 					bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_1"));
 					if (bitmap)
-						bitmap->setTexture(entityTag1.toString());
+						bitmap->setTexture(entityTag1);
 					bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_2"));
 					if (bitmap)
-						bitmap->setTexture(entityTag2.toString());
+						bitmap->setTexture(entityTag2);
 				}
 				bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_3"));
 				if (bitmap)
-					bitmap->setTexture(entityTag3.toString());
+					bitmap->setTexture(entityTag3);
 				bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_4"));
 				if (bitmap)
-					bitmap->setTexture(entityTag4.toString());
+					bitmap->setTexture(entityTag4);
 			}
 
 			// Get the permanent content bitmap
@@ -959,14 +959,14 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 	{
 		_Name->setColor(entityColor);
 		_Name->setModulateGlobalColor(false);
-		ucstring entityName = _Entity->getDisplayName();
+		string entityName = _Entity->getDisplayName();
 		if (entityName.empty())
 			entityName = _Entity->getTitle();
 
 		if (pPlayer != NULL)
 			if (pPlayer->isAFK())
 				entityName += CI18N::get("uiAFK");
-		_Name->setText(entityName.toUtf8());
+		_Name->setText(entityName);
 
 		// Title color get the PVP color
 		if (_Title)
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 8582b938e..45bcf79c2 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -146,7 +146,7 @@ static void popupLandMarkNameDialog()
 	else
 	{
 		NLGUI::CDBManager::getInstance()->getDbProp( "UI:TEMP:LANDMARKTYPE" )->setValue8(cb->getTextPos(CUserLandMark::Misc));
-		eb->setInputStringAsUtf16(ucstring());
+		eb->setInputString(string());
 	}
 
 	CWidgetManager::getInstance()->setCaptureKeyboard(eb);
diff --git a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
index 7d2054fc4..48d3bd8d4 100644
--- a/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
+++ b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
@@ -191,9 +191,9 @@ void	CGroupPhraseSkillFilter::rebuild()
 	uint nCounter = 0;
 
 	// local variable (avoid realloc in loop)
-	vector< pair<string, string> > tempVec(2);
-	ucstring	sSkillName;
-	string		sDBNameSkillValue;
+	// vector< pair<string, string> > tempVec(2);
+	// string		sSkillName;
+	// string		sDBNameSkillValue;
 
 	// Build the hierarchy
 	while ((!bQuit) && (nCounter < 32)) // Counter is used to not infinitly loop
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 39fe7e05e..6d8a0f864 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -1266,7 +1266,7 @@ class CHandlerInvGuildToBag : public IActionHandler
 
 		if (!bPlaceFound)
 		{
-			ucstring msg = CI18N::get("msgCantPutItemInBag");
+			string msg = CI18N::get("msgCantPutItemInBag");
 			string cat = getStringCategory(msg, msg);
 			pIM->displaySystemInfo(msg, cat);
 			return;
diff --git a/ryzom/client/src/interface_v3/interface_ddx.cpp b/ryzom/client/src/interface_v3/interface_ddx.cpp
index 36bd17e62..230b7a2c2 100644
--- a/ryzom/client/src/interface_v3/interface_ddx.cpp
+++ b/ryzom/client/src/interface_v3/interface_ddx.cpp
@@ -351,7 +351,7 @@ void CInterfaceDDX::CParam::updateScrollView(sint32 nVal)
 {
 	if(ResultView)
 	{
-		ResultView->setText(toString(nVal) + ResultUnit.toUtf8());
+		ResultView->setText(toString(nVal) + ResultUnit);
 	}
 }
 
@@ -362,7 +362,7 @@ void CInterfaceDDX::CParam::updateScrollView(double nVal)
 	{
 		// allow N digits
 		string	fmt= toString("%%.%df", ResultDecimal);
-		ResultView->setText(toString(fmt.c_str(), nVal) + ResultUnit.toUtf8());
+		ResultView->setText(toString(fmt.c_str(), nVal) + ResultUnit);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/interface_ddx.h b/ryzom/client/src/interface_v3/interface_ddx.h
index 48f329053..2be1c84b4 100644
--- a/ryzom/client/src/interface_v3/interface_ddx.h
+++ b/ryzom/client/src/interface_v3/interface_ddx.h
@@ -79,7 +79,7 @@ private:
 		// The tex view, result of the scroll
 		CViewTextPtr		ResultView;
 		// The unit to append to the result string
-		ucstring			ResultUnit;
+		std::string			ResultUnit;
 		// For ScrollBarFloat widget only
 		uint8				ResultDecimal;
 		// For ScrollBarFloat widget only
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index aa38b6dbf..3329a2aae 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1527,7 +1527,7 @@ void CInterfaceManager::updateFrameEvents()
 		if ((T0 - _UpdateWeatherTime) > (1 * 3 * 1000))
 		{
 			_UpdateWeatherTime = T0;
-			ucstring str =	CI18N::get ("uiTheSeasonIs") +
+			string str =	CI18N::get ("uiTheSeasonIs") +
 							CI18N::get ("uiSeason"+toStringEnum(computeCurrSeason())) +
 							CI18N::get ("uiAndTheWeatherIs") +
 							CI18N::get (WeatherManager.getCurrWeatherState().LocalizedName) +
@@ -1537,7 +1537,7 @@ void CInterfaceManager::updateFrameEvents()
 
 			CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather"));
 			if (pVT != NULL)
-				pVT->setText(str.toUtf8());
+				pVT->setText(str);
 
 			CCtrlBase *pTooltip= dynamic_cast<CCtrlBase*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:weather_tt"));
 			if (pTooltip != NULL)
@@ -1571,7 +1571,7 @@ void CInterfaceManager::updateFrameEvents()
 
 			pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time"));
 			if (pVT != NULL)
-				pVT->setText(str.toUtf8());
+				pVT->setText(str);
 
 			str.clear();
 			// Update the clock in the compass if enabled.
@@ -1584,7 +1584,7 @@ void CInterfaceManager::updateFrameEvents()
 						str = getTimestampHuman("%I:%M %p");
 					else
 						str = getTimestampHuman("%H:%M");
-					pVT->setText(str.toUtf8());
+					pVT->setText(str);
 				}
 			}
 		}
@@ -2389,7 +2389,7 @@ void CInterfaceManager::processServerIDString()
 }
 
 // ------------------------------------------------------------------------------------------------
-void CInterfaceManager::messageBoxInternal(const string &msgBoxGroup, const ucstring &text, const string &masterGroup, TCaseMode caseMode)
+void CInterfaceManager::messageBoxInternal(const string &msgBoxGroup, const string &text, const string &masterGroup, TCaseMode caseMode)
 {
 	CInterfaceGroup *group= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(masterGroup+":" + msgBoxGroup));
 	CViewText		*viewText= dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(masterGroup+":" + msgBoxGroup + ":text"));
@@ -2397,7 +2397,7 @@ void CInterfaceManager::messageBoxInternal(const string &msgBoxGroup, const ucst
 	if (group && viewText)
 	{
 		viewText->setCaseMode(caseMode);
-		viewText->setText(text.toUtf8());
+		viewText->setText(text);
 		CWidgetManager::getInstance()->enableModalWindow(NULL, group);
 		// don't understand why but need to update coords here
 		group->updateCoords();
@@ -2406,7 +2406,7 @@ void CInterfaceManager::messageBoxInternal(const string &msgBoxGroup, const ucst
 }
 
 // ------------------------------------------------------------------------------------------------
-void	CInterfaceManager::messageBox(const ucstring &text, const string &masterGroup, TCaseMode caseMode)
+void	CInterfaceManager::messageBox(const string &text, const string &masterGroup, TCaseMode caseMode)
 {
 	messageBoxInternal("message_box", text, masterGroup, caseMode);
 }
@@ -2435,7 +2435,7 @@ void CInterfaceManager::messageBoxWithHelp(const std::string &text, const std::s
 
 
 // ------------------------------------------------------------------------------------------------
-void	CInterfaceManager::validMessageBox(TValidMessageIcon icon, const ucstring &text, const std::string &ahOnOk,
+void	CInterfaceManager::validMessageBox(TValidMessageIcon icon, const std::string &text, const std::string &ahOnOk,
 	const std::string &paramsOnOk, const std::string &ahOnCancel, const std::string &paramsOnCancel, const string &masterGroup)
 {
 	CInterfaceGroup *group= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(masterGroup+":valid_message_box"));
@@ -2450,7 +2450,7 @@ void	CInterfaceManager::validMessageBox(TValidMessageIcon icon, const ucstring &
 		CWidgetManager::getInstance()->setProcedureAction("proc_valid_message_box_cancel", 1, ahOnCancel, paramsOnCancel);
 
 		// set text and icon
-		viewText->setText(text.toUtf8());
+		viewText->setText(text);
 		if(viewBitmap)
 		{
 			bool	active= true;
@@ -2978,7 +2978,7 @@ bool CInterfaceManager::deletePlayerKeys (const std::string &playerFileIdent)
 }
 
 // ***************************************************************************
-void CInterfaceManager::log(const ucstring &str, const std::string &cat)
+void CInterfaceManager::log(const std::string &str, const std::string &cat)
 {
 	if (_LogState)
 	{
@@ -2987,7 +2987,7 @@ void CInterfaceManager::log(const ucstring &str, const std::string &cat)
 		FILE *f = nlfopen(fileName, "at");
 		if (f != NULL)
 		{
-			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str.toUtf8();
+			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str;
 			fprintf(f, "%s\n", finalString.c_str());
 			fclose(f);
 		}
@@ -3176,8 +3176,8 @@ struct CEmoteEntry
 			string::size_type pos1 = path1.find('|');
 			string::size_type pos2 = path2.find('|');
 
-			ucstring s1 = toUpper(CI18N::get(path1.substr(0, pos1)));
-			ucstring s2 = toUpper(CI18N::get(path2.substr(0, pos2)));
+			string s1 = toUpper(CI18N::get(path1.substr(0, pos1)));
+			string s2 = toUpper(CI18N::get(path2.substr(0, pos2)));
 
 			sint result = s1.compare(s2);
 			if (result != 0)
@@ -3195,14 +3195,14 @@ struct CEmoteEntry
 	}
 };
 
-static bool translateEmote(const std::string &id, ucstring &translatedName, std::string &commandName, std::string &commandNameAlt)
+static bool translateEmote(const std::string &id, std::string &translatedName, std::string &commandName, std::string &commandNameAlt)
 {
 	if (CI18N::hasTranslation(id))
 	{
 		translatedName = CI18N::get(id);
 
 		// convert command to utf8 since emote translation can have strange chars
-		commandName = toLower(translatedName).toUtf8();
+		commandName = toLower(translatedName);
 
 		// replace all spaces by _
 		while (strFindReplace(commandName, " ", "_"));
@@ -3301,7 +3301,7 @@ void CInterfaceManager::initEmotes()
 		CGroupSubMenu *pMenu = pRootMenu->getRootMenu();
 		nlassert(pMenu);
 
-		ucstring sTranslatedName;
+		std::string sTranslatedName;
 		std::string sCommandName;
 		std::string sCommandNameAlt;
 
@@ -3345,7 +3345,7 @@ void CInterfaceManager::initEmotes()
 					translateEmote(sTmp, sTranslatedName, sCommandName, sCommandNameAlt);
 
 					// Create a line
-					pMenu->addLine (sTranslatedName.toUtf8() + " (/" + sCommandName + ")", "emote",
+					pMenu->addLine (sTranslatedName + " (/" + sCommandName + ")", "emote",
 						"nb="+toString(nEmoteNb)+"|behav="+toString(nBehav), sTmp);
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 91178677d..5206e0513 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -241,7 +241,7 @@ public:
 	// Log system (all chat/tell
 	void setLogState(bool state) { _LogState = state; }
 	bool getLogState() const { return _LogState; }
-	void log(const ucstring &str, const std::string &cat = "");
+	void log(const std::string &str, const std::string &cat = "");
 
 	/// Text from here and from server
 
@@ -305,7 +305,7 @@ public:
 	/** Open a MessageBox. this is a simple ModalWindow with a Ok button
 	 *	ui:interface:message_box must be defined in xml, with a "text" ViewText son
 	 */
-	void	messageBox(const ucstring &text, const std::string &masterGroup="ui:interface", TCaseMode caseMode = CaseFirstSentenceLetterUp);
+	void	messageBox(const std::string &text, const std::string &masterGroup="ui:interface", TCaseMode caseMode = CaseFirstSentenceLetterUp);
 	/** Open a MessageBox. this is a simple ModalWindow with a Ok and a HELP button.
 	 *  The help button with open a browser on ryzom.com faq
 	 *	ui:interface:message_box_with_help must be defined in xml, with a "text" ViewText son
@@ -321,7 +321,7 @@ public:
 	 *	\param ahOnCancel => the action handler to call if cancel is pressed. NB: you don't have to call leave_modal in this ah (auto done).
 	 *	\param paramsOnCancel => params passed to ahOnCancel.
 	 */
-	void	validMessageBox(TValidMessageIcon icon, const ucstring &text, const std::string &ahOnOk, const std::string &paramsOnOk= std::string(),
+	void	validMessageBox(TValidMessageIcon icon, const std::string &text, const std::string &ahOnOk, const std::string &paramsOnOk= std::string(),
 		const std::string &ahOnCancel= std::string(), const std::string &paramsOnCancel= std::string(), const std::string &masterGroup="ui:interface");
 
 	/** Get the current running validMessageBox OnOk action. empty if no validMessageBox currently opened
@@ -446,7 +446,7 @@ public:
 	 */
 	static char* getTimestampHuman(const char* format = "[%H:%M:%S] ");
 
-	/** Parses any tokens in the ucstring like $t$ or $g()$
+	/** Parses any tokens in the utf-8 string like $t$ or $g()$
 	 */
 	static bool parseTokens(std::string& ucstr);
 
@@ -672,7 +672,7 @@ private:
 	CServerToLocalAutoCopy ServerToLocalAutoCopyDMGift;
 
 	// Pop a new message box. If the message box was found, returns a pointer on it
-	void messageBoxInternal(const std::string &msgBoxGroup, const ucstring &text, const std::string &masterGroup, TCaseMode caseMode);
+	void messageBoxInternal(const std::string &msgBoxGroup, const std::string &text, const std::string &masterGroup, TCaseMode caseMode);
 
 	CInterfaceLink::CInterfaceLinkUpdater *interfaceLinkUpdater;
 };
diff --git a/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
index fdb53a0ec..84dbdf785 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_special_effect.cpp
@@ -66,7 +66,7 @@ void CItemSpecialEffectHelper::registerItemSpecialEffect(const string &name)
 		{
 			string tmp = "%";
 			tmp += s[0];
-			if (s.size() >=2 && isdigit(s[1]))
+			if (s.size() >=2 && (uint8)s[1] < (uint8)'\x80' && isdigit(s[1]))
 				tmp += s[1];
 			params.push_back(tmp);
 		}
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index 0e97c73f7..bd2377bcb 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -825,7 +825,7 @@ int CLuaIHMRyzom::validMessageBox(CLuaState &ls)
 	CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
 	CLuaIHM::checkArgType(ls, funcName, 6, LUA_TSTRING);
 	CInterfaceManager *im = CInterfaceManager::getInstance();
-	im->validMessageBox(CInterfaceManager::QuestionIconMsg, msg, ls.toString(2), ls.toString(3), ls.toString(4), ls.toString(5), ls.toString(6));
+	im->validMessageBox(CInterfaceManager::QuestionIconMsg, msg.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4), ls.toString(5), ls.toString(6));
 	return 0;
 }
 
@@ -2889,7 +2889,7 @@ void		CLuaIHMRyzom::messageBox(const ucstring &text)
 {
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBox(text);
+	pIM->messageBox(text.toUtf8());
 }
 
 // ***************************************************************************
@@ -2897,7 +2897,7 @@ void		CLuaIHMRyzom::messageBox(const ucstring &text, const std::string &masterGr
 {
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBox(text, masterGroup);
+	pIM->messageBox(text.toUtf8(), masterGroup);
 }
 
 // ***************************************************************************
@@ -2910,7 +2910,7 @@ void		CLuaIHMRyzom::messageBox(const ucstring &text, const std::string &masterGr
 
 	//H_AUTO(Lua_CLuaIHM_messageBox)
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	pIM->messageBox(text, masterGroup, (TCaseMode) caseMode);
+	pIM->messageBox(text.toUtf8(), masterGroup, (TCaseMode) caseMode);
 }
 
 // ***************************************************************************
@@ -3652,7 +3652,7 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 				CInterfaceManager *im = CInterfaceManager::getInstance();
 				w->setKeyboardFocus();
 				w->enableBlink(1);
-				w->setCommand(ucstring("tell ") + CEntityCL::removeTitleFromName(player.toUtf8()) + ucstring(" "), false);
+				w->setCommand("tell " + CEntityCL::removeTitleFromName(player.toUtf8()) + " ", false);
 				CGroupEditBox *eb = w->getEditBox();
 
 				if (eb != NULL)
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 98432cdb8..d1c43d897 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -3201,7 +3201,7 @@ NLMISC_COMMAND(party_chat, "Create a new party chat", "<party_chat_name>")
 		return true;
 	}
 	CPeopleInterraction &pi = PeopleInterraction;
-	ucstring title = args[0];
+	string title = args[0];
 
 	if (!pi.testValidPartyChatName(title))
 	{
@@ -3221,16 +3221,16 @@ NLMISC_COMMAND(remove_party_chat, "Remove a party chat", "<party_chat_name>")
 		displayVisibleSystemMsg(CI18N::get("uiRemovePartyChatCmd"));
 		return true;
 	}
-	ucstring title = ucstring(args[0]);
+	string title = ucstring(args[0]);
 	CChatWindow *chat = getChatWndMgr().getChatWindow(title);
 	if (!chat)
 	{
-		displayVisibleSystemMsg(title + ucstring(" : ") + CI18N::get("uiBadPartyChatName"));
+		displayVisibleSystemMsg(title + " : " + CI18N::get("uiBadPartyChatName"));
 		return true;
 	}
 	if (!PeopleInterraction.removePartyChat(chat))
 	{
-		displayVisibleSystemMsg(title + ucstring(" : ") + CI18N::get("uiCantRemovePartyChat"));
+		displayVisibleSystemMsg(title + " : " + CI18N::get("uiCantRemovePartyChat"));
 		return true;
 	}
 	return true;
diff --git a/ryzom/client/src/interface_v3/sbrick_manager.cpp b/ryzom/client/src/interface_v3/sbrick_manager.cpp
index a2cecf2d4..780b1301c 100644
--- a/ryzom/client/src/interface_v3/sbrick_manager.cpp
+++ b/ryzom/client/src/interface_v3/sbrick_manager.cpp
@@ -486,7 +486,7 @@ void			CSBrickManager::compileBrickProperties()
 								k++;
 							}
 							// Param Id modifier? (ie read not the 0th value, but the 1th etc... up to 9)
-							else if(k<textSize && isdigit(text[k]))
+							else if(k<textSize && (uint8)text[k] < (uint8)'\x80' && isdigit(text[k]))
 							{
 								char	tp[2];
 								tp[0]= (char)text[k];
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index cf4950fdd..379d34c00 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -3840,14 +3840,14 @@ void				CSPhraseManager::computePhraseProgression()
 			// replace each number with 001 format. toLower
 			for(uint k=0;k<pse.Text.size();k++)
 			{
-				if((unsigned char)pse.Text[k] < 0x80 && isalpha(pse.Text[k]))
+				if((uint8)pse.Text[k] < (uint8)'\x80' && isalpha(pse.Text[k]))
 					pse.Text[k]= tolower(pse.Text[k]); // FIXME: toLowerAscii
-				else if((unsigned char)pse.Text[k] < 0x80 && isdigit(pse.Text[k]))
+				else if((uint8)pse.Text[k] < (uint8)'\x80' && isdigit(pse.Text[k]))
 				{
 					uint32	number= 0;
 					uint32	start= k;
 					// get the whole number
-					for(;k<pse.Text.size() && isdigit(pse.Text[k]);k++)
+					for(;k<pse.Text.size() && (uint8)pse.Text[k] < (uint8)'\x80' && isdigit(pse.Text[k]);k++)
 					{
 						number*=10;
 						number+= pse.Text[k] - '0';
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index c9b47e6a3..a9da5b1e8 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -4244,7 +4244,7 @@ sint CEditor::getGeneratedNameIndex(const std::string &nameUtf8, const std::stri
 			{
 				++ strIt;
 				const char *numberStart = &*strIt;
-				for (; strIt != endStrIt && isdigit(*strIt); ++strIt) {}
+				for (; strIt != endStrIt && (uint8)(*strIt) < (uint8)'\x80' && isdigit(*strIt); ++strIt) {}
 				if (strIt == endStrIt)
 				{
 					sint ret;
@@ -4266,7 +4266,7 @@ bool CEditor::isPostFixedByNumber(const ucstring &baseName)
 	while (lastIndex > 0)
 	{
 		int currChar = (int) baseName[lastIndex];
-		if (!isdigit(currChar) &&
+		if (((uint8)currChar >= (uint8)'\x80' || !isdigit(currChar)) &&
 			currChar != ' ' &&
 			currChar != '\t')
 		{
@@ -4289,7 +4289,7 @@ ucstring CEditor::genInstanceName(const ucstring &baseName)
 	while (lastIndex > 0)
 	{
 		int currChar = (int) strippedName[lastIndex];
-		if (!isdigit(currChar) &&
+		if (((uint8)currChar >= (uint8)'\x80' || !isdigit(currChar)) &&
 			currChar != ' ' &&
 			currChar != '\t')
 		{
diff --git a/ryzom/client/src/zone_util.cpp b/ryzom/client/src/zone_util.cpp
index d7da6810c..0f2a84636 100644
--- a/ryzom/client/src/zone_util.cpp
+++ b/ryzom/client/src/zone_util.cpp
@@ -44,7 +44,7 @@ bool getPosFromZoneName(const std::string &name,NLMISC::CVector2f &dest)
 	uint32 i = 0;
 	while (zoneName[i] != '_')
 	{
-		if (!::isdigit(zoneName[i])) return false;
+		if ((uint8)zoneName[i] >= (uint8)'\x80' || !::isdigit(zoneName[i])) return false;
 		yStr += zoneName[i]; ++i;
 		if (i == zoneName.size())
 			return false;
@@ -52,7 +52,7 @@ bool getPosFromZoneName(const std::string &name,NLMISC::CVector2f &dest)
 	++i;
 	while (i < zoneName.size())
 	{
-		if (!::isalpha(zoneName[i])) return false;
+		if ((uint8)zoneName[i] >= (uint8)'\x80' || !::isalpha(zoneName[i])) return false;
 		xStr += (char) NLMISC::toUpper(zoneName[i]); ++i;
 	}
 	if (xStr.size() != 2) return false;
@@ -80,7 +80,7 @@ bool getZonePosFromZoneName(const std::string &name, sint &x, sint &y)
 	uint32 i = 0;
 	while (zoneName[i] != '_')
 	{
-		if (!::isdigit(zoneName[i])) return false;
+		if ((uint8)zoneName[i] >= (uint8)'\x80' || !::isdigit(zoneName[i])) return false;
 		yStr += zoneName[i]; ++i;
 		if (i == zoneName.size())
 			return false;
@@ -88,7 +88,7 @@ bool getZonePosFromZoneName(const std::string &name, sint &x, sint &y)
 	++i;
 	while (i < zoneName.size())
 	{
-		if (!::isalpha(zoneName[i])) return false;
+		if ((uint8)zoneName[i] >= (uint8)'\x80' || !::isalpha(zoneName[i])) return false;
 		xStr += (char) NLMISC::toUpper(zoneName[i]); ++i;
 	}
 	if (xStr.size() != 2) return false;
diff --git a/ryzom/common/src/game_share/character_title.h b/ryzom/common/src/game_share/character_title.h
index 5ad8c3c10..bae0c2a4b 100644
--- a/ryzom/common/src/game_share/character_title.h
+++ b/ryzom/common/src/game_share/character_title.h
@@ -301,9 +301,9 @@ inline ECharacterTitle getGMTitleFromPriv (const std::string& priv)
 
 
 //----------------------------------------------------------------------
-inline bool isCsrTitle(const ucstring& title)
+inline bool isCsrTitle(const std::string& title)
 {
-	ECharacterTitle titleEnum = toCharacterTitle( title.toUtf8() );
+	ECharacterTitle titleEnum = toCharacterTitle( title );
 	bool bIsCsrTitle = (titleEnum >= SGM && titleEnum <= CM);
 
 	return bIsCsrTitle;
diff --git a/ryzom/common/src/game_share/utils.h b/ryzom/common/src/game_share/utils.h
index cb22574a4..eb527162f 100644
--- a/ryzom/common/src/game_share/utils.h
+++ b/ryzom/common/src/game_share/utils.h
@@ -44,7 +44,11 @@ inline std::string capitalize(const std::string & s)
 	if ( s.empty() )
 		return s;
 
-	return NLMISC::toUpper( s.substr(0,1) ) + NLMISC::toLower( s.substr(1,std::string::npos) );
+	std::string res;
+	res.reserve(4);
+	ptrdiff_t i = 0;
+	NLMISC::appendToUpper(res, s, i);
+	return res + NLMISC::toLower(s.substr(i));
 }
 
 inline ucstring capitalize(const ucstring & s)
@@ -52,7 +56,8 @@ inline ucstring capitalize(const ucstring & s)
 	if ( s.empty() )
 		return s;
 
-	return NLMISC::toUpper( s.substr(0,1) ) + NLMISC::toLower( s.substr(1,std::string::npos) );
+	// return NLMISC::toUpper( s.substr(0,1) ) + NLMISC::toLower( s.substr(1,std::string::npos) );
+	return ucstring::makeFromUtf8(capitalize(s.toUtf8()));
 }
 
 

From ffa6179b827e506d2d7ebd480a4bbcf287dd1b43 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 12:59:09 +0800
Subject: [PATCH 135/292] Alternative 7-bit upper- and lowercase

---
 nel/include/nel/misc/common.h | 12 +++++
 nel/src/misc/common.cpp       | 91 ++++++++++++++++++++++++++++++++++-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 1e99b5e70..12ad31ceb 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -267,6 +267,18 @@ void toLowerAscii(char *str, char replacement);
 std::string toUpperAscii(const std::string &str, char replacement);
 void toUpperAscii(char *str, char replacement);
 
+/** ASCII to lowercase. Useful for internal identifiers.
+* Characters outside of the 7-bit ASCII space are not affected.
+*/
+std::string toLowerAscii(const std::string &str);
+void toLowerAscii(char *str);
+
+/** ASCII to uppercase. Useful for internal identifiers.
+* Characters outside of the 7-bit ASCII space are not affected.
+*/
+std::string toUpperAscii(const std::string &str);
+void toUpperAscii(char *str);
+
 /**
  *  Convert to an hexadecimal std::string
  */
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index fce6af69c..2cdec50c8 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -577,7 +577,6 @@ uint32 fromHumanReadable (const std::string &str)
 	return 0;
 }
 
-
 NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human readable time", "<int>")
 {
 	nlunreferenced(rawCommandString);
@@ -594,6 +593,50 @@ NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human rea
 	return true;
 }
 
+NLMISC_CATEGORISED_COMMAND(nel, toLower, "Convert a string to lowercase", "<string>")
+{
+	nlunreferenced(args);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
+	log.displayNL("%s", toLower(rawCommandString).c_str());
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(nel, toUpper, "Convert a string to uppercase", "<string>")
+{
+	nlunreferenced(args);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
+	log.displayNL("%s", toUpper(rawCommandString).c_str());
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(nel, toLowerAscii, "Convert a string's ascii-characters to lowercase", "<string>")
+{
+	nlunreferenced(args);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
+	log.displayNL("%s", toLowerAscii(rawCommandString).c_str());
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(nel, toUpperAscii, "Convert a string's ascii-characters to uppercase", "<string>")
+{
+	nlunreferenced(args);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
+	log.displayNL("%s", toUpperAscii(rawCommandString).c_str());
+
+	return true;
+}
+
 #if 0
 
 std::string toLower(const char *str)
@@ -739,6 +782,52 @@ void toUpperAscii(char *str, char replacement)
 	}
 }
 
+std::string toLowerAscii(const std::string &str)
+{
+	std::string res;
+	res.reserve(str.size());
+	for (std::string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+	{
+		char c = *it;
+		if (c >= 'A' && c <= 'Z') res += c + ('a' - 'A');
+		else res += c;
+	}
+	return res;
+}
+
+void toLowerAscii(char *str)
+{
+	for (ptrdiff_t i = 0; str[i]; ++i)
+	{
+		char c = str[i];
+		if (c >= 'A' && c <= 'Z') str[i] = c + ('a' - 'A');
+		else str[i] = c;
+	}
+}
+
+std::string toUpperAscii(const std::string &str)
+{
+	std::string res;
+	res.reserve(str.size());
+	for (std::string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+	{
+		char c = *it;
+		if (c >= 'a' && c <= 'z') res += c - ('a' - 'A');
+		else res += c;
+	}
+	return res;
+}
+
+void toUpperAscii(char *str)
+{
+	for (ptrdiff_t i = 0; str[i]; ++i)
+	{
+		char c = str[i];
+		if (c >= 'a' && c <= 'z') str[i] = c - ('a' - 'A');
+		else str[i] = c;
+	}
+}
+
 std::string toHexa(const uint8 &b)
 {
 	return toString("%02hhx", b);

From 281630c28080e0087ad178eca5d87cc8854e4c30 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 13:44:44 +0800
Subject: [PATCH 136/292] Use the simplified toLower for identifiers and
 filenames

---
 nel/include/nel/georges/form_elm.h            |  2 +-
 nel/src/3d/animation_set.cpp                  |  2 +-
 nel/src/3d/async_texture_manager.cpp          |  2 +-
 nel/src/3d/coarse_mesh_build.cpp              |  4 +-
 nel/src/3d/driver.cpp                         |  4 +-
 nel/src/3d/driver/opengl/driver_opengl.cpp    |  2 +-
 nel/src/3d/hls_texture_bank.cpp               |  2 +-
 nel/src/3d/hls_texture_manager.cpp            |  2 +-
 nel/src/3d/instance_lighter.cpp               |  2 +-
 nel/src/3d/landscapeig_manager.cpp            |  2 +-
 nel/src/3d/packed_zone.cpp                    |  2 +-
 nel/src/3d/scene.cpp                          |  4 +-
 nel/src/3d/scene_group.cpp                    |  6 +--
 nel/src/3d/shape_bank.cpp                     | 22 +++++------
 nel/src/3d/shape_info.cpp                     |  2 +-
 nel/src/3d/texture_file.cpp                   |  2 +-
 nel/src/3d/tile_bank.cpp                      |  4 +-
 nel/src/georges/form.cpp                      |  2 +-
 nel/src/georges/form_dfn.cpp                  |  4 +-
 nel/src/georges/form_loader.cpp               |  6 +--
 nel/src/gui/action_handler.cpp                |  6 +--
 nel/src/gui/css_parser.cpp                    | 10 ++---
 nel/src/gui/css_selector.cpp                  |  8 ++--
 nel/src/gui/css_style.cpp                     | 28 +++++++-------
 nel/src/gui/ctrl_base.cpp                     |  2 +-
 nel/src/gui/ctrl_base_button.cpp              |  6 +--
 nel/src/gui/ctrl_button.cpp                   |  6 +--
 nel/src/gui/ctrl_col_pick.cpp                 |  4 +-
 nel/src/gui/ctrl_scroll.cpp                   |  6 +--
 nel/src/gui/ctrl_text_button.cpp              |  6 +--
 nel/src/gui/dbgroup_combo_box.cpp             |  3 +-
 nel/src/gui/group_editbox.cpp                 |  2 +-
 nel/src/gui/group_html.cpp                    | 28 +++++++-------
 nel/src/gui/html_parser.cpp                   | 10 ++---
 nel/src/gui/http_hsts.cpp                     |  2 +-
 nel/src/gui/interface_anim.cpp                |  2 +-
 nel/src/gui/interface_group.cpp               |  2 +-
 nel/src/gui/interface_options.cpp             |  4 +-
 nel/src/gui/interface_parser.cpp              | 16 ++++----
 nel/src/gui/libwww.cpp                        |  4 +-
 nel/src/gui/url_parser.cpp                    |  2 +-
 nel/src/gui/view_pointer.cpp                  | 26 ++++++-------
 nel/src/gui/view_renderer.cpp                 | 16 ++++----
 nel/src/ligo/primitive_class.cpp              |  8 ++--
 nel/src/ligo/primitive_configuration.cpp      |  6 +--
 nel/src/misc/big_file.cpp                     | 10 ++---
 nel/src/misc/command.cpp                      |  8 ++--
 nel/src/misc/common.cpp                       |  4 +-
 nel/src/misc/i18n.cpp                         |  8 ++--
 nel/src/misc/i_xml.cpp                        |  2 +-
 nel/src/misc/path.cpp                         | 34 ++++++++---------
 nel/src/misc/sheet_id.cpp                     | 10 ++---
 nel/src/misc/streamed_package.cpp             |  2 +-
 nel/src/misc/streamed_package_manager.cpp     |  2 +-
 nel/src/misc/string_common.cpp                |  2 +-
 nel/src/misc/system_info.cpp                  |  4 +-
 nel/src/net/email.cpp                         |  2 +-
 nel/src/net/service.cpp                       |  2 +-
 nel/src/sound/audio_decoder.cpp               |  4 +-
 nel/src/sound/audio_mixer_user.cpp            |  2 +-
 nel/src/sound/group_controller_root.cpp       |  2 +-
 ryzom/client/src/animation_fx.cpp             |  2 +-
 ryzom/client/src/auto_anim.cpp                |  2 +-
 ryzom/client/src/character_cl.cpp             | 22 +++++------
 ryzom/client/src/client.cpp                   |  2 +-
 ryzom/client/src/client_cfg.cpp               |  4 +-
 .../client_sheets/automaton_list_sheet.cpp    |  6 +--
 .../src/client_sheets/character_sheet.cpp     | 10 ++---
 ryzom/client/src/client_sheets/item_sheet.cpp | 20 +++++-----
 .../client_sheets/outpost_building_sheet.cpp  |  8 ++--
 .../client/src/client_sheets/player_sheet.cpp |  4 +-
 .../client/src/client_sheets/sbrick_sheet.cpp | 14 +++----
 ryzom/client/src/commands.cpp                 |  8 ++--
 ryzom/client/src/connection.cpp               |  6 +--
 ryzom/client/src/continent.cpp                |  6 +--
 ryzom/client/src/continent_manager.cpp        |  4 +-
 ryzom/client/src/door_manager.cpp             |  8 ++--
 ryzom/client/src/entity_animation_manager.cpp |  2 +-
 ryzom/client/src/ground_fx_manager.cpp        |  2 +-
 ryzom/client/src/hair_set.cpp                 |  2 +-
 ryzom/client/src/ig_callback.cpp              |  2 +-
 ryzom/client/src/init.cpp                     |  6 +--
 .../src/interface_v3/bot_chat_page_trade.cpp  |  2 +-
 .../client/src/interface_v3/character_3d.cpp  |  2 +-
 .../src/interface_v3/chat_text_manager.cpp    |  4 +-
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 37 ++++++++++---------
 .../interface_v3/dbgroup_list_sheet_trade.cpp |  2 +-
 .../client/src/interface_v3/group_compas.cpp  |  4 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  8 ++--
 .../client/src/interface_v3/guild_manager.cpp |  4 +-
 .../src/interface_v3/interface_3d_scene.cpp   | 12 +++---
 .../src/interface_v3/interface_manager.cpp    |  4 +-
 .../src/interface_v3/inventory_manager.cpp    |  2 +-
 .../interface_v3/item_consumable_effect.cpp   | 16 ++++----
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |  2 +-
 .../client/src/interface_v3/music_player.cpp  |  4 +-
 .../src/interface_v3/people_interraction.cpp  |  2 +-
 ryzom/client/src/interface_v3/people_list.cpp |  4 +-
 .../src/interface_v3/sbrick_manager.cpp       |  4 +-
 .../src/interface_v3/view_bitmap_faber_mp.cpp |  2 +-
 ryzom/client/src/interface_v3/view_radar.cpp  |  4 +-
 ryzom/client/src/login_patch.cpp              |  2 +-
 ryzom/client/src/mesh_camera_col_manager.cpp  |  2 +-
 ryzom/client/src/net_manager.cpp              |  4 +-
 ryzom/client/src/outpost.cpp                  |  2 +-
 ryzom/client/src/pacs_client.cpp              |  4 +-
 ryzom/client/src/player_cl.cpp                |  2 +-
 ryzom/client/src/sky.cpp                      |  2 +-
 ryzom/client/src/streamable_ig.cpp            | 10 ++---
 ryzom/client/src/string_manager_client.cpp    | 10 ++---
 ryzom/client/src/teleport.cpp                 |  2 +-
 ryzom/common/src/game_share/ecosystem.cpp     | 16 ++++----
 ryzom/common/src/game_share/fame.cpp          |  8 ++--
 ryzom/common/src/game_share/guild_grade.cpp   |  2 +-
 .../src/game_share/guild_grade_inline.h       |  2 +-
 ryzom/common/src/game_share/people_pd.cpp     |  4 +-
 .../common/src/game_share/people_pd_inline.h  |  4 +-
 ryzom/common/src/game_share/pvp_clan.cpp      |  4 +-
 ryzom/common/src/game_share/season.cpp        |  2 +-
 ryzom/common/src/game_share/season_inline.h   |  2 +-
 .../src/game_share/server_edition_module.cpp  |  6 +--
 ryzom/common/src/game_share/sp_type.cpp       |  2 +-
 ryzom/common/src/game_share/sp_type_inline.h  |  2 +-
 .../time_weather_season/weather_manager.cpp   |  4 +-
 .../weather_setup_sheet_base.cpp              |  6 +--
 ryzom/tools/client/client_patcher/main.cpp    |  2 +-
 126 files changed, 376 insertions(+), 378 deletions(-)

diff --git a/nel/include/nel/georges/form_elm.h b/nel/include/nel/georges/form_elm.h
index bf9b3ef62..6795ad328 100644
--- a/nel/include/nel/georges/form_elm.h
+++ b/nel/include/nel/georges/form_elm.h
@@ -631,7 +631,7 @@ inline bool CFormElm::convertValue (bool &result, const std::string &value) cons
 	}
 	else
 	{
-		std::string temp = NLMISC::toLower(value);
+		std::string temp = NLMISC::toLowerAscii(value);
 		if (strcmp (temp.c_str (), "true") == 0)
 		{
 			result  = true;
diff --git a/nel/src/3d/animation_set.cpp b/nel/src/3d/animation_set.cpp
index 0b4c096c0..462587b09 100644
--- a/nel/src/3d/animation_set.cpp
+++ b/nel/src/3d/animation_set.cpp
@@ -289,7 +289,7 @@ void	CAnimationSet::preloadSSSShapes(IDriver &drv, CShapeBank &shapeBank)
 	std::set<std::string>::iterator		it;
 	for(it=_SSSShapes.begin();it!=_SSSShapes.end();it++)
 	{
-		string	fileName= toLower(*it);
+		string	fileName= toLowerAscii(*it);
 
 		// link the shape to the shapeCache
 		shapeBank.linkShapeToShapeCache(fileName, shapeCacheName);
diff --git a/nel/src/3d/async_texture_manager.cpp b/nel/src/3d/async_texture_manager.cpp
index a962c9991..22c4969ea 100644
--- a/nel/src/3d/async_texture_manager.cpp
+++ b/nel/src/3d/async_texture_manager.cpp
@@ -151,7 +151,7 @@ uint			CAsyncTextureManager::addTextureRef(const string &textNameNotLwr, CMeshBa
 	uint	ret;
 
 	// lower case name
-	string	textName = toLower(textNameNotLwr);
+	string	textName = toLowerAscii(textNameNotLwr);
 
 	// find the texture in map
 	ItTextureEntryMap	it;
diff --git a/nel/src/3d/coarse_mesh_build.cpp b/nel/src/3d/coarse_mesh_build.cpp
index 966f389b4..e89c8da8d 100644
--- a/nel/src/3d/coarse_mesh_build.cpp
+++ b/nel/src/3d/coarse_mesh_build.cpp
@@ -117,7 +117,7 @@ bool CCoarseMeshBuild::buildBitmap (const std::vector<CCoarseMeshDesc>& coarseMe
 						if (texture->supportSharing())
 						{
 							// Get sharing name
-							name+=toLower(texture->getShareName());
+							name+=toLowerAscii(texture->getShareName());
 						}
 						else
 						{
@@ -477,7 +477,7 @@ void CCoarseMeshBuild::remapCoordinates (const std::vector<CCoarseMeshDesc>& coa
 						if (texture->supportSharing())
 						{
 							// Get sharing name
-							name+=toLower(texture->getShareName());
+							name+=toLowerAscii(texture->getShareName());
 						}
 						else
 						{
diff --git a/nel/src/3d/driver.cpp b/nel/src/3d/driver.cpp
index 32cd19a89..71600d3c9 100644
--- a/nel/src/3d/driver.cpp
+++ b/nel/src/3d/driver.cpp
@@ -291,7 +291,7 @@ bool			IDriver::invalidateShareTexture (ITexture &texture)
 void			IDriver::getTextureShareName (const ITexture& tex, string &output)
 {
 	// Create the shared Name.
-	output= toLower(tex.getShareName());
+	output= toLowerAscii(tex.getShareName());
 
 	// append format Id of the texture.
 	static char	fmt[256];
@@ -372,7 +372,7 @@ void IDriver::profileTextureUsage(std::vector<std::string> &result)
 		// get the shareName
 		string	shareName;
 		if(text->supportSharing())
-			shareName= toLower(text->getShareName());
+			shareName= toLowerAscii(text->getShareName());
 		else
 			shareName= "Not Shared";
 
diff --git a/nel/src/3d/driver/opengl/driver_opengl.cpp b/nel/src/3d/driver/opengl/driver_opengl.cpp
index 90b17958f..6fe9ae7c4 100644
--- a/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -2583,7 +2583,7 @@ void CDriverGL::retrieveATIDriverVersion()
 				result = RegQueryValueExA(subKey, "DriverDesc", NULL, &valueType, (unsigned char *) driverDesc, &driverDescBufSize);
 				if (result == ERROR_SUCCESS && valueType == REG_SZ)
 				{
-					toLower(driverDesc);
+					toLowerAscii(driverDesc);
 					if (strstr(driverDesc, "radeon")) // is it a radeon card ?
 					{
 						char driverVersion[256];
diff --git a/nel/src/3d/hls_texture_bank.cpp b/nel/src/3d/hls_texture_bank.cpp
index b741ec387..9077f1638 100644
--- a/nel/src/3d/hls_texture_bank.cpp
+++ b/nel/src/3d/hls_texture_bank.cpp
@@ -59,7 +59,7 @@ uint32			CHLSTextureBank::addColorTexture(const CHLSColorTexture &tex)
 // ***************************************************************************
 void			CHLSTextureBank::addTextureInstance(const std::string &name, uint32 colorTextureId, const vector<CHLSColorDelta> &cols)
 {
-	string	nameLwr= toLower(name);
+	string	nameLwr= toLowerAscii(name);
 
 	// checks
 	nlassert(colorTextureId<_ColorTextures.size());
diff --git a/nel/src/3d/hls_texture_manager.cpp b/nel/src/3d/hls_texture_manager.cpp
index 586ec53ce..3f585eb6b 100644
--- a/nel/src/3d/hls_texture_manager.cpp
+++ b/nel/src/3d/hls_texture_manager.cpp
@@ -76,7 +76,7 @@ sint			CHLSTextureManager::findTexture(const std::string &name) const
 		return -1;
 
 	// Build a valid key.
-	string	nameLwr= toLower(name);
+	string	nameLwr= toLowerAscii(name);
 	CHLSTextureBank::CTextureInstance		textKey;
 	CHLSTextureBank::CTextureInstanceHandle	textKeyHandle;
 	textKey.buildAsKey(nameLwr.c_str());
diff --git a/nel/src/3d/instance_lighter.cpp b/nel/src/3d/instance_lighter.cpp
index 87e0deb45..a08a0a38f 100644
--- a/nel/src/3d/instance_lighter.cpp
+++ b/nel/src/3d/instance_lighter.cpp
@@ -415,7 +415,7 @@ void CInstanceLighter::light (const CInstanceGroup &igIn, CInstanceGroup &igOut,
 		string name= _Instances[i].Name;
 		bool	shapeFound= true;
 
-		if (toLower (CFile::getExtension (name)) == "pacs_prim")
+		if (toLowerAscii (CFile::getExtension (name)) == "pacs_prim")
 		{
 			nlwarning("EXPORT BUG: Can't read %s (not a shape), should not be part of .ig!", name.c_str());
 			continue;
diff --git a/nel/src/3d/landscapeig_manager.cpp b/nel/src/3d/landscapeig_manager.cpp
index 10eab0f60..d2b276f8a 100644
--- a/nel/src/3d/landscapeig_manager.cpp
+++ b/nel/src/3d/landscapeig_manager.cpp
@@ -129,7 +129,7 @@ void	CLandscapeIGManager::initIG(UScene *scene, const std::string &igDesc, UDriv
 							_ig.getShapeName(i, shapeName);
 							if (!shapeName.empty ())
 							{
-								if (toLower(CFile::getExtension(shapeName)) != "pacs_prim")
+								if (toLowerAscii(CFile::getExtension(shapeName)) != "pacs_prim")
 								{
 									// Insert a new shape ?
 									if (_ShapeAdded.find(shapeName) == _ShapeAdded.end())
diff --git a/nel/src/3d/packed_zone.cpp b/nel/src/3d/packed_zone.cpp
index f1cb7426b..fc8fa9a8a 100644
--- a/nel/src/3d/packed_zone.cpp
+++ b/nel/src/3d/packed_zone.cpp
@@ -665,7 +665,7 @@ void CPackedZone32::build(std::vector<const CTessFace*> &leaves,
 		{
 			CMatrix instanceMatrix;
 			igs[k]->getInstanceMatrix(l, instanceMatrix);
-			if (NLMISC::toLower(NLMISC::CFile::getExtension(igs[k]->getShapeName(l))) == "pacs_prim") continue;
+			if (NLMISC::toLowerAscii(NLMISC::CFile::getExtension(igs[k]->getShapeName(l))) == "pacs_prim") continue;
 			std::string stdShapeName = standardizeShapeName(igs[k]->getShapeName(l));
 			TShapeCache::const_iterator it = shapeCache.find(stdShapeName);
 			if (it != shapeCache.end())
diff --git a/nel/src/3d/scene.cpp b/nel/src/3d/scene.cpp
index 15173d7d9..651837e2c 100644
--- a/nel/src/3d/scene.cpp
+++ b/nel/src/3d/scene.cpp
@@ -793,7 +793,7 @@ CTransformShape	*CScene::createInstance(const string &shapeName)
 			if (pMB->getAutoAnim())
 			{
 
-				std::string animName = toLower(CFile::getFilenameWithoutExtension(shapeName));
+				std::string animName = toLowerAscii(CFile::getFilenameWithoutExtension(shapeName));
 				uint animID = _AutomaticAnimationSet->getAnimationIdByName(animName);
 				if (animID != CAnimationSet::NotFound)
 				{
@@ -833,7 +833,7 @@ void CScene::createInstanceAsync(const string &shapeName, CTransformShape **pIns
 	if (_ShapeBank->getPresentState( shapeName ) != CShapeBank::Present)
 	{
 		// Load it from file asynchronously
-		_ShapeBank->loadAsync( toLower(shapeName), getDriver(), position, NULL, selectedTexture);
+		_ShapeBank->loadAsync( toLowerAscii(shapeName), getDriver(), position, NULL, selectedTexture);
 	}
 }
 
diff --git a/nel/src/3d/scene_group.cpp b/nel/src/3d/scene_group.cpp
index dc5dd9f73..131f5feaf 100644
--- a/nel/src/3d/scene_group.cpp
+++ b/nel/src/3d/scene_group.cpp
@@ -607,7 +607,7 @@ void CInstanceGroup::getShapeName (uint instanceIndex, std::string &shapeName) c
 		shapeName = _TransformName->transformName (instanceIndex, rInstanceInfo.InstanceName, rInstanceInfo.Name);
 	}
 
-	toLower(shapeName);
+	toLowerAscii(shapeName);
 	if (!shapeName.empty() && shapeName.find('.') == std::string::npos)
 		shapeName += ".shape";
 }
@@ -860,7 +860,7 @@ bool CInstanceGroup::addToSceneAsync (CScene& scene, IDriver *driver, uint selec
 				shapeName = _TransformName->transformName (i, rInstanceInfo.InstanceName, rInstanceInfo.Name);
 			}
 
-			toLower(shapeName);
+			toLowerAscii(shapeName);
 
 			if (!shapeName.empty() && shapeName.find('.') == std::string::npos)
 				shapeName += ".shape";
@@ -920,7 +920,7 @@ void CInstanceGroup::stopAddToSceneAsync ()
 					shapeName  = rInstanceInfo.Name;
 			}
 
-			toLower(shapeName);
+			toLowerAscii(shapeName);
 			_AddToSceneTempScene->getShapeBank()->cancelLoadAsync (shapeName);
 		}
 	}
diff --git a/nel/src/3d/shape_bank.cpp b/nel/src/3d/shape_bank.cpp
index 71bdb79e2..cb6ea8c21 100644
--- a/nel/src/3d/shape_bank.cpp
+++ b/nel/src/3d/shape_bank.cpp
@@ -56,7 +56,7 @@ CShapeBank::~CShapeBank()
 
 IShape*CShapeBank::addRef(const string &shapeNameNotLwr)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	// get the shape info (must succeed)
 	TShapeInfoMap::iterator scfpmIt = ShapePtrToShapeInfo.find( getShapePtrFromShapeName( shapeName ) );
@@ -434,7 +434,7 @@ bool CShapeBank::processWSUploadTexture (CWaitingShape &rWS, uint32 &nTotalUploa
 
 CShapeBank::TShapeState CShapeBank::getPresentState (const string &shapeNameNotLwr)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	// Is the shape is found in the shape map so return Present
 	TShapeMap::iterator smIt = ShapeMap.find (shapeName);
@@ -450,7 +450,7 @@ CShapeBank::TShapeState CShapeBank::getPresentState (const string &shapeNameNotL
 // ***************************************************************************
 IShape	*CShapeBank::getShape (const std::string &shapeNameNotLwr)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	// Is the shape is found in the shape map so return Present
 	TShapeMap::iterator smIt = ShapeMap.find (shapeName);
@@ -464,7 +464,7 @@ IShape	*CShapeBank::getShape (const std::string &shapeNameNotLwr)
 
 void CShapeBank::load (const string &shapeNameNotLwr)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	TShapeMap::iterator smIt = ShapeMap.find(shapeName);
 	if( smIt == ShapeMap.end() )
@@ -498,7 +498,7 @@ void CShapeBank::load (const string &shapeNameNotLwr)
 
 void CShapeBank::loadAsync (const std::string &shapeNameNotLwr, IDriver *pDriver, const CVector &position, bool *bSignal, uint selectedTexture)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	TShapeMap::iterator smIt = ShapeMap.find(shapeName);
 	if (smIt != ShapeMap.end())
@@ -530,7 +530,7 @@ void CShapeBank::loadAsync (const std::string &shapeNameNotLwr, IDriver *pDriver
 
 void CShapeBank::cancelLoadAsync (const std::string &shapeNameNotLwr)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	TWaitingShapesMap::iterator wsmmIt = WaitingShapes.find(shapeName);
 	if (wsmmIt != WaitingShapes.end())
@@ -600,7 +600,7 @@ bool CShapeBank::isShapeWaiting ()
 void CShapeBank::add (const string &shapeNameNotLwr, IShape* pShp)
 {
 	nlassert(pShp);
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	// request a system mem geometry copy?
 	if(pShp && _ShapeNeedingSystemGeometryCopy.find(shapeName)!=_ShapeNeedingSystemGeometryCopy.end())
@@ -724,7 +724,7 @@ sint CShapeBank::getShapeCacheFreeSpace(const std::string &shapeCacheName) const
 
 void CShapeBank::linkShapeToShapeCache(const string &shapeNameNotLwr, const string &shapeCacheName)
 {
-	string	shapeName= toLower(shapeNameNotLwr);
+	string	shapeName= toLowerAscii(shapeNameNotLwr);
 
 	for(;;)
 	{
@@ -857,7 +857,7 @@ void CShapeBank::preLoadShapes(const std::string &shapeCacheName,
 		return;
 
 	// lower case
-	string wildCard= toLower(wildCardNotLwr);
+	string wildCard= toLowerAscii(wildCardNotLwr);
 
 	// For all files
 	for(uint i=0;i<listFile.size();i++)
@@ -866,7 +866,7 @@ void CShapeBank::preLoadShapes(const std::string &shapeCacheName,
 		if (progress)
 			progress->progress ((float)i/(float)listFile.size ());
 
-		string	fileName= toLower(CFile::getFilename(listFile[i]));
+		string	fileName= toLowerAscii(CFile::getFilename(listFile[i]));
 		// if the file is ok for the wildCard, process it
 		if( testWildCard(fileName.c_str(), wildCard.c_str()) )
 		{
@@ -908,7 +908,7 @@ void CShapeBank::preLoadShapes(const std::string &shapeCacheName,
 // ***************************************************************************
 void CShapeBank::buildSystemGeometryForshape(const std::string &shapeName)
 {
-	_ShapeNeedingSystemGeometryCopy.insert(toLower(shapeName));
+	_ShapeNeedingSystemGeometryCopy.insert(toLowerAscii(shapeName));
 }
 
 
diff --git a/nel/src/3d/shape_info.cpp b/nel/src/3d/shape_info.cpp
index d3a8a4df3..4385b044e 100644
--- a/nel/src/3d/shape_info.cpp
+++ b/nel/src/3d/shape_info.cpp
@@ -229,7 +229,7 @@ void CShapeInfo::build(const CMeshBase &meshBase, const CMeshMRMGeom &meshGeom)
 // ***************************************************************************
 std::string standardizeShapeName(const std::string &name)
 {
-	std::string result = NLMISC::toLower(name);
+	std::string result = NLMISC::toLowerAscii(name);
 	if (CFile::getExtension(result).empty())
 	{
 		result += ".shape";
diff --git a/nel/src/3d/texture_file.cpp b/nel/src/3d/texture_file.cpp
index 0e343ec8e..58f2f333f 100644
--- a/nel/src/3d/texture_file.cpp
+++ b/nel/src/3d/texture_file.cpp
@@ -311,7 +311,7 @@ void			CTextureFile::setMipMapSkipAtLoad(uint8 level)
 // ***************************************************************************
 std::string		CTextureFile::getShareName() const
 {
-	return toLower(_FileName);
+	return toLowerAscii(_FileName);
 }
 
 
diff --git a/nel/src/3d/tile_bank.cpp b/nel/src/3d/tile_bank.cpp
index a22a797f4..9ba3ca756 100644
--- a/nel/src/3d/tile_bank.cpp
+++ b/nel/src/3d/tile_bank.cpp
@@ -275,7 +275,7 @@ sint CTileBank::getNumBitmap (CTile::TBitmap bitmap) const
 			{
 				std::vector<char> vect (str.length()+1);
 				memcpy (&*vect.begin(), str.c_str(), str.length()+1);
-				toLower(&*vect.begin());
+				toLowerAscii(&*vect.begin());
 				setString.insert (std::string (&*vect.begin()));
 			}
 		}
@@ -600,7 +600,7 @@ void CTileBank::removeDisplacementMap (uint mapId)
 uint CTileBank::getDisplacementMap (const string &fileName)
 {
 	// Lower string
-	string lower=toLower(fileName);
+	string lower=toLowerAscii(fileName);
 
 	// Look for this texture filename
 	uint noiseTile;
diff --git a/nel/src/georges/form.cpp b/nel/src/georges/form.cpp
index 40f374b8d..2f9ecf9b1 100644
--- a/nel/src/georges/form.cpp
+++ b/nel/src/georges/form.cpp
@@ -371,7 +371,7 @@ void CForm::warning (bool exception, const std::string &function, const char *fo
 void CForm::getDependencies (std::set<std::string> &dependencies) const
 {
 	// Add me
-	if (dependencies.insert (toLower(CFile::getFilename (_Filename))).second)
+	if (dependencies.insert (toLowerAscii(CFile::getFilename (_Filename))).second)
 	{
 		// Add parents
 		uint i;
diff --git a/nel/src/georges/form_dfn.cpp b/nel/src/georges/form_dfn.cpp
index d9c52c1b4..628077579 100644
--- a/nel/src/georges/form_dfn.cpp
+++ b/nel/src/georges/form_dfn.cpp
@@ -882,7 +882,7 @@ void CFormDfn::warning (bool exception, const std::string &function, const char
 void CFormDfn::getDependencies (std::set<std::string> &dependencies) const
 {
 	// Scan only if not already inserted
-	if (dependencies.insert (toLower(CFile::getFilename (_Filename))).second)
+	if (dependencies.insert (toLowerAscii(CFile::getFilename (_Filename))).second)
 	{
 		// Add parents
 		uint i;
@@ -898,7 +898,7 @@ void CFormDfn::getDependencies (std::set<std::string> &dependencies) const
 				Entries[i].getDfnPtr ()->getDependencies (dependencies);
 			if (Entries[i].getTypePtr ())
 			{
-				dependencies.insert (toLower(CFile::getFilename (Entries[i].getFilename())));
+				dependencies.insert (toLowerAscii(CFile::getFilename (Entries[i].getFilename())));
 			}
 		}
 	}
diff --git a/nel/src/georges/form_loader.cpp b/nel/src/georges/form_loader.cpp
index 877c587ed..dd3d50ed5 100644
--- a/nel/src/georges/form_loader.cpp
+++ b/nel/src/georges/form_loader.cpp
@@ -67,7 +67,7 @@ CFormLoader::~CFormLoader()
 CType *CFormLoader::loadType (const std::string &filename)
 {
 	// Lower string filename
-	string lowerStr = toLower(filename);
+	string lowerStr = toLowerAscii(filename);
 	lowerStr = CFile::getFilename (lowerStr);
 
 	// Already in the map ?
@@ -137,7 +137,7 @@ CType *CFormLoader::loadType (const std::string &filename)
 CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad)
 {
 	// Lower string filename
-	string lowerStr = toLower(filename);
+	string lowerStr = toLowerAscii(filename);
 	lowerStr = CFile::getFilename (lowerStr);
 
 	// Already in the map ?
@@ -203,7 +203,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad)
 UForm *CFormLoader::loadForm (const std::string &filename)
 {
 	// Lower string filename
-	string lowerStr = toLower((string)filename);
+	string lowerStr = toLowerAscii((string)filename);
 	lowerStr = CFile::getFilename (lowerStr);
 
 	// Already in the map ?
diff --git a/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
index a10513ebb..f7a5f2cee 100644
--- a/nel/src/gui/action_handler.cpp
+++ b/nel/src/gui/action_handler.cpp
@@ -73,13 +73,13 @@ namespace NLGUI
 	{
 		string allparam = Params;
 		skipBlankAtStart (allparam);
-		string param = toLower (ParamName);
+		string param = toLowerAscii (ParamName);
 		while (!allparam.empty())
 		{
 			std::string::size_type e = allparam.find('=');
 			if (e == std::string::npos || e == 0) break;
 			std::string::size_type p = allparam.find('|');
-			string tmp = NLMISC::toLower(allparam.substr(0,e));
+			string tmp = NLMISC::toLowerAscii(allparam.substr(0,e));
 			skipBlankAtEnd(tmp);
 			if (tmp == param)
 			{
@@ -105,7 +105,7 @@ namespace NLGUI
 			std::string::size_type e = allparam.find('=');
 			if (e == std::string::npos || e == 0) break;
 			std::string::size_type p = allparam.find('|');
-			string tmp = NLMISC::toLower(allparam.substr(0,e));
+			string tmp = NLMISC::toLowerAscii(allparam.substr(0,e));
 			skipBlankAtEnd(tmp);
 
 			string tmp2 = allparam.substr(e+1,p-e-1);
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index d43189fca..ab9f6edb7 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -50,7 +50,7 @@ namespace NLGUI
 			pos = elements[i].find_first_of(':');
 			if (pos != std::string::npos)
 			{
-				std::string key = trim(toLower(elements[i].substr(0, pos)));
+				std::string key = trim(toLowerAscii(elements[i].substr(0, pos)));
 				std::string value = trim(elements[i].substr(pos+1));
 				styles.push_back(TStylePair(key, value));
 			}
@@ -361,7 +361,7 @@ namespace NLGUI
 				while(pos < sel.size() && is_nmchar(sel[pos]))
 					pos++;
 
-				current.Element = toLower(sel.substr(start, pos - start));
+				current.Element = toLowerAscii(sel.substr(start, pos - start));
 				start = pos;
 				continue;
 			}
@@ -374,7 +374,7 @@ namespace NLGUI
 				while(pos < sel.size() && is_nmchar(sel[pos]))
 					pos++;
 
-				current.Id = toLower(sel.substr(start, pos - start));
+				current.Id = toLowerAscii(sel.substr(start, pos - start));
 				start = pos;
 			}
 			else if (sel[pos] == '.')
@@ -386,7 +386,7 @@ namespace NLGUI
 				while(pos < sel.size() && (is_nmchar(sel[pos]) || sel[pos] == '.'))
 					pos++;
 
-				current.setClass(toLower(sel.substr(start, pos - start)));
+				current.setClass(toLowerAscii(sel.substr(start, pos - start)));
 				start = pos;
 			}
 			else if (sel[pos] == '[')
@@ -552,7 +552,7 @@ namespace NLGUI
 					}
 				}
 
-				std::string key = toLower(sel.substr(start, pos - start));
+				std::string key = toLowerAscii(sel.substr(start, pos - start));
 				if (key.empty())
 				{
 					failed = true;
diff --git a/nel/src/gui/css_selector.cpp b/nel/src/gui/css_selector.cpp
index 2c9d94559..18d0375b0 100644
--- a/nel/src/gui/css_selector.cpp
+++ b/nel/src/gui/css_selector.cpp
@@ -59,7 +59,7 @@ namespace NLGUI
 	void CCssSelector::setClass(const std::string &cls)
 	{
 		std::vector<std::string> parts;
-		NLMISC::splitString(toLower(cls), ".", parts);
+		NLMISC::splitString(toLowerAscii(cls), ".", parts);
 
 		for(uint i = 0; i< parts.size(); i++)
 		{
@@ -80,7 +80,7 @@ namespace NLGUI
 		}
 		else
 		{
-			Attr.push_back(SAttribute(key, toLower(val), op, cs));
+			Attr.push_back(SAttribute(key, toLowerAscii(val), op, cs));
 		}
 	}
 
@@ -146,7 +146,7 @@ namespace NLGUI
 			// case-insensitive compare, Attr.value is already lowercased
 			if (!Attr[i].caseSensitive)
 			{
-				value = toLower(value);
+				value = toLowerAscii(value);
 			}
 
 			switch(Attr[i].op)
@@ -255,7 +255,7 @@ namespace NLGUI
 
 		if (start == std::string::npos) return;
 
-		std::string expr = toLower(pseudo.substr(start, end - start));
+		std::string expr = toLowerAscii(pseudo.substr(start, end - start));
 
 		if (expr.empty()) return;
 
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index 396bff062..ac36da726 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -676,7 +676,7 @@ namespace NLGUI
 			else
 			if (it->first == "text-decoration" || it->first == "text-decoration-line")
 			{
-				std::string prop(toLower(it->second));
+				std::string prop(toLowerAscii(it->second));
 				style.Underlined = (prop.find("underline") != std::string::npos);
 				style.StrikeThrough = (prop.find("line-through") != std::string::npos);
 			}
@@ -924,7 +924,7 @@ namespace NLGUI
 			{
 				// normalize
 				std::string image = trim(it->second);
-				if (toLower(image.substr(0, 4)) == "url(")
+				if (toLowerAscii(image.substr(0, 4)) == "url(")
 				{
 					image = image.substr(4, image.size()-5);
 				}
@@ -934,7 +934,7 @@ namespace NLGUI
 			if (it->first == "background-repeat")
 			{
 				// normalize
-				std::string val = toLower(trim(it->second));
+				std::string val = toLowerAscii(trim(it->second));
 				std::vector<std::string> parts;
 				splitParams(val, ' ', parts);
 				// check for "repeat repeat"
@@ -947,7 +947,7 @@ namespace NLGUI
 			if (it->first == "background-size")
 			{
 				// normalize
-				std::string val = toLower(trim(it->second));
+				std::string val = toLowerAscii(trim(it->second));
 				std::vector<std::string> parts;
 				splitParams(val, ' ', parts);
 				if (parts.size() == 2 && parts[0] == parts[1])
@@ -999,7 +999,7 @@ namespace NLGUI
 		uint index = 0;
 		while(!failed && index < parts.size())
 		{
-			std::string val = toLower(parts[index]);
+			std::string val = toLowerAscii(parts[index]);
 			bool matches = false;
 			for(uint i = 0; i < nbProps; i++)
 			{
@@ -1028,7 +1028,7 @@ namespace NLGUI
 						// second loop -> false && break
 						loop = !loop;
 
-						val = toLower(parts[next]);
+						val = toLowerAscii(parts[next]);
 						if (val == "center")
 						{
 							if (bgPositionX.empty()) bgPositionX = "center";
@@ -1082,7 +1082,7 @@ namespace NLGUI
 						uint next = index + 1;
 						if (next < parts.size())
 						{
-							val = toLower(parts[next]);
+							val = toLowerAscii(parts[next]);
 							if (val == "cover" || val == "contain")
 							{
 								matches = true;
@@ -1106,7 +1106,7 @@ namespace NLGUI
 									next++;
 									if (next < parts.size())
 									{
-										val = toLower(parts[next]);
+										val = toLowerAscii(parts[next]);
 										if (val == "auto")
 											v = "auto";
 										else if (getCssLength(fval, unit, val))
@@ -1160,7 +1160,7 @@ namespace NLGUI
 							uint next = index + 1;
 							if (next < parts.size())
 							{
-								val = toLower(parts[next]);
+								val = toLowerAscii(parts[next]);
 								if (val == "repeat" || val == "space" || val == "round" || val == "no-repeat")
 								{
 									vert = val;
@@ -1334,7 +1334,7 @@ namespace NLGUI
 	bool CCssStyle::tryBorderWidthShorthand(const std::string &prop, const std::string &value, TStyle &style) const
 	{
 		std::vector<std::string> parts;
-		splitParams(toLower(value), ' ', parts);
+		splitParams(toLowerAscii(value), ' ', parts);
 		float tmpf;
 		std::string unit;
 
@@ -1371,7 +1371,7 @@ namespace NLGUI
 	bool CCssStyle::tryBorderStyleShorthand(const std::string &prop, const std::string &value, TStyle &style) const
 	{
 		std::vector<std::string> parts;
-		splitParams(toLower(value), ' ', parts);
+		splitParams(toLowerAscii(value), ' ', parts);
 
 		// verify that parts are valid
 		uint8 maxSize  = (prop == "border" || prop == "border-style") ? 4 : 1;
@@ -1420,7 +1420,7 @@ namespace NLGUI
 	bool CCssStyle::tryBorderColorShorthand(const std::string &prop, const std::string &value, TStyle &style) const
 	{
 		std::vector<std::string> parts;
-		splitParams(toLower(value), ' ', parts);
+		splitParams(toLowerAscii(value), ' ', parts);
 		CRGBA color;
 
 		// verify that parts are valid
@@ -1465,7 +1465,7 @@ namespace NLGUI
 
 		TStyle borderStyle;
 		std::vector<std::string> parts;
-		splitParams(toLower(value), ' ', parts);
+		splitParams(toLowerAscii(value), ' ', parts);
 
 		for(uint index = 0; index < parts.size(); ++index)
 		{
@@ -1530,7 +1530,7 @@ namespace NLGUI
 	void CCssStyle::expandPaddingShorthand(const std::string &value, TStyle &style) const
 	{
 		std::vector<std::string> parts;
-		splitParams(toLower(value), ' ', parts);
+		splitParams(toLowerAscii(value), ' ', parts);
 
 		uint8 t, r, b, l;
 		if (!getShorthandIndices(parts.size(), t, r, b, l))
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index 2e95c50dd..e120c5d4e 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -100,7 +100,7 @@ namespace NLGUI
 
 	CCtrlBase::TToolTipParentType CCtrlBase::stringToToolTipParent( const std::string &str )
 	{
-		std::string s = toLower( str );
+		std::string s = toLowerAscii( str );
 
 		if( s == "mouse" )
 			return TTMouse;
diff --git a/nel/src/gui/ctrl_base_button.cpp b/nel/src/gui/ctrl_base_button.cpp
index dec715048..68aa19f15 100644
--- a/nel/src/gui/ctrl_base_button.cpp
+++ b/nel/src/gui/ctrl_base_button.cpp
@@ -584,18 +584,18 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_l" );
 		if (prop)
 		{
-			_ListMenuLeft = NLMISC::toLower(std::string((const char *) prop));
+			_ListMenuLeft = NLMISC::toLowerAscii(std::string((const char *) prop));
 		}
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r" );
 		if (prop)
 		{
-			_ListMenuRight = NLMISC::toLower(std::string((const char *) prop));
+			_ListMenuRight = NLMISC::toLowerAscii(std::string((const char *) prop));
 		}
 		// list menu on both clicks
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_b" );
 		if (prop)
 		{
-			setListMenuBoth(NLMISC::toLower(std::string((const char *) prop)));
+			setListMenuBoth(NLMISC::toLowerAscii(std::string((const char *) prop)));
 		}
 
 		prop= (char*) xmlGetProp (cur, (xmlChar*)"frozen");
diff --git a/nel/src/gui/ctrl_button.cpp b/nel/src/gui/ctrl_button.cpp
index e27d8cfbd..cc38e50e4 100644
--- a/nel/src/gui/ctrl_button.cpp
+++ b/nel/src/gui/ctrl_button.cpp
@@ -210,21 +210,21 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_normal" );
 		if (prop)
 		{
-			string TxName = NLMISC::toLower((const char *) prop);
+			string TxName = NLMISC::toLowerAscii((const char *) prop);
 			_TextureIdNormal.setTexture(TxName.c_str());
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_pushed" );
 		if (prop)
 		{
-			string TxName = NLMISC::toLower((const char *) prop);
+			string TxName = NLMISC::toLowerAscii((const char *) prop);
 			_TextureIdPushed.setTexture(TxName.c_str());
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_over" );
 		if (prop)
 		{
-			string TxName = NLMISC::toLower((const char *) prop);
+			string TxName = NLMISC::toLowerAscii((const char *) prop);
 			_TextureIdOver.setTexture(TxName.c_str());
 		}
 
diff --git a/nel/src/gui/ctrl_col_pick.cpp b/nel/src/gui/ctrl_col_pick.cpp
index 411414de7..251c655c2 100644
--- a/nel/src/gui/ctrl_col_pick.cpp
+++ b/nel/src/gui/ctrl_col_pick.cpp
@@ -212,12 +212,12 @@ namespace NLGUI
 		CViewRenderer &rVR = *CViewRenderer::getInstance();
 		if(prop)
 		{
-			string sTmp = NLMISC::toLower((const char*)prop);
+			string sTmp = NLMISC::toLowerAscii((const char*)prop);
 			_Texture = rVR.createTexture (sTmp, 0, 0, 256, 64, false, false);
 		}
 
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" );
-		if (prop)	_AHOnChange = NLMISC::toLower((const char*)prop);
+		if (prop)	_AHOnChange = NLMISC::toLowerAscii((const char*)prop);
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" );
 		if (prop)	_AHOnChangeParams = string((const char*)prop);
 
diff --git a/nel/src/gui/ctrl_scroll.cpp b/nel/src/gui/ctrl_scroll.cpp
index d9191e770..00f089660 100644
--- a/nel/src/gui/ctrl_scroll.cpp
+++ b/nel/src/gui/ctrl_scroll.cpp
@@ -561,17 +561,17 @@ namespace NLGUI
 
 		// Read Action handlers
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscroll" );
-		if (prop)	_AHOnScroll = NLMISC::toLower(prop.str());
+		if (prop)	_AHOnScroll = NLMISC::toLowerAscii(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"params" );
 		if (prop)	_AHOnScrollParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollend" );
-		if (prop)	_AHOnScrollEnd = NLMISC::toLower(prop.str());
+		if (prop)	_AHOnScrollEnd = NLMISC::toLowerAscii(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"end_params" );
 		if (prop)	_AHOnScrollEndParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollcancel" );
-		if (prop)	_AHOnScrollCancel = NLMISC::toLower(prop.str());
+		if (prop)	_AHOnScrollCancel = NLMISC::toLowerAscii(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancel_params" );
 		if (prop)	_AHOnScrollCancelParams = string((const char*)prop);
 
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 3be6142e3..e7689704f 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -542,7 +542,7 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_normal" );
 		if (prop)
 		{
-			string TxName = toLower(std::string((const char *) prop));
+			string TxName = toLowerAscii(std::string((const char *) prop));
 			_TextureIdNormal[0].setTexture((TxName+"_l.tga").c_str());
 			_TextureIdNormal[1].setTexture((TxName+"_m.tga").c_str());
 			_TextureIdNormal[2].setTexture((TxName+"_r.tga").c_str());
@@ -551,7 +551,7 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_pushed" );
 		if (prop)
 		{
-			string TxName = toLower(std::string((const char *) prop));
+			string TxName = toLowerAscii(std::string((const char *) prop));
 			_TextureIdPushed[0].setTexture((TxName+"_l.tga").c_str());
 			_TextureIdPushed[1].setTexture((TxName+"_m.tga").c_str());
 			_TextureIdPushed[2].setTexture((TxName+"_r.tga").c_str());
@@ -560,7 +560,7 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_over" );
 		if (prop)
 		{
-			string TxName = toLower(std::string((const char *) prop));
+			string TxName = toLowerAscii(std::string((const char *) prop));
 			_TextureIdOver[0].setTexture((TxName+"_l.tga").c_str());
 			_TextureIdOver[1].setTexture((TxName+"_m.tga").c_str());
 			_TextureIdOver[2].setTexture((TxName+"_r.tga").c_str());
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 725019b72..1e5f18b4d 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -45,7 +45,8 @@ namespace NLGUI
 	// Compare strings
 	static inline bool lt_text(const std::pair<int,std::string> &s1, const std::pair<int,std::string> &s2)
 	{
-		return toLower(s1.second) < toLower(s2.second);
+		// return toLower(s1.second) < toLower(s2.second);
+		return -NLMISC::compareCaseInsensitive(s1.second, s2.second);
 	}
 
 	std::string CDBGroupComboBox::measureMenu;
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 27084dd1b..f90eb424f 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -629,7 +629,7 @@ namespace NLGUI
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r" );
-		if (prop) _ListMenuRight = toLower((const char *) prop);
+		if (prop) _ListMenuRight = toLowerAscii((const char *) prop);
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"max_historic" );
 		if (prop) fromString((const char*)prop, _MaxHistoric);
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 508d60361..04c083c20 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -89,7 +89,7 @@ namespace NLGUI
 	// Return URL with https is host is in HSTS list
 	static std::string upgradeInsecureUrl(const std::string &url)
 	{
-		if (toLower(url.substr(0, 7)) != "http://") {
+		if (toLowerAscii(url.substr(0, 7)) != "http://") {
 			return url;
 		}
 
@@ -136,7 +136,7 @@ namespace NLGUI
 				if (pos == std::string::npos)
 					return;
 
-				std::string key = toLower(header.substr(0, pos));
+				std::string key = toLowerAscii(header.substr(0, pos));
 				if (pos != std::string::npos)
 				{
 					HeadersRecv[key] = header.substr(pos + 2);
@@ -185,7 +185,7 @@ namespace NLGUI
 			bool hasHSTSHeader()
 			{
 				// ignore header if not secure connection
-				if (toLower(Url.substr(0, 8)) != "https://")
+				if (toLowerAscii(Url.substr(0, 8)) != "https://")
 				{
 					return false;
 				}
@@ -552,7 +552,7 @@ namespace NLGUI
 		LOG_DL("curl easy handle %p created for '%s'", curl, download.url.c_str());
 
 		// https://
-		if (toLower(download.url.substr(0, 8)) == "https://")
+		if (toLowerAscii(download.url.substr(0, 8)) == "https://")
 		{
 			// if supported, use custom SSL context function to load certificates
 			NLWEB::CCurlCertificates::useCertificates(curl);
@@ -1266,7 +1266,7 @@ namespace NLGUI
 
 		// TODO: 'content' should already be tokenized in css parser as it has all the functions for that
 		std::string content = trim(_Style.getStyle("content"));
-		if (toLower(content) == "none" || toLower(content) == "normal")
+		if (toLowerAscii(content) == "none" || toLowerAscii(content) == "normal")
 		{
 			_Style.popStyle();
 			return;
@@ -1297,7 +1297,7 @@ namespace NLGUI
 				// skip closing quote
 				pos++;
 			}
-			else if (content[pos] == 'u' && pos < content.size() - 6 && toLower(content.substr(pos, 4)) == "url(")
+			else if (content[pos] == 'u' && pos < content.size() - 6 && toLowerAscii(content.substr(pos, 4)) == "url(")
 			{
 				// url(/path-to/image.jpg) / "Alt!"
 				// url("/path to/image.jpg") / "Alt!"
@@ -3440,7 +3440,7 @@ namespace NLGUI
 		result = url;
 		string tmp;
 
-		if (toLower(result).find("file:") == 0 && result.size() > 5)
+		if (toLowerAscii(result).find("file:") == 0 && result.size() > 5)
 		{
 			result = result.substr(5, result.size()-5);
 		}
@@ -3461,7 +3461,7 @@ namespace NLGUI
 		{
 			// Normalize the path
 			if (isUrl)
-				//result = "file:"+toLower(CPath::standardizePath (CPath::getFullPath (CFile::getPath(result)))+CFile::getFilename(result));*/
+				//result = "file:"+toLowerAscii(CPath::standardizePath (CPath::getFullPath (CFile::getPath(result)))+CFile::getFilename(result));*/
 				result = "file:/"+tmp;
 			else
 				result = tmp;
@@ -3786,7 +3786,7 @@ namespace NLGUI
 		updateRefreshButton();
 
 		std::string filename;
-		if (toLower(uri).find("file:/") == 0)
+		if (toLowerAscii(uri).find("file:/") == 0)
 		{
 			filename = uri.substr(6, uri.size() - 6);
 		}
@@ -3856,7 +3856,7 @@ namespace NLGUI
 		}
 
 		// https://
-		if (toLower(url.substr(0, 8)) == "https://")
+		if (toLowerAscii(url.substr(0, 8)) == "https://")
 		{
 			// if supported, use custom SSL context function to load certificates
 			NLWEB::CCurlCertificates::useCertificates(curl);
@@ -5347,7 +5347,7 @@ namespace NLGUI
 			if (_Style.hasStyle("text-align"))
 				align = _Style.Current.TextAlign;
 			else if (elm.hasNonEmptyAttribute("align"))
-				align = toLower(elm.getAttribute("align"));
+				align = toLowerAscii(elm.getAttribute("align"));
 
 			if (align == "left")
 				cellParams.Align = CGroupCell::Left;
@@ -5362,7 +5362,7 @@ namespace NLGUI
 			if (_Style.hasStyle("vertical-align"))
 				valign = _Style.Current.VerticalAlign;
 			else if (elm.hasNonEmptyAttribute("valign"))
-				valign = toLower(elm.getAttribute("valign"));
+				valign = toLowerAscii(elm.getAttribute("valign"));
 
 			if (valign == "top")
 				cellParams.VAlign = CGroupCell::Top;
@@ -5859,7 +5859,7 @@ namespace NLGUI
 		// Build the form
 		CGroupHTML::CForm form;
 		// id check is case sensitive and auto id's are uppercase
-		form.id = toLower(trim(elm.getAttribute("id")));
+		form.id = toLowerAscii(trim(elm.getAttribute("id")));
 		if (form.id.empty())
 		{
 			form.id = toString("FORM%d", _Forms.size());
@@ -6287,7 +6287,7 @@ namespace NLGUI
 			{
 				fromString(httpContent.substr(0, pos), _NextRefreshTime);
 
-				pos = toLower(httpContent).find("url=");
+				pos = toLowerAscii(httpContent).find("url=");
 				if (pos != string::npos)
 					_RefreshUrl = getAbsoluteUrl(httpContent.substr(pos + 4));
 			}
diff --git a/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
index 3d7303706..de1a0e4d9 100644
--- a/nel/src/gui/html_parser.cpp
+++ b/nel/src/gui/html_parser.cpp
@@ -89,7 +89,7 @@ namespace NLGUI
 					}
 				}
 
-				parent.Children.push_back(CHtmlElement(CHtmlElement::ELEMENT_NODE, toLower((const char*)node->name)));
+				parent.Children.push_back(CHtmlElement(CHtmlElement::ELEMENT_NODE, toLowerAscii((const char*)node->name)));
 				CHtmlElement &elm = parent.Children.back();
 				elm.ID = element_number;
 				elm.parent = &parent;
@@ -109,7 +109,7 @@ namespace NLGUI
 				elm.Attributes.clear();
 
 				for (xmlAttr *cur_attr = node->properties; cur_attr; cur_attr = cur_attr->next) {
-					std::string key(toLower((const char *)(cur_attr->name)));
+					std::string key(toLowerAscii((const char *)(cur_attr->name)));
 					std::string value;
 					if (cur_attr->children)
 					{
@@ -124,7 +124,7 @@ namespace NLGUI
 					NLMISC::splitString(elm.getAttribute("class"), " ", parts);
 					for(uint i = 0; i<parts.size();++i)
 					{
-						elm.ClassNames.insert(toLower(trim(parts[i])));
+						elm.ClassNames.insert(toLowerAscii(trim(parts[i])));
 					}
 				}
 
@@ -136,7 +136,7 @@ namespace NLGUI
 					bool useStyle = true;
 					if (elm.hasAttribute("media"))
 					{
-						std::string media = trim(toLower(elm.Attributes["media"]));
+						std::string media = trim(toLowerAscii(elm.Attributes["media"]));
 						useStyle = media.empty() || media.find("all") != std::string::npos || media.find("screen") != std::string::npos;
 
 						// <style media="ryzom"> for ingame browser
@@ -154,7 +154,7 @@ namespace NLGUI
 					bool useStyle = true;
 					if (elm.hasAttribute("media"))
 					{
-						std::string media = trim(toLower(elm.Attributes["media"]));
+						std::string media = trim(toLowerAscii(elm.Attributes["media"]));
 						useStyle = media.empty() || media.find("all") != std::string::npos || media.find("screen") != std::string::npos;
 
 						// <style media="ryzom"> for ingame browser
diff --git a/nel/src/gui/http_hsts.cpp b/nel/src/gui/http_hsts.cpp
index d473f1786..e5a13e26a 100644
--- a/nel/src/gui/http_hsts.cpp
+++ b/nel/src/gui/http_hsts.cpp
@@ -210,7 +210,7 @@ namespace NLGUI {
 	{
 		// max-age=<seconds>; includeSubdomains; preload;
 		std::vector<std::string> elements;
-		NLMISC::splitString(toLower(header), ";", elements);
+		NLMISC::splitString(toLowerAscii(header), ";", elements);
 		if (elements.empty()) return;
 
 		time_t currentTime;
diff --git a/nel/src/gui/interface_anim.cpp b/nel/src/gui/interface_anim.cpp
index 0541b7676..d23c69330 100644
--- a/nel/src/gui/interface_anim.cpp
+++ b/nel/src/gui/interface_anim.cpp
@@ -63,7 +63,7 @@ namespace NLGUI
 		if (ptr) _Dynamic = CInterfaceElement::convertBool (ptr);
 
 		ptr = xmlGetProp (cur, (xmlChar*)"type");
-		string sTmp = toLower(ptr.str());
+		string sTmp = toLowerAscii(ptr.str());
 		if (sTmp == "linear")
 			_Type = Track_Linear;
 		else if (sTmp == "bezier")
diff --git a/nel/src/gui/interface_group.cpp b/nel/src/gui/interface_group.cpp
index 9cced8264..703070d82 100644
--- a/nel/src/gui/interface_group.cpp
+++ b/nel/src/gui/interface_group.cpp
@@ -320,7 +320,7 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"max_sizeparent" );
 		if (ptr)
 		{
-			string idparent = NLMISC::toLower(ptr.str());
+			string idparent = NLMISC::toLowerAscii(ptr.str());
 			if (idparent != "parent")
 			{
 				if (parentGroup)
diff --git a/nel/src/gui/interface_options.cpp b/nel/src/gui/interface_options.cpp
index 1854cc638..172e6ab41 100644
--- a/nel/src/gui/interface_options.cpp
+++ b/nel/src/gui/interface_options.cpp
@@ -83,7 +83,7 @@ namespace NLGUI
 				}
 				else
 				{
-					string name = NLMISC::toLower(string((const char*)ptr));
+					string name = NLMISC::toLowerAscii(string((const char*)ptr));
 					string value = (string((const char*)val));
 					_ParamValue[name].init(value);
 				}
@@ -135,7 +135,7 @@ namespace NLGUI
 	// ***************************************************************************
 	const CInterfaceOptionValue	 &CInterfaceOptions::getValue(const string &sParamName) const
 	{
-		std::map<std::string, CInterfaceOptionValue>::const_iterator it = _ParamValue.find (toLower(sParamName));
+		std::map<std::string, CInterfaceOptionValue>::const_iterator it = _ParamValue.find (toLowerAscii(sParamName));
 		if (it != _ParamValue.end())
 			return it->second;
 		else
diff --git a/nel/src/gui/interface_parser.cpp b/nel/src/gui/interface_parser.cpp
index 204b28295..afb5c3d4d 100644
--- a/nel/src/gui/interface_parser.cpp
+++ b/nel/src/gui/interface_parser.cpp
@@ -1369,7 +1369,7 @@ namespace NLGUI
 		CXMLAutoPtr ptr((const char*) xmlGetProp( cur, (xmlChar*)"node" ));
 		if (!ptr) return false;
 
-		string stmp2 = toLower(string((const char*)ptr));
+		string stmp2 = toLowerAscii(string((const char*)ptr));
 
 		CInterfaceElement *pEltFound = NULL;
 		std::vector< CWidgetManager::SMasterGroup > &_MasterGroups = CWidgetManager::getInstance()->getAllMasterGroup();
@@ -1379,7 +1379,7 @@ namespace NLGUI
 			for (uint32 j = 0; j < rMG.Group->getGroups().size(); ++j)
 			{
 				CInterfaceGroup *pIG = rMG.Group->getGroups()[j];
-				string stmp = toLower(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
+				string stmp = toLowerAscii(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
 
 				if (stmp == stmp2)
 				{
@@ -1421,7 +1421,7 @@ namespace NLGUI
 		CXMLAutoPtr ptr((const char*) xmlGetProp( cur, (xmlChar*)"node" ));
 		if (!ptr) return false;
 
-		string stmp2 = toLower(string((const char*)ptr));
+		string stmp2 = toLowerAscii(string((const char*)ptr));
 
 		std::vector< CWidgetManager::SMasterGroup > &_MasterGroups = CWidgetManager::getInstance()->getAllMasterGroup();
 		CInterfaceElement *pEltFound = NULL;
@@ -1431,7 +1431,7 @@ namespace NLGUI
 			for (uint32 j = 0; j < rMG.Group->getGroups().size(); ++j)
 			{
 				CInterfaceGroup *pIG = rMG.Group->getGroups()[j];
-				string stmp = toLower(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
+				string stmp = toLowerAscii(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
 				if (stmp == stmp2)
 				{
 					pEltFound = pIG;
@@ -1615,7 +1615,7 @@ namespace NLGUI
 		CXMLAutoPtr ptr((const char*) xmlGetProp( cur, (xmlChar*)"node" ));
 		if (!ptr) return false;
 
-		string stmp2 = toLower(string((const char*)ptr));
+		string stmp2 = toLowerAscii(string((const char*)ptr));
 
 		std::vector< CWidgetManager::SMasterGroup > &_MasterGroups = CWidgetManager::getInstance()->getAllMasterGroup();
 		CInterfaceElement *pEltFound = NULL;
@@ -1625,7 +1625,7 @@ namespace NLGUI
 			for (uint32 j = 0; j < rMG.Group->getGroups().size(); ++j)
 			{
 				CInterfaceGroup *pIG = rMG.Group->getGroups()[j];
-				string stmp = toLower(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
+				string stmp = toLowerAscii(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
 
 				if (stmp == stmp2)
 				{
@@ -1693,8 +1693,8 @@ namespace NLGUI
 			for (uint32 j = 0; j < rMG.Group->getGroups().size(); ++j)
 			{
 				CInterfaceGroup *pIG = rMG.Group->getGroups()[j];
-				string stmp = NLMISC::toLower(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
-				string stmp2 = NLMISC::toLower(string((const char*)ptr));
+				string stmp = NLMISC::toLowerAscii(pIG->getId().substr(pIG->getId().rfind(':')+1,pIG->getId().size()));
+				string stmp2 = NLMISC::toLowerAscii(string((const char*)ptr));
 				if (stmp == stmp2)
 				{
 					pEltFound = pIG;
diff --git a/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
index f54a13a83..8ebb1eaa1 100644
--- a/nel/src/gui/libwww.cpp
+++ b/nel/src/gui/libwww.cpp
@@ -227,7 +227,7 @@ namespace NLGUI
 			pos++;
 		}
 
-		unit = toLower(str.substr(pos));
+		unit = toLowerAscii(str.substr(pos));
 		if (unit == "%" || unit == "rem" || unit == "em" || unit == "px" || unit == "pt")
 		{
 			std::string tmpstr = str.substr(0, pos);
@@ -687,7 +687,7 @@ namespace NLGUI
 		}
 
 		// make sure domain is lowercase
-		chunks[0] = toLower(chunks[0]);
+		chunks[0] = toLowerAscii(chunks[0]);
 
 		if (chunks[0] != domain && chunks[0] != std::string("." + domain))
 		{
diff --git a/nel/src/gui/url_parser.cpp b/nel/src/gui/url_parser.cpp
index da222f807..f965b05b3 100644
--- a/nel/src/gui/url_parser.cpp
+++ b/nel/src/gui/url_parser.cpp
@@ -88,7 +88,7 @@ namespace NLGUI
 				host = authority.substr(2);
 
 			// case-insensitive
-			host = NLMISC::toLower(host);
+			host = NLMISC::toLowerAscii(host);
 
 			pos = host.find(":");
 			if (pos != npos)
diff --git a/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
index 228868731..198c16c7c 100644
--- a/nel/src/gui/view_pointer.cpp
+++ b/nel/src/gui/view_pointer.cpp
@@ -92,43 +92,43 @@ namespace NLGUI
 		_OffsetY = getY();
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_default");
-		if (prop) _TxDefault = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxDefault = NLMISC::toLowerAscii ((const char *) prop);
 
  		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_move_window");
-		if (prop) _TxMoveWindow = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxMoveWindow = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_resize_BR_TL");
-		if (prop) _TxResizeBRTL = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxResizeBRTL = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_resize_BL_TR");
-		if (prop) _TxResizeBLTR = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxResizeBLTR = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_resize_TB");
-		if (prop) _TxResizeTB = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxResizeTB = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_resize_LR");
-		if (prop) _TxResizeLR = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxResizeLR = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_rotate");
-		if (prop) _TxRotate = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxRotate = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_scale");
-		if (prop) _TxScale = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxScale = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_colpick");
-		if (prop) _TxColPick = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxColPick = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_pan");
-		if (prop) _TxPan = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxPan = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_can_pan");
-		if (prop) _TxCanPan = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxCanPan = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_pan_r2");
-		if (prop) _TxPanR2 = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxPanR2 = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"tx_can_pan_r2");
-		if (prop) _TxCanPanR2 = NLMISC::toLower ((const char *) prop);
+		if (prop) _TxCanPanR2 = NLMISC::toLowerAscii ((const char *) prop);
 
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"color");
 		if (prop) _Color = convertColor(prop);
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index ea177dff0..38e20f3f6 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -895,7 +895,7 @@ namespace NLGUI
 			image.UVMin.V = uvMinV;
 			image.UVMax.U = uvMaxU;
 			image.UVMax.V = uvMaxV;
-			sTGAname = toLower(string(tgaName));
+			sTGAname = toLowerAscii(string(tgaName));
 
 			string::size_type stripPng = sTGAname.find(".png");
 			if (stripPng != string::npos)
@@ -964,11 +964,11 @@ namespace NLGUI
 			return;
 		}
 		// Look if already existing
-		string sLwrGTName = toLower(sGlobalTextureName);
+		string sLwrGTName = toLowerAscii(sGlobalTextureName);
 		TGlobalTextureList::iterator ite = _GlobalTextures.begin();
 		while (ite != _GlobalTextures.end())
 		{
-			if (toLower(ite->Name) == sLwrGTName)
+			if (toLowerAscii(ite->Name) == sLwrGTName)
 				break;
 			ite++;
 		}
@@ -1007,11 +1007,11 @@ namespace NLGUI
 			return createTextureFromDataURL(sGlobalTextureName, uploadDXTC, bReleasable);
 
 		// Look if already existing
-		string sLwrGTName = toLower(sGlobalTextureName);
+		string sLwrGTName = toLowerAscii(sGlobalTextureName);
 		TGlobalTextureList::iterator ite = _GlobalTextures.begin();
 		while (ite != _GlobalTextures.end())
 		{
-			std::string sText = toLower(ite->Name);
+			std::string sText = toLowerAscii(ite->Name);
 			if (sText == sLwrGTName)
 				break;
 			ite++;
@@ -1184,11 +1184,11 @@ namespace NLGUI
 	 */
 	NL3D::UTexture *CViewRenderer::getGlobalTexture(const std::string &name)
 	{
-		string sLwrGTName = NLMISC::toLower(name);
+		string sLwrGTName = NLMISC::toLowerAscii(name);
 		TGlobalTextureList::iterator ite = _GlobalTextures.begin();
 		while (ite != _GlobalTextures.end())
 		{
-			std::string sText = NLMISC::toLower(ite->Name);
+			std::string sText = NLMISC::toLowerAscii(ite->Name);
 			if (sText == sLwrGTName)
 				break;
 			ite++;
@@ -1318,7 +1318,7 @@ namespace NLGUI
 			return -1;
 
 		// convert to lowCase
-		string nameLwr = toLower(sName);
+		string nameLwr = toLowerAscii(sName);
 
 		string::size_type stripPng = nameLwr.find(".png");
 		if (stripPng != string::npos)
diff --git a/nel/src/ligo/primitive_class.cpp b/nel/src/ligo/primitive_class.cpp
index 02923285c..9386ca6b9 100644
--- a/nel/src/ligo/primitive_class.cpp
+++ b/nel/src/ligo/primitive_class.cpp
@@ -353,7 +353,7 @@ bool CPrimitiveClass::read (xmlNodePtr primitiveNode,
 		// Read the file extension
 		parameter.FileExtension.clear();
 		CIXml::getPropertyString (parameter.FileExtension, paramNode, "FILE_EXTENSION");
-		parameter.FileExtension = toLower(parameter.FileExtension);
+		parameter.FileExtension = toLowerAscii(parameter.FileExtension);
 
 		// Autonaming preference
 		parameter.Autoname.clear();
@@ -362,7 +362,7 @@ bool CPrimitiveClass::read (xmlNodePtr primitiveNode,
 		// Read the file extension
 		parameter.Folder.clear();
 		CIXml::getPropertyString (parameter.Folder, paramNode, "FOLDER");
-		parameter.Folder = toLower(parameter.Folder);
+		parameter.Folder = toLowerAscii(parameter.Folder);
 
 		// Read the combo values
 		for (	xmlNodePtr comboValueNode = CIXml::getFirstChildNode (paramNode, "COMBO_VALUES");
@@ -427,7 +427,7 @@ bool CPrimitiveClass::read (xmlNodePtr primitiveNode,
 				for (uint i=0; i<files.size (); i++)
 				{
 					// Good extension ?
-					if (toLower(NLMISC::CFile::getExtension (files[i])) != parameter.FileExtension)
+					if (toLowerAscii(NLMISC::CFile::getExtension (files[i])) != parameter.FileExtension)
 						continue;
 
 					// Add a combo value
@@ -438,7 +438,7 @@ bool CPrimitiveClass::read (xmlNodePtr primitiveNode,
 					CParameter::CConstStringValue &comboValue = insertResult.first->second;
 
 					// Get the filename without extension
-					string nameWithoutExt = toLower(NLMISC::CFile::getFilenameWithoutExtension (files[i]));
+					string nameWithoutExt = toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension (files[i]));
 
 					// Add the values
 					comboValue.Values.push_back (nameWithoutExt);
diff --git a/nel/src/ligo/primitive_configuration.cpp b/nel/src/ligo/primitive_configuration.cpp
index 3b77d9309..d85d626eb 100644
--- a/nel/src/ligo/primitive_configuration.cpp
+++ b/nel/src/ligo/primitive_configuration.cpp
@@ -105,13 +105,13 @@ bool	CPrimitiveConfigurations::belong (const IPrimitive &primitive) const
 		for (rules=0; rules<numRules; rules++)
 		{
 			const std::pair<std::string, std::string> &pairs = matchGroup.Pairs[rules];
-			string key = toLower(pairs.second);
+			string key = toLowerAscii(pairs.second);
 
 			// Get the property
 			string value;
 			if (primitive.getPropertyByName (pairs.first.c_str(), value))
 			{
-				if (toLower(value) == key)
+				if (toLowerAscii(value) == key)
 					continue;
 			}
 
@@ -122,7 +122,7 @@ bool	CPrimitiveConfigurations::belong (const IPrimitive &primitive) const
 				uint i;
 				for (i=0; i<array->size(); i++)
 				{
-					if (toLower((*array)[i]) == key)
+					if (toLowerAscii((*array)[i]) == key)
 						break;
 				}
 				if (i!=array->size())
diff --git a/nel/src/misc/big_file.cpp b/nel/src/misc/big_file.cpp
index 533d52818..7d68c18c2 100644
--- a/nel/src/misc/big_file.cpp
+++ b/nel/src/misc/big_file.cpp
@@ -128,7 +128,7 @@ void CBigFile::CThreadFileArray::currentThreadFinished()
 bool CBigFile::add (const std::string &sBigFileName, uint32 nOptions)
 {
 	// Is already the same bigfile name ?
-	string bigfilenamealone = toLower(CFile::getFilename (sBigFileName));
+	string bigfilenamealone = toLowerAscii(CFile::getFilename (sBigFileName));
 	if (_BNPs.find(bigfilenamealone) != _BNPs.end())
 	{
 		nlwarning ("CBigFile::add : bigfile %s already added.", bigfilenamealone.c_str());
@@ -315,7 +315,7 @@ bool CBigFile::BNP::readHeader(FILE *file)
 			BNPFile bnpfTmp;
 			bnpfTmp.Pos = nFilePos;
 			bnpfTmp.Size = nFileSize2;
-			tempMap.insert (make_pair(toLower(string(sFileName)), bnpfTmp));
+			tempMap.insert (make_pair(toLowerAscii(string(sFileName)), bnpfTmp));
 		}
 		else
 		{
@@ -606,7 +606,7 @@ std::string CBigFile::getBigFileName(const std::string &sBigFileName) const
 // ***************************************************************************
 void CBigFile::list (const std::string &sBigFileName, std::vector<std::string> &vAllFiles)
 {
-	string lwrFileName = toLower(sBigFileName);
+	string lwrFileName = toLowerAscii(sBigFileName);
 	if (_BNPs.find (lwrFileName) == _BNPs.end())
 		return;
 	vAllFiles.clear ();
@@ -639,7 +639,7 @@ struct CBNPFileComp
 // ***************************************************************************
 bool CBigFile::getFileInternal (const std::string &sFileName, BNP *&zeBnp, BNPFile *&zeBnpFile)
 {
-	string zeFileName, zeBigFileName, lwrFileName = toLower(sFileName);
+	string zeFileName, zeBigFileName, lwrFileName = toLowerAscii(sFileName);
 	string::size_type i, nPos = sFileName.find ('@');
 	if (nPos == string::npos)
 	{
@@ -753,7 +753,7 @@ char *CBigFile::getFileNamePtr(const std::string &sFileName, const std::string &
 		vector<BNPFile>::iterator itNBPFile;
 		if (rbnp.Files.empty())
 			return NULL;
-		string lwrFileName = toLower(sFileName);
+		string lwrFileName = toLowerAscii(sFileName);
 
 		BNPFile temp_bnp_file;
 		temp_bnp_file.Name = (char*)lwrFileName.c_str();
diff --git a/nel/src/misc/command.cpp b/nel/src/misc/command.cpp
index 1e259ca0f..d6afbcd84 100644
--- a/nel/src/misc/command.cpp
+++ b/nel/src/misc/command.cpp
@@ -466,7 +466,7 @@ void CCommandRegistry::expand (std::string &commandName, NLMISC::CLog &log)
 		useprefix = false;
 	}
 
-	string lowerCommandName = toLower(commandName);
+	string lowerCommandName = toLowerAscii(commandName);
 	// Build the list of matching command names
 	vector<string> matchingnames;
 	{
@@ -475,7 +475,7 @@ void CCommandRegistry::expand (std::string &commandName, NLMISC::CLog &log)
 			// list of global commands
 			for (TCommand::iterator comm = _Commands.begin(); comm != _Commands.end(); comm++)
 			{
-				string first = toLower((*comm).first);
+				string first = toLowerAscii((*comm).first);
 				if (first.find( lowerCommandName ) == 0)
 				{
 					matchingnames.push_back( (*comm).first );
@@ -485,7 +485,7 @@ void CCommandRegistry::expand (std::string &commandName, NLMISC::CLog &log)
 			// list of object instance
 			for (TCommandsHandlers::TAToBMap::const_iterator it(_CommandsHandlers.getAToBMap().begin()); it != _CommandsHandlers.getAToBMap().end(); ++it)
 			{
-				string first = toLower(it->first);
+				string first = toLowerAscii(it->first);
 				if (first.find( lowerCommandName ) == 0)
 				{
 					matchingnames.push_back( it->first );
@@ -507,7 +507,7 @@ void CCommandRegistry::expand (std::string &commandName, NLMISC::CLog &log)
 
 					for (TCommandHandlerClassInfo::TCommandsInfo::iterator it(chci._Commands.begin()); it != chci._Commands.end(); ++it)
 					{
-						string first = toLower(it->first);
+						string first = toLowerAscii(it->first);
 						if (first.find( lowerCommandName ) == 0)
 						{
 							matchingnames.push_back( it->first );
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index 2cdec50c8..df802e20d 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -1191,7 +1191,7 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
 
 #ifdef NL_OS_MAC
 	// special OS X case with bundles
-	if (toLower(CFile::getExtension(programName)) == ".app")
+	if (toLowerAscii(CFile::getExtension(programName)) == ".app")
 	{
 		// we need to open bundles with "open" command
 		std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
@@ -1299,7 +1299,7 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
 
 #ifdef NL_OS_MAC
 	// special OS X case with bundles
-	if (toLower(CFile::getExtension(programName)) == "app")
+	if (toLowerAscii(CFile::getExtension(programName)) == "app")
 	{
 		// we need to open bundles with "open" command
 		std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
diff --git a/nel/src/misc/i18n.cpp b/nel/src/misc/i18n.cpp
index 74558db17..188d672b3 100644
--- a/nel/src/misc/i18n.cpp
+++ b/nel/src/misc/i18n.cpp
@@ -444,7 +444,7 @@ std::string CI18N::getSystemLanguageCode ()
 			if (lang.size() > 1)
 			{
 				// only keep 2 first characters
-				lang = NLMISC::toLower(lang).substr(0, 2);
+				lang = NLMISC::toLowerAscii(lang).substr(0, 2);
 
 				// language code supported?
 				if (isLanguageCodeSupported(lang))
@@ -466,7 +466,7 @@ bool CI18N::setSystemLanguageCode (const std::string &languageCode)
 	// be sure supported languages are initialized
 	initLanguages();
 
-	std::string lang = NLMISC::toLower(languageCode);
+	std::string lang = NLMISC::toLowerAscii(languageCode);
 
 	// specified language is really a code (2 characters)
 	if (lang.length() == 2)
@@ -474,7 +474,7 @@ bool CI18N::setSystemLanguageCode (const std::string &languageCode)
 		// check if language code is supported
 		for(uint i = 0; i < _LanguageCodes.size(); ++i)
 		{
-			std::string code = NLMISC::toLower(_LanguageCodes[i]);
+			std::string code = NLMISC::toLowerAscii(_LanguageCodes[i]);
 
 			if (lang == code)
 			{
@@ -490,7 +490,7 @@ bool CI18N::setSystemLanguageCode (const std::string &languageCode)
 		// check if language name is supported
 		for(uint i = 0; i < _LanguageNames.size(); ++i)
 		{
-			std::string name = NLMISC::toLower(_LanguageNames[i]);
+			std::string name = NLMISC::toLowerAscii(_LanguageNames[i]);
 
 			if (name == lang)
 			{
diff --git a/nel/src/misc/i_xml.cpp b/nel/src/misc/i_xml.cpp
index b38601f06..2790a0590 100644
--- a/nel/src/misc/i_xml.cpp
+++ b/nel/src/misc/i_xml.cpp
@@ -180,7 +180,7 @@ bool CIXml::init (IStream &stream)
 			header[2] = buffer[2];
 			header[3] = buffer[3];
 			header[4] = '\0';
-			toLower(header);
+			toLowerAscii(header);
 
 			// Does it a xml stream ?
 			if (strcmp(header, "<?xm"))
diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index bd8190db0..2c55ac09f 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -334,8 +334,8 @@ void CFileContainer::remapExtension (const string &ext1, const string &ext2, boo
 {
 	nlassert(!_MemoryCompressed);
 
-	string ext1lwr = toLower(ext1);
-	string ext2lwr = toLower(ext2);
+	string ext1lwr = toLowerAscii(ext1);
+	string ext2lwr = toLowerAscii(ext2);
 
 	if (ext1lwr.empty() || ext2lwr.empty())
 	{
@@ -417,7 +417,7 @@ void CFileContainer::remapFile (const std::string &file1, const std::string &fil
 {
 	if (file1.empty()) return;
 	if (file2.empty()) return;
-	_RemappedFiles[toLower(file1)] = toLower(file2);
+	_RemappedFiles[toLowerAscii(file1)] = toLowerAscii(file2);
 }
 
 // ***************************************************************************
@@ -497,7 +497,7 @@ string CFileContainer::lookup (const string &filename, bool throwException, bool
 	// Try to find in the map directories
 
 	// If filename contains a path, we get only the filename to look inside paths
-	string str = CFile::getFilename(toLower(filename));
+	string str = CFile::getFilename(toLowerAscii(filename));
 
 	// Remove end spaces
 	while ((!str.empty()) && (str[str.size()-1] == ' '))
@@ -557,7 +557,7 @@ string CFileContainer::lookup (const string &filename, bool throwException, bool
 		// try with the remapping
 		for (uint j = 0; j < _Extensions.size(); j++)
 		{
-			if (toLower(CFile::getExtension (str)) == _Extensions[j].second)
+			if (toLowerAscii(CFile::getExtension (str)) == _Extensions[j].second)
 			{
 				string rs = _AlternativePaths[i] + CFile::getFilenameWithoutExtension (filename) + "." + _Extensions[j].first;
 				if ( CFile::fileExists(rs) )
@@ -599,7 +599,7 @@ bool CPath::exists (const std::string &filename)
 bool CFileContainer::exists (const std::string &filename)
 {
 	// Try to find in the map directories
-	string str = toLower(filename);
+	string str = toLowerAscii(filename);
 
 	// Remove end spaces
 	while ((!str.empty()) && (str[str.size()-1] == ' '))
@@ -1215,7 +1215,7 @@ void CFileContainer::addSearchFile (const string &file, bool remap, const string
 		// now, we have to see extension and insert in the map the remapped files
 		for (uint i = 0; i < _Extensions.size (); i++)
 		{
-			if (_Extensions[i].first == toLower(ext))
+			if (_Extensions[i].first == toLowerAscii(ext))
 			{
 				// need to remap
 				addSearchFile (newFile, true, _Extensions[i].second, progressCallBack);
@@ -1372,7 +1372,7 @@ void CFileContainer::addSearchBigFile (const string &sBigFilename, bool recurse,
 			NLMISC_BSWAP32(nFilePos);
 #endif
 
-			string sTmp = toLower(string(FileName));
+			string sTmp = toLowerAscii(string(FileName));
 			if (sTmp.empty())
 			{
 				nlwarning ("PATH: CPath::addSearchBigFile(%s, %d, %d): can't add empty file, skip it", sBigFilename.c_str(), recurse, alternative);
@@ -1380,7 +1380,7 @@ void CFileContainer::addSearchBigFile (const string &sBigFilename, bool recurse,
 			}
 			string bigfilenamealone = CFile::getFilename (sBigFilename);
 			string filenamewoext = CFile::getFilenameWithoutExtension (sTmp);
-			string ext = toLower(CFile::getExtension(sTmp));
+			string ext = toLowerAscii(CFile::getExtension(sTmp));
 
 			insertFileInMap (sTmp, bigfilenamealone + "@" + sTmp, false, ext);
 
@@ -1438,7 +1438,7 @@ void CFileContainer::addSearchStreamedPackage (const string &filename, bool recu
 	}
 
 	// Add the file itself
-	std::string packname = NLMISC::toLower(CFile::getFilename(filename));
+	std::string packname = NLMISC::toLowerAscii(CFile::getFilename(filename));
 	insertFileInMap(packname, filename, false, CFile::getExtension(filename));
 
 	// Add the package to the package manager
@@ -1525,7 +1525,7 @@ void CFileContainer::addSearchXmlpackFile (const string &sXmlpackFilename, bool
 
 			string packfilenamealone = sXmlpackFilename;
 			string filenamewoext = CFile::getFilenameWithoutExtension (filenames[i]);
-			string ext = toLower(CFile::getExtension(filenames[i]));
+			string ext = toLowerAscii(CFile::getExtension(filenames[i]));
 
 			insertFileInMap (filenames[i], packfilenamealone + "@@" + filenames[i], false, ext);
 
@@ -1570,7 +1570,7 @@ void CFileContainer::insertFileInMap (const string &filename, const string &file
 {
 	nlassert(!_MemoryCompressed);
 	// find if the file already exist
-	TFiles::iterator it = _Files.find (toLower(filename));
+	TFiles::iterator it = _Files.find (toLowerAscii(filename));
 	if (it != _Files.end ())
 	{
 		string path = SSMpath.get((*it).second.idPath);
@@ -1629,8 +1629,8 @@ void CFileContainer::insertFileInMap (const string &filename, const string &file
 		fe.idPath = SSMpath.add(sTmp);
 		fe.Name = filename;
 
-		_Files.insert (make_pair(toLower(filename), fe));
-		NL_DISPLAY_PATH("PATH: CPath::insertFileInMap(%s, %s, %d, %s): added", toLower(filename).c_str(), filepath.c_str(), remap, toLower(extension).c_str());
+		_Files.insert (make_pair(toLowerAscii(filename), fe));
+		NL_DISPLAY_PATH("PATH: CPath::insertFileInMap(%s, %s, %d, %s): added", toLowerAscii(filename).c_str(), filepath.c_str(), remap, toLowerAscii(extension).c_str());
 	}
 }
 
@@ -1690,13 +1690,13 @@ void CFileContainer::removeBigFiles(const std::vector<std::string> &bnpFilenames
 	TFiles::iterator fileIt, fileCurrIt;
 	for (uint k = 0; k < bnpFilenames.size(); ++k)
 	{
-		std::string completeBNPName = toLower(bnpFilenames[k]) + "@";
+		std::string completeBNPName = toLowerAscii(bnpFilenames[k]) + "@";
 		if (SSMpath.isAdded(completeBNPName))
 		{
 			bnpStrIds.insert(SSMpath.add(completeBNPName));
 		}
 		CBigFile::getInstance().remove(bnpFilenames[k]);
-		fileIt = _Files.find(toLower(bnpFilenames[k]));
+		fileIt = _Files.find(toLowerAscii(bnpFilenames[k]));
 		if (fileIt != _Files.end())
 		{
 			_Files.erase(fileIt);
@@ -1825,7 +1825,7 @@ void CFileContainer::memoryUncompress()
 		fe.idPath = it->idPath;
 		fe.Remapped = it->Remapped;
 
-		_Files[toLower(CFile::getFilename(fe.Name))] = fe;
+		_Files[toLowerAscii(CFile::getFilename(fe.Name))] = fe;
 	}
 	contReset(_MCFiles);
 	_MemoryCompressed = false;
diff --git a/nel/src/misc/sheet_id.cpp b/nel/src/misc/sheet_id.cpp
index 77a56c099..f84b4afb7 100644
--- a/nel/src/misc/sheet_id.cpp
+++ b/nel/src/misc/sheet_id.cpp
@@ -226,7 +226,7 @@ bool CSheetId::buildSheetId(const char *sheetName, size_t sheetNameLen)
 	// When no sheet_id.bin is loaded, use dynamically assigned IDs.
 	if (_DontHaveSheetKnowledge)
 	{
-		std::string sheetNameLc = toLower(sheetName);
+		std::string sheetNameLc = toLowerAscii(sheetName);
 		std::map<std::string, uint32>::iterator it = _DevSheetNameToId.find(sheetNameLc);
 		if (it == _DevSheetNameToId.end())
 		{
@@ -278,7 +278,7 @@ bool CSheetId::buildSheetId(const char *sheetName, size_t sheetNameLen)
 	c.Ptr = new char[sheetName.size() + 1];
 #endif
 	strcpy(c.Ptr, sheetName);
-	toLower(c.Ptr);
+	toLowerAscii(c.Ptr);
 
 	itId = _SheetNameToId.find(c);
 #ifndef alloca
@@ -381,7 +381,7 @@ void CSheetId::loadSheetId()
 			{
 				tempVec[nNb].Ptr = _AllStrings.Ptr + nSize;
 				strcpy(_AllStrings.Ptr + nSize, it->second.c_str());
-				toLower(_AllStrings.Ptr + nSize);
+				toLowerAscii(_AllStrings.Ptr + nSize);
 				nSize += (uint32)it->second.size() + 1;
 				nNb++;
 				it++;
@@ -422,7 +422,7 @@ void CSheetId::loadSheetId()
 				if (_FileExtensions[type].empty())
 				{
 					// find the file extension part of the given file name
-					_FileExtensions[type] = toLower(CFile::getExtension((*itStr).second.Ptr));
+					_FileExtensions[type] = toLowerAscii(CFile::getExtension((*itStr).second.Ptr));
 				}
 				nSize--;
 			}
@@ -826,7 +826,7 @@ uint32 CSheetId::typeFromFileExtension(const std::string &fileExtension)
 
 	uint i;
 	for (i = 0; i < _FileExtensions.size(); i++)
-		if (toLower(fileExtension) == _FileExtensions[i])
+		if (toLowerAscii(fileExtension) == _FileExtensions[i])
 			return i;
 
 	return std::numeric_limits<uint32>::max();
diff --git a/nel/src/misc/streamed_package.cpp b/nel/src/misc/streamed_package.cpp
index f7189903a..28e2db956 100644
--- a/nel/src/misc/streamed_package.cpp
+++ b/nel/src/misc/streamed_package.cpp
@@ -55,7 +55,7 @@ void CStreamedPackage::CEntry::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 void CStreamedPackage::makePath(std::string &result, const CHashKey &hash)
 {
-	std::string lowerHash = NLMISC::toLower(hash.toString());
+	std::string lowerHash = NLMISC::toLowerAscii(hash.toString());
 	result = std::string("/") + lowerHash.substr(0, 2)
 		+ "/" + lowerHash.substr(2, 2)
 		+ "/" + lowerHash.substr(4);
diff --git a/nel/src/misc/streamed_package_manager.cpp b/nel/src/misc/streamed_package_manager.cpp
index 3fe497e3e..aa36a8ec6 100644
--- a/nel/src/misc/streamed_package_manager.cpp
+++ b/nel/src/misc/streamed_package_manager.cpp
@@ -41,7 +41,7 @@ bool CStreamedPackageManager::loadPackage(const std::string &package)
 {
 	nldebug("Load package '%s'", package.c_str());
 
-	std::string packname = NLMISC::toLower(CFile::getFilename(package));
+	std::string packname = NLMISC::toLowerAscii(CFile::getFilename(package));
 	m_Packages[packname] = CStreamedPackage();
 	std::map<std::string, CStreamedPackage>::iterator it = m_Packages.find(packname);
 	CStreamedPackage &p = it->second;
diff --git a/nel/src/misc/string_common.cpp b/nel/src/misc/string_common.cpp
index 9e6459677..bb39c747b 100644
--- a/nel/src/misc/string_common.cpp
+++ b/nel/src/misc/string_common.cpp
@@ -90,7 +90,7 @@ bool fromString(const std::string &str, bool &val)
 	}
 	else
 	{
-		std::string strl = toLower(str);
+		std::string strl = toLowerAscii(str);
 		if (strl == "true" || strl == "yes")
 		{
 			val = true;
diff --git a/nel/src/misc/system_info.cpp b/nel/src/misc/system_info.cpp
index fb192cc43..762904443 100644
--- a/nel/src/misc/system_info.cpp
+++ b/nel/src/misc/system_info.cpp
@@ -1690,7 +1690,7 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 						}
 						else
 						{
-							string::size_type pos = toLower(keyPath).find ("\\device");
+							string::size_type pos = toLowerAscii(keyPath).find ("\\device");
 							if (pos != string::npos)
 								keyPath = keyPath.substr (0, pos+1);
 							keyName = "ImagePath";
@@ -1703,7 +1703,7 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 					}
 
 					// Format the key path
-					if (toLower(keyPath).find ("\\registry\\machine") == 0)
+					if (toLowerAscii(keyPath).find ("\\registry\\machine") == 0)
 					{
 						keyPath = "HKEY_LOCAL_MACHINE" + keyPath.substr (strlen ("\\registry\\machine"));
 					}
diff --git a/nel/src/net/email.cpp b/nel/src/net/email.cpp
index f402edd65..8d2854125 100644
--- a/nel/src/net/email.cpp
+++ b/nel/src/net/email.cpp
@@ -225,7 +225,7 @@ bool sendEmail (const string &smtpServer, const string &from, const string &to,
 			formatedBody += "--Multipart_nel\r\n";
 			formatedBody += "Content-Disposition: attachment;\r\n";
 
-			string lext = toLower(ext);
+			string lext = toLowerAscii(ext);
 			if(lext == "tga")
 			{
 				formatedBody += "Content-Type: image/x-targa;\r\n";
diff --git a/nel/src/net/service.cpp b/nel/src/net/service.cpp
index 04e160f22..1bbe71469 100644
--- a/nel/src/net/service.cpp
+++ b/nel/src/net/service.cpp
@@ -708,7 +708,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName,
 			// we create the log with service name filename ("test_service_ALIAS.log" for example)
 			string logname = LogDirectory.toString() + _LongName;
 			if (haveArg('N'))
-				logname += "_" + toLower(getArg('N'));
+				logname += "_" + toLowerAscii(getArg('N'));
 			logname += ".log";
 			fd.setParam (logname, false);
 
diff --git a/nel/src/sound/audio_decoder.cpp b/nel/src/sound/audio_decoder.cpp
index 57fc8ead8..4f264ccaf 100644
--- a/nel/src/sound/audio_decoder.cpp
+++ b/nel/src/sound/audio_decoder.cpp
@@ -89,7 +89,7 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
 		return NULL;
 	}
 #else
-	std::string type_lower = toLower(type);
+	std::string type_lower = toLowerAscii(type);
 	if (type_lower == "ogg")
 	{
 		return new CAudioDecoderVorbis(stream, loop);
@@ -124,7 +124,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		return CAudioDecoderFfmpeg::getInfo(&ifile, artist, title, length);
 #else
 	std::string type = CFile::getExtension(filepath);
-	std::string type_lower = NLMISC::toLower(type);
+	std::string type_lower = NLMISC::toLowerAscii(type);
 
 	if (type_lower == "ogg")
 	{
diff --git a/nel/src/sound/audio_mixer_user.cpp b/nel/src/sound/audio_mixer_user.cpp
index 50f99f5d0..5d037750b 100644
--- a/nel/src/sound/audio_mixer_user.cpp
+++ b/nel/src/sound/audio_mixer_user.cpp
@@ -371,7 +371,7 @@ void CAudioMixerUser::init(uint maxTrack, bool useEax, bool useADPCM, IProgressC
 /// Initialize the NeL Sound Driver with given driverName.
 void CAudioMixerUser::initDriver(const std::string &driverName)
 {
-	std::string dn = NLMISC::toLower(driverName);
+	std::string dn = NLMISC::toLowerAscii(driverName);
 	nldebug("AM: Init Driver '%s' ('%s')...", driverName.c_str(), dn.c_str());
 
 	ISoundDriver::TDriver driverType;
diff --git a/nel/src/sound/group_controller_root.cpp b/nel/src/sound/group_controller_root.cpp
index 1cf124429..a32f87d78 100644
--- a/nel/src/sound/group_controller_root.cpp
+++ b/nel/src/sound/group_controller_root.cpp
@@ -90,7 +90,7 @@ bool CGroupControllerRoot::isReservedName(const std::string &nodeName)
 CGroupController *CGroupControllerRoot::getGroupController(const std::string &path)
 {
 	std::vector<std::string> pathNodes;
-	NLMISC::splitString(NLMISC::toLower(path), ":", pathNodes);
+	NLMISC::splitString(NLMISC::toLowerAscii(path), ":", pathNodes);
 	CGroupController *active = this;
 	if (pathNodes[0] != NLSOUND_GROUP_CONTROLLER_ROOT_PATH)
 	{
diff --git a/ryzom/client/src/animation_fx.cpp b/ryzom/client/src/animation_fx.cpp
index 8f716d64e..b87464cb3 100644
--- a/ryzom/client/src/animation_fx.cpp
+++ b/ryzom/client/src/animation_fx.cpp
@@ -65,7 +65,7 @@ void CAnimationFX::buildTrack(NL3D::UAnimationSet *as)
 	nlassert(Sheet != NULL);
 	if (!as) return;
 	if (Sheet->TrajectoryAnim.empty()) return;
-	std::string animName = NLMISC::toLower(Sheet->TrajectoryAnim);
+	std::string animName = NLMISC::toLowerAscii(Sheet->TrajectoryAnim);
 	uint id = as->getAnimationIdByName(animName);
 	NL3D::UAnimation *anim = NULL;
 	if (id != NL3D::UAnimationSet::NotFound)
diff --git a/ryzom/client/src/auto_anim.cpp b/ryzom/client/src/auto_anim.cpp
index 9676742bb..71b6116ea 100644
--- a/ryzom/client/src/auto_anim.cpp
+++ b/ryzom/client/src/auto_anim.cpp
@@ -84,7 +84,7 @@ void initAutoAnimation()
 			file.getline(line, 512);
 
 			// Read the animation file
-			string animName = toLower(CFile::getFilenameWithoutExtension(line));
+			string animName = toLowerAscii(CFile::getFilenameWithoutExtension(line));
 			uint id = AutoAnimSet->addAnimation (line, animName.c_str ());
 			if (id == UAnimationSet::NotFound)
 			{
diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 411795200..401dacad0 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -617,7 +617,7 @@ uint32 CCharacterCL::buildEquipment(const CCharacterSheet::CEquipment &slot, SLO
 	{
 		// IS the item a valid one ?
 		CSheetId itemId;
-		if(itemId.buildSheetId(NLMISC::toLower(slot.getItem())))
+		if(itemId.buildSheetId(NLMISC::toLowerAscii(slot.getItem())))
 		{
 			// Is it stored in the database ?
 			CEntitySheet *entitySheet = SheetMngr.get(itemId);
@@ -1105,7 +1105,7 @@ string CCharacterCL::automatonType() const	// virtual
 //-----------------------------------------------
 void CCharacterCL::computeAutomaton()
 {
-	_CurrentAutomaton = automatonType() + "_" + NLMISC::toLower(MBEHAV::modeToString(_Mode)) + ".automaton";
+	_CurrentAutomaton = automatonType() + "_" + NLMISC::toLowerAscii(MBEHAV::modeToString(_Mode)) + ".automaton";
 }// computeAutomaton //
 
 
@@ -10250,11 +10250,11 @@ NLMISC_COMMAND(setNamePosZ, "", "<low/high/normal> <value>")
 			CRaceStatsSheet *sheet = const_cast<CRaceStatsSheet*>(playerTarget->playerSheet());
 			if (sheet)
 			{
-				if (toLower(args[0]) == "low")
+				if (toLowerAscii(args[0]) == "low")
 					namePosZ = &sheet->GenderInfos[playerTarget->getGender()].NamePosZLow;
-				else if (toLower(args[0]) == "normal")
+				else if (toLowerAscii(args[0]) == "normal")
 					namePosZ = &sheet->GenderInfos[playerTarget->getGender()].NamePosZNormal;
-				else if (toLower(args[0]) == "high")
+				else if (toLowerAscii(args[0]) == "high")
 					namePosZ = &sheet->GenderInfos[playerTarget->getGender()].NamePosZHigh;
 
 				sheetName = sheet->Id.toString();
@@ -10270,11 +10270,11 @@ NLMISC_COMMAND(setNamePosZ, "", "<low/high/normal> <value>")
 			CCharacterSheet *sheet = const_cast<CCharacterSheet*>(creatureTarget->getSheet());
 			if (sheet)
 			{
-				if (toLower(args[0]) == "low")
+				if (toLowerAscii(args[0]) == "low")
 					namePosZ = &sheet->NamePosZLow;
-				else if (toLower(args[0]) == "normal")
+				else if (toLowerAscii(args[0]) == "normal")
 					namePosZ = &sheet->NamePosZNormal;
-				else if (toLower(args[0]) == "high")
+				else if (toLowerAscii(args[0]) == "high")
 					namePosZ = &sheet->NamePosZHigh;
 
 				sheetName = sheet->Id.toString();
@@ -10301,11 +10301,11 @@ NLMISC_COMMAND(setMyNamePosZ, "", "<low/high/normal> <value>")
 	CRaceStatsSheet *sheet = const_cast<CRaceStatsSheet*>(UserEntity->playerSheet());
 	if (sheet)
 	{
-		if (toLower(args[0]) == "low")
+		if (toLowerAscii(args[0]) == "low")
 			namePosZ = &sheet->GenderInfos[UserEntity->getGender()].NamePosZLow;
-		else if (toLower(args[0]) == "normal")
+		else if (toLowerAscii(args[0]) == "normal")
 			namePosZ = &sheet->GenderInfos[UserEntity->getGender()].NamePosZNormal;
-		else if (toLower(args[0]) == "high")
+		else if (toLowerAscii(args[0]) == "high")
 			namePosZ = &sheet->GenderInfos[UserEntity->getGender()].NamePosZHigh;
 
 		sheetName = sheet->Id.toString();
diff --git a/ryzom/client/src/client.cpp b/ryzom/client/src/client.cpp
index e824f6529..da9eb8a54 100644
--- a/ryzom/client/src/client.cpp
+++ b/ryzom/client/src/client.cpp
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
 		uint i;
 		for (i=0; i<files.size(); i++)
 		{
-			if (toLower(CFile::getExtension (files[i])) == "ttf")
+			if (toLowerAscii(CFile::getExtension (files[i])) == "ttf")
 				CFile::deleteFile (files[i]);
 		}
 	}
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index 95bc6306b..8e46e028a 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -1436,7 +1436,7 @@ void CClientConfig::setValues()
 				else if (stricmp(mode, "centeraround") == 0)	p.Mode = SSysInfoParam::CenterAround;
 				else if (stricmp(mode, "around") == 0)	p.Mode = SSysInfoParam::Around;
 
-				ClientCfg.SystemInfoParams[toLower(sic->asString(2 * k))] = p;
+				ClientCfg.SystemInfoParams[toLowerAscii(sic->asString(2 * k))] = p;
 			}
 		}
 	}
@@ -1859,7 +1859,7 @@ void CClientConfig::setValues()
 		ClientCfg.HardwareCursors.clear ();
 		int iSz = pcvHardwareCursors->size();
 		for (int i = 0; i < iSz; i++)
-			ClientCfg.HardwareCursors.insert(toLower(pcvHardwareCursors->asString(i)));
+			ClientCfg.HardwareCursors.insert(toLowerAscii(pcvHardwareCursors->asString(i)));
 	}
 	else
 	{
diff --git a/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
index 013847fa2..2d9c9564d 100644
--- a/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
+++ b/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
@@ -204,7 +204,7 @@ void CAutomatonStateSheet::build(const NLGEORGES::UFormElm &item, const string &
 	for(uint mode = 0; mode<MBEHAV::NUMBER_OF_MODES; ++mode)
 	{
 		string animset;
-		animset = NLMISC::toLower(MBEHAV::modeToString((MBEHAV::EMode)mode));
+		animset = NLMISC::toLowerAscii(MBEHAV::modeToString((MBEHAV::EMode)mode));
 		if(animset != "unknown_mode")
 		{
 			string resultTransition;
@@ -495,9 +495,9 @@ void CAutomatonListSheet::build(const NLGEORGES::UFormElm &rootList)
 				for(uint mode = 0; mode<MBEHAV::NUMBER_OF_MODES; ++mode)
 				{
 					// Get the Mode Name
-					string modeName = NLMISC::toLower(MBEHAV::modeToString((MBEHAV::EMode)mode));
+					string modeName = NLMISC::toLowerAscii(MBEHAV::modeToString((MBEHAV::EMode)mode));
 					// Compute the automaton name
-					string filename = NLMISC::toLower(automatonType) + "_" + modeName + ".automaton";
+					string filename = NLMISC::toLowerAscii(automatonType) + "_" + modeName + ".automaton";
 					// Push some information
 					nlinfo("loading automaton '%s'.", filename.c_str());
 					// Load the automaton's form.
diff --git a/ryzom/client/src/client_sheets/character_sheet.cpp b/ryzom/client/src/client_sheets/character_sheet.cpp
index 2568717f9..e0a0bb76c 100644
--- a/ryzom/client/src/client_sheets/character_sheet.cpp
+++ b/ryzom/client/src/client_sheets/character_sheet.cpp
@@ -129,7 +129,7 @@ void CCharacterSheet::readEquipment(const NLGEORGES::UFormElm &form, const strin
 	string itemName;
 	if(!form.getValueByName(itemName, string(key + ".Item").c_str() ))
 		debug(NLMISC::toString("Key '%s.Item' not found.", key.c_str()));
-	slot.IdItem = ClientSheetsStrings.add(NLMISC::toLower(itemName));
+	slot.IdItem = ClientSheetsStrings.add(NLMISC::toLowerAscii(itemName));
 
 	// Get the texture.
 	if(!form.getValueByName(slot.Texture, string(key + ".Texture").c_str() ))
@@ -221,7 +221,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 		std::string	right;
 		item.getValueByName(right, "item_right");
 		if (!right.empty())
-			ObjectInRightHand.IdItem = ClientSheetsStrings.add(NLMISC::toLower(right));
+			ObjectInRightHand.IdItem = ClientSheetsStrings.add(NLMISC::toLowerAscii(right));
 	}
 
 	if (!ObjectInLeftHand.IdItem)
@@ -229,7 +229,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 		std::string	left;
 		item.getValueByName(left, "item_left");
 		if (!left.empty())
-			ObjectInLeftHand.IdItem = ClientSheetsStrings.add(NLMISC::toLower(left));
+			ObjectInLeftHand.IdItem = ClientSheetsStrings.add(NLMISC::toLowerAscii(left));
 	}
 
 	// Get the animation set Base Name.
@@ -239,7 +239,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 		if(AnimSetBaseName.empty())
 			debug("AnimSetBaseName is Empty.");
 		else
-			AnimSetBaseName = NLMISC::toLower(AnimSetBaseName); // Force the CASE in UPPER to not be CASE SENSITIVE.
+			AnimSetBaseName = NLMISC::toLowerAscii(AnimSetBaseName); // Force the CASE in UPPER to not be CASE SENSITIVE.
 	}
 	else
 		debug("Key '3d data.AnimSetBaseName' not found.");
@@ -253,7 +253,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 			debug("Automaton is Empty.");
 		// Lower Case
 		else
-			Automaton = NLMISC::toLower(Automaton);
+			Automaton = NLMISC::toLowerAscii(Automaton);
 	}
 	// Key not Found
 	else
diff --git a/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
index 0bc47d947..514282b23 100644
--- a/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -240,28 +240,28 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	string IconMain;
 	if(!item.getValueByName (IconMain, "3d.icon"))
 		debug("key '3d.icon' not found.");
-	IconMain = toLower(IconMain);
+	IconMain = toLowerAscii(IconMain);
 	IdIconMain = ClientSheetsStrings.add(IconMain);
 
 	// Get the icon associated.
 	string IconBack;
 	if(!item.getValueByName (IconBack, "3d.icon background"))
 		debug("key '3d.icon background' not found.");
-	IconBack = toLower(IconBack);
+	IconBack = toLowerAscii(IconBack);
 	IdIconBack = ClientSheetsStrings.add(IconBack);
 
 	// Get the icon associated.
 	string IconOver;
 	if(!item.getValueByName (IconOver, "3d.icon overlay"))
 		debug("key '3d.icon overlay' not found.");
-	IconOver = toLower(IconOver);
+	IconOver = toLowerAscii(IconOver);
 	IdIconOver = ClientSheetsStrings.add(IconOver);
 
 	// Get the icon associated.
 	string IconOver2;
 	if(!item.getValueByName (IconOver2, "3d.icon overlay2"))
 		debug("key '3d.icon overlay2' not found.");
-	IconOver2 = toLower(IconOver2);
+	IconOver2 = toLowerAscii(IconOver2);
 	IdIconOver2 = ClientSheetsStrings.add(IconOver2);
 
 	// Get Special modulate colors
@@ -274,7 +274,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	string IconText;
 	if(!item.getValueByName (IconText, "3d.text overlay"))
 		debug("key '3d.text overlay' not found.");
-	IconText = toLower(IconText);
+	IconText = toLowerAscii(IconText);
 	IdIconText = ClientSheetsStrings.add(IconText);
 
 	// See if this item can be hiden when equipped
@@ -366,7 +366,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 		debug("key '3d.anim_set' not found.");
 	// Force the CASE in UPPER to not be CASE SENSITIVE.
 	else
-		AnimSet = NLMISC::toLower(AnimSet);
+		AnimSet = NLMISC::toLowerAscii(AnimSet);
 	IdAnimSet = ClientSheetsStrings.add(AnimSet);
 
 	// Get the Trail Shape
@@ -381,28 +381,28 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	string Effect1;
 	if(!item.getValueByName(Effect1, "Effects.Effect1"))
 		debug("key 'Effects.Effect1' not found.");
-	Effect1 = toLower(Effect1);
+	Effect1 = toLowerAscii(Effect1);
 	IdEffect1 = ClientSheetsStrings.add(Effect1);
 
 	// Get special Effect2
 	string Effect2;
 	if(!item.getValueByName(Effect2, "Effects.Effect2"))
 		debug("key 'Effects.Effect2' not found.");
-	Effect2 = toLower(Effect2);
+	Effect2 = toLowerAscii(Effect2);
 	IdEffect2 = ClientSheetsStrings.add(Effect2);
 
 	// Get special Effect3
 	string Effect3;
 	if(!item.getValueByName(Effect3, "Effects.Effect3"))
 		debug("key 'Effects.Effect3' not found.");
-	Effect3 = toLower(Effect3);
+	Effect3 = toLowerAscii(Effect3);
 	IdEffect3 = ClientSheetsStrings.add(Effect3);
 
 	// Get special Effect4
 	string Effect4;
 	if(!item.getValueByName(Effect4, "Effects.Effect4"))
 		debug("key 'Effects.Effect4' not found.");
-	Effect4 = toLower(Effect4);
+	Effect4 = toLowerAscii(Effect4);
 	IdEffect4 = ClientSheetsStrings.add(Effect4);
 
 	// Get its bulk
diff --git a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
index 841a57aad..42083c83f 100644
--- a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
+++ b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
@@ -110,28 +110,28 @@ void COutpostBuildingSheet::build(const NLGEORGES::UFormElm &root)
 	string IconMain;
 	if(!root.getValueByName (IconMain, "icon"))
 		debug("key 'icon' not found.");
-	IconMain = toLower(IconMain);
+	IconMain = toLowerAscii(IconMain);
 	IdIconMain = ClientSheetsStrings.add(IconMain);
 
 	// Get the icon associated.
 	string IconBack;
 	if(!root.getValueByName (IconBack, "icon background"))
 		debug("key 'icon background' not found.");
-	IconBack = toLower(IconBack);
+	IconBack = toLowerAscii(IconBack);
 	IdIconBack = ClientSheetsStrings.add(IconBack);
 
 	// Get the icon associated.
 	string IconOver;
 	if(!root.getValueByName (IconOver, "icon overlay"))
 		debug("key 'icon overlay' not found.");
-	IconOver = toLower(IconOver);
+	IconOver = toLowerAscii(IconOver);
 	IdIconOver = ClientSheetsStrings.add(IconOver);
 
 	// Get the icon text associated.
 	string IconText;
 	if(!root.getValueByName (IconText, "text overlay"))
 		debug("key 'text overlay' not found.");
-	IconText = toLower(IconText);
+	IconText = toLowerAscii(IconText);
 	IdIconText = ClientSheetsStrings.add(IconText);
 }
 
diff --git a/ryzom/client/src/client_sheets/player_sheet.cpp b/ryzom/client/src/client_sheets/player_sheet.cpp
index d339f99cb..03bddd9dd 100644
--- a/ryzom/client/src/client_sheets/player_sheet.cpp
+++ b/ryzom/client/src/client_sheets/player_sheet.cpp
@@ -74,7 +74,7 @@ void CPlayerSheet::build(const NLGEORGES::UFormElm &item)
 		debug("Key 'AnimSetBaseName' not found.");
 	// Force the CASE in UPPER to not be CASE SENSITIVE.
 	else
-		AnimSetBaseName = NLMISC::toLower(AnimSetBaseName);
+		AnimSetBaseName = NLMISC::toLowerAscii(AnimSetBaseName);
 
 	// Load Lod character name
 	if(!item.getValueByName(LodCharacterName, "LodCharacterName"))
@@ -240,7 +240,7 @@ void CPlayerSheet::CEquipment::build(const std::string &key,const NLGEORGES::UFo
 	if(!item.getValueByName(itemName, string(key + ".Item").c_str() ))
 		debug(NLMISC::toString("Key '%s.Item' not found.", key.c_str()));
 	else
-		Item = NLMISC::toLower(itemName);
+		Item = NLMISC::toLowerAscii(itemName);
 
 	// Get the color.
 	if(!item.getValueByName(Color, string(key + ".Color").c_str() ))
diff --git a/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
index c60d1c03c..53d875cab 100644
--- a/ryzom/client/src/client_sheets/sbrick_sheet.cpp
+++ b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
@@ -113,22 +113,22 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 	// read icons
 	string Icon;
 	root.getValueByName (Icon, "Client.Icon" );
-	Icon = toLower(Icon);
+	Icon = toLowerAscii(Icon);
 	IdIcon = ClientSheetsStrings.add(Icon);
 
 	string IconBack;
 	root.getValueByName (IconBack, "Client.IconBack" );
-	IconBack = toLower(IconBack);
+	IconBack = toLowerAscii(IconBack);
 	IdIconBack = ClientSheetsStrings.add(IconBack);
 
 	string IconOver;
 	root.getValueByName (IconOver, "Client.IconOver" );
-	IconOver = toLower(IconOver);
+	IconOver = toLowerAscii(IconOver);
 	IdIconOver = ClientSheetsStrings.add(IconOver);
 
 	string IconOver2;
 	root.getValueByName (IconOver2, "Client.IconOver2" );
-	IconOver2 = toLower(IconOver2);
+	IconOver2 = toLowerAscii(IconOver2);
 	IdIconOver2 = ClientSheetsStrings.add(IconOver2);
 
 	root.getValueByName (IconColor, "Client.IconColor" );
@@ -312,7 +312,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 	BrickRequiredFlags= 0;
 	for(i=0;i<Properties.size();i++)
 	{
-		string text= NLMISC::toLower(Properties[i].Text);
+		string text= NLMISC::toLowerAscii(Properties[i].Text);
 
 		// If the property is an opening property
 		const	string	openingProp[]= { "opening_1:", "opening_2:", "opening_3:" };
@@ -381,7 +381,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 	for(i=0;i<listBrick.size();i++)
 	{
 		CSheetId	sheetId;
-		string	str= toLower(listBrick[i]);
+		string	str= toLowerAscii(listBrick[i]);
 		if(str.find(".sbrick")==string::npos)
 			str+= ".sbrick";
 		sheetId.buildSheetId(str);
@@ -402,7 +402,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 	// **** Magic only: try to get a ResistType against this brick
 	for(i=0;i<Properties.size();i++)
 	{
-		string text= toLower(Properties[i].Text);
+		string text= toLowerAscii(Properties[i].Text);
 
 		// *** If the property is a DamageType
 		const string	dmgTypeProp= "ma_dmg_type:";
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index ea14537be..46f494660 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -1090,7 +1090,7 @@ NLMISC_COMMAND(verbose, "Enable/Disable some Debug Information", "none or magic"
 	}
 	else
 	{
-		std::string type = NLMISC::toLower(args[0]);
+		std::string type = NLMISC::toLowerAscii(args[0]);
 		if     (type == "none")
 			Verbose = VerboseNone;
 		else if(type == "magic")
@@ -1424,7 +1424,7 @@ NLMISC_COMMAND(ah, "Launch an action handler", "<ActionHandler> <AHparam>")
 	if (args.empty())
 		return false;
 
-	if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua")
+	if (!ClientCfg.AllowDebugLua && toLowerAscii(args[0]) == "lua")
 	{
 		return false; // not allowed!!
 	}
@@ -1981,7 +1981,7 @@ NLMISC_COMMAND(pos, "Change the position of the user (in local only)", "<x, y, (
 	if(args.size() == 1)
 	{
 		string dest = args[0];
-		newPos = CTeleport::getPos(NLMISC::toLower(dest));
+		newPos = CTeleport::getPos(NLMISC::toLowerAscii(dest));
 		if(newPos == CTeleport::Unknown)
 		{
 			//here we try to teleport to a bot destination
@@ -5666,7 +5666,7 @@ NLMISC_COMMAND(dumpShapeMaxDist, "dump max dist for shapes", "")
 			cs->getWholeEquipmentList(equipList);
 			for (uint k = 0; k < equipList.size(); ++k)
 			{
-				std::string item = toLower(equipList[k]->getItem());
+				std::string item = toLowerAscii(equipList[k]->getItem());
 				if (!item.empty())
 				{
 
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index e31bd37fd..431cdb2ee 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -306,9 +306,9 @@ void	CSoundGlobalMenu::updateSound()
 	// **** update the music played
 	// The first music played is the music played at loading, before select char
 	if (_MusicPlayed.empty())
-		_MusicPlayed = toLower(LoadingMusic.empty() ? ClientCfg.StartMusic : LoadingMusic);
+		_MusicPlayed = toLowerAscii(LoadingMusic.empty() ? ClientCfg.StartMusic : LoadingMusic);
 	if (_MusicWanted.empty())
-		_MusicWanted = toLower(LoadingMusic.empty() ? ClientCfg.StartMusic : LoadingMusic);
+		_MusicWanted = toLowerAscii(LoadingMusic.empty() ? ClientCfg.StartMusic : LoadingMusic);
 
 	// because music is changed when the player select other race for instance,
 	// wait the 3D to load (stall some secs)
@@ -335,7 +335,7 @@ void	CSoundGlobalMenu::updateSound()
 
 void	CSoundGlobalMenu::setMusic(const string &music, bool async)
 {
-	_MusicWanted= toLower(music);
+	_MusicWanted= toLowerAscii(music);
 	_MusicWantedAsync= async;
 	// reset the counter
 	_NbFrameBeforeChange= NbFrameBeforeChangeMax;
diff --git a/ryzom/client/src/continent.cpp b/ryzom/client/src/continent.cpp
index 07fd6155a..6f8eeceaf 100644
--- a/ryzom/client/src/continent.cpp
+++ b/ryzom/client/src/continent.cpp
@@ -547,7 +547,7 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress
 				// Associate IGs with the ZC number or -1 if there is no ZC.
 				for(uint i = 0; i<igsWithNames.size(); ++i)
 				{
-					string igZone = toLower(CFile::getFilenameWithoutExtension(igsWithNames[i].second));
+					string igZone = toLowerAscii(CFile::getFilenameWithoutExtension(igsWithNames[i].second));
 
 					// Search for the IG name in the ZC list to associate.
 					for(uint j = 0; j<ZCList.size(); ++j)
@@ -557,7 +557,7 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress
 						if (outpost)
 						{
 							// If name matching -> this zone should be a ZC.
-							string outpostZone = toLower(CFile::getFilenameWithoutExtension(ZCList[j].Name));
+							string outpostZone = toLowerAscii(CFile::getFilenameWithoutExtension(ZCList[j].Name));
 							if(igZone == outpostZone)
 							{
 								nlctassert(RZ_MAX_BUILDING_PER_OUTPOST==4);
@@ -833,7 +833,7 @@ void CContinent::reloadFogMap()
 	const R2::CScenarioEntryPoints::CCompleteIsland *completeIsland = R2::CScenarioEntryPoints::getInstance().getCompleteIslandFromCoords(CVector2f((float) UserEntity->pos().x, (float) UserEntity->pos().y));
 	if (completeIsland)
 	{
-		std::string islandName = toLower(completeIsland->Island);
+		std::string islandName = toLowerAscii(completeIsland->Island);
 		std::string::size_type lastPos = islandName.find_last_of("_");
 		if (lastPos != std::string::npos)
 		{
diff --git a/ryzom/client/src/continent_manager.cpp b/ryzom/client/src/continent_manager.cpp
index 4bdb470f3..7148dfcd9 100644
--- a/ryzom/client/src/continent_manager.cpp
+++ b/ryzom/client/src/continent_manager.cpp
@@ -187,7 +187,7 @@ void CContinentManager::preloadSheets()
 	for (i = 0; i < ws->ContLocs.size(); ++i)
 	{
 		const SContLoc &clTmp = ws->ContLocs[i];
-		std::string continentSheetName = NLMISC::toLower(clTmp.ContinentName);
+		std::string continentSheetName = NLMISC::toLowerAscii(clTmp.ContinentName);
 		if (continentSheetName.find(".continent") == std::string::npos)
 		{
 			continentSheetName += ".continent";
@@ -564,7 +564,7 @@ void CContinentManager::readFrom(xmlNodePtr node)
 		nlwarning("Ignore landmarks group without 'type' attribute.");
 		return;
 	}
-	lmtype = toLower((const char*)prop);
+	lmtype = toLowerAscii((const char*)prop);
 	if (lmtype != "user")
 	{
 		nlwarning("Ignore landmarks group with type '%s', expected 'user'.", lmtype.c_str());
diff --git a/ryzom/client/src/door_manager.cpp b/ryzom/client/src/door_manager.cpp
index 64b1d65a5..24641f9e0 100644
--- a/ryzom/client/src/door_manager.cpp
+++ b/ryzom/client/src/door_manager.cpp
@@ -248,7 +248,7 @@ void CDoorManager::SDoor::checkToClose()
 std::string CDoorManager::transformName (uint /* index */, const std::string &/* instanceName */, const std::string &shapeName)
 {
 	if (shapeName.rfind('.') == string::npos) return shapeName;
-	string sExt = toLower(shapeName.substr(shapeName.rfind('.')+1,shapeName.size()));
+	string sExt = toLowerAscii(shapeName.substr(shapeName.rfind('.')+1,shapeName.size()));
 	if (sExt != "pacs_prim") return shapeName;
 	return ""; // Do not load a pacs prim as a mesh...
 }
@@ -265,7 +265,7 @@ void CDoorManager::loadedCallback (NL3D::UInstanceGroup *ig)
 		string sShapeName = ig->getShapeName(k);
 		if (sShapeName.rfind('.') == string::npos) continue;
 
-		string sExt = toLower(sShapeName.substr(sShapeName.rfind('.')+1,sShapeName.size()));
+		string sExt = toLowerAscii(sShapeName.substr(sShapeName.rfind('.')+1,sShapeName.size()));
 		if (sExt != "pacs_prim") continue;
 
 		// Check if the pacs_prim is a door detection
@@ -347,7 +347,7 @@ void CDoorManager::loadedCallback (NL3D::UInstanceGroup *ig)
 						case SDoor::Matis3PartBourgeon:
 						{
 							string sDebug = ig->getShapeName(i);
-							sDebug = toLower(sDebug.substr(sDebug.rfind('_')+1,sDebug.size()));
+							sDebug = toLowerAscii(sDebug.substr(sDebug.rfind('_')+1,sDebug.size()));
 							if (sDebug == "gauche")
 								pDoor->Instances[0] = i;
 							else if (sDebug == "droite")
@@ -360,7 +360,7 @@ void CDoorManager::loadedCallback (NL3D::UInstanceGroup *ig)
 						case SDoor::Zorai2Part:
 						{
 							string sDebug = ig->getShapeName(i);
-							sDebug = toLower(sDebug.substr(sDebug.rfind('_')+1,sDebug.size()));
+							sDebug = toLowerAscii(sDebug.substr(sDebug.rfind('_')+1,sDebug.size()));
 							if (sDebug == "gauche")
 								pDoor->Instances[0] = i;
 							else if (sDebug == "droite")
diff --git a/ryzom/client/src/entity_animation_manager.cpp b/ryzom/client/src/entity_animation_manager.cpp
index 02ed9969b..51bc5304a 100644
--- a/ryzom/client/src/entity_animation_manager.cpp
+++ b/ryzom/client/src/entity_animation_manager.cpp
@@ -205,7 +205,7 @@ void CEntityAnimationManager::load(NLMISC::IProgressCallback &/* progress */, bo
 	for (uint32 i = 0; i < pASLS->AnimSetList.size(); ++i)
 	{
 		CAnimationSet as;
-		string sTmp = toLower(pASLS->AnimSetList[i].Name);
+		string sTmp = toLowerAscii(pASLS->AnimSetList[i].Name);
 		sTmp = sTmp.substr(0,sTmp.rfind('.'));
 		pair<map<string,CAnimationSet>::iterator, bool> it;
 		it = _AnimSet.insert(pair<string,CAnimationSet>(sTmp,as));
diff --git a/ryzom/client/src/ground_fx_manager.cpp b/ryzom/client/src/ground_fx_manager.cpp
index ac5e540e3..0eb68bcc5 100644
--- a/ryzom/client/src/ground_fx_manager.cpp
+++ b/ryzom/client/src/ground_fx_manager.cpp
@@ -524,7 +524,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos)
 		}
 		if (!fxName.empty())
 		{
-			stdFXName = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(fxName));
+			stdFXName = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(fxName));
 		}
 		// is an fx already attached to the entity ?
 		if (_SortedInstances[k]->HasFX)
diff --git a/ryzom/client/src/hair_set.cpp b/ryzom/client/src/hair_set.cpp
index 5d44e2857..ba687a5b1 100644
--- a/ryzom/client/src/hair_set.cpp
+++ b/ryzom/client/src/hair_set.cpp
@@ -50,7 +50,7 @@ void CHairSet::init (NLMISC::IProgressCallback &progress)
 			if (item->getShape().find("cheveux", 0) != std::string::npos)
 			{
 				// get race
-				std::string itemName = NLMISC::toLower(item->getShape());
+				std::string itemName = NLMISC::toLowerAscii(item->getShape());
 
 				// fortunately, first character of each race is distinct
 				switch(itemName[0])
diff --git a/ryzom/client/src/ig_callback.cpp b/ryzom/client/src/ig_callback.cpp
index bf7b41625..9632f2fcf 100644
--- a/ryzom/client/src/ig_callback.cpp
+++ b/ryzom/client/src/ig_callback.cpp
@@ -200,7 +200,7 @@ void CIGCallback::CIGInstance::instanceGroupAdded()
 	uint numInstances = _IG->getNumInstance();
 	for(uint k = 0; k < numInstances; ++k)
 	{
-		TPacsPrimMap::iterator pbIt = PacsPrims.find(NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(_IG->getShapeName(k))));
+		TPacsPrimMap::iterator pbIt = PacsPrims.find(NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(_IG->getShapeName(k))));
 		if (pbIt != PacsPrims.end())
 		{
 			// compute orientation and position
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index dbaa9a5c8..88a2cbb51 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -534,7 +534,7 @@ void checkDriverVersion()
 		uint i;
 		for (i=0; i< sizeofarray(driversVersion); i++)
 		{
-			string lwr = toLower(deviceName);
+			string lwr = toLowerAscii(deviceName);
 			if ((lwr.find (driversTest[i])!=string::npos) && (driversNTest[i]==NULL || lwr.find (driversNTest[i])==string::npos))
 			{
 				if (driverVersion < driversVersion[i])
@@ -1283,7 +1283,7 @@ void prelogInit()
 			std::string deviceName;
 			uint64 driverVersion;
 			CSystemInfo::getVideoInfo(deviceName, driverVersion);
-			deviceName = NLMISC::toLower(deviceName);
+			deviceName = NLMISC::toLowerAscii(deviceName);
 			// for radeon 7200, patch because agp crash with agp with OpenGL -> don't display the message
 			if (!(Driver->getNbTextureStages() <= 3 && strstr(deviceName.c_str(), "radeon")))
 			{*/
@@ -1495,7 +1495,7 @@ void	initBotObjectSelection()
 						{
 							// IS the item a valid one ?
 							CSheetId itemId;
-							if(itemId.buildSheetId(NLMISC::toLower(strShape)))
+							if(itemId.buildSheetId(NLMISC::toLowerAscii(strShape)))
 							{
 								// Get this item sheet ?
 								CItemSheet		*itemSheet= dynamic_cast<CItemSheet *>(SheetMngr.get(itemId));
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 2725eedc9..67c3e91dd 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -1692,7 +1692,7 @@ void	CBotChatPageTrade::setupFactionPointPrice(bool /* sellMode */, uint default
 
 		// setup icon according to pvp clan
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		factionName = NLMISC::toLower(factionName);
+		factionName = NLMISC::toLowerAscii(factionName);
 		string	factionIcon= CWidgetManager::getInstance()->getParser()->getDefine(toString("faction_icon_%s", factionName.c_str()));
 		CViewBitmap		*vBmp= dynamic_cast<CViewBitmap*>(fpGroup->getView("unit_price:item_price:icone"));
 		if(vBmp)	vBmp->setTexture(factionIcon);
diff --git a/ryzom/client/src/interface_v3/character_3d.cpp b/ryzom/client/src/interface_v3/character_3d.cpp
index edc300d19..8d6b30c51 100644
--- a/ryzom/client/src/interface_v3/character_3d.cpp
+++ b/ryzom/client/src/interface_v3/character_3d.cpp
@@ -486,7 +486,7 @@ void SCharacter3DSetup::setupFromCS_ModelCol (SLOTTYPE::EVisualSlot s, sint32 mo
 
 			if (shapeLegs.find("_caster01_") != std::string::npos)
 			{
-				std::string tmpName = toLower(Parts[part].Name);
+				std::string tmpName = toLowerAscii(Parts[part].Name);
 
 				std::string::size_type posBottes = tmpName.find("_bottes");
 
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index eb79f4211..fd6e752ee 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -188,7 +188,7 @@ static inline bool	isUrlTag(const string &s, string::size_type index, string::si
 
 		if (textSize > i + 7)
 		{
-			bool isUrl = (toLower(s.substr(i, 7)) == "http://" || toLower(s.substr(i, 8)) == "https://");
+			bool isUrl = (toLowerAscii(s.substr(i, 7)) == "http://" || toLowerAscii(s.substr(i, 8)) == "https://");
 			// match "text http://" and not "texthttp://"
 			if (isUrl && i > 0 && !markdown)
 			{
@@ -425,7 +425,7 @@ CViewBase *CChatTextManager::createMsgTextComplex(const string &msg, NLMISC::CRG
 	// quickly check if text has links or not
 	bool hasUrl;
 	{
-		string s = toLower(msg);
+		string s = toLowerAscii(msg);
 		hasUrl = (s.find("http://") || s.find("https://"));
 	}
 
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index ee01fc913..4a66dd307 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -325,29 +325,30 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"nature" );
 	if (prop)
 	{
-		if (NLMISC::toLower(prop.str()) == "item")
+		std::string lwrProp = NLMISC::toLower(prop.str());
+		if (lwrProp == "item")
 			_Type = CCtrlSheetInfo::SheetType_Item;
-		else if (NLMISC::toLower(prop.str()) == "pact")
+		else if (lwrProp == "pact")
 			_Type = CCtrlSheetInfo::SheetType_Pact;
-		else if (NLMISC::toLower(prop.str()) == "skill")
+		else if (lwrProp == "skill")
 			_Type = CCtrlSheetInfo::SheetType_Skill;
-		else if (NLMISC::toLower(prop.str()) == "auto")
+		else if (lwrProp == "auto")
 			_Type = CCtrlSheetInfo::SheetType_Auto;
-		else if (NLMISC::toLower(prop.str()) == "macro")
+		else if (lwrProp == "macro")
 			_Type = CCtrlSheetInfo::SheetType_Macro;
-		else if (NLMISC::toLower(prop.str()) == "guild_flag")
+		else if (lwrProp == "guild_flag")
 			_Type = CCtrlSheetInfo::SheetType_GuildFlag;
-		else if (NLMISC::toLower(prop.str()) == "mission")
+		else if (lwrProp == "mission")
 			_Type = CCtrlSheetInfo::SheetType_Mission;
-		else if (NLMISC::toLower(prop.str()) == "sbrick")
+		else if (lwrProp == "sbrick")
 			_Type = CCtrlSheetInfo::SheetType_SBrick;
-		else if (NLMISC::toLower(prop.str()) == "sphraseid")
+		else if (lwrProp == "sphraseid")
 			_Type = CCtrlSheetInfo::SheetType_SPhraseId;
-		else if (NLMISC::toLower(prop.str()) == "sphrase")
+		else if (lwrProp == "sphrase")
 			_Type = CCtrlSheetInfo::SheetType_SPhrase;
-		else if (NLMISC::toLower(prop.str()) == "elevator_destination")
+		else if (lwrProp == "elevator_destination")
 			_Type = CCtrlSheetInfo::SheetType_ElevatorDestination;
-		else if (NLMISC::toLower(prop.str()) == "outpost_building")
+		else if (lwrProp == "outpost_building")
 			_Type = CCtrlSheetInfo::SheetType_OutpostBuilding;
 	}
 
@@ -355,7 +356,7 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_noitem" );
 	if (prop)
 	{
-		string TxName = toLower((const char *) prop);
+		string TxName = toLowerAscii((const char *) prop);
 		CViewRenderer &rVR = *CViewRenderer::getInstance();
 		_DispNoSheetBmpId = rVR.getTextureIdFromName (TxName);
 	}
@@ -401,23 +402,23 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_l" );
 	if (prop)
 	{
-		_ListMenuLeft = toLower((const char *) prop);
+		_ListMenuLeft = toLowerAscii((const char *) prop);
 	}
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r" );
 	if (prop)
 	{
-		_ListMenuRight = toLower((const char *) prop);
+		_ListMenuRight = toLowerAscii((const char *) prop);
 	}
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r_empty_slot" );
 	if (prop)
 	{
-		_ListMenuRightEmptySlot = toLower((const char *) prop);
+		_ListMenuRightEmptySlot = toLowerAscii((const char *) prop);
 	}
 	// list menu on both clicks
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_b" );
 	if (prop)
 	{
-		setListMenuBoth(toLower((const char *) prop));
+		setListMenuBoth(toLowerAscii((const char *) prop));
 	}
 
 	// _BrickTypeBitField
@@ -1899,7 +1900,7 @@ void CDBCtrlSheet::resetCharBitmaps()
 void CDBCtrlSheet::setupCharBitmaps(sint32 maxW, sint32 maxLine, sint32 maxWChar, bool topDown)
 {
 	// Use the optString for the Macro name
-	_OptString = toLower(_OptString);
+	_OptString = toLowerAscii(_OptString);
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CViewRenderer &rVR = *CViewRenderer::getInstance();
 
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index a09e69801..c6667745e 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -654,7 +654,7 @@ bool CDBGroupListSheetTrade::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup
 	prop= (char*) xmlGetProp( cur, (xmlChar*)"filter_seller_type" );
 	if(prop)
 	{
-		string	lwrFilter= toLower(std::string((const char *)prop));
+		string	lwrFilter= toLowerAscii(std::string((const char *)prop));
 		if(lwrFilter=="npc")
 			_SellerTypeFilter= NPC;
 		else if(lwrFilter=="resale")
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index f36e6a637..5089149b4 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -89,7 +89,7 @@ void CCompassTarget::serial(NLMISC::IStream &f)
 	{
 		f.serial(Name);
 	}
-	std::string language = toLower(ClientCfg.LanguageCode);
+	std::string language = toLowerAscii(ClientCfg.LanguageCode);
 	f.serial(language);
 	f.serialEnum(_Type);
 	if (_Type == PosTracker)
@@ -115,7 +115,7 @@ void CCompassTarget::serial(NLMISC::IStream &f)
 	// reset the compass to north to avoid incoherency
 	if (f.isReading())
 	{
-		if (toLower(ClientCfg.LanguageCode) != language)
+		if (toLowerAscii(ClientCfg.LanguageCode) != language)
 		{
 			*this = CCompassTarget();
 		}
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 45bcf79c2..d0b46299e 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -2672,9 +2672,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s)
 	_LandmarkFilter.clear();
 
 	if (!s.empty()) {
-		ucstring ucs;
-		ucs.fromUtf8(s);
-		splitUCString(toLower(ucs), ucstring(" "), _LandmarkFilter);
+		splitUCString(ucstring(toLower(s)), ucstring(" "), _LandmarkFilter);
 	}
 
 	// recreate landmarks
@@ -3712,13 +3710,13 @@ std::string CGroupMap::getContinentName() const
 {
 	if (_CurMap == NULL) return "";
 
-	return toLower(_CurMap->ContinentName);
+	return toLowerAscii(_CurMap->ContinentName);
 }
 
 //=========================================================================================================
 std::string CGroupMap::getMapTexture() const
 {
-	return toLower(_MapTexture);
+	return toLowerAscii(_MapTexture);
 }
 
 //=========================================================================================================
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 6d8a0f864..b721a2802 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -395,7 +395,7 @@ void CGuildManager::update()
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
-						it = ClientCfg.SystemInfoParams.find(toLower(cat));
+						it = ClientCfg.SystemInfoParams.find(toLowerAscii(cat));
 						if (it != ClientCfg.SystemInfoParams.end())
 						{
 							col = it->second.Color;
@@ -734,7 +734,7 @@ bool CDBGroupListAscensor::CSheetChildAscensor::isInvalidated(CDBGroupListSheetT
 			{
 
 				LIFT_ICONS::TLiftIcon li = (LIFT_ICONS::TLiftIcon)(icon & UINT64_CONSTANT(0x7FFFFFFFFFFFFFFF));
-				string str = toLower(LIFT_ICONS::toString(li));
+				string str = toLowerAscii(LIFT_ICONS::toString(li));
 				Ctrl->setType(CCtrlSheetInfo::SheetType_Teleport_Location);
 				Ctrl->setSlot("asc_"+str+".tga");
 			}
diff --git a/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/ryzom/client/src/interface_v3/interface_3d_scene.cpp
index 6fcba9eac..bf3d13da8 100644
--- a/ryzom/client/src/interface_v3/interface_3d_scene.cpp
+++ b/ryzom/client/src/interface_v3/interface_3d_scene.cpp
@@ -298,7 +298,7 @@ bool CInterface3DScene::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 			CXMLAutoPtr ptr((const char*)xmlGetProp (cur, (xmlChar*)"name"));
 			string animName;
 			if (ptr)
-				animName = toLower(CFile::getFilenameWithoutExtension(ptr.str()));
+				animName = toLowerAscii(CFile::getFilenameWithoutExtension(ptr.str()));
 
 			if (!animName.empty())
 			{
@@ -1108,7 +1108,7 @@ bool CInterface3DIG::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (ptr) _Rot = convertVector(ptr);
 
 	ptr = xmlGetProp (cur, (xmlChar*)"name");
-	if (ptr) _Name = toLower((const char*)ptr);
+	if (ptr) _Name = toLowerAscii((const char*)ptr);
 
 	_IG = UInstanceGroup::createInstanceGroup(_Name);
 	if (_IG == NULL)
@@ -1223,7 +1223,7 @@ std::string CInterface3DIG::getName() const
 // ----------------------------------------------------------------------------
 void CInterface3DIG::setName (const std::string &ht)
 {
-	string lwrname = toLower(ht);
+	string lwrname = toLowerAscii(ht);
 	if (lwrname != _Name)
 	{
 		CInterface3DScene *pI3DS = dynamic_cast<CInterface3DScene*>(_Parent);
@@ -1271,7 +1271,7 @@ bool CInterface3DShape::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (ptr) _Rot = convertVector(ptr);
 
 	ptr = xmlGetProp (cur, (xmlChar*)"name");
-	if (ptr) _Name = toLower((const char*)ptr);
+	if (ptr) _Name = toLowerAscii((const char*)ptr);
 
 	_Instance = dynamic_cast<CInterface3DScene*>(parentGroup)->getScene()->createInstance(_Name);
 	if (_Instance.empty())
@@ -1417,7 +1417,7 @@ void CInterface3DShape::setName (const std::string &ht)
 		_Name.clear();
 	}
 
-	string lwrname = toLower(ht);
+	string lwrname = toLowerAscii(ht);
 	if (lwrname != _Name)
 	{
 		CInterface3DScene *pI3DS = dynamic_cast<CInterface3DScene*>(_Parent);
@@ -1583,7 +1583,7 @@ bool CInterface3DFX::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 	if (ptr) _Rot = convertVector(ptr);
 
 	ptr = xmlGetProp (cur, (xmlChar*)"name");
-	if (ptr) _Name = toLower((const char*)ptr);
+	if (ptr) _Name = toLowerAscii((const char*)ptr);
 
 	return true;
 }
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 3329a2aae..998817b77 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2533,7 +2533,7 @@ void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
 	CRGBA color = CRGBA::White;
 
 
-	map<string, CClientConfig::SSysInfoParam>::const_iterator it = ClientCfg.SystemInfoParams.find(toLower(cat));
+	map<string, CClientConfig::SSysInfoParam>::const_iterator it = ClientCfg.SystemInfoParams.find(toLowerAscii(cat));
 	if (it != ClientCfg.SystemInfoParams.end())
 	{
 		mode = it->second.Mode;
@@ -2568,7 +2568,7 @@ void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
 CRGBA CInterfaceManager::getSystemInfoColor(const std::string &cat)
 {
 	CRGBA col = CRGBA::White;
-	map<string, CClientConfig::SSysInfoParam>::const_iterator it = ClientCfg.SystemInfoParams.find(toLower(cat));
+	map<string, CClientConfig::SSysInfoParam>::const_iterator it = ClientCfg.SystemInfoParams.find(toLowerAscii(cat));
 	if (it != ClientCfg.SystemInfoParams.end())
 		col = it->second.Color;
 	return col;
diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
index 3122d3f46..0da63f3b6 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -4015,7 +4015,7 @@ const CItemImage *CInventoryManager::getServerItem(uint slotId) const
 // ***************************************************************************
 CInventoryManager::TInvType CInventoryManager::invTypeFromString(const string &str)
 {
-	string sTmp = toLower(str);
+	string sTmp = toLowerAscii(str);
 	if (sTmp == "inv_bag")		return InvBag;
 	if (sTmp == "inv_pa0")		return InvPA0;
 	if (sTmp == "inv_pa1")		return InvPA1;
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
index 38b22a3e4..b238a4c5e 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
@@ -253,10 +253,10 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 		uint8 paramIdx = 0;
 		if( name == "SP_MOD_DEFENSE" )
 		{
-			if( toLower(params[0]) == "dodge" )
+			if( toLowerAscii(params[0]) == "dodge" )
 				result = CI18N::get("uiItemConsumableEffectModDodgeSuccess");
 			else
-			if( toLower(params[0]) == "parry" )
+			if( toLowerAscii(params[0]) == "parry" )
 				result = CI18N::get("uiItemConsumableEffectModParrySuccess");
 			else
 				result = CI18N::get("uiItemConsumableEffectModDefenseSuccess");
@@ -280,17 +280,17 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 		}
 		if( name == "SP_MOD_FORAGE_SUCCESS" )
 		{
-			if( toLower(params[0]) == "commonecosystem" )
+			if( toLowerAscii(params[0]) == "commonecosystem" )
 				result = CI18N::get("uiItemConsumableEffectModForageSuccess");
-			if( toLower(params[0]) == "desert" )
+			if( toLowerAscii(params[0]) == "desert" )
 				result = CI18N::get("uiItemConsumableEffectModDesertForageSuccess");
-			if( toLower(params[0]) == "forest" )
+			if( toLowerAscii(params[0]) == "forest" )
 				result = CI18N::get("uiItemConsumableEffectModForestForageSuccess");
-			if( toLower(params[0]) == "lacustre" )
+			if( toLowerAscii(params[0]) == "lacustre" )
 				result = CI18N::get("uiItemConsumableEffectModLacustreForageSuccess");
-			if( toLower(params[0]) == "jungle" )
+			if( toLowerAscii(params[0]) == "jungle" )
 				result = CI18N::get("uiItemConsumableEffectModJungleForageSuccess");
-			if( toLower(params[0]) == "primaryroot" )
+			if( toLowerAscii(params[0]) == "primaryroot" )
 				result = CI18N::get("uiItemConsumableEffectModPrimaryRootForageSuccess");
 			paramIdx++;
 		}
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index bd2377bcb..d6326ed14 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -4247,7 +4247,7 @@ int CLuaIHMRyzom::displayChatMessage(CLuaState &ls)
 
 	if (ls.type(2) == LUA_TSTRING)
 	{
-		std::string input = toLower(ls.toString(2));
+		std::string input = toLowerAscii(ls.toString(2));
 		if (input == "around")
 		{
 			prop.readRGBA(std::string(dbPath + ":SAY").c_str(), " ");
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index c7c9e89eb..90eee9a0b 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -602,7 +602,7 @@ static void addFromPlaylist(const std::string &playlist, const std::vector<std::
 			if (lineStr[0] != '#')
 			{
 				std::string filename = CPath::makePathAbsolute(CFile::getPath(lineStr), basePlaylist) + CFile::getFilename(lineStr);
-				std::string ext = toLower(CFile::getExtension(filename));
+				std::string ext = toLowerAscii(CFile::getExtension(filename));
 				if (std::find(extensions.begin(), extensions.end(), ext) != extensions.end())
 				{
 					if (CFile::fileExists(filename))
@@ -654,7 +654,7 @@ void CMusicPlayer::createPlaylistFromMusic()
 
 	for (i = 0; i < filesToProcess.size(); ++i)
 	{
-		std::string ext = toLower(CFile::getExtension(filesToProcess[i]));
+		std::string ext = toLowerAscii(CFile::getExtension(filesToProcess[i]));
 		if (std::find(extensions.begin(), extensions.end(), ext) != extensions.end())
 		{
 			filenames.push_back(filesToProcess[i]);
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index d1c43d897..196ce69f4 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1414,7 +1414,7 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 						string cat = getStringCategory(msg, msg);
 						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
 						NLMISC::CRGBA col = CRGBA::Yellow;
-						it = ClientCfg.SystemInfoParams.find(toLower(cat));
+						it = ClientCfg.SystemInfoParams.find(toLowerAscii(cat));
 						if (it != ClientCfg.SystemInfoParams.end())
 						{
 							col = it->second.Color;
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 6650b7ef2..3fb3a74a7 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -156,10 +156,10 @@ bool CPeopleList::create(const CPeopleListDesc &desc, const CChatWindowDesc *cha
 //==================================================================
 sint CPeopleList::getIndexFromName(const string &name) const
 {
-	string sNameIn = toLower(name);
+	string sNameIn = toLowerAscii(name);
 	for(uint k = 0; k < _Peoples.size(); ++k)
 	{
-		string sPeopleName = toLower(_Peoples[k].getName());
+		string sPeopleName = toLowerAscii(_Peoples[k].getName());
 		if (sPeopleName == sNameIn) return k;
 	}
 	return -1;
diff --git a/ryzom/client/src/interface_v3/sbrick_manager.cpp b/ryzom/client/src/interface_v3/sbrick_manager.cpp
index 780b1301c..34537689e 100644
--- a/ryzom/client/src/interface_v3/sbrick_manager.cpp
+++ b/ryzom/client/src/interface_v3/sbrick_manager.cpp
@@ -408,7 +408,7 @@ void			CSBrickManager::compileBrickProperties()
 			string::size_type pos = prop.Text.find(':');
 			if (pos != string::npos)
 			{
-				string key = toLower(prop.Text.substr(0, pos));
+				string key = toLowerAscii(prop.Text.substr(0, pos));
 				string value = prop.Text.substr(pos + 1);
 				// get key id.
 				if (_BrickPropIdMap.find(key) == _BrickPropIdMap.end())
@@ -509,7 +509,7 @@ void			CSBrickManager::compileBrickProperties()
 							// Parse all the brick properties if match the key
 							float	value= 0.f;
 							// get the wanted prop id
-							key = toLower(key);
+							key = toLowerAscii(key);
 							uint	propId= getBrickPropId(key);
 							// if propid exist
 							if(propId)
diff --git a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
index 44127e630..b0a6538dd 100644
--- a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
+++ b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
@@ -62,7 +62,7 @@ bool CViewBitmapFaberMp::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_noitem" );
 	if (prop)
 	{
-		_TextureNoItemName = toLower((const char *) prop);
+		_TextureNoItemName = toLowerAscii((const char *) prop);
 		_TextureNoItemId = -2;
 	}
 
diff --git a/ryzom/client/src/interface_v3/view_radar.cpp b/ryzom/client/src/interface_v3/view_radar.cpp
index ea9f5286b..49f305bb2 100644
--- a/ryzom/client/src/interface_v3/view_radar.cpp
+++ b/ryzom/client/src/interface_v3/view_radar.cpp
@@ -104,7 +104,7 @@ bool CViewRadar::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 		prop = (char*) xmlGetProp( cur, (xmlChar*)spotTextureNames[i] );
 		if (prop)
 		{
-			txName = toLower((const char *) prop);
+			txName = toLowerAscii((const char *) prop);
 		}
 		_SpotDescriptions[i].TextureId.setTexture(txName.c_str());
 		rVR.getTextureSizeFromId (_SpotDescriptions[i].TextureId, _SpotDescriptions[i].TxW, _SpotDescriptions[i].TxH);
@@ -113,7 +113,7 @@ bool CViewRadar::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 		prop = (char*) xmlGetProp( cur, (xmlChar*)spotMiniTextureNames[i] );
 		if (prop)
 		{
-			txName = toLower((const char *) prop);
+			txName = toLowerAscii((const char *) prop);
 		}
 		_SpotDescriptions[i].MiniTextureId.setTexture(txName.c_str());
 		rVR.getTextureSizeFromId (_SpotDescriptions[i].MiniTextureId, _SpotDescriptions[i].MTxW, _SpotDescriptions[i].MTxH);
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 2b7d0c1ba..d9d7e2e99 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -1538,7 +1538,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 void CPatchManager::downloadFile (const string &source, const string &dest, NLMISC::IProgressCallback *progress)
 {
 	// For the moment use only curl
-	const string sourceLower = toLower(source.substr(0, 6));
+	const string sourceLower = toLowerAscii(source.substr(0, 6));
 
 	if (startsWith(sourceLower, "http:")
 		|| startsWith(sourceLower, "https:")
diff --git a/ryzom/client/src/mesh_camera_col_manager.cpp b/ryzom/client/src/mesh_camera_col_manager.cpp
index 7a4452e38..bf5994583 100644
--- a/ryzom/client/src/mesh_camera_col_manager.cpp
+++ b/ryzom/client/src/mesh_camera_col_manager.cpp
@@ -108,7 +108,7 @@ void CMeshCameraColManager::instanceGroupAdded(NL3D::UInstanceGroup *ig)
 					bool	avoidCollisionInside= ig->dontCastShadowForInterior(i);
 					bool	avoidCollisionOutside= ig->dontCastShadowForExterior(i);
 					// very special patch for the matis serre (grrrrrrrrrrrrr)
-					avoidCollisionOutside= avoidCollisionOutside || toLower(shapeName)== "ma_serre_interieur.shape";
+					avoidCollisionOutside= avoidCollisionOutside || toLowerAscii(shapeName)== "ma_serre_interieur.shape";
 
 					// then send the result to the collision manager, and keep the mesh col id if succeed
 					uint32	meshId= CollisionManager->addMeshInstanceCollision(colMesh, mat, avoidCollisionInside, avoidCollisionOutside);
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index e98d13fe9..aa6a99051 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -698,7 +698,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		if (!stringCategory.empty() && stringCategory != "SYS")
 		{
 			map<string, CClientConfig::SSysInfoParam>::const_iterator it;
-			it = ClientCfg.SystemInfoParams.find(toLower(stringCategory));
+			it = ClientCfg.SystemInfoParams.find(toLowerAscii(stringCategory));
 			if (it != ClientCfg.SystemInfoParams.end())
 			{
 				col = it->second.Color;
@@ -729,7 +729,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 	if( !stringCategory.empty() )
 	{
 		map<string, CClientConfig::SSysInfoParam>::const_iterator it;
-		it = ClientCfg.SystemInfoParams.find( toLower(stringCategory) );
+		it = ClientCfg.SystemInfoParams.find( toLowerAscii(stringCategory) );
 		if( it != ClientCfg.SystemInfoParams.end() )
 		{
 			if( !(*it).second.SysInfoFxName.empty() )
diff --git a/ryzom/client/src/outpost.cpp b/ryzom/client/src/outpost.cpp
index b345d36cb..8637ded60 100644
--- a/ryzom/client/src/outpost.cpp
+++ b/ryzom/client/src/outpost.cpp
@@ -99,7 +99,7 @@ void COutpost::initOutpost ()
 		for (i=0; i<RZ_MAX_BUILDING_PER_OUTPOST; i++)
 		{
 			// Put the ZC pacs_prim
-			TPacsPrimMap::iterator pbIt = PacsPrims.find(NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(ClientCfg.ZCPacsPrim)));
+			TPacsPrimMap::iterator pbIt = PacsPrims.find(NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(ClientCfg.ZCPacsPrim)));
 			if (pbIt != PacsPrims.end())
 			{
 				// Build the building matrix
diff --git a/ryzom/client/src/pacs_client.cpp b/ryzom/client/src/pacs_client.cpp
index c021f7c1c..7bf4a0195 100644
--- a/ryzom/client/src/pacs_client.cpp
+++ b/ryzom/client/src/pacs_client.cpp
@@ -146,7 +146,7 @@ UInstanceGroup *getCluster(const UGlobalPosition &gp)
 	if(strPos.empty())
 		return 0;
 	// try to find the ig in the loaded ig map
-	std::map<std::string, UInstanceGroup *>::const_iterator igIt = IGLoaded.find(toLower(strPos));
+	std::map<std::string, UInstanceGroup *>::const_iterator igIt = IGLoaded.find(toLowerAscii(strPos));
 	if (igIt != IGLoaded.end())
 	{
 		return igIt->second;
@@ -192,7 +192,7 @@ void releaseLandscapeIGCallbacks()
 
 void addPacsPrim(const std::string &fileName)
 {
-	std::string ppName = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(fileName));
+	std::string ppName = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(fileName));
 	if (PacsPrims.find(ppName) != PacsPrims.end())
 	{
 		nlwarning(("Pacs primitive " + ppName + " already has been inserted").c_str());
diff --git a/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
index 58deeac56..304dd5726 100644
--- a/ryzom/client/src/player_cl.cpp
+++ b/ryzom/client/src/player_cl.cpp
@@ -603,7 +603,7 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, uint index, uint color)
 
 			if (!shapeLegs.empty() && shapeLegs.find("_caster01_") != std::string::npos)
 			{
-				std::string tmpName = toLower(shapeName);
+				std::string tmpName = toLowerAscii(shapeName);
 
 				std::string::size_type posBottes = tmpName.find("_bottes");
 
diff --git a/ryzom/client/src/sky.cpp b/ryzom/client/src/sky.cpp
index ad9411189..cbe9ee609 100644
--- a/ryzom/client/src/sky.cpp
+++ b/ryzom/client/src/sky.cpp
@@ -288,7 +288,7 @@ CBitmap *buildSharedBitmap(const std::string &filename,
 {
 	alreadyBuilt = false;
 	if (filename.empty()) return NULL;
-	std::string lcBMFilename = toLower(CFile::getFilenameWithoutExtension(filename));
+	std::string lcBMFilename = toLowerAscii(CFile::getFilenameWithoutExtension(filename));
 	std::map<std::string, CBitmap *>::iterator it = bitmapByName.find(lcBMFilename);
 	if (it != bitmapByName.end())
 	{
diff --git a/ryzom/client/src/streamable_ig.cpp b/ryzom/client/src/streamable_ig.cpp
index dab7a3fa8..2d26acaed 100644
--- a/ryzom/client/src/streamable_ig.cpp
+++ b/ryzom/client/src/streamable_ig.cpp
@@ -300,8 +300,8 @@ bool CStreamableIG::setIG(uint ig, const std::string &name, const std::string &p
 		}
 
 		// Load this IG
-		_IGs[ig].Name = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(name));
-		_IGs[ig].ParentName = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(parentName));
+		_IGs[ig].Name = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(name));
+		_IGs[ig].ParentName = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(parentName));
 		_IGs[ig].IG = NULL;
 		_IGs[ig].Loading = false;
 		_Linked = false;
@@ -315,8 +315,8 @@ void CStreamableIG::addIG(const std::string &name,const std::string &parentName,
 {
 	H_AUTO_USE(RZ_StremableIG)
 	_IGs.push_back(CIGNode ());
-	_IGs.back().Name = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(name));
-	_IGs.back().ParentName = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(parentName));
+	_IGs.back().Name = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(name));
+	_IGs.back().ParentName = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(parentName));
 	_IGs.back().IG = NULL;
 	_IGs.back().Loading = false;
 	_IGs.back().Pos = pos;
@@ -381,7 +381,7 @@ void CStreamableIG::addLoadedIGToMap()
 		if (_IGs[k].IG && _IGs[k].IG != (NL3D::UInstanceGroup *)-1) // is this a successfully loaded ig ?
 		{
 			// insert the new ig if it hasn't before..
-			if( _IGMap->insert(std::make_pair(NLMISC::toLower(_IGs[k].Name), _IGs[k].IG)).second )
+			if( _IGMap->insert(std::make_pair(NLMISC::toLowerAscii(_IGs[k].Name), _IGs[k].IG)).second )
 				// if inserted, must notify IG Added, else already notifiyed by loadAsync()
 				this->notifyIGAdded(_IGs[k].IG);
 		}
diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index 71b8ddc81..d7be1f224 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1261,7 +1261,7 @@ void CStringManagerClient::initI18NSpecialWords(const string &languageCode)
 				string name= ws.getData(j, nameColIndex).toUtf8(); // FIXME: const string & when UTF-8
 				// Append to the I18N.
 				// avoid case problems
-				string keyStr = NLMISC::toLower(key);
+				string keyStr = NLMISC::toLowerAscii(key);
 
 				// append the special key extension.
 				keyStr+= keyExtenstion;
@@ -1423,7 +1423,7 @@ const char *CStringManagerClient::getSpecialWord(const string &label, bool women
 
 	// avoid case problems
 	static string lwrLabel;
-	lwrLabel = toLower(label);
+	lwrLabel = toLowerAscii(label);
 
 	if (_SpecItem_MemoryCompressed)
 	{
@@ -1470,7 +1470,7 @@ const char *CStringManagerClient::getSpecialDesc(const string &label)
 
 	// avoid case problems
 	static string lwrLabel;
-	lwrLabel = toLower(label);
+	lwrLabel = toLowerAscii(label);
 
 	if (_SpecItem_MemoryCompressed)
 	{
@@ -1503,7 +1503,7 @@ const char *CStringManagerClient::getSpecialDesc2(const string &label)
 
 	// avoid case problems
 	static string lwrLabel;
-	lwrLabel = toLower(label);
+	lwrLabel = toLowerAscii(label);
 
 	if (_SpecItem_MemoryCompressed)
 	{
@@ -1736,7 +1736,7 @@ void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const std::str
 
 	// avoid case problems
 	static string lwrLabel;
-	lwrLabel = toLower(label);
+	lwrLabel = toLowerAscii(label);
 
 	nlassert(!_SpecItem_MemoryCompressed); // Not allowed, strings are released!
 	if (_SpecItem_MemoryCompressed)
diff --git a/ryzom/client/src/teleport.cpp b/ryzom/client/src/teleport.cpp
index 60d96c794..825de0add 100644
--- a/ryzom/client/src/teleport.cpp
+++ b/ryzom/client/src/teleport.cpp
@@ -107,7 +107,7 @@ void CTeleport::load(const std::string &/* filename */)
 					&& tpElmt->getValueByName(pos.z, "position.Z"))
 					{
 						// All in UPPER CASE to not be CASE SENSITIVE.
-						_Destinations.insert(make_pair(NLMISC::toLower(destName), pos));
+						_Destinations.insert(make_pair(NLMISC::toLowerAscii(destName), pos));
 					}
 					else
 						nlwarning("CTeleport::load: Cannot find the one of the key 'position.X or Y or Z' for the element %d.", i);
diff --git a/ryzom/common/src/game_share/ecosystem.cpp b/ryzom/common/src/game_share/ecosystem.cpp
index d41cb2bac..c0d2bb0c2 100644
--- a/ryzom/common/src/game_share/ecosystem.cpp
+++ b/ryzom/common/src/game_share/ecosystem.cpp
@@ -39,14 +39,14 @@ namespace ECOSYSTEM
 	//-----------------------------------------------
 	EECosystem stringToEcosystem(const string &str)
 	{
-		string strL = NLMISC::toLower( str );
-		if( strL == NLMISC::toLower( CommonString) ) return common_ecosystem;
-		if( strL == NLMISC::toLower( DesertString ) ) return desert;
-		if( strL == NLMISC::toLower( ForestString ) ) return forest;
-		if( strL == NLMISC::toLower( LacustreString ) ) return lacustre;
-		if( strL == NLMISC::toLower( JungleString ) ) return jungle;
-		if( strL == NLMISC::toLower( GooString ) ) return goo;
-		if( strL == NLMISC::toLower( PrimaryRootString ) ) return primary_root;
+		string strL = NLMISC::toLowerAscii( str );
+		if( strL == NLMISC::toLowerAscii( CommonString) ) return common_ecosystem;
+		if( strL == NLMISC::toLowerAscii( DesertString ) ) return desert;
+		if( strL == NLMISC::toLowerAscii( ForestString ) ) return forest;
+		if( strL == NLMISC::toLowerAscii( LacustreString ) ) return lacustre;
+		if( strL == NLMISC::toLowerAscii( JungleString ) ) return jungle;
+		if( strL == NLMISC::toLowerAscii( GooString ) ) return goo;
+		if( strL == NLMISC::toLowerAscii( PrimaryRootString ) ) return primary_root;
 		return unknown;
 	} // stringToEcosystem //
 
diff --git a/ryzom/common/src/game_share/fame.cpp b/ryzom/common/src/game_share/fame.cpp
index cd9e2b850..17400018f 100644
--- a/ryzom/common/src/game_share/fame.cpp
+++ b/ryzom/common/src/game_share/fame.cpp
@@ -366,7 +366,7 @@ void CStaticFames::loadStaticFame( const string& filename )
 		// 1st, build the index table
 		for (uint i=1; i<ws.size(); ++i)
 		{
-			string name = toLower(ws.getData(i, 0).toString());
+			string name = toLowerAscii(ws.getData(i, 0).toString());
 			if (name.empty())
 				break;
 			_FactionNameIndex.insert(make_pair(CStringMapper::map(name), i-1));
@@ -382,7 +382,7 @@ void CStaticFames::loadStaticFame( const string& filename )
 		// 2nd check the table structure
 		for (uint i=2; i<ws.ColCount; ++i)
 		{
-			string name = toLower(ws.getData(0, i).toString());
+			string name = toLowerAscii(ws.getData(0, i).toString());
 
 			if (name.empty())
 			{
@@ -613,7 +613,7 @@ uint	CStaticFames::getFactionIndex(NLMISC::TStringId factionName)
 //----------------------------------------------------------------------------
 uint	CStaticFames::getFactionIndex(const std::string &factionName)
 {
-	return getFactionIndex(CStringMapper::map(toLower(factionName)));
+	return getFactionIndex(CStringMapper::map(toLowerAscii(factionName)));
 }
 
 //----------------------------------------------------------------------------
@@ -671,7 +671,7 @@ sint32 CStaticFames::getStaticFame(NLMISC::TStringId faction1, NLMISC::TStringId
 //----------------------------------------------------------------------------
 sint32	CStaticFames::getStaticFame(const std::string &faction1, const std::string &faction2)
 {
-	return getStaticFame(CStringMapper::map(toLower(faction1)), CStringMapper::map(toLower(faction2)));
+	return getStaticFame(CStringMapper::map(toLowerAscii(faction1)), CStringMapper::map(toLowerAscii(faction2)));
 }
 
 //----------------------------------------------------------------------------
diff --git a/ryzom/common/src/game_share/guild_grade.cpp b/ryzom/common/src/game_share/guild_grade.cpp
index e6f055649..fd0fd66fd 100644
--- a/ryzom/common/src/game_share/guild_grade.cpp
+++ b/ryzom/common/src/game_share/guild_grade.cpp
@@ -40,7 +40,7 @@ void							CGuildGrade::init()
 	for (i=0; i<4; ++i)
 	{
 		_StrTable[TGuildGradeConvert[i].Value] = TGuildGradeConvert[i].Name;
-		_ValueMap[NLMISC::toLower(std::string(TGuildGradeConvert[i].Name))] = TGuildGradeConvert[i].Value;
+		_ValueMap[NLMISC::toLowerAscii(std::string(TGuildGradeConvert[i].Name))] = TGuildGradeConvert[i].Value;
 	}
 	_Initialised = true;
 }
diff --git a/ryzom/common/src/game_share/guild_grade_inline.h b/ryzom/common/src/game_share/guild_grade_inline.h
index dcb8cfa99..e81e199ba 100644
--- a/ryzom/common/src/game_share/guild_grade_inline.h
+++ b/ryzom/common/src/game_share/guild_grade_inline.h
@@ -43,7 +43,7 @@ inline CGuildGrade::TGuildGrade	CGuildGrade::fromString(const std::string& v)
 	{
 		return Unknown;
 	}
-	const std::map<std::string, TGuildGrade>::const_iterator	it = _ValueMap.find(NLMISC::toLower(v));
+	const std::map<std::string, TGuildGrade>::const_iterator	it = _ValueMap.find(NLMISC::toLowerAscii(v));
 	if (it == _ValueMap.end())
 	{
 		nlwarning("TGuildGrade::toString(): string '%s' is not matched, 'Unknown' enum value returned", v.c_str());
diff --git a/ryzom/common/src/game_share/people_pd.cpp b/ryzom/common/src/game_share/people_pd.cpp
index 90bd1bc8b..acf3a4e40 100644
--- a/ryzom/common/src/game_share/people_pd.cpp
+++ b/ryzom/common/src/game_share/people_pd.cpp
@@ -194,7 +194,7 @@ void							CPeople::init()
 	for (i=0; i<159; ++i)
 	{
 		_StrTable[TPeopleConvert[i].Value] = TPeopleConvert[i].Name;
-		_ValueMap[NLMISC::toLower(std::string(TPeopleConvert[i].Name))] = TPeopleConvert[i].Value;
+		_ValueMap[NLMISC::toLowerAscii(std::string(TPeopleConvert[i].Name))] = TPeopleConvert[i].Value;
 	}
 	_Initialised = true;
 }
@@ -239,7 +239,7 @@ void							CClassificationType::init()
 	for (i=0; i<20; ++i)
 	{
 		_StrTable[TClassificationTypeConvert[i].Value] = TClassificationTypeConvert[i].Name;
-		_ValueMap[NLMISC::toLower(std::string(TClassificationTypeConvert[i].Name))] = TClassificationTypeConvert[i].Value;
+		_ValueMap[NLMISC::toLowerAscii(std::string(TClassificationTypeConvert[i].Name))] = TClassificationTypeConvert[i].Value;
 	}
 	_Initialised = true;
 }
diff --git a/ryzom/common/src/game_share/people_pd_inline.h b/ryzom/common/src/game_share/people_pd_inline.h
index b5bfc6097..4ad6fd661 100644
--- a/ryzom/common/src/game_share/people_pd_inline.h
+++ b/ryzom/common/src/game_share/people_pd_inline.h
@@ -43,7 +43,7 @@ inline CPeople::TPeople			CPeople::fromString(const std::string& v)
 	{
 		return Unknown;
 	}
-	const std::map<std::string, TPeople>::const_iterator	it = _ValueMap.find(NLMISC::toLower(v));
+	const std::map<std::string, TPeople>::const_iterator	it = _ValueMap.find(NLMISC::toLowerAscii(v));
 	if (it == _ValueMap.end())
 	{
 		nlwarning("TPeople::toString(): string '%s' is not matched, 'Unknown' enum value returned", v.c_str());
@@ -79,7 +79,7 @@ inline CClassificationType::TClassificationType	CClassificationType::fromString(
 	{
 		return Unknown;
 	}
-	const std::map<std::string, TClassificationType>::const_iterator	it = _ValueMap.find(NLMISC::toLower(v));
+	const std::map<std::string, TClassificationType>::const_iterator	it = _ValueMap.find(NLMISC::toLowerAscii(v));
 	if (it == _ValueMap.end())
 	{
 		nlwarning("TClassificationType::toString(): string '%s' is not matched, 'Unknown' enum value returned", v.c_str());
diff --git a/ryzom/common/src/game_share/pvp_clan.cpp b/ryzom/common/src/game_share/pvp_clan.cpp
index 81a2ca1d3..92255fab9 100644
--- a/ryzom/common/src/game_share/pvp_clan.cpp
+++ b/ryzom/common/src/game_share/pvp_clan.cpp
@@ -52,9 +52,7 @@ namespace PVP_CLAN
 
 	std::string toLowerString(TPVPClan clan)
 	{
-		CSString s = PVPClanConversion.toString(clan);
-		CSString sl = s.toLower();
-		return sl;
+		return toLowerAscii(PVPClanConversion.toString(clan));
 	}
 
 	uint32 getFactionIndex(TPVPClan clan)
diff --git a/ryzom/common/src/game_share/season.cpp b/ryzom/common/src/game_share/season.cpp
index a7065062c..aa110f2fe 100644
--- a/ryzom/common/src/game_share/season.cpp
+++ b/ryzom/common/src/game_share/season.cpp
@@ -41,7 +41,7 @@ void							CSeason::init()
 	for (i=0; i<5; ++i)
 	{
 		_StrTable[TSeasonConvert[i].Value] = TSeasonConvert[i].Name;
-		_ValueMap[NLMISC::toLower(std::string(TSeasonConvert[i].Name))] = TSeasonConvert[i].Value;
+		_ValueMap[NLMISC::toLowerAscii(std::string(TSeasonConvert[i].Name))] = TSeasonConvert[i].Value;
 	}
 	_Initialised = true;
 }
diff --git a/ryzom/common/src/game_share/season_inline.h b/ryzom/common/src/game_share/season_inline.h
index 069d29cbc..e81509d6e 100644
--- a/ryzom/common/src/game_share/season_inline.h
+++ b/ryzom/common/src/game_share/season_inline.h
@@ -43,7 +43,7 @@ inline CSeason::TSeason			CSeason::fromString(const std::string& v)
 	{
 		return Unknown;
 	}
-	const std::map<std::string, TSeason>::const_iterator	it = _ValueMap.find(NLMISC::toLower(v));
+	const std::map<std::string, TSeason>::const_iterator	it = _ValueMap.find(NLMISC::toLowerAscii(v));
 	if (it == _ValueMap.end())
 	{
 		nlwarning("TSeason::toString(): string '%s' is not matched, 'Unknown' enum value returned", v.c_str());
diff --git a/ryzom/common/src/game_share/server_edition_module.cpp b/ryzom/common/src/game_share/server_edition_module.cpp
index 79cf9a6f2..70fc2a5dc 100644
--- a/ryzom/common/src/game_share/server_edition_module.cpp
+++ b/ryzom/common/src/game_share/server_edition_module.cpp
@@ -1394,7 +1394,7 @@ void CServerEditionModule::connectChar(TSessionId sessionId, TCharId charId, TUs
 		CMessage msg("HELLO");
 		clientEditionProxy->sendModuleMessage(this->getAnimationModule()->getModule(), msg);
 	}
-	_PioneersInfo[charId].RingAccess = CSString(ringAccess).toLower();
+	_PioneersInfo[charId].RingAccess = toLowerAscii(ringAccess);
 	_PioneersInfo[charId].Newcomer = newcomer;
 
 	if (_SessionManager)
@@ -1434,7 +1434,7 @@ void CServerEditionModule::connectChar(TSessionId sessionId, TCharId charId, TUs
 				if ( first->size() >= length && first->substr(0, length) == r2a)
 				{
 
-					std::string ra = CSString(first->substr(length) ).replace("_", ":").toLower();
+					std::string ra = toLowerAscii(CSString(first->substr(length) ).replace("_", ":"));
 					_PioneersInfo[charId].RingAccess = ra;
 					break;
 				}
@@ -2943,7 +2943,7 @@ void CServerEditionModule::addCharacterInSession(NLNET::IModuleProxy *sender, TS
 	}
 
 
-	std::string upgradedRingAccess = CRingAccess::getInstance().upgradeRingAccess(CSString(DefaultCharRingAccess.get()).toLower(), CSString(ringAccess).toLower()) ;
+	std::string upgradedRingAccess = CRingAccess::getInstance().upgradeRingAccess(toLowerAscii(DefaultCharRingAccess.get()), toLowerAscii(ringAccess)) ;
 
 
 	// TODO use security info for overdoing ring access
diff --git a/ryzom/common/src/game_share/sp_type.cpp b/ryzom/common/src/game_share/sp_type.cpp
index 15a6b2f93..3b4332b44 100644
--- a/ryzom/common/src/game_share/sp_type.cpp
+++ b/ryzom/common/src/game_share/sp_type.cpp
@@ -40,7 +40,7 @@ void							CSPType::init()
 	for (i=0; i<4; ++i)
 	{
 		_StrTable[TSPTypeConvert[i].Value] = TSPTypeConvert[i].Name;
-		_ValueMap[NLMISC::toLower(std::string(TSPTypeConvert[i].Name))] = TSPTypeConvert[i].Value;
+		_ValueMap[NLMISC::toLowerAscii(std::string(TSPTypeConvert[i].Name))] = TSPTypeConvert[i].Value;
 	}
 	_Initialised = true;
 }
diff --git a/ryzom/common/src/game_share/sp_type_inline.h b/ryzom/common/src/game_share/sp_type_inline.h
index 3f85729d2..6c904f572 100644
--- a/ryzom/common/src/game_share/sp_type_inline.h
+++ b/ryzom/common/src/game_share/sp_type_inline.h
@@ -43,7 +43,7 @@ inline CSPType::TSPType			CSPType::fromString(const std::string& v)
 	{
 		return Unknown;
 	}
-	const std::map<std::string, TSPType>::const_iterator	it = _ValueMap.find(NLMISC::toLower(v));
+	const std::map<std::string, TSPType>::const_iterator	it = _ValueMap.find(NLMISC::toLowerAscii(v));
 	if (it == _ValueMap.end())
 	{
 		nlwarning("TSPType::toString(): string '%s' is not matched, 'Unknown' enum value returned", v.c_str());
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp b/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
index 7d2f42aa7..43a03fefb 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
@@ -35,7 +35,7 @@ void CWeatherManager::init(const std::vector<const CWeatherSetupSheetBase *> &sh
 	{
 		if (sheets[k])
 		{
-			std::string id = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(sheetNames[k]));
+			std::string id = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(sheetNames[k]));
 			CWeatherSetup *ws = newWeatherSetup();
 			if (ws)
 			{
@@ -70,7 +70,7 @@ void CWeatherManager::release()
 //================================================================================================
 const CWeatherSetup *CWeatherManager::getSetup(const char *name) const
 {
-	std::string id = NLMISC::toLower(CFile::getFilenameWithoutExtension(name));
+	std::string id = NLMISC::toLowerAscii(CFile::getFilenameWithoutExtension(name));
 	TWeatherSetupMap::const_iterator it = _WeatherSetupMap.find(id);
 	if (it == _WeatherSetupMap.end()) return NULL;
 	return it->second;
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
index a1a56f18e..2c98e5e7e 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
@@ -85,7 +85,7 @@ void CWeatherStateSheet::build(const NLGEORGES::UFormElm &item)
 	GetWeatherFormValue(item, fxName, "FXName");
 	if (!fxName.empty())
 	{
-		fxName = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(fxName));
+		fxName = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(fxName));
 		if (!fxName.empty())
 		{
 			FXInfos.resize(1);
@@ -192,7 +192,7 @@ void CWeatherSetupSheetBase::build(const NLGEORGES::UFormElm &item)
 	CloudState.build(item);
 	std::string setupName;
 	GetWeatherFormValue(item, setupName, "SetupName");
-	SetupName = NLMISC::CStringMapper::map(NLMISC::toLower(setupName));
+	SetupName = NLMISC::CStringMapper::map(NLMISC::toLowerAscii(setupName));
 }
 
 //==================================================================================
@@ -203,7 +203,7 @@ void CWeatherSetupSheetBase::serial(NLMISC::IStream &f)
 	{
 		std::string setupName;
 		f.serial(setupName);
-		SetupName = NLMISC::CStringMapper::map(NLMISC::toLower(setupName));
+		SetupName = NLMISC::CStringMapper::map(NLMISC::toLowerAscii(setupName));
 	}
 	else
 	{
diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
index 3f5cb04ee..26db547ac 100644
--- a/ryzom/tools/client/client_patcher/main.cpp
+++ b/ryzom/tools/client/client_patcher/main.cpp
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 	INelContext::getInstance().getWarningLog()->removeDisplayer("DEFAULT_SD");
 
 	// check if console supports colors
-	std::string term = toLower(std::string(getenv("TERM") ? getenv("TERM"):""));
+	std::string term = toLowerAscii(std::string(getenv("TERM") ? getenv("TERM"):""));
 	useEsc = (term.find("xterm") != string::npos || term.find("linux") != string::npos);
 
 #ifdef NL_OS_WINDOWS

From 36c676e2b2412a5221265f72d99df6effc41e112 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 14:00:56 +0800
Subject: [PATCH 137/292] Use the simplified toUpper for identifiers and
 filenames

---
 nel/src/3d/landscapeig_manager.cpp                     |  6 +++---
 nel/src/ligo/primitive.cpp                             |  4 ++--
 nel/src/misc/system_info.cpp                           |  2 +-
 nel/src/net/service.cpp                                |  2 +-
 ryzom/client/src/client_sheets/item_sheet.cpp          |  6 +++---
 ryzom/client/src/client_sheets/sbrick_sheet.cpp        |  2 +-
 ryzom/client/src/color_slot_manager.cpp                |  6 +++---
 ryzom/client/src/init_main_loop.cpp                    |  4 ++--
 ryzom/client/src/interface_v3/action_handler_game.cpp  |  2 +-
 ryzom/client/src/interface_v3/action_phrase_faber.cpp  |  2 +-
 ryzom/client/src/interface_v3/dbctrl_sheet.cpp         |  4 ++--
 ryzom/client/src/interface_v3/interface_manager.cpp    |  2 +-
 .../client/src/interface_v3/item_consumable_effect.cpp |  2 +-
 ryzom/client/src/interface_v3/item_special_effect.cpp  |  2 +-
 ryzom/client/src/interface_v3/macrocmd_key.cpp         |  2 +-
 ryzom/client/src/interface_v3/people_list.cpp          | 10 ++--------
 ryzom/client/src/item_group_manager.cpp                |  4 ++--
 17 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/nel/src/3d/landscapeig_manager.cpp b/nel/src/3d/landscapeig_manager.cpp
index d2b276f8a..78154deda 100644
--- a/nel/src/3d/landscapeig_manager.cpp
+++ b/nel/src/3d/landscapeig_manager.cpp
@@ -115,7 +115,7 @@ void	CLandscapeIGManager::initIG(UScene *scene, const std::string &igDesc, UDriv
 					if (ig)
 					{
 						// add it to the map.
-						string	tokId= toUpper(string(token));
+						string	tokId= toUpperAscii(string(token));
 						_ZoneInstanceGroupMap[tokId]= CInstanceGroupElement(ig, token);
 
 						// Add a reference on the shapes
@@ -295,7 +295,7 @@ UInstanceGroup	*CLandscapeIGManager::getIG(const std::string &name) const
 std::string		CLandscapeIGManager::translateName(const std::string &name) const
 {
 	std::string		ret;
-	ret= toUpper(name + ".ig");
+	ret= toUpperAscii(name + ".ig");
 	return ret;
 }
 
@@ -364,7 +364,7 @@ void	CLandscapeIGManager::reloadAllIgs()
 		const	char	*token= bkupIgFileNameList[i].c_str();
 		UInstanceGroup	*ig = UInstanceGroup::createInstanceGroup(token);
 		// add it to the map.
-		string	tokId= toUpper(token);
+		string	tokId= toUpperAscii(token);
 		_ZoneInstanceGroupMap[tokId]= CInstanceGroupElement(ig, token);
 
 		// If was addedToScene before, re-add to scene now.
diff --git a/nel/src/ligo/primitive.cpp b/nel/src/ligo/primitive.cpp
index 205464c67..c9c4f8180 100644
--- a/nel/src/ligo/primitive.cpp
+++ b/nel/src/ligo/primitive.cpp
@@ -1250,7 +1250,7 @@ const	IPrimitive	*IPrimitive::getPrimitive	(const	std::string	&absoluteOrRelativ
 			childName=path.substr(0,indexStr);
 			path.erase(0, indexStr);
 		}
-		childName=toUpper(childName);
+		childName=toUpperAscii(childName);
 		const	IPrimitive*child=NULL;
 		uint	childIndex;
 		for	(childIndex=0;childIndex<cursor->getNumChildren();childIndex++)
@@ -1259,7 +1259,7 @@ const	IPrimitive	*IPrimitive::getPrimitive	(const	std::string	&absoluteOrRelativ
 			nlassert(child);
 			string	name;
 			if	(	child->getPropertyByName("class", name)
-				&&	toUpper(name)==childName	)
+				&&	toUpperAscii(name)==childName	)
 				break;
 		}
 		if	(childIndex>=cursor->getNumChildren())
diff --git a/nel/src/misc/system_info.cpp b/nel/src/misc/system_info.cpp
index 762904443..d8a79ca77 100644
--- a/nel/src/misc/system_info.cpp
+++ b/nel/src/misc/system_info.cpp
@@ -1733,7 +1733,7 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 					HKEY keyRoot = HKEY_LOCAL_MACHINE;
 					for (i=0; i<sizeof(rootKeysH)/sizeof(HKEY); i++)
 					{
-						if (toUpper(keyPath).find (rootKeys[i]) == 0)
+						if (toUpperAscii(keyPath).find (rootKeys[i]) == 0)
 						{
 							keyPath = keyPath.substr (strlen (rootKeys[i]));
 							keyRoot = rootKeysH[i];
diff --git a/nel/src/net/service.cpp b/nel/src/net/service.cpp
index 1bbe71469..0f679fa84 100644
--- a/nel/src/net/service.cpp
+++ b/nel/src/net/service.cpp
@@ -956,7 +956,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName,
 		// Load the recording state from the config file
 		if ((var = ConfigFile.getVarPtr ("Rec")) != NULL)
 		{
-			string srecstate = toUpper(var->asString());
+			string srecstate = toUpperAscii(var->asString());
 			if ( srecstate == "RECORD" )
 			{
 				_RecordingState = CCallbackNetBase::Record;
diff --git a/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
index 514282b23..5918ba73c 100644
--- a/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -302,7 +302,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 						debug(toString("The slot name %d is Empty.", i));
 
 					// Push the possible slots for the item in the list.
-					SlotBF|= SINT64_CONSTANT(1)<< (SLOTTYPE::stringToSlotType(NLMISC::toUpper(slotName)));
+					SlotBF|= SINT64_CONSTANT(1)<< (SLOTTYPE::stringToSlotType(NLMISC::toUpperAscii(slotName)));
 				}
 			}
 		}
@@ -321,7 +321,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	}
 	else
 	{
-		Family = (ITEMFAMILY::EItemFamily) ITEMFAMILY::stringToItemFamily(NLMISC::toUpper( family) );
+		Family = (ITEMFAMILY::EItemFamily) ITEMFAMILY::stringToItemFamily(NLMISC::toUpperAscii( family) );
 		if(Family == ITEMFAMILY::UNDEFINED)
 			debug("Item Family Undefined.");
 	}
@@ -335,7 +335,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	}
 	else
 	{
-		ItemType = (ITEM_TYPE::TItemType) ITEM_TYPE::stringToItemType(NLMISC::toUpper(itemtype) );
+		ItemType = (ITEM_TYPE::TItemType) ITEM_TYPE::stringToItemType(NLMISC::toUpperAscii(itemtype) );
 		if (ItemType == ITEM_TYPE::UNDEFINED)
 			debug("Item Type Undefined.");
 	}
diff --git a/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
index 53d875cab..5c2584cfc 100644
--- a/ryzom/client/src/client_sheets/sbrick_sheet.cpp
+++ b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
@@ -103,7 +103,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 	{
 		string	sheetName= Id.toString();
 		std::string::size_type	end= sheetName.find(".sbrick")-2;
-		BrickFamily = BRICK_FAMILIES::toSBrickFamily ( NLMISC::toUpper(sheetName.substr(0,end)) );
+		BrickFamily = BRICK_FAMILIES::toSBrickFamily ( NLMISC::toUpperAscii(sheetName.substr(0,end)) );
 		if(BrickFamily==BRICK_FAMILIES::Unknown)
 			nlwarning("Unknown Family for SBrick: %s", sheetName.c_str());
 	}
diff --git a/ryzom/client/src/color_slot_manager.cpp b/ryzom/client/src/color_slot_manager.cpp
index cccd680c2..87b7815bf 100644
--- a/ryzom/client/src/color_slot_manager.cpp
+++ b/ryzom/client/src/color_slot_manager.cpp
@@ -134,7 +134,7 @@ uint CColorSlotManager::addSlot(const TStringVect &slotDescs)
 	_Slots.push_back(slotDescs);
 	for(uint k = 0; k < slotDescs.size(); ++k)
 	{
-		_Slots.back()[k] = NLMISC::toUpper(_Slots.back()[k]);
+		_Slots.back()[k] = NLMISC::toUpperAscii(_Slots.back()[k]);
 	}
 	return (uint)_Slots.size() - 1;
 }
@@ -266,7 +266,7 @@ bool CColorSlotManager::parseTexName(const char *texName, std::string *texNameWi
 	static  std::string nameToParse;
 	static  std::string currentExt;
 	static  TIntCoupleVect slotsId;
-	nameToParse = NLMISC::toUpper(NLMISC::CFile::getFilenameWithoutExtension(texName));
+	nameToParse = NLMISC::toUpperAscii(NLMISC::CFile::getFilenameWithoutExtension(texName));
 
 	TStrPos currPos = nameToParse.length();
 
@@ -376,7 +376,7 @@ bool CColorSlotManager::changeTexName(std::string &texName, TIntCouple *slotIDs,
 	static TIntCoupleVect srcSlotIDs;
 
 	everythingOk = true;
-	texNameNoExt = NLMISC::toUpper(NLMISC::CFile::getFilenameWithoutExtension(texName));
+	texNameNoExt = NLMISC::toUpperAscii(NLMISC::CFile::getFilenameWithoutExtension(texName));
 	texExt       = NLMISC::CFile::getExtension(texName);
 	TTex2Slots::const_iterator texIt = _TexMap.find(texNameNoExt);
 	if (texIt != _TexMap.end())
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index 0714d1553..d7cce447d 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -229,7 +229,7 @@ struct CStatThread : public NLMISC::IRunnable
 			name = UserEntity->getEntityName();
 
 		std::string userid = toString("u%d", NetMngr.getUserId())+name;
-		return toUpper(getMD5((const uint8 *)userid.c_str(), (uint32)userid.size()).toString());
+		return toUpperAscii(getMD5((const uint8 *)userid.c_str(), (uint32)userid.size()).toString());
 	}
 
 	// return true if we sent the connect because we have all information
@@ -244,7 +244,7 @@ struct CStatThread : public NLMISC::IRunnable
 		std::string params;
 		addParam(params, "ra", randomString());
 		std::string session = toString("%d%d", NetMngr.getUserId(), CTime::getSecondsSince1970());
-		addParam(params, "sessioncookie", toUpper(getMD5((const uint8 *)session.c_str(), (uint32)session.size()).toString()));
+		addParam(params, "sessioncookie", toUpperAscii(getMD5((const uint8 *)session.c_str(), (uint32)session.size()).toString()));
 		addParam(params, "cookie", cookie());
 		addParam(params, "browsertoken", "X");
 		addParam(params, "platformtoken", "Win32");
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index b43e8e19a..171b4bc08 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -4613,7 +4613,7 @@ public:
 			}
 
 			std::locale loc("");
-			const std::collate<char>& coll = std::use_facet<std::collate<char> >(loc);
+			const std::collate<char>& coll = std::use_facet<std::collate<char> >(loc); // FIXME: Probably does not work
 
 			for(uint i = 0; i < nbChilds - 1; ++i)
 			{
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index f23152b8a..71e8a28d1 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -117,7 +117,7 @@ void		CActionPhraseFaber::launchFaberCastWindow(sint32 memoryLine, uint memoryIn
 
 	if (!rootBrick->Properties.empty())
 	{
-		string prop= NLMISC::toUpper(rootBrick->Properties[0].Text);
+		string prop= NLMISC::toUpperAscii(rootBrick->Properties[0].Text);
 		vector<string>	strList;
 		splitString(prop, " ", strList);
 		// The prop Id should be 'FPLAN:'
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 4a66dd307..1723891d6 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -431,7 +431,7 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 		// The string may have multiple brick type separated by |
 		string	brickTypeArray= (const char*)prop;
 		vector<string>	strList;
-		NLMISC::splitString(NLMISC::toUpper(brickTypeArray), "|", strList);
+		NLMISC::splitString(NLMISC::toUpperAscii(brickTypeArray), "|", strList);
 
 		// Test All words
 		for(uint i=0;i<strList.size();i++)
@@ -457,7 +457,7 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
 	if(prop)
 	{
 		string str= prop.str();
-		_ItemSlot= SLOTTYPE::stringToSlotType(NLMISC::toUpper(str));
+		_ItemSlot= SLOTTYPE::stringToSlotType(NLMISC::toUpperAscii(str));
 	}
 
 	// _AutoGrayed
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 998817b77..66ed24233 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2987,7 +2987,7 @@ void CInterfaceManager::log(const std::string &str, const std::string &cat)
 		FILE *f = nlfopen(fileName, "at");
 		if (f != NULL)
 		{
-			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str;
+			const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpperAscii(cat) + ") * " + str;
 			fprintf(f, "%s\n", finalString.c_str());
 			fclose(f);
 		}
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
index b238a4c5e..ea3a0036b 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
@@ -47,7 +47,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet *
 			continue;
 
 		// Get name id of effect
-		CSString name = toUpper(eff.splitTo(':', true));
+		CSString name = toUpperAscii(eff.splitTo(':', true));
 
 		// Extract parameters from sheet
 		vector<CSString> params;
diff --git a/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
index 84dbdf785..a4a0851da 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_special_effect.cpp
@@ -101,7 +101,7 @@ string CItemSpecialEffectHelper::getEffect(const std::string &effect, bool &firs
 		return result;
 
 	// Get name id of effect
-	CSString name = toUpper(eff.splitTo(':', true));
+	CSString name = toUpperAscii(eff.splitTo(':', true));
 
 	// Extract parameters from sheet
 	vector<CSString> params;
diff --git a/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 21977f0bc..0f8055043 100644
--- a/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -404,7 +404,7 @@ CModalContainerEditCmd::CModalContainerEditCmd()
 void CModalContainerEditCmd::create(const std::string &name, bool bDefKey, bool allowAllActions)
 {
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	string prefix = NLMISC::toUpper(name);
+	string prefix = NLMISC::toUpperAscii(name);
 	CanDefineKey = bDefKey;
 	_AllowAllActions = allowAllActions;
 	prefix = string(DB_EDITCMD_PREFIX) + string(":") + prefix + string(":");
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 3fb3a74a7..8c43de2eb 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -195,22 +195,16 @@ bool CPeopleList::sortExByContactId(const CPeople& a, const CPeople& b)
 //==================================================================
 bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 {
-	string name_a = toUpper(a.getName());
-	string name_b = toUpper(b.getName());
-	
-	return (name_a < name_b);
+	return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
 }
 
 //==================================================================
 bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 {
-	string name_a = toUpper(a.getName());
-	string name_b = toUpper(b.getName());
-	
 	// We want order: online/alpha, offworld/alpha, offline/alpha
 	if (a.Online == b.Online)
 	{
-		return (name_a < name_b);
+		return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
 	}
 	else
 	{
diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index 2cbb86dac..e1fc52eb7 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -96,7 +96,7 @@ void CItemGroup::addItem(sint32 createTime, sint32 serial, SLOT_EQUIPMENT::TSlot
 
 void CItemGroup::addRemove(std::string slotName)
 {
-	SLOT_EQUIPMENT::TSlotEquipment slot = SLOT_EQUIPMENT::stringToSlotEquipment(NLMISC::toUpper(slotName));
+	SLOT_EQUIPMENT::TSlotEquipment slot = SLOT_EQUIPMENT::stringToSlotEquipment(NLMISC::toUpperAscii(slotName));
 	if(slot != SLOT_EQUIPMENT::UNDEFINED)
 		addRemove(slot);
 }
@@ -161,7 +161,7 @@ void CItemGroup::readFrom(xmlNodePtr node)
 			ptrName = (char*) xmlGetProp(curNode, (xmlChar*)"slot");
 			std::string slot;
 			if (ptrName) NLMISC::fromString((const char*)ptrName, slot);
-			item.slot = SLOT_EQUIPMENT::stringToSlotEquipment(NLMISC::toUpper(slot));
+			item.slot = SLOT_EQUIPMENT::stringToSlotEquipment(NLMISC::toUpperAscii(slot));
 			// Old read, keep for compatibility reasons
 			ptrName = (char*) xmlGetProp(curNode, (xmlChar*)"sheetName");
 			if (ptrName) NLMISC::fromString((const char*)ptrName, item.sheetName);

From f8de4aff595c0b92e9b315ca2904d53704ccbd72 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 14:24:32 +0800
Subject: [PATCH 138/292] Fix

---
 nel/include/nel/misc/utf_string_view.h         | 4 ++--
 nel/src/misc/utf_string_view.cpp               | 4 ++--
 ryzom/client/src/interface_v3/music_player.cpp | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 309377578..5b349a2d8 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -147,8 +147,8 @@ public:
 	static void append(IStream &s, u32char c);
 	static u32char get(IStream &s);
 
-	/// Get an UTF-8 string from an undefined ASCII-based codepage
-	static std::string fromAscii(std::string &str);
+	/// Get an UTF-8 string from an undefined ASCII-based codepage, without attempting to convert non-7-bit characters
+	static std::string fromAscii(const std::string &str);
 
 private:
 	typedef u32char (*TIterator)(const void **addr);
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index dd7a88868..5fedc5328 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -174,11 +174,11 @@ std::string CUtfStringView::toAscii() const
 	return res;
 }
 
-std::string CUtfStringView::fromAscii(std::string &str)
+std::string CUtfStringView::fromAscii(const std::string &str)
 {
 	std::string res;
 	res.reserve(str.size());
-	for (std::string::iterator it(str.begin()), end(str.end()); it != end; ++it)
+	for (std::string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
 	{
 		unsigned char c = *it;
 		if (c < 0x80)
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index 90eee9a0b..e211bb9d2 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -582,19 +582,18 @@ static void addFromPlaylist(const std::string &playlist, const std::vector<std::
 
 			// id a UTF-8 BOM header is present, parse as UTF-8
 			if (!useUtf8 && lineStr.length() >= 3 && memcmp(line, utf8Header, 3) == 0)
+			{
 				useUtf8 = true;
+				lineStr = trim(std::string(line + 3));
+			}
 
 			if (!useUtf8)
 			{
 				lineStr = NLMISC::mbcsToUtf8(line); // Attempt local codepage first
 				if (lineStr.empty())
-					lineStr = CUtfStringView::fromAscii(std::string(line));
+					lineStr = CUtfStringView::fromAscii(std::string(line)); // Fallback
 				lineStr = trim(lineStr);
 			}
-			else
-			{
-				lineStr = trim(std::string(line + 3));
-			}
 
 			lineStr = CUtfStringView(lineStr).toUtf8(true); // Re-encode external string
 

From 3dfc6d580735c23c338e7a7c8886c7566b1ab103 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 16:07:11 +0800
Subject: [PATCH 139/292] Fix

---
 nel/src/misc/utf_string_view.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 5fedc5328..39bf3b92f 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -76,7 +76,7 @@ void CUtfStringView::append(IStream &s, u32char c)
 	std::string tmp;
 	tmp.reserve(4);
 	append(tmp, c);
-	s.serialBuffer((uint8_t *)&tmp[0], tmp.size());
+	s.serialBuffer((uint8 *)&tmp[0], tmp.size());
 }
 
 u32char CUtfStringView::get(IStream &s)
@@ -85,7 +85,7 @@ u32char CUtfStringView::get(IStream &s)
 
 	std::string tmp;
 	tmp.reserve(4);
-	uint8_t c;
+	uint8 c;
 	s.serial(c);
 
 	// Single byte
@@ -101,7 +101,7 @@ u32char CUtfStringView::get(IStream &s)
 
 	// Read from stream
 	tmp.resize(len);
-	s.serialBuffer((uint8_t *)&tmp[1], len - 1);
+	s.serialBuffer((uint8 *)&tmp[1], len - 1);
 
 	// Decode
 	const void *str = tmp.c_str();

From 745db9518426eb84b7e8b664cf7f78442be5daed Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 2 Nov 2020 16:56:01 +0800
Subject: [PATCH 140/292] Add compatibility switch

---
 nel/include/nel/misc/ucstring.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
index 5b95c33c2..17f87e66a 100644
--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@@ -20,6 +20,8 @@
 #ifndef NL_UCSTRING_H
 #define NL_UCSTRING_H
 
+#define RYZOM_LUA_UCSTRING
+
 #include "types_nl.h"
 #include "debug.h"
 

From 5bb21d7aa06346930083d7bcf5db3760fc222f60 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 04:09:46 +0800
Subject: [PATCH 141/292] Don't expose ucstring to Lua, unless compatibility
 flag is set

---
 nel/include/nel/gui/ctrl_base.h               |  22 ++-
 nel/include/nel/gui/ctrl_text_button.h        |  14 +-
 nel/include/nel/gui/dbgroup_combo_box.h       |  20 ++-
 nel/include/nel/gui/group_container.h         |  22 ++-
 nel/include/nel/gui/group_editbox.h           |  17 +-
 nel/include/nel/gui/group_tree.h              |  12 +-
 nel/include/nel/gui/lua_ihm.h                 |   8 +
 nel/include/nel/gui/reflect.h                 |   5 +-
 nel/include/nel/gui/view_text.h               |  48 +++--
 nel/include/nel/gui/view_text_id.h            |   2 +-
 nel/src/gui/ctrl_base.cpp                     |   2 +
 nel/src/gui/ctrl_text_button.cpp              |  15 ++
 nel/src/gui/dbgroup_combo_box.cpp             |  48 ++++-
 nel/src/gui/group_container.cpp               |   2 +
 nel/src/gui/group_editbox.cpp                 |  68 +++++--
 nel/src/gui/group_html.cpp                    |   9 +-
 nel/src/gui/group_list.cpp                    |  16 +-
 nel/src/gui/group_menu.cpp                    |  41 ++++-
 nel/src/gui/interface_link.cpp                |   3 +-
 nel/src/gui/lua_ihm.cpp                       |  24 ++-
 nel/src/gui/view_text.cpp                     |  10 ++
 nel/src/web/curl_certificates.cpp             |   2 +-
 ryzom/client/src/connection.cpp               |   2 +-
 .../src/interface_v3/action_handler_item.cpp  |   4 +-
 .../bot_chat_page_create_guild.cpp            |   4 +-
 .../client/src/interface_v3/dbctrl_sheet.cpp  |  36 +++-
 .../src/interface_v3/dbgroup_build_phrase.cpp |   4 +-
 .../src/interface_v3/encyclopedia_manager.cpp |   2 +-
 ryzom/client/src/interface_v3/group_map.cpp   |  15 +-
 .../client/src/interface_v3/lua_ihm_ryzom.cpp | 167 +++++++++++++++++-
 ryzom/client/src/interface_v3/lua_ihm_ryzom.h |  42 ++++-
 .../src/interface_v3/people_interraction.cpp  |   5 +-
 ryzom/client/src/interface_v3/people_list.cpp |   2 +-
 .../src/interface_v3/sphrase_manager.cpp      |  14 +-
 ryzom/client/src/r2/dmc/action_historic.cpp   |  18 +-
 ryzom/client/src/r2/dmc/com_lua_module.cpp    |   4 +
 ryzom/client/src/r2/editor.cpp                |  30 ++++
 ryzom/client/src/r2/instance.cpp              |   6 +
 ryzom/client/src/r2/tool.cpp                  |   4 +
 39 files changed, 641 insertions(+), 128 deletions(-)

diff --git a/nel/include/nel/gui/ctrl_base.h b/nel/include/nel/gui/ctrl_base.h
index 9c80e7f7a..55983bfbb 100644
--- a/nel/include/nel/gui/ctrl_base.h
+++ b/nel/include/nel/gui/ctrl_base.h
@@ -87,7 +87,9 @@ namespace NLGUI
 
 		/// Get the ContextHelp for this control. Default is to return _ContextHelp
 		virtual void		getContextHelp(std::string &help) const {help= _ContextHelp;}
-		virtual void		getContextHelpAsUtf16(ucstring &help) const {help.fromUtf8(_ContextHelp);}
+#ifdef RYZOM_LUA_UCSTRING
+		virtual void		getContextHelpAsUtf16(ucstring &help) const {help.fromUtf8(_ContextHelp);} // Compatibility
+#endif
 		/// Get the ContextHelp for this control, with tooltip specific code. Default behaviour is identical to getContextHelp.
 		virtual void		getContextHelpToolTip(std::string &help) const { getContextHelp(help); }
 		// Get the name of the context help window. Default to "context_help"
@@ -127,8 +129,10 @@ namespace NLGUI
 		/// replace the default contextHelp
 		std::string			getDefaultContextHelp() const {return _ContextHelp;}
 		void				setDefaultContextHelp(const std::string &help) {_ContextHelp= help;}
-		ucstring			getDefaultContextHelpAsUtf16() const {return ucstring::makeFromUtf8(_ContextHelp);}
-		void				setDefaultContextHelpAsUtf16(const ucstring &help) {_ContextHelp= help.toUtf8();}
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring			getDefaultContextHelpAsUtf16() const {return ucstring::makeFromUtf8(_ContextHelp);} // Compatibility
+		void				setDefaultContextHelpAsUtf16(const ucstring &help) {_ContextHelp= help.toUtf8();} // Compatibility
+#endif
 		void				setOnContextHelp(const std::string &help) {_OnContextHelp= help;}
 		void				setOnContextHelpAHParams(const std::string &p) {_OnContextHelpParams= p;}
 
@@ -158,12 +162,18 @@ namespace NLGUI
 		// called when keyboard capture has been lost
 		virtual void		onKeyboardCaptureLost() {}
 
+#ifdef RYZOM_LUA_UCSTRING
 		// 'tooltip' property expects string to be ucstring or latin1 which is not possible from html page
-		int luaSetTooltipUtf8(CLuaState &ls);
+		int luaSetTooltipUtf8(CLuaState &ls); // Compatibility
+#endif
 
 		REFLECT_EXPORT_START(CCtrlBase, CViewBase)
-			REFLECT_UCSTRING("tooltip", getDefaultContextHelpAsUtf16, setDefaultContextHelpAsUtf16); // FIXME: Lua UTF-8
-			REFLECT_LUA_METHOD("setTooltipUtf8", luaSetTooltipUtf8);
+#ifdef RYZOM_LUA_UCSTRING
+			REFLECT_UCSTRING("tooltip", getDefaultContextHelpAsUtf16, setDefaultContextHelpAsUtf16); // Compatibility
+			REFLECT_LUA_METHOD("setTooltipUtf8", luaSetTooltipUtf8); // Compatibility
+#else
+			REFLECT_STRING("tooltip", getDefaultContextHelp, setDefaultContextHelp);
+#endif
 		REFLECT_EXPORT_END
 
 		// special for mouse over : return true and fill the name of the cursor to display
diff --git a/nel/include/nel/gui/ctrl_text_button.h b/nel/include/nel/gui/ctrl_text_button.h
index 4773a25e9..98223a802 100644
--- a/nel/include/nel/gui/ctrl_text_button.h
+++ b/nel/include/nel/gui/ctrl_text_button.h
@@ -99,8 +99,12 @@ namespace NLGUI
 		// Set text (noop if text id)
 		void			setText (const std::string &text);
 		std::string		getText () const;
-		void			setTextAsUtf16 (const ucstring &text);
-		ucstring		getTextAsUtf16 () const;
+#ifdef RYZOM_LUA_UCSTRING
+		void			setTextAsUtf16 (const ucstring &text); // Compatibility
+		ucstring		getTextAsUtf16 () const; // Compatibility
+#endif
+		void			setLocalize (bool localize);
+		bool			isLocalized () const;
 
 		void			setHardText (const std::string &text);
 		std::string		getHardText () const;
@@ -133,8 +137,12 @@ namespace NLGUI
 		int luaGetViewText(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CCtrlTextButton, CCtrlBaseButton)
-			REFLECT_UCSTRING("uc_hardtext", getTextAsUtf16, setTextAsUtf16);
+#ifdef RYZOM_LUA_UCSTRING
+			REFLECT_UCSTRING("uc_hardtext", getTextAsUtf16, setTextAsUtf16); // Compatibility
+#endif
+			REFLECT_BOOL("localize", isLocalized, setLocalize);
 			REFLECT_STRING("hardtext", getHardText, setHardText);
+			REFLECT_STRING("text", getText, setText);
 			REFLECT_SINT32("text_x", getTextX, setTextX)
 			REFLECT_SINT32("wmargin", getWMargin, setWMargin)
 			REFLECT_SINT32("wmin", getWMin, setWMin)
diff --git a/nel/include/nel/gui/dbgroup_combo_box.h b/nel/include/nel/gui/dbgroup_combo_box.h
index ddf84cbef..3826bf00f 100644
--- a/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/nel/include/nel/gui/dbgroup_combo_box.h
@@ -64,11 +64,15 @@ namespace NLGUI
 		void			setText(uint i, const std::string &text);
 		void			insertText(uint i, const std::string &text);
 		const std::string	&getText(uint i) const;
-		ucstring	getTextAsUtf16(uint i) const;
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring	getTextAsUtf16(uint i) const; // Compatibility
+#endif
 		uint			getTextId(uint i) const;
 		uint			getTextPos(uint nId) const;
 		const std::string	&getTexture(uint i) const;
-		ucstring	getTextureAsUtf16(uint i) const;
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring	getTextureAsUtf16(uint i) const; // Compatibility
+#endif
 		void			setGrayed(uint i, bool g);
 		bool			getGrayed(uint i) const;
 		void			removeText(uint nPos);
@@ -91,8 +95,10 @@ namespace NLGUI
 		// view text
 		void			setViewText(const std::string & text);
 		std::string		getViewText() const;
-		void			setViewTextAsUtf16(const ucstring &text) { setViewText(text.toUtf8()); }
-		ucstring		getViewTextAsUtf16() const;
+#ifdef RYZOM_LUA_UCSTRING
+		void			setViewTextAsUtf16(const ucstring &text) { setViewText(text.toUtf8()); } // Compatibility
+		ucstring		getViewTextAsUtf16() const; // Compatibility
+#endif
 		CViewText		*getViewText();
 
 		void			setTexture(uint i, const std::string &texture);
@@ -126,7 +132,11 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("resetTexts", luaResetTexts)
 			REFLECT_SINT32 ("selectionNb", getSelectionNb, setSelectionNb)
 			REFLECT_STRING ("selection_text", getSelectionText, setSelectionText)
-			REFLECT_UCSTRING ("view_text", getViewTextAsUtf16, setViewTextAsUtf16) // FIXME: Better to have UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+			REFLECT_UCSTRING ("view_text", getViewTextAsUtf16, setViewTextAsUtf16) // Compatibility
+#else
+			REFLECT_STRING ("view_text", getViewText, setViewText)
+#endif
 		REFLECT_EXPORT_END
 
 
diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
index d7c489e5f..5157c22b1 100644
--- a/nel/include/nel/gui/group_container.h
+++ b/nel/include/nel/gui/group_container.h
@@ -249,12 +249,14 @@ namespace NLGUI
 		// Get the header color draw. NB: depends if grayed, and if active.
 		NLMISC::CRGBA	getDrawnHeaderColor () const;
 
-		ucstring		getUCTitleOpened () const;
-		void			setUCTitleOpened (const ucstring &title);
-		ucstring		getUCTitleClosed () const;
-		void			setUCTitleClosed (const ucstring &title);
-		ucstring		getUCTitle () const;
-		void			setUCTitle (const ucstring &title);
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring		getUCTitleOpened () const; // Compatibility
+		void			setUCTitleOpened (const ucstring &title); // Compatibility
+		ucstring		getUCTitleClosed () const; // Compatibility
+		void			setUCTitleClosed (const ucstring &title); // Compatibility
+		ucstring		getUCTitle () const; // Compatibility
+		void			setUCTitle (const ucstring &title); // Compatibility
+#endif
 
 		void			setPopable(bool popable) { _Popable = popable; }
 		bool			isPopable() const { return _Popable; }
@@ -289,9 +291,11 @@ namespace NLGUI
 			REFLECT_STRING("title_opened", getTitleOpened, setTitleOpened);
 			REFLECT_STRING("title_closed", getTitleClosed, setTitleClosed);
 
-			REFLECT_UCSTRING("uc_title_opened", getUCTitleOpened, setUCTitleOpened); // FIXME: Lua UTF-8
-			REFLECT_UCSTRING("uc_title_closed", getUCTitleClosed, setUCTitleClosed); // FIXME: Lua UTF-8
-			REFLECT_UCSTRING("uc_title", getUCTitle, setUCTitle); // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+			REFLECT_UCSTRING("uc_title_opened", getUCTitleOpened, setUCTitleOpened); // Compatibility
+			REFLECT_UCSTRING("uc_title_closed", getUCTitleClosed, setUCTitleClosed); // Compatibility
+			REFLECT_UCSTRING("uc_title", getUCTitle, setUCTitle); // Compatibility
+#endif
 
 			REFLECT_STRING("title_color", getTitleColorAsString, setTitleColorAsString);
 			REFLECT_SINT32("pop_min_h", getPopupMinH, setPopupMinH);
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index 4bf200df8..ebd9aeeaf 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -74,17 +74,19 @@ namespace NLGUI
 		  */
 		void		setPrompt(const std::string &s);
 		void		setInputString(const std::string &str);
-		void		setInputStringRef(const ::u32string &str) {_InputString = str; };
+		void		setInputStringRef(const ::u32string &str);
 		void		setInputStringAsInt(sint32 val);
 		sint32		getInputStringAsInt() const;
 		void		setInputStringAsInt64(sint64 val);
 		sint64		getInputStringAsInt64() const;
 		void		setInputStringAsFloat(float val);
 		float		getInputStringAsFloat() const;
-		void		setInputStringAsUtf16(const ucstring &str);
-		ucstring    getInputStringAsUtf16() const;
-		void		setInputStringAsUtf32(const ::u32string &str);
-		::u32string   getInputStringAsUtf32() const { return _InputString; }
+#ifdef RYZOM_LUA_UCSTRING
+		void		setInputStringAsUtf16(const ucstring &str); // Compatibility
+		ucstring    getInputStringAsUtf16() const; // Compatibility
+		void		setInputStringAsUtf32(const ::u32string &str) { setInputStringRef(str); } // Compatibility
+		::u32string   getInputStringAsUtf32() const { return _InputString; } // Compatibility
+#endif
 		void		setColor(NLMISC::CRGBA col);
 
 
@@ -192,7 +194,9 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setFocusOnText", luaSetFocusOnText);
 			REFLECT_LUA_METHOD("cancelFocusOnText", luaCancelFocusOnText);
 			REFLECT_STRING("input_string", getInputString, setInputString);
-			REFLECT_UCSTRING("uc_input_string", getInputStringAsUtf16, setInputStringAsUtf16);
+#ifdef RYZOM_LUA_UCSTRING
+			REFLECT_UCSTRING("uc_input_string", getInputStringAsUtf16, setInputStringAsUtf16); // Compatibility
+#endif
 		REFLECT_EXPORT_END
 
 		/** Restore the original value of the edit box.
@@ -217,6 +221,7 @@ namespace NLGUI
 		float	_BlinkTime;
 		sint32	_CursorPos;
 		uint32  _MaxNumChar;
+		uint32  _MaxNumBytes;
 		uint32  _MaxNumReturn;
 		uint32  _MaxFloatPrec;		// used in setInputStringAsFloat() only
 		sint32	_MaxCharsSize;
diff --git a/nel/include/nel/gui/group_tree.h b/nel/include/nel/gui/group_tree.h
index 835a305e1..7a39ccfea 100644
--- a/nel/include/nel/gui/group_tree.h
+++ b/nel/include/nel/gui/group_tree.h
@@ -115,8 +115,10 @@ namespace NLGUI
 			bool getOpened() const { return Opened; }
 			void setText(const std::string &text) { Text = text; }
 			const std::string& getText() const { return Text; }
-			void setTextAsUtf16(const ucstring &text) { Text = text.toUtf8(); }
-			ucstring getTextAsUtf16() const { return ucstring::makeFromUtf8(Text); }
+#ifdef RYZOM_LUA_UCSTRING
+			void setTextAsUtf16(const ucstring &text) { Text = text.toUtf8(); } // Compatibility
+			ucstring getTextAsUtf16() const { return ucstring::makeFromUtf8(Text); } // Compatibility
+#endif
 			sint32 getFontSize() const { return FontSize; }
 			void setFontSize(sint32 value) { FontSize = value; }
 			sint32 getYDecal() const { return YDecal; }
@@ -184,7 +186,11 @@ namespace NLGUI
 				REFLECT_STRING("AHParamsClose", getAHParamsClose, setAHParamsClose);
 				REFLECT_BOOL("Opened", getOpened, setOpened);
 				REFLECT_BOOL("Show", getShow, setShow);
-				REFLECT_UCSTRING("Text", getTextAsUtf16, setTextAsUtf16); // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+				REFLECT_UCSTRING("Text", getTextAsUtf16, setTextAsUtf16); // Compatibility
+#else
+				REFLECT_STRING_REF("Text", getText, setText);
+#endif
 				// lua
 				REFLECT_LUA_METHOD("getNumChildren", luaGetNumChildren);
 				REFLECT_LUA_METHOD("getChild", luaGetChild);
diff --git a/nel/include/nel/gui/lua_ihm.h b/nel/include/nel/gui/lua_ihm.h
index cc1051e62..ec047e69a 100644
--- a/nel/include/nel/gui/lua_ihm.h
+++ b/nel/include/nel/gui/lua_ihm.h
@@ -86,10 +86,12 @@ namespace NLGUI
 
 
 		// ucstring
+#ifdef RYZOM_LUA_UCSTRING
 		static bool pop(CLuaState &ls, ucstring &dest);
 		static void push(CLuaState &ls, const ucstring &value);
 		static bool	isUCStringOnStack(CLuaState &ls, sint index);
 		static bool getUCStringOnStack(CLuaState &ls, sint index, ucstring &dest);
+#endif
 
 
 		// RGBA
@@ -108,7 +110,9 @@ namespace NLGUI
 		static void	check(CLuaState &ls, bool ok, const std::string &failReason);
 		static void	checkArgType(CLuaState &ls, const char *funcName, uint index, int argType);
 		static void	checkArgTypeRGBA(CLuaState &ls, const char *funcName, uint index);
+#ifdef RYZOM_LUA_UCSTRING
 		static void	checkArgTypeUCString(CLuaState &ls, const char *funcName, uint index);
+#endif
 		/** throw a lua expection (inside a C function called from lua) with the given reason, and the current call stack
 		  * The various check... function call this function when their test fails
 		  */
@@ -154,10 +158,12 @@ namespace NLGUI
 		static uint32		getLocalTime();
 		static double		getPreciseLocalTime();
 		static std::string	findReplaceAll(const std::string &str, const std::string &search, const std::string &replace);
+#ifdef RYZOM_LUA_UCSTRING
 		static ucstring		findReplaceAll(const ucstring &str, const ucstring &search, const ucstring &replace);
 		static ucstring		findReplaceAll(const ucstring &str, const std::string &search, const std::string &replace);
 		static ucstring		findReplaceAll(const ucstring &str, const std::string &search, const ucstring &replace);
 		static ucstring		findReplaceAll(const ucstring &str, const ucstring &search, const std::string &replace);
+#endif
 
 		//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -183,8 +189,10 @@ namespace NLGUI
 		static int	runExpr(CLuaState &ls);			// params: "expr". return: any of: nil,bool,string,number, RGBA, UCString
 		static int	runFct(CLuaState &ls);			// params: "expr", param1, param2.... return: any of: nil,bool,string,number, RGBA, UCString
 		static int  runCommand(CLuaState &ls);      // params: "command name", param1, param2 ... return true or false
+#ifdef RYZOM_LUA_UCSTRING
 		static int  isUCString(CLuaState &ls);
 		static int	concatUCString(CLuaState &ls); // workaround for + operator that don't work in luabind for ucstrings ...
+#endif
 		static int	concatString(CLuaState &ls); // speedup concatenation of several strings
 		static int	tableToString(CLuaState &ls); // concat element of a table to build a string
 		static int	getPathContent(CLuaState &ls);
diff --git a/nel/include/nel/gui/reflect.h b/nel/include/nel/gui/reflect.h
index 7da0b3529..579a9418b 100644
--- a/nel/include/nel/gui/reflect.h
+++ b/nel/include/nel/gui/reflect.h
@@ -298,6 +298,7 @@ namespace NLGUI
 		props.push_back(prop);                                                         \
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// export a unicode string value, by giving the name of the get and the set method
 	#define REFLECT_UCSTRING(exportName, getMethod, setMethod)                         \
 	{                                                                                  \
@@ -308,6 +309,7 @@ namespace NLGUI
 		prop.SetMethod.SetUCString = (CReflectedProperty::TSetUCString) static_cast<TSetUCStringa>(&A::setMethod); \
 		props.push_back(prop);                                                         \
 	}
+#endif
 
 	// export a string value, by giving the name of the get and the set method
 	#define REFLECT_STRING_REF(exportName, getMethod, setMethod)                           \
@@ -320,6 +322,7 @@ namespace NLGUI
 		props.push_back(prop);                                                         \
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// export a unicode string value, by giving the name of the get and the set method
 	#define REFLECT_UCSTRING_REF(exportName, getMethod, setMethod)                         \
 	{                                                                                  \
@@ -330,7 +333,7 @@ namespace NLGUI
 		prop.SetMethod.SetUCString = (CReflectedProperty::TSetUCString) static_cast<TSetUCStringa>(&A::setMethod); \
 		props.push_back(prop);                                                         \
 	}
-
+#endif
 
 	// export a color value, by giving the name of the get and the set method
 	#define REFLECT_RGBA(exportName, getMethod, setMethod)							   \
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 69f9efca7..3fb92f88c 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -86,7 +86,9 @@ namespace NLGUI
 
 		void setText(const std::string &text);
 		void setTextLocalized(const std::string &text, bool localized);
-		void setTextAsUtf16 (const ucstring &text);
+#ifdef RYZOM_LUA_UCSTRING
+		void setTextAsUtf16 (const ucstring &text); // Compatibility
+#endif
 		void setLocalized(bool localized);
 		void setFontName (const std::string &name);
 		void setFontSize (sint nFontSize, bool coef = true);
@@ -99,7 +101,9 @@ namespace NLGUI
 		void setShadowOffset (sint x, sint y);
 		void setLineMaxW (sint nMaxW, bool invalidate=true);
 		void setOverflowText(const std::string &text) { _OverflowText = text; }
-		void setOverflowTextAsUtf16(const ucstring &text) { _OverflowText = text.toUtf8(); }
+#ifdef RYZOM_LUA_UCSTRING
+		void setOverflowTextAsUtf16(const ucstring &text) { _OverflowText = text.toUtf8(); } // Compatibility
+#endif
 		void setMultiLine (bool bMultiLine);
 		void setMultiLineSpace (sint nMultiLineSpace);
 		void setMultiLineMaxWOnly (bool state);
@@ -117,8 +121,10 @@ namespace NLGUI
 
 		/// Get
 		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
-		ucstring		getTextAsUtf16() const;
-		ucstring		getHardTextAsUtf16() const;
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring		getTextAsUtf16() const; // Compatibility
+		ucstring		getHardTextAsUtf16() const; // Compatibility
+#endif
 		bool			isLocalized() const { return _Localized;  }
 		sint			getFontSize() const;
 		std::string		getFontName() const { return _FontName; }
@@ -130,7 +136,9 @@ namespace NLGUI
 		NLMISC::CRGBA	getShadowColor()	{ return _ShadowColor; }
 		void			getShadowOffset(sint &x, sint &y) { x = _ShadowX; y = _ShadowY; }
 		sint			getLineMaxW()		const { return _LineMaxW; }
-		ucstring		getOverflowTextAsUtf16()	const { return _OverflowText; }
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring		getOverflowTextAsUtf16()	const { return _OverflowText; } // Compatibility
+#endif
 		bool			getMultiLine() const		{ return _MultiLine; }
 		sint			getMultiLineSpace()	const	{ return _MultiLineSpace; }
 		bool			getMultiLineMaxWOnly()	const	{ return _MultiLineMaxWOnly; }
@@ -182,7 +190,9 @@ namespace NLGUI
 
 		std::string getHardText() const { return _HardText.empty() ? _Text : _HardText; }
 		void        setHardText (const std::string &ht); //< Localizes strings starting with "ui"
-		void		setHardTextAsUtf16(const ucstring &ht);
+#ifdef RYZOM_LUA_UCSTRING
+		void		setHardTextAsUtf16(const ucstring &ht); // Compatibility
+#endif
 
 		std::string getColorAsString() const;
 		void        setColorAsString(const std::string &ht);
@@ -196,10 +206,14 @@ namespace NLGUI
 		/** Setup a Text with Format Tags. Text is store without color/format tags, and special array is allocated for Format association
 		 */
 		void	setTextFormatTaged(const std::string &text);
-		void	setTextFormatTagedAsUtf16(const ucstring &text);
+#ifdef RYZOM_LUA_UCSTRING
+		void	setTextFormatTagedAsUtf16(const ucstring &text); // Compatibility
+#endif
 
 		void	setSingleLineTextFormatTaged(const std::string &text);
-		void	setSingleLineTextFormatTagedAsUtf16(const ucstring &text);
+#ifdef RYZOM_LUA_UCSTRING
+		void	setSingleLineTextFormatTagedAsUtf16(const ucstring &text); // Compatibility
+#endif
 
 		// Remove end space
 		void removeEndSpaces();
@@ -225,13 +239,17 @@ namespace NLGUI
 		int luaSetLineMaxW(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CViewText, CViewBase)
-			REFLECT_STRING("text_raw", getText, setText);
-			REFLECT_STRING("hardtext", getHardText, setHardText);
-			REFLECT_BOOL ("localize", isLocalized, setLocalized);
+			REFLECT_BOOL("localize", isLocalized, setLocalized);
+			REFLECT_STRING("hardtext", getHardText, setHardText); // Same as text, but localize is implicitly set true
+			REFLECT_STRING("text", getText, setText);
+			REFLECT_STRING("text_format", getText, setTextFormatTaged);
+			REFLECT_STRING("text_single_line_format", getText, setSingleLineTextFormatTaged);
+#ifdef RYZOM_LUA_UCSTRING
 			// REFLECT_UCSTRING("uc_text", getTextAsUtf16, setTextAsUtf16); // Deprecate uc_ functions
-			REFLECT_UCSTRING("uc_hardtext", getHardTextAsUtf16, setHardTextAsUtf16);
-			REFLECT_UCSTRING("uc_hardtext_format", getTextAsUtf16, setTextFormatTagedAsUtf16); // FIXME: Name doesn't make sense
-			REFLECT_UCSTRING("uc_hardtext_single_line_format", getTextAsUtf16, setSingleLineTextFormatTagedAsUtf16); // FIXME: Name doesn't make sense
+			REFLECT_UCSTRING("uc_hardtext", getHardTextAsUtf16, setHardTextAsUtf16); // Compatibility
+			REFLECT_UCSTRING("uc_hardtext_format", getTextAsUtf16, setTextFormatTagedAsUtf16); // Compatibility
+			REFLECT_UCSTRING("uc_hardtext_single_line_format", getTextAsUtf16, setSingleLineTextFormatTagedAsUtf16); // Compatibility
+#endif
 			REFLECT_STRING ("color", getColorAsString, setColorAsString);
 			REFLECT_RGBA ("color_rgba", getColorRGBA, setColorRGBA);
 			REFLECT_SINT32 ("alpha", getAlpha, setAlpha);
@@ -452,7 +470,7 @@ namespace NLGUI
 
 		void setStringSelectionSkipingSpace(uint stringId, const std::string &text, sint charStart, sint charEnd);
 
-	//	void pushString(const ucstring &str, bool deleteSpaceAtStart = false);
+	//	void pushString(const ucstring &str, bool deleteSpaceAtStart = false); // OLD
 
 		/// \from CInterfaceElement
 		void onInvalidateContent();
diff --git a/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
index d29721481..5f8ccb14f 100644
--- a/nel/include/nel/gui/view_text_id.h
+++ b/nel/include/nel/gui/view_text_id.h
@@ -145,7 +145,7 @@ namespace NLGUI
 		// If true, setTextFormatted() is used instead of setText()
 		bool					_IsTextFormatTaged;
 
-		// Optional ucstring modifier
+		// Optional utf-8 string modifier
 		IOnReceiveTextId		*_StringModifier;
 		std::string				_DBPath;
 		static IViewTextProvider* getTextProvider(){ return textProvider; }
diff --git a/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
index e120c5d4e..fa790d9d4 100644
--- a/nel/src/gui/ctrl_base.cpp
+++ b/nel/src/gui/ctrl_base.cpp
@@ -573,6 +573,7 @@ namespace NLGUI
 			return itr2->second;
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	int CCtrlBase::luaSetTooltipUtf8(CLuaState &ls)
 	{
@@ -585,5 +586,6 @@ namespace NLGUI
 
 		return 0;
 	}
+#endif
 }
 
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index e7689704f..8697fb212 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -1051,6 +1051,20 @@ namespace NLGUI
 		return std::string();
 	}
 
+	void CCtrlTextButton::setLocalize(bool localize)
+	{
+		if (_ViewText && !_IsViewTextId)
+			_ViewText->setLocalized(localize);
+	}
+
+	bool CCtrlTextButton::isLocalized() const
+	{
+		if (_ViewText && !_IsViewTextId)
+			return _ViewText->isLocalized();
+		return true;
+	}
+
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void CCtrlTextButton::setTextAsUtf16 (const ucstring &text)
 	{
@@ -1065,6 +1079,7 @@ namespace NLGUI
 			return CUtfStringView(_ViewText->getText()).toUtf16();
 		return ucstring("");
 	}
+#endif
 
 	// ***************************************************************************
 	void CCtrlTextButton::setHardText (const std::string &text)
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 1e5f18b4d..b54d33e8f 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -361,11 +361,13 @@ namespace NLGUI
 			return empty;
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	ucstring CDBGroupComboBox::getTextAsUtf16(uint i) const
 	{
 		return ucstring::makeFromUtf8(getText(i));
 	}
+#endif
 
 	// ***************************************************************************
 	uint CDBGroupComboBox::getTextId(uint i) const
@@ -402,12 +404,14 @@ namespace NLGUI
 		else
 			return empty;
 	}
-	
+
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	ucstring CDBGroupComboBox::getTextureAsUtf16(uint i) const
 	{
 		return ucstring::makeFromUtf8(getTexture(i));
 	}
+#endif
 
 	// ***************************************************************************
 	void		CDBGroupComboBox::setSelection(sint32 val)
@@ -489,11 +493,13 @@ namespace NLGUI
 		return _ViewText->getText();
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	ucstring CDBGroupComboBox::getViewTextAsUtf16() const
 	{
 		return  CUtfStringView(_ViewText->getText()).toUtf16();
 	}
+#endif
 
 	// ***************************************************************************
 	CViewText *CDBGroupComboBox::getViewText()
@@ -576,10 +582,16 @@ namespace NLGUI
 	{
 		const char *funcName = "addText";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 1);
-		ucstring text;
+		ucstring text; // Compatibility
 		nlverify(CLuaIHM::pop(ls, text));
-		addText(text.toUtf8()); // FIXME: Lua should just do UTF-8!
+		addText(text.toUtf8());
+#else
+		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+		string text = ls.toString(1);
+		addText(text);
+#endif
 		return 0;
 	}
 
@@ -589,10 +601,16 @@ namespace NLGUI
 		const char *funcName = "setText";
 		CLuaIHM::checkArgCount(ls, funcName, 2);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
-		ucstring text;
+		ucstring text; // Compatibility
 		nlverify(CLuaIHM::pop(ls, text));
-		setText((uint) ls.toInteger(1), text.toUtf8()); // FIXME: Lua should just do UTF-8!
+		setText((uint) ls.toInteger(1), text.toUtf8());
+#else
+		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+		string text = ls.toString(2);
+		setText((uint)ls.toInteger(1), text);
+#endif
 		return 0;
 	}
 
@@ -602,10 +620,16 @@ namespace NLGUI
 		const char *funcName = "insertText";
 		CLuaIHM::checkArgCount(ls, funcName, 2);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
 		ucstring text;
 		nlverify(CLuaIHM::pop(ls, text));
 		insertText((uint) ls.toInteger(1), text.toUtf8()); // FIXME: Lua should just do UTF-8!
+#else
+		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+		string text = ls.toString(2);
+		insertText((uint)ls.toInteger(1), text);
+#endif
 		return 0;
 	}
 
@@ -615,20 +639,30 @@ namespace NLGUI
 		const char *funcName = "setTexture";
 		CLuaIHM::checkArgCount(ls, funcName, 2);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
 		ucstring texture;
 		nlverify(CLuaIHM::pop(ls, texture));
 		setTexture((uint) ls.toInteger(1), texture.toUtf8()); // FIXME: Lua should just do UTF-8!
+#else
+		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+		string texture = ls.toString(2);
+		setTexture((uint)ls.toInteger(1), texture);
+#endif
 		return 0;
 	}
 
 	// ***************************************************************************
 	int CDBGroupComboBox::luaGetText(CLuaState &ls)
 	{
-		const char *funcName = "setText";
+		const char *funcName = "getText";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
-		CLuaIHM::push(ls, getText((uint) ls.toInteger(1)));
+#ifdef RYZOM_LUA_UCSTRING
+		CLuaIHM::push(ls, getTextAsUtf16((uint) ls.toInteger(1)));
+#else
+		ls.push(getText((uint)ls.toInteger(1)));
+#endif
 		return 1;
 	}
 
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 0740bd80f..9047fbfcb 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -4016,6 +4016,7 @@ namespace NLGUI
 		}
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void CGroupContainer::setUCTitleOpened(const ucstring &title)
 	{
@@ -4051,6 +4052,7 @@ namespace NLGUI
 	{
 		return ucstring::makeFromUtf8(getTitleClosed());
 	}
+#endif
 
 	// ***************************************************************************
 	void	CGroupContainer::launch ()
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index f90eb424f..64390bf24 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -63,6 +63,7 @@ namespace NLGUI
 									_BlinkTime(0.f),
 									_CursorPos(0),
 									_MaxNumChar(std::numeric_limits<uint32>::max()),
+									_MaxNumBytes(0),
 									_MaxNumReturn(std::numeric_limits<uint32>::max()),
 									_MaxFloatPrec(20),
 									_MaxCharsSize(32768),
@@ -149,6 +150,11 @@ namespace NLGUI
 			return toString( _MaxNumChar );
 		}
 		else
+		if( name == "max_num_bytes" )
+		{
+			return toString( _MaxNumBytes );
+		}
+		else
 		if( name == "max_num_return" )
 		{
 			return toString( _MaxNumReturn );
@@ -321,6 +327,14 @@ namespace NLGUI
 			return;
 		}
 		else
+		if( name == "max_num_bytes" )
+		{
+			uint32 i;
+			if( fromString( value, i ) )
+				_MaxNumBytes = i;
+			return;
+		}
+		else
 		if( name == "max_num_return" )
 		{
 			uint32 i;
@@ -474,6 +488,7 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "on_focus", BAD_CAST _AHOnFocus.c_str() );
 		xmlSetProp( node, BAD_CAST "on_focus_params", BAD_CAST _AHOnFocusParams.c_str() );
 		xmlSetProp( node, BAD_CAST "max_num_chars", BAD_CAST toString( _MaxNumChar ).c_str() );
+		xmlSetProp( node, BAD_CAST "max_num_bytes", BAD_CAST toString( _MaxNumBytes ).c_str() );
 		xmlSetProp( node, BAD_CAST "max_num_return", BAD_CAST toString( _MaxNumReturn ).c_str() );
 		xmlSetProp( node, BAD_CAST "max_chars_size", BAD_CAST toString( _MaxCharsSize ).c_str() );
 		xmlSetProp( node, BAD_CAST "enter_loose_focus", BAD_CAST toString( _LooseFocusOnEnter ).c_str() );
@@ -591,6 +606,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"max_num_chars" );
 		if (prop) fromString((const char*)prop, _MaxNumChar);
 
+		prop = (char*) xmlGetProp( cur, (xmlChar*)"max_num_bytes" );
+		if (prop) fromString((const char*)prop, _MaxNumBytes);
+
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"max_num_return" );
 		if (prop) fromString((const char*)prop, _MaxNumReturn);
 
@@ -969,6 +987,17 @@ namespace NLGUI
 			length = _MaxNumChar - (sint)_InputString.length();
 		}
 		::u32string toAdd = toAppend.substr(0, length);
+		if (_MaxNumBytes && length)
+		{
+			sint baseBytes = CUtfStringView(_InputString).toUtf8().length();
+			sint bytes = baseBytes + CUtfStringView(toAdd).toUtf8().length();
+			while (bytes > _MaxNumBytes)
+			{
+				length -= std::max((int)(bytes - _MaxNumBytes) >> 2, 1);
+				toAdd = toAdd.substr(0, length);
+				bytes = baseBytes + CUtfStringView(toAdd).toUtf8().length();
+			}
+		}
 		sint32	minPos;
 		sint32	maxPos;
 		if (_CurrSelection == this)
@@ -1018,7 +1047,7 @@ namespace NLGUI
 				_CursorAtPreviousLineEnd = false;
 				if (_ClearOnEscape)
 				{
-					setInputStringAsUtf32(::u32string());
+					setInputStringRef(::u32string());
 					triggerOnChangeAH();
 				}
 				CWidgetManager::getInstance()->setCaptureKeyboard(NULL);
@@ -1064,7 +1093,7 @@ namespace NLGUI
 					{
 						if (isKeyRETURN)
 						{
-							//ucstring	copyStr= _InputString;
+							//u32string	copyStr= _InputString;
 							//if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
 							if ((uint)std::count(_InputString.begin(), _InputString.end(), '\n') >= _MaxNumReturn)
 								break;
@@ -1153,11 +1182,14 @@ namespace NLGUI
 						// verify max num char
 						if ((uint) _InputString.length() < _MaxNumChar)
 						{
-							makeTopWindow();
-							::u32string::iterator it = _InputString.begin() + _CursorPos;
-							_InputString.insert(it, c);
-							++ _CursorPos;
-							triggerOnChangeAH();
+							if (!_MaxNumBytes || CUtfStringView(_InputString + c).toUtf8().size() <= _MaxNumBytes)
+							{
+								makeTopWindow();
+								::u32string::iterator it = _InputString.begin() + _CursorPos;
+								_InputString.insert(it, c);
+								++_CursorPos;
+								triggerOnChangeAH();
+							}
 						}
 						if (isKeyRETURN)
 						{
@@ -1182,7 +1214,7 @@ namespace NLGUI
 		if (CWidgetManager::getInstance()->getCaptureKeyboard() != this) return false;
 		if (!_CanUndo) return false;
 		_ModifiedInputString = _InputString;
-		setInputStringAsUtf32(_StartInputString);
+		setInputStringRef(_StartInputString);
 		_CanUndo = false;
 		_CanRedo = true;
 		setCursorPos((sint32)_InputString.length());
@@ -1195,7 +1227,7 @@ namespace NLGUI
 	{
 		if (CWidgetManager::getInstance()->getCaptureKeyboard() != this) return false;
 		if (!_CanRedo) return false;
-		setInputStringAsUtf32(_ModifiedInputString);
+		setInputStringRef(_ModifiedInputString);
 		_CanUndo = true;
 		_CanRedo = false;
 		setCursorPos((sint32)_InputString.length());
@@ -1306,7 +1338,7 @@ namespace NLGUI
 				default: break;
 			}
 			// update the text
-			setInputStringAsUtf32(_InputString);
+			setInputStringRef(_InputString);
 
 			// if event of type char or string, consider handle all of them
 			if( rEDK.getKeyEventType()==NLGUI::CEventDescriptorKey::keychar || rEDK.getKeyEventType()==NLGUI::CEventDescriptorKey::keystring )
@@ -1635,9 +1667,9 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	void CGroupEditBox::setInputString(const std::string &str)
 	{
-		setInputStringAsUtf32(CUtfStringView(str).toUtf32());
+		setInputStringRef(CUtfStringView(str).toUtf32());
 	}
-	void CGroupEditBox::setInputStringAsUtf32(const ::u32string &str)
+	void CGroupEditBox::setInputStringRef(const ::u32string &str)
 	{
 		_InputString = str;
 		if (_CursorPos > (sint32) str.length())
@@ -1761,6 +1793,7 @@ namespace NLGUI
 		return NLMISC::CUtfStringView(_InputString).toUtf8();
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void	CGroupEditBox::setInputStringAsUtf16(const ucstring &str)
 	{
@@ -1772,6 +1805,7 @@ namespace NLGUI
 	{
 		return CUtfStringView(_InputString).toUtf16();
 	}
+#endif
 
 	// ***************************************************************************
 	void CGroupEditBox::setCommand(const std::string &command, bool execute)
@@ -1844,7 +1878,7 @@ namespace NLGUI
 		}
 		if (version < 1)
 		{
-			ucstring str;
+			ucstring str; // Compatibility
 			if (!f.isReading())
 				str = CUtfStringView(_InputString).toUtf16();
 			f.serial(str);
@@ -1864,7 +1898,7 @@ namespace NLGUI
 		f.serial(_PrevNumLine);
 		if (f.isReading())
 		{
-			setInputStringAsUtf32(_InputString);
+			setInputStringRef(_InputString);
 
 		}
 		// serial selection
@@ -1881,7 +1915,7 @@ namespace NLGUI
 	void CGroupEditBox::onQuit()
 	{
 		// clear the text and restore backup pos before final save
-		setInputStringAsUtf32(::u32string());
+		setInputStringRef(::u32string());
 		_CurrSelection = NULL;
 	}
 
@@ -1889,7 +1923,7 @@ namespace NLGUI
 	void CGroupEditBox::onLoadConfig()
 	{
 		// config is not saved when there's an empty string, so restore that default state.
-		setInputStringAsUtf32(::u32string());
+		setInputStringRef(::u32string());
 		_CurrSelection = NULL;
 		_PrevNumLine = 1;
 	}
@@ -1904,7 +1938,7 @@ namespace NLGUI
 			if (_DefaultInputString)
 			{
 				_DefaultInputString= false;
-				setInputStringAsUtf32(::u32string());
+				setInputStringRef(::u32string());
 			}
 			_CanRedo = false;
 			_CanUndo = false;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 04c083c20..6694200bf 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1272,7 +1272,6 @@ namespace NLGUI
 			return;
 		}
 
-		// TODO: use ucstring / ucchar as content is utf8 chars
 		std::string::size_type pos = 0;
 		while(pos < content.size())
 		{
@@ -3695,7 +3694,7 @@ namespace NLGUI
 		{
 			// Text area ?
 			bool addEntry = false;
-			ucstring entryData;
+			string entryData;
 			if (form.Entries[i].TextArea)
 			{
 				// Get the edit box view
@@ -3706,7 +3705,7 @@ namespace NLGUI
 					CGroupEditBox *editBox = dynamic_cast<CGroupEditBox*>(group);
 					if (editBox)
 					{
-						entryData = CUtfStringView(editBox->getViewText()->getText()).toUtf16();
+						entryData = editBox->getViewText()->getText();
 						addEntry = true;
 					}
 				}
@@ -3723,7 +3722,7 @@ namespace NLGUI
 			else if (form.Entries[i].ComboBox)
 			{
 				CDBGroupComboBox *cb = form.Entries[i].ComboBox;
-				entryData.fromUtf8(form.Entries[i].SelectValues[cb->getSelection()]);
+				entryData = form.Entries[i].SelectValues[cb->getSelection()];
 				addEntry = true;
 			}
 			else if (form.Entries[i].SelectBox)
@@ -3754,7 +3753,7 @@ namespace NLGUI
 			// Add this entry
 			if (addEntry)
 			{
-				formfields.add(form.Entries[i].Name, CI18N::encodeUTF8(entryData));
+				formfields.add(form.Entries[i].Name, entryData);
 			}
 		}
 
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index c65d759ba..b21784836 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -1286,12 +1286,18 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	int CGroupList::luaAddTextChild(CLuaState &ls)
 	{
-		CLuaIHM::checkArgCount(ls, "addTextChild", 1);
-		ucstring text;
+		const char *funcName = "addTextChild";
+		CLuaIHM::checkArgCount(ls, funcName, 1);
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring text; // Compatibility
 		if(CLuaIHM::pop(ls, text))
 		{
-			addTextChild(text.toUtf8()); // FIXME: Lua UTF-8
+			addTextChild(text.toUtf8());
 		}
+#else
+		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+		addTextChild(ls.toString(1));
+#endif
 		return 0;
 	}
 
@@ -1306,15 +1312,13 @@ namespace NLGUI
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TNUMBER);
 		CLuaIHM::checkArgType(ls, funcName, 5, LUA_TNUMBER);
 		string text = ls.toString(1);
-		ucstring ucText;
-		ucText.fromUtf8(text);
 
 		uint r = (uint) ls.toInteger(2);
 		uint g = (uint) ls.toInteger(3);
 		uint b = (uint) ls.toInteger(4);
 		uint a = (uint) ls.toInteger(5);
 
-		addTextChild(ucText.toUtf8(), CRGBA(r, g, b, a)); // FIXME: Lua UTF-8
+		addTextChild(text, CRGBA(r, g, b, a));
 
 		return 0;
 	}
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index 8db402540..41c153c36 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -1823,8 +1823,13 @@ namespace NLGUI
 		const char *funcName = "getLineId";
 		CLuaIHM::checkArgCount(ls, funcName, 1);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
-		std::string id = getLineId((uint) ls.toInteger(1));
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring id = getLineId((uint) ls.toInteger(1)); // Compatibility
 		CLuaIHM::push(ls, id);
+#else
+		std::string id = getLineId((uint)ls.toInteger(1));
+		ls.push(id);
+#endif
 		return 1;
 	}
 
@@ -1853,13 +1858,21 @@ namespace NLGUI
 	{
 		const char *funcName = "addLine";
 		CLuaIHM::checkArgCount(ls, funcName, 4);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 1);
+#else
+		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+#endif
 		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
-		ucstring arg1;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1)); // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring arg1; // Compatibility
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1));
 		addLine(arg1.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4));
+#else
+		addLine(ls.toString(1), ls.toString(2), ls.toString(3), ls.toString(4));
+#endif
 		return 0;
 	}
 
@@ -1868,14 +1881,22 @@ namespace NLGUI
 	{
 		const char *funcName = "addIconLine";
 		CLuaIHM::checkArgCount(ls, funcName, 5);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 1);
+#else
+		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+#endif
 		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
-		ucstring arg1;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1)); // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+		ucstring arg1; // Compatibility
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 1, arg1));
 		addLine(arg1.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4), string(), ls.toString(5));
+#else
+		addLine(ls.toString(1), ls.toString(2), ls.toString(3), ls.toString(4), string(), ls.toString(5));
+#endif
 		return 0;
 	}
 
@@ -1885,13 +1906,21 @@ namespace NLGUI
 		const char *funcName = "addLineAtIndex";
 		CLuaIHM::checkArgCount(ls, funcName, 5);
 		CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
+#ifdef RYZOM_LUA_UCSTRING
 		CLuaIHM::checkArgTypeUCString(ls, funcName, 2);
+#else
+		CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+#endif
 		CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 		CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
+#ifdef RYZOM_LUA_UCSTRING
 		ucstring arg2;
-		nlverify(CLuaIHM::getUCStringOnStack(ls, 2, arg2)); // FIXME: Lua UTF-8
+		nlverify(CLuaIHM::getUCStringOnStack(ls, 2, arg2));
 		addLineAtIndex((uint) ls.toInteger(1), arg2.toUtf8(), ls.toString(3), ls.toString(4), ls.toString(5));
+#else
+		addLineAtIndex((uint)ls.toInteger(1), ls.toString(2), ls.toString(3), ls.toString(4), ls.toString(5));
+#endif
 		return 0;
 	}
 
diff --git a/nel/src/gui/interface_link.cpp b/nel/src/gui/interface_link.cpp
index 6fbe3a3ec..c320f8c51 100644
--- a/nel/src/gui/interface_link.cpp
+++ b/nel/src/gui/interface_link.cpp
@@ -119,13 +119,14 @@ namespace NLGUI
 			break;
 			case CReflectedProperty::UCString:
 			case CReflectedProperty::UCStringRef:
+#ifdef RYZOM_LUA_UCSTRING
 				if (valueToAffect.toString())
 				{
 					(destElem.*(property.SetMethod.SetUCString))(ucstring::makeFromUtf8(valueToAffect.getString()));
 				}
 				else
+#endif
 				{
-
 					return false;
 				}
 			break;
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index 9b00026d7..9a6bacc3c 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -100,11 +100,13 @@ using namespace NLMISC;
 #define new DEBUG_NEW
 #endif
 
+#ifdef RYZOM_LUA_UCSTRING
 // declare ostream << operator for ucstring -> registration of ucstring iin luabind will build a 'tostring' function from it
 std::ostream &operator<<(std::ostream &str, const ucstring &value)
 {
 	return str << value.toString();
 }
+#endif
 
 namespace NLGUI
 {
@@ -172,6 +174,7 @@ namespace NLGUI
 		return true;
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	bool CLuaIHM::pop(CLuaState &ls,   ucstring &dest)
 	{
@@ -224,6 +227,7 @@ namespace NLGUI
 		obj.pushvalue();
 	#endif
 	}
+#endif
 
 	// ***************************************************************************
 	// ***************************************************************************
@@ -689,6 +693,7 @@ namespace NLGUI
 				.def_readwrite("A",    &NLMISC::CRGBA::A)
 		];
 
+#ifdef RYZOM_LUA_UCSTRING
 		// ucstring
 		module(L)
 		[
@@ -709,6 +714,7 @@ namespace NLGUI
 				.def("toString",   (std::string(ucstring::*)()const)&ucstring::toString)
 				//.def(self + other<ucstring>())
 		];
+#endif
 
 		// CVector2f
 		module(L)
@@ -1279,6 +1285,7 @@ namespace NLGUI
 		return 1;
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	int CLuaIHM::isUCString(CLuaState &ls)
 	{
@@ -1313,6 +1320,7 @@ namespace NLGUI
 		CLuaIHM::push(ls, result);
 		return 1;
 	}
+#endif
 
 	// ***************************************************************************
 	int CLuaIHM::concatString(CLuaState &ls)
@@ -1511,6 +1519,7 @@ namespace NLGUI
 						ls.toString(stackIndex,    str);
 						val= str;
 					}
+#ifdef RYZOM_LUA_UCSTRING
 					else
 					{
 						// else this should be a ucstring
@@ -1519,6 +1528,7 @@ namespace NLGUI
 							throw ELuaIHMException("You must set a string,    number or ucstring to UI property '%s'",    property.Name.c_str());
 						}
 					}
+#endif
 					(target.*(property.SetMethod.SetUCString))(val);
 					return;
 				}
@@ -1631,8 +1641,10 @@ namespace NLGUI
 		ls.registerFunc("getWindowSize",    getWindowSize);
 		ls.registerFunc("getTextureSize", getTextureSize);
 		ls.registerFunc("disableModalWindow", disableModalWindow);
+#ifdef RYZOM_LUA_UCSTRING
 		ls.registerFunc("isUCString", isUCString);
 		ls.registerFunc("concatUCString", concatUCString);
+#endif
 		ls.registerFunc("concatString", concatString);
 		ls.registerFunc("tableToString", tableToString);
 		ls.registerFunc("getCurrentWindowUnder", getCurrentWindowUnder);
@@ -1665,7 +1677,11 @@ namespace NLGUI
 		// inside i18n table
 		luabind::module(L, "i18n")
 		[
-			luabind::def("get", &CI18N::getAsUtf16), // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+			luabind::def("get", &CI18N::getAsUtf16), // Compatibility
+#else
+			luabind::def("get", &CI18N::get),
+#endif
 			luabind::def("hasTranslation", &CI18N::hasTranslation)
 		];
 		// inside 'nlfile' table
@@ -1843,6 +1859,7 @@ namespace NLGUI
 		return ret;
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	ucstring		CLuaIHM::findReplaceAll(const ucstring &str,   const ucstring &search,   const ucstring &replace)
 	{
@@ -1870,7 +1887,7 @@ namespace NLGUI
 		//H_AUTO(Lua_CLuaIHM_findReplaceAll)
 		return findReplaceAll(str,   search,   ucstring::makeFromUtf8(replace));
 	}
-
+#endif
 
 	// ***************************************************************************
 	void CLuaIHM::fails(CLuaState &ls, const char *format, ...)
@@ -1957,6 +1974,7 @@ namespace NLGUI
 		}
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void CLuaIHM::checkArgTypeUCString(CLuaState &ls, const char *funcName, uint index)
 	{
@@ -1973,7 +1991,7 @@ namespace NLGUI
 			fails(ls, "%s : argument %d of expected type ucstring has bad type : %s",   funcName,   index,   ls.getTypename(ls.type(index)),   ls.type(index));
 		}
 	}
-
+#endif
 
 
 	// ***************************************************************************
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index f96ac535d..510567d8e 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -1425,11 +1425,13 @@ namespace NLGUI
 		}
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void CViewText::setTextAsUtf16(const ucstring &text)
 	{
 		setText(text.toUtf8());
 	}
+#endif
 
 	// ***************************************************************************
 	void CViewText::setTextLocalized(const std::string &text, bool localized)
@@ -2452,11 +2454,13 @@ namespace NLGUI
 		endOfPreviousLine = !_Lines[line]->getLF();
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void CViewText::setHardTextAsUtf16(const ucstring &ht)
 	{
 		setHardText(ht.toUtf8());
 	}
+#endif
 
 	// ***************************************************************************
 	void CViewText::setHardText (const std::string &ht)
@@ -2469,6 +2473,7 @@ namespace NLGUI
 		setText(ht);
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	ucstring CViewText::getTextAsUtf16() const
 	{
@@ -2480,6 +2485,7 @@ namespace NLGUI
 	{
 		return CUtfStringView(getHardText()).toUtf16();
 	}
+#endif
 
 	// ***************************************************************************
 	string CViewText::getColorAsString() const
@@ -3386,11 +3392,13 @@ namespace NLGUI
 		}
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	// ***************************************************************************
 	void	CViewText::setTextFormatTagedAsUtf16(const ucstring &text)
 	{
 		setTextFormatTaged(text.toUtf8());
 	}
+#endif
 
 	// ***************************************************************************
 	void	CViewText::setTextFormatTaged(const std::string &text)
@@ -3484,10 +3492,12 @@ namespace NLGUI
 			nlwarning("ViewText isn't multilined : uc_hardtext_format will not act as wanted !\n%s", text.c_str());
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	void CViewText::setSingleLineTextFormatTagedAsUtf16(const ucstring &text)
 	{
 		setSingleLineTextFormatTaged(text.toUtf8());
 	}
+#endif
 
 	void CViewText::setSingleLineTextFormatTaged(const std::string &text)
 	{
diff --git a/nel/src/web/curl_certificates.cpp b/nel/src/web/curl_certificates.cpp
index ecb202b76..ac88792bb 100644
--- a/nel/src/web/curl_certificates.cpp
+++ b/nel/src/web/curl_certificates.cpp
@@ -340,7 +340,7 @@ namespace NLWEB
 					}
 					else
 					{
-						nldebug("Added certificate %s", entry.name.c_str());
+						// nldebug("Added certificate %s", entry.name.c_str());
 					}
 				}
 			}
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 431cdb2ee..3cc9f97dc 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -2835,7 +2835,7 @@ class CAHScenarioControl : public IActionHandler
 					{
 						CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
 						if(editBox)
-							editBox->setInputStringAsUtf16(description);
+							editBox->setInputString(description);
 					}
 				}
 			}
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index cdd47be2a..a6eaca91e 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -130,7 +130,7 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 				{
 					if ( pIS->Family == ITEMFAMILY::SCROLL)
 					{
-						editBoxLarge->setInputStringAsUtf16(itemInfo.CustomText);
+						editBoxLarge->setInputString(itemInfo.CustomText.toUtf8()); // TODO: UTF-8 (serial)
 						editLarge->setActive(true);
 						editBoxLarge->setActive(true);
 
@@ -251,7 +251,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 						// If we already have item info
 						if ( pIS->Family == ITEMFAMILY::SCROLL)
 						{
-							editBoxLarge->setInputStringAsUtf16(itemInfo.CustomText);
+							editBoxLarge->setInputString(itemInfo.CustomText.toUtf8()); // TODO: UTF-8 (serial)
 							editLarge->setActive(true);
 							editBoxLarge->setActive(true);
 
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
index 649f2bd16..4da27749b 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
@@ -71,10 +71,10 @@ class CHandlerGuildCreate : public IActionHandler
 
 		CGroupEditBox *pDesc = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(guildDescWin));
 
-		ucstring guildName = pGEB->getInputStringAsUtf16(); // FIXME: UTF-8 (serial)
+		ucstring guildName = ucstring::makeFromUtf8(pGEB->getInputString()); // FIXME: UTF-8 (serial)
 
 		ucstring guildDesc; // FIXME: UTF-8 (serial)
-		if (pDesc != NULL) guildDesc = pDesc->getInputStringAsUtf16(); // FIXME: UTF-8 (serial)
+		if (pDesc != NULL) guildDesc.fromUtf8(pDesc->getInputString()); // FIXME: UTF-8 (serial)
 
 		uint64 icon = CGuildManager::iconMake((uint8)pCS->getGuildBack(), (uint8)pCS->getGuildSymbol(),
 								pCS->getInvertGuildSymbol(), pCS->getGuildColor1(), pCS->getGuildColor2());
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 1723891d6..f24137f23 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -104,7 +104,11 @@ void CControlSheetInfoWaiter::infoReceived()
 
 string CControlSheetInfoWaiter::infoValidated() const
 {
-	ucstring help; // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+	ucstring help; // Compatibility
+#else
+	string help;
+#endif
 	if (CtrlSheet && !LuaMethodName.empty())
 	{
 		// delegate setup of context he help ( & window ) to lua
@@ -122,7 +126,12 @@ string CControlSheetInfoWaiter::infoValidated() const
 			// retrieve result from stack
 			if (!ls->empty())
 			{
+#ifdef RYZOM_LUA_UCSTRING
 				CLuaIHM::pop(*ls, help);
+#else
+				help = ls->toString(-1);
+				ls->pop();
+#endif
 			}
 			else
 			{
@@ -131,7 +140,11 @@ string CControlSheetInfoWaiter::infoValidated() const
 		}
 	}
 
+#ifdef RYZOM_LUA_UCSTRING
 	return help.toUtf8();
+#else
+	return help;
+#endif
 }
 
 // ***************************************************************************
@@ -179,7 +192,11 @@ int CDBCtrlSheet::luaGetItemInfo(CLuaState &ls)
 // ***************************************************************************
 int CDBCtrlSheet::luaGetName(CLuaState &ls)
 {
-	CLuaIHM::push(ls, getItemActualName());
+#ifdef RYZOM_LUA_UCSTRING
+	CLuaIHM::push(ls, ucstring::makeFromUtf8(getItemActualName()));
+#else
+	ls.push(getItemActualName());
+#endif
 	return 1;
 }
 
@@ -209,7 +226,11 @@ int CDBCtrlSheet::luaGetCreatorName(CLuaState &ls)
 	CClientItemInfo itemInfo = getInventory().getItemInfo(itemSlotId);
 	string creatorName;
 	STRING_MANAGER::CStringManagerClient::instance()->getString(itemInfo.CreatorName, creatorName);
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::push(ls, ucstring::makeFromUtf8(creatorName)); // FIXME: Lua UTF-8
+#else
+	ls.push(creatorName);
+#endif
 
 	return 1;
 }
@@ -3513,11 +3534,16 @@ void	CDBCtrlSheet::getContextHelp(std::string &help) const
 				game = game["game"];
 				game.callMethodByNameNoThrow("updatePhraseTooltip", 1, 1);
 				// retrieve result from stack
-				ucstring tmpHelp; // FIXME: Lua UTF-8
 				if (!ls->empty())
 				{
-					CLuaIHM::pop(*ls, tmpHelp); // FIXME: Lua UTF-8
-					help = tmpHelp.toUtf8(); // FIXME: Lua UTF-8
+#ifdef RYZOM_LUA_UCSTRING
+					ucstring tmpHelp; // Compatibility
+					CLuaIHM::pop(*ls, tmpHelp);
+					help = tmpHelp.toUtf8();
+#else
+					help = ls->toString();
+					ls->pop();
+#endif
 				}
 				else
 				{
diff --git a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
index cbc183f35..43c03d5fc 100644
--- a/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
@@ -374,7 +374,7 @@ void			CDBGroupBuildPhrase::startComposition(const CSPhraseCom &phrase)
 
 	// set the editable name.
 	if(_UserSentenceName)
-		_UserSentenceName->setInputStringAsUtf16(name);
+		_UserSentenceName->setInputString(name);
 }
 
 
@@ -1791,7 +1791,7 @@ void			CDBGroupBuildPhrase::buildCurrentPhrase(CSPhraseCom &newPhrase)
 	// Set the Name
 	if(_UserSentenceName)
 	{
-		newPhrase.Name= _UserSentenceName->getInputStringAsUtf16();
+		newPhrase.Name= ucstring::makeFromUtf8(_UserSentenceName->getInputString());
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
index 8de31a438..7d435b64f 100644
--- a/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
+++ b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
@@ -399,7 +399,7 @@ void CEncyclopediaManager::rebuildThemaPage(uint32 themaName)
 
 		// setup task NPC name
 		CStringPostProcessNPCRemoveTitle *pSPPRT = new CStringPostProcessNPCRemoveTitle;
-		pIM->addServerID (sTmp+":npc:uc_hardtext", pThema->TaskNPCName[i], pSPPRT);
+		pIM->addServerID (sTmp+":npc:hardtext", pThema->TaskNPCName[i], pSPPRT);
 
 		// If the task is not known gray it
 		if (pThema->getTaskState((uint8)i) == 0)
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index d0b46299e..56d00d15e 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -141,7 +141,7 @@ static void popupLandMarkNameDialog()
 		const CUserLandMark userLM = map->getUserLandMark(LastSelectedLandMark);
 
 		NLGUI::CDBManager::getInstance()->getDbProp( "UI:TEMP:LANDMARKTYPE" )->setValue8(cb->getTextPos(userLM.Type));
-		eb->setInputStringAsUtf16(userLM.Title);
+		eb->setInputString(userLM.Title.toUtf8());
 	}
 	else
 	{
@@ -3375,9 +3375,10 @@ CGroupMap::CLandMarkButton* CGroupMap::findClosestLandmark(const CVector2f &cent
 	closest = std::numeric_limits<float>::max();
 	for(TLandMarkButtonVect::const_iterator it = landmarks.begin(); it != landmarks.end(); ++it)
 	{
-		ucstring lc;
-		(*it)->getContextHelpAsUtf16(lc);
-		if(filterLandmark(lc, keywords, startsWith)) {
+		std::string lc;
+		(*it)->getContextHelp(lc);
+		ucstring ulc = ucstring::makeFromUtf8(lc);
+		if(filterLandmark(ulc, keywords, startsWith)) {
 			CVector2f pos;
 			mapToWorld(pos, (*it)->Pos);
 			float dist = distsqr(center, pos);
@@ -3984,7 +3985,7 @@ class CAHValidateUserLandMarkName : public IActionHandler
 			CGroupMap *map = dynamic_cast<CGroupMap *>(LastSelectedLandMark->getParent());
 			if (!map) return;
 			// update existing landmark
-			map->updateUserLandMark(LastSelectedLandMark, eb->getInputStringAsUtf16(), landMarkType);
+			map->updateUserLandMark(LastSelectedLandMark, ucstring::makeFromUtf8(eb->getInputString()), landMarkType);
 		}
 		else
 		{
@@ -3992,11 +3993,11 @@ class CAHValidateUserLandMarkName : public IActionHandler
 			if (!LastClickedMap) return;
 			if( UseUserPositionForLandMark )
 			{
-				LastClickedMap->addUserLandMark(LastClickedMap->getPlayerPos(), eb->getInputStringAsUtf16(), landMarkType);
+				LastClickedMap->addUserLandMark(LastClickedMap->getPlayerPos(), ucstring::makeFromUtf8(eb->getInputString()), landMarkType);
 			}
 			else
 			{
-				LastClickedMap->addUserLandMark(LastClickedMap->getRightClickLastPos(), eb->getInputStringAsUtf16(), landMarkType);
+				LastClickedMap->addUserLandMark(LastClickedMap->getRightClickLastPos(), ucstring::makeFromUtf8(eb->getInputString()), landMarkType);
 			}
 			LastClickedMap->invalidateCoords();
 		}
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index d6326ed14..c87102c9e 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -265,6 +265,7 @@ static DECLARE_INTERFACE_USER_FCT(lua)
 		// NB: the value is poped in obj.set() (no need to do ls.pop());
 
 		// try with ucstring
+#ifdef RYZOM_LUA_UCSTRING
 		ucstring ucstrVal;
 
 		if (CLuaIHM::pop(ls, ucstrVal))
@@ -273,9 +274,10 @@ static DECLARE_INTERFACE_USER_FCT(lua)
 			ok = true;
 		}
 
-		// try with RGBA
 		if (!ok)
+#endif
 		{
+			// try with RGBA
 			NLMISC::CRGBA rgbaVal;
 
 			if (CLuaIHM::pop(ls, rgbaVal))
@@ -523,13 +525,17 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
 		LUABIND_FUNC(dumpCallStack),
 		LUABIND_FUNC(getDefine),
 		LUABIND_FUNC(setContextHelpText),
+#ifdef RYZOM_LUA_UCSTRING
 		luabind::def("messageBox", (void(*)(const ucstring &)) &messageBox),
 		luabind::def("messageBox", (void(*)(const ucstring &, const std::string &)) &messageBox),
 		luabind::def("messageBox", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox),
+#endif
 		luabind::def("messageBox", (void(*)(const std::string &)) &messageBox),
+#ifdef RYZOM_LUA_UCSTRING
 		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &)) &messageBoxWithHelp), // TODO: Lua UTF-8
 		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp), // TODO: Lua UTF-8
 		luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp), // TODO: Lua UTF-8
+#endif
 		luabind::def("messageBoxWithHelp", (void(*)(const std::string &)) &messageBoxWithHelp),
 		LUABIND_FUNC(replacePvpEffectParam),
 		LUABIND_FUNC(secondsSince1970ToHour),
@@ -816,16 +822,24 @@ int CLuaIHMRyzom::validMessageBox(CLuaState &ls)
 	//H_AUTO(Lua_CLuaIHM_validMessageBox)
 	const char *funcName = "validMessageBox";
 	CLuaIHM::checkArgCount(ls, funcName, 6);
+#ifdef RYZOM_LUA_UCSTRING
 	ucstring msg;
 	ls.pushValue(1); // copy ucstring at the end of stack to pop it
 	CLuaIHM::check(ls, CLuaIHM::pop(ls, msg), "validMessageBox : ucstring wanted as first parameter");
+#else
+	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+#endif
 	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
 	CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
 	CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
 	CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
 	CLuaIHM::checkArgType(ls, funcName, 6, LUA_TSTRING);
 	CInterfaceManager *im = CInterfaceManager::getInstance();
+#ifdef RYZOM_LUA_UCSTRING
 	im->validMessageBox(CInterfaceManager::QuestionIconMsg, msg.toUtf8(), ls.toString(2), ls.toString(3), ls.toString(4), ls.toString(5), ls.toString(6));
+#else
+	im->validMessageBox(CInterfaceManager::QuestionIconMsg, ls.toString(1), ls.toString(2), ls.toString(3), ls.toString(4), ls.toString(5), ls.toString(6));
+#endif
 	return 0;
 }
 
@@ -861,6 +875,7 @@ int	CLuaIHMRyzom::setTextFormatTaged(CLuaState &ls)
 	CInterfaceElement *pIE = CLuaIHM::getUIOnStack(ls,    1);
 
 	// *** check and retrieve param 2. must be a string or a ucstring
+#ifdef RYZOM_LUA_UCSTRING
 	ucstring	text;
 
 	if (ls.isString(2))
@@ -878,6 +893,13 @@ int	CLuaIHMRyzom::setTextFormatTaged(CLuaState &ls)
 			CLuaIHM::check(ls,   false,    "setTextFormatTaged() requires a string or a ucstring in param 2");
 		}
 	}
+#else
+	string text;
+	if (ls.isString(2))
+	{
+		ls.toString(2, text);
+	}
+#endif
 
 	// must be a view text
 	CViewText *vt = dynamic_cast<CViewText*>(pIE);
@@ -886,7 +908,11 @@ int	CLuaIHMRyzom::setTextFormatTaged(CLuaState &ls)
 		throw ELuaIHMException("setTextFormatTaged(): '%s' is not a CViewText",    pIE->getId().c_str());
 
 	// Set the text as format
+#ifdef RYZOM_LUA_UCSTRING
 	vt->setTextFormatTaged(text.toUtf8());
+#else
+	vt->setTextFormatTaged(text);
+#endif
 
 	return 0;
 }
@@ -909,8 +935,8 @@ struct CEmoteStruct
 			string::size_type pos1 = path1.find('|');
 			string::size_type pos2 = path2.find('|');
 
-			ucstring s1 = toUpper(CI18N::get(path1.substr(0, pos1)));
-			ucstring s2 = toUpper(CI18N::get(path2.substr(0, pos2)));
+			std::string s1 = toUpper(CI18N::get(path1.substr(0, pos1)));
+			std::string s2 = toUpper(CI18N::get(path2.substr(0, pos2)));
 
 			sint result = s1.compare(s2);
 
@@ -1698,12 +1724,22 @@ int CLuaIHMRyzom::displaySystemInfo(CLuaState &ls)
 	//H_AUTO(Lua_CLuaIHM_displaySystemInfo)
 	const char *funcName = "displaySystemInfo";
 	CLuaIHM::checkArgCount(ls, funcName, 2);
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 1);
+#else
+	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+#endif
 	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+#ifdef RYZOM_LUA_UCSTRING
 	ucstring msg;
 	nlverify(CLuaIHM::getUCStringOnStack(ls, 1, msg));
+#endif
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+#ifdef RYZOM_LUA_UCSTRING
 	pIM->displaySystemInfo(msg.toUtf8(), ls.toString(2));
+#else
+	pIM->displaySystemInfo(ls.toString(1), ls.toString(2));
+#endif
 	return 0;
 }
 
@@ -2878,12 +2914,21 @@ std::string	CLuaIHMRyzom::getDefine(const std::string &def)
 	return CWidgetManager::getInstance()->getParser()->getDefine(def);
 }
 
+#ifdef RYZOM_LUA_UCSTRING
 // ***************************************************************************
 void		CLuaIHMRyzom::setContextHelpText(const ucstring &text)
 {
 	CWidgetManager::getInstance()->setContextHelpText(text.toUtf8());
 }
+#else
+// ***************************************************************************
+void		CLuaIHMRyzom::setContextHelpText(const std::string &text)
+{
+	CWidgetManager::getInstance()->setContextHelpText(text);
+}
+#endif
 
+#ifdef RYZOM_LUA_UCSTRING
 // ***************************************************************************
 void		CLuaIHMRyzom::messageBox(const ucstring &text)
 {
@@ -2912,6 +2957,7 @@ void		CLuaIHMRyzom::messageBox(const ucstring &text, const std::string &masterGr
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	pIM->messageBox(text.toUtf8(), masterGroup, (TCaseMode) caseMode);
 }
+#endif
 
 // ***************************************************************************
 void		CLuaIHMRyzom::messageBox(const std::string &text)
@@ -2928,6 +2974,28 @@ void		CLuaIHMRyzom::messageBox(const std::string &text)
 	pIM->messageBox(text);
 }
 
+// ***************************************************************************
+void		CLuaIHMRyzom::messageBox(const std::string &text, const std::string &masterGroup)
+{
+	//H_AUTO(Lua_CLuaIHM_messageBox)
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	pIM->messageBox(text, masterGroup);
+}
+
+// ***************************************************************************
+void		CLuaIHMRyzom::messageBox(const std::string &text, const std::string &masterGroup, int caseMode)
+{
+	if (caseMode < 0 || caseMode >= CaseCount)
+	{
+		throw ELuaIHMException("messageBox: case mode value is invalid.");
+	}
+
+	//H_AUTO(Lua_CLuaIHM_messageBox)
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	pIM->messageBox(text, masterGroup, (TCaseMode) caseMode);
+}
+
+#ifdef RYZOM_LUA_UCSTRING
 // ***************************************************************************
 void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text) // TODO: Lua UTF-8
 {
@@ -2956,6 +3024,7 @@ void		CLuaIHMRyzom::messageBoxWithHelp(const ucstring &text, const std::string &
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	pIM->messageBoxWithHelp(text.toUtf8(), masterGroup, "" , "", (TCaseMode) caseMode);
 }
+#endif
 
 // ***************************************************************************
 void		CLuaIHMRyzom::messageBoxWithHelp(const std::string &text)
@@ -2972,6 +3041,27 @@ void		CLuaIHMRyzom::messageBoxWithHelp(const std::string &text)
 	pIM->messageBoxWithHelp(text);
 }
 
+// ***************************************************************************
+void		CLuaIHMRyzom::messageBoxWithHelp(const std::string &text, const std::string &masterGroup)
+{
+	//H_AUTO(Lua_CLuaIHM_messageBox)
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	pIM->messageBoxWithHelp(text, masterGroup);
+}
+
+// ***************************************************************************
+void		CLuaIHMRyzom::messageBoxWithHelp(const std::string &text, const std::string &masterGroup, int caseMode)
+{
+	if (caseMode < 0 || caseMode >= CaseCount)
+	{
+		throw ELuaIHMException("messageBoxWithHelp: case mode value is invalid.");
+	}
+
+	//H_AUTO(Lua_CLuaIHM_messageBox)
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	pIM->messageBoxWithHelp(text, masterGroup, "" , "", (TCaseMode) caseMode);
+}
+
 // ***************************************************************************
 bool CLuaIHMRyzom::executeFunctionOnStack(CLuaState &ls,   int numArgs,   int numRet)
 {
@@ -3014,11 +3104,20 @@ bool CLuaIHMRyzom::executeFunctionOnStack(CLuaState &ls,   int numArgs,   int nu
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 ucstring CLuaIHMRyzom::replacePvpEffectParam(const ucstring &str, sint32 parameter)
+#else
+std::string CLuaIHMRyzom::replacePvpEffectParam(const std::string &str, sint32 parameter)
+#endif
 {
 	//H_AUTO(Lua_CLuaIHM_replacePvpEffectParam)
+#ifdef RYZOM_LUA_UCSTRING
 	ucstring result = str;
 	CSString s = str.toString();
+#else
+	std::string result = str;
+	CSString s = str;
+#endif
 	std::string p, paramString;
 
 	// Locate parameter and store it
@@ -3056,7 +3155,11 @@ ucstring CLuaIHMRyzom::replacePvpEffectParam(const ucstring &str, sint32 paramet
 		break;
 
 	default:
+#ifdef RYZOM_LUA_UCSTRING
 		debugInfo("Bad arguments in " + str.toString() + " : " + paramString);
+#else
+		debugInfo("Bad arguments in " + str + " : " + paramString);
+#endif
 	}
 
 	strFindReplace(result, paramString.c_str(), p);
@@ -3122,7 +3225,11 @@ void CLuaIHMRyzom::loadBackground(const std::string &bg)
 
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 ucstring CLuaIHMRyzom::getPatchLastErrorMessage()
+#else
+std::string CLuaIHMRyzom::getPatchLastErrorMessage()
+#endif
 {
 #ifdef RYZOM_BG_DOWNLOADER
 	if (isBGDownloadEnabled())
@@ -3189,11 +3296,19 @@ sint32	CLuaIHMRyzom::getSkillIdFromName(const std::string &def)
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 ucstring	CLuaIHMRyzom::getSkillLocalizedName(sint32 skillId)
 {
 	//H_AUTO(Lua_CLuaIHM_getSkillLocalizedName)
 	return ucstring(STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId));
 }
+#else
+std::string	CLuaIHMRyzom::getSkillLocalizedName(sint32 skillId)
+{
+	//H_AUTO(Lua_CLuaIHM_getSkillLocalizedName)
+	return STRING_MANAGER::CStringManagerClient::getSkillLocalizedName((SKILLS::ESkills)skillId);
+}
+#endif
 
 // ***************************************************************************
 sint32	CLuaIHMRyzom::getMaxSkillValue(sint32 skillId)
@@ -3330,13 +3445,23 @@ void		CLuaIHMRyzom::clearHtmlUndoRedo(const std::string &htmlId)
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 ucstring	CLuaIHMRyzom::getDynString(sint32 dynStringId)
 {
 	//H_AUTO(Lua_CLuaIHM_getDynString)
 	string result;
 	STRING_MANAGER::CStringManagerClient::instance()->getDynString(dynStringId,   result);
-	return ucstring::makeFromUtf8(result); // TODO: Lua UTF-8
+	return ucstring::makeFromUtf8(result); // Compatibility
+}
+#else
+std::string	CLuaIHMRyzom::getDynString(sint32 dynStringId)
+{
+	//H_AUTO(Lua_CLuaIHM_getDynString)
+	string result;
+	STRING_MANAGER::CStringManagerClient::instance()->getDynString(dynStringId,   result);
+	return result;
 }
+#endif
 
 // ***************************************************************************
 bool		CLuaIHMRyzom::isDynStringAvailable(sint32 dynStringId)
@@ -3624,7 +3749,11 @@ void setMouseCursor(const std::string &texture)
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
+#else
+void CLuaIHMRyzom::tell(const std::string &player, const std::string &msg)
+#endif
 {
 	//H_AUTO(Lua_CLuaIHM_tell)
 	// display a /tell command in the main chat
@@ -3633,7 +3762,11 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 		if (!msg.empty())
 		{
 			// Parse any tokens in the message.
+#ifdef RYZOM_LUA_UCSTRING
 			string msg_modified = msg.toUtf8();
+#else
+			string msg_modified = msg;
+#endif
 
 			// Parse any tokens in the text
 			if (! CInterfaceManager::parseTokens(msg_modified))
@@ -3641,7 +3774,11 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 				return;
 			}
 
+#ifdef RYZOM_LUA_UCSTRING
 			ChatMngr.tell(player.toUtf8(), msg_modified);
+#else
+			ChatMngr.tell(player, msg_modified);
+#endif
 		}
 		else
 		{
@@ -3652,7 +3789,11 @@ void CLuaIHMRyzom::tell(const ucstring &player, const ucstring &msg)
 				CInterfaceManager *im = CInterfaceManager::getInstance();
 				w->setKeyboardFocus();
 				w->enableBlink(1);
+#ifdef RYZOM_LUA_UCSTRING
 				w->setCommand("tell " + CEntityCL::removeTitleFromName(player.toUtf8()) + " ", false);
+#else
+				w->setCommand("tell " + CEntityCL::removeTitleFromName(player) + " ", false);
+#endif
 				CGroupEditBox *eb = w->getEditBox();
 
 				if (eb != NULL)
@@ -3702,11 +3843,19 @@ bool CLuaIHMRyzom::isCtrlKeyDown()
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 std::string CLuaIHMRyzom::encodeURLUnicodeParam(const ucstring &text)
 {
 	//H_AUTO(Lua_CLuaIHM_encodeURLUnicodeParam)
 	return convertToHTML(text.toUtf8());
 }
+#else
+std::string CLuaIHMRyzom::encodeURLUnicodeParam(const std::string &text)
+{
+	//H_AUTO(Lua_CLuaIHM_encodeURLUnicodeParam)
+	return convertToHTML(text);
+}
+#endif
 
 // ***************************************************************************
 sint32 CLuaIHMRyzom::getPlayerLevel()
@@ -3773,6 +3922,7 @@ sint32 CLuaIHMRyzom::getTargetLevel()
 }
 
 // ***************************************************************************
+#ifdef RYZOM_LUA_UCSTRING
 ucstring CLuaIHMRyzom::getTargetSheet()
 {
 	CEntityCL *target = getTargetEntity();
@@ -3780,6 +3930,15 @@ ucstring CLuaIHMRyzom::getTargetSheet()
 
 	return target->sheetId().toString();
 }
+#else
+std::string CLuaIHMRyzom::getTargetSheet()
+{
+	CEntityCL *target = getTargetEntity();
+	if (!target) return std::string();
+
+	return target->sheetId().toString();
+}
+#endif
 
 // ***************************************************************************
 sint64 CLuaIHMRyzom::getTargetVpa()
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
index 44e841636..501f5301f 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
@@ -162,19 +162,35 @@ private:
 
 	static void	getCallStackAsString(int startStackLevel, std::string &result);
 	static std::string	getDefine(const std::string &def);
+#ifdef RYZOM_LUA_UCSTRING
 	static void			setContextHelpText(const ucstring &text);
+#else
+	static void			setContextHelpText(const std::string &text);
+#endif
 
 
+#ifdef RYZOM_LUA_UCSTRING
 	static void	messageBox(const ucstring &text);
 	static void	messageBox(const ucstring &text, const std::string &masterGroup);
 	static void	messageBox(const ucstring &text, const std::string &masterGroup, int caseMode);
+#endif
 	static void	messageBox(const std::string &text);
+	static void	messageBox(const std::string &text, const std::string &masterGroup);
+	static void	messageBox(const std::string &text, const std::string &masterGroup, int caseMode);
+#ifdef RYZOM_LUA_UCSTRING
 	static void	messageBoxWithHelp(const ucstring &text);
 	static void	messageBoxWithHelp(const ucstring &text, const std::string &masterGroup);
 	static void	messageBoxWithHelp(const ucstring &text, const std::string &masterGroup, int caseMode);
+#endif
 	static void	messageBoxWithHelp(const std::string &text);
+	static void	messageBoxWithHelp(const std::string &text, const std::string &masterGroup);
+	static void	messageBoxWithHelp(const std::string &text, const std::string &masterGroup, int caseMode);
 
+#ifdef RYZOM_LUA_UCSTRING
 	static ucstring	replacePvpEffectParam(const ucstring &str, sint32 parameter); // TODO: UTF-8 Lua
+#else
+	static std::string	replacePvpEffectParam(const std::string &str, sint32 parameter); // TODO: UTF-8 Lua
+#endif
 	static sint32 secondsSince1970ToHour(sint32 seconds);
 #ifdef RYZOM_BG_DOWNLOADER
 	static void	pauseBGDownloader();
@@ -183,7 +199,11 @@ private:
 	static sint	getBGDownloaderPriority();
 #endif
 	static void	loadBackground(const std::string &bg);
+#ifdef RYZOM_LUA_UCSTRING
 	static ucstring	getPatchLastErrorMessage();
+#else
+	static std::string	getPatchLastErrorMessage();
+#endif
 	static bool	isInGame();
 	static uint32 getPlayerSelectedSlot();
 	static bool	isPlayerSlotNewbieLand(uint32 slot);  // test if one of the player slot is a newbieland one, if not so, client must be patched in order to continue
@@ -192,14 +212,22 @@ private:
 	static ucstring	getSheetLocalizedName(const std::string &sheet);
 	static ucstring	getSheetLocalizedDesc(const std::string &sheet);
 	static sint32 getSkillIdFromName(const std::string &def);
+#ifdef RYZOM_LUA_UCSTRING
 	static ucstring	getSkillLocalizedName(sint32 skillId);
+#else
+	static std::string	getSkillLocalizedName(sint32 skillId);
+#endif
 	static sint32 getMaxSkillValue(sint32 skillId);
 	static sint32 getBaseSkillValueMaxChildren(sint32 skillId);
 	static sint32 getMagicResistChance(bool elementalSpell, sint32 casterSpellLvl, sint32 victimResistLvl);
 	static sint32 getDodgeParryChance(sint32 attLvl, sint32 defLvl);
 	static void	browseNpcWebPage(const std::string &htmlId, const std::string &url, bool addParameters, double timeout);
 	static void	clearHtmlUndoRedo(const std::string &htmlId);
+#ifdef RYZOM_LUA_UCSTRING
 	static ucstring	getDynString(sint32 dynStringId);
+#else
+	static std::string	getDynString(sint32 dynStringId);
+#endif
 	static bool	isDynStringAvailable(sint32 dynStringId);
 	static bool	isFullyPatched();
 	static std::string getSheetType(const std::string &sheet);
@@ -250,13 +278,21 @@ private:
 
 	// open the window to do a tell to 'player', if 'msg' is not empty, then the message will be sent immediatly
     // else, current command of the chat window will be replaced with tell 'player'
+#ifdef RYZOM_LUA_UCSTRING
 	static void	tell(const ucstring &player, const ucstring &msg);
+#else
+	static void	tell(const std::string &player, const std::string &msg);
+#endif
 	static bool isRingAccessPointInReach();
 	static void updateTooltipCoords();
 	// test if the ctrl key is down (NB nico : I didn't add other key,
 	// because it would be too easy to write a key recorder ...)
 	static bool	isCtrlKeyDown(); 							     
+#ifdef RYZOM_LUA_UCSTRING
 	static std::string encodeURLUnicodeParam(const ucstring &text);
+#else
+	static std::string encodeURLUnicodeParam(const std::string &text);
+#endif
 
 	static sint32 getPlayerLevel();		// get max level among player skills (magi, combat, crafting ,foraging)
 	static sint64 getPlayerVpa();
@@ -264,8 +300,12 @@ private:
 	static sint64 getPlayerVpc();
 	static sint32 getTargetLevel();		// get current, precise level of the selected target, or -1 if there's no such selected target
 	static sint32 getTargetForceRegion(); // get 'force region' for current target, or -1 if there's no selected target
-	static sint32 getTargetLevelForce();	// get 'level force' for current target, or -1 if there's no selected target
+	static sint32 getTargetLevelForce();	// get 'level force' for current target, or -1 if there's no selected target					     
+#ifdef RYZOM_LUA_UCSTRING
 	static ucstring getTargetSheet();		// get the name of the target sheet (like 'zoha2old.creature')
+#else
+	static std::string getTargetSheet();		// get the name of the target sheet (like 'zoha2old.creature')
+#endif
 	static sint64 getTargetVpa();
 	static sint64 getTargetVpb();
 	static sint64 getTargetVpc();
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index 196ce69f4..0128791a2 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1677,7 +1677,10 @@ bool CPeopleInterraction::saveUserChatsInfos(NLMISC::IStream &f)
 		if (ver>=2)
 		{
 			CChatGroupWindow *pCGW = PeopleInterraction.getChatGroupWindow();
-			pCGW->saveFreeTeller(f);
+			if (pCGW)
+			{
+				pCGW->saveFreeTeller(f);
+			}
 		}
 	}
 	catch(const NLMISC::EStream &e)
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 8c43de2eb..d99089a69 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -895,7 +895,7 @@ class CHandlerContactEntry : public IActionHandler
 		CGroupContainer *gc = static_cast< CGroupContainer* >( pCaller->getParent()->getEnclosingContainer() );
 
 		// title gives the name of the player
-		string playerName = gc->getUCTitle().toUtf8();
+		string playerName = gc->getTitle();
 
 		// Simply do a tell on the player
 		ChatMngr.tell(playerName, text);
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index 379d34c00..94f2b3d84 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -4675,7 +4675,11 @@ int CSPhraseComAdpater::luaGetStaCost(CLuaState &ls)
 // ***************************************************************************
 int CSPhraseComAdpater::luaGetName(CLuaState &ls)
 {
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::push(ls, this->Phrase.Name);
+#else
+	ls.push(this->Phrase.Name.toUtf8());
+#endif
 	return 1;
 }
 
@@ -4688,11 +4692,15 @@ int CSPhraseComAdpater::luaGetDesc(CLuaState &ls)
 	if (phraseSheetID != 0)
 	{
 		// is it a built-in phrase?
-		ucstring desc; // FIXME: UTF-8 Lua
-		desc.fromUtf8(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID)));
-		if (!desc.empty())
+		const char *desc = STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetId(phraseSheetID));
+		if (*desc)
 		{
+#ifdef RYZOM_LUA_UCSTRING
+			ucstring desc = ucstring::makeFromUtf8(desc); // Compatibility
 			CLuaIHM::push(ls, desc);
+#else
+			ls.push(desc);
+#endif
 			return 1;
 		}
 	}
diff --git a/ryzom/client/src/r2/dmc/action_historic.cpp b/ryzom/client/src/r2/dmc/action_historic.cpp
index 19cab7384..cab232895 100644
--- a/ryzom/client/src/r2/dmc/action_historic.cpp
+++ b/ryzom/client/src/r2/dmc/action_historic.cpp
@@ -586,7 +586,11 @@ void CActionHistoric::CRequestEraseNode::undo(IDynamicMapClient *dmc, CScenario
 	dmc->doRequestInsertNode(_ParentInstanceId, _AttrNameInParent, _PositionInParent, "", _OldValue);
 	_OldValue = NULL;
 
-	CLuaIHM::push(getEditor().getLua(), _InstanceId);
+#ifdef RYZOM_LUA_UCSTRING
+	CLuaIHM::push(getEditor().getLua(), ucstring::makeFromUtf8(_InstanceId));
+#else
+	getEditor().getLua().push(_InstanceId);
+#endif
 	getEditor().callEnvMethod("setUndoRedoInstances", 1, 0);
 }
 //====================================================================================
@@ -616,7 +620,11 @@ void CActionHistoric::CRequestInsertNode::redo(IDynamicMapClient *dmc, CScenario
 	dmc->doRequestInsertNode(_InstanceId, _AttrName, _Position, _Key, _Value);
 
 	CObject* nodeId = _Value->findAttr("InstanceId");
-	CLuaIHM::push(getEditor().getLua(), nodeId->toString());
+#ifdef RYZOM_LUA_UCSTRING
+	CLuaIHM::push(getEditor().getLua(), ucstring::makeFromUtf8(nodeId->toString()));
+#else
+	getEditor().getLua().push(nodeId->toString());
+#endif
 	getEditor().callEnvMethod("setUndoRedoInstances", 1, 0);
 }
 //
@@ -641,7 +649,11 @@ void CActionHistoric::CRequestInsertNode::undo(IDynamicMapClient *dmc, CScenario
 			// send to network
 			dmc->doRequestEraseNode(instanceId, attrName, position);
 
-			CLuaIHM::push(getEditor().getLua(), instanceId);
+#ifdef RYZOM_LUA_UCSTRING
+			CLuaIHM::push(getEditor().getLua(), ucstring::makeFromUtf8(instanceId));
+#else
+			getEditor().getLua().push(instanceId);
+#endif
 			getEditor().callEnvMethod("setUndoRedoInstances", 1, 0);
 		}
 		else
diff --git a/ryzom/client/src/r2/dmc/com_lua_module.cpp b/ryzom/client/src/r2/dmc/com_lua_module.cpp
index aaa8410ab..789884c76 100644
--- a/ryzom/client/src/r2/dmc/com_lua_module.cpp
+++ b/ryzom/client/src/r2/dmc/com_lua_module.cpp
@@ -903,6 +903,7 @@ int CComLuaModule::luaRequestNewAction(lua_State* state, bool pending, uint coun
 		}
 		else
 		{
+#ifdef RYZOM_LUA_UCSTRING
 			// try with ucstring
 			CLuaState &ls = getEditor().getLua();
 			nlassert(ls.getStatePointer() == state);
@@ -911,6 +912,9 @@ int CComLuaModule::luaRequestNewAction(lua_State* state, bool pending, uint coun
 				nlwarning("<r2.%s> : ucstring or string expected as action name", funcName);
 				return 0;
 			}
+#else
+			return 0;
+#endif
 		}
 	}
 	else
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index a9da5b1e8..8d0f14e02 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -1191,10 +1191,15 @@ int CEditor::luaGenInstanceName(CLuaState &ls)
 	CHECK_EDITOR
 	const char *funcName = "genInstanceName";
 	CLuaIHM::checkArgCount(ls, funcName, 2); // this is a method
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 2); // name
 	ucstring baseName;
 	nlverify(CLuaIHM::getUCStringOnStack(ls, 2, baseName));
 	CLuaIHM::push(ls, getEditor().genInstanceName(baseName));
+#else
+	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+	ls.push(getEditor().genInstanceName(ucstring::makeFromUtf8(ls.toString(2))).toUtf8()); // FIXME: Ring UTF-8
+#endif
 	return 1;
 }
 
@@ -1205,10 +1210,15 @@ int CEditor::luaIsPostFixedByNumber(CLuaState &ls)
 	CHECK_EDITOR
 	const char *funcName = "isPostFixedByNumber";
 	CLuaIHM::checkArgCount(ls, funcName, 2); // this is a method
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 2); // name
 	ucstring baseName;
 	nlverify(CLuaIHM::getUCStringOnStack(ls, 2, baseName));
 	ls.push(getEditor().isPostFixedByNumber(baseName));
+#else
+	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+	ls.push(getEditor().isPostFixedByNumber(ucstring::makeFromUtf8(ls.toString(2)))); // FIXME: Ring UTF-8
+#endif
 	return 1;
 }
 
@@ -1326,9 +1336,15 @@ int CEditor::luaSetPlotItemInfos(CLuaState &ls)
 	const char *funcName = "setPlotItemInfos";
 	CLuaIHM::checkArgCount(ls, funcName, 5); // a method with 4 args
 	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TNUMBER);
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 3);
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 4);
 	CLuaIHM::checkArgTypeUCString(ls, funcName, 5);
+#else
+	CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING);
+	CLuaIHM::checkArgType(ls, funcName, 4, LUA_TSTRING);
+	CLuaIHM::checkArgType(ls, funcName, 5, LUA_TSTRING);
+#endif
 	CItemSheet *item = dynamic_cast<CItemSheet *>(SheetMngr.get(CSheetId((uint32) ls.toInteger(2))));
 	if (!item || item->Family != ITEMFAMILY::SCROLL_R2)
 	{
@@ -1336,9 +1352,15 @@ int CEditor::luaSetPlotItemInfos(CLuaState &ls)
 	}
 	R2::TMissionItem mi;
 	mi.SheetId = (uint32) ls.toInteger(2);
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::getUCStringOnStack(ls, 3, mi.Name);
 	CLuaIHM::getUCStringOnStack(ls, 4, mi.Description);
 	CLuaIHM::getUCStringOnStack(ls, 5, mi.Comment);
+#else
+	mi.Name = ucstring::makeFromUtf8(ls.toString(3));
+	mi.Description = ucstring::makeFromUtf8(ls.toString(4));
+	mi.Comment = ucstring::makeFromUtf8(ls.toString(5));
+#endif
 	getEditor().setPlotItemInfos(mi);
 	return 0;
 }
@@ -7622,7 +7644,11 @@ class CAHR2Undo : public IActionHandler
 			getEditor().setCurrentTool(NULL);
 			const ucstring *actionName = historic.getPreviousActionName();
 			nlassert(actionName);
+#ifdef RYZOM_LUA_UCSTRING
 			CLuaIHM::push(getEditor().getLua(), *actionName);
+#else
+			getEditor().getLua().push((*actionName).toUtf8());
+#endif
 			historic.undo();
 			getEditor().callEnvMethod("onUndo", 1, 0);
 		}
@@ -7651,7 +7677,11 @@ class CAHR2Redo : public IActionHandler
 			getEditor().setCurrentTool(NULL);
 			const ucstring *actionName = historic.getNextActionName();
 			nlassert(actionName);
+#ifdef RYZOM_LUA_UCSTRING
 			CLuaIHM::push(getEditor().getLua(), *actionName);
+#else
+			getEditor().getLua().push((*actionName).toUtf8());
+#endif
 			historic.redo();
 			getEditor().callEnvMethod("onRedo", 1, 0);
 		}
diff --git a/ryzom/client/src/r2/instance.cpp b/ryzom/client/src/r2/instance.cpp
index 6f3d04a2f..78845fb66 100644
--- a/ryzom/client/src/r2/instance.cpp
+++ b/ryzom/client/src/r2/instance.cpp
@@ -120,8 +120,14 @@ ucstring CInstance::getDisplayName()
 	}
 	if (getLuaProjection().callMethodByNameNoThrow("getDisplayName", 0, 1))
 	{
+#ifdef RYZOM_LUA_UCSTRING
 		ucstring result;
 		if (CLuaIHM::pop(ls, result)) return result;
+#else
+		std::string res = ls.toString();
+		ls.pop();
+		if (!res.empty()) return res;
+#endif
 	}
 	TEST_LUA_PROJ;
 	return ucstring("Can't find display name");
diff --git a/ryzom/client/src/r2/tool.cpp b/ryzom/client/src/r2/tool.cpp
index 8620341d8..756ca5de1 100644
--- a/ryzom/client/src/r2/tool.cpp
+++ b/ryzom/client/src/r2/tool.cpp
@@ -938,7 +938,11 @@ void CTool::setContextHelp(const ucstring &contextHelp)
 	// forward the call to lua (all ui handling done bye lua)
 	CLuaState &ls = getEditor().getLua();
 	CLuaStackChecker lsc(&ls);
+#ifdef RYZOM_LUA_UCSTRING
 	CLuaIHM::push(ls, contextHelp);
+#else
+	ls.push(contextHelp.toUtf8());
+#endif
 	getEditor().callEnvMethod("setToolContextHelp", 1, 0);
 }
 

From be60cf8978007e8757c828c99b5c7f59ed6de53f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 08:04:28 +0800
Subject: [PATCH 142/292] Localizable font families, start font name with ui to
 get a \n-separated font list from uxt, close ryzom/ryzomcore#623

---
 nel/include/nel/3d/font_generator.h           |   5 +-
 nel/src/3d/font_generator.cpp                 | 190 ++++++++++++------
 nel/src/gui/view_renderer.cpp                 |   2 +-
 .../build_gamedata/processes/font/1_export.py |   1 +
 .../processes/font/3_install.py               |   1 +
 ryzom/client/src/global.cpp                   |   2 +-
 6 files changed, 130 insertions(+), 71 deletions(-)

diff --git a/nel/include/nel/3d/font_generator.h b/nel/include/nel/3d/font_generator.h
index eca05d456..f79b3c109 100644
--- a/nel/include/nel/3d/font_generator.h
+++ b/nel/include/nel/3d/font_generator.h
@@ -36,7 +36,7 @@ typedef struct FT_FaceRec_* FT_Face;
 
 #include "nel/misc/types_nl.h"
 #include <string>
-
+#include <vector>
 
 namespace NL3D {
 
@@ -88,6 +88,7 @@ private:
 	static uint32 _FontGeneratorCounterUID;
 	uint32			_UID;
 	std::string		_FontFileName;
+	std::vector<std::string> _FontFileNames;
 
 #ifndef NL_DONT_USE_EXTERNAL_CODE
 	const char			*getFT2Error(FT_Error fte);
@@ -95,7 +96,7 @@ private:
 	static FT_Library	_Library;
 	static uint			_LibraryInit;
 
-	FT_Face				_Face;
+	std::vector<FT_Face> _Faces;
 #else // NL_DONT_USE_EXTERNAL_CODE
 
 #endif // NL_DONT_USE_EXTERNAL_CODE
diff --git a/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
index 06ccd3a8b..8cc24c4b6 100644
--- a/nel/src/3d/font_generator.cpp
+++ b/nel/src/3d/font_generator.cpp
@@ -26,6 +26,7 @@
 #include "nel/misc/common.h"
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
+#include "nel/misc/i18n.h"
 
 #include "nel/3d/font_generator.h"
 
@@ -190,6 +191,20 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri
 	_FontGeneratorCounterUID++;
 	_FontFileName = fontFileName;
 
+	if (NLMISC::startsWith(fontFileName, "ui"))
+	{
+		std::string nameList = CI18N::get(fontFileName);
+		NLMISC::explode(nameList, string("\n"), _FontFileNames, true);
+		for (std::vector<std::string>::iterator it(_FontFileNames.begin()), end(_FontFileNames.end()); it != end; ++it)
+		{
+			*it = CPath::lookup(*it);
+		}
+	}
+	else
+	{
+		_FontFileNames.push_back(fontFileName);
+	}
+
 	FT_Error error;
 
 	if (!_LibraryInit)
@@ -202,49 +217,66 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri
 	}
 	++_LibraryInit;
 
-	FT_Open_Args args;
-
-	if (!createFreetypeStream(fontFileName, args))
+	for (std::vector<std::string>::iterator it(_FontFileNames.begin()), end(_FontFileNames.end()); it != end; ++it)
 	{
-		nlerror ("createFreetypeStream failed with file '%s'", fontFileName.c_str());
-	}
+		FT_Open_Args args;
+		const std::string &fileName = *it;
 
-	error = FT_Open_Face(_Library, &args, 0, &_Face);
-	if (error)
-	{
-		nlerror ("FT_New_Face() failed with file '%s': %s", fontFileName.c_str(), getFT2Error(error));
-	}
+		if (!createFreetypeStream(fileName, args))
+		{
+			nlerror("createFreetypeStream failed with file '%s'", fileName.c_str());
+		}
 
-	string fontEx = fontExFileName;
-	if (fontEx.empty())
-	{
-		// try to see if the ex filename exists based on the fontExFileName
-		fontEx = CPath::lookup(CFile::getFilenameWithoutExtension (fontFileName)+".afm", false, false);
-	}
+		FT_Face face;
+		error = FT_Open_Face(_Library, &args, 0, &face);
+		if (error)
+		{
+			nlerror("FT_New_Face() failed with file '%s': %s", fileName.c_str(), getFT2Error(error));
+		}
 
-	if (!fontEx.empty())
-	{
-		if (!createFreetypeStream(fontEx, args))
+		string fontEx = fontExFileName;
+		if (fontEx.empty())
+		{
+			// try to see if the ex filename exists based on the fontExFileName
+			fontEx = CPath::lookup(CFile::getFilenameWithoutExtension(fileName) + ".afm", false, false);
+		}
+
+		if (!fontEx.empty())
 		{
-			nlerror ("createFreetypeStream failed with file '%s'", fontFileName.c_str());
+			if (!createFreetypeStream(fontEx, args))
+			{
+				nlerror("createFreetypeStream failed with file '%s'", fileName.c_str());
+				FT_Done_Face(face);
+				continue;
+			}
+
+			error = FT_Attach_Stream(face, &args);
+			if (error)
+			{
+				nlwarning("FT_Attach_File() failed with file '%s': %s", fontEx.c_str(), getFT2Error(error));
+				FT_Done_Face(face);
+				continue;
+			}
 		}
 
-		error = FT_Attach_Stream(_Face, &args);
+		error = FT_Select_Charmap(face, ft_encoding_unicode);
 		if (error)
 		{
-			nlwarning ("FT_Attach_File() failed with file '%s': %s", fontEx.c_str(), getFT2Error(error));
+			nlerror("FT_Select_Charmap() failed with file '%s': %s", fileName.c_str(), getFT2Error(error));
+			FT_Done_Face(face);
+			continue;
 		}
-	}
 
-	error = FT_Select_Charmap (_Face, ft_encoding_unicode);
-	if (error)
-	{
-		nlerror ("FT_Select_Charmap() failed with file '%s': %s", fontFileName.c_str(), getFT2Error(error));
+		_Faces.push_back(face);
 	}
 }
 
 CFontGenerator::~CFontGenerator ()
 {
+	for (std::vector<FT_Face>::iterator it(_Faces.begin()), end(_Faces.end()); it != end; ++it)
+		FT_Done_Face(*it);
+	_Faces.clear();
+
 	// important: destroying and creating your last font generator
 	// will also reload the freetype library
 	nlassert(_LibraryInit);
@@ -259,30 +291,41 @@ CFontGenerator::~CFontGenerator ()
 void CFontGenerator::getSizes (u32char c, uint32 size, uint32 &width, uint32 &height)
 {
 	FT_Error error;
+	FT_Face face;
+	FT_UInt glyph_index = 0;
 
-	error = FT_Set_Pixel_Sizes (_Face, size, size);
-	if (error)
+	if (!_Faces.size())
 	{
-		nlerror ("FT_Set_Pixel_Sizes() failed: %s", getFT2Error(error));
+		nlerror("No faces loaded");
+		return;
 	}
 
-	// retrieve glyph index from character code
-	FT_UInt glyph_index = FT_Get_Char_Index (_Face, c);
-
-	if (glyph_index == 0)
+	for (std::vector<FT_Face>::iterator it(_Faces.begin()), end(_Faces.end()); it != end; ++it)
 	{
-		// no glyph available, replace with a dot
-		glyph_index = FT_Get_Char_Index (_Face, u32char('.'));
+		face = *it;
+		error = FT_Set_Pixel_Sizes(face, size, size);
+		if (error)
+		{
+			nlerror("FT_Set_Pixel_Sizes() failed: %s", getFT2Error(error));
+			continue;
+		}
+
+		// retrieve glyph index from character code
+		glyph_index = FT_Get_Char_Index(face, c);
+
+		// found glyph
+		if (glyph_index)
+			break;
 	}
 
 	// load glyph image into the slot (erase previous one)
-	error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
+	error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
 	if (error)
 	{
 		// use fallback for glyph/character errors (composite char limit for example)
 		nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
 
-		error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
+		error = FT_Load_Glyph(face, 0, FT_LOAD_DEFAULT);
 		if (error)
 		{
 			nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
@@ -290,39 +333,48 @@ void CFontGenerator::getSizes (u32char c, uint32 size, uint32 &width, uint32 &he
 	}
 
 	// convert 24.6 fixed point into integer
-	width = _Face->glyph->metrics.width >> 6;
-	height = _Face->glyph->metrics.height >> 6;
+	width = face->glyph->metrics.width >> 6;
+	height = face->glyph->metrics.height >> 6;
 }
 
 uint8 *CFontGenerator::getBitmap (u32char c, uint32 size, bool embolden, bool oblique, uint32 &width, uint32 &height, uint32 &pitch, sint32 &left, sint32 &top, sint32 &advx, uint32 &glyphIndex)
 {
 	FT_Error error;
+	FT_Face face;
+	FT_UInt glyph_index = 0;
 
-	error = FT_Set_Pixel_Sizes (_Face, size, size);
-	if (error)
+	if (!_Faces.size())
 	{
-		nlerror ("FT_Set_Pixel_Sizes() failed: %s", getFT2Error(error));
+		nlerror("No faces loaded");
+		return NULL;
 	}
 
-	// retrieve glyph index from character code
-	FT_UInt glyph_index = FT_Get_Char_Index (_Face, c);
-
-	/*
-	if (glyph_index == 0)
+	for (std::vector<FT_Face>::iterator it(_Faces.begin()), end(_Faces.end()); it != end; ++it)
 	{
-		// no glyph available, replace with a dot
-		glyph_index = FT_Get_Char_Index (_Face, u32char('.'));
+		face = *it;
+		error = FT_Set_Pixel_Sizes(face, size, size);
+		if (error)
+		{
+			nlerror("FT_Set_Pixel_Sizes() failed: %s", getFT2Error(error));
+			continue;
+		}
+
+		// retrieve glyph index from character code
+		glyph_index = FT_Get_Char_Index(face, c);
+
+		// found glyph
+		if (glyph_index)
+			break;
 	}
-	*/
 
 	// load glyph image into the slot (erase previous one)
-	error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
+	error = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
 	if (error)
 	{
 		// use fallback for glyph/character errors (composite char limit for example)
 		nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
 
-		error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
+		error = FT_Load_Glyph (face, 0, FT_LOAD_DEFAULT);
 		if (error)
 		{
 			nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
@@ -343,47 +395,49 @@ uint8 *CFontGenerator::getBitmap (u32char c, uint32 size, bool embolden, bool ob
 
 	if (embolden)
 	{
-		FT_GlyphSlot_Embolden(_Face->glyph);
+		FT_GlyphSlot_Embolden(face->glyph);
 	}
 
 	if (oblique)
 	{
-		FT_GlyphSlot_Oblique(_Face->glyph);
+		FT_GlyphSlot_Oblique(face->glyph);
 	}
 
 	// convert to an anti-aliased bitmap
-	error = FT_Render_Glyph (_Face->glyph, ft_render_mode_normal);
+	error = FT_Render_Glyph (face->glyph, ft_render_mode_normal);
 	if (error)
 	{
 		nlerror ("FT_Render_Glyph() failed: %s", getFT2Error(error));
 	}
 
-	width = _Face->glyph->bitmap.width;
-	height = _Face->glyph->bitmap.rows;
-	pitch = _Face->glyph->bitmap.pitch;
+	width = face->glyph->bitmap.width;
+	height = face->glyph->bitmap.rows;
+	pitch = face->glyph->bitmap.pitch;
 
-	left = _Face->glyph->bitmap_left;
-	top = _Face->glyph->bitmap_top;
+	left = face->glyph->bitmap_left;
+	top = face->glyph->bitmap_top;
 
-	advx = _Face->glyph->advance.x >> 6;
+	advx = face->glyph->advance.x >> 6;
 
 	glyphIndex = glyph_index;
 
-	return (uint8 *) _Face->glyph->bitmap.buffer;
+	return (uint8 *) face->glyph->bitmap.buffer;
 }
 
 
 
 void CFontGenerator::getKerning (u32char left, u32char right, sint32 &kernx)
 {
-	if (!FT_HAS_KERNING(_Face))
+	if (!FT_HAS_KERNING(_Faces[0]))
 	{
 		kernx = 0;
 	}
 	else
 	{
+		// This is currently not used...
+
 		FT_Vector  kerning;
-		FT_Error error = FT_Get_Kerning (_Face, left, right, ft_kerning_default, &kerning);
+		FT_Error error = FT_Get_Kerning (_Faces[0], left, right, ft_kerning_default, &kerning);
 		if (error)
 		{
 			nlerror ("FT_Get_Kerning() failed: %s", getFT2Error(error));
@@ -396,12 +450,14 @@ void CFontGenerator::getKerning (u32char left, u32char right, sint32 &kernx)
 
 uint32	 CFontGenerator::getCharIndex (u32char c)
 {
-	uint32 ret = FT_Get_Char_Index(_Face, c);
+	// This is currently not used...
+
+	uint32 ret = FT_Get_Char_Index(_Faces[0], c);
 
 	if (ret == 0)
 	{
 		// no glyph available, replace with a dot
-		ret = FT_Get_Char_Index (_Face, u32char('.'));
+		ret = FT_Get_Char_Index (_Faces[0], u32char('.'));
 	}
 
 	return ret;
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 38e20f3f6..66aea4cfb 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -312,7 +312,7 @@ namespace NLGUI
 		if (fonts.count(name) > 0)
 			driver->deleteTextContext(fonts[name]);
 
-		std::string fontFile = CPath::lookup(font, false);
+		std::string fontFile = NLMISC::startsWith(font, "ui") ? font : CPath::lookup(font, false);
 		if (fontFile.empty())
 		{
 			nlwarning("Font file '%s' not found", font.c_str());
diff --git a/nel/tools/build_gamedata/processes/font/1_export.py b/nel/tools/build_gamedata/processes/font/1_export.py
index f97d3375e..5e3f23439 100755
--- a/nel/tools/build_gamedata/processes/font/1_export.py
+++ b/nel/tools/build_gamedata/processes/font/1_export.py
@@ -49,6 +49,7 @@ mkPath(log, fontExportDir)
 for dir in FontSourceDirectories:
 	mkPath(log, DatabaseDirectory + "/" + dir)
 	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".ttf")
+	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".otf")
 	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".afm")
 	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".pfb")
 	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".pfm")
diff --git a/nel/tools/build_gamedata/processes/font/3_install.py b/nel/tools/build_gamedata/processes/font/3_install.py
index c18ae12e3..11e74ccfe 100755
--- a/nel/tools/build_gamedata/processes/font/3_install.py
+++ b/nel/tools/build_gamedata/processes/font/3_install.py
@@ -50,6 +50,7 @@ mkPath(log, fontExportDir)
 
 printLog(log, ">>> Install font <<<")
 copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".ttf")
+copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".otf")
 copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".afm")
 copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".pfb")
 copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".pfm")
diff --git a/ryzom/client/src/global.cpp b/ryzom/client/src/global.cpp
index 6e8bc4534..22a568306 100644
--- a/ryzom/client/src/global.cpp
+++ b/ryzom/client/src/global.cpp
@@ -90,7 +90,7 @@ void resetTextContext (const char *font, bool resetInterfaceManager)
 {
 	if (TextContext != NULL)
 		Driver->deleteTextContext(TextContext);
-	TextContext = Driver->createTextContext(CPath::lookup(font));
+	TextContext = Driver->createTextContext(NLMISC::startsWith(font, "ui") ? font : CPath::lookup(font));
 	if (TextContext != NULL)
 		TextContext->setKeep800x600Ratio(false);
 	else

From 91bceae90265921efeb1b815313d62de7d93a215 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 08:55:45 +0800
Subject: [PATCH 143/292] Fix UTF-16 character input pair events

---
 nel/include/nel/misc/win_event_emitter.h |  3 ++-
 nel/src/misc/win_event_emitter.cpp       | 27 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/nel/include/nel/misc/win_event_emitter.h b/nel/include/nel/misc/win_event_emitter.h
index d23d9d040..ee709ec04 100644
--- a/nel/include/nel/misc/win_event_emitter.h
+++ b/nel/include/nel/misc/win_event_emitter.h
@@ -36,7 +36,7 @@ namespace NLMISC {
 class CWinEventEmitter : public IEventEmitter
 {
 public:
-	CWinEventEmitter () : _MouseEventsEnabled(true), _KeyboardEventsEnabled(true), _IMEEventsEnabled(true)
+	CWinEventEmitter () : _Utf16Pair(0), _MouseEventsEnabled(true), _KeyboardEventsEnabled(true), _IMEEventsEnabled(true)
 	{
 		_HWnd=NULL;
 		resetButtonFlagState ();
@@ -106,6 +106,7 @@ public:
 private:
 	CWinEventServer		_InternalServer;
 	HWND				_HWnd;
+	wchar_t				_Utf16Pair;
 public:
 	// private: may need to be in sync with direct input flags however...
 	bool				_CtrlButton;
diff --git a/nel/src/misc/win_event_emitter.cpp b/nel/src/misc/win_event_emitter.cpp
index dfc385bd9..939ad0477 100644
--- a/nel/src/misc/win_event_emitter.cpp
+++ b/nel/src/misc/win_event_emitter.cpp
@@ -24,6 +24,7 @@
 #include "nel/misc/event_emitter.h"
 #include "nel/misc/win_event_emitter.h"
 #include "nel/misc/event_server.h"
+#include "nel/misc/utf_string_view.h"
 
 #ifdef NL_OS_WINDOWS
 #include <windowsx.h>
@@ -177,10 +178,28 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 		{
 			//if (wParam < KeyCount)
 			//nlinfo("WM_CHAR with %u", wParam);
-#ifndef WM_UNICHAR
-			// FIXME: Combine UTF-16 pairs
-#endif
-			server->postEvent (new CEventChar ((ucchar)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
+			wchar_t c = (wchar_t)wParam;
+			if ((c & 0xFC00) == 0xD800)
+			{
+				_Utf16Pair = c;
+			}
+			else if (_Utf16Pair && (c & 0xFC00) == 0xDC00)
+			{
+				wchar_t cc[] = { _Utf16Pair, c, 0 };
+				_Utf16Pair = 0;
+				CUtfStringView cv = CUtfStringView(cc);
+				for (CUtfStringView::iterator it(cv.begin()), end(cv.end()); it != end; ++it)
+					server->postEvent(new CEventChar(*it, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
+			}
+			else
+			{
+				if (_Utf16Pair)
+				{
+					server->postEvent(new CEventChar(_Utf16Pair, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
+					_Utf16Pair = 0;
+				}
+				server->postEvent(new CEventChar(c, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
+			}
 		}
 		break;
 	/*case WM_IME_CHAR:

From 73610be10dcb4cf7ad41f25106b5985c310c50ed Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 3 Nov 2020 22:28:01 +0200
Subject: [PATCH 144/292] utf-8 fixes, ryzom/ryzomcore#335

---
 ryzom/client/src/game_context_menu.cpp        | 10 +++----
 .../src/interface_v3/chat_text_manager.cpp    | 12 ++++----
 .../interface_v3/group_in_scene_bubble.cpp    |  8 +++---
 .../src/interface_v3/interface_manager.cpp    |  2 +-
 .../src/interface_v3/people_interraction.cpp  |  4 +--
 ryzom/client/src/interface_v3/people_list.cpp | 28 +++++++++----------
 ryzom/client/src/interface_v3/people_list.h   |  4 +--
 ryzom/client/src/net_manager.cpp              |  2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 17078677d..96b0852c0 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -768,11 +768,11 @@ void CGameContextMenu::updateContextMenuMissionsOptions( bool forceHide )
 					{
 						result = NLMISC::CI18N::get("uiMissionOptionNotReceived");
 					}
-					if (result == ucstring("Qui etes-vous ?")
-						|| result == ucstring("Wer bist Du?")
-						|| result == ucstring("Who are you?")
-						|| result == ucstring("Quién eres tú?")
-						|| result == ucstring("Кто ты?"))
+					if (result == string("Qui etes-vous ?")
+						|| result == string("Wer bist Du?")
+						|| result == string("Who are you?")
+						|| result == string("Quién eres tú?")
+						|| result == string("Кто ты?"))
 					{
 						pVTM->setActive(false);
 					}
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 35ce74564..96daa2a07 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -421,14 +421,14 @@ CViewBase *CChatTextManager::createMsgTextComplex(const string &msg, NLMISC::CRG
 		return para;
 	}
 
-	ucstring::size_type pos = 0;
+	string::size_type pos = 0;
 
 	// Manage Translations
 	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
 	bool originalFirst = node->getValueBool();
 
-	string::size_type startTr = msg.find(ucstring("{:"));
-	string::size_type endOfOriginal = msg.find(ucstring("}@{"));
+	string::size_type startTr = msg.find("{:");
+	string::size_type endOfOriginal = msg.find("}@{");
 
 	// Original/Translated case, example: {:enHello the world!}@{ Bonjour le monde !
 	if (startTr != string::npos && endOfOriginal != string::npos)
@@ -436,9 +436,9 @@ CViewBase *CChatTextManager::createMsgTextComplex(const string &msg, NLMISC::CRG
 		CViewBase *vt = createMsgTextSimple(msg.substr(0, startTr), col, justified, NULL);
 		para->addChild(vt);
 
-		string texture = "flag-"+toLower(msg.substr(startTr+2, 2)).toString()+".tga";
-		ucstring original = msg.substr(startTr+5, endOfOriginal-startTr-5);
-		ucstring translation = msg.substr(endOfOriginal+3);
+		string texture = "flag-"+toLowerAscii(msg.substr(startTr+2, 2))+".tga";
+		string original = msg.substr(startTr+5, endOfOriginal-startTr-5);
+		string translation = msg.substr(endOfOriginal+3);
 		CCtrlButton *ctrlButton = new CCtrlButton(CViewBase::TCtorParam());
 		ctrlButton->setTexture(texture);
 		ctrlButton->setTextureOver(texture);
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 60243062c..95bbc1600 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -849,10 +849,10 @@ void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const std::string &ucsTe
 	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
 	bool originalFirst = node->getValueBool();
 
-	ucstring::size_type pos = 0;
-	ucstring::size_type textSize = ucsText.size();
-	string::size_type startTr = ucsText.find(ucstring("{:"));
-	string::size_type endOfOriginal = ucsText.find(ucstring("}@{"));
+	string::size_type pos = 0;
+	string::size_type textSize = ucsText.size();
+	string::size_type startTr = ucsText.find("{:");
+	string::size_type endOfOriginal = ucsText.find("}@{");
 	if (endOfOriginal != string::npos)
 	{
 		if (!originalFirst)
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 8c874d6a5..d6eb63a02 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2535,7 +2535,7 @@ void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
 	// If broadcast, parse lua code
 	if (toLower(cat) == "bc" && str.size() > 3 && str[0]=='@' && str[1]=='L' && str[2]=='U' && str[3]=='A')
 	{
-		string code = str.substr(4, str.size()-4).toString();
+		string code = str.substr(4, str.size()-4);
 		if (!code.empty())
 			CLuaManager::getInstance().executeLuaScript(code);
 		return;
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index fc3cc34d8..a2973570c 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -2334,7 +2334,7 @@ public:
 			if (gc)
 			{
 				CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(gc->getGroup("change_contact_group_eb:eb"));
-				geb->setInputString(ucstring(""));
+				geb->setInputString(std::string(""));
 			}
 			CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, sParams);
 		}
@@ -2359,7 +2359,7 @@ public:
 			{
 				
 				PeopleInterraction.FriendList.changeGroup(lastPeopleIndexChangeGroup, geb->getInputString());
-				geb->setInputString(ucstring(""));
+				geb->setInputString(std::string(""));
 				CPeopleList::TSortOrder order = (CPeopleList::TSortOrder)(NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CONTACT_LIST:SORT_ORDER")->getValue32());
 				PeopleInterraction.FriendList.sortEx(order);
 			}
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 292e73ff7..ff3be9f8c 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -287,7 +287,7 @@ void CPeopleList::sortEx(TSortOrder order)
 		{
 			newGroup = true;
 		}
-		while (groupIndex < _GroupContainers.size() && _GroupContainers[groupIndex].first != _Peoples[k].Group.toString())
+		while (groupIndex < _GroupContainers.size() && _GroupContainers[groupIndex].first != _Peoples[k].Group)
 		{
 			newGroup = true;
 			++groupIndex;
@@ -479,44 +479,44 @@ void CPeopleList::setContactId(uint index, uint32 contactId)
 }
 
 //==================================================================
-void CPeopleList::changeGroup(uint index, const ucstring &groupName)
+void CPeopleList::changeGroup(uint index, const std::string &groupName)
 {
         if (index >= _Peoples.size())
 	{
 		nlwarning("<CPeopleList::changeGroup> bad index.");
 		return;
 	}
-	ucstring group = groupName;
-	if (group.toString() == "General")
-		group = ucstring("");
+	std::string group = groupName;
+	if (group == "General")
+		group.clear();
 	_Peoples[index].Group = group;
 	
 	for (uint k = 0; k < _GroupContainers.size(); ++k)
 	{
-		if (_GroupContainers[k].first == group.toString())
+		if (_GroupContainers[k].first == group)
 			return;
 	}
 	
 	vector<pair<string, string> > properties;
 	properties.push_back(make_pair(string("posparent"), string("parent")));
 	properties.push_back(make_pair(string("id"), _ContainerID + "_group_" + toString(_GroupContainers.size())));
-	if (group.toString() == "")
+	if (group.empty())
 		properties.push_back(make_pair(string("title"), "General"));
 	else
-		properties.push_back(make_pair(string("title"), group.toString()));
+		properties.push_back(make_pair(string("title"), group));
 	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getParser()->createGroupInstance("people_list_group_header", "ui:interface", properties, false));
 
-	if (group.toString() == "")
-		gc->setUCTitle(ucstring("General"));
+	if (group.empty())
+		gc->setTitle(std::string("General"));
 	else
-		gc->setUCTitle(group.toString());
+		gc->setTitle(group);
 	gc->setSavable(false);
 
 	CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
 	pRoot->addGroup (gc);
 	_BaseContainer->attachContainer(gc);
 	
-	_GroupContainers.push_back(make_pair(group.toString(), gc));
+	_GroupContainers.push_back(make_pair(group, gc));
 	
 	std::sort(_GroupContainers.begin(), _GroupContainers.end());
 }
@@ -627,8 +627,8 @@ void CPeopleList::saveContactGroups()
 			{
 				xmlNodePtr newNode = xmlNewChild(node, NULL, (const xmlChar*)"contact", NULL);
 				
-				xmlSetProp(newNode, (const xmlChar*)"name", (const xmlChar*)_Peoples[k].getName().toString().c_str());
-				xmlSetProp(newNode, (const xmlChar*)"group", (const xmlChar*)_Peoples[k].Group.toString().c_str());
+				xmlSetProp(newNode, (const xmlChar*)"name", (const xmlChar*)_Peoples[k].getName().c_str());
+				xmlSetProp(newNode, (const xmlChar*)"group", (const xmlChar*)_Peoples[k].Group.c_str());
 			}
 			stream.flush();
 			fd.close();
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index 060fa039c..79a575a95 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -110,7 +110,7 @@ public:
 	sint	getIndexFromContactId(uint32 contactId);
 
 	// For Friend Groups management
-	void changeGroup(uint index, const ucstring &groupName);
+	void changeGroup(uint index, const std::string &groupName);
 	void readContactGroups();
 	void saveContactGroups();
 
@@ -162,7 +162,7 @@ private:
 		TCharConnectionState			Online;
 		bool							Blocked;
 		uint32							ContactId;
-		ucstring						Group;
+		std::string						Group;
 		bool operator < (const CPeople &other) const { return getName() < other.getName(); }
 		std::string getName() const { return Container->getTitle(); }
 	};
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 18ffd867c..3dfc07818 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -147,7 +147,7 @@ extern bool CharNameValidArrived;
 extern bool CharNameValid;
 bool IsInRingSession = false;
 TSessionId HighestMainlandSessionId; // highest in the position stack
-ucstring lastUniversMessage;
+std::string lastUniversMessage;
 
 extern const char *CDBBankNames[INVALID_CDB_BANK+1];
 

From e8c18b1b44390528be157da56962d4a7259717dd Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 3 Nov 2020 22:28:58 +0200
Subject: [PATCH 145/292] fix build

---
 ryzom/client/src/interface_v3/sphrase_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index 5fb034e72..4ca505afb 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -4704,8 +4704,8 @@ int CSPhraseComAdpater::luaGetDesc(CLuaState &ls)
 		if (*desc)
 		{
 #ifdef RYZOM_LUA_UCSTRING
-			ucstring desc = ucstring::makeFromUtf8(desc); // Compatibility
-			CLuaIHM::push(ls, desc);
+			ucstring uc = ucstring::makeFromUtf8(desc); // Compatibility
+			CLuaIHM::push(ls, uc);
 #else
 			ls.push(desc);
 #endif

From 465a36b250e8445bf14564184e8ae3f56d36ead0 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 3 Nov 2020 22:28:58 +0200
Subject: [PATCH 146/292] fix build

---
 ryzom/client/src/interface_v3/sphrase_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index 94f2b3d84..d03b71411 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -4696,8 +4696,8 @@ int CSPhraseComAdpater::luaGetDesc(CLuaState &ls)
 		if (*desc)
 		{
 #ifdef RYZOM_LUA_UCSTRING
-			ucstring desc = ucstring::makeFromUtf8(desc); // Compatibility
-			CLuaIHM::push(ls, desc);
+			ucstring uc = ucstring::makeFromUtf8(desc); // Compatibility
+			CLuaIHM::push(ls, uc);
 #else
 			ls.push(desc);
 #endif

From b220dac7b3640566715b53a92f13809cc28bd425 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 13:55:06 +0800
Subject: [PATCH 147/292] Fix memory release

---
 nel/include/nel/gui/action_handler.h | 15 ++++++++++++++-
 nel/src/gui/action_handler.cpp       |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nel/include/nel/gui/action_handler.h b/nel/include/nel/gui/action_handler.h
index 7288c9529..5bdad89ba 100644
--- a/nel/include/nel/gui/action_handler.h
+++ b/nel/include/nel/gui/action_handler.h
@@ -69,7 +69,7 @@ namespace NLGUI
 
 		static CAHManager* getInstance()
 		{
-			if (_GlobalInstance == NULL)
+			if (_GlobalInstance == NULL && !s_Deleted)
 				_GlobalInstance = new CAHManager;
 			return _GlobalInstance;
 		}
@@ -134,6 +134,19 @@ namespace NLGUI
 		static CAHManager *_GlobalInstance;
 		static bool editorMode;
 
+		class CDeleter
+		{
+		public:
+			~CDeleter()
+			{
+				delete _GlobalInstance;
+				_GlobalInstance = NULL;
+				s_Deleted = true;
+			}
+		};
+		static CDeleter s_Deleter;
+		static bool s_Deleted;
+
 	};
 
 	/// Ah name must all be lower case
diff --git a/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
index f7a5f2cee..601175361 100644
--- a/nel/src/gui/action_handler.cpp
+++ b/nel/src/gui/action_handler.cpp
@@ -42,6 +42,8 @@ namespace NLGUI
 	// ------------------------------------------------------------------------------------------------
 	CAHManager	*CAHManager::_GlobalInstance = NULL;
 	bool CAHManager::editorMode = false;
+	CAHManager::CDeleter CAHManager::s_Deleter;
+	bool CAHManager::s_Deleted = false;
 	// ------------------------------------------------------------------------------------------------
 
 	// ------------------------------------------------------------------------------------------------

From f50b59702e7698cdbf6073be2ba8fda9d1ba3bb9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 13:55:12 +0800
Subject: [PATCH 148/292] Fix memory release

---
 ryzom/client/src/string_manager_client.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
index e3cd736fd..ef55b0367 100644
--- a/ryzom/client/src/string_manager_client.h
+++ b/ryzom/client/src/string_manager_client.h
@@ -46,6 +46,7 @@ class CStringManagerClient
 public:
 	// Singleton pattern implementation
 	static CStringManagerClient	*instance();
+	static bool hasInstance() { return _Instance; }
 	static void	release(bool mustReleaseStaticArrays);
 
 	/** Prepare the string manager to use a persistent string cache.
@@ -388,7 +389,8 @@ public:
 	virtual ~IStringWaiterRemover()
 	{
 		// signal the string manager that this waiter is destroyed
-		CStringManagerClient::instance()->removeStringWaiter(this);
+		if (CStringManagerClient::hasInstance())
+			CStringManagerClient::instance()->removeStringWaiter(this);
 	}
 };
 
@@ -406,7 +408,8 @@ public:
 	virtual ~IStringWaitCallback()
 	{
 		// signal the string manager that this waiter is destroyed
-		CStringManagerClient::instance()->removeStringWaiter(this);
+		if (CStringManagerClient::hasInstance())
+			CStringManagerClient::instance()->removeStringWaiter(this);
 	}
 
 };

From 0ba45054d0e975bd19b2bebdc810189a2302137e Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 14:34:25 +0800
Subject: [PATCH 149/292] Fix memory release

---
 nel/include/nel/georges/form.h     |  5 +++++
 nel/include/nel/georges/form_elm.h |  8 ++++++++
 nel/src/georges/form.cpp           |  3 +++
 nel/src/georges/form_elm.cpp       | 10 ++++++----
 nel/src/georges/form_loader.cpp    |  2 +-
 nel/src/sound/audio_mixer_user.cpp |  1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/nel/include/nel/georges/form.h b/nel/include/nel/georges/form.h
index 9b21c4c49..732a45840 100644
--- a/nel/include/nel/georges/form.h
+++ b/nel/include/nel/georges/form.h
@@ -22,6 +22,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/georges/u_form.h"
+#include "form_dfn.h"
 #include "form_elm.h"
 #include "header.h"
 
@@ -124,6 +125,10 @@ private:
 
 	// The form filename
 	std::string			_Filename;
+
+	// The dfn
+	NLMISC::CSmartPtr<CFormDfn> _Dfn;
+
 };
 
 } // NLGEORGES
diff --git a/nel/include/nel/georges/form_elm.h b/nel/include/nel/georges/form_elm.h
index 6795ad328..f94d9842c 100644
--- a/nel/include/nel/georges/form_elm.h
+++ b/nel/include/nel/georges/form_elm.h
@@ -282,6 +282,10 @@ public:
 		{
 			Element = NULL;
 		}
+		~CFormElmStructElm()
+		{
+			nlassert(!Element);
+		}
 
 		std::string		Name;
 		CFormElm*		Element;
@@ -400,6 +404,10 @@ public:
 		{
 			Element = NULL;
 		}
+		~CElement ()
+		{
+			nlassert(!Element);
+		}
 
 		std::string		Name;
 		CFormElm*		Element;
diff --git a/nel/src/georges/form.cpp b/nel/src/georges/form.cpp
index 2f9ecf9b1..63e4ee2ed 100644
--- a/nel/src/georges/form.cpp
+++ b/nel/src/georges/form.cpp
@@ -191,6 +191,9 @@ void CForm::read (xmlNodePtr node, CFormLoader &loader, CFormDfn *dfn, const std
 	// Reset form
 	clean ();
 
+	// Save the dfn
+	_Dfn = dfn;
+
 	// Check node name
 	if ( ((const char*)node->name == NULL) || (strcmp ((const char*)node->name, "FORM") != 0) )
 	{
diff --git a/nel/src/georges/form_elm.cpp b/nel/src/georges/form_elm.cpp
index af87a2e0a..358b45f65 100644
--- a/nel/src/georges/form_elm.cpp
+++ b/nel/src/georges/form_elm.cpp
@@ -1707,6 +1707,7 @@ CFormElmStruct::CFormElmStruct (CForm *form, CFormElm *parentNode, const CFormDf
 CFormElmStruct::~CFormElmStruct ()
 {
 	// Job done in clean()
+	clean();
 }
 
 // ***************************************************************************
@@ -1717,10 +1718,10 @@ void CFormElmStruct::clean ()
 	uint elm;
 	for (elm =0; elm<Elements.size(); elm++)
 	{
-		if (Elements[elm].Element)
-			delete Elements[elm].Element;
+		delete Elements[elm].Element;
 		Elements[elm].Element = NULL;
 	}
+	Elements.clear();
 }
 
 // ***************************************************************************
@@ -2270,6 +2271,7 @@ CFormElmArray::CFormElmArray (CForm *form, const CFormDfn *formDfn, const CType
 CFormElmArray::~CFormElmArray ()
 {
 	// Job done in clean()
+	clean();
 }
 
 // ***************************************************************************
@@ -2280,8 +2282,8 @@ void CFormElmArray::clean ()
 	uint elm;
 	for (elm =0; elm<Elements.size(); elm++)
 	{
-		if (Elements[elm].Element)
-			delete Elements[elm].Element;
+		delete Elements[elm].Element;
+		Elements[elm].Element = NULL;
 	}
 	Elements.clear ();
 }
diff --git a/nel/src/georges/form_loader.cpp b/nel/src/georges/form_loader.cpp
index dd3d50ed5..e757fb9d0 100644
--- a/nel/src/georges/form_loader.cpp
+++ b/nel/src/georges/form_loader.cpp
@@ -241,7 +241,7 @@ UForm *CFormLoader::loadForm (const std::string &filename)
 			name += ".dfn";
 
 			// Load the dfn
-			CFormDfn	*dfn = loadFormDfn (name, false);
+			CSmartPtr<CFormDfn> dfn = loadFormDfn (name, false);
 			if (dfn)
 			{
 				// Open the file
diff --git a/nel/src/sound/audio_mixer_user.cpp b/nel/src/sound/audio_mixer_user.cpp
index 5d037750b..3f6a5dcbe 100644
--- a/nel/src/sound/audio_mixer_user.cpp
+++ b/nel/src/sound/audio_mixer_user.cpp
@@ -695,6 +695,7 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
 				setBackgroundFlags(flags);
 			}
 
+			form = NULL;
 			NLGEORGES::UFormLoader::releaseLoader(formLoader);
 		}
 	}

From 64b978b77ac4f84a6421f7c665c1dc3c20067e43 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 14:47:01 +0800
Subject: [PATCH 150/292] Fix memory release

---
 nel/include/nel/misc/factory.h | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/nel/include/nel/misc/factory.h b/nel/include/nel/misc/factory.h
index b1c22a668..82da7ce7d 100644
--- a/nel/include/nel/misc/factory.h
+++ b/nel/include/nel/misc/factory.h
@@ -58,12 +58,8 @@ public:
 	static CFactory &instance()
 	{
 		// Singleton instance pointer.
-		static CFactory	*instance = NULL;
-		if (!instance)
-		{
-			instance = new CFactory();
-		}
-		return *instance;
+		static CFactory	instance;
+		return instance;
 	}
 
 	/** Register a factorable object in the factory.
@@ -185,12 +181,8 @@ public:
 	/// Get the singleton instance reference.
 	static CFactoryIndirect &instance()
 	{
-		static CFactoryIndirect	*instance = NULL;
-		if (!instance)
-		{
-			instance = new CFactoryIndirect();
-		}
-		return *instance;
+		static CFactoryIndirect	instance;
+		return instance;
 	}
 
 	void registerClass(const KeyType &key, IFactoryIndirectRegister<BaseFactoryClass> *factoryRegister)

From e9fdac30a2928103857d3ae00862b3f2bae6940c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 14:47:59 +0800
Subject: [PATCH 151/292] Fix memory release

---
 ryzom/client/src/release.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index bcbf7259f..ccf84af18 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -629,6 +629,9 @@ void release()
 		delete FXAA; FXAA = NULL;
 		CBloomEffect::releaseInstance();
 
+		// Release texture
+		endLoading();
+
 		// Release Scene, textcontexts, materials, ...
 		Driver->release();
 

From c9f967b52ba2a505c11cef6ead04abc7d279d475 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 3 Nov 2020 16:00:25 +0800
Subject: [PATCH 152/292] Fix memory release

---
 nel/src/misc/app_context.cpp | 4 ++--
 ryzom/client/src/release.cpp | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nel/src/misc/app_context.cpp b/nel/src/misc/app_context.cpp
index 34d312d98..fc8c64e5f 100644
--- a/nel/src/misc/app_context.cpp
+++ b/nel/src/misc/app_context.cpp
@@ -135,12 +135,12 @@ CApplicationContext::~CApplicationContext()
 	while (it != iend)
 	{
 		// can't use nldebug there because it'll create new displayers
-		std::string message = toString("Instance '%s' still allocated at %p", it->first.c_str(), it->second);
+		std::string message = toString("Instance '%s' still allocated at %p\n", it->first.c_str(), it->second);
 
 #ifdef NL_OS_WINDOWS
 		OutputDebugStringW(nlUtf8ToWide(message));
 #else
-		printf("%s\n", message.c_str());
+		printf("%s", message.c_str());
 #endif
 
 		++it;
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index ccf84af18..24783d391 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -704,6 +704,7 @@ void release()
 	CIXml::releaseLibXml();
 	CHttpCache::release();
 	CStrictTransportSecurity::release();
+	CCoTask::releaseInstance();
 
 #if FINAL_VERSION
 	// openURL ("http://ryzom.com/exit/");

From 0d2633b6977a5d6677d50493b2fc32f71a4cf1bb Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 05:39:43 +0800
Subject: [PATCH 153/292] Cleanup string

---
 nel/include/nel/misc/string_view.h            | 131 ++++++++++++++++++
 nel/include/nel/misc/utf_string_view.h        |  10 +-
 nel/src/misc/string_view.cpp                  |  31 +++++
 ryzom/client/src/client_chat_manager.cpp      |   6 +-
 ryzom/client/src/commands.cpp                 |  68 ++++-----
 ryzom/client/src/connection.cpp               |   2 +-
 ryzom/client/src/far_tp.cpp                   |   4 +-
 .../src/interface_v3/action_handler_game.cpp  |  14 +-
 .../src/interface_v3/action_handler_help.cpp  |   6 +-
 .../src/interface_v3/action_handler_item.cpp  |  30 ++--
 .../interface_v3/action_handler_outpost.cpp   |   8 +-
 .../bot_chat_page_create_guild.cpp            |   2 +-
 12 files changed, 240 insertions(+), 72 deletions(-)
 create mode 100644 nel/include/nel/misc/string_view.h
 create mode 100644 nel/src/misc/string_view.cpp

diff --git a/nel/include/nel/misc/string_view.h b/nel/include/nel/misc/string_view.h
new file mode 100644
index 000000000..9d1a96308
--- /dev/null
+++ b/nel/include/nel/misc/string_view.h
@@ -0,0 +1,131 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NLMISC_STRING_VIEW_H
+#define NLMISC_STRING_VIEW_H
+
+#include <nel/misc/types_nl.h>
+#include <string>
+
+#ifdef NL_CPP14
+using namespace std::string_literals;
+#ifdef NL_CPP17
+#include <string_view>
+using namespace std::string_view_literals;
+#endif
+#endif
+
+#ifdef NL_CPP14
+/// Obtain an std::string from a string literal.
+#define nlstr(strLit) (strLit##s)
+#else
+/// Obtain an std::string from a string literal.
+#define nlstr(strLit) (std::string(strLit))
+#endif
+
+#ifdef NL_CPP17
+/// Obtain a string view from a string literal.
+#define nlsv(strLit) (strLit##sv)
+/// Obtain an std::string from a string view.
+#define nlsvs(strView) (std::string(strView))
+#else
+/// Obtain a string view from a string literal.
+#define nlsv(strLit) (CStringView(strLit, ::strlen(strLit)))
+/// Obtain an std::string from a string view.
+#define nlsvs(strView) (std::string(strView.data(), strView.size()))
+#endif
+
+/// Obtain a temporary C-string from a string view. Use directly in argument, do not store.
+#define nlsvc(strView) ((strView.data()[strView.size()]) ? nlsvs(strView).c_str() : strView.data())
+
+namespace NLMISC {
+
+/// String view literals allow bypassing allocation and strlen calls.
+/// CStringView is a 100% drop-in replacement for (const char *str, size_t len) tuples. It's a non-owning reference.
+/// Always use `CStringView` where previously `const std::string &` would have been used. It avoids accidental copy.
+/// Gotcha: CStringView doesn't need to end with \0, so there's no guarantee with functions that expect \0 terminated strings, 
+/// use the `nlsvc` macro to get a temporary C-string from a CStringView.
+/// Use the `nlsv` macro to get a CStringView from a string literal.
+/// Use the `nlstr` macro to get an std::string from a string literal.
+/// Use the `nlsvs` macro to get an std::string from a CStringView.
+#ifdef NL_CPP17
+typedef std::string_view CStringView;
+#else
+class CStringView
+{
+public:
+	CStringView(const std::string &str) : m_Str(&str[0]), m_Len(str.size()) {}
+	CStringView(const char *const str, const size_t len) : m_Str(str), m_Len(len) {}
+	CStringView(const char *const str) : m_Str(str), m_Len(sizeof(str)) {}
+
+	inline const char *data() const { return m_Str; }
+	inline size_t length() const { return m_Len; }
+	inline size_t size() const { return m_Len; }
+
+	inline CStringView substr(const size_t offset, const size_t count = -1) { return CStringView(m_Str + offset, std::min(m_Len - offset, count)); }
+
+	inline bool operator==(const CStringView o) { if (m_Len != o.m_Len) return false; return memcmp(m_Str, o.m_Str, m_Len) == 0; }
+	inline bool operator!=(const CStringView o) { if (m_Len != o.m_Len) return true; return memcmp(m_Str, o.m_Str, m_Len) != 0; }
+
+	struct const_iterator
+	{
+	public:
+		const_iterator() : m_Addr(NULL) { }
+
+		inline void operator++()
+		{
+			++m_Addr;
+		}
+		inline void operator+=(ptrdiff_t v)
+		{
+			m_Addr += v;
+		}
+		inline void operator--()
+		{
+			--m_Addr;
+		}
+		inline void operator-=(ptrdiff_t v)
+		{
+			m_Addr -= v;
+		}
+		inline bool operator!=(const const_iterator &o) const { return m_Addr != o.m_Addr; }
+		inline bool operator==(const const_iterator &o) const { return m_Addr == o.m_Addr; }
+		inline const char &operator*() const { return *m_Addr; }
+
+	private:
+		friend class CStringView;
+		inline const_iterator(const char *addr) : m_Addr(addr) {}
+		const char *m_Addr;
+
+	};
+
+	typedef const_iterator iterator;
+
+	iterator begin() const { return iterator(m_Str); }
+	inline iterator end() const { return iterator(m_Str + m_Len); }
+
+private:
+	const char *m_Str;
+	size_t m_Len;
+
+};
+#endif
+
+}
+
+#endif /* #ifndef NLMISC_STRING_VIEW_H */
+
+/* end of file */
diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 5b349a2d8..8a224cef5 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -18,9 +18,12 @@
 #define NLMISC_UTF_STRING_VIEW_H
 
 #include <nel/misc/types_nl.h>
-#include <nel/misc/ucstring.h>
+
 #include <string>
 
+#include <nel/misc/string_view.h>
+#include <nel/misc/ucstring.h>
+
 namespace NLMISC {
 
 class IStream;
@@ -40,6 +43,9 @@ public:
 	{
 		nlassert(len <= strlen(utf8Str));
 	}
+
+	inline CUtfStringView(CStringView utf8Str) : m_Str(utf8Str.data()), m_Size(utf8Str.size()), m_Iterator(utf8Iterator) {}
+
 #if defined(NL_OS_WINDOWS)
 	inline CUtfStringView(const wchar_t *utf16Str) : m_Str(utf16Str), m_Size(wcslen(utf16Str)), m_Iterator(utf16Iterator) {}
 	inline CUtfStringView(const wchar_t *utf16Str, size_t len): m_Str(utf16Str), m_Size(len), m_Iterator(utf16Iterator)
@@ -166,6 +172,6 @@ private:
 
 } /* namespace NLMISC */
 
-#endif /* #ifndef NLMISC_STREAMED_PACKAGE_PROVIDER_H */
+#endif /* #ifndef NLMISC_UTF_STRING_VIEW_H */
 
 /* end of file */
diff --git a/nel/src/misc/string_view.cpp b/nel/src/misc/string_view.cpp
new file mode 100644
index 000000000..1299d233f
--- /dev/null
+++ b/nel/src/misc/string_view.cpp
@@ -0,0 +1,31 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/string_view.h"
+
+// STL includes
+
+// Project includes
+
+namespace NLMISC
+{
+
+void nothing_here_string_view_nl() { }
+
+} /* namespace NLMISC */
+
+/* end of file */
diff --git a/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
index 5515e8580..1414c175d 100644
--- a/ryzom/client/src/client_chat_manager.cpp
+++ b/ryzom/client/src/client_chat_manager.cpp
@@ -329,7 +329,7 @@ void CClientChatManager::tell( const string& receiverIn, const string& strIn )
 
 	// *** send str
 	CBitMemStream bms;
-	string msgType = "STRING:TELL";
+	const char *msgType = "STRING:TELL";
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serial( receiver );
@@ -385,7 +385,7 @@ void CClientChatManager::tell( const string& receiverIn, const string& strIn )
 void CClientChatManager::filter( uint8 filter )
 {
 	CBitMemStream bms;
-	string msgType = "STRING:FILTER";
+	const char *msgType = "STRING:FILTER";
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serial( filter );
@@ -417,7 +417,7 @@ void CClientChatManager::setChatMode(CChatGroup::TGroupType group, TChanID dynam
 	if (group != CChatGroup::team)
 	{
 		CBitMemStream bms;
-		string msgType = "STRING:CHAT_MODE";
+		const char *msgType = "STRING:CHAT_MODE";
 		if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 		{
 			bms.serial( mode );
diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index 46f494660..00d2b9e4f 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -181,14 +181,14 @@ NLMISC_COMMAND(where, "Ask information on the position", "")
 	// Check parameters.
 	if(args.empty())
 	{	// Create the message and send.
-		const string msgName = "COMMAND:WHERE";
+		const char *msgName = "COMMAND:WHERE";
 		CBitMemStream out;
 		if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 		{
 			NetMngr.push(out);
 		}
 		else
-			nlwarning("command 'where': unknown message named '%s'", msgName.c_str());
+			nlwarning("command 'where': unknown message named '%s'", msgName);
 		return true;
 	}
 	return false;
@@ -1803,14 +1803,14 @@ NLMISC_COMMAND(usePreprogCombat, "use the specified combat preprog sentence", "<
 NLMISC_COMMAND(engage, "engage target in combat", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "COMBAT:ENGAGE";
+	const char *msgName = "COMBAT:ENGAGE";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1836,14 +1836,14 @@ NLMISC_COMMAND(disengage, "disengage from combat", "")
 NLMISC_COMMAND(leaveTeam, "leave team", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "TEAM:LEAVE";
+	const char *msgName = "TEAM:LEAVE";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1851,14 +1851,14 @@ NLMISC_COMMAND(leaveTeam, "leave team", "")
 NLMISC_COMMAND(joinTeam, "join the specified team", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "TEAM:JOIN";
+	const char *msgName = "TEAM:JOIN";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1866,14 +1866,14 @@ NLMISC_COMMAND(joinTeam, "join the specified team", "")
 NLMISC_COMMAND(joinTeamProposal, "propose to current target to join the team", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "TEAM:JOIN_PROPOSAL";
+	const char *msgName = "TEAM:JOIN_PROPOSAL";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1881,14 +1881,14 @@ NLMISC_COMMAND(joinTeamProposal, "propose to current target to join the team", "
 NLMISC_COMMAND(joinTeamDecline, "decline a join team proposal", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "TEAM:JOIN_PROPOSAL_DECLINE";
+	const char *msgName = "TEAM:JOIN_PROPOSAL_DECLINE";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1896,14 +1896,14 @@ NLMISC_COMMAND(joinTeamDecline, "decline a join team proposal", "")
 NLMISC_COMMAND(kickTeammate, "kick someone from your team", "")
 {
 	// Create the message for the server to execute a phrase.
-	const string msgName = "TEAM:KICK";
+	const char *msgName = "TEAM:KICK";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("mainLoop : unknown message name : '%s'", msgName.c_str());
+		nlwarning("mainLoop : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1913,14 +1913,14 @@ NLMISC_COMMAND(cancelCurrentSentence, "cancel the sentence being executed", "")
 	// no parameter needed
 
 	// Create the message for the server to cancel the phrase being executed
-	const string msgName = "SENTENCE:CANCEL_CURRENT";
+	const char *msgName = "SENTENCE:CANCEL_CURRENT";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
 		NetMngr.push(out);
 	}
 	else
-		nlwarning("command : unknown message name : '%s'", msgName.c_str());
+		nlwarning("command : unknown message name : '%s'", msgName);
 
 	return true;
 }
@@ -1952,7 +1952,7 @@ NLMISC_COMMAND(drop,"drop an item to the ground","<id>")
 	sint32 z = (sint32)UserEntity->pos().z * 1000;
 
 	CBitMemStream bms;
-	string msgType = "ITEM:DROP";
+	const char *msgType = "ITEM:DROP";
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serial( itemId );
@@ -3769,7 +3769,7 @@ NLMISC_COMMAND( createPerso, "create a new character", "Parameters:\n-Character
 	fromString(args[4], level);
 
 	CBitMemStream bms;
-	string msgType = "CHEAT:CREATE_CHARACTER";
+	const char *msgType = "CHEAT:CREATE_CHARACTER";
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serial( characterName );
@@ -3800,7 +3800,7 @@ NLMISC_COMMAND( add_role, "add role to character", "<Role( MeleeFighter, RangeFi
 	fromString(args[1], level);
 
 	CBitMemStream bms;
-	string msgType = "CHEAT:ADD_ROLE";
+	const char *msgType = "CHEAT:ADD_ROLE";
 	if( GenericMsgHeaderMngr.pushNameToStream(msgType,bms) )
 	{
 		bms.serialEnum( role );
@@ -4130,11 +4130,11 @@ NLMISC_COMMAND(browseRingAdmin, "Browse a HTML document with the ring web browse
 NLMISC_COMMAND(GUCreate, "create a guild", "<guild name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:CREATE";
+	const char *msgName = "GUILD:CREATE";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
-		string buf = args[0];
+		ucstring buf = ucstring::makeFromUtf8(args[0]); // FIXME: UTF-8 (serial)
 		out.serial( buf );
 		NetMngr.push(out);
 	}
@@ -4144,7 +4144,7 @@ NLMISC_COMMAND(GUCreate, "create a guild", "<guild name>")
 NLMISC_COMMAND(GUQuit, "quit a guild", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:QUIT";
+	const char *msgName = "GUILD:QUIT";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4156,7 +4156,7 @@ NLMISC_COMMAND(GUQuit, "quit a guild", "")
 NLMISC_COMMAND(GULeaveLeadership, "abandon leadership of a guild", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:ABANDON_LEADERSHIP";
+	const char *msgName = "GUILD:ABANDON_LEADERSHIP";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4167,7 +4167,7 @@ NLMISC_COMMAND(GULeaveLeadership, "abandon leadership of a guild", "")
 NLMISC_COMMAND(GULeaveOfficerTitle, "abandon officer title", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:ABANDON_OFFICER_TITLE";
+	const char *msgName = "GUILD:ABANDON_OFFICER_TITLE";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4179,7 +4179,7 @@ NLMISC_COMMAND(GULeaveOfficerTitle, "abandon officer title", "")
 NLMISC_COMMAND(GUNameOfficer, "name an officer", "<player name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:NAME_OFFICER";
+	const char *msgName = "GUILD:NAME_OFFICER";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4193,7 +4193,7 @@ NLMISC_COMMAND(GUNameOfficer, "name an officer", "<player name>")
 NLMISC_COMMAND(GUDismissOfficer, "dismiss an officer", "<player name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:DISMISS_OFFICER";
+	const char *msgName = "GUILD:DISMISS_OFFICER";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4207,7 +4207,7 @@ NLMISC_COMMAND(GUDismissOfficer, "dismiss an officer", "<player name>")
 NLMISC_COMMAND(GUKick, "kick a member", "<player name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:KICK_MEMBER";
+	const char *msgName = "GUILD:KICK_MEMBER";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4234,7 +4234,7 @@ NLMISC_COMMAND(GURefuse, "refuse an invitation", "")
 NLMISC_COMMAND(GUFriend, "invite a player to become a friend of the guild", "<player name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:FRIEND_INVITATION";
+	const char *msgName = "GUILD:FRIEND_INVITATION";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4248,7 +4248,7 @@ NLMISC_COMMAND(GUFriend, "invite a player to become a friend of the guild", "<pl
 NLMISC_COMMAND(GUFriendAccept, "accept to be a friend of a guild that invited you", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:ACCEPT_FRIEND_INVITATION";
+	const char *msgName = "GUILD:ACCEPT_FRIEND_INVITATION";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4260,7 +4260,7 @@ NLMISC_COMMAND(GUFriendAccept, "accept to be a friend of a guild that invited yo
 NLMISC_COMMAND(GUFriendRefuse, "refuse to be a friend of a guild that invited you", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:REFUSE_FRIEND_INVITATION";
+	const char *msgName = "GUILD:REFUSE_FRIEND_INVITATION";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4272,7 +4272,7 @@ NLMISC_COMMAND(GUFriendRefuse, "refuse to be a friend of a guild that invited yo
 NLMISC_COMMAND(GUSetSuccessor, "set the successor of the guild leader", "<player name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:SET_SUCCESSOR";
+	const char *msgName = "GUILD:SET_SUCCESSOR";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4286,7 +4286,7 @@ NLMISC_COMMAND(GUSetSuccessor, "set the successor of the guild leader", "<player
 NLMISC_COMMAND(GUInfos, "get information on a guild", "<guild name>")
 {
 	if (args.size() != 1) return false;
-	const string msgName = "GUILD:GET_INFOS";
+	const char *msgName = "GUILD:GET_INFOS";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4300,7 +4300,7 @@ NLMISC_COMMAND(GUInfos, "get information on a guild", "<guild name>")
 NLMISC_COMMAND(GUJournal, "get the guild journal", "")
 {
 	if (args.size() != 0) return false;
-	const string msgName = "GUILD:GET_LOG";
+	const char *msgName = "GUILD:GET_LOG";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
@@ -4314,7 +4314,7 @@ NLMISC_COMMAND(buildingTeleport, "teleport to a building", "building index")
 	if (args.size() != 1) return false;
 	uint16 index;
 	fromString(args[0], index);
-	const string msgName = "GUILD:TELEPORT";
+	const char *msgName = "GUILD:TELEPORT";
 	CBitMemStream out;
 	if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 	{
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 3cc9f97dc..1ec84433f 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1706,7 +1706,7 @@ public:
 		string sCharSumPath = getParam(Params, "charsum");
 		SCharacter3DSetup::setupCharacterSummaryFromDB(CS, sCharSumPath);
 		CS.Mainland = MainlandSelected;
-		CS.Name = sFirstName;
+		CS.Name = ucstring::makeFromUtf8(sFirstName); // FIXME: UTF-8 (serial)
 		//CS.Surname = sSurName;
 
 		// Create the message to send to the server from the character summary
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index 7f98d8b82..6b0d18409 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -1010,13 +1010,13 @@ void CFarTP::hookNextFarTPForEditor()
  */
 void CFarTP::requestReturnToPreviousSession(TSessionId rejectedSessionId)
 {
-	const string msgName = "CONNECTION:RET_MAINLAND";
+	const char *msgName = "CONNECTION:RET_MAINLAND";
 	CBitMemStream out;
 	nlverify(GenericMsgHeaderMngr.pushNameToStream(msgName, out));
 	out.serial(PlayerSelectedSlot);
 	out.serial(rejectedSessionId);
 	NetMngr.push(out);
-	nlinfo("%s sent", msgName.c_str());
+	nlinfo("%s sent", msgName);
 }
 
 /*
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 171b4bc08..2fedf8aad 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1166,7 +1166,7 @@ public:
 			game_exit_request = true;
 			ryzom_exit_request = true;
 
-			const string msgName = "CONNECTION:CLIENT_QUIT_REQUEST";
+			const char *msgName = "CONNECTION:CLIENT_QUIT_REQUEST";
 			CBitMemStream out;
 			nlverify(GenericMsgHeaderMngr.pushNameToStream(msgName, out));
 			bool bypassDisconnectionTimer = FarTP.isFastDisconnectGranted() && (!IsInRingSession); // no need on a ring shard, as it's very short
@@ -1489,7 +1489,7 @@ void beastOrder (const std::string &orderStr, const std::string &beastIndexStr,
 	else
 	{
 		// execute the order.
-		const string msgName = "ANIMALS:BEAST";
+		const char *msgName = "ANIMALS:BEAST";
 		CBitMemStream out;
 		if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 		{
@@ -1500,7 +1500,7 @@ void beastOrder (const std::string &orderStr, const std::string &beastIndexStr,
 			NetMngr.push(out);
 		}
 		else
-			nlwarning("<beastOrder> : unknown message name : '%s'.", msgName.c_str());
+			nlwarning("<beastOrder> : unknown message name : '%s'.", msgName);
 	}
 }
 
@@ -4530,7 +4530,7 @@ public:
 		if( sCustomPhrase.empty() )
 		{
 			// Create the message and send.
-			static const string msgName = "COMMAND:EMOTE";
+			static const char *msgName = "COMMAND:EMOTE";
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 			{
@@ -4540,12 +4540,12 @@ public:
 				//nlinfo("impulseCallBack : %s %d %d sent", msgName.c_str(), (uint32)behavToSend, phraseNbToSend);
 			}
 			else
-				nlwarning("command 'emote': unknown message named '%s'.", msgName.c_str());
+				nlwarning("command 'emote': unknown message named '%s'.", msgName);
 		}
 		else
 		{
 			// Create the message and send.
-			static const string msgName = "COMMAND:CUSTOM_EMOTE";
+			static const char *msgName = "COMMAND:CUSTOM_EMOTE";
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 			{
@@ -4575,7 +4575,7 @@ public:
 				//nlinfo("impulseCallBack : %s %d %s sent", msgName.c_str(), (uint32)behavToSend, sCustomPhrase.c_str());
 			}
 			else
-				nlwarning("command 'emote': unknown message named '%s'.", msgName.c_str());
+				nlwarning("command 'emote': unknown message named '%s'.", msgName);
 		}
 	}
 };
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 102307909..cd79f0192 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -3706,17 +3706,17 @@ public:
 			sint n = PeopleInterraction.TeamList.getIndexFromName(selection->getEntityName());
 			if (n >= 0)
 			{
-				const string msgName = "TEAM:KICK";
+				const char *msgName = "TEAM:KICK";
 				CBitMemStream out;
 				if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 				{
 					uint8 teamMember = (uint8)n;
 					out.serialEnum(teamMember);
 					NetMngr.push(out);
-					//nlinfo("impulseCallBack : %s %d sent", msgName.c_str(), teamMember);
+					//nlinfo("impulseCallBack : %s %d sent", msgName, teamMember);
 				}
 				else
-					nlwarning("unknown message named '%s'.", msgName.c_str());
+					nlwarning("unknown message named '%s'.", msgName);
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index a6eaca91e..9bbf9fbc8 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -417,10 +417,10 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
 			if (textValid)
 			{
 				CBitMemStream out;
-				const string msgName = "EVENT:SET_ITEM_CUSTOM_TEXT";
+				const char *msgName = "EVENT:SET_ITEM_CUSTOM_TEXT";
 				if (!GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 				{
-					nlwarning ("don't know message name %s", msgName.c_str());
+					nlwarning ("don't know message name %s", msgName);
 				}
 				else
 				{
@@ -456,7 +456,7 @@ static void checkItemCommand(const CItemSheet *itemSheet);
 static void sendSwapItemMsg(const CDBCtrlSheet *pCSSrc, const CDBCtrlSheet *pCSDst, sint32 quantitySrc)
 {
 	CBitMemStream out;
-	const string sMsg = "ITEM:SWAP";
+	const char *sMsg = "ITEM:SWAP";
 	if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 	{
 		// Swap all the Src (quantity= quantitySrc) to dest
@@ -489,7 +489,7 @@ static void sendSwapItemMsg(const CDBCtrlSheet *pCSSrc, const CDBCtrlSheet *pCSD
 		//nlinfo("impulseCallBack : %s %d %d %d %d %d sent", sMsg.c_str(), srcInvId, srcSlotId, dstInvId, dstSlotId, quantity);
 	}
 	else
-		nlwarning(" unknown message name '%s'",sMsg.c_str());
+		nlwarning(" unknown message name '%s'",sMsg);
 }
 
 /** Display the popup to ask item quantity
@@ -567,7 +567,7 @@ static void openStackItem(CCtrlBase *pCaller, CDBCtrlSheet *pCSSrc, CDBCtrlSheet
 		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 
 		CBitMemStream out;
-		const string sMsg = "EXCHANGE:ADD";
+		const char *sMsg = "EXCHANGE:ADD";
 		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
 			// Swap all the Src (quantity= quantitySrc) to dest
@@ -580,7 +580,7 @@ static void openStackItem(CCtrlBase *pCaller, CDBCtrlSheet *pCSSrc, CDBCtrlSheet
 			//nlinfo("impulseCallBack : %s %d %d %d sent", sMsg.c_str(), srcSlotIndex, destSlotIndex, quantitySrc);
 		}
 		else
-			nlwarning(" unknown message name '%s'",sMsg.c_str());
+			nlwarning(" unknown message name '%s'",sMsg);
 	}
 
 //=====================================================================================================================
@@ -636,8 +636,8 @@ static void openStackItem(CCtrlBase *pCaller, CDBCtrlSheet *pCSSrc, CDBCtrlSheet
 
 		// send msg to server
 		CBitMemStream out;
-		const string sMsg = "EXCHANGE:REMOVE";
-		if(GenericMsgHeaderMngr.pushNameToStream(sMsg.c_str(), out))
+		const char *sMsg = "EXCHANGE:REMOVE";
+		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
 			// Swap all the Src (quantity= quantitySrc) to dest
 			uint16	slotIndex =	(uint16) exchangeSlot->getIndexInDB();
@@ -647,7 +647,7 @@ static void openStackItem(CCtrlBase *pCaller, CDBCtrlSheet *pCSSrc, CDBCtrlSheet
 			//nlinfo("impulseCallBack : %s %d sent", sMsg.c_str(), slotIndex);
 		}
 		else
-			nlwarning(" unknown message name '%s'",sMsg.c_str());
+			nlwarning(" unknown message name '%s'",sMsg);
 	}
 
 
@@ -1658,7 +1658,7 @@ REGISTER_ACTION_HANDLER( CHandlerDragNDrop, "drag_n_drop" );
 static void sendToServerEnchantMessage(uint8 invent, uint16 slot)
 {
 	CBitMemStream out;
-	const string sMsg = "ITEM:ENCHANT";
+	const char *sMsg = "ITEM:ENCHANT";
 
 	if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 	{
@@ -1667,7 +1667,7 @@ static void sendToServerEnchantMessage(uint8 invent, uint16 slot)
 		NetMngr.push(out);
 	}
 	else
-		nlinfo("unknown message %s", sMsg.c_str());
+		nlinfo("unknown message %s", sMsg);
 }
 
 // **********************************************************************************************************
@@ -2230,7 +2230,7 @@ static void sendMsgUseItem(uint16 slot)
 	if(!ClientCfg.Local)
 	{
 		CBitMemStream out;
-		const string sMsg = "ITEM:USE_ITEM";
+		const char *sMsg = "ITEM:USE_ITEM";
 
 		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
@@ -2238,7 +2238,7 @@ static void sendMsgUseItem(uint16 slot)
 			NetMngr.push(out);
 		}
 		else
-			nlinfo("unknown message %s", sMsg.c_str());
+			nlinfo("unknown message %s", sMsg);
 	}
 }
 
@@ -2248,7 +2248,7 @@ static void sendMsgStopUseXpCat( bool isRingCatalyser )
 	if(!ClientCfg.Local)
 	{
 		CBitMemStream out;
-		const string sMsg = "ITEM:STOP_USE_XP_CAT";
+		const char *sMsg = "ITEM:STOP_USE_XP_CAT";
 
 		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
@@ -2256,7 +2256,7 @@ static void sendMsgStopUseXpCat( bool isRingCatalyser )
 			NetMngr.push(out);
 		}
 		else
-			nlinfo("unknown message %s", sMsg.c_str());
+			nlinfo("unknown message %s", sMsg);
 	}
 }
 
diff --git a/ryzom/client/src/interface_v3/action_handler_outpost.cpp b/ryzom/client/src/interface_v3/action_handler_outpost.cpp
index 023030ebe..a4270e309 100644
--- a/ryzom/client/src/interface_v3/action_handler_outpost.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_outpost.cpp
@@ -471,7 +471,7 @@ public:
 			startAttackTime= node->getValue32();
 
 		// send a DECLARE_WAR_VALIDATE message to server
-		string	sMsg= "OUTPOST:DECLARE_WAR_VALIDATE";
+		const char *sMsg= "OUTPOST:DECLARE_WAR_VALIDATE";
 		CBitMemStream out;
 		if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
@@ -483,7 +483,7 @@ public:
 		}
 		else
 		{
-			nlwarning("command : unknown message name : '%s'.", sMsg.c_str());
+			nlwarning("command : unknown message name : '%s'.", sMsg);
 		}
 
 	}
@@ -508,7 +508,7 @@ public:
 		// Send a msg to server
 		if(outpostSheet)
 		{
-			string	sMsg= "OUTPOST:SELECT";
+			const char *sMsg= "OUTPOST:SELECT";
 			CBitMemStream out;
 			if(GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 			{
@@ -518,7 +518,7 @@ public:
 			}
 			else
 			{
-				nlwarning("command : unknown message name : '%s'.", sMsg.c_str());
+				nlwarning("command : unknown message name : '%s'.", sMsg);
 			}
 		}
 	}
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
index 4da27749b..6bfbea0b3 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
@@ -79,7 +79,7 @@ class CHandlerGuildCreate : public IActionHandler
 		uint64 icon = CGuildManager::iconMake((uint8)pCS->getGuildBack(), (uint8)pCS->getGuildSymbol(),
 								pCS->getInvertGuildSymbol(), pCS->getGuildColor1(), pCS->getGuildColor2());
 
-		const string msgName = "GUILD:CREATE";
+		const char *msgName = "GUILD:CREATE";
 		NLMISC::CBitMemStream out;
 		if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 		{

From 2444d94f4f0b0409f5216611e139c47546d20b50 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 06:16:21 +0800
Subject: [PATCH 154/292] Don't expose ucstring to Lua, unless compatibility
 flag is set

---
 nel/include/nel/gui/reflect.h           | 10 ++++++++++
 nel/src/gui/interface_expr_user_fct.cpp |  4 ++++
 nel/src/gui/interface_link.cpp          |  4 ++--
 nel/src/gui/lua_ihm.cpp                 |  4 ++++
 ryzom/client/src/connection.cpp         |  8 +++++++-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/reflect.h b/nel/include/nel/gui/reflect.h
index 579a9418b..3f0b936a9 100644
--- a/nel/include/nel/gui/reflect.h
+++ b/nel/include/nel/gui/reflect.h
@@ -42,9 +42,13 @@ namespace NLGUI
 					 UInt32,
 					 Float,
 					 String,
+#ifdef RYZOM_LUA_UCSTRING
 					 UCString,
+#endif
 					 StringRef,
+#ifdef RYZOM_LUA_UCSTRING
 					 UCStringRef,
+#endif
 					 RGBA,
 					 LuaMethod
 					}; // other types will be added when needed
@@ -79,9 +83,13 @@ namespace NLGUI
 			TGetUInt32		GetUInt32;
 			TGetFloat		GetFloat;
 			TGetString		GetString;
+#ifdef RYZOM_LUA_UCSTRING
 			TGetUCString	GetUCString;
+#endif
 			TGetStringRef	GetStringRef;
+#ifdef RYZOM_LUA_UCSTRING
 			TGetUCStringRef	GetUCStringRef;
+#endif
 			TGetRGBA		GetRGBA;
 			TLuaMethod		GetLuaMethod; // lua method can only be obtained, not written ...
 		} GetMethod;
@@ -92,7 +100,9 @@ namespace NLGUI
 			TSetUInt32		SetUInt32;
 			TSetFloat		SetFloat;
 			TSetString		SetString;
+#ifdef RYZOM_LUA_UCSTRING
 			TSetUCString	SetUCString;
+#endif
 			TSetRGBA		SetRGBA;
 		} SetMethod;
 		// name of the property
diff --git a/nel/src/gui/interface_expr_user_fct.cpp b/nel/src/gui/interface_expr_user_fct.cpp
index f5de62b6f..e2bb589e1 100644
--- a/nel/src/gui/interface_expr_user_fct.cpp
+++ b/nel/src/gui/interface_expr_user_fct.cpp
@@ -553,15 +553,19 @@ namespace NLGUI
 			case CReflectedProperty::String:
 				result.setString ((elem->*(pRP->GetMethod.GetString))());
 			break;
+#ifdef RYZOM_LUA_UCSTRING
 			case CReflectedProperty::UCString:
 				result.setString ((elem->*(pRP->GetMethod.GetUCString))().toUtf8());
 			break;
+#endif
 			case CReflectedProperty::StringRef:
 				result.setString ((elem->*(pRP->GetMethod.GetStringRef))());
 			break;
+#ifdef RYZOM_LUA_UCSTRING
 			case CReflectedProperty::UCStringRef:
 				result.setString ((elem->*(pRP->GetMethod.GetUCStringRef))().toUtf8());
 			break;
+#endif
 			case CReflectedProperty::RGBA:
 				result.setRGBA ((elem->*(pRP->GetMethod.GetRGBA))());
 			break;
diff --git a/nel/src/gui/interface_link.cpp b/nel/src/gui/interface_link.cpp
index c320f8c51..5b9bebb1f 100644
--- a/nel/src/gui/interface_link.cpp
+++ b/nel/src/gui/interface_link.cpp
@@ -117,18 +117,18 @@ namespace NLGUI
 					return false;
 				}
 			break;
+#ifdef RYZOM_LUA_UCSTRING
 			case CReflectedProperty::UCString:
 			case CReflectedProperty::UCStringRef:
-#ifdef RYZOM_LUA_UCSTRING
 				if (valueToAffect.toString())
 				{
 					(destElem.*(property.SetMethod.SetUCString))(ucstring::makeFromUtf8(valueToAffect.getString()));
 				}
 				else
-#endif
 				{
 					return false;
 				}
+#endif
 			break;
 			case CReflectedProperty::RGBA:
 				if (valueToAffect.toRGBA())
diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
index 9a6bacc3c..cdd87330c 100644
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@@ -1412,6 +1412,7 @@ namespace NLGUI
 			case CReflectedProperty::String:
 				ls.push( (reflectedObject.*(property.GetMethod.GetString))() );
 			break;
+#ifdef RYZOM_LUA_UCSTRING
 			case CReflectedProperty::UCString:
 			{
 				ucstring str = (reflectedObject.*(property.GetMethod.GetUCString))();
@@ -1434,6 +1435,7 @@ namespace NLGUI
 	#endif
 			}
 			break;
+#endif
 			case CReflectedProperty::StringRef:
 				ls.push( (reflectedObject.*(property.GetMethod.GetStringRef))() );
 			break;
@@ -1508,6 +1510,7 @@ namespace NLGUI
 					(target.*(property.SetMethod.SetString))(val);
 					return;
 				}
+#ifdef RYZOM_LUA_UCSTRING
 			case CReflectedProperty::UCString:
 			case CReflectedProperty::UCStringRef:
 				{
@@ -1532,6 +1535,7 @@ namespace NLGUI
 					(target.*(property.SetMethod.SetUCString))(val);
 					return;
 				}
+#endif
 			case CReflectedProperty::RGBA:
 				{
 					CRGBA color;
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index 1ec84433f..d7eaa2969 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1863,8 +1863,9 @@ string getTarget(CCtrlBase * /* ctrl */, const string &targetName)
 	return "";
 }
 
+#ifdef RYZOM_LUA_UCSTRING
 // ------------------------------------------------------------------------------------------------
-ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName) // TODO: UTF-8 Lua
+ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName)
 {
 	string sTmp = targetName;
 	std::vector<CInterfaceLink::CTargetInfo> targetsVector;
@@ -1884,6 +1885,7 @@ ucstring getUCTarget(CCtrlBase * /* ctrl */, const string &targetName) // TODO:
 		return ((elem->*(pRP->GetMethod.GetUCString))());
 	return ucstring(""); // TODO: UTF-8 Lua
 }
+#endif
 
 /*// Ask the server to rename a character
 // ------------------------------------------------------------------------------------------------
@@ -1955,7 +1957,11 @@ public:
 		string sDBLink = getParam(Params, "dblink");
 		CharNameValidDBLink = sDBLink;
 
+#ifdef RYZOM_LUA_UCSTRING
 		string sName = getUCTarget(NULL,sTarget).toUtf8(); // TODO: UTF-8 Lua
+#else
+		string sName = getTarget(NULL, sTarget);
+#endif
 
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		if (sName.empty())

From 297de1d19a825b37d8cf646b1db10f27706712cd Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 07:03:09 +0800
Subject: [PATCH 155/292] Fix memory release

---
 nel/include/nel/3d/async_file_manager_3d.h | 2 +-
 ryzom/client/src/client.cpp                | 1 +
 ryzom/client/src/release.cpp               | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nel/include/nel/3d/async_file_manager_3d.h b/nel/include/nel/3d/async_file_manager_3d.h
index 4e86f10b1..3f43a01e3 100644
--- a/nel/include/nel/3d/async_file_manager_3d.h
+++ b/nel/include/nel/3d/async_file_manager_3d.h
@@ -40,7 +40,7 @@ class CTextureFile;
 class CAsyncFileManager3D
 {
 
-	NLMISC_SAFE_SINGLETON_DECL(CAsyncFileManager3D);
+	NLMISC_SAFE_RELEASABLE_SINGLETON_DECL(CAsyncFileManager3D);
 	CAsyncFileManager3D();
 public:
 
diff --git a/ryzom/client/src/client.cpp b/ryzom/client/src/client.cpp
index da9eb8a54..84abb8cd4 100644
--- a/ryzom/client/src/client.cpp
+++ b/ryzom/client/src/client.cpp
@@ -451,6 +451,7 @@ int main(int argc, char **argv)
 	// delete all logs and displayers when we're not using logs macros anymore
 	destroyDebug();
 	CLog::releaseProcessName();
+	// CCoTask::releaseInstance();
 
 	// delete the Nel context
 	delete appContext;
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index 24783d391..b29683149 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -43,6 +43,7 @@
 #include "nel/3d/u_visual_collision_manager.h"
 #include "nel/3d/u_shape_bank.h"
 #include "nel/3d/stereo_hmd.h"
+#include "nel/3d/async_file_manager_3d.h"
 // Client
 #include "global.h"
 #include "release.h"
@@ -572,6 +573,8 @@ void release()
 	{
 		CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_GameExit, "login_step_game_exit&play_time=" + toString((NLMISC::CTime::getLocalTime() - StartPlayTime) / 1000)));
 	}
+	
+	setCrashCallback(NULL);
 
 #ifdef RYZOM_BG_DOWNLOADER
 	CBGDownloaderAccess::getInstance().release();
@@ -704,7 +707,7 @@ void release()
 	CIXml::releaseLibXml();
 	CHttpCache::release();
 	CStrictTransportSecurity::release();
-	CCoTask::releaseInstance();
+	CAsyncFileManager3D::releaseInstance();
 
 #if FINAL_VERSION
 	// openURL ("http://ryzom.com/exit/");

From 3b6e27e800975fd98638495608387be9c4b29d90 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 10:00:29 +0800
Subject: [PATCH 156/292] Find offset by index

---
 nel/include/nel/misc/utf_string_view.h |  3 ++-
 nel/src/misc/utf_string_view.cpp       | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/nel/include/nel/misc/utf_string_view.h b/nel/include/nel/misc/utf_string_view.h
index 8a224cef5..6264f425e 100644
--- a/nel/include/nel/misc/utf_string_view.h
+++ b/nel/include/nel/misc/utf_string_view.h
@@ -131,7 +131,8 @@ public:
 	inline bool empty() const { return !m_Size; }
 	const void *ptr() const { return m_Str; }
 
-	size_t count() const; // Slow count of UTF-32 characters
+	size_t count() const; //< Slow count of UTF-32 codepoints
+	ptrdiff_t offset(ptrdiff_t i); const //< Get byte offset by utf-32 codepoint index
 
 	inline CUtfStringView substr(const iterator &begin, const iterator &end) const
 	{
diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 39bf3b92f..283ef9555 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -230,6 +230,18 @@ size_t CUtfStringView::count() const
 	return res;
 }
 
+ptrdiff_t CUtfStringView::offset(ptrdiff_t i)
+{
+	size_t res = 0;
+	for (iterator it(begin()), end(this->end()); it != end; ++it)
+	{
+		if (res == i)
+			return (ptrdiff_t)it.ptr() - (ptrdiff_t)ptr();
+		++res;
+	}
+	return res;
+}
+
 u32char CUtfStringView::utf8Iterator(const void **addr)
 {
 	// Decode UTF-8

From bb564a630245503926d9701fedfc46f3764c141f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 11:07:27 +0800
Subject: [PATCH 157/292] Trim unsupported unicode for now, since they mess
 with input

---
 nel/src/3d/font_manager.cpp   |  4 +++-
 nel/src/gui/group_editbox.cpp | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index da8573ef7..3d468f987 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -146,8 +146,10 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		{
 			// Creating font
 			k.Char = *it;
-			if (k.Char < 0x20)
+			if (k.Char < 0x20) // Control Characters
 				k.Char += 0x2400;
+			if (k.Char == 0x7F) // DEL
+				k.Char = 0x2421;
 			k.FontGenerator = fontGen;
 			k.Size = fontSize;
 			k.Embolden = embolden;
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 64390bf24..98782cca1 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -54,6 +54,36 @@ namespace NLGUI
 	CGroupEditBox *CGroupEditBox::_MenuFather = NULL;
 	CGroupEditBox::IComboKeyHandler* CGroupEditBox::comboKeyHandler = NULL;
 
+	// For now, just trim unsupported codepoints to make emoji fallback to text form
+	static bool supportedCodepoint(u32char c)
+	{
+		if (c >= 0xFE00 && c < 0xFE10)
+			return false; // Variation Selectors
+		else if (c >= 0xE0100 && c < 0xE01F0)
+			return false; // Variation Selectors Supplement
+		else if (c >= 0x200B && c < 0x2010)
+			return false; // ZERO WIDTH JOINER, etcetera
+		else if (c >= 0x2028 && c < 0x202F)
+			return false; // PARAGRAPH SEPARATOR, etcetera
+		else if (c >= 0x2060 && c < 0x2070)
+			return false; // WORD JOINER, etcetera
+		else if (c == 0xFEFF)
+			return false; // BOM
+		return true;
+	}
+
+	// For now, just trim unsupported codepoints to make emoji fallback to text form
+	static ::u32string trimUnsupported(const ::u32string str)
+	{
+		::u32string res;
+		res.reserve(str.size());
+		for (::u32string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+		{
+			if (supportedCodepoint(*it))
+				res.push_back(*it);
+		}
+		return res;
+	}
 
 	// ----------------------------------------------------------------------------
 	NLMISC_REGISTER_OBJECT(CViewBase, CGroupEditBox, std::string, "edit_box");
@@ -850,7 +880,8 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	void CGroupEditBox::writeString(const std::string &str16, bool replace, bool atEnd)
 	{
-		::u32string str = CUtfStringView(str16).toUtf32();
+		// For now, just trim unsupported codepoints to make emoji fallback to text form
+		::u32string str = trimUnsupported(CUtfStringView(str16).toUtf32());
 		sint length = (sint)str.length();
 
 		::u32string toAppend;
@@ -1111,6 +1142,7 @@ namespace NLGUI
 
 						u32char c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
+						if (!supportedCodepoint(c)) return; // For now, just trim unsupported codepoints to make emoji fallback to text form
 						switch(_EntryType)
 						{
 							case Integer:

From e20af7828a30a6bb9ecb71022bfabed90c64d79c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 11:31:15 +0800
Subject: [PATCH 158/292] Additional size check to avoid stuck empty string
 cache files, caused by exception handling

---
 ryzom/client/src/string_manager_client.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index d7be1f224..b868b8104 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -127,14 +127,17 @@ namespace STRING_MANAGER
 
 				nlinfo("SM : Try to open the string cache : %s", _CacheFilename.c_str());
 
-				if (CFile::fileExists(_CacheFilename))
+				if (CFile::fileExists(_CacheFilename) && CFile::getFileSize(_CacheFilename))
 				{
 					// there is a cache file, check date reset it if needed
 					{
 						NLMISC::CIFile file(_CacheFilename);
 						file.setVersionException(false, false);
 						file.serialVersion(currentVersion);
-						file.serial(_Timestamp);
+						if (file.getPos() + sizeof(_Timestamp) > file.getFileSize())
+							_Timestamp = ~timestamp;
+						else
+							file.serial(_Timestamp);
 					}
 
 					if (_Timestamp != timestamp)

From 99df03dad00b186b90eacd426fe5befc57f71a4a Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 11:39:23 +0800
Subject: [PATCH 159/292] Don't allow unmatched surrogates in input

---
 nel/src/gui/group_editbox.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 98782cca1..563a27312 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -55,21 +55,25 @@ namespace NLGUI
 	CGroupEditBox::IComboKeyHandler* CGroupEditBox::comboKeyHandler = NULL;
 
 	// For now, just trim unsupported codepoints to make emoji fallback to text form
-	static bool supportedCodepoint(u32char c)
+	static u32char supportedCodepoint(u32char c)
 	{
 		if (c >= 0xFE00 && c < 0xFE10)
-			return false; // Variation Selectors
+			return 0; // Variation Selectors, unsupported
 		else if (c >= 0xE0100 && c < 0xE01F0)
-			return false; // Variation Selectors Supplement
+			return 0; // Variation Selectors Supplement, unsupported
 		else if (c >= 0x200B && c < 0x2010)
-			return false; // ZERO WIDTH JOINER, etcetera
+			return 0; // ZERO WIDTH JOINER, etcetera, unsupported
 		else if (c >= 0x2028 && c < 0x202F)
-			return false; // PARAGRAPH SEPARATOR, etcetera
+			return 0; // PARAGRAPH SEPARATOR, etcetera, unsupported
 		else if (c >= 0x2060 && c < 0x2070)
-			return false; // WORD JOINER, etcetera
+			return 0; // WORD JOINER, etcetera, unsupported
 		else if (c == 0xFEFF)
-			return false; // BOM
-		return true;
+			return 0; // BOM, unsupported
+		else if ((c & 0xFC00) == 0xD800)
+			return 0xFFFD; // UTF-16 surrogate, unmatched pair, invalid, set to replacement character
+		else if ((c & 0xFC00) == 0xDC00)
+			return 0xFFFD; // UTF-16 surrogate, unmatched pair, invalid, set to replacement character
+		return c;
 	}
 
 	// For now, just trim unsupported codepoints to make emoji fallback to text form
@@ -79,8 +83,9 @@ namespace NLGUI
 		res.reserve(str.size());
 		for (::u32string::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
 		{
-			if (supportedCodepoint(*it))
-				res.push_back(*it);
+			u32char c = supportedCodepoint(*it);
+			if (c) // This also trims NUL
+				res.push_back(c);
 		}
 		return res;
 	}
@@ -1142,7 +1147,8 @@ namespace NLGUI
 
 						u32char c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
-						if (!supportedCodepoint(c)) return; // For now, just trim unsupported codepoints to make emoji fallback to text form
+						c = supportedCodepoint(c);
+						if (!c) return; // For now, just trim unsupported codepoints to make emoji fallback to text form
 						switch(_EntryType)
 						{
 							case Integer:

From 773f27dfcb2de245b106e7021959e920117b1607 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 4 Nov 2020 16:04:40 +0800
Subject: [PATCH 160/292] Just pass utf-8

---
 nel/src/3d/text_context_user.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index f32fd175d..01bfe21df 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -229,7 +229,7 @@ uint32 CTextContextUser::textPush(const char *format, ...)
 	char *str;
 	NLMISC_CONVERT_VARGS (str, format, NLMISC::MaxCStringSize);
 
-	return _TextContext.textPush(ucstring(str)) ;
+	return _TextContext.textPush(str) ;
 }
 uint32 CTextContextUser::textPush(NLMISC::CUtfStringView sv)
 {
@@ -340,7 +340,7 @@ void CTextContextUser::printfAt(float x, float y, const char * format, ...)
 	char *str;
 	NLMISC_CONVERT_VARGS (str, format, NLMISC::MaxCStringSize);
 
-	_TextContext.printAt(x, y, ucstring(str)) ;
+	_TextContext.printAt(x, y, str) ;
 	_DriverUser->restoreMatrixContext();
 }
 

From 8809d3983504cbe2bc505b41cebcf6353a0cb354 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 7 Nov 2020 14:27:26 +0800
Subject: [PATCH 161/292] Rebuild string case tables

---
 nel/include/nel/misc/common.h               |    3 +
 nel/src/gui/string_case.cpp                 |    6 +-
 nel/src/misc/string_to_ci.cpp               | 2743 ++++++++++
 nel/src/misc/string_to_lower.cpp            | 2567 +++++++++
 nel/src/misc/string_to_title.cpp            | 2587 +++++++++
 nel/src/misc/string_to_upper.cpp            | 2661 +++++++++
 nel/src/misc/unicode.cpp                    | 5392 +------------------
 nel/tools/misc/CMakeLists.txt               |    1 +
 nel/tools/misc/utf_generator/CMakeLists.txt |   11 +
 nel/tools/misc/utf_generator/gold_pill.ico  |  Bin 0 -> 3638 bytes
 nel/tools/misc/utf_generator/main.cpp       |  425 ++
 nel/tools/misc/utf_generator/main.rc        |   42 +
 12 files changed, 11073 insertions(+), 5365 deletions(-)
 create mode 100644 nel/src/misc/string_to_ci.cpp
 create mode 100644 nel/src/misc/string_to_lower.cpp
 create mode 100644 nel/src/misc/string_to_title.cpp
 create mode 100644 nel/src/misc/string_to_upper.cpp
 create mode 100644 nel/tools/misc/utf_generator/CMakeLists.txt
 create mode 100644 nel/tools/misc/utf_generator/gold_pill.ico
 create mode 100644 nel/tools/misc/utf_generator/main.cpp
 create mode 100644 nel/tools/misc/utf_generator/main.rc

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 12ad31ceb..637c3c800 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -249,11 +249,14 @@ void appendToLower(std::string &res, const char *str, ptrdiff_t &i);
 void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i);
 void appendToUpper(std::string &res, const char *str, ptrdiff_t &i);
 void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i);
+void appendToTitle(std::string &res, const char *str, ptrdiff_t &i);
+void appendToTitle(std::string &res, const std::string &str, ptrdiff_t &i);
 
 /** UTF-8 case insensitive compare */
 int compareCaseInsensitive(const char *a, const char *b);
 int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB);
 inline int compareCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()); }
+inline bool ltCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()) < 0; }
 
 /** ASCII to lowercase. Useful for internal identifiers.
 * Characters outside of the 7-bit ASCII space, and control characters, are replaced.
diff --git a/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
index 946b8d58a..22c80fc5f 100644
--- a/nel/src/gui/string_case.cpp
+++ b/nel/src/gui/string_case.cpp
@@ -68,7 +68,7 @@ namespace NLGUI
 				if (!isSeparator(c))
 				{
 					if (newString)
-						NLMISC::appendToUpper(res, str, i);
+						NLMISC::appendToTitle(res, str, i);
 					else
 						NLMISC::appendToLower(res, str, i);
 					newString = false;
@@ -99,7 +99,7 @@ namespace NLGUI
 				else
 				{
 					if (newSentence)
-						NLMISC::appendToUpper(res, str, i);
+						NLMISC::appendToTitle(res, str, i);
 					else
 						NLMISC::appendToLower(res, str, i);
 
@@ -128,7 +128,7 @@ namespace NLGUI
 				else
 				{
 					if (newWord)
-						NLMISC::appendToUpper(res, str, i);
+						NLMISC::appendToTitle(res, str, i);
 					else
 						NLMISC::appendToLower(res, str, i);
 
diff --git a/nel/src/misc/string_to_ci.cpp b/nel/src/misc/string_to_ci.cpp
new file mode 100644
index 000000000..bdde3df23
--- /dev/null
+++ b/nel/src/misc/string_to_ci.cpp
@@ -0,0 +1,2743 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+namespace NLMISC {
+
+static const char s_StringToCaseInsensitiveC2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xBC', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveC3[64 * 4] = {
+	'\xC3', '\xA0', '\x00', 0,
+	'\xC3', '\xA1', '\x00', 0,
+	'\xC3', '\xA2', '\x00', 0,
+	'\xC3', '\xA3', '\x00', 0,
+	'\xC3', '\xA4', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	'\xC3', '\xA6', '\x00', 0,
+	'\xC3', '\xA7', '\x00', 0,
+	'\xC3', '\xA8', '\x00', 0,
+	'\xC3', '\xA9', '\x00', 0,
+	'\xC3', '\xAA', '\x00', 0,
+	'\xC3', '\xAB', '\x00', 0,
+	'\xC3', '\xAC', '\x00', 0,
+	'\xC3', '\xAD', '\x00', 0,
+	'\xC3', '\xAE', '\x00', 0,
+	'\xC3', '\xAF', '\x00', 0,
+	'\xC3', '\xB0', '\x00', 0,
+	'\xC3', '\xB1', '\x00', 0,
+	'\xC3', '\xB2', '\x00', 0,
+	'\xC3', '\xB3', '\x00', 0,
+	'\xC3', '\xB4', '\x00', 0,
+	'\xC3', '\xB5', '\x00', 0,
+	'\xC3', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xB8', '\x00', 0,
+	'\xC3', '\xB9', '\x00', 0,
+	'\xC3', '\xBA', '\x00', 0,
+	'\xC3', '\xBB', '\x00', 0,
+	'\xC3', '\xBC', '\x00', 0,
+	'\xC3', '\xBD', '\x00', 0,
+	'\xC3', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveC4[64 * 4] = {
+	'\xC4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\x69', '\x00', '\x00', 0,
+	'\x69', '\x00', '\x00', 0,
+	'\xC4', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x80', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveC5[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC5', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x88', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xBF', '\x00', 0,
+	'\xC5', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\x73', '\x00', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveC6[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC9', '\x93', '\x00', 0,
+	'\xC6', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x94', '\x00', 0,
+	'\xC6', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x96', '\x00', 0,
+	'\xC9', '\x97', '\x00', 0,
+	'\xC6', '\x8C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9D', '\x00', 0,
+	'\xC9', '\x99', '\x00', 0,
+	'\xC9', '\x9B', '\x00', 0,
+	'\xC6', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA0', '\x00', 0,
+	'\xC9', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA9', '\x00', 0,
+	'\xC9', '\xA8', '\x00', 0,
+	'\xC6', '\x99', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC9', '\xAF', '\x00', 0,
+	'\xC9', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xB5', '\x00', 0,
+	'\xC6', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x80', '\x00', 0,
+	'\xC6', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x88', '\x00', 0,
+	'\xC6', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x8A', '\x00', 0,
+	'\xCA', '\x8B', '\x00', 0,
+	'\xC6', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x92', '\x00', 0,
+	'\xC6', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x86', '\x00', 0,
+	'\xC7', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x89', '\x00', 0,
+	'\xC7', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8C', '\x00', 0,
+	'\xC7', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB3', '\x00', 0,
+	'\xC7', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x95', '\x00', 0,
+	'\xC6', '\xBF', '\x00', 0,
+	'\xC7', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveC8[64 * 4] = {
+	'\xC8', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB3', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA5', 0,
+	'\xC8', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x9A', '\x00', 0,
+	'\xE2', '\xB1', '\xA6', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveC9[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC9', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x80', '\x00', 0,
+	'\xCA', '\x89', '\x00', 0,
+	'\xCA', '\x8C', '\x00', 0,
+	'\xC9', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveCD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB3', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB3', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xAD', '\x00', 0,
+	'\xCE', '\xAE', '\x00', 0,
+	'\xCE', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8D', '\x00', 0,
+	'\xCF', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xCE', '\xB2', '\x00', 0,
+	'\xCE', '\xB3', '\x00', 0,
+	'\xCE', '\xB4', '\x00', 0,
+	'\xCE', '\xB5', '\x00', 0,
+	'\xCE', '\xB6', '\x00', 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xCE', '\xB8', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xBA', '\x00', 0,
+	'\xCE', '\xBB', '\x00', 0,
+	'\xCE', '\xBC', '\x00', 0,
+	'\xCE', '\xBD', '\x00', 0,
+	'\xCE', '\xBE', '\x00', 0,
+	'\xCE', '\xBF', '\x00', 0,
+	'\xCF', '\x80', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x83', '\x00', 0,
+	'\xCF', '\x84', '\x00', 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x86', '\x00', 0,
+	'\xCF', '\x87', '\x00', 0,
+	'\xCF', '\x88', '\x00', 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xCF', '\x8A', '\x00', 0,
+	'\xCF', '\x8B', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveCF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x97', '\x00', 0,
+	'\xCE', '\xB2', '\x00', 0,
+	'\xCE', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x86', '\x00', 0,
+	'\xCF', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xBA', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB8', '\x00', 0,
+	'\xCE', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xB2', '\x00', 0,
+	'\xCF', '\xBB', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xBB', '\x00', 0,
+	'\xCD', '\xBC', '\x00', 0,
+	'\xCD', '\xBD', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveD0[64 * 4] = {
+	'\xD1', '\x90', '\x00', 0,
+	'\xD1', '\x91', '\x00', 0,
+	'\xD1', '\x92', '\x00', 0,
+	'\xD1', '\x93', '\x00', 0,
+	'\xD1', '\x94', '\x00', 0,
+	'\xD1', '\x95', '\x00', 0,
+	'\xD1', '\x96', '\x00', 0,
+	'\xD1', '\x97', '\x00', 0,
+	'\xD1', '\x98', '\x00', 0,
+	'\xD1', '\x99', '\x00', 0,
+	'\xD1', '\x9A', '\x00', 0,
+	'\xD1', '\x9B', '\x00', 0,
+	'\xD1', '\x9C', '\x00', 0,
+	'\xD1', '\x9D', '\x00', 0,
+	'\xD1', '\x9E', '\x00', 0,
+	'\xD1', '\x9F', '\x00', 0,
+	'\xD0', '\xB0', '\x00', 0,
+	'\xD0', '\xB1', '\x00', 0,
+	'\xD0', '\xB2', '\x00', 0,
+	'\xD0', '\xB3', '\x00', 0,
+	'\xD0', '\xB4', '\x00', 0,
+	'\xD0', '\xB5', '\x00', 0,
+	'\xD0', '\xB6', '\x00', 0,
+	'\xD0', '\xB7', '\x00', 0,
+	'\xD0', '\xB8', '\x00', 0,
+	'\xD0', '\xB9', '\x00', 0,
+	'\xD0', '\xBA', '\x00', 0,
+	'\xD0', '\xBB', '\x00', 0,
+	'\xD0', '\xBC', '\x00', 0,
+	'\xD0', '\xBD', '\x00', 0,
+	'\xD0', '\xBE', '\x00', 0,
+	'\xD0', '\xBF', '\x00', 0,
+	'\xD1', '\x80', '\x00', 0,
+	'\xD1', '\x81', '\x00', 0,
+	'\xD1', '\x82', '\x00', 0,
+	'\xD1', '\x83', '\x00', 0,
+	'\xD1', '\x84', '\x00', 0,
+	'\xD1', '\x85', '\x00', 0,
+	'\xD1', '\x86', '\x00', 0,
+	'\xD1', '\x87', '\x00', 0,
+	'\xD1', '\x88', '\x00', 0,
+	'\xD1', '\x89', '\x00', 0,
+	'\xD1', '\x8A', '\x00', 0,
+	'\xD1', '\x8B', '\x00', 0,
+	'\xD1', '\x8C', '\x00', 0,
+	'\xD1', '\x8D', '\x00', 0,
+	'\xD1', '\x8E', '\x00', 0,
+	'\xD1', '\x8F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveD1[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD1', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveD2[64 * 4] = {
+	'\xD2', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveD3[64 * 4] = {
+	'\xD3', '\x8F', '\x00', 0,
+	'\xD3', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveD4[64 * 4] = {
+	'\xD4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD5', '\xA1', '\x00', 0,
+	'\xD5', '\xA2', '\x00', 0,
+	'\xD5', '\xA3', '\x00', 0,
+	'\xD5', '\xA4', '\x00', 0,
+	'\xD5', '\xA5', '\x00', 0,
+	'\xD5', '\xA6', '\x00', 0,
+	'\xD5', '\xA7', '\x00', 0,
+	'\xD5', '\xA8', '\x00', 0,
+	'\xD5', '\xA9', '\x00', 0,
+	'\xD5', '\xAA', '\x00', 0,
+	'\xD5', '\xAB', '\x00', 0,
+	'\xD5', '\xAC', '\x00', 0,
+	'\xD5', '\xAD', '\x00', 0,
+	'\xD5', '\xAE', '\x00', 0,
+	'\xD5', '\xAF', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveD5[64 * 4] = {
+	'\xD5', '\xB0', '\x00', 0,
+	'\xD5', '\xB1', '\x00', 0,
+	'\xD5', '\xB2', '\x00', 0,
+	'\xD5', '\xB3', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xB5', '\x00', 0,
+	'\xD5', '\xB6', '\x00', 0,
+	'\xD5', '\xB7', '\x00', 0,
+	'\xD5', '\xB8', '\x00', 0,
+	'\xD5', '\xB9', '\x00', 0,
+	'\xD5', '\xBA', '\x00', 0,
+	'\xD5', '\xBB', '\x00', 0,
+	'\xD5', '\xBC', '\x00', 0,
+	'\xD5', '\xBD', '\x00', 0,
+	'\xD5', '\xBE', '\x00', 0,
+	'\xD5', '\xBF', '\x00', 0,
+	'\xD6', '\x80', '\x00', 0,
+	'\xD6', '\x81', '\x00', 0,
+	'\xD6', '\x82', '\x00', 0,
+	'\xD6', '\x83', '\x00', 0,
+	'\xD6', '\x84', '\x00', 0,
+	'\xD6', '\x85', '\x00', 0,
+	'\xD6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE182[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB4', '\x80', 0,
+	'\xE2', '\xB4', '\x81', 0,
+	'\xE2', '\xB4', '\x82', 0,
+	'\xE2', '\xB4', '\x83', 0,
+	'\xE2', '\xB4', '\x84', 0,
+	'\xE2', '\xB4', '\x85', 0,
+	'\xE2', '\xB4', '\x86', 0,
+	'\xE2', '\xB4', '\x87', 0,
+	'\xE2', '\xB4', '\x88', 0,
+	'\xE2', '\xB4', '\x89', 0,
+	'\xE2', '\xB4', '\x8A', 0,
+	'\xE2', '\xB4', '\x8B', 0,
+	'\xE2', '\xB4', '\x8C', 0,
+	'\xE2', '\xB4', '\x8D', 0,
+	'\xE2', '\xB4', '\x8E', 0,
+	'\xE2', '\xB4', '\x8F', 0,
+	'\xE2', '\xB4', '\x90', 0,
+	'\xE2', '\xB4', '\x91', 0,
+	'\xE2', '\xB4', '\x92', 0,
+	'\xE2', '\xB4', '\x93', 0,
+	'\xE2', '\xB4', '\x94', 0,
+	'\xE2', '\xB4', '\x95', 0,
+	'\xE2', '\xB4', '\x96', 0,
+	'\xE2', '\xB4', '\x97', 0,
+	'\xE2', '\xB4', '\x98', 0,
+	'\xE2', '\xB4', '\x99', 0,
+	'\xE2', '\xB4', '\x9A', 0,
+	'\xE2', '\xB4', '\x9B', 0,
+	'\xE2', '\xB4', '\x9C', 0,
+	'\xE2', '\xB4', '\x9D', 0,
+	'\xE2', '\xB4', '\x9E', 0,
+	'\xE2', '\xB4', '\x9F', 0,
+};
+
+static const char s_StringToCaseInsensitiveE183[64 * 4] = {
+	'\xE2', '\xB4', '\xA0', 0,
+	'\xE2', '\xB4', '\xA1', 0,
+	'\xE2', '\xB4', '\xA2', 0,
+	'\xE2', '\xB4', '\xA3', 0,
+	'\xE2', '\xB4', '\xA4', 0,
+	'\xE2', '\xB4', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB4', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB4', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE18E[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\xAD', '\xB0', 0,
+	'\xEA', '\xAD', '\xB1', 0,
+	'\xEA', '\xAD', '\xB2', 0,
+	'\xEA', '\xAD', '\xB3', 0,
+	'\xEA', '\xAD', '\xB4', 0,
+	'\xEA', '\xAD', '\xB5', 0,
+	'\xEA', '\xAD', '\xB6', 0,
+	'\xEA', '\xAD', '\xB7', 0,
+	'\xEA', '\xAD', '\xB8', 0,
+	'\xEA', '\xAD', '\xB9', 0,
+	'\xEA', '\xAD', '\xBA', 0,
+	'\xEA', '\xAD', '\xBB', 0,
+	'\xEA', '\xAD', '\xBC', 0,
+	'\xEA', '\xAD', '\xBD', 0,
+	'\xEA', '\xAD', '\xBE', 0,
+	'\xEA', '\xAD', '\xBF', 0,
+	'\xEA', '\xAE', '\x80', 0,
+	'\xEA', '\xAE', '\x81', 0,
+	'\xEA', '\xAE', '\x82', 0,
+	'\xEA', '\xAE', '\x83', 0,
+	'\xEA', '\xAE', '\x84', 0,
+	'\xEA', '\xAE', '\x85', 0,
+	'\xEA', '\xAE', '\x86', 0,
+	'\xEA', '\xAE', '\x87', 0,
+	'\xEA', '\xAE', '\x88', 0,
+	'\xEA', '\xAE', '\x89', 0,
+	'\xEA', '\xAE', '\x8A', 0,
+	'\xEA', '\xAE', '\x8B', 0,
+	'\xEA', '\xAE', '\x8C', 0,
+	'\xEA', '\xAE', '\x8D', 0,
+	'\xEA', '\xAE', '\x8E', 0,
+	'\xEA', '\xAE', '\x8F', 0,
+};
+
+static const char s_StringToCaseInsensitiveE18F[64 * 4] = {
+	'\xEA', '\xAE', '\x90', 0,
+	'\xEA', '\xAE', '\x91', 0,
+	'\xEA', '\xAE', '\x92', 0,
+	'\xEA', '\xAE', '\x93', 0,
+	'\xEA', '\xAE', '\x94', 0,
+	'\xEA', '\xAE', '\x95', 0,
+	'\xEA', '\xAE', '\x96', 0,
+	'\xEA', '\xAE', '\x97', 0,
+	'\xEA', '\xAE', '\x98', 0,
+	'\xEA', '\xAE', '\x99', 0,
+	'\xEA', '\xAE', '\x9A', 0,
+	'\xEA', '\xAE', '\x9B', 0,
+	'\xEA', '\xAE', '\x9C', 0,
+	'\xEA', '\xAE', '\x9D', 0,
+	'\xEA', '\xAE', '\x9E', 0,
+	'\xEA', '\xAE', '\x9F', 0,
+	'\xEA', '\xAE', '\xA0', 0,
+	'\xEA', '\xAE', '\xA1', 0,
+	'\xEA', '\xAE', '\xA2', 0,
+	'\xEA', '\xAE', '\xA3', 0,
+	'\xEA', '\xAE', '\xA4', 0,
+	'\xEA', '\xAE', '\xA5', 0,
+	'\xEA', '\xAE', '\xA6', 0,
+	'\xEA', '\xAE', '\xA7', 0,
+	'\xEA', '\xAE', '\xA8', 0,
+	'\xEA', '\xAE', '\xA9', 0,
+	'\xEA', '\xAE', '\xAA', 0,
+	'\xEA', '\xAE', '\xAB', 0,
+	'\xEA', '\xAE', '\xAC', 0,
+	'\xEA', '\xAE', '\xAD', 0,
+	'\xEA', '\xAE', '\xAE', 0,
+	'\xEA', '\xAE', '\xAF', 0,
+	'\xEA', '\xAE', '\xB0', 0,
+	'\xEA', '\xAE', '\xB1', 0,
+	'\xEA', '\xAE', '\xB2', 0,
+	'\xEA', '\xAE', '\xB3', 0,
+	'\xEA', '\xAE', '\xB4', 0,
+	'\xEA', '\xAE', '\xB5', 0,
+	'\xEA', '\xAE', '\xB6', 0,
+	'\xEA', '\xAE', '\xB7', 0,
+	'\xEA', '\xAE', '\xB8', 0,
+	'\xEA', '\xAE', '\xB9', 0,
+	'\xEA', '\xAE', '\xBA', 0,
+	'\xEA', '\xAE', '\xBB', 0,
+	'\xEA', '\xAE', '\xBC', 0,
+	'\xEA', '\xAE', '\xBD', 0,
+	'\xEA', '\xAE', '\xBE', 0,
+	'\xEA', '\xAE', '\xBF', 0,
+	'\xE1', '\x8F', '\xB8', 0,
+	'\xE1', '\x8F', '\xB9', 0,
+	'\xE1', '\x8F', '\xBA', 0,
+	'\xE1', '\x8F', '\xBB', 0,
+	'\xE1', '\x8F', '\xBC', 0,
+	'\xE1', '\x8F', '\xBD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1B2[64 * 4] = {
+	'\xD0', '\xB2', '\x00', 0,
+	'\xD0', '\xB4', '\x00', 0,
+	'\xD0', '\xBE', '\x00', 0,
+	'\xD1', '\x81', '\x00', 0,
+	'\xD1', '\x82', '\x00', 0,
+	'\xD1', '\x82', '\x00', 0,
+	'\xD1', '\x8A', '\x00', 0,
+	'\xD1', '\xA3', '\x00', 0,
+	'\xEA', '\x99', '\x8B', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\x90', 0,
+	'\xE1', '\x83', '\x91', 0,
+	'\xE1', '\x83', '\x92', 0,
+	'\xE1', '\x83', '\x93', 0,
+	'\xE1', '\x83', '\x94', 0,
+	'\xE1', '\x83', '\x95', 0,
+	'\xE1', '\x83', '\x96', 0,
+	'\xE1', '\x83', '\x97', 0,
+	'\xE1', '\x83', '\x98', 0,
+	'\xE1', '\x83', '\x99', 0,
+	'\xE1', '\x83', '\x9A', 0,
+	'\xE1', '\x83', '\x9B', 0,
+	'\xE1', '\x83', '\x9C', 0,
+	'\xE1', '\x83', '\x9D', 0,
+	'\xE1', '\x83', '\x9E', 0,
+	'\xE1', '\x83', '\x9F', 0,
+	'\xE1', '\x83', '\xA0', 0,
+	'\xE1', '\x83', '\xA1', 0,
+	'\xE1', '\x83', '\xA2', 0,
+	'\xE1', '\x83', '\xA3', 0,
+	'\xE1', '\x83', '\xA4', 0,
+	'\xE1', '\x83', '\xA5', 0,
+	'\xE1', '\x83', '\xA6', 0,
+	'\xE1', '\x83', '\xA7', 0,
+	'\xE1', '\x83', '\xA8', 0,
+	'\xE1', '\x83', '\xA9', 0,
+	'\xE1', '\x83', '\xAA', 0,
+	'\xE1', '\x83', '\xAB', 0,
+	'\xE1', '\x83', '\xAC', 0,
+	'\xE1', '\x83', '\xAD', 0,
+	'\xE1', '\x83', '\xAE', 0,
+	'\xE1', '\x83', '\xAF', 0,
+	'\xE1', '\x83', '\xB0', 0,
+	'\xE1', '\x83', '\xB1', 0,
+	'\xE1', '\x83', '\xB2', 0,
+	'\xE1', '\x83', '\xB3', 0,
+	'\xE1', '\x83', '\xB4', 0,
+	'\xE1', '\x83', '\xB5', 0,
+	'\xE1', '\x83', '\xB6', 0,
+	'\xE1', '\x83', '\xB7', 0,
+	'\xE1', '\x83', '\xB8', 0,
+	'\xE1', '\x83', '\xB9', 0,
+	'\xE1', '\x83', '\xBA', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\xBD', 0,
+	'\xE1', '\x83', '\xBE', 0,
+	'\xE1', '\x83', '\xBF', 0,
+};
+
+static const char s_StringToCaseInsensitiveE1B8[64 * 4] = {
+	'\xE1', '\xB8', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1B9[64 * 4] = {
+	'\xE1', '\xB9', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BA[64 * 4] = {
+	'\xE1', '\xBA', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x95', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA1', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC3', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BB[64 * 4] = {
+	'\xE1', '\xBB', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x80', 0,
+	'\xE1', '\xBC', '\x81', 0,
+	'\xE1', '\xBC', '\x82', 0,
+	'\xE1', '\xBC', '\x83', 0,
+	'\xE1', '\xBC', '\x84', 0,
+	'\xE1', '\xBC', '\x85', 0,
+	'\xE1', '\xBC', '\x86', 0,
+	'\xE1', '\xBC', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x90', 0,
+	'\xE1', '\xBC', '\x91', 0,
+	'\xE1', '\xBC', '\x92', 0,
+	'\xE1', '\xBC', '\x93', 0,
+	'\xE1', '\xBC', '\x94', 0,
+	'\xE1', '\xBC', '\x95', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA0', 0,
+	'\xE1', '\xBC', '\xA1', 0,
+	'\xE1', '\xBC', '\xA2', 0,
+	'\xE1', '\xBC', '\xA3', 0,
+	'\xE1', '\xBC', '\xA4', 0,
+	'\xE1', '\xBC', '\xA5', 0,
+	'\xE1', '\xBC', '\xA6', 0,
+	'\xE1', '\xBC', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB0', 0,
+	'\xE1', '\xBC', '\xB1', 0,
+	'\xE1', '\xBC', '\xB2', 0,
+	'\xE1', '\xBC', '\xB3', 0,
+	'\xE1', '\xBC', '\xB4', 0,
+	'\xE1', '\xBC', '\xB5', 0,
+	'\xE1', '\xBC', '\xB6', 0,
+	'\xE1', '\xBC', '\xB7', 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\x80', 0,
+	'\xE1', '\xBD', '\x81', 0,
+	'\xE1', '\xBD', '\x82', 0,
+	'\xE1', '\xBD', '\x83', 0,
+	'\xE1', '\xBD', '\x84', 0,
+	'\xE1', '\xBD', '\x85', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x97', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA0', 0,
+	'\xE1', '\xBD', '\xA1', 0,
+	'\xE1', '\xBD', '\xA2', 0,
+	'\xE1', '\xBD', '\xA3', 0,
+	'\xE1', '\xBD', '\xA4', 0,
+	'\xE1', '\xBD', '\xA5', 0,
+	'\xE1', '\xBD', '\xA6', 0,
+	'\xE1', '\xBD', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x80', 0,
+	'\xE1', '\xBE', '\x81', 0,
+	'\xE1', '\xBE', '\x82', 0,
+	'\xE1', '\xBE', '\x83', 0,
+	'\xE1', '\xBE', '\x84', 0,
+	'\xE1', '\xBE', '\x85', 0,
+	'\xE1', '\xBE', '\x86', 0,
+	'\xE1', '\xBE', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x90', 0,
+	'\xE1', '\xBE', '\x91', 0,
+	'\xE1', '\xBE', '\x92', 0,
+	'\xE1', '\xBE', '\x93', 0,
+	'\xE1', '\xBE', '\x94', 0,
+	'\xE1', '\xBE', '\x95', 0,
+	'\xE1', '\xBE', '\x96', 0,
+	'\xE1', '\xBE', '\x97', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xA0', 0,
+	'\xE1', '\xBE', '\xA1', 0,
+	'\xE1', '\xBE', '\xA2', 0,
+	'\xE1', '\xBE', '\xA3', 0,
+	'\xE1', '\xBE', '\xA4', 0,
+	'\xE1', '\xBE', '\xA5', 0,
+	'\xE1', '\xBE', '\xA6', 0,
+	'\xE1', '\xBE', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xB0', 0,
+	'\xE1', '\xBE', '\xB1', 0,
+	'\xE1', '\xBD', '\xB0', 0,
+	'\xE1', '\xBD', '\xB1', 0,
+	'\xE1', '\xBE', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB2', 0,
+	'\xE1', '\xBD', '\xB3', 0,
+	'\xE1', '\xBD', '\xB4', 0,
+	'\xE1', '\xBD', '\xB5', 0,
+	'\xE1', '\xBF', '\x83', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x90', 0,
+	'\xE1', '\xBF', '\x91', 0,
+	'\xE1', '\xBD', '\xB6', 0,
+	'\xE1', '\xBD', '\xB7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xA0', 0,
+	'\xE1', '\xBF', '\xA1', 0,
+	'\xE1', '\xBD', '\xBA', 0,
+	'\xE1', '\xBD', '\xBB', 0,
+	'\xE1', '\xBF', '\xA5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB8', 0,
+	'\xE1', '\xBD', '\xB9', 0,
+	'\xE1', '\xBD', '\xBC', 0,
+	'\xE1', '\xBD', '\xBD', 0,
+	'\xE1', '\xBF', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE284[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x6B', '\x00', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\x8E', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xB0', 0,
+	'\xE2', '\x85', '\xB1', 0,
+	'\xE2', '\x85', '\xB2', 0,
+	'\xE2', '\x85', '\xB3', 0,
+	'\xE2', '\x85', '\xB4', 0,
+	'\xE2', '\x85', '\xB5', 0,
+	'\xE2', '\x85', '\xB6', 0,
+	'\xE2', '\x85', '\xB7', 0,
+	'\xE2', '\x85', '\xB8', 0,
+	'\xE2', '\x85', '\xB9', 0,
+	'\xE2', '\x85', '\xBA', 0,
+	'\xE2', '\x85', '\xBB', 0,
+	'\xE2', '\x85', '\xBC', 0,
+	'\xE2', '\x85', '\xBD', 0,
+	'\xE2', '\x85', '\xBE', 0,
+	'\xE2', '\x85', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE286[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x86', '\x84', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE292[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x93', '\x90', 0,
+	'\xE2', '\x93', '\x91', 0,
+	'\xE2', '\x93', '\x92', 0,
+	'\xE2', '\x93', '\x93', 0,
+	'\xE2', '\x93', '\x94', 0,
+	'\xE2', '\x93', '\x95', 0,
+	'\xE2', '\x93', '\x96', 0,
+	'\xE2', '\x93', '\x97', 0,
+	'\xE2', '\x93', '\x98', 0,
+	'\xE2', '\x93', '\x99', 0,
+};
+
+static const char s_StringToCaseInsensitiveE293[64 * 4] = {
+	'\xE2', '\x93', '\x9A', 0,
+	'\xE2', '\x93', '\x9B', 0,
+	'\xE2', '\x93', '\x9C', 0,
+	'\xE2', '\x93', '\x9D', 0,
+	'\xE2', '\x93', '\x9E', 0,
+	'\xE2', '\x93', '\x9F', 0,
+	'\xE2', '\x93', '\xA0', 0,
+	'\xE2', '\x93', '\xA1', 0,
+	'\xE2', '\x93', '\xA2', 0,
+	'\xE2', '\x93', '\xA3', 0,
+	'\xE2', '\x93', '\xA4', 0,
+	'\xE2', '\x93', '\xA5', 0,
+	'\xE2', '\x93', '\xA6', 0,
+	'\xE2', '\x93', '\xA7', 0,
+	'\xE2', '\x93', '\xA8', 0,
+	'\xE2', '\x93', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE2B0[64 * 4] = {
+	'\xE2', '\xB0', '\xB0', 0,
+	'\xE2', '\xB0', '\xB1', 0,
+	'\xE2', '\xB0', '\xB2', 0,
+	'\xE2', '\xB0', '\xB3', 0,
+	'\xE2', '\xB0', '\xB4', 0,
+	'\xE2', '\xB0', '\xB5', 0,
+	'\xE2', '\xB0', '\xB6', 0,
+	'\xE2', '\xB0', '\xB7', 0,
+	'\xE2', '\xB0', '\xB8', 0,
+	'\xE2', '\xB0', '\xB9', 0,
+	'\xE2', '\xB0', '\xBA', 0,
+	'\xE2', '\xB0', '\xBB', 0,
+	'\xE2', '\xB0', '\xBC', 0,
+	'\xE2', '\xB0', '\xBD', 0,
+	'\xE2', '\xB0', '\xBE', 0,
+	'\xE2', '\xB0', '\xBF', 0,
+	'\xE2', '\xB1', '\x80', 0,
+	'\xE2', '\xB1', '\x81', 0,
+	'\xE2', '\xB1', '\x82', 0,
+	'\xE2', '\xB1', '\x83', 0,
+	'\xE2', '\xB1', '\x84', 0,
+	'\xE2', '\xB1', '\x85', 0,
+	'\xE2', '\xB1', '\x86', 0,
+	'\xE2', '\xB1', '\x87', 0,
+	'\xE2', '\xB1', '\x88', 0,
+	'\xE2', '\xB1', '\x89', 0,
+	'\xE2', '\xB1', '\x8A', 0,
+	'\xE2', '\xB1', '\x8B', 0,
+	'\xE2', '\xB1', '\x8C', 0,
+	'\xE2', '\xB1', '\x8D', 0,
+	'\xE2', '\xB1', '\x8E', 0,
+	'\xE2', '\xB1', '\x8F', 0,
+	'\xE2', '\xB1', '\x90', 0,
+	'\xE2', '\xB1', '\x91', 0,
+	'\xE2', '\xB1', '\x92', 0,
+	'\xE2', '\xB1', '\x93', 0,
+	'\xE2', '\xB1', '\x94', 0,
+	'\xE2', '\xB1', '\x95', 0,
+	'\xE2', '\xB1', '\x96', 0,
+	'\xE2', '\xB1', '\x97', 0,
+	'\xE2', '\xB1', '\x98', 0,
+	'\xE2', '\xB1', '\x99', 0,
+	'\xE2', '\xB1', '\x9A', 0,
+	'\xE2', '\xB1', '\x9B', 0,
+	'\xE2', '\xB1', '\x9C', 0,
+	'\xE2', '\xB1', '\x9D', 0,
+	'\xE2', '\xB1', '\x9E', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE2B1[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xAB', '\x00', 0,
+	'\xE1', '\xB5', '\xBD', 0,
+	'\xC9', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x91', '\x00', 0,
+	'\xC9', '\xB1', '\x00', 0,
+	'\xC9', '\x90', '\x00', 0,
+	'\xC9', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB6', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBF', '\x00', 0,
+	'\xC9', '\x80', '\x00', 0,
+};
+
+static const char s_StringToCaseInsensitiveE2B2[64 * 4] = {
+	'\xE2', '\xB2', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveE2B3[64 * 4] = {
+	'\xE2', '\xB3', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA99[64 * 4] = {
+	'\xEA', '\x99', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA9A[64 * 4] = {
+	'\xEA', '\x9A', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x9B', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA9C[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAF', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA9D[64 * 4] = {
+	'\xEA', '\x9D', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAF', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB5', '\xB9', 0,
+	'\xEA', '\x9D', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA9E[64 * 4] = {
+	'\xEA', '\x9E', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x87', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA6', '\x00', 0,
+	'\xC9', '\x9C', '\x00', 0,
+	'\xC9', '\xA1', '\x00', 0,
+	'\xC9', '\xAC', '\x00', 0,
+	'\xC9', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x9E', '\x00', 0,
+	'\xCA', '\x87', '\x00', 0,
+	'\xCA', '\x9D', '\x00', 0,
+	'\xEA', '\xAD', '\x93', 0,
+	'\xEA', '\x9E', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEA9F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x94', 0,
+	'\xCA', '\x82', '\x00', 0,
+	'\xE1', '\xB6', '\x8E', 0,
+	'\xEA', '\x9F', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x8A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\xB6', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveEFBC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEF', '\xBD', '\x81', 0,
+	'\xEF', '\xBD', '\x82', 0,
+	'\xEF', '\xBD', '\x83', 0,
+	'\xEF', '\xBD', '\x84', 0,
+	'\xEF', '\xBD', '\x85', 0,
+	'\xEF', '\xBD', '\x86', 0,
+	'\xEF', '\xBD', '\x87', 0,
+	'\xEF', '\xBD', '\x88', 0,
+	'\xEF', '\xBD', '\x89', 0,
+	'\xEF', '\xBD', '\x8A', 0,
+	'\xEF', '\xBD', '\x8B', 0,
+	'\xEF', '\xBD', '\x8C', 0,
+	'\xEF', '\xBD', '\x8D', 0,
+	'\xEF', '\xBD', '\x8E', 0,
+	'\xEF', '\xBD', '\x8F', 0,
+	'\xEF', '\xBD', '\x90', 0,
+	'\xEF', '\xBD', '\x91', 0,
+	'\xEF', '\xBD', '\x92', 0,
+	'\xEF', '\xBD', '\x93', 0,
+	'\xEF', '\xBD', '\x94', 0,
+	'\xEF', '\xBD', '\x95', 0,
+	'\xEF', '\xBD', '\x96', 0,
+	'\xEF', '\xBD', '\x97', 0,
+	'\xEF', '\xBD', '\x98', 0,
+	'\xEF', '\xBD', '\x99', 0,
+	'\xEF', '\xBD', '\x9A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveF09090[64 * 4] = {
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveF09092[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+};
+
+static const char s_StringToCaseInsensitiveF09093[64 * 4] = {
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveF090B2[64 * 4] = {
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveF091A2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+};
+
+static const char s_StringToCaseInsensitiveF096B9[64 * 4] = {
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToCaseInsensitiveF09EA4[64 * 4] = {
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMap[32] = {
+	0, 0,
+	s_StringToCaseInsensitiveC2,
+	s_StringToCaseInsensitiveC3,
+	s_StringToCaseInsensitiveC4,
+	s_StringToCaseInsensitiveC5,
+	s_StringToCaseInsensitiveC6,
+	s_StringToCaseInsensitiveC7,
+	s_StringToCaseInsensitiveC8,
+	s_StringToCaseInsensitiveC9,
+	0, 0, 0,
+	s_StringToCaseInsensitiveCD,
+	s_StringToCaseInsensitiveCE,
+	s_StringToCaseInsensitiveCF,
+	s_StringToCaseInsensitiveD0,
+	s_StringToCaseInsensitiveD1,
+	s_StringToCaseInsensitiveD2,
+	s_StringToCaseInsensitiveD3,
+	s_StringToCaseInsensitiveD4,
+	s_StringToCaseInsensitiveD5,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapE1[64] = {
+	0, 0,
+	s_StringToCaseInsensitiveE182,
+	s_StringToCaseInsensitiveE183,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveE18E,
+	s_StringToCaseInsensitiveE18F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveE1B2,
+	0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveE1B8,
+	s_StringToCaseInsensitiveE1B9,
+	s_StringToCaseInsensitiveE1BA,
+	s_StringToCaseInsensitiveE1BB,
+	s_StringToCaseInsensitiveE1BC,
+	s_StringToCaseInsensitiveE1BD,
+	s_StringToCaseInsensitiveE1BE,
+	s_StringToCaseInsensitiveE1BF,
+};
+
+static const char *s_StringToCaseInsensitiveMapE2[64] = {
+	0, 0, 0, 0,
+	s_StringToCaseInsensitiveE284,
+	s_StringToCaseInsensitiveE285,
+	s_StringToCaseInsensitiveE286,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveE292,
+	s_StringToCaseInsensitiveE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveE2B0,
+	s_StringToCaseInsensitiveE2B1,
+	s_StringToCaseInsensitiveE2B2,
+	s_StringToCaseInsensitiveE2B3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapEA[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveEA99,
+	s_StringToCaseInsensitiveEA9A,
+	0,
+	s_StringToCaseInsensitiveEA9C,
+	s_StringToCaseInsensitiveEA9D,
+	s_StringToCaseInsensitiveEA9E,
+	s_StringToCaseInsensitiveEA9F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveEFBC,
+	0, 0, 0,
+};
+
+static const char **s_StringToCaseInsensitiveMapMap[16] = {
+	0,
+	s_StringToCaseInsensitiveMapE1,
+	s_StringToCaseInsensitiveMapE2,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveMapEA,
+	0, 0, 0, 0,
+	s_StringToCaseInsensitiveMapEF,
+};
+
+static const char *s_StringToCaseInsensitiveMapF090[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveF09090,
+	0,
+	s_StringToCaseInsensitiveF09092,
+	s_StringToCaseInsensitiveF09093,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveF090B2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapF091[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveF091A2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapF096[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveF096B9,
+	0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToCaseInsensitiveMapF09E[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveF09EA4,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char **s_StringToCaseInsensitiveMapMapF0[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveMapF090,
+	s_StringToCaseInsensitiveMapF091,
+	0, 0, 0, 0,
+	s_StringToCaseInsensitiveMapF096,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToCaseInsensitiveMapF09E,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char ***s_StringToCaseInsensitiveMapMapMap[8] = {
+	s_StringToCaseInsensitiveMapMapF0,
+	0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_LowerAscii[] = {
+	'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g', 0, 
+	'h', 0, 'i', 0, 'j', 0, 'k', 0, 'l', 0, 'm', 0, 'n', 0, 
+	'o', 0, 'p', 0, 'q', 0, 'r', 0, 's', 0, 't', 0, 'u', 0, 
+	'v', 0, 'w', 0, 'x', 0, 'y', 0, 'z', 0, 0, 0, 0, 0
+};
+
+// ***************************************************************************
+
+const char *fetchToCaseInsensitiveAsUtf8(const char **str)
+{
+	unsigned char c = *(*str);
+	unsigned char d, e, f;
+	if (c < 0x80)
+	{
+		if (c >= 'A' && c <= 'Z')
+		{
+			// 1-byte UTF-8
+			++(*str);
+			return &s_LowerAscii[(c - 'A') << 1];
+		}
+	}
+	else if (c < 0xC0)
+	{
+		// non-starting byte
+	}
+	else if (c < 0xE0)
+	{
+		// 2-byte UTF-8
+		if (((d = (*str)[1]) & 0xC0) == 0x80)
+		{
+			const char *table = s_StringToCaseInsensitiveMap[c & 0x1F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					(*str) += 2;
+					return &table[idx];
+				}
+			}
+		}
+	}
+	else if (c < 0xF0)
+	{
+		// 3-byte UTF-8
+		if (((d = (*str)[1]) & 0xC0) == 0x80 && ((e = (*str)[2]) & 0xC0) == 0x80)
+		{
+			const char **map = s_StringToCaseInsensitiveMapMap[c & 0x0F];
+			if (map)
+			{
+				const char *table = map[d & 0x3F];
+				if (table)
+				{
+					unsigned char idx = (e & 0x3F) << 2;
+					if (table[idx])
+					{
+						(*str) += 3;
+						return &table[idx];
+					}
+				}
+			}
+		}
+	}
+	else if (c < 0xF8)
+	{
+		// 4-byte UTF-8
+		if (((d = (*str)[1]) & 0xC0) == 0x80 && ((e = (*str)[2]) & 0xC0) == 0x80 && ((f = (*str)[3]) & 0xC0) == 0x80)
+		{
+			const char ***mapMap = s_StringToCaseInsensitiveMapMapMap[c & 0x07];
+			if (mapMap)
+			{
+				const char **map = mapMap[d & 0x3F];
+				if (map)
+				{
+					const char *table = map[e & 0x3F];
+					if (table)
+					{
+						unsigned char idx = (f & 0x3F) << 2;
+						if (table[idx])
+						{
+							(*str) += 4;
+							return &table[idx];
+						}
+					}
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+// ***************************************************************************
+
+int compareCaseInsensitive(const char *a, const char *b)
+{
+	// while (*a != 0 && *b != 0)
+	for (; ;)
+	{
+		const char *ca = fetchToCaseInsensitiveAsUtf8(&a);
+		const char *cb = fetchToCaseInsensitiveAsUtf8(&b);
+		if (!ca && !cb)
+		{
+			// Easy case, ASCII compare or junk
+			if (*a != *b)
+			{
+				if (*a > * b) return 1;
+				else return -1;
+			}
+			else if (!*a) // Equal and NUL, ends both
+			{
+				return 0;
+			}
+			++a;
+			++b;
+		}
+		else if (!cb)
+		{
+			// String a changed lowercase, iterate ca until NUL alongside b
+			nlassert(*ca);
+			do
+			{
+				if (*ca != *b)
+				{
+					if (*ca > *b) return 1;
+					else return -1;
+				}
+				++ca;
+				++b;
+			} while (*ca);
+		}
+		else if (!ca)
+		{
+			// String b changed lowercase, iterate a alongside cb until NUL
+			nlassert(*cb);
+			do
+			{
+				if (*a != *cb)
+				{
+					if (*a > *cb) return 1;
+					else return -1;
+				}
+				++a;
+				++cb;
+			} while (*cb);
+		}
+		else
+		{
+			// Both strings changed lowercase
+			if (ca != cb) // Only check if it's a different result
+			{
+				do
+				{
+					if (*ca != *cb)
+					{
+						if (*ca > *cb) return 1;
+						else return -1;
+					}
+					++ca;
+					++cb;
+				} while (*ca && *cb);
+			}
+		}
+	}
+	// if (*a == *b) return 0;
+	// if (*a > *b) return 1;
+	// return -1;
+}
+
+// ***************************************************************************
+
+int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB)
+{
+	const char *ma = a + lenA;
+	const char *mb = b + lenB;
+	for (; ;)
+	{
+		if (a >= ma)
+		{
+			if (b >= mb)
+			{
+				return 0; // Both strings ended
+			}
+			else
+			{
+				return 1; // A is longer
+			}
+		}
+		if (b >= mb)
+		{
+			return -1; // B is longer
+		}
+		const char *ca = fetchToCaseInsensitiveAsUtf8(&a);
+		const char *cb = fetchToCaseInsensitiveAsUtf8(&b);
+		if (!ca && !cb)
+		{
+			// Easy case, ASCII compare or junk
+			if (*a != *b)
+			{
+				if (*a > * b) return 1;
+				else return -1;
+			}
+			/*
+			else if (!*a) // Equal and NUL, ends both
+			{
+			return 0;
+			}
+			*/
+			++a;
+			++b;
+		}
+		else if (!cb)
+		{
+			// String a changed lowercase, iterate ca until NUL alongside b
+			nlassert(*ca);
+			do
+			{
+				if (*ca != *b)
+				{
+					if (*ca > *b) return 1;
+					else return -1;
+				}
+				++ca;
+				++b;
+			} while (*ca);
+		}
+		else if (!ca)
+		{
+			// String b changed lowercase, iterate a alongside cb until NUL
+			nlassert(*cb);
+			do
+			{
+				if (*a != *cb)
+				{
+					if (*a > *cb) return 1;
+					else return -1;
+				}
+				++a;
+				++cb;
+			} while (*cb);
+		}
+		else
+		{
+			// Both strings changed lowercase
+			if (ca != cb) // Only check if it's a different result
+			{
+				do
+				{
+					if (*ca != *cb)
+					{
+						if (*ca > *cb) return 1;
+						else return -1;
+					}
+					++ca;
+					++cb;
+				} while (*ca && *cb);
+			}
+		}
+	}
+}
+
+// ***************************************************************************
+
+} // NLMISC
diff --git a/nel/src/misc/string_to_lower.cpp b/nel/src/misc/string_to_lower.cpp
new file mode 100644
index 000000000..cd40abe88
--- /dev/null
+++ b/nel/src/misc/string_to_lower.cpp
@@ -0,0 +1,2567 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
+
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
+namespace NLMISC {
+
+static const char s_StringToLowerC3[64 * 4] = {
+	'\xC3', '\xA0', '\x00', 0,
+	'\xC3', '\xA1', '\x00', 0,
+	'\xC3', '\xA2', '\x00', 0,
+	'\xC3', '\xA3', '\x00', 0,
+	'\xC3', '\xA4', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	'\xC3', '\xA6', '\x00', 0,
+	'\xC3', '\xA7', '\x00', 0,
+	'\xC3', '\xA8', '\x00', 0,
+	'\xC3', '\xA9', '\x00', 0,
+	'\xC3', '\xAA', '\x00', 0,
+	'\xC3', '\xAB', '\x00', 0,
+	'\xC3', '\xAC', '\x00', 0,
+	'\xC3', '\xAD', '\x00', 0,
+	'\xC3', '\xAE', '\x00', 0,
+	'\xC3', '\xAF', '\x00', 0,
+	'\xC3', '\xB0', '\x00', 0,
+	'\xC3', '\xB1', '\x00', 0,
+	'\xC3', '\xB2', '\x00', 0,
+	'\xC3', '\xB3', '\x00', 0,
+	'\xC3', '\xB4', '\x00', 0,
+	'\xC3', '\xB5', '\x00', 0,
+	'\xC3', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xB8', '\x00', 0,
+	'\xC3', '\xB9', '\x00', 0,
+	'\xC3', '\xBA', '\x00', 0,
+	'\xC3', '\xBB', '\x00', 0,
+	'\xC3', '\xBC', '\x00', 0,
+	'\xC3', '\xBD', '\x00', 0,
+	'\xC3', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerC4[64 * 4] = {
+	'\xC4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\x69', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x80', '\x00', 0,
+};
+
+static const char s_StringToLowerC5[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC5', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x88', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\xBF', '\x00', 0,
+	'\xC5', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerC6[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC9', '\x93', '\x00', 0,
+	'\xC6', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x94', '\x00', 0,
+	'\xC6', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x96', '\x00', 0,
+	'\xC9', '\x97', '\x00', 0,
+	'\xC6', '\x8C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9D', '\x00', 0,
+	'\xC9', '\x99', '\x00', 0,
+	'\xC9', '\x9B', '\x00', 0,
+	'\xC6', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA0', '\x00', 0,
+	'\xC9', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA9', '\x00', 0,
+	'\xC9', '\xA8', '\x00', 0,
+	'\xC6', '\x99', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC9', '\xAF', '\x00', 0,
+	'\xC9', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xB5', '\x00', 0,
+	'\xC6', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x80', '\x00', 0,
+	'\xC6', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x88', '\x00', 0,
+	'\xC6', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x8A', '\x00', 0,
+	'\xCA', '\x8B', '\x00', 0,
+	'\xC6', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x92', '\x00', 0,
+	'\xC6', '\xB9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x86', '\x00', 0,
+	'\xC7', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x89', '\x00', 0,
+	'\xC7', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8C', '\x00', 0,
+	'\xC7', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB3', '\x00', 0,
+	'\xC7', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x95', '\x00', 0,
+	'\xC6', '\xBF', '\x00', 0,
+	'\xC7', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerC8[64 * 4] = {
+	'\xC8', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB3', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA5', 0,
+	'\xC8', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x9A', '\x00', 0,
+	'\xE2', '\xB1', '\xA6', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerC9[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC9', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x80', '\x00', 0,
+	'\xCA', '\x89', '\x00', 0,
+	'\xCA', '\x8C', '\x00', 0,
+	'\xC9', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerCD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB3', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB3', '\x00', 0,
+};
+
+static const char s_StringToLowerCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xAD', '\x00', 0,
+	'\xCE', '\xAE', '\x00', 0,
+	'\xCE', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x8D', '\x00', 0,
+	'\xCF', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\xB1', '\x00', 0,
+	'\xCE', '\xB2', '\x00', 0,
+	'\xCE', '\xB3', '\x00', 0,
+	'\xCE', '\xB4', '\x00', 0,
+	'\xCE', '\xB5', '\x00', 0,
+	'\xCE', '\xB6', '\x00', 0,
+	'\xCE', '\xB7', '\x00', 0,
+	'\xCE', '\xB8', '\x00', 0,
+	'\xCE', '\xB9', '\x00', 0,
+	'\xCE', '\xBA', '\x00', 0,
+	'\xCE', '\xBB', '\x00', 0,
+	'\xCE', '\xBC', '\x00', 0,
+	'\xCE', '\xBD', '\x00', 0,
+	'\xCE', '\xBE', '\x00', 0,
+	'\xCE', '\xBF', '\x00', 0,
+	'\xCF', '\x80', '\x00', 0,
+	'\xCF', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x83', '\x00', 0,
+	'\xCF', '\x84', '\x00', 0,
+	'\xCF', '\x85', '\x00', 0,
+	'\xCF', '\x86', '\x00', 0,
+	'\xCF', '\x87', '\x00', 0,
+	'\xCF', '\x88', '\x00', 0,
+	'\xCF', '\x89', '\x00', 0,
+	'\xCF', '\x8A', '\x00', 0,
+	'\xCF', '\x8B', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerCF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x97', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xB2', '\x00', 0,
+	'\xCF', '\xBB', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xBB', '\x00', 0,
+	'\xCD', '\xBC', '\x00', 0,
+	'\xCD', '\xBD', '\x00', 0,
+};
+
+static const char s_StringToLowerD0[64 * 4] = {
+	'\xD1', '\x90', '\x00', 0,
+	'\xD1', '\x91', '\x00', 0,
+	'\xD1', '\x92', '\x00', 0,
+	'\xD1', '\x93', '\x00', 0,
+	'\xD1', '\x94', '\x00', 0,
+	'\xD1', '\x95', '\x00', 0,
+	'\xD1', '\x96', '\x00', 0,
+	'\xD1', '\x97', '\x00', 0,
+	'\xD1', '\x98', '\x00', 0,
+	'\xD1', '\x99', '\x00', 0,
+	'\xD1', '\x9A', '\x00', 0,
+	'\xD1', '\x9B', '\x00', 0,
+	'\xD1', '\x9C', '\x00', 0,
+	'\xD1', '\x9D', '\x00', 0,
+	'\xD1', '\x9E', '\x00', 0,
+	'\xD1', '\x9F', '\x00', 0,
+	'\xD0', '\xB0', '\x00', 0,
+	'\xD0', '\xB1', '\x00', 0,
+	'\xD0', '\xB2', '\x00', 0,
+	'\xD0', '\xB3', '\x00', 0,
+	'\xD0', '\xB4', '\x00', 0,
+	'\xD0', '\xB5', '\x00', 0,
+	'\xD0', '\xB6', '\x00', 0,
+	'\xD0', '\xB7', '\x00', 0,
+	'\xD0', '\xB8', '\x00', 0,
+	'\xD0', '\xB9', '\x00', 0,
+	'\xD0', '\xBA', '\x00', 0,
+	'\xD0', '\xBB', '\x00', 0,
+	'\xD0', '\xBC', '\x00', 0,
+	'\xD0', '\xBD', '\x00', 0,
+	'\xD0', '\xBE', '\x00', 0,
+	'\xD0', '\xBF', '\x00', 0,
+	'\xD1', '\x80', '\x00', 0,
+	'\xD1', '\x81', '\x00', 0,
+	'\xD1', '\x82', '\x00', 0,
+	'\xD1', '\x83', '\x00', 0,
+	'\xD1', '\x84', '\x00', 0,
+	'\xD1', '\x85', '\x00', 0,
+	'\xD1', '\x86', '\x00', 0,
+	'\xD1', '\x87', '\x00', 0,
+	'\xD1', '\x88', '\x00', 0,
+	'\xD1', '\x89', '\x00', 0,
+	'\xD1', '\x8A', '\x00', 0,
+	'\xD1', '\x8B', '\x00', 0,
+	'\xD1', '\x8C', '\x00', 0,
+	'\xD1', '\x8D', '\x00', 0,
+	'\xD1', '\x8E', '\x00', 0,
+	'\xD1', '\x8F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerD1[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD1', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerD2[64 * 4] = {
+	'\xD2', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerD3[64 * 4] = {
+	'\xD3', '\x8F', '\x00', 0,
+	'\xD3', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerD4[64 * 4] = {
+	'\xD4', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA5', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA7', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAD', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAF', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD5', '\xA1', '\x00', 0,
+	'\xD5', '\xA2', '\x00', 0,
+	'\xD5', '\xA3', '\x00', 0,
+	'\xD5', '\xA4', '\x00', 0,
+	'\xD5', '\xA5', '\x00', 0,
+	'\xD5', '\xA6', '\x00', 0,
+	'\xD5', '\xA7', '\x00', 0,
+	'\xD5', '\xA8', '\x00', 0,
+	'\xD5', '\xA9', '\x00', 0,
+	'\xD5', '\xAA', '\x00', 0,
+	'\xD5', '\xAB', '\x00', 0,
+	'\xD5', '\xAC', '\x00', 0,
+	'\xD5', '\xAD', '\x00', 0,
+	'\xD5', '\xAE', '\x00', 0,
+	'\xD5', '\xAF', '\x00', 0,
+};
+
+static const char s_StringToLowerD5[64 * 4] = {
+	'\xD5', '\xB0', '\x00', 0,
+	'\xD5', '\xB1', '\x00', 0,
+	'\xD5', '\xB2', '\x00', 0,
+	'\xD5', '\xB3', '\x00', 0,
+	'\xD5', '\xB4', '\x00', 0,
+	'\xD5', '\xB5', '\x00', 0,
+	'\xD5', '\xB6', '\x00', 0,
+	'\xD5', '\xB7', '\x00', 0,
+	'\xD5', '\xB8', '\x00', 0,
+	'\xD5', '\xB9', '\x00', 0,
+	'\xD5', '\xBA', '\x00', 0,
+	'\xD5', '\xBB', '\x00', 0,
+	'\xD5', '\xBC', '\x00', 0,
+	'\xD5', '\xBD', '\x00', 0,
+	'\xD5', '\xBE', '\x00', 0,
+	'\xD5', '\xBF', '\x00', 0,
+	'\xD6', '\x80', '\x00', 0,
+	'\xD6', '\x81', '\x00', 0,
+	'\xD6', '\x82', '\x00', 0,
+	'\xD6', '\x83', '\x00', 0,
+	'\xD6', '\x84', '\x00', 0,
+	'\xD6', '\x85', '\x00', 0,
+	'\xD6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE182[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB4', '\x80', 0,
+	'\xE2', '\xB4', '\x81', 0,
+	'\xE2', '\xB4', '\x82', 0,
+	'\xE2', '\xB4', '\x83', 0,
+	'\xE2', '\xB4', '\x84', 0,
+	'\xE2', '\xB4', '\x85', 0,
+	'\xE2', '\xB4', '\x86', 0,
+	'\xE2', '\xB4', '\x87', 0,
+	'\xE2', '\xB4', '\x88', 0,
+	'\xE2', '\xB4', '\x89', 0,
+	'\xE2', '\xB4', '\x8A', 0,
+	'\xE2', '\xB4', '\x8B', 0,
+	'\xE2', '\xB4', '\x8C', 0,
+	'\xE2', '\xB4', '\x8D', 0,
+	'\xE2', '\xB4', '\x8E', 0,
+	'\xE2', '\xB4', '\x8F', 0,
+	'\xE2', '\xB4', '\x90', 0,
+	'\xE2', '\xB4', '\x91', 0,
+	'\xE2', '\xB4', '\x92', 0,
+	'\xE2', '\xB4', '\x93', 0,
+	'\xE2', '\xB4', '\x94', 0,
+	'\xE2', '\xB4', '\x95', 0,
+	'\xE2', '\xB4', '\x96', 0,
+	'\xE2', '\xB4', '\x97', 0,
+	'\xE2', '\xB4', '\x98', 0,
+	'\xE2', '\xB4', '\x99', 0,
+	'\xE2', '\xB4', '\x9A', 0,
+	'\xE2', '\xB4', '\x9B', 0,
+	'\xE2', '\xB4', '\x9C', 0,
+	'\xE2', '\xB4', '\x9D', 0,
+	'\xE2', '\xB4', '\x9E', 0,
+	'\xE2', '\xB4', '\x9F', 0,
+};
+
+static const char s_StringToLowerE183[64 * 4] = {
+	'\xE2', '\xB4', '\xA0', 0,
+	'\xE2', '\xB4', '\xA1', 0,
+	'\xE2', '\xB4', '\xA2', 0,
+	'\xE2', '\xB4', '\xA3', 0,
+	'\xE2', '\xB4', '\xA4', 0,
+	'\xE2', '\xB4', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB4', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB4', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE18E[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\xAD', '\xB0', 0,
+	'\xEA', '\xAD', '\xB1', 0,
+	'\xEA', '\xAD', '\xB2', 0,
+	'\xEA', '\xAD', '\xB3', 0,
+	'\xEA', '\xAD', '\xB4', 0,
+	'\xEA', '\xAD', '\xB5', 0,
+	'\xEA', '\xAD', '\xB6', 0,
+	'\xEA', '\xAD', '\xB7', 0,
+	'\xEA', '\xAD', '\xB8', 0,
+	'\xEA', '\xAD', '\xB9', 0,
+	'\xEA', '\xAD', '\xBA', 0,
+	'\xEA', '\xAD', '\xBB', 0,
+	'\xEA', '\xAD', '\xBC', 0,
+	'\xEA', '\xAD', '\xBD', 0,
+	'\xEA', '\xAD', '\xBE', 0,
+	'\xEA', '\xAD', '\xBF', 0,
+	'\xEA', '\xAE', '\x80', 0,
+	'\xEA', '\xAE', '\x81', 0,
+	'\xEA', '\xAE', '\x82', 0,
+	'\xEA', '\xAE', '\x83', 0,
+	'\xEA', '\xAE', '\x84', 0,
+	'\xEA', '\xAE', '\x85', 0,
+	'\xEA', '\xAE', '\x86', 0,
+	'\xEA', '\xAE', '\x87', 0,
+	'\xEA', '\xAE', '\x88', 0,
+	'\xEA', '\xAE', '\x89', 0,
+	'\xEA', '\xAE', '\x8A', 0,
+	'\xEA', '\xAE', '\x8B', 0,
+	'\xEA', '\xAE', '\x8C', 0,
+	'\xEA', '\xAE', '\x8D', 0,
+	'\xEA', '\xAE', '\x8E', 0,
+	'\xEA', '\xAE', '\x8F', 0,
+};
+
+static const char s_StringToLowerE18F[64 * 4] = {
+	'\xEA', '\xAE', '\x90', 0,
+	'\xEA', '\xAE', '\x91', 0,
+	'\xEA', '\xAE', '\x92', 0,
+	'\xEA', '\xAE', '\x93', 0,
+	'\xEA', '\xAE', '\x94', 0,
+	'\xEA', '\xAE', '\x95', 0,
+	'\xEA', '\xAE', '\x96', 0,
+	'\xEA', '\xAE', '\x97', 0,
+	'\xEA', '\xAE', '\x98', 0,
+	'\xEA', '\xAE', '\x99', 0,
+	'\xEA', '\xAE', '\x9A', 0,
+	'\xEA', '\xAE', '\x9B', 0,
+	'\xEA', '\xAE', '\x9C', 0,
+	'\xEA', '\xAE', '\x9D', 0,
+	'\xEA', '\xAE', '\x9E', 0,
+	'\xEA', '\xAE', '\x9F', 0,
+	'\xEA', '\xAE', '\xA0', 0,
+	'\xEA', '\xAE', '\xA1', 0,
+	'\xEA', '\xAE', '\xA2', 0,
+	'\xEA', '\xAE', '\xA3', 0,
+	'\xEA', '\xAE', '\xA4', 0,
+	'\xEA', '\xAE', '\xA5', 0,
+	'\xEA', '\xAE', '\xA6', 0,
+	'\xEA', '\xAE', '\xA7', 0,
+	'\xEA', '\xAE', '\xA8', 0,
+	'\xEA', '\xAE', '\xA9', 0,
+	'\xEA', '\xAE', '\xAA', 0,
+	'\xEA', '\xAE', '\xAB', 0,
+	'\xEA', '\xAE', '\xAC', 0,
+	'\xEA', '\xAE', '\xAD', 0,
+	'\xEA', '\xAE', '\xAE', 0,
+	'\xEA', '\xAE', '\xAF', 0,
+	'\xEA', '\xAE', '\xB0', 0,
+	'\xEA', '\xAE', '\xB1', 0,
+	'\xEA', '\xAE', '\xB2', 0,
+	'\xEA', '\xAE', '\xB3', 0,
+	'\xEA', '\xAE', '\xB4', 0,
+	'\xEA', '\xAE', '\xB5', 0,
+	'\xEA', '\xAE', '\xB6', 0,
+	'\xEA', '\xAE', '\xB7', 0,
+	'\xEA', '\xAE', '\xB8', 0,
+	'\xEA', '\xAE', '\xB9', 0,
+	'\xEA', '\xAE', '\xBA', 0,
+	'\xEA', '\xAE', '\xBB', 0,
+	'\xEA', '\xAE', '\xBC', 0,
+	'\xEA', '\xAE', '\xBD', 0,
+	'\xEA', '\xAE', '\xBE', 0,
+	'\xEA', '\xAE', '\xBF', 0,
+	'\xE1', '\x8F', '\xB8', 0,
+	'\xE1', '\x8F', '\xB9', 0,
+	'\xE1', '\x8F', '\xBA', 0,
+	'\xE1', '\x8F', '\xBB', 0,
+	'\xE1', '\x8F', '\xBC', 0,
+	'\xE1', '\x8F', '\xBD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1B2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\x90', 0,
+	'\xE1', '\x83', '\x91', 0,
+	'\xE1', '\x83', '\x92', 0,
+	'\xE1', '\x83', '\x93', 0,
+	'\xE1', '\x83', '\x94', 0,
+	'\xE1', '\x83', '\x95', 0,
+	'\xE1', '\x83', '\x96', 0,
+	'\xE1', '\x83', '\x97', 0,
+	'\xE1', '\x83', '\x98', 0,
+	'\xE1', '\x83', '\x99', 0,
+	'\xE1', '\x83', '\x9A', 0,
+	'\xE1', '\x83', '\x9B', 0,
+	'\xE1', '\x83', '\x9C', 0,
+	'\xE1', '\x83', '\x9D', 0,
+	'\xE1', '\x83', '\x9E', 0,
+	'\xE1', '\x83', '\x9F', 0,
+	'\xE1', '\x83', '\xA0', 0,
+	'\xE1', '\x83', '\xA1', 0,
+	'\xE1', '\x83', '\xA2', 0,
+	'\xE1', '\x83', '\xA3', 0,
+	'\xE1', '\x83', '\xA4', 0,
+	'\xE1', '\x83', '\xA5', 0,
+	'\xE1', '\x83', '\xA6', 0,
+	'\xE1', '\x83', '\xA7', 0,
+	'\xE1', '\x83', '\xA8', 0,
+	'\xE1', '\x83', '\xA9', 0,
+	'\xE1', '\x83', '\xAA', 0,
+	'\xE1', '\x83', '\xAB', 0,
+	'\xE1', '\x83', '\xAC', 0,
+	'\xE1', '\x83', '\xAD', 0,
+	'\xE1', '\x83', '\xAE', 0,
+	'\xE1', '\x83', '\xAF', 0,
+	'\xE1', '\x83', '\xB0', 0,
+	'\xE1', '\x83', '\xB1', 0,
+	'\xE1', '\x83', '\xB2', 0,
+	'\xE1', '\x83', '\xB3', 0,
+	'\xE1', '\x83', '\xB4', 0,
+	'\xE1', '\x83', '\xB5', 0,
+	'\xE1', '\x83', '\xB6', 0,
+	'\xE1', '\x83', '\xB7', 0,
+	'\xE1', '\x83', '\xB8', 0,
+	'\xE1', '\x83', '\xB9', 0,
+	'\xE1', '\x83', '\xBA', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\xBD', 0,
+	'\xE1', '\x83', '\xBE', 0,
+	'\xE1', '\x83', '\xBF', 0,
+};
+
+static const char s_StringToLowerE1B8[64 * 4] = {
+	'\xE1', '\xB8', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1B9[64 * 4] = {
+	'\xE1', '\xB9', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1BA[64 * 4] = {
+	'\xE1', '\xBA', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x95', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC3', '\x9F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1BB[64 * 4] = {
+	'\xE1', '\xBB', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1BC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x80', 0,
+	'\xE1', '\xBC', '\x81', 0,
+	'\xE1', '\xBC', '\x82', 0,
+	'\xE1', '\xBC', '\x83', 0,
+	'\xE1', '\xBC', '\x84', 0,
+	'\xE1', '\xBC', '\x85', 0,
+	'\xE1', '\xBC', '\x86', 0,
+	'\xE1', '\xBC', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x90', 0,
+	'\xE1', '\xBC', '\x91', 0,
+	'\xE1', '\xBC', '\x92', 0,
+	'\xE1', '\xBC', '\x93', 0,
+	'\xE1', '\xBC', '\x94', 0,
+	'\xE1', '\xBC', '\x95', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA0', 0,
+	'\xE1', '\xBC', '\xA1', 0,
+	'\xE1', '\xBC', '\xA2', 0,
+	'\xE1', '\xBC', '\xA3', 0,
+	'\xE1', '\xBC', '\xA4', 0,
+	'\xE1', '\xBC', '\xA5', 0,
+	'\xE1', '\xBC', '\xA6', 0,
+	'\xE1', '\xBC', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB0', 0,
+	'\xE1', '\xBC', '\xB1', 0,
+	'\xE1', '\xBC', '\xB2', 0,
+	'\xE1', '\xBC', '\xB3', 0,
+	'\xE1', '\xBC', '\xB4', 0,
+	'\xE1', '\xBC', '\xB5', 0,
+	'\xE1', '\xBC', '\xB6', 0,
+	'\xE1', '\xBC', '\xB7', 0,
+};
+
+static const char s_StringToLowerE1BD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\x80', 0,
+	'\xE1', '\xBD', '\x81', 0,
+	'\xE1', '\xBD', '\x82', 0,
+	'\xE1', '\xBD', '\x83', 0,
+	'\xE1', '\xBD', '\x84', 0,
+	'\xE1', '\xBD', '\x85', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x97', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA0', 0,
+	'\xE1', '\xBD', '\xA1', 0,
+	'\xE1', '\xBD', '\xA2', 0,
+	'\xE1', '\xBD', '\xA3', 0,
+	'\xE1', '\xBD', '\xA4', 0,
+	'\xE1', '\xBD', '\xA5', 0,
+	'\xE1', '\xBD', '\xA6', 0,
+	'\xE1', '\xBD', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1BE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x80', 0,
+	'\xE1', '\xBE', '\x81', 0,
+	'\xE1', '\xBE', '\x82', 0,
+	'\xE1', '\xBE', '\x83', 0,
+	'\xE1', '\xBE', '\x84', 0,
+	'\xE1', '\xBE', '\x85', 0,
+	'\xE1', '\xBE', '\x86', 0,
+	'\xE1', '\xBE', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x90', 0,
+	'\xE1', '\xBE', '\x91', 0,
+	'\xE1', '\xBE', '\x92', 0,
+	'\xE1', '\xBE', '\x93', 0,
+	'\xE1', '\xBE', '\x94', 0,
+	'\xE1', '\xBE', '\x95', 0,
+	'\xE1', '\xBE', '\x96', 0,
+	'\xE1', '\xBE', '\x97', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xA0', 0,
+	'\xE1', '\xBE', '\xA1', 0,
+	'\xE1', '\xBE', '\xA2', 0,
+	'\xE1', '\xBE', '\xA3', 0,
+	'\xE1', '\xBE', '\xA4', 0,
+	'\xE1', '\xBE', '\xA5', 0,
+	'\xE1', '\xBE', '\xA6', 0,
+	'\xE1', '\xBE', '\xA7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xB0', 0,
+	'\xE1', '\xBE', '\xB1', 0,
+	'\xE1', '\xBD', '\xB0', 0,
+	'\xE1', '\xBD', '\xB1', 0,
+	'\xE1', '\xBE', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB2', 0,
+	'\xE1', '\xBD', '\xB3', 0,
+	'\xE1', '\xBD', '\xB4', 0,
+	'\xE1', '\xBD', '\xB5', 0,
+	'\xE1', '\xBF', '\x83', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x90', 0,
+	'\xE1', '\xBF', '\x91', 0,
+	'\xE1', '\xBD', '\xB6', 0,
+	'\xE1', '\xBD', '\xB7', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xA0', 0,
+	'\xE1', '\xBF', '\xA1', 0,
+	'\xE1', '\xBD', '\xBA', 0,
+	'\xE1', '\xBD', '\xBB', 0,
+	'\xE1', '\xBF', '\xA5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xB8', 0,
+	'\xE1', '\xBD', '\xB9', 0,
+	'\xE1', '\xBD', '\xBC', 0,
+	'\xE1', '\xBD', '\xBD', 0,
+	'\xE1', '\xBF', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE284[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\x6B', '\x00', '\x00', 0,
+	'\xC3', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\x8E', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xB0', 0,
+	'\xE2', '\x85', '\xB1', 0,
+	'\xE2', '\x85', '\xB2', 0,
+	'\xE2', '\x85', '\xB3', 0,
+	'\xE2', '\x85', '\xB4', 0,
+	'\xE2', '\x85', '\xB5', 0,
+	'\xE2', '\x85', '\xB6', 0,
+	'\xE2', '\x85', '\xB7', 0,
+	'\xE2', '\x85', '\xB8', 0,
+	'\xE2', '\x85', '\xB9', 0,
+	'\xE2', '\x85', '\xBA', 0,
+	'\xE2', '\x85', '\xBB', 0,
+	'\xE2', '\x85', '\xBC', 0,
+	'\xE2', '\x85', '\xBD', 0,
+	'\xE2', '\x85', '\xBE', 0,
+	'\xE2', '\x85', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE286[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x86', '\x84', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE292[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x93', '\x90', 0,
+	'\xE2', '\x93', '\x91', 0,
+	'\xE2', '\x93', '\x92', 0,
+	'\xE2', '\x93', '\x93', 0,
+	'\xE2', '\x93', '\x94', 0,
+	'\xE2', '\x93', '\x95', 0,
+	'\xE2', '\x93', '\x96', 0,
+	'\xE2', '\x93', '\x97', 0,
+	'\xE2', '\x93', '\x98', 0,
+	'\xE2', '\x93', '\x99', 0,
+};
+
+static const char s_StringToLowerE293[64 * 4] = {
+	'\xE2', '\x93', '\x9A', 0,
+	'\xE2', '\x93', '\x9B', 0,
+	'\xE2', '\x93', '\x9C', 0,
+	'\xE2', '\x93', '\x9D', 0,
+	'\xE2', '\x93', '\x9E', 0,
+	'\xE2', '\x93', '\x9F', 0,
+	'\xE2', '\x93', '\xA0', 0,
+	'\xE2', '\x93', '\xA1', 0,
+	'\xE2', '\x93', '\xA2', 0,
+	'\xE2', '\x93', '\xA3', 0,
+	'\xE2', '\x93', '\xA4', 0,
+	'\xE2', '\x93', '\xA5', 0,
+	'\xE2', '\x93', '\xA6', 0,
+	'\xE2', '\x93', '\xA7', 0,
+	'\xE2', '\x93', '\xA8', 0,
+	'\xE2', '\x93', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE2B0[64 * 4] = {
+	'\xE2', '\xB0', '\xB0', 0,
+	'\xE2', '\xB0', '\xB1', 0,
+	'\xE2', '\xB0', '\xB2', 0,
+	'\xE2', '\xB0', '\xB3', 0,
+	'\xE2', '\xB0', '\xB4', 0,
+	'\xE2', '\xB0', '\xB5', 0,
+	'\xE2', '\xB0', '\xB6', 0,
+	'\xE2', '\xB0', '\xB7', 0,
+	'\xE2', '\xB0', '\xB8', 0,
+	'\xE2', '\xB0', '\xB9', 0,
+	'\xE2', '\xB0', '\xBA', 0,
+	'\xE2', '\xB0', '\xBB', 0,
+	'\xE2', '\xB0', '\xBC', 0,
+	'\xE2', '\xB0', '\xBD', 0,
+	'\xE2', '\xB0', '\xBE', 0,
+	'\xE2', '\xB0', '\xBF', 0,
+	'\xE2', '\xB1', '\x80', 0,
+	'\xE2', '\xB1', '\x81', 0,
+	'\xE2', '\xB1', '\x82', 0,
+	'\xE2', '\xB1', '\x83', 0,
+	'\xE2', '\xB1', '\x84', 0,
+	'\xE2', '\xB1', '\x85', 0,
+	'\xE2', '\xB1', '\x86', 0,
+	'\xE2', '\xB1', '\x87', 0,
+	'\xE2', '\xB1', '\x88', 0,
+	'\xE2', '\xB1', '\x89', 0,
+	'\xE2', '\xB1', '\x8A', 0,
+	'\xE2', '\xB1', '\x8B', 0,
+	'\xE2', '\xB1', '\x8C', 0,
+	'\xE2', '\xB1', '\x8D', 0,
+	'\xE2', '\xB1', '\x8E', 0,
+	'\xE2', '\xB1', '\x8F', 0,
+	'\xE2', '\xB1', '\x90', 0,
+	'\xE2', '\xB1', '\x91', 0,
+	'\xE2', '\xB1', '\x92', 0,
+	'\xE2', '\xB1', '\x93', 0,
+	'\xE2', '\xB1', '\x94', 0,
+	'\xE2', '\xB1', '\x95', 0,
+	'\xE2', '\xB1', '\x96', 0,
+	'\xE2', '\xB1', '\x97', 0,
+	'\xE2', '\xB1', '\x98', 0,
+	'\xE2', '\xB1', '\x99', 0,
+	'\xE2', '\xB1', '\x9A', 0,
+	'\xE2', '\xB1', '\x9B', 0,
+	'\xE2', '\xB1', '\x9C', 0,
+	'\xE2', '\xB1', '\x9D', 0,
+	'\xE2', '\xB1', '\x9E', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE2B1[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xAB', '\x00', 0,
+	'\xE1', '\xB5', '\xBD', 0,
+	'\xC9', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x91', '\x00', 0,
+	'\xC9', '\xB1', '\x00', 0,
+	'\xC9', '\x90', '\x00', 0,
+	'\xC9', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB6', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBF', '\x00', 0,
+	'\xC9', '\x80', '\x00', 0,
+};
+
+static const char s_StringToLowerE2B2[64 * 4] = {
+	'\xE2', '\xB2', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAF', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerE2B3[64 * 4] = {
+	'\xE2', '\xB3', '\x81', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x83', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x87', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x89', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x91', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x93', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x95', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x97', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA99[64 * 4] = {
+	'\xEA', '\x99', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA9A[64 * 4] = {
+	'\xEA', '\x9A', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x9B', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA9C[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAF', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA9D[64 * 4] = {
+	'\xEA', '\x9D', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x89', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x93', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x95', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAF', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB5', '\xB9', 0,
+	'\xEA', '\x9D', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA9E[64 * 4] = {
+	'\xEA', '\x9E', '\x81', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x85', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x87', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA5', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x91', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x97', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x99', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9F', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA1', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA3', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xC9', '\xA6', '\x00', 0,
+	'\xC9', '\x9C', '\x00', 0,
+	'\xC9', '\xA1', '\x00', 0,
+	'\xC9', '\xAC', '\x00', 0,
+	'\xC9', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCA', '\x9E', '\x00', 0,
+	'\xCA', '\x87', '\x00', 0,
+	'\xCA', '\x9D', '\x00', 0,
+	'\xEA', '\xAD', '\x93', 0,
+	'\xEA', '\x9E', '\xB5', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB7', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBB', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBD', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBF', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEA9F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x83', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x94', 0,
+	'\xCA', '\x82', '\x00', 0,
+	'\xE1', '\xB6', '\x8E', 0,
+	'\xEA', '\x9F', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x8A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\xB6', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerEFBC[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEF', '\xBD', '\x81', 0,
+	'\xEF', '\xBD', '\x82', 0,
+	'\xEF', '\xBD', '\x83', 0,
+	'\xEF', '\xBD', '\x84', 0,
+	'\xEF', '\xBD', '\x85', 0,
+	'\xEF', '\xBD', '\x86', 0,
+	'\xEF', '\xBD', '\x87', 0,
+	'\xEF', '\xBD', '\x88', 0,
+	'\xEF', '\xBD', '\x89', 0,
+	'\xEF', '\xBD', '\x8A', 0,
+	'\xEF', '\xBD', '\x8B', 0,
+	'\xEF', '\xBD', '\x8C', 0,
+	'\xEF', '\xBD', '\x8D', 0,
+	'\xEF', '\xBD', '\x8E', 0,
+	'\xEF', '\xBD', '\x8F', 0,
+	'\xEF', '\xBD', '\x90', 0,
+	'\xEF', '\xBD', '\x91', 0,
+	'\xEF', '\xBD', '\x92', 0,
+	'\xEF', '\xBD', '\x93', 0,
+	'\xEF', '\xBD', '\x94', 0,
+	'\xEF', '\xBD', '\x95', 0,
+	'\xEF', '\xBD', '\x96', 0,
+	'\xEF', '\xBD', '\x97', 0,
+	'\xEF', '\xBD', '\x98', 0,
+	'\xEF', '\xBD', '\x99', 0,
+	'\xEF', '\xBD', '\x9A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerF09090[64 * 4] = {
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	'\xF0', '\x90', '\x91', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerF09092[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+};
+
+static const char s_StringToLowerF09093[64 * 4] = {
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerF090B2[64 * 4] = {
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	'\xF0', '\x90', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerF091A2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+	'\xF0', '\x91', '\xA3', 0,
+};
+
+static const char s_StringToLowerF096B9[64 * 4] = {
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToLowerF09EA4[64 * 4] = {
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	'\xF0', '\x9E', '\xA5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMap[32] = {
+	0, 0, 0,
+	s_StringToLowerC3,
+	s_StringToLowerC4,
+	s_StringToLowerC5,
+	s_StringToLowerC6,
+	s_StringToLowerC7,
+	s_StringToLowerC8,
+	s_StringToLowerC9,
+	0, 0, 0,
+	s_StringToLowerCD,
+	s_StringToLowerCE,
+	s_StringToLowerCF,
+	s_StringToLowerD0,
+	s_StringToLowerD1,
+	s_StringToLowerD2,
+	s_StringToLowerD3,
+	s_StringToLowerD4,
+	s_StringToLowerD5,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapE1[64] = {
+	0, 0,
+	s_StringToLowerE182,
+	s_StringToLowerE183,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerE18E,
+	s_StringToLowerE18F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerE1B2,
+	0, 0, 0, 0, 0,
+	s_StringToLowerE1B8,
+	s_StringToLowerE1B9,
+	s_StringToLowerE1BA,
+	s_StringToLowerE1BB,
+	s_StringToLowerE1BC,
+	s_StringToLowerE1BD,
+	s_StringToLowerE1BE,
+	s_StringToLowerE1BF,
+};
+
+static const char *s_StringToLowerMapE2[64] = {
+	0, 0, 0, 0,
+	s_StringToLowerE284,
+	s_StringToLowerE285,
+	s_StringToLowerE286,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerE292,
+	s_StringToLowerE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerE2B0,
+	s_StringToLowerE2B1,
+	s_StringToLowerE2B2,
+	s_StringToLowerE2B3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapEA[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerEA99,
+	s_StringToLowerEA9A,
+	0,
+	s_StringToLowerEA9C,
+	s_StringToLowerEA9D,
+	s_StringToLowerEA9E,
+	s_StringToLowerEA9F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerEFBC,
+	0, 0, 0,
+};
+
+static const char **s_StringToLowerMapMap[16] = {
+	0,
+	s_StringToLowerMapE1,
+	s_StringToLowerMapE2,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerMapEA,
+	0, 0, 0, 0,
+	s_StringToLowerMapEF,
+};
+
+static const char *s_StringToLowerMapF090[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerF09090,
+	0,
+	s_StringToLowerF09092,
+	s_StringToLowerF09093,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerF090B2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapF091[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerF091A2,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapF096[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerF096B9,
+	0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToLowerMapF09E[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerF09EA4,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char **s_StringToLowerMapMapF0[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerMapF090,
+	s_StringToLowerMapF091,
+	0, 0, 0, 0,
+	s_StringToLowerMapF096,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToLowerMapF09E,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char ***s_StringToLowerMapMapMap[8] = {
+	s_StringToLowerMapMapF0,
+	0, 0, 0, 0, 0, 0, 0,
+};
+
+// ***************************************************************************
+
+NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	unsigned char c = str[i];
+	unsigned char d, e, f;
+	if (c < 0x80)
+	{
+		if (c >= 'A' && c <= 'Z')
+		{
+			// 1-byte UTF-8
+			c += 'a' - 'A';
+		}
+	}
+	else if (c < 0xC0)
+	{
+		// non-starting byte
+	}
+	else if (c < 0xE0)
+	{
+		// 2-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80)
+		{
+			const char *table = s_StringToLowerMap[c & 0x1F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	else if (c < 0xF0)
+	{
+		// 3-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+		{
+			const char **map = s_StringToLowerMapMap[c & 0x0F];
+			if (map)
+			{
+				const char *table = map[d & 0x3F];
+				if (table)
+				{
+					unsigned char idx = (e & 0x3F) << 2;
+					if (table[idx])
+					{
+						res += &table[idx];
+						i += 3;
+						return;
+					}
+				}
+			}
+		}
+	}
+	else if (c < 0xF8)
+	{
+		// 4-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80 && ((f = str[i + 3]) & 0xC0) == 0x80)
+		{
+			const char ***mapMap = s_StringToLowerMapMapMap[c & 0x07];
+			if (mapMap)
+			{
+				const char **map = mapMap[d & 0x3F];
+				if (map)
+				{
+					const char *table = map[e & 0x3F];
+					if (table)
+					{
+						unsigned char idx = (f & 0x3F) << 2;
+						if (table[idx])
+						{
+							res += &table[idx];
+							i += 4;
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+	res += c;
+	++i;
+}
+
+// ***************************************************************************
+
+std::string toLower(const char *str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	for (ptrdiff_t i = 0; str[i];)
+		appendToLowerAsUtf8(res, str, i);
+	return res;
+}
+
+// ***************************************************************************
+
+std::string	toLower(const std::string &str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	res.reserve(str.size() + (str.size() >> 2));
+	const char *cstr = &str[0];
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
+		appendToLowerAsUtf8(res, cstr, i);
+	return res;
+}
+
+// ***************************************************************************
+
+void appendToLower(std::string &res, const char *str, ptrdiff_t &i)
+{
+	appendToLowerAsUtf8(res, str, i);
+}
+
+// ***************************************************************************
+
+void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i)
+{
+	appendToLowerAsUtf8(res, &str[0], i);
+}
+
+} // NLMISC
diff --git a/nel/src/misc/string_to_title.cpp b/nel/src/misc/string_to_title.cpp
new file mode 100644
index 000000000..97ed35ffc
--- /dev/null
+++ b/nel/src/misc/string_to_title.cpp
@@ -0,0 +1,2587 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+namespace NLMISC {
+
+static const char s_StringToTitleC2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleC3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC3', '\x80', '\x00', 0,
+	'\xC3', '\x81', '\x00', 0,
+	'\xC3', '\x82', '\x00', 0,
+	'\xC3', '\x83', '\x00', 0,
+	'\xC3', '\x84', '\x00', 0,
+	'\xC3', '\x85', '\x00', 0,
+	'\xC3', '\x86', '\x00', 0,
+	'\xC3', '\x87', '\x00', 0,
+	'\xC3', '\x88', '\x00', 0,
+	'\xC3', '\x89', '\x00', 0,
+	'\xC3', '\x8A', '\x00', 0,
+	'\xC3', '\x8B', '\x00', 0,
+	'\xC3', '\x8C', '\x00', 0,
+	'\xC3', '\x8D', '\x00', 0,
+	'\xC3', '\x8E', '\x00', 0,
+	'\xC3', '\x8F', '\x00', 0,
+	'\xC3', '\x90', '\x00', 0,
+	'\xC3', '\x91', '\x00', 0,
+	'\xC3', '\x92', '\x00', 0,
+	'\xC3', '\x93', '\x00', 0,
+	'\xC3', '\x94', '\x00', 0,
+	'\xC3', '\x95', '\x00', 0,
+	'\xC3', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\x98', '\x00', 0,
+	'\xC3', '\x99', '\x00', 0,
+	'\xC3', '\x9A', '\x00', 0,
+	'\xC3', '\x9B', '\x00', 0,
+	'\xC3', '\x9C', '\x00', 0,
+	'\xC3', '\x9D', '\x00', 0,
+	'\xC3', '\x9E', '\x00', 0,
+	'\xC5', '\xB8', '\x00', 0,
+};
+
+static const char s_StringToTitleC4[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC4', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC4', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToTitleC5[64 * 4] = {
+	'\xC4', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x87', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBD', '\x00', 0,
+	'\x53', '\x00', '\x00', 0,
+};
+
+static const char s_StringToTitleC6[64 * 4] = {
+	'\xC9', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x84', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x87', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x8B', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x91', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\x98', '\x00', 0,
+	'\xC8', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xA7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAC', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAF', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB7', '\x00', 0,
+};
+
+static const char s_StringToTitleC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x85', '\x00', 0,
+	'\xC7', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x88', '\x00', 0,
+	'\xC7', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9B', '\x00', 0,
+	'\xC6', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToTitleC8[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC8', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB2', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBB', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xBE', 0,
+};
+
+static const char s_StringToTitleC9[64 * 4] = {
+	'\xE2', '\xB1', '\xBF', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC9', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8E', '\x00', 0,
+	'\xE2', '\xB1', '\xAF', 0,
+	'\xE2', '\xB1', '\xAD', 0,
+	'\xE2', '\xB1', '\xB0', 0,
+	'\xC6', '\x81', '\x00', 0,
+	'\xC6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x89', '\x00', 0,
+	'\xC6', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x90', '\x00', 0,
+	'\xEA', '\x9E', '\xAB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x93', '\x00', 0,
+	'\xEA', '\x9E', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8D', 0,
+	'\xEA', '\x9E', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x97', '\x00', 0,
+	'\xC6', '\x96', '\x00', 0,
+	'\xEA', '\x9E', '\xAE', 0,
+	'\xE2', '\xB1', '\xA2', 0,
+	'\xEA', '\x9E', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAE', 0,
+	'\xC6', '\x9D', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x9F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA4', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleCA[64 * 4] = {
+	'\xC6', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x85', 0,
+	'\xC6', '\xA9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB1', 0,
+	'\xC6', '\xAE', '\x00', 0,
+	'\xC9', '\x84', '\x00', 0,
+	'\xC6', '\xB1', '\x00', 0,
+	'\xC6', '\xB2', '\x00', 0,
+	'\xC9', '\x85', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB2', 0,
+	'\xEA', '\x9E', '\xB0', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleCD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x99', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB2', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xBD', '\x00', 0,
+	'\xCF', '\xBE', '\x00', 0,
+	'\xCF', '\xBF', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x86', '\x00', 0,
+	'\xCE', '\x88', '\x00', 0,
+	'\xCE', '\x89', '\x00', 0,
+	'\xCE', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x91', '\x00', 0,
+	'\xCE', '\x92', '\x00', 0,
+	'\xCE', '\x93', '\x00', 0,
+	'\xCE', '\x94', '\x00', 0,
+	'\xCE', '\x95', '\x00', 0,
+	'\xCE', '\x96', '\x00', 0,
+	'\xCE', '\x97', '\x00', 0,
+	'\xCE', '\x98', '\x00', 0,
+	'\xCE', '\x99', '\x00', 0,
+	'\xCE', '\x9A', '\x00', 0,
+	'\xCE', '\x9B', '\x00', 0,
+	'\xCE', '\x9C', '\x00', 0,
+	'\xCE', '\x9D', '\x00', 0,
+	'\xCE', '\x9E', '\x00', 0,
+	'\xCE', '\x9F', '\x00', 0,
+};
+
+static const char s_StringToTitleCF[64 * 4] = {
+	'\xCE', '\xA0', '\x00', 0,
+	'\xCE', '\xA1', '\x00', 0,
+	'\xCE', '\xA3', '\x00', 0,
+	'\xCE', '\xA3', '\x00', 0,
+	'\xCE', '\xA4', '\x00', 0,
+	'\xCE', '\xA5', '\x00', 0,
+	'\xCE', '\xA6', '\x00', 0,
+	'\xCE', '\xA7', '\x00', 0,
+	'\xCE', '\xA8', '\x00', 0,
+	'\xCE', '\xA9', '\x00', 0,
+	'\xCE', '\xAA', '\x00', 0,
+	'\xCE', '\xAB', '\x00', 0,
+	'\xCE', '\x8C', '\x00', 0,
+	'\xCE', '\x8E', '\x00', 0,
+	'\xCE', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x92', '\x00', 0,
+	'\xCE', '\x98', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xA6', '\x00', 0,
+	'\xCE', '\xA0', '\x00', 0,
+	'\xCF', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAE', '\x00', 0,
+	'\xCE', '\x9A', '\x00', 0,
+	'\xCE', '\xA1', '\x00', 0,
+	'\xCF', '\xB9', '\x00', 0,
+	'\xCD', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x95', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xBA', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleD0[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD0', '\x90', '\x00', 0,
+	'\xD0', '\x91', '\x00', 0,
+	'\xD0', '\x92', '\x00', 0,
+	'\xD0', '\x93', '\x00', 0,
+	'\xD0', '\x94', '\x00', 0,
+	'\xD0', '\x95', '\x00', 0,
+	'\xD0', '\x96', '\x00', 0,
+	'\xD0', '\x97', '\x00', 0,
+	'\xD0', '\x98', '\x00', 0,
+	'\xD0', '\x99', '\x00', 0,
+	'\xD0', '\x9A', '\x00', 0,
+	'\xD0', '\x9B', '\x00', 0,
+	'\xD0', '\x9C', '\x00', 0,
+	'\xD0', '\x9D', '\x00', 0,
+	'\xD0', '\x9E', '\x00', 0,
+	'\xD0', '\x9F', '\x00', 0,
+};
+
+static const char s_StringToTitleD1[64 * 4] = {
+	'\xD0', '\xA0', '\x00', 0,
+	'\xD0', '\xA1', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xA3', '\x00', 0,
+	'\xD0', '\xA4', '\x00', 0,
+	'\xD0', '\xA5', '\x00', 0,
+	'\xD0', '\xA6', '\x00', 0,
+	'\xD0', '\xA7', '\x00', 0,
+	'\xD0', '\xA8', '\x00', 0,
+	'\xD0', '\xA9', '\x00', 0,
+	'\xD0', '\xAA', '\x00', 0,
+	'\xD0', '\xAB', '\x00', 0,
+	'\xD0', '\xAC', '\x00', 0,
+	'\xD0', '\xAD', '\x00', 0,
+	'\xD0', '\xAE', '\x00', 0,
+	'\xD0', '\xAF', '\x00', 0,
+	'\xD0', '\x80', '\x00', 0,
+	'\xD0', '\x81', '\x00', 0,
+	'\xD0', '\x82', '\x00', 0,
+	'\xD0', '\x83', '\x00', 0,
+	'\xD0', '\x84', '\x00', 0,
+	'\xD0', '\x85', '\x00', 0,
+	'\xD0', '\x86', '\x00', 0,
+	'\xD0', '\x87', '\x00', 0,
+	'\xD0', '\x88', '\x00', 0,
+	'\xD0', '\x89', '\x00', 0,
+	'\xD0', '\x8A', '\x00', 0,
+	'\xD0', '\x8B', '\x00', 0,
+	'\xD0', '\x8C', '\x00', 0,
+	'\xD0', '\x8D', '\x00', 0,
+	'\xD0', '\x8E', '\x00', 0,
+	'\xD0', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToTitleD2[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD2', '\x80', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToTitleD3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8D', '\x00', 0,
+	'\xD3', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToTitleD4[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD4', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleD5[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD4', '\xB1', '\x00', 0,
+	'\xD4', '\xB2', '\x00', 0,
+	'\xD4', '\xB3', '\x00', 0,
+	'\xD4', '\xB4', '\x00', 0,
+	'\xD4', '\xB5', '\x00', 0,
+	'\xD4', '\xB6', '\x00', 0,
+	'\xD4', '\xB7', '\x00', 0,
+	'\xD4', '\xB8', '\x00', 0,
+	'\xD4', '\xB9', '\x00', 0,
+	'\xD4', '\xBA', '\x00', 0,
+	'\xD4', '\xBB', '\x00', 0,
+	'\xD4', '\xBC', '\x00', 0,
+	'\xD4', '\xBD', '\x00', 0,
+	'\xD4', '\xBE', '\x00', 0,
+	'\xD4', '\xBF', '\x00', 0,
+	'\xD5', '\x80', '\x00', 0,
+	'\xD5', '\x81', '\x00', 0,
+	'\xD5', '\x82', '\x00', 0,
+	'\xD5', '\x83', '\x00', 0,
+	'\xD5', '\x84', '\x00', 0,
+	'\xD5', '\x85', '\x00', 0,
+	'\xD5', '\x86', '\x00', 0,
+	'\xD5', '\x87', '\x00', 0,
+	'\xD5', '\x88', '\x00', 0,
+	'\xD5', '\x89', '\x00', 0,
+	'\xD5', '\x8A', '\x00', 0,
+	'\xD5', '\x8B', '\x00', 0,
+	'\xD5', '\x8C', '\x00', 0,
+	'\xD5', '\x8D', '\x00', 0,
+	'\xD5', '\x8E', '\x00', 0,
+	'\xD5', '\x8F', '\x00', 0,
+};
+
+static const char s_StringToTitleD6[64 * 4] = {
+	'\xD5', '\x90', '\x00', 0,
+	'\xD5', '\x91', '\x00', 0,
+	'\xD5', '\x92', '\x00', 0,
+	'\xD5', '\x93', '\x00', 0,
+	'\xD5', '\x94', '\x00', 0,
+	'\xD5', '\x95', '\x00', 0,
+	'\xD5', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE18F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x8F', '\xB0', 0,
+	'\xE1', '\x8F', '\xB1', 0,
+	'\xE1', '\x8F', '\xB2', 0,
+	'\xE1', '\x8F', '\xB3', 0,
+	'\xE1', '\x8F', '\xB4', 0,
+	'\xE1', '\x8F', '\xB5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1B2[64 * 4] = {
+	'\xD0', '\x92', '\x00', 0,
+	'\xD0', '\x94', '\x00', 0,
+	'\xD0', '\x9E', '\x00', 0,
+	'\xD0', '\xA1', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xAA', '\x00', 0,
+	'\xD1', '\xA2', '\x00', 0,
+	'\xEA', '\x99', '\x8A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1B5[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1B6[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x86', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1B8[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBE', 0,
+};
+
+static const char s_StringToTitleE1B9[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBE', 0,
+};
+
+static const char s_StringToTitleE1BA[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x94', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA0', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBE', 0,
+};
+
+static const char s_StringToTitleE1BB[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBE', 0,
+};
+
+static const char s_StringToTitleE1BC[64 * 4] = {
+	'\xE1', '\xBC', '\x88', 0,
+	'\xE1', '\xBC', '\x89', 0,
+	'\xE1', '\xBC', '\x8A', 0,
+	'\xE1', '\xBC', '\x8B', 0,
+	'\xE1', '\xBC', '\x8C', 0,
+	'\xE1', '\xBC', '\x8D', 0,
+	'\xE1', '\xBC', '\x8E', 0,
+	'\xE1', '\xBC', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x98', 0,
+	'\xE1', '\xBC', '\x99', 0,
+	'\xE1', '\xBC', '\x9A', 0,
+	'\xE1', '\xBC', '\x9B', 0,
+	'\xE1', '\xBC', '\x9C', 0,
+	'\xE1', '\xBC', '\x9D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA8', 0,
+	'\xE1', '\xBC', '\xA9', 0,
+	'\xE1', '\xBC', '\xAA', 0,
+	'\xE1', '\xBC', '\xAB', 0,
+	'\xE1', '\xBC', '\xAC', 0,
+	'\xE1', '\xBC', '\xAD', 0,
+	'\xE1', '\xBC', '\xAE', 0,
+	'\xE1', '\xBC', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB8', 0,
+	'\xE1', '\xBC', '\xB9', 0,
+	'\xE1', '\xBC', '\xBA', 0,
+	'\xE1', '\xBC', '\xBB', 0,
+	'\xE1', '\xBC', '\xBC', 0,
+	'\xE1', '\xBC', '\xBD', 0,
+	'\xE1', '\xBC', '\xBE', 0,
+	'\xE1', '\xBC', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1BD[64 * 4] = {
+	'\xE1', '\xBD', '\x88', 0,
+	'\xE1', '\xBD', '\x89', 0,
+	'\xE1', '\xBD', '\x8A', 0,
+	'\xE1', '\xBD', '\x8B', 0,
+	'\xE1', '\xBD', '\x8C', 0,
+	'\xE1', '\xBD', '\x8D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA8', 0,
+	'\xE1', '\xBD', '\xA9', 0,
+	'\xE1', '\xBD', '\xAA', 0,
+	'\xE1', '\xBD', '\xAB', 0,
+	'\xE1', '\xBD', '\xAC', 0,
+	'\xE1', '\xBD', '\xAD', 0,
+	'\xE1', '\xBD', '\xAE', 0,
+	'\xE1', '\xBD', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBA', 0,
+	'\xE1', '\xBE', '\xBB', 0,
+	'\xE1', '\xBF', '\x88', 0,
+	'\xE1', '\xBF', '\x89', 0,
+	'\xE1', '\xBF', '\x8A', 0,
+	'\xE1', '\xBF', '\x8B', 0,
+	'\xE1', '\xBF', '\x9A', 0,
+	'\xE1', '\xBF', '\x9B', 0,
+	'\xE1', '\xBF', '\xB8', 0,
+	'\xE1', '\xBF', '\xB9', 0,
+	'\xE1', '\xBF', '\xAA', 0,
+	'\xE1', '\xBF', '\xAB', 0,
+	'\xE1', '\xBF', '\xBA', 0,
+	'\xE1', '\xBF', '\xBB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1BE[64 * 4] = {
+	'\xE1', '\xBE', '\x88', 0,
+	'\xE1', '\xBE', '\x89', 0,
+	'\xE1', '\xBE', '\x8A', 0,
+	'\xE1', '\xBE', '\x8B', 0,
+	'\xE1', '\xBE', '\x8C', 0,
+	'\xE1', '\xBE', '\x8D', 0,
+	'\xE1', '\xBE', '\x8E', 0,
+	'\xE1', '\xBE', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x98', 0,
+	'\xE1', '\xBE', '\x99', 0,
+	'\xE1', '\xBE', '\x9A', 0,
+	'\xE1', '\xBE', '\x9B', 0,
+	'\xE1', '\xBE', '\x9C', 0,
+	'\xE1', '\xBE', '\x9D', 0,
+	'\xE1', '\xBE', '\x9E', 0,
+	'\xE1', '\xBE', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xA8', 0,
+	'\xE1', '\xBE', '\xA9', 0,
+	'\xE1', '\xBE', '\xAA', 0,
+	'\xE1', '\xBE', '\xAB', 0,
+	'\xE1', '\xBE', '\xAC', 0,
+	'\xE1', '\xBE', '\xAD', 0,
+	'\xE1', '\xBE', '\xAE', 0,
+	'\xE1', '\xBE', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xB8', 0,
+	'\xE1', '\xBE', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x8C', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x98', 0,
+	'\xE1', '\xBF', '\x99', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xA8', 0,
+	'\xE1', '\xBF', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xAC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x84', '\xB2', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xA0', 0,
+	'\xE2', '\x85', '\xA1', 0,
+	'\xE2', '\x85', '\xA2', 0,
+	'\xE2', '\x85', '\xA3', 0,
+	'\xE2', '\x85', '\xA4', 0,
+	'\xE2', '\x85', '\xA5', 0,
+	'\xE2', '\x85', '\xA6', 0,
+	'\xE2', '\x85', '\xA7', 0,
+	'\xE2', '\x85', '\xA8', 0,
+	'\xE2', '\x85', '\xA9', 0,
+	'\xE2', '\x85', '\xAA', 0,
+	'\xE2', '\x85', '\xAB', 0,
+	'\xE2', '\x85', '\xAC', 0,
+	'\xE2', '\x85', '\xAD', 0,
+	'\xE2', '\x85', '\xAE', 0,
+	'\xE2', '\x85', '\xAF', 0,
+};
+
+static const char s_StringToTitleE286[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x86', '\x83', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE293[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x92', '\xB6', 0,
+	'\xE2', '\x92', '\xB7', 0,
+	'\xE2', '\x92', '\xB8', 0,
+	'\xE2', '\x92', '\xB9', 0,
+	'\xE2', '\x92', '\xBA', 0,
+	'\xE2', '\x92', '\xBB', 0,
+	'\xE2', '\x92', '\xBC', 0,
+	'\xE2', '\x92', '\xBD', 0,
+	'\xE2', '\x92', '\xBE', 0,
+	'\xE2', '\x92', '\xBF', 0,
+	'\xE2', '\x93', '\x80', 0,
+	'\xE2', '\x93', '\x81', 0,
+	'\xE2', '\x93', '\x82', 0,
+	'\xE2', '\x93', '\x83', 0,
+	'\xE2', '\x93', '\x84', 0,
+	'\xE2', '\x93', '\x85', 0,
+	'\xE2', '\x93', '\x86', 0,
+	'\xE2', '\x93', '\x87', 0,
+	'\xE2', '\x93', '\x88', 0,
+	'\xE2', '\x93', '\x89', 0,
+	'\xE2', '\x93', '\x8A', 0,
+	'\xE2', '\x93', '\x8B', 0,
+	'\xE2', '\x93', '\x8C', 0,
+	'\xE2', '\x93', '\x8D', 0,
+	'\xE2', '\x93', '\x8E', 0,
+	'\xE2', '\x93', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE2B0[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB0', '\x80', 0,
+	'\xE2', '\xB0', '\x81', 0,
+	'\xE2', '\xB0', '\x82', 0,
+	'\xE2', '\xB0', '\x83', 0,
+	'\xE2', '\xB0', '\x84', 0,
+	'\xE2', '\xB0', '\x85', 0,
+	'\xE2', '\xB0', '\x86', 0,
+	'\xE2', '\xB0', '\x87', 0,
+	'\xE2', '\xB0', '\x88', 0,
+	'\xE2', '\xB0', '\x89', 0,
+	'\xE2', '\xB0', '\x8A', 0,
+	'\xE2', '\xB0', '\x8B', 0,
+	'\xE2', '\xB0', '\x8C', 0,
+	'\xE2', '\xB0', '\x8D', 0,
+	'\xE2', '\xB0', '\x8E', 0,
+	'\xE2', '\xB0', '\x8F', 0,
+};
+
+static const char s_StringToTitleE2B1[64 * 4] = {
+	'\xE2', '\xB0', '\x90', 0,
+	'\xE2', '\xB0', '\x91', 0,
+	'\xE2', '\xB0', '\x92', 0,
+	'\xE2', '\xB0', '\x93', 0,
+	'\xE2', '\xB0', '\x94', 0,
+	'\xE2', '\xB0', '\x95', 0,
+	'\xE2', '\xB0', '\x96', 0,
+	'\xE2', '\xB0', '\x97', 0,
+	'\xE2', '\xB0', '\x98', 0,
+	'\xE2', '\xB0', '\x99', 0,
+	'\xE2', '\xB0', '\x9A', 0,
+	'\xE2', '\xB0', '\x9B', 0,
+	'\xE2', '\xB0', '\x9C', 0,
+	'\xE2', '\xB0', '\x9D', 0,
+	'\xE2', '\xB0', '\x9E', 0,
+	'\xE2', '\xB0', '\x9F', 0,
+	'\xE2', '\xB0', '\xA0', 0,
+	'\xE2', '\xB0', '\xA1', 0,
+	'\xE2', '\xB0', '\xA2', 0,
+	'\xE2', '\xB0', '\xA3', 0,
+	'\xE2', '\xB0', '\xA4', 0,
+	'\xE2', '\xB0', '\xA5', 0,
+	'\xE2', '\xB0', '\xA6', 0,
+	'\xE2', '\xB0', '\xA7', 0,
+	'\xE2', '\xB0', '\xA8', 0,
+	'\xE2', '\xB0', '\xA9', 0,
+	'\xE2', '\xB0', '\xAA', 0,
+	'\xE2', '\xB0', '\xAB', 0,
+	'\xE2', '\xB0', '\xAC', 0,
+	'\xE2', '\xB0', '\xAD', 0,
+	'\xE2', '\xB0', '\xAE', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA0', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBA', '\x00', 0,
+	'\xC8', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB5', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE2B2[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBE', 0,
+};
+
+static const char s_StringToTitleE2B3[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAD', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleE2B4[64 * 4] = {
+	'\xE1', '\x82', '\xA0', 0,
+	'\xE1', '\x82', '\xA1', 0,
+	'\xE1', '\x82', '\xA2', 0,
+	'\xE1', '\x82', '\xA3', 0,
+	'\xE1', '\x82', '\xA4', 0,
+	'\xE1', '\x82', '\xA5', 0,
+	'\xE1', '\x82', '\xA6', 0,
+	'\xE1', '\x82', '\xA7', 0,
+	'\xE1', '\x82', '\xA8', 0,
+	'\xE1', '\x82', '\xA9', 0,
+	'\xE1', '\x82', '\xAA', 0,
+	'\xE1', '\x82', '\xAB', 0,
+	'\xE1', '\x82', '\xAC', 0,
+	'\xE1', '\x82', '\xAD', 0,
+	'\xE1', '\x82', '\xAE', 0,
+	'\xE1', '\x82', '\xAF', 0,
+	'\xE1', '\x82', '\xB0', 0,
+	'\xE1', '\x82', '\xB1', 0,
+	'\xE1', '\x82', '\xB2', 0,
+	'\xE1', '\x82', '\xB3', 0,
+	'\xE1', '\x82', '\xB4', 0,
+	'\xE1', '\x82', '\xB5', 0,
+	'\xE1', '\x82', '\xB6', 0,
+	'\xE1', '\x82', '\xB7', 0,
+	'\xE1', '\x82', '\xB8', 0,
+	'\xE1', '\x82', '\xB9', 0,
+	'\xE1', '\x82', '\xBA', 0,
+	'\xE1', '\x82', '\xBB', 0,
+	'\xE1', '\x82', '\xBC', 0,
+	'\xE1', '\x82', '\xBD', 0,
+	'\xE1', '\x82', '\xBE', 0,
+	'\xE1', '\x82', '\xBF', 0,
+	'\xE1', '\x83', '\x80', 0,
+	'\xE1', '\x83', '\x81', 0,
+	'\xE1', '\x83', '\x82', 0,
+	'\xE1', '\x83', '\x83', 0,
+	'\xE1', '\x83', '\x84', 0,
+	'\xE1', '\x83', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\x83', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\x8D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleEA99[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleEA9A[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x9A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleEA9C[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBE', 0,
+};
+
+static const char s_StringToTitleEA9D[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9D', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBE', 0,
+};
+
+static const char s_StringToTitleEA9E[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x86', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8B', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x92', 0,
+	'\xEA', '\x9F', '\x84', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA8', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBE', 0,
+};
+
+static const char s_StringToTitleEA9F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x82', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x89', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\xB5', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleEAAD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x8E', '\xA0', 0,
+	'\xE1', '\x8E', '\xA1', 0,
+	'\xE1', '\x8E', '\xA2', 0,
+	'\xE1', '\x8E', '\xA3', 0,
+	'\xE1', '\x8E', '\xA4', 0,
+	'\xE1', '\x8E', '\xA5', 0,
+	'\xE1', '\x8E', '\xA6', 0,
+	'\xE1', '\x8E', '\xA7', 0,
+	'\xE1', '\x8E', '\xA8', 0,
+	'\xE1', '\x8E', '\xA9', 0,
+	'\xE1', '\x8E', '\xAA', 0,
+	'\xE1', '\x8E', '\xAB', 0,
+	'\xE1', '\x8E', '\xAC', 0,
+	'\xE1', '\x8E', '\xAD', 0,
+	'\xE1', '\x8E', '\xAE', 0,
+	'\xE1', '\x8E', '\xAF', 0,
+};
+
+static const char s_StringToTitleEAAE[64 * 4] = {
+	'\xE1', '\x8E', '\xB0', 0,
+	'\xE1', '\x8E', '\xB1', 0,
+	'\xE1', '\x8E', '\xB2', 0,
+	'\xE1', '\x8E', '\xB3', 0,
+	'\xE1', '\x8E', '\xB4', 0,
+	'\xE1', '\x8E', '\xB5', 0,
+	'\xE1', '\x8E', '\xB6', 0,
+	'\xE1', '\x8E', '\xB7', 0,
+	'\xE1', '\x8E', '\xB8', 0,
+	'\xE1', '\x8E', '\xB9', 0,
+	'\xE1', '\x8E', '\xBA', 0,
+	'\xE1', '\x8E', '\xBB', 0,
+	'\xE1', '\x8E', '\xBC', 0,
+	'\xE1', '\x8E', '\xBD', 0,
+	'\xE1', '\x8E', '\xBE', 0,
+	'\xE1', '\x8E', '\xBF', 0,
+	'\xE1', '\x8F', '\x80', 0,
+	'\xE1', '\x8F', '\x81', 0,
+	'\xE1', '\x8F', '\x82', 0,
+	'\xE1', '\x8F', '\x83', 0,
+	'\xE1', '\x8F', '\x84', 0,
+	'\xE1', '\x8F', '\x85', 0,
+	'\xE1', '\x8F', '\x86', 0,
+	'\xE1', '\x8F', '\x87', 0,
+	'\xE1', '\x8F', '\x88', 0,
+	'\xE1', '\x8F', '\x89', 0,
+	'\xE1', '\x8F', '\x8A', 0,
+	'\xE1', '\x8F', '\x8B', 0,
+	'\xE1', '\x8F', '\x8C', 0,
+	'\xE1', '\x8F', '\x8D', 0,
+	'\xE1', '\x8F', '\x8E', 0,
+	'\xE1', '\x8F', '\x8F', 0,
+	'\xE1', '\x8F', '\x90', 0,
+	'\xE1', '\x8F', '\x91', 0,
+	'\xE1', '\x8F', '\x92', 0,
+	'\xE1', '\x8F', '\x93', 0,
+	'\xE1', '\x8F', '\x94', 0,
+	'\xE1', '\x8F', '\x95', 0,
+	'\xE1', '\x8F', '\x96', 0,
+	'\xE1', '\x8F', '\x97', 0,
+	'\xE1', '\x8F', '\x98', 0,
+	'\xE1', '\x8F', '\x99', 0,
+	'\xE1', '\x8F', '\x9A', 0,
+	'\xE1', '\x8F', '\x9B', 0,
+	'\xE1', '\x8F', '\x9C', 0,
+	'\xE1', '\x8F', '\x9D', 0,
+	'\xE1', '\x8F', '\x9E', 0,
+	'\xE1', '\x8F', '\x9F', 0,
+	'\xE1', '\x8F', '\xA0', 0,
+	'\xE1', '\x8F', '\xA1', 0,
+	'\xE1', '\x8F', '\xA2', 0,
+	'\xE1', '\x8F', '\xA3', 0,
+	'\xE1', '\x8F', '\xA4', 0,
+	'\xE1', '\x8F', '\xA5', 0,
+	'\xE1', '\x8F', '\xA6', 0,
+	'\xE1', '\x8F', '\xA7', 0,
+	'\xE1', '\x8F', '\xA8', 0,
+	'\xE1', '\x8F', '\xA9', 0,
+	'\xE1', '\x8F', '\xAA', 0,
+	'\xE1', '\x8F', '\xAB', 0,
+	'\xE1', '\x8F', '\xAC', 0,
+	'\xE1', '\x8F', '\xAD', 0,
+	'\xE1', '\x8F', '\xAE', 0,
+	'\xE1', '\x8F', '\xAF', 0,
+};
+
+static const char s_StringToTitleEFBD[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEF', '\xBC', '\xA1', 0,
+	'\xEF', '\xBC', '\xA2', 0,
+	'\xEF', '\xBC', '\xA3', 0,
+	'\xEF', '\xBC', '\xA4', 0,
+	'\xEF', '\xBC', '\xA5', 0,
+	'\xEF', '\xBC', '\xA6', 0,
+	'\xEF', '\xBC', '\xA7', 0,
+	'\xEF', '\xBC', '\xA8', 0,
+	'\xEF', '\xBC', '\xA9', 0,
+	'\xEF', '\xBC', '\xAA', 0,
+	'\xEF', '\xBC', '\xAB', 0,
+	'\xEF', '\xBC', '\xAC', 0,
+	'\xEF', '\xBC', '\xAD', 0,
+	'\xEF', '\xBC', '\xAE', 0,
+	'\xEF', '\xBC', '\xAF', 0,
+	'\xEF', '\xBC', '\xB0', 0,
+	'\xEF', '\xBC', '\xB1', 0,
+	'\xEF', '\xBC', '\xB2', 0,
+	'\xEF', '\xBC', '\xB3', 0,
+	'\xEF', '\xBC', '\xB4', 0,
+	'\xEF', '\xBC', '\xB5', 0,
+	'\xEF', '\xBC', '\xB6', 0,
+	'\xEF', '\xBC', '\xB7', 0,
+	'\xEF', '\xBC', '\xB8', 0,
+	'\xEF', '\xBC', '\xB9', 0,
+	'\xEF', '\xBC', '\xBA', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleF09090[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+};
+
+static const char s_StringToTitleF09091[64 * 4] = {
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleF09093[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleF090B3[64 * 4] = {
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleF091A3[64 * 4] = {
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToTitleF096B9[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+};
+
+static const char s_StringToTitleF09EA4[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+};
+
+static const char s_StringToTitleF09EA5[64 * 4] = {
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMap[32] = {
+	0, 0,
+	s_StringToTitleC2,
+	s_StringToTitleC3,
+	s_StringToTitleC4,
+	s_StringToTitleC5,
+	s_StringToTitleC6,
+	s_StringToTitleC7,
+	s_StringToTitleC8,
+	s_StringToTitleC9,
+	s_StringToTitleCA,
+	0, 0,
+	s_StringToTitleCD,
+	s_StringToTitleCE,
+	s_StringToTitleCF,
+	s_StringToTitleD0,
+	s_StringToTitleD1,
+	s_StringToTitleD2,
+	s_StringToTitleD3,
+	s_StringToTitleD4,
+	s_StringToTitleD5,
+	s_StringToTitleD6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapE1[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleE18F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleE1B2,
+	0, 0,
+	s_StringToTitleE1B5,
+	s_StringToTitleE1B6,
+	0,
+	s_StringToTitleE1B8,
+	s_StringToTitleE1B9,
+	s_StringToTitleE1BA,
+	s_StringToTitleE1BB,
+	s_StringToTitleE1BC,
+	s_StringToTitleE1BD,
+	s_StringToTitleE1BE,
+	s_StringToTitleE1BF,
+};
+
+static const char *s_StringToTitleMapE2[64] = {
+	0, 0, 0, 0, 0,
+	s_StringToTitleE285,
+	s_StringToTitleE286,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleE2B0,
+	s_StringToTitleE2B1,
+	s_StringToTitleE2B2,
+	s_StringToTitleE2B3,
+	s_StringToTitleE2B4,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapEA[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleEA99,
+	s_StringToTitleEA9A,
+	0,
+	s_StringToTitleEA9C,
+	s_StringToTitleEA9D,
+	s_StringToTitleEA9E,
+	s_StringToTitleEA9F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleEAAD,
+	s_StringToTitleEAAE,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleEFBD,
+	0, 0,
+};
+
+static const char **s_StringToTitleMapMap[16] = {
+	0,
+	s_StringToTitleMapE1,
+	s_StringToTitleMapE2,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleMapEA,
+	0, 0, 0, 0,
+	s_StringToTitleMapEF,
+};
+
+static const char *s_StringToTitleMapF090[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleF09090,
+	s_StringToTitleF09091,
+	0,
+	s_StringToTitleF09093,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleF090B3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapF091[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleF091A3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapF096[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleF096B9,
+	0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToTitleMapF09E[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleF09EA4,
+	s_StringToTitleF09EA5,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char **s_StringToTitleMapMapF0[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleMapF090,
+	s_StringToTitleMapF091,
+	0, 0, 0, 0,
+	s_StringToTitleMapF096,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToTitleMapF09E,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char ***s_StringToTitleMapMapMap[8] = {
+	s_StringToTitleMapMapF0,
+	0, 0, 0, 0, 0, 0, 0,
+};
+
+// ***************************************************************************
+
+NL_FORCE_INLINE void appendToTitleAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	unsigned char c = str[i];
+	unsigned char d, e, f;
+	if (c < 0x80)
+	{
+		if (c >= 'a' && c <= 'z')
+		{
+			// 1-byte UTF-8
+			c -= 'a' - 'A';
+		}
+	}
+	else if (c < 0xC0)
+	{
+		// non-starting byte
+	}
+	else if (c < 0xE0)
+	{
+		// 2-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80)
+		{
+			const char *table = s_StringToTitleMap[c & 0x1F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	else if (c < 0xF0)
+	{
+		// 3-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+		{
+			const char **map = s_StringToTitleMapMap[c & 0x0F];
+			if (map)
+			{
+				const char *table = map[d & 0x3F];
+				if (table)
+				{
+					unsigned char idx = (e & 0x3F) << 2;
+					if (table[idx])
+					{
+						res += &table[idx];
+						i += 3;
+						return;
+					}
+				}
+			}
+		}
+	}
+	else if (c < 0xF8)
+	{
+		// 4-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80 && ((f = str[i + 3]) & 0xC0) == 0x80)
+		{
+			const char ***mapMap = s_StringToTitleMapMapMap[c & 0x07];
+			if (mapMap)
+			{
+				const char **map = mapMap[d & 0x3F];
+				if (map)
+				{
+					const char *table = map[e & 0x3F];
+					if (table)
+					{
+						unsigned char idx = (f & 0x3F) << 2;
+						if (table[idx])
+						{
+							res += &table[idx];
+							i += 4;
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+	res += c;
+	++i;
+}
+
+// ***************************************************************************
+
+void appendToTitle(std::string &res, const char *str, ptrdiff_t &i)
+{
+	appendToTitleAsUtf8(res, str, i);
+}
+
+// ***************************************************************************
+
+void appendToTitle(std::string &res, const std::string &str, ptrdiff_t &i)
+{
+	appendToTitleAsUtf8(res, &str[0], i);
+}
+
+// ***************************************************************************
+
+} // NLMISC
diff --git a/nel/src/misc/string_to_upper.cpp b/nel/src/misc/string_to_upper.cpp
new file mode 100644
index 000000000..eb037969c
--- /dev/null
+++ b/nel/src/misc/string_to_upper.cpp
@@ -0,0 +1,2661 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdmisc.h"
+#include "nel/misc/ucstring.h"
+#include "nel/misc/utf_string_view.h"
+
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
+namespace NLMISC {
+
+static const char s_StringToUpperC2[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x9C', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperC3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC3', '\x80', '\x00', 0,
+	'\xC3', '\x81', '\x00', 0,
+	'\xC3', '\x82', '\x00', 0,
+	'\xC3', '\x83', '\x00', 0,
+	'\xC3', '\x84', '\x00', 0,
+	'\xC3', '\x85', '\x00', 0,
+	'\xC3', '\x86', '\x00', 0,
+	'\xC3', '\x87', '\x00', 0,
+	'\xC3', '\x88', '\x00', 0,
+	'\xC3', '\x89', '\x00', 0,
+	'\xC3', '\x8A', '\x00', 0,
+	'\xC3', '\x8B', '\x00', 0,
+	'\xC3', '\x8C', '\x00', 0,
+	'\xC3', '\x8D', '\x00', 0,
+	'\xC3', '\x8E', '\x00', 0,
+	'\xC3', '\x8F', '\x00', 0,
+	'\xC3', '\x90', '\x00', 0,
+	'\xC3', '\x91', '\x00', 0,
+	'\xC3', '\x92', '\x00', 0,
+	'\xC3', '\x93', '\x00', 0,
+	'\xC3', '\x94', '\x00', 0,
+	'\xC3', '\x95', '\x00', 0,
+	'\xC3', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC3', '\x98', '\x00', 0,
+	'\xC3', '\x99', '\x00', 0,
+	'\xC3', '\x9A', '\x00', 0,
+	'\xC3', '\x9B', '\x00', 0,
+	'\xC3', '\x9C', '\x00', 0,
+	'\xC3', '\x9D', '\x00', 0,
+	'\xC3', '\x9E', '\x00', 0,
+	'\xC5', '\xB8', '\x00', 0,
+};
+
+static const char s_StringToUpperC4[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC4', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\x49', '\x00', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC4', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC4', '\xBD', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToUpperC5[64 * 4] = {
+	'\xC4', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x87', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC5', '\xB9', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBB', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC5', '\xBD', '\x00', 0,
+	'\x53', '\x00', '\x00', 0,
+};
+
+static const char s_StringToUpperC6[64 * 4] = {
+	'\xC9', '\x83', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x84', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x87', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x8B', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x91', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\x98', '\x00', 0,
+	'\xC8', '\xBD', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xA4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xA7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAC', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xAF', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xB3', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB5', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC6', '\xB8', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB7', '\x00', 0,
+};
+
+static const char s_StringToUpperC7[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\x84', '\x00', 0,
+	'\xC7', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x87', '\x00', 0,
+	'\xC7', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8A', '\x00', 0,
+	'\xC7', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8D', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x91', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x93', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x95', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x97', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9B', '\x00', 0,
+	'\xC6', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xAE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC7', '\xB1', '\x00', 0,
+	'\xC7', '\xB1', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB4', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xC7', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC7', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToUpperC8[64 * 4] = {
+	0, 0, 0, 0,
+	'\xC8', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\x9E', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC8', '\xB2', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBB', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xBE', 0,
+};
+
+static const char s_StringToUpperC9[64 * 4] = {
+	'\xE2', '\xB1', '\xBF', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x81', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC9', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC9', '\x8E', '\x00', 0,
+	'\xE2', '\xB1', '\xAF', 0,
+	'\xE2', '\xB1', '\xAD', 0,
+	'\xE2', '\xB1', '\xB0', 0,
+	'\xC6', '\x81', '\x00', 0,
+	'\xC6', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x89', '\x00', 0,
+	'\xC6', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x90', '\x00', 0,
+	'\xEA', '\x9E', '\xAB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x93', '\x00', 0,
+	'\xEA', '\x9E', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8D', 0,
+	'\xEA', '\x9E', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xC6', '\x97', '\x00', 0,
+	'\xC6', '\x96', '\x00', 0,
+	'\xEA', '\x9E', '\xAE', 0,
+	'\xE2', '\xB1', '\xA2', 0,
+	'\xEA', '\x9E', '\xAD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAE', 0,
+	'\xC6', '\x9D', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\x9F', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA4', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperCA[64 * 4] = {
+	'\xC6', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x85', 0,
+	'\xC6', '\xA9', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB1', 0,
+	'\xC6', '\xAE', '\x00', 0,
+	'\xC9', '\x84', '\x00', 0,
+	'\xC6', '\xB1', '\x00', 0,
+	'\xC6', '\xB2', '\x00', 0,
+	'\xC9', '\x85', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC6', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB2', 0,
+	'\xEA', '\x9E', '\xB0', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperCD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x99', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCD', '\xB2', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCD', '\xB6', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xBD', '\x00', 0,
+	'\xCF', '\xBE', '\x00', 0,
+	'\xCF', '\xBF', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperCE[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x86', '\x00', 0,
+	'\xCE', '\x88', '\x00', 0,
+	'\xCE', '\x89', '\x00', 0,
+	'\xCE', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x91', '\x00', 0,
+	'\xCE', '\x92', '\x00', 0,
+	'\xCE', '\x93', '\x00', 0,
+	'\xCE', '\x94', '\x00', 0,
+	'\xCE', '\x95', '\x00', 0,
+	'\xCE', '\x96', '\x00', 0,
+	'\xCE', '\x97', '\x00', 0,
+	'\xCE', '\x98', '\x00', 0,
+	'\xCE', '\x99', '\x00', 0,
+	'\xCE', '\x9A', '\x00', 0,
+	'\xCE', '\x9B', '\x00', 0,
+	'\xCE', '\x9C', '\x00', 0,
+	'\xCE', '\x9D', '\x00', 0,
+	'\xCE', '\x9E', '\x00', 0,
+	'\xCE', '\x9F', '\x00', 0,
+};
+
+static const char s_StringToUpperCF[64 * 4] = {
+	'\xCE', '\xA0', '\x00', 0,
+	'\xCE', '\xA1', '\x00', 0,
+	'\xCE', '\xA3', '\x00', 0,
+	'\xCE', '\xA3', '\x00', 0,
+	'\xCE', '\xA4', '\x00', 0,
+	'\xCE', '\xA5', '\x00', 0,
+	'\xCE', '\xA6', '\x00', 0,
+	'\xCE', '\xA7', '\x00', 0,
+	'\xCE', '\xA8', '\x00', 0,
+	'\xCE', '\xA9', '\x00', 0,
+	'\xCE', '\xAA', '\x00', 0,
+	'\xCE', '\xAB', '\x00', 0,
+	'\xCE', '\x8C', '\x00', 0,
+	'\xCE', '\x8E', '\x00', 0,
+	'\xCE', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x92', '\x00', 0,
+	'\xCE', '\x98', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\xA6', '\x00', 0,
+	'\xCE', '\xA0', '\x00', 0,
+	'\xCF', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCF', '\xAE', '\x00', 0,
+	'\xCE', '\x9A', '\x00', 0,
+	'\xCE', '\xA1', '\x00', 0,
+	'\xCF', '\xB9', '\x00', 0,
+	'\xCD', '\xBF', '\x00', 0,
+	0, 0, 0, 0,
+	'\xCE', '\x95', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xB7', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCF', '\xBA', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperD0[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD0', '\x90', '\x00', 0,
+	'\xD0', '\x91', '\x00', 0,
+	'\xD0', '\x92', '\x00', 0,
+	'\xD0', '\x93', '\x00', 0,
+	'\xD0', '\x94', '\x00', 0,
+	'\xD0', '\x95', '\x00', 0,
+	'\xD0', '\x96', '\x00', 0,
+	'\xD0', '\x97', '\x00', 0,
+	'\xD0', '\x98', '\x00', 0,
+	'\xD0', '\x99', '\x00', 0,
+	'\xD0', '\x9A', '\x00', 0,
+	'\xD0', '\x9B', '\x00', 0,
+	'\xD0', '\x9C', '\x00', 0,
+	'\xD0', '\x9D', '\x00', 0,
+	'\xD0', '\x9E', '\x00', 0,
+	'\xD0', '\x9F', '\x00', 0,
+};
+
+static const char s_StringToUpperD1[64 * 4] = {
+	'\xD0', '\xA0', '\x00', 0,
+	'\xD0', '\xA1', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xA3', '\x00', 0,
+	'\xD0', '\xA4', '\x00', 0,
+	'\xD0', '\xA5', '\x00', 0,
+	'\xD0', '\xA6', '\x00', 0,
+	'\xD0', '\xA7', '\x00', 0,
+	'\xD0', '\xA8', '\x00', 0,
+	'\xD0', '\xA9', '\x00', 0,
+	'\xD0', '\xAA', '\x00', 0,
+	'\xD0', '\xAB', '\x00', 0,
+	'\xD0', '\xAC', '\x00', 0,
+	'\xD0', '\xAD', '\x00', 0,
+	'\xD0', '\xAE', '\x00', 0,
+	'\xD0', '\xAF', '\x00', 0,
+	'\xD0', '\x80', '\x00', 0,
+	'\xD0', '\x81', '\x00', 0,
+	'\xD0', '\x82', '\x00', 0,
+	'\xD0', '\x83', '\x00', 0,
+	'\xD0', '\x84', '\x00', 0,
+	'\xD0', '\x85', '\x00', 0,
+	'\xD0', '\x86', '\x00', 0,
+	'\xD0', '\x87', '\x00', 0,
+	'\xD0', '\x88', '\x00', 0,
+	'\xD0', '\x89', '\x00', 0,
+	'\xD0', '\x8A', '\x00', 0,
+	'\xD0', '\x8B', '\x00', 0,
+	'\xD0', '\x8C', '\x00', 0,
+	'\xD0', '\x8D', '\x00', 0,
+	'\xD0', '\x8E', '\x00', 0,
+	'\xD0', '\x8F', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD1', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToUpperD2[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD2', '\x80', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD2', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD2', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToUpperD3[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xD3', '\x81', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x83', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x85', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x87', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x89', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8B', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x8D', '\x00', 0,
+	'\xD3', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xAE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xB8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD3', '\xBE', '\x00', 0,
+};
+
+static const char s_StringToUpperD4[64 * 4] = {
+	0, 0, 0, 0,
+	'\xD4', '\x80', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x82', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x84', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x86', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x88', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x8E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x90', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x92', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x94', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x98', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9A', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9C', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\x9E', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA0', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA2', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA4', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA6', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xA8', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAA', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAC', '\x00', 0,
+	0, 0, 0, 0,
+	'\xD4', '\xAE', '\x00', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperD5[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xD4', '\xB1', '\x00', 0,
+	'\xD4', '\xB2', '\x00', 0,
+	'\xD4', '\xB3', '\x00', 0,
+	'\xD4', '\xB4', '\x00', 0,
+	'\xD4', '\xB5', '\x00', 0,
+	'\xD4', '\xB6', '\x00', 0,
+	'\xD4', '\xB7', '\x00', 0,
+	'\xD4', '\xB8', '\x00', 0,
+	'\xD4', '\xB9', '\x00', 0,
+	'\xD4', '\xBA', '\x00', 0,
+	'\xD4', '\xBB', '\x00', 0,
+	'\xD4', '\xBC', '\x00', 0,
+	'\xD4', '\xBD', '\x00', 0,
+	'\xD4', '\xBE', '\x00', 0,
+	'\xD4', '\xBF', '\x00', 0,
+	'\xD5', '\x80', '\x00', 0,
+	'\xD5', '\x81', '\x00', 0,
+	'\xD5', '\x82', '\x00', 0,
+	'\xD5', '\x83', '\x00', 0,
+	'\xD5', '\x84', '\x00', 0,
+	'\xD5', '\x85', '\x00', 0,
+	'\xD5', '\x86', '\x00', 0,
+	'\xD5', '\x87', '\x00', 0,
+	'\xD5', '\x88', '\x00', 0,
+	'\xD5', '\x89', '\x00', 0,
+	'\xD5', '\x8A', '\x00', 0,
+	'\xD5', '\x8B', '\x00', 0,
+	'\xD5', '\x8C', '\x00', 0,
+	'\xD5', '\x8D', '\x00', 0,
+	'\xD5', '\x8E', '\x00', 0,
+	'\xD5', '\x8F', '\x00', 0,
+};
+
+static const char s_StringToUpperD6[64 * 4] = {
+	'\xD5', '\x90', '\x00', 0,
+	'\xD5', '\x91', '\x00', 0,
+	'\xD5', '\x92', '\x00', 0,
+	'\xD5', '\x93', '\x00', 0,
+	'\xD5', '\x94', '\x00', 0,
+	'\xD5', '\x95', '\x00', 0,
+	'\xD5', '\x96', '\x00', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE183[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xB2', '\x90', 0,
+	'\xE1', '\xB2', '\x91', 0,
+	'\xE1', '\xB2', '\x92', 0,
+	'\xE1', '\xB2', '\x93', 0,
+	'\xE1', '\xB2', '\x94', 0,
+	'\xE1', '\xB2', '\x95', 0,
+	'\xE1', '\xB2', '\x96', 0,
+	'\xE1', '\xB2', '\x97', 0,
+	'\xE1', '\xB2', '\x98', 0,
+	'\xE1', '\xB2', '\x99', 0,
+	'\xE1', '\xB2', '\x9A', 0,
+	'\xE1', '\xB2', '\x9B', 0,
+	'\xE1', '\xB2', '\x9C', 0,
+	'\xE1', '\xB2', '\x9D', 0,
+	'\xE1', '\xB2', '\x9E', 0,
+	'\xE1', '\xB2', '\x9F', 0,
+	'\xE1', '\xB2', '\xA0', 0,
+	'\xE1', '\xB2', '\xA1', 0,
+	'\xE1', '\xB2', '\xA2', 0,
+	'\xE1', '\xB2', '\xA3', 0,
+	'\xE1', '\xB2', '\xA4', 0,
+	'\xE1', '\xB2', '\xA5', 0,
+	'\xE1', '\xB2', '\xA6', 0,
+	'\xE1', '\xB2', '\xA7', 0,
+	'\xE1', '\xB2', '\xA8', 0,
+	'\xE1', '\xB2', '\xA9', 0,
+	'\xE1', '\xB2', '\xAA', 0,
+	'\xE1', '\xB2', '\xAB', 0,
+	'\xE1', '\xB2', '\xAC', 0,
+	'\xE1', '\xB2', '\xAD', 0,
+	'\xE1', '\xB2', '\xAE', 0,
+	'\xE1', '\xB2', '\xAF', 0,
+	'\xE1', '\xB2', '\xB0', 0,
+	'\xE1', '\xB2', '\xB1', 0,
+	'\xE1', '\xB2', '\xB2', 0,
+	'\xE1', '\xB2', '\xB3', 0,
+	'\xE1', '\xB2', '\xB4', 0,
+	'\xE1', '\xB2', '\xB5', 0,
+	'\xE1', '\xB2', '\xB6', 0,
+	'\xE1', '\xB2', '\xB7', 0,
+	'\xE1', '\xB2', '\xB8', 0,
+	'\xE1', '\xB2', '\xB9', 0,
+	'\xE1', '\xB2', '\xBA', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xB2', '\xBD', 0,
+	'\xE1', '\xB2', '\xBE', 0,
+	'\xE1', '\xB2', '\xBF', 0,
+};
+
+static const char s_StringToUpperE18F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x8F', '\xB0', 0,
+	'\xE1', '\x8F', '\xB1', 0,
+	'\xE1', '\x8F', '\xB2', 0,
+	'\xE1', '\x8F', '\xB3', 0,
+	'\xE1', '\x8F', '\xB4', 0,
+	'\xE1', '\x8F', '\xB5', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1B2[64 * 4] = {
+	'\xD0', '\x92', '\x00', 0,
+	'\xD0', '\x94', '\x00', 0,
+	'\xD0', '\x9E', '\x00', 0,
+	'\xD0', '\xA1', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xA2', '\x00', 0,
+	'\xD0', '\xAA', '\x00', 0,
+	'\xD1', '\xA2', '\x00', 0,
+	'\xEA', '\x99', '\x8A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1B5[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBD', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1B6[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x86', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1B8[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB8', '\xBE', 0,
+};
+
+static const char s_StringToUpperE1B9[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xB9', '\xBE', 0,
+};
+
+static const char s_StringToUpperE1BA[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\x94', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xB9', '\xA0', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBA', '\xBE', 0,
+};
+
+static const char s_StringToUpperE1BB[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBB', '\xBE', 0,
+};
+
+static const char s_StringToUpperE1BC[64 * 4] = {
+	'\xE1', '\xBC', '\x88', 0,
+	'\xE1', '\xBC', '\x89', 0,
+	'\xE1', '\xBC', '\x8A', 0,
+	'\xE1', '\xBC', '\x8B', 0,
+	'\xE1', '\xBC', '\x8C', 0,
+	'\xE1', '\xBC', '\x8D', 0,
+	'\xE1', '\xBC', '\x8E', 0,
+	'\xE1', '\xBC', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\x98', 0,
+	'\xE1', '\xBC', '\x99', 0,
+	'\xE1', '\xBC', '\x9A', 0,
+	'\xE1', '\xBC', '\x9B', 0,
+	'\xE1', '\xBC', '\x9C', 0,
+	'\xE1', '\xBC', '\x9D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xA8', 0,
+	'\xE1', '\xBC', '\xA9', 0,
+	'\xE1', '\xBC', '\xAA', 0,
+	'\xE1', '\xBC', '\xAB', 0,
+	'\xE1', '\xBC', '\xAC', 0,
+	'\xE1', '\xBC', '\xAD', 0,
+	'\xE1', '\xBC', '\xAE', 0,
+	'\xE1', '\xBC', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBC', '\xB8', 0,
+	'\xE1', '\xBC', '\xB9', 0,
+	'\xE1', '\xBC', '\xBA', 0,
+	'\xE1', '\xBC', '\xBB', 0,
+	'\xE1', '\xBC', '\xBC', 0,
+	'\xE1', '\xBC', '\xBD', 0,
+	'\xE1', '\xBC', '\xBE', 0,
+	'\xE1', '\xBC', '\xBF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1BD[64 * 4] = {
+	'\xE1', '\xBD', '\x88', 0,
+	'\xE1', '\xBD', '\x89', 0,
+	'\xE1', '\xBD', '\x8A', 0,
+	'\xE1', '\xBD', '\x8B', 0,
+	'\xE1', '\xBD', '\x8C', 0,
+	'\xE1', '\xBD', '\x8D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x99', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9B', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9D', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBD', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBD', '\xA8', 0,
+	'\xE1', '\xBD', '\xA9', 0,
+	'\xE1', '\xBD', '\xAA', 0,
+	'\xE1', '\xBD', '\xAB', 0,
+	'\xE1', '\xBD', '\xAC', 0,
+	'\xE1', '\xBD', '\xAD', 0,
+	'\xE1', '\xBD', '\xAE', 0,
+	'\xE1', '\xBD', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBA', 0,
+	'\xE1', '\xBE', '\xBB', 0,
+	'\xE1', '\xBF', '\x88', 0,
+	'\xE1', '\xBF', '\x89', 0,
+	'\xE1', '\xBF', '\x8A', 0,
+	'\xE1', '\xBF', '\x8B', 0,
+	'\xE1', '\xBF', '\x9A', 0,
+	'\xE1', '\xBF', '\x9B', 0,
+	'\xE1', '\xBF', '\xB8', 0,
+	'\xE1', '\xBF', '\xB9', 0,
+	'\xE1', '\xBF', '\xAA', 0,
+	'\xE1', '\xBF', '\xAB', 0,
+	'\xE1', '\xBF', '\xBA', 0,
+	'\xE1', '\xBF', '\xBB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1BE[64 * 4] = {
+	'\xE1', '\xBE', '\x88', 0,
+	'\xE1', '\xBE', '\x89', 0,
+	'\xE1', '\xBE', '\x8A', 0,
+	'\xE1', '\xBE', '\x8B', 0,
+	'\xE1', '\xBE', '\x8C', 0,
+	'\xE1', '\xBE', '\x8D', 0,
+	'\xE1', '\xBE', '\x8E', 0,
+	'\xE1', '\xBE', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\x98', 0,
+	'\xE1', '\xBE', '\x99', 0,
+	'\xE1', '\xBE', '\x9A', 0,
+	'\xE1', '\xBE', '\x9B', 0,
+	'\xE1', '\xBE', '\x9C', 0,
+	'\xE1', '\xBE', '\x9D', 0,
+	'\xE1', '\xBE', '\x9E', 0,
+	'\xE1', '\xBE', '\x9F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xA8', 0,
+	'\xE1', '\xBE', '\xA9', 0,
+	'\xE1', '\xBE', '\xAA', 0,
+	'\xE1', '\xBE', '\xAB', 0,
+	'\xE1', '\xBE', '\xAC', 0,
+	'\xE1', '\xBE', '\xAD', 0,
+	'\xE1', '\xBE', '\xAE', 0,
+	'\xE1', '\xBE', '\xAF', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBE', '\xB8', 0,
+	'\xE1', '\xBE', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xE1', '\xBE', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xCE', '\x99', '\x00', 0,
+	0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE1BF[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x8C', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\x98', 0,
+	'\xE1', '\xBF', '\x99', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xA8', 0,
+	'\xE1', '\xBF', '\xA9', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xAC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\xBF', '\xBC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE285[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x84', '\xB2', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x85', '\xA0', 0,
+	'\xE2', '\x85', '\xA1', 0,
+	'\xE2', '\x85', '\xA2', 0,
+	'\xE2', '\x85', '\xA3', 0,
+	'\xE2', '\x85', '\xA4', 0,
+	'\xE2', '\x85', '\xA5', 0,
+	'\xE2', '\x85', '\xA6', 0,
+	'\xE2', '\x85', '\xA7', 0,
+	'\xE2', '\x85', '\xA8', 0,
+	'\xE2', '\x85', '\xA9', 0,
+	'\xE2', '\x85', '\xAA', 0,
+	'\xE2', '\x85', '\xAB', 0,
+	'\xE2', '\x85', '\xAC', 0,
+	'\xE2', '\x85', '\xAD', 0,
+	'\xE2', '\x85', '\xAE', 0,
+	'\xE2', '\x85', '\xAF', 0,
+};
+
+static const char s_StringToUpperE286[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x86', '\x83', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE293[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\x92', '\xB6', 0,
+	'\xE2', '\x92', '\xB7', 0,
+	'\xE2', '\x92', '\xB8', 0,
+	'\xE2', '\x92', '\xB9', 0,
+	'\xE2', '\x92', '\xBA', 0,
+	'\xE2', '\x92', '\xBB', 0,
+	'\xE2', '\x92', '\xBC', 0,
+	'\xE2', '\x92', '\xBD', 0,
+	'\xE2', '\x92', '\xBE', 0,
+	'\xE2', '\x92', '\xBF', 0,
+	'\xE2', '\x93', '\x80', 0,
+	'\xE2', '\x93', '\x81', 0,
+	'\xE2', '\x93', '\x82', 0,
+	'\xE2', '\x93', '\x83', 0,
+	'\xE2', '\x93', '\x84', 0,
+	'\xE2', '\x93', '\x85', 0,
+	'\xE2', '\x93', '\x86', 0,
+	'\xE2', '\x93', '\x87', 0,
+	'\xE2', '\x93', '\x88', 0,
+	'\xE2', '\x93', '\x89', 0,
+	'\xE2', '\x93', '\x8A', 0,
+	'\xE2', '\x93', '\x8B', 0,
+	'\xE2', '\x93', '\x8C', 0,
+	'\xE2', '\x93', '\x8D', 0,
+	'\xE2', '\x93', '\x8E', 0,
+	'\xE2', '\x93', '\x8F', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE2B0[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB0', '\x80', 0,
+	'\xE2', '\xB0', '\x81', 0,
+	'\xE2', '\xB0', '\x82', 0,
+	'\xE2', '\xB0', '\x83', 0,
+	'\xE2', '\xB0', '\x84', 0,
+	'\xE2', '\xB0', '\x85', 0,
+	'\xE2', '\xB0', '\x86', 0,
+	'\xE2', '\xB0', '\x87', 0,
+	'\xE2', '\xB0', '\x88', 0,
+	'\xE2', '\xB0', '\x89', 0,
+	'\xE2', '\xB0', '\x8A', 0,
+	'\xE2', '\xB0', '\x8B', 0,
+	'\xE2', '\xB0', '\x8C', 0,
+	'\xE2', '\xB0', '\x8D', 0,
+	'\xE2', '\xB0', '\x8E', 0,
+	'\xE2', '\xB0', '\x8F', 0,
+};
+
+static const char s_StringToUpperE2B1[64 * 4] = {
+	'\xE2', '\xB0', '\x90', 0,
+	'\xE2', '\xB0', '\x91', 0,
+	'\xE2', '\xB0', '\x92', 0,
+	'\xE2', '\xB0', '\x93', 0,
+	'\xE2', '\xB0', '\x94', 0,
+	'\xE2', '\xB0', '\x95', 0,
+	'\xE2', '\xB0', '\x96', 0,
+	'\xE2', '\xB0', '\x97', 0,
+	'\xE2', '\xB0', '\x98', 0,
+	'\xE2', '\xB0', '\x99', 0,
+	'\xE2', '\xB0', '\x9A', 0,
+	'\xE2', '\xB0', '\x9B', 0,
+	'\xE2', '\xB0', '\x9C', 0,
+	'\xE2', '\xB0', '\x9D', 0,
+	'\xE2', '\xB0', '\x9E', 0,
+	'\xE2', '\xB0', '\x9F', 0,
+	'\xE2', '\xB0', '\xA0', 0,
+	'\xE2', '\xB0', '\xA1', 0,
+	'\xE2', '\xB0', '\xA2', 0,
+	'\xE2', '\xB0', '\xA3', 0,
+	'\xE2', '\xB0', '\xA4', 0,
+	'\xE2', '\xB0', '\xA5', 0,
+	'\xE2', '\xB0', '\xA6', 0,
+	'\xE2', '\xB0', '\xA7', 0,
+	'\xE2', '\xB0', '\xA8', 0,
+	'\xE2', '\xB0', '\xA9', 0,
+	'\xE2', '\xB0', '\xAA', 0,
+	'\xE2', '\xB0', '\xAB', 0,
+	'\xE2', '\xB0', '\xAC', 0,
+	'\xE2', '\xB0', '\xAD', 0,
+	'\xE2', '\xB0', '\xAE', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA0', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xC8', '\xBA', '\x00', 0,
+	'\xC8', '\xBE', '\x00', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA7', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xA9', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB1', '\xAB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB1', '\xB5', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE2B2[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xAE', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB2', '\xBE', 0,
+};
+
+static const char s_StringToUpperE2B3[64 * 4] = {
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x80', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x82', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x84', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x86', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x88', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x90', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x92', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x94', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x96', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x98', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xA2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAB', 0,
+	0, 0, 0, 0,
+	'\xE2', '\xB3', '\xAD', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE2', '\xB3', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperE2B4[64 * 4] = {
+	'\xE1', '\x82', '\xA0', 0,
+	'\xE1', '\x82', '\xA1', 0,
+	'\xE1', '\x82', '\xA2', 0,
+	'\xE1', '\x82', '\xA3', 0,
+	'\xE1', '\x82', '\xA4', 0,
+	'\xE1', '\x82', '\xA5', 0,
+	'\xE1', '\x82', '\xA6', 0,
+	'\xE1', '\x82', '\xA7', 0,
+	'\xE1', '\x82', '\xA8', 0,
+	'\xE1', '\x82', '\xA9', 0,
+	'\xE1', '\x82', '\xAA', 0,
+	'\xE1', '\x82', '\xAB', 0,
+	'\xE1', '\x82', '\xAC', 0,
+	'\xE1', '\x82', '\xAD', 0,
+	'\xE1', '\x82', '\xAE', 0,
+	'\xE1', '\x82', '\xAF', 0,
+	'\xE1', '\x82', '\xB0', 0,
+	'\xE1', '\x82', '\xB1', 0,
+	'\xE1', '\x82', '\xB2', 0,
+	'\xE1', '\x82', '\xB3', 0,
+	'\xE1', '\x82', '\xB4', 0,
+	'\xE1', '\x82', '\xB5', 0,
+	'\xE1', '\x82', '\xB6', 0,
+	'\xE1', '\x82', '\xB7', 0,
+	'\xE1', '\x82', '\xB8', 0,
+	'\xE1', '\x82', '\xB9', 0,
+	'\xE1', '\x82', '\xBA', 0,
+	'\xE1', '\x82', '\xBB', 0,
+	'\xE1', '\x82', '\xBC', 0,
+	'\xE1', '\x82', '\xBD', 0,
+	'\xE1', '\x82', '\xBE', 0,
+	'\xE1', '\x82', '\xBF', 0,
+	'\xE1', '\x83', '\x80', 0,
+	'\xE1', '\x83', '\x81', 0,
+	'\xE1', '\x83', '\x82', 0,
+	'\xE1', '\x83', '\x83', 0,
+	'\xE1', '\x83', '\x84', 0,
+	'\xE1', '\x83', '\x85', 0,
+	0, 0, 0, 0,
+	'\xE1', '\x83', '\x87', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x83', '\x8D', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperEA99[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x99', '\xAC', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperEA9A[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9A', '\x9A', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperEA9C[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9C', '\xBE', 0,
+};
+
+static const char s_StringToUpperEA9D[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x86', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x88', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x8E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x92', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x94', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xA8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xAE', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9D', '\xB9', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBB', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9D', '\xBE', 0,
+};
+
+static const char s_StringToUpperEA9E[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x80', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x82', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x84', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x86', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x8B', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x90', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x92', 0,
+	'\xEA', '\x9F', '\x84', 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\x96', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x98', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9A', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9C', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\x9E', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA0', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA2', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xA8', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB4', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB6', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB8', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBA', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBC', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9E', '\xBE', 0,
+};
+
+static const char s_StringToUpperEA9F[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x82', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\x87', 0,
+	0, 0, 0, 0,
+	'\xEA', '\x9F', '\x89', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9F', '\xB5', 0,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperEAAD[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xEA', '\x9E', '\xB3', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xE1', '\x8E', '\xA0', 0,
+	'\xE1', '\x8E', '\xA1', 0,
+	'\xE1', '\x8E', '\xA2', 0,
+	'\xE1', '\x8E', '\xA3', 0,
+	'\xE1', '\x8E', '\xA4', 0,
+	'\xE1', '\x8E', '\xA5', 0,
+	'\xE1', '\x8E', '\xA6', 0,
+	'\xE1', '\x8E', '\xA7', 0,
+	'\xE1', '\x8E', '\xA8', 0,
+	'\xE1', '\x8E', '\xA9', 0,
+	'\xE1', '\x8E', '\xAA', 0,
+	'\xE1', '\x8E', '\xAB', 0,
+	'\xE1', '\x8E', '\xAC', 0,
+	'\xE1', '\x8E', '\xAD', 0,
+	'\xE1', '\x8E', '\xAE', 0,
+	'\xE1', '\x8E', '\xAF', 0,
+};
+
+static const char s_StringToUpperEAAE[64 * 4] = {
+	'\xE1', '\x8E', '\xB0', 0,
+	'\xE1', '\x8E', '\xB1', 0,
+	'\xE1', '\x8E', '\xB2', 0,
+	'\xE1', '\x8E', '\xB3', 0,
+	'\xE1', '\x8E', '\xB4', 0,
+	'\xE1', '\x8E', '\xB5', 0,
+	'\xE1', '\x8E', '\xB6', 0,
+	'\xE1', '\x8E', '\xB7', 0,
+	'\xE1', '\x8E', '\xB8', 0,
+	'\xE1', '\x8E', '\xB9', 0,
+	'\xE1', '\x8E', '\xBA', 0,
+	'\xE1', '\x8E', '\xBB', 0,
+	'\xE1', '\x8E', '\xBC', 0,
+	'\xE1', '\x8E', '\xBD', 0,
+	'\xE1', '\x8E', '\xBE', 0,
+	'\xE1', '\x8E', '\xBF', 0,
+	'\xE1', '\x8F', '\x80', 0,
+	'\xE1', '\x8F', '\x81', 0,
+	'\xE1', '\x8F', '\x82', 0,
+	'\xE1', '\x8F', '\x83', 0,
+	'\xE1', '\x8F', '\x84', 0,
+	'\xE1', '\x8F', '\x85', 0,
+	'\xE1', '\x8F', '\x86', 0,
+	'\xE1', '\x8F', '\x87', 0,
+	'\xE1', '\x8F', '\x88', 0,
+	'\xE1', '\x8F', '\x89', 0,
+	'\xE1', '\x8F', '\x8A', 0,
+	'\xE1', '\x8F', '\x8B', 0,
+	'\xE1', '\x8F', '\x8C', 0,
+	'\xE1', '\x8F', '\x8D', 0,
+	'\xE1', '\x8F', '\x8E', 0,
+	'\xE1', '\x8F', '\x8F', 0,
+	'\xE1', '\x8F', '\x90', 0,
+	'\xE1', '\x8F', '\x91', 0,
+	'\xE1', '\x8F', '\x92', 0,
+	'\xE1', '\x8F', '\x93', 0,
+	'\xE1', '\x8F', '\x94', 0,
+	'\xE1', '\x8F', '\x95', 0,
+	'\xE1', '\x8F', '\x96', 0,
+	'\xE1', '\x8F', '\x97', 0,
+	'\xE1', '\x8F', '\x98', 0,
+	'\xE1', '\x8F', '\x99', 0,
+	'\xE1', '\x8F', '\x9A', 0,
+	'\xE1', '\x8F', '\x9B', 0,
+	'\xE1', '\x8F', '\x9C', 0,
+	'\xE1', '\x8F', '\x9D', 0,
+	'\xE1', '\x8F', '\x9E', 0,
+	'\xE1', '\x8F', '\x9F', 0,
+	'\xE1', '\x8F', '\xA0', 0,
+	'\xE1', '\x8F', '\xA1', 0,
+	'\xE1', '\x8F', '\xA2', 0,
+	'\xE1', '\x8F', '\xA3', 0,
+	'\xE1', '\x8F', '\xA4', 0,
+	'\xE1', '\x8F', '\xA5', 0,
+	'\xE1', '\x8F', '\xA6', 0,
+	'\xE1', '\x8F', '\xA7', 0,
+	'\xE1', '\x8F', '\xA8', 0,
+	'\xE1', '\x8F', '\xA9', 0,
+	'\xE1', '\x8F', '\xAA', 0,
+	'\xE1', '\x8F', '\xAB', 0,
+	'\xE1', '\x8F', '\xAC', 0,
+	'\xE1', '\x8F', '\xAD', 0,
+	'\xE1', '\x8F', '\xAE', 0,
+	'\xE1', '\x8F', '\xAF', 0,
+};
+
+static const char s_StringToUpperEFBD[64 * 4] = {
+	0, 0, 0, 0,
+	'\xEF', '\xBC', '\xA1', 0,
+	'\xEF', '\xBC', '\xA2', 0,
+	'\xEF', '\xBC', '\xA3', 0,
+	'\xEF', '\xBC', '\xA4', 0,
+	'\xEF', '\xBC', '\xA5', 0,
+	'\xEF', '\xBC', '\xA6', 0,
+	'\xEF', '\xBC', '\xA7', 0,
+	'\xEF', '\xBC', '\xA8', 0,
+	'\xEF', '\xBC', '\xA9', 0,
+	'\xEF', '\xBC', '\xAA', 0,
+	'\xEF', '\xBC', '\xAB', 0,
+	'\xEF', '\xBC', '\xAC', 0,
+	'\xEF', '\xBC', '\xAD', 0,
+	'\xEF', '\xBC', '\xAE', 0,
+	'\xEF', '\xBC', '\xAF', 0,
+	'\xEF', '\xBC', '\xB0', 0,
+	'\xEF', '\xBC', '\xB1', 0,
+	'\xEF', '\xBC', '\xB2', 0,
+	'\xEF', '\xBC', '\xB3', 0,
+	'\xEF', '\xBC', '\xB4', 0,
+	'\xEF', '\xBC', '\xB5', 0,
+	'\xEF', '\xBC', '\xB6', 0,
+	'\xEF', '\xBC', '\xB7', 0,
+	'\xEF', '\xBC', '\xB8', 0,
+	'\xEF', '\xBC', '\xB9', 0,
+	'\xEF', '\xBC', '\xBA', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperF09090[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+};
+
+static const char s_StringToUpperF09091[64 * 4] = {
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	'\xF0', '\x90', '\x90', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperF09093[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x92', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	'\xF0', '\x90', '\x93', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperF090B3[64 * 4] = {
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	'\xF0', '\x90', '\xB2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperF091A3[64 * 4] = {
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	'\xF0', '\x91', '\xA2', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char s_StringToUpperF096B9[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+	'\xF0', '\x96', '\xB9', 0,
+};
+
+static const char s_StringToUpperF09EA4[64 * 4] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+};
+
+static const char s_StringToUpperF09EA5[64 * 4] = {
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	'\xF0', '\x9E', '\xA4', 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMap[32] = {
+	0, 0,
+	s_StringToUpperC2,
+	s_StringToUpperC3,
+	s_StringToUpperC4,
+	s_StringToUpperC5,
+	s_StringToUpperC6,
+	s_StringToUpperC7,
+	s_StringToUpperC8,
+	s_StringToUpperC9,
+	s_StringToUpperCA,
+	0, 0,
+	s_StringToUpperCD,
+	s_StringToUpperCE,
+	s_StringToUpperCF,
+	s_StringToUpperD0,
+	s_StringToUpperD1,
+	s_StringToUpperD2,
+	s_StringToUpperD3,
+	s_StringToUpperD4,
+	s_StringToUpperD5,
+	s_StringToUpperD6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapE1[64] = {
+	0, 0, 0,
+	s_StringToUpperE183,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperE18F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperE1B2,
+	0, 0,
+	s_StringToUpperE1B5,
+	s_StringToUpperE1B6,
+	0,
+	s_StringToUpperE1B8,
+	s_StringToUpperE1B9,
+	s_StringToUpperE1BA,
+	s_StringToUpperE1BB,
+	s_StringToUpperE1BC,
+	s_StringToUpperE1BD,
+	s_StringToUpperE1BE,
+	s_StringToUpperE1BF,
+};
+
+static const char *s_StringToUpperMapE2[64] = {
+	0, 0, 0, 0, 0,
+	s_StringToUpperE285,
+	s_StringToUpperE286,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperE293,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperE2B0,
+	s_StringToUpperE2B1,
+	s_StringToUpperE2B2,
+	s_StringToUpperE2B3,
+	s_StringToUpperE2B4,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapEA[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperEA99,
+	s_StringToUpperEA9A,
+	0,
+	s_StringToUpperEA9C,
+	s_StringToUpperEA9D,
+	s_StringToUpperEA9E,
+	s_StringToUpperEA9F,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperEAAD,
+	s_StringToUpperEAAE,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapEF[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperEFBD,
+	0, 0,
+};
+
+static const char **s_StringToUpperMapMap[16] = {
+	0,
+	s_StringToUpperMapE1,
+	s_StringToUpperMapE2,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperMapEA,
+	0, 0, 0, 0,
+	s_StringToUpperMapEF,
+};
+
+static const char *s_StringToUpperMapF090[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperF09090,
+	s_StringToUpperF09091,
+	0,
+	s_StringToUpperF09093,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperF090B3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapF091[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperF091A3,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapF096[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperF096B9,
+	0, 0, 0, 0, 0, 0,
+};
+
+static const char *s_StringToUpperMapF09E[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperF09EA4,
+	s_StringToUpperF09EA5,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char **s_StringToUpperMapMapF0[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperMapF090,
+	s_StringToUpperMapF091,
+	0, 0, 0, 0,
+	s_StringToUpperMapF096,
+	0, 0, 0, 0, 0, 0, 0,
+	s_StringToUpperMapF09E,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char ***s_StringToUpperMapMapMap[8] = {
+	s_StringToUpperMapMapF0,
+	0, 0, 0, 0, 0, 0, 0,
+};
+
+// ***************************************************************************
+
+/*NL_FORCE_INLINE*/ void appendToUpperAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	unsigned char c = str[i];
+	unsigned char d, e, f;
+	if (c < 0x80)
+	{
+		if (c >= 'a' && c <= 'z')
+		{
+			// 1-byte UTF-8
+			c -= 'a' - 'A';
+		}
+	}
+	else if (c < 0xC0)
+	{
+		// non-starting byte
+	}
+	else if (c < 0xE0)
+	{
+		// 2-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80)
+		{
+			const char *table = s_StringToUpperMap[c & 0x1F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	else if (c < 0xF0)
+	{
+		// 3-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+		{
+			const char **map = s_StringToUpperMapMap[c & 0x0F];
+			if (map)
+			{
+				const char *table = map[d & 0x3F];
+				if (table)
+				{
+					unsigned char idx = (e & 0x3F) << 2;
+					if (table[idx])
+					{
+						res += &table[idx];
+						i += 3;
+						return;
+					}
+				}
+			}
+		}
+	}
+	else if (c < 0xF8)
+	{
+		// 4-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80 && ((f = str[i + 3]) & 0xC0) == 0x80)
+		{
+			const char ***mapMap = s_StringToUpperMapMapMap[c & 0x07];
+			if (mapMap)
+			{
+				const char **map = mapMap[d & 0x3F];
+				if (map)
+				{
+					const char *table = map[e & 0x3F];
+					if (table)
+					{
+						unsigned char idx = (f & 0x3F) << 2;
+						if (table[idx])
+						{
+							res += &table[idx];
+							i += 4;
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+	res += c;
+	++i;
+}
+
+// ***************************************************************************
+
+std::string toUpper(const char *str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	for (ptrdiff_t i = 0; str[i];)
+		appendToUpperAsUtf8(res, str, i);
+	return res;
+}
+
+// ***************************************************************************
+
+std::string	toUpper(const std::string &str)
+{
+	// UTF-8 toLower, tables generated from UTF-16 tables
+	std::string res;
+	res.reserve(str.size() + (str.size() >> 2));
+	const char *cstr = &str[0];
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
+		appendToUpperAsUtf8(res, cstr, i);
+	return res;
+}
+
+// ***************************************************************************
+
+void appendToUpper(std::string &res, const char *str, ptrdiff_t &i)
+{
+	appendToUpperAsUtf8(res, str, i);
+}
+
+// ***************************************************************************
+
+void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i)
+{
+	appendToUpperAsUtf8(res, &str[0], i);
+}
+
+} // NLMISC
diff --git a/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
index 6e00afe88..0e1b3683b 100644
--- a/nel/src/misc/unicode.cpp
+++ b/nel/src/misc/unicode.cpp
@@ -28,5400 +28,68 @@
 namespace	NLMISC
 {
 
-// TODO / FIXME: Write tool to regenerate the unicode tables in this file
-//   See: ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt
-
-// Uppercase to lowercase 16 bits unicode. This table must be sorted. First entry must be unique.
-static const ucchar UnicodeUpperToLower[]=
-{
-	0x0041, 0x0061,	// LATIN CAPITAL LETTER A
-	0x0042, 0x0062,	// LATIN CAPITAL LETTER B
-	0x0043, 0x0063,	// LATIN CAPITAL LETTER C
-	0x0044, 0x0064,	// LATIN CAPITAL LETTER D
-	0x0045, 0x0065,	// LATIN CAPITAL LETTER E
-	0x0046, 0x0066,	// LATIN CAPITAL LETTER F
-	0x0047, 0x0067,	// LATIN CAPITAL LETTER G
-	0x0048, 0x0068, // LATIN CAPITAL LETTER H
-	0x0049, 0x0069, // LATIN CAPITAL LETTER I
-	0x004A, 0x006A, // LATIN CAPITAL LETTER J
-	0x004B, 0x006B, // LATIN CAPITAL LETTER K
-	0x004C, 0x006C, // LATIN CAPITAL LETTER L
-	0x004D, 0x006D, // LATIN CAPITAL LETTER M
-	0x004E, 0x006E, // LATIN CAPITAL LETTER N
-	0x004F, 0x006F, // LATIN CAPITAL LETTER O
-	0x0050, 0x0070, // LATIN CAPITAL LETTER P
-	0x0051, 0x0071, // LATIN CAPITAL LETTER Q
-	0x0052, 0x0072, // LATIN CAPITAL LETTER R
-	0x0053, 0x0073, // LATIN CAPITAL LETTER S
-	0x0054, 0x0074, // LATIN CAPITAL LETTER T
-	0x0055, 0x0075, // LATIN CAPITAL LETTER U
-	0x0056, 0x0076, // LATIN CAPITAL LETTER V
-	0x0057, 0x0077, // LATIN CAPITAL LETTER W
-	0x0058, 0x0078, // LATIN CAPITAL LETTER X
-	0x0059, 0x0079, // LATIN CAPITAL LETTER Y
-	0x005A, 0x007A, // LATIN CAPITAL LETTER Z
-	0x00B5, 0x03BC, // MICRO SIGN
-	0x00C0, 0x00E0, // LATIN CAPITAL LETTER A WITH GRAVE
-	0x00C1, 0x00E1, // LATIN CAPITAL LETTER A WITH ACUTE
-	0x00C2, 0x00E2, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-	0x00C3, 0x00E3, // LATIN CAPITAL LETTER A WITH TILDE
-	0x00C4, 0x00E4, // LATIN CAPITAL LETTER A WITH DIAERESIS
-	0x00C5, 0x00E5, // LATIN CAPITAL LETTER A WITH RING ABOVE
-	0x00C6, 0x00E6, // LATIN CAPITAL LETTER AE
-	0x00C7, 0x00E7, // LATIN CAPITAL LETTER C WITH CEDILLA
-	0x00C8, 0x00E8, // LATIN CAPITAL LETTER E WITH GRAVE
-	0x00C9, 0x00E9, // LATIN CAPITAL LETTER E WITH ACUTE
-	0x00CA, 0x00EA, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-	0x00CB, 0x00EB, // LATIN CAPITAL LETTER E WITH DIAERESIS
-	0x00CC, 0x00EC, // LATIN CAPITAL LETTER I WITH GRAVE
-	0x00CD, 0x00ED, // LATIN CAPITAL LETTER I WITH ACUTE
-	0x00CE, 0x00EE, // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-	0x00CF, 0x00EF, // LATIN CAPITAL LETTER I WITH DIAERESIS
-	0x00D0, 0x00F0, // LATIN CAPITAL LETTER ETH
-	0x00D1, 0x00F1, // LATIN CAPITAL LETTER N WITH TILDE
-	0x00D2, 0x00F2, // LATIN CAPITAL LETTER O WITH GRAVE
-	0x00D3, 0x00F3, // LATIN CAPITAL LETTER O WITH ACUTE
-	0x00D4, 0x00F4, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-	0x00D5, 0x00F5, // LATIN CAPITAL LETTER O WITH TILDE
-	0x00D6, 0x00F6, // LATIN CAPITAL LETTER O WITH DIAERESIS
-	0x00D8, 0x00F8, // LATIN CAPITAL LETTER O WITH STROKE
-	0x00D9, 0x00F9, // LATIN CAPITAL LETTER U WITH GRAVE
-	0x00DA, 0x00FA, // LATIN CAPITAL LETTER U WITH ACUTE
-	0x00DB, 0x00FB, // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-	0x00DC, 0x00FC, // LATIN CAPITAL LETTER U WITH DIAERESIS
-	0x00DD, 0x00FD, // LATIN CAPITAL LETTER Y WITH ACUTE
-	0x00DE, 0x00FE, // LATIN CAPITAL LETTER THORN
-	0x00DF, 0x00DF , // # LATIN SMALL LETTER SHARP S
-	0x0100, 0x0101, // LATIN CAPITAL LETTER A WITH MACRON
-	0x0102, 0x0103, // LATIN CAPITAL LETTER A WITH BREVE
-	0x0104, 0x0105, // LATIN CAPITAL LETTER A WITH OGONEK
-	0x0106, 0x0107, // LATIN CAPITAL LETTER C WITH ACUTE
-	0x0108, 0x0109, // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-	0x010A, 0x010B, // LATIN CAPITAL LETTER C WITH DOT ABOVE
-	0x010C, 0x010D, // LATIN CAPITAL LETTER C WITH CARON
-	0x010E, 0x010F, // LATIN CAPITAL LETTER D WITH CARON
-	0x0110, 0x0111, // LATIN CAPITAL LETTER D WITH STROKE
-	0x0112, 0x0113, // LATIN CAPITAL LETTER E WITH MACRON
-	0x0114, 0x0115, // LATIN CAPITAL LETTER E WITH BREVE
-	0x0116, 0x0117, // LATIN CAPITAL LETTER E WITH DOT ABOVE
-	0x0118, 0x0119, // LATIN CAPITAL LETTER E WITH OGONEK
-	0x011A, 0x011B, // LATIN CAPITAL LETTER E WITH CARON
-	0x011C, 0x011D, // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-	0x011E, 0x011F, // LATIN CAPITAL LETTER G WITH BREVE
-	0x0120, 0x0121, // LATIN CAPITAL LETTER G WITH DOT ABOVE
-	0x0122, 0x0123, // LATIN CAPITAL LETTER G WITH CEDILLA
-	0x0124, 0x0125, // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-	0x0126, 0x0127, // LATIN CAPITAL LETTER H WITH STROKE
-	0x0128, 0x0129, // LATIN CAPITAL LETTER I WITH TILDE
-	0x012A, 0x012B, // LATIN CAPITAL LETTER I WITH MACRON
-	0x012C, 0x012D, // LATIN CAPITAL LETTER I WITH BREVE
-	0x012E, 0x012F, // LATIN CAPITAL LETTER I WITH OGONEK
-	0x0130, 0x0069, // LATIN CAPITAL LETTER I WITH DOT ABOVE
-	0x0132, 0x0133, // LATIN CAPITAL LIGATURE IJ
-	0x0134, 0x0135, // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-	0x0136, 0x0137, // LATIN CAPITAL LETTER K WITH CEDILLA
-	0x0139, 0x013A, // LATIN CAPITAL LETTER L WITH ACUTE
-	0x013B, 0x013C, // LATIN CAPITAL LETTER L WITH CEDILLA
-	0x013D, 0x013E, // LATIN CAPITAL LETTER L WITH CARON
-	0x013F, 0x0140, // LATIN CAPITAL LETTER L WITH MIDDLE DOT
-	0x0141, 0x0142, // LATIN CAPITAL LETTER L WITH STROKE
-	0x0143, 0x0144, // LATIN CAPITAL LETTER N WITH ACUTE
-	0x0145, 0x0146, // LATIN CAPITAL LETTER N WITH CEDILLA
-	0x0147, 0x0148, // LATIN CAPITAL LETTER N WITH CARON
-	0x0149, 0x02BC , // # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-	0x014A, 0x014B, // LATIN CAPITAL LETTER ENG
-	0x014C, 0x014D, // LATIN CAPITAL LETTER O WITH MACRON
-	0x014E, 0x014F, // LATIN CAPITAL LETTER O WITH BREVE
-	0x0150, 0x0151, // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-	0x0152, 0x0153, // LATIN CAPITAL LIGATURE OE
-	0x0154, 0x0155, // LATIN CAPITAL LETTER R WITH ACUTE
-	0x0156, 0x0157, // LATIN CAPITAL LETTER R WITH CEDILLA
-	0x0158, 0x0159, // LATIN CAPITAL LETTER R WITH CARON
-	0x015A, 0x015B, // LATIN CAPITAL LETTER S WITH ACUTE
-	0x015C, 0x015D, // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-	0x015E, 0x015F, // LATIN CAPITAL LETTER S WITH CEDILLA
-	0x0160, 0x0161, // LATIN CAPITAL LETTER S WITH CARON
-	0x0162, 0x0163, // LATIN CAPITAL LETTER T WITH CEDILLA
-	0x0164, 0x0165, // LATIN CAPITAL LETTER T WITH CARON
-	0x0166, 0x0167, // LATIN CAPITAL LETTER T WITH STROKE
-	0x0168, 0x0169, // LATIN CAPITAL LETTER U WITH TILDE
-	0x016A, 0x016B, // LATIN CAPITAL LETTER U WITH MACRON
-	0x016C, 0x016D, // LATIN CAPITAL LETTER U WITH BREVE
-	0x016E, 0x016F, // LATIN CAPITAL LETTER U WITH RING ABOVE
-	0x0170, 0x0171, // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-	0x0172, 0x0173, // LATIN CAPITAL LETTER U WITH OGONEK
-	0x0174, 0x0175, // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-	0x0176, 0x0177, // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-	0x0178, 0x00FF, // LATIN CAPITAL LETTER Y WITH DIAERESIS
-	0x0179, 0x017A, // LATIN CAPITAL LETTER Z WITH ACUTE
-	0x017B, 0x017C, // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-	0x017D, 0x017E, // LATIN CAPITAL LETTER Z WITH CARON
-	0x017F, 0x0073, // LATIN SMALL LETTER LONG S
-	0x0181, 0x0253, // LATIN CAPITAL LETTER B WITH HOOK
-	0x0182, 0x0183, // LATIN CAPITAL LETTER B WITH TOPBAR
-	0x0184, 0x0185, // LATIN CAPITAL LETTER TONE SIX
-	0x0186, 0x0254, // LATIN CAPITAL LETTER OPEN O
-	0x0187, 0x0188, // LATIN CAPITAL LETTER C WITH HOOK
-	0x0189, 0x0256, // LATIN CAPITAL LETTER AFRICAN D
-	0x018A, 0x0257, // LATIN CAPITAL LETTER D WITH HOOK
-	0x018B, 0x018C, // LATIN CAPITAL LETTER D WITH TOPBAR
-	0x018E, 0x01DD, // LATIN CAPITAL LETTER REVERSED E
-	0x018F, 0x0259, // LATIN CAPITAL LETTER SCHWA
-	0x0190, 0x025B, // LATIN CAPITAL LETTER OPEN E
-	0x0191, 0x0192, // LATIN CAPITAL LETTER F WITH HOOK
-	0x0193, 0x0260, // LATIN CAPITAL LETTER G WITH HOOK
-	0x0194, 0x0263, // LATIN CAPITAL LETTER GAMMA
-	0x0196, 0x0269, // LATIN CAPITAL LETTER IOTA
-	0x0197, 0x0268, // LATIN CAPITAL LETTER I WITH STROKE
-	0x0198, 0x0199, // LATIN CAPITAL LETTER K WITH HOOK
-	0x019C, 0x026F, // LATIN CAPITAL LETTER TURNED M
-	0x019D, 0x0272, // LATIN CAPITAL LETTER N WITH LEFT HOOK
-	0x019F, 0x0275, // LATIN CAPITAL LETTER O WITH MIDDLE TILDE
-	0x01A0, 0x01A1, // LATIN CAPITAL LETTER O WITH HORN
-	0x01A2, 0x01A3, // LATIN CAPITAL LETTER OI
-	0x01A4, 0x01A5, // LATIN CAPITAL LETTER P WITH HOOK
-	0x01A6, 0x0280, // LATIN LETTER YR
-	0x01A7, 0x01A8, // LATIN CAPITAL LETTER TONE TWO
-	0x01A9, 0x0283, // LATIN CAPITAL LETTER ESH
-	0x01AC, 0x01AD, // LATIN CAPITAL LETTER T WITH HOOK
-	0x01AE, 0x0288, // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
-	0x01AF, 0x01B0, // LATIN CAPITAL LETTER U WITH HORN
-	0x01B1, 0x028A, // LATIN CAPITAL LETTER UPSILON
-	0x01B2, 0x028B, // LATIN CAPITAL LETTER V WITH HOOK
-	0x01B3, 0x01B4, // LATIN CAPITAL LETTER Y WITH HOOK
-	0x01B5, 0x01B6, // LATIN CAPITAL LETTER Z WITH STROKE
-	0x01B7, 0x0292, // LATIN CAPITAL LETTER EZH
-	0x01B8, 0x01B9, // LATIN CAPITAL LETTER EZH REVERSED
-	0x01BC, 0x01BD, // LATIN CAPITAL LETTER TONE FIVE
-	0x01C4, 0x01C6, // LATIN CAPITAL LETTER DZ WITH CARON
-	0x01C5, 0x01C6, // LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-	0x01C7, 0x01C9, // LATIN CAPITAL LETTER LJ
-	0x01C8, 0x01C9, // LATIN CAPITAL LETTER L WITH SMALL LETTER J
-	0x01CA, 0x01CC, // LATIN CAPITAL LETTER NJ
-	0x01CB, 0x01CC, // LATIN CAPITAL LETTER N WITH SMALL LETTER J
-	0x01CD, 0x01CE, // LATIN CAPITAL LETTER A WITH CARON
-	0x01CF, 0x01D0, // LATIN CAPITAL LETTER I WITH CARON
-	0x01D1, 0x01D2, // LATIN CAPITAL LETTER O WITH CARON
-	0x01D3, 0x01D4, // LATIN CAPITAL LETTER U WITH CARON
-	0x01D5, 0x01D6, // LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-	0x01D7, 0x01D8, // LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-	0x01D9, 0x01DA, // LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-	0x01DB, 0x01DC, // LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-	0x01DE, 0x01DF, // LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-	0x01E0, 0x01E1, // LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-	0x01E2, 0x01E3, // LATIN CAPITAL LETTER AE WITH MACRON
-	0x01E4, 0x01E5, // LATIN CAPITAL LETTER G WITH STROKE
-	0x01E6, 0x01E7, // LATIN CAPITAL LETTER G WITH CARON
-	0x01E8, 0x01E9, // LATIN CAPITAL LETTER K WITH CARON
-	0x01EA, 0x01EB, // LATIN CAPITAL LETTER O WITH OGONEK
-	0x01EC, 0x01ED, // LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-	0x01EE, 0x01EF, // LATIN CAPITAL LETTER EZH WITH CARON
-	0x01F0, 0x006A , // # LATIN SMALL LETTER J WITH CARON
-	0x01F1, 0x01F3, // LATIN CAPITAL LETTER DZ
-	0x01F2, 0x01F3, // LATIN CAPITAL LETTER D WITH SMALL LETTER Z
-	0x01F4, 0x01F5, // LATIN CAPITAL LETTER G WITH ACUTE
-	0x01F6, 0x0195, // LATIN CAPITAL LETTER HWAIR
-	0x01F7, 0x01BF, // LATIN CAPITAL LETTER WYNN
-	0x01F8, 0x01F9, // LATIN CAPITAL LETTER N WITH GRAVE
-	0x01FA, 0x01FB, // LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-	0x01FC, 0x01FD, // LATIN CAPITAL LETTER AE WITH ACUTE
-	0x01FE, 0x01FF, // LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-	0x0200, 0x0201, // LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-	0x0202, 0x0203, // LATIN CAPITAL LETTER A WITH INVERTED BREVE
-	0x0204, 0x0205, // LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-	0x0206, 0x0207, // LATIN CAPITAL LETTER E WITH INVERTED BREVE
-	0x0208, 0x0209, // LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-	0x020A, 0x020B, // LATIN CAPITAL LETTER I WITH INVERTED BREVE
-	0x020C, 0x020D, // LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-	0x020E, 0x020F, // LATIN CAPITAL LETTER O WITH INVERTED BREVE
-	0x0210, 0x0211, // LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-	0x0212, 0x0213, // LATIN CAPITAL LETTER R WITH INVERTED BREVE
-	0x0214, 0x0215, // LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-	0x0216, 0x0217, // LATIN CAPITAL LETTER U WITH INVERTED BREVE
-	0x0218, 0x0219, // LATIN CAPITAL LETTER S WITH COMMA BELOW
-	0x021A, 0x021B, // LATIN CAPITAL LETTER T WITH COMMA BELOW
-	0x021C, 0x021D, // LATIN CAPITAL LETTER YOGH
-	0x021E, 0x021F, // LATIN CAPITAL LETTER H WITH CARON
-	0x0220, 0x019E, // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-	0x0222, 0x0223, // LATIN CAPITAL LETTER OU
-	0x0224, 0x0225, // LATIN CAPITAL LETTER Z WITH HOOK
-	0x0226, 0x0227, // LATIN CAPITAL LETTER A WITH DOT ABOVE
-	0x0228, 0x0229, // LATIN CAPITAL LETTER E WITH CEDILLA
-	0x022A, 0x022B, // LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-	0x022C, 0x022D, // LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-	0x022E, 0x022F, // LATIN CAPITAL LETTER O WITH DOT ABOVE
-	0x0230, 0x0231, // LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-	0x0232, 0x0233, // LATIN CAPITAL LETTER Y WITH MACRON
-	0x0345, 0x03B9, // COMBINING GREEK YPOGEGRAMMENI
-	0x0386, 0x03AC, // GREEK CAPITAL LETTER ALPHA WITH TONOS
-	0x0388, 0x03AD, // GREEK CAPITAL LETTER EPSILON WITH TONOS
-	0x0389, 0x03AE, // GREEK CAPITAL LETTER ETA WITH TONOS
-	0x038A, 0x03AF, // GREEK CAPITAL LETTER IOTA WITH TONOS
-	0x038C, 0x03CC, // GREEK CAPITAL LETTER OMICRON WITH TONOS
-	0x038E, 0x03CD, // GREEK CAPITAL LETTER UPSILON WITH TONOS
-	0x038F, 0x03CE, // GREEK CAPITAL LETTER OMEGA WITH TONOS
-	0x0390, 0x03B9 , // ; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-	0x0391, 0x03B1, // GREEK CAPITAL LETTER ALPHA
-	0x0392, 0x03B2, // GREEK CAPITAL LETTER BETA
-	0x0393, 0x03B3, // GREEK CAPITAL LETTER GAMMA
-	0x0394, 0x03B4, // GREEK CAPITAL LETTER DELTA
-	0x0395, 0x03B5, // GREEK CAPITAL LETTER EPSILON
-	0x0396, 0x03B6, // GREEK CAPITAL LETTER ZETA
-	0x0397, 0x03B7, // GREEK CAPITAL LETTER ETA
-	0x0398, 0x03B8, // GREEK CAPITAL LETTER THETA
-	0x0399, 0x03B9, // GREEK CAPITAL LETTER IOTA
-	0x039A, 0x03BA, // GREEK CAPITAL LETTER KAPPA
-	0x039B, 0x03BB, // GREEK CAPITAL LETTER LAMDA
-	0x039C, 0x03BC, // GREEK CAPITAL LETTER MU
-	0x039D, 0x03BD, // GREEK CAPITAL LETTER NU
-	0x039E, 0x03BE, // GREEK CAPITAL LETTER XI
-	0x039F, 0x03BF, // GREEK CAPITAL LETTER OMICRON
-	0x03A0, 0x03C0, // GREEK CAPITAL LETTER PI
-	0x03A1, 0x03C1, // GREEK CAPITAL LETTER RHO
-	0x03A3, 0x03C3, // GREEK CAPITAL LETTER SIGMA
-	0x03A4, 0x03C4, // GREEK CAPITAL LETTER TAU
-	0x03A5, 0x03C5, // GREEK CAPITAL LETTER UPSILON
-	0x03A6, 0x03C6, // GREEK CAPITAL LETTER PHI
-	0x03A7, 0x03C7, // GREEK CAPITAL LETTER CHI
-	0x03A8, 0x03C8, // GREEK CAPITAL LETTER PSI
-	0x03A9, 0x03C9, // GREEK CAPITAL LETTER OMEGA
-	0x03AA, 0x03CA, // GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-	0x03AB, 0x03CB, // GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-	0x03B0, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-	0x03C2, 0x03C3, // GREEK SMALL LETTER FINAL SIGMA
-	0x03D0, 0x03B2, // GREEK BETA SYMBOL
-	0x03D1, 0x03B8, // GREEK THETA SYMBOL
-	0x03D5, 0x03C6, // GREEK PHI SYMBOL
-	0x03D6, 0x03C0, // GREEK PI SYMBOL
-	0x03D8, 0x03D9, // GREEK LETTER ARCHAIC KOPPA
-	0x03DA, 0x03DB, // GREEK LETTER STIGMA
-	0x03DC, 0x03DD, // GREEK LETTER DIGAMMA
-	0x03DE, 0x03DF, // GREEK LETTER KOPPA
-	0x03E0, 0x03E1, // GREEK LETTER SAMPI
-	0x03E2, 0x03E3, // COPTIC CAPITAL LETTER SHEI
-	0x03E4, 0x03E5, // COPTIC CAPITAL LETTER FEI
-	0x03E6, 0x03E7, // COPTIC CAPITAL LETTER KHEI
-	0x03E8, 0x03E9, // COPTIC CAPITAL LETTER HORI
-	0x03EA, 0x03EB, // COPTIC CAPITAL LETTER GANGIA
-	0x03EC, 0x03ED, // COPTIC CAPITAL LETTER SHIMA
-	0x03EE, 0x03EF, // COPTIC CAPITAL LETTER DEI
-	0x03F0, 0x03BA, // GREEK KAPPA SYMBOL
-	0x03F1, 0x03C1, // GREEK RHO SYMBOL
-	0x03F4, 0x03B8, // GREEK CAPITAL THETA SYMBOL
-	0x03F5, 0x03B5, // GREEK LUNATE EPSILON SYMBOL
-	0x03F7, 0x03F8, // GREEK CAPITAL LETTER SHO
-	0x03F9, 0x03F2, // GREEK CAPITAL LUNATE SIGMA SYMBOL
-	0x03FA, 0x03FB, // GREEK CAPITAL LETTER SAN
-	0x0400, 0x0450, // CYRILLIC CAPITAL LETTER IE WITH GRAVE
-	0x0401, 0x0451, // CYRILLIC CAPITAL LETTER IO
-	0x0402, 0x0452, // CYRILLIC CAPITAL LETTER DJE
-	0x0403, 0x0453, // CYRILLIC CAPITAL LETTER GJE
-	0x0404, 0x0454, // CYRILLIC CAPITAL LETTER UKRAINIAN IE
-	0x0405, 0x0455, // CYRILLIC CAPITAL LETTER DZE
-	0x0406, 0x0456, // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-	0x0407, 0x0457, // CYRILLIC CAPITAL LETTER YI
-	0x0408, 0x0458, // CYRILLIC CAPITAL LETTER JE
-	0x0409, 0x0459, // CYRILLIC CAPITAL LETTER LJE
-	0x040A, 0x045A, // CYRILLIC CAPITAL LETTER NJE
-	0x040B, 0x045B, // CYRILLIC CAPITAL LETTER TSHE
-	0x040C, 0x045C, // CYRILLIC CAPITAL LETTER KJE
-	0x040D, 0x045D, // CYRILLIC CAPITAL LETTER I WITH GRAVE
-	0x040E, 0x045E, // CYRILLIC CAPITAL LETTER SHORT U
-	0x040F, 0x045F, // CYRILLIC CAPITAL LETTER DZHE
-	0x0410, 0x0430, // CYRILLIC CAPITAL LETTER A
-	0x0411, 0x0431, // CYRILLIC CAPITAL LETTER BE
-	0x0412, 0x0432, // CYRILLIC CAPITAL LETTER VE
-	0x0413, 0x0433, // CYRILLIC CAPITAL LETTER GHE
-	0x0414, 0x0434, // CYRILLIC CAPITAL LETTER DE
-	0x0415, 0x0435, // CYRILLIC CAPITAL LETTER IE
-	0x0416, 0x0436, // CYRILLIC CAPITAL LETTER ZHE
-	0x0417, 0x0437, // CYRILLIC CAPITAL LETTER ZE
-	0x0418, 0x0438, // CYRILLIC CAPITAL LETTER I
-	0x0419, 0x0439, // CYRILLIC CAPITAL LETTER SHORT I
-	0x041A, 0x043A, // CYRILLIC CAPITAL LETTER KA
-	0x041B, 0x043B, // CYRILLIC CAPITAL LETTER EL
-	0x041C, 0x043C, // CYRILLIC CAPITAL LETTER EM
-	0x041D, 0x043D, // CYRILLIC CAPITAL LETTER EN
-	0x041E, 0x043E, // CYRILLIC CAPITAL LETTER O
-	0x041F, 0x043F, // CYRILLIC CAPITAL LETTER PE
-	0x0420, 0x0440, // CYRILLIC CAPITAL LETTER ER
-	0x0421, 0x0441, // CYRILLIC CAPITAL LETTER ES
-	0x0422, 0x0442, // CYRILLIC CAPITAL LETTER TE
-	0x0423, 0x0443, // CYRILLIC CAPITAL LETTER U
-	0x0424, 0x0444, // CYRILLIC CAPITAL LETTER EF
-	0x0425, 0x0445, // CYRILLIC CAPITAL LETTER HA
-	0x0426, 0x0446, // CYRILLIC CAPITAL LETTER TSE
-	0x0427, 0x0447, // CYRILLIC CAPITAL LETTER CHE
-	0x0428, 0x0448, // CYRILLIC CAPITAL LETTER SHA
-	0x0429, 0x0449, // CYRILLIC CAPITAL LETTER SHCHA
-	0x042A, 0x044A, // CYRILLIC CAPITAL LETTER HARD SIGN
-	0x042B, 0x044B, // CYRILLIC CAPITAL LETTER YERU
-	0x042C, 0x044C, // CYRILLIC CAPITAL LETTER SOFT SIGN
-	0x042D, 0x044D, // CYRILLIC CAPITAL LETTER E
-	0x042E, 0x044E, // CYRILLIC CAPITAL LETTER YU
-	0x042F, 0x044F, // CYRILLIC CAPITAL LETTER YA
-	0x0460, 0x0461, // CYRILLIC CAPITAL LETTER OMEGA
-	0x0462, 0x0463, // CYRILLIC CAPITAL LETTER YAT
-	0x0464, 0x0465, // CYRILLIC CAPITAL LETTER IOTIFIED E
-	0x0466, 0x0467, // CYRILLIC CAPITAL LETTER LITTLE YUS
-	0x0468, 0x0469, // CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
-	0x046A, 0x046B, // CYRILLIC CAPITAL LETTER BIG YUS
-	0x046C, 0x046D, // CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
-	0x046E, 0x046F, // CYRILLIC CAPITAL LETTER KSI
-	0x0470, 0x0471, // CYRILLIC CAPITAL LETTER PSI
-	0x0472, 0x0473, // CYRILLIC CAPITAL LETTER FITA
-	0x0474, 0x0475, // CYRILLIC CAPITAL LETTER IZHITSA
-	0x0476, 0x0477, // CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-	0x0478, 0x0479, // CYRILLIC CAPITAL LETTER UK
-	0x047A, 0x047B, // CYRILLIC CAPITAL LETTER ROUND OMEGA
-	0x047C, 0x047D, // CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
-	0x047E, 0x047F, // CYRILLIC CAPITAL LETTER OT
-	0x0480, 0x0481, // CYRILLIC CAPITAL LETTER KOPPA
-	0x048A, 0x048B, // CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
-	0x048C, 0x048D, // CYRILLIC CAPITAL LETTER SEMISOFT SIGN
-	0x048E, 0x048F, // CYRILLIC CAPITAL LETTER ER WITH TICK
-	0x0490, 0x0491, // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-	0x0492, 0x0493, // CYRILLIC CAPITAL LETTER GHE WITH STROKE
-	0x0494, 0x0495, // CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
-	0x0496, 0x0497, // CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-	0x0498, 0x0499, // CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-	0x049A, 0x049B, // CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-	0x049C, 0x049D, // CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-	0x049E, 0x049F, // CYRILLIC CAPITAL LETTER KA WITH STROKE
-	0x04A0, 0x04A1, // CYRILLIC CAPITAL LETTER BASHKIR KA
-	0x04A2, 0x04A3, // CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-	0x04A4, 0x04A5, // CYRILLIC CAPITAL LIGATURE EN GHE
-	0x04A6, 0x04A7, // CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
-	0x04A8, 0x04A9, // CYRILLIC CAPITAL LETTER ABKHASIAN HA
-	0x04AA, 0x04AB, // CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-	0x04AC, 0x04AD, // CYRILLIC CAPITAL LETTER TE WITH DESCENDER
-	0x04AE, 0x04AF, // CYRILLIC CAPITAL LETTER STRAIGHT U
-	0x04B0, 0x04B1, // CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-	0x04B2, 0x04B3, // CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-	0x04B4, 0x04B5, // CYRILLIC CAPITAL LIGATURE TE TSE
-	0x04B6, 0x04B7, // CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-	0x04B8, 0x04B9, // CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-	0x04BA, 0x04BB, // CYRILLIC CAPITAL LETTER SHHA
-	0x04BC, 0x04BD, // CYRILLIC CAPITAL LETTER ABKHASIAN CHE
-	0x04BE, 0x04BF, // CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
-	0x04C1, 0x04C2, // CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-	0x04C3, 0x04C4, // CYRILLIC CAPITAL LETTER KA WITH HOOK
-	0x04C5, 0x04C6, // CYRILLIC CAPITAL LETTER EL WITH TAIL
-	0x04C7, 0x04C8, // CYRILLIC CAPITAL LETTER EN WITH HOOK
-	0x04C9, 0x04CA, // CYRILLIC CAPITAL LETTER EN WITH TAIL
-	0x04CB, 0x04CC, // CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
-	0x04CD, 0x04CE, // CYRILLIC CAPITAL LETTER EM WITH TAIL
-	0x04D0, 0x04D1, // CYRILLIC CAPITAL LETTER A WITH BREVE
-	0x04D2, 0x04D3, // CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-	0x04D4, 0x04D5, // CYRILLIC CAPITAL LIGATURE A IE
-	0x04D6, 0x04D7, // CYRILLIC CAPITAL LETTER IE WITH BREVE
-	0x04D8, 0x04D9, // CYRILLIC CAPITAL LETTER SCHWA
-	0x04DA, 0x04DB, // CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-	0x04DC, 0x04DD, // CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-	0x04DE, 0x04DF, // CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-	0x04E0, 0x04E1, // CYRILLIC CAPITAL LETTER ABKHASIAN DZE
-	0x04E2, 0x04E3, // CYRILLIC CAPITAL LETTER I WITH MACRON
-	0x04E4, 0x04E5, // CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-	0x04E6, 0x04E7, // CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-	0x04E8, 0x04E9, // CYRILLIC CAPITAL LETTER BARRED O
-	0x04EA, 0x04EB, // CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-	0x04EC, 0x04ED, // CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-	0x04EE, 0x04EF, // CYRILLIC CAPITAL LETTER U WITH MACRON
-	0x04F0, 0x04F1, // CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-	0x04F2, 0x04F3, // CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-	0x04F4, 0x04F5, // CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-	0x04F8, 0x04F9, // CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-	0x0500, 0x0501, // CYRILLIC CAPITAL LETTER KOMI DE
-	0x0502, 0x0503, // CYRILLIC CAPITAL LETTER KOMI DJE
-	0x0504, 0x0505, // CYRILLIC CAPITAL LETTER KOMI ZJE
-	0x0506, 0x0507, // CYRILLIC CAPITAL LETTER KOMI DZJE
-	0x0508, 0x0509, // CYRILLIC CAPITAL LETTER KOMI LJE
-	0x050A, 0x050B, // CYRILLIC CAPITAL LETTER KOMI NJE
-	0x050C, 0x050D, // CYRILLIC CAPITAL LETTER KOMI SJE
-	0x050E, 0x050F, // CYRILLIC CAPITAL LETTER KOMI TJE
-	0x0531, 0x0561, // ARMENIAN CAPITAL LETTER AYB
-	0x0532, 0x0562, // ARMENIAN CAPITAL LETTER BEN
-	0x0533, 0x0563, // ARMENIAN CAPITAL LETTER GIM
-	0x0534, 0x0564, // ARMENIAN CAPITAL LETTER DA
-	0x0535, 0x0565, // ARMENIAN CAPITAL LETTER ECH
-	0x0536, 0x0566, // ARMENIAN CAPITAL LETTER ZA
-	0x0537, 0x0567, // ARMENIAN CAPITAL LETTER EH
-	0x0538, 0x0568, // ARMENIAN CAPITAL LETTER ET
-	0x0539, 0x0569, // ARMENIAN CAPITAL LETTER TO
-	0x053A, 0x056A, // ARMENIAN CAPITAL LETTER ZHE
-	0x053B, 0x056B, // ARMENIAN CAPITAL LETTER INI
-	0x053C, 0x056C, // ARMENIAN CAPITAL LETTER LIWN
-	0x053D, 0x056D, // ARMENIAN CAPITAL LETTER XEH
-	0x053E, 0x056E, // ARMENIAN CAPITAL LETTER CA
-	0x053F, 0x056F, // ARMENIAN CAPITAL LETTER KEN
-	0x0540, 0x0570, // ARMENIAN CAPITAL LETTER HO
-	0x0541, 0x0571, // ARMENIAN CAPITAL LETTER JA
-	0x0542, 0x0572, // ARMENIAN CAPITAL LETTER GHAD
-	0x0543, 0x0573, // ARMENIAN CAPITAL LETTER CHEH
-	0x0544, 0x0574, // ARMENIAN CAPITAL LETTER MEN
-	0x0545, 0x0575, // ARMENIAN CAPITAL LETTER YI
-	0x0546, 0x0576, // ARMENIAN CAPITAL LETTER NOW
-	0x0547, 0x0577, // ARMENIAN CAPITAL LETTER SHA
-	0x0548, 0x0578, // ARMENIAN CAPITAL LETTER VO
-	0x0549, 0x0579, // ARMENIAN CAPITAL LETTER CHA
-	0x054A, 0x057A, // ARMENIAN CAPITAL LETTER PEH
-	0x054B, 0x057B, // ARMENIAN CAPITAL LETTER JHEH
-	0x054C, 0x057C, // ARMENIAN CAPITAL LETTER RA
-	0x054D, 0x057D, // ARMENIAN CAPITAL LETTER SEH
-	0x054E, 0x057E, // ARMENIAN CAPITAL LETTER VEW
-	0x054F, 0x057F, // ARMENIAN CAPITAL LETTER TIWN
-	0x0550, 0x0580, // ARMENIAN CAPITAL LETTER REH
-	0x0551, 0x0581, // ARMENIAN CAPITAL LETTER CO
-	0x0552, 0x0582, // ARMENIAN CAPITAL LETTER YIWN
-	0x0553, 0x0583, // ARMENIAN CAPITAL LETTER PIWR
-	0x0554, 0x0584, // ARMENIAN CAPITAL LETTER KEH
-	0x0555, 0x0585, // ARMENIAN CAPITAL LETTER OH
-	0x0556, 0x0586, // ARMENIAN CAPITAL LETTER FEH
-	0x0587, 0x0565 , // # ARMENIAN SMALL LIGATURE ECH YIWN
-	0x1E00, 0x1E01, // LATIN CAPITAL LETTER A WITH RING BELOW
-	0x1E02, 0x1E03, // LATIN CAPITAL LETTER B WITH DOT ABOVE
-	0x1E04, 0x1E05, // LATIN CAPITAL LETTER B WITH DOT BELOW
-	0x1E06, 0x1E07, // LATIN CAPITAL LETTER B WITH LINE BELOW
-	0x1E08, 0x1E09, // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-	0x1E0A, 0x1E0B, // LATIN CAPITAL LETTER D WITH DOT ABOVE
-	0x1E0C, 0x1E0D, // LATIN CAPITAL LETTER D WITH DOT BELOW
-	0x1E0E, 0x1E0F, // LATIN CAPITAL LETTER D WITH LINE BELOW
-	0x1E10, 0x1E11, // LATIN CAPITAL LETTER D WITH CEDILLA
-	0x1E12, 0x1E13, // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-	0x1E14, 0x1E15, // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-	0x1E16, 0x1E17, // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-	0x1E18, 0x1E19, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-	0x1E1A, 0x1E1B, // LATIN CAPITAL LETTER E WITH TILDE BELOW
-	0x1E1C, 0x1E1D, // LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-	0x1E1E, 0x1E1F, // LATIN CAPITAL LETTER F WITH DOT ABOVE
-	0x1E20, 0x1E21, // LATIN CAPITAL LETTER G WITH MACRON
-	0x1E22, 0x1E23, // LATIN CAPITAL LETTER H WITH DOT ABOVE
-	0x1E24, 0x1E25, // LATIN CAPITAL LETTER H WITH DOT BELOW
-	0x1E26, 0x1E27, // LATIN CAPITAL LETTER H WITH DIAERESIS
-	0x1E28, 0x1E29, // LATIN CAPITAL LETTER H WITH CEDILLA
-	0x1E2A, 0x1E2B, // LATIN CAPITAL LETTER H WITH BREVE BELOW
-	0x1E2C, 0x1E2D, // LATIN CAPITAL LETTER I WITH TILDE BELOW
-	0x1E2E, 0x1E2F, // LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-	0x1E30, 0x1E31, // LATIN CAPITAL LETTER K WITH ACUTE
-	0x1E32, 0x1E33, // LATIN CAPITAL LETTER K WITH DOT BELOW
-	0x1E34, 0x1E35, // LATIN CAPITAL LETTER K WITH LINE BELOW
-	0x1E36, 0x1E37, // LATIN CAPITAL LETTER L WITH DOT BELOW
-	0x1E38, 0x1E39, // LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-	0x1E3A, 0x1E3B, // LATIN CAPITAL LETTER L WITH LINE BELOW
-	0x1E3C, 0x1E3D, // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-	0x1E3E, 0x1E3F, // LATIN CAPITAL LETTER M WITH ACUTE
-	0x1E40, 0x1E41, // LATIN CAPITAL LETTER M WITH DOT ABOVE
-	0x1E42, 0x1E43, // LATIN CAPITAL LETTER M WITH DOT BELOW
-	0x1E44, 0x1E45, // LATIN CAPITAL LETTER N WITH DOT ABOVE
-	0x1E46, 0x1E47, // LATIN CAPITAL LETTER N WITH DOT BELOW
-	0x1E48, 0x1E49, // LATIN CAPITAL LETTER N WITH LINE BELOW
-	0x1E4A, 0x1E4B, // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-	0x1E4C, 0x1E4D, // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-	0x1E4E, 0x1E4F, // LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-	0x1E50, 0x1E51, // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-	0x1E52, 0x1E53, // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-	0x1E54, 0x1E55, // LATIN CAPITAL LETTER P WITH ACUTE
-	0x1E56, 0x1E57, // LATIN CAPITAL LETTER P WITH DOT ABOVE
-	0x1E58, 0x1E59, // LATIN CAPITAL LETTER R WITH DOT ABOVE
-	0x1E5A, 0x1E5B, // LATIN CAPITAL LETTER R WITH DOT BELOW
-	0x1E5C, 0x1E5D, // LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-	0x1E5E, 0x1E5F, // LATIN CAPITAL LETTER R WITH LINE BELOW
-	0x1E60, 0x1E61, // LATIN CAPITAL LETTER S WITH DOT ABOVE
-	0x1E62, 0x1E63, // LATIN CAPITAL LETTER S WITH DOT BELOW
-	0x1E64, 0x1E65, // LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-	0x1E66, 0x1E67, // LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-	0x1E68, 0x1E69, // LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-	0x1E6A, 0x1E6B, // LATIN CAPITAL LETTER T WITH DOT ABOVE
-	0x1E6C, 0x1E6D, // LATIN CAPITAL LETTER T WITH DOT BELOW
-	0x1E6E, 0x1E6F, // LATIN CAPITAL LETTER T WITH LINE BELOW
-	0x1E70, 0x1E71, // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-	0x1E72, 0x1E73, // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-	0x1E74, 0x1E75, // LATIN CAPITAL LETTER U WITH TILDE BELOW
-	0x1E76, 0x1E77, // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-	0x1E78, 0x1E79, // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-	0x1E7A, 0x1E7B, // LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-	0x1E7C, 0x1E7D, // LATIN CAPITAL LETTER V WITH TILDE
-	0x1E7E, 0x1E7F, // LATIN CAPITAL LETTER V WITH DOT BELOW
-	0x1E80, 0x1E81, // LATIN CAPITAL LETTER W WITH GRAVE
-	0x1E82, 0x1E83, // LATIN CAPITAL LETTER W WITH ACUTE
-	0x1E84, 0x1E85, // LATIN CAPITAL LETTER W WITH DIAERESIS
-	0x1E86, 0x1E87, // LATIN CAPITAL LETTER W WITH DOT ABOVE
-	0x1E88, 0x1E89, // LATIN CAPITAL LETTER W WITH DOT BELOW
-	0x1E8A, 0x1E8B, // LATIN CAPITAL LETTER X WITH DOT ABOVE
-	0x1E8C, 0x1E8D, // LATIN CAPITAL LETTER X WITH DIAERESIS
-	0x1E8E, 0x1E8F, // LATIN CAPITAL LETTER Y WITH DOT ABOVE
-	0x1E90, 0x1E91, // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-	0x1E92, 0x1E93, // LATIN CAPITAL LETTER Z WITH DOT BELOW
-	0x1E94, 0x1E95, // LATIN CAPITAL LETTER Z WITH LINE BELOW
-	0x1E96, 0x0068 , // # LATIN SMALL LETTER H WITH LINE BELOW
-	0x1E97, 0x0074 , // # LATIN SMALL LETTER T WITH DIAERESIS
-	0x1E98, 0x0077 , // # LATIN SMALL LETTER W WITH RING ABOVE
-	0x1E99, 0x0079 , // # LATIN SMALL LETTER Y WITH RING ABOVE
-	0x1E9A, 0x0061 , // # LATIN SMALL LETTER A WITH RIGHT HALF RING
-	0x1E9B, 0x1E61, // LATIN SMALL LETTER LONG S WITH DOT ABOVE
-	0x1EA0, 0x1EA1, // LATIN CAPITAL LETTER A WITH DOT BELOW
-	0x1EA2, 0x1EA3, // LATIN CAPITAL LETTER A WITH HOOK ABOVE
-	0x1EA4, 0x1EA5, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-	0x1EA6, 0x1EA7, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-	0x1EA8, 0x1EA9, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1EAA, 0x1EAB, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-	0x1EAC, 0x1EAD, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-	0x1EAE, 0x1EAF, // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-	0x1EB0, 0x1EB1, // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-	0x1EB2, 0x1EB3, // LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-	0x1EB4, 0x1EB5, // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-	0x1EB6, 0x1EB7, // LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-	0x1EB8, 0x1EB9, // LATIN CAPITAL LETTER E WITH DOT BELOW
-	0x1EBA, 0x1EBB, // LATIN CAPITAL LETTER E WITH HOOK ABOVE
-	0x1EBC, 0x1EBD, // LATIN CAPITAL LETTER E WITH TILDE
-	0x1EBE, 0x1EBF, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-	0x1EC0, 0x1EC1, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-	0x1EC2, 0x1EC3, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1EC4, 0x1EC5, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-	0x1EC6, 0x1EC7, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-	0x1EC8, 0x1EC9, // LATIN CAPITAL LETTER I WITH HOOK ABOVE
-	0x1ECA, 0x1ECB, // LATIN CAPITAL LETTER I WITH DOT BELOW
-	0x1ECC, 0x1ECD, // LATIN CAPITAL LETTER O WITH DOT BELOW
-	0x1ECE, 0x1ECF, // LATIN CAPITAL LETTER O WITH HOOK ABOVE
-	0x1ED0, 0x1ED1, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-	0x1ED2, 0x1ED3, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-	0x1ED4, 0x1ED5, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1ED6, 0x1ED7, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-	0x1ED8, 0x1ED9, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-	0x1EDA, 0x1EDB, // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-	0x1EDC, 0x1EDD, // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-	0x1EDE, 0x1EDF, // LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-	0x1EE0, 0x1EE1, // LATIN CAPITAL LETTER O WITH HORN AND TILDE
-	0x1EE2, 0x1EE3, // LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-	0x1EE4, 0x1EE5, // LATIN CAPITAL LETTER U WITH DOT BELOW
-	0x1EE6, 0x1EE7, // LATIN CAPITAL LETTER U WITH HOOK ABOVE
-	0x1EE8, 0x1EE9, // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-	0x1EEA, 0x1EEB, // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-	0x1EEC, 0x1EED, // LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-	0x1EEE, 0x1EEF, // LATIN CAPITAL LETTER U WITH HORN AND TILDE
-	0x1EF0, 0x1EF1, // LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-	0x1EF2, 0x1EF3, // LATIN CAPITAL LETTER Y WITH GRAVE
-	0x1EF4, 0x1EF5, // LATIN CAPITAL LETTER Y WITH DOT BELOW
-	0x1EF6, 0x1EF7, // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-	0x1EF8, 0x1EF9, // LATIN CAPITAL LETTER Y WITH TILDE
-	0x1F08, 0x1F00, // GREEK CAPITAL LETTER ALPHA WITH PSILI
-	0x1F09, 0x1F01, // GREEK CAPITAL LETTER ALPHA WITH DASIA
-	0x1F0A, 0x1F02, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-	0x1F0B, 0x1F03, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-	0x1F0C, 0x1F04, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-	0x1F0D, 0x1F05, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-	0x1F0E, 0x1F06, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-	0x1F0F, 0x1F07, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-	0x1F18, 0x1F10, // GREEK CAPITAL LETTER EPSILON WITH PSILI
-	0x1F19, 0x1F11, // GREEK CAPITAL LETTER EPSILON WITH DASIA
-	0x1F1A, 0x1F12, // GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-	0x1F1B, 0x1F13, // GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-	0x1F1C, 0x1F14, // GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-	0x1F1D, 0x1F15, // GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-	0x1F28, 0x1F20, // GREEK CAPITAL LETTER ETA WITH PSILI
-	0x1F29, 0x1F21, // GREEK CAPITAL LETTER ETA WITH DASIA
-	0x1F2A, 0x1F22, // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-	0x1F2B, 0x1F23, // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-	0x1F2C, 0x1F24, // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-	0x1F2D, 0x1F25, // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-	0x1F2E, 0x1F26, // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-	0x1F2F, 0x1F27, // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-	0x1F38, 0x1F30, // GREEK CAPITAL LETTER IOTA WITH PSILI
-	0x1F39, 0x1F31, // GREEK CAPITAL LETTER IOTA WITH DASIA
-	0x1F3A, 0x1F32, // GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-	0x1F3B, 0x1F33, // GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-	0x1F3C, 0x1F34, // GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-	0x1F3D, 0x1F35, // GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-	0x1F3E, 0x1F36, // GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-	0x1F3F, 0x1F37, // GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-	0x1F48, 0x1F40, // GREEK CAPITAL LETTER OMICRON WITH PSILI
-	0x1F49, 0x1F41, // GREEK CAPITAL LETTER OMICRON WITH DASIA
-	0x1F4A, 0x1F42, // GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-	0x1F4B, 0x1F43, // GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-	0x1F4C, 0x1F44, // GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-	0x1F4D, 0x1F45, // GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-	0x1F50, 0x03C5 , // # GREEK SMALL LETTER UPSILON WITH PSILI
-	0x1F52, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-	0x1F54, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-	0x1F56, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-	0x1F59, 0x1F51, // GREEK CAPITAL LETTER UPSILON WITH DASIA
-	0x1F5B, 0x1F53, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-	0x1F5D, 0x1F55, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-	0x1F5F, 0x1F57, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-	0x1F68, 0x1F60, // GREEK CAPITAL LETTER OMEGA WITH PSILI
-	0x1F69, 0x1F61, // GREEK CAPITAL LETTER OMEGA WITH DASIA
-	0x1F6A, 0x1F62, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-	0x1F6B, 0x1F63, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-	0x1F6C, 0x1F64, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-	0x1F6D, 0x1F65, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-	0x1F6E, 0x1F66, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-	0x1F6F, 0x1F67, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-	0x1F80, 0x1F00 , // # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-	0x1F81, 0x1F01 , // # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-	0x1F82, 0x1F02 , // # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-	0x1F83, 0x1F03 , // # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-	0x1F84, 0x1F04 , // # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-	0x1F85, 0x1F05 , // # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-	0x1F86, 0x1F06 , // # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1F87, 0x1F07 , // # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1F88, 0x1F80, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-	0x1F89, 0x1F81, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-	0x1F8A, 0x1F82, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1F8B, 0x1F83, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1F8C, 0x1F84, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1F8D, 0x1F85, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1F8E, 0x1F86, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F8F, 0x1F87, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F90, 0x1F20 , // # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-	0x1F91, 0x1F21 , // # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-	0x1F92, 0x1F22 , // # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-	0x1F93, 0x1F23 , // # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-	0x1F94, 0x1F24 , // # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-	0x1F95, 0x1F25 , // # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-	0x1F96, 0x1F26 , // # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1F97, 0x1F27 , // # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1F98, 0x1F90, // GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-	0x1F99, 0x1F91, // GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-	0x1F9A, 0x1F92, // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1F9B, 0x1F93, // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1F9C, 0x1F94, // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1F9D, 0x1F95, // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1F9E, 0x1F96, // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F9F, 0x1F97, // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FA0, 0x1F60 , // # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-	0x1FA1, 0x1F61 , // # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-	0x1FA2, 0x1F62 , // # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-	0x1FA3, 0x1F63 , // # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-	0x1FA4, 0x1F64 , // # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-	0x1FA5, 0x1F65 , // # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-	0x1FA6, 0x1F66 , // # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1FA7, 0x1F67 , // # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-	0x1FA8, 0x1FA0, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-	0x1FA9, 0x1FA1, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-	0x1FAA, 0x1FA2, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1FAB, 0x1FA3, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1FAC, 0x1FA4, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1FAD, 0x1FA5, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1FAE, 0x1FA6, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FAF, 0x1FA7, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FB2, 0x1F70 , // # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-	0x1FB3, 0x03B1 , // # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-	0x1FB4, 0x03AC , // # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-	0x1FB6, 0x03B1 , // # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-	0x1FB7, 0x03B1 , // ; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-	0x1FB8, 0x1FB0, // GREEK CAPITAL LETTER ALPHA WITH VRACHY
-	0x1FB9, 0x1FB1, // GREEK CAPITAL LETTER ALPHA WITH MACRON
-	0x1FBA, 0x1F70, // GREEK CAPITAL LETTER ALPHA WITH VARIA
-	0x1FBB, 0x1F71, // GREEK CAPITAL LETTER ALPHA WITH OXIA
-	0x1FBC, 0x1FB3, // GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-	0x1FBE, 0x03B9, // GREEK PROSGEGRAMMENI
-	0x1FC2, 0x1F74 , // # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-	0x1FC3, 0x03B7 , // # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-	0x1FC4, 0x03AE , // # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-	0x1FC6, 0x03B7 , // # GREEK SMALL LETTER ETA WITH PERISPOMENI
-	0x1FC7, 0x03B7 , // ; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-	0x1FC8, 0x1F72, // GREEK CAPITAL LETTER EPSILON WITH VARIA
-	0x1FC9, 0x1F73, // GREEK CAPITAL LETTER EPSILON WITH OXIA
-	0x1FCA, 0x1F74, // GREEK CAPITAL LETTER ETA WITH VARIA
-	0x1FCB, 0x1F75, // GREEK CAPITAL LETTER ETA WITH OXIA
-	0x1FCC, 0x1FC3, // GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-	0x1FD2, 0x03B9 , // ; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-	0x1FD3, 0x03B9 , // ; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
-	0x1FD6, 0x03B9 , // # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-	0x1FD7, 0x03B9 , // ; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-	0x1FD8, 0x1FD0, // GREEK CAPITAL LETTER IOTA WITH VRACHY
-	0x1FD9, 0x1FD1, // GREEK CAPITAL LETTER IOTA WITH MACRON
-	0x1FDA, 0x1F76, // GREEK CAPITAL LETTER IOTA WITH VARIA
-	0x1FDB, 0x1F77, // GREEK CAPITAL LETTER IOTA WITH OXIA
-	0x1FE2, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-	0x1FE3, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
-	0x1FE4, 0x03C1 , // # GREEK SMALL LETTER RHO WITH PSILI
-	0x1FE6, 0x03C5 , // # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-	0x1FE7, 0x03C5 , // ; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-	0x1FE8, 0x1FE0, // GREEK CAPITAL LETTER UPSILON WITH VRACHY
-	0x1FE9, 0x1FE1, // GREEK CAPITAL LETTER UPSILON WITH MACRON
-	0x1FEA, 0x1F7A, // GREEK CAPITAL LETTER UPSILON WITH VARIA
-	0x1FEB, 0x1F7B, // GREEK CAPITAL LETTER UPSILON WITH OXIA
-	0x1FEC, 0x1FE5, // GREEK CAPITAL LETTER RHO WITH DASIA
-	0x1FF2, 0x1F7C , // # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-	0x1FF3, 0x03C9 , // # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-	0x1FF4, 0x03CE , // # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-	0x1FF6, 0x03C9 , // # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-	0x1FF7, 0x03C9 , // ; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-	0x1FF8, 0x1F78, // GREEK CAPITAL LETTER OMICRON WITH VARIA
-	0x1FF9, 0x1F79, // GREEK CAPITAL LETTER OMICRON WITH OXIA
-	0x1FFA, 0x1F7C, // GREEK CAPITAL LETTER OMEGA WITH VARIA
-	0x1FFB, 0x1F7D, // GREEK CAPITAL LETTER OMEGA WITH OXIA
-	0x1FFC, 0x1FF3, // GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-	0x2126, 0x03C9, // OHM SIGN
-	0x212A, 0x006B, // KELVIN SIGN
-	0x212B, 0x00E5, // ANGSTROM SIGN
-	0x2160, 0x2170, // ROMAN NUMERAL ONE
-	0x2161, 0x2171, // ROMAN NUMERAL TWO
-	0x2162, 0x2172, // ROMAN NUMERAL THREE
-	0x2163, 0x2173, // ROMAN NUMERAL FOUR
-	0x2164, 0x2174, // ROMAN NUMERAL FIVE
-	0x2165, 0x2175, // ROMAN NUMERAL SIX
-	0x2166, 0x2176, // ROMAN NUMERAL SEVEN
-	0x2167, 0x2177, // ROMAN NUMERAL EIGHT
-	0x2168, 0x2178, // ROMAN NUMERAL NINE
-	0x2169, 0x2179, // ROMAN NUMERAL TEN
-	0x216A, 0x217A, // ROMAN NUMERAL ELEVEN
-	0x216B, 0x217B, // ROMAN NUMERAL TWELVE
-	0x216C, 0x217C, // ROMAN NUMERAL FIFTY
-	0x216D, 0x217D, // ROMAN NUMERAL ONE HUNDRED
-	0x216E, 0x217E, // ROMAN NUMERAL FIVE HUNDRED
-	0x216F, 0x217F, // ROMAN NUMERAL ONE THOUSAND
-	0x24B6, 0x24D0, // CIRCLED LATIN CAPITAL LETTER A
-	0x24B7, 0x24D1, // CIRCLED LATIN CAPITAL LETTER B
-	0x24B8, 0x24D2, // CIRCLED LATIN CAPITAL LETTER C
-	0x24B9, 0x24D3, // CIRCLED LATIN CAPITAL LETTER D
-	0x24BA, 0x24D4, // CIRCLED LATIN CAPITAL LETTER E
-	0x24BB, 0x24D5, // CIRCLED LATIN CAPITAL LETTER F
-	0x24BC, 0x24D6, // CIRCLED LATIN CAPITAL LETTER G
-	0x24BD, 0x24D7, // CIRCLED LATIN CAPITAL LETTER H
-	0x24BE, 0x24D8, // CIRCLED LATIN CAPITAL LETTER I
-	0x24BF, 0x24D9, // CIRCLED LATIN CAPITAL LETTER J
-	0x24C0, 0x24DA, // CIRCLED LATIN CAPITAL LETTER K
-	0x24C1, 0x24DB, // CIRCLED LATIN CAPITAL LETTER L
-	0x24C2, 0x24DC, // CIRCLED LATIN CAPITAL LETTER M
-	0x24C3, 0x24DD, // CIRCLED LATIN CAPITAL LETTER N
-	0x24C4, 0x24DE, // CIRCLED LATIN CAPITAL LETTER O
-	0x24C5, 0x24DF, // CIRCLED LATIN CAPITAL LETTER P
-	0x24C6, 0x24E0, // CIRCLED LATIN CAPITAL LETTER Q
-	0x24C7, 0x24E1, // CIRCLED LATIN CAPITAL LETTER R
-	0x24C8, 0x24E2, // CIRCLED LATIN CAPITAL LETTER S
-	0x24C9, 0x24E3, // CIRCLED LATIN CAPITAL LETTER T
-	0x24CA, 0x24E4, // CIRCLED LATIN CAPITAL LETTER U
-	0x24CB, 0x24E5, // CIRCLED LATIN CAPITAL LETTER V
-	0x24CC, 0x24E6, // CIRCLED LATIN CAPITAL LETTER W
-	0x24CD, 0x24E7, // CIRCLED LATIN CAPITAL LETTER X
-	0x24CE, 0x24E8, // CIRCLED LATIN CAPITAL LETTER Y
-	0x24CF, 0x24E9, // CIRCLED LATIN CAPITAL LETTER Z
-	0xFB00, 0x0066 , // # LATIN SMALL LIGATURE FF
-	0xFB01, 0x0066 , // # LATIN SMALL LIGATURE FI
-	0xFB02, 0x0066 , // # LATIN SMALL LIGATURE FL
-	0xFB03, 0x0066 , // ; # LATIN SMALL LIGATURE FFI
-	0xFB04, 0x0066 , // ; # LATIN SMALL LIGATURE FFL
-	0xFB05, 0x0073 , // # LATIN SMALL LIGATURE LONG S T
-	0xFB06, 0x0073 , // # LATIN SMALL LIGATURE ST
-	0xFB13, 0x0574 , // # ARMENIAN SMALL LIGATURE MEN NOW
-	0xFB14, 0x0574 , // # ARMENIAN SMALL LIGATURE MEN ECH
-	0xFB15, 0x0574 , // # ARMENIAN SMALL LIGATURE MEN INI
-	0xFB16, 0x057E , // # ARMENIAN SMALL LIGATURE VEW NOW
-	0xFB17, 0x0574 , // # ARMENIAN SMALL LIGATURE MEN XEH
-	0xFF21, 0xFF41, // FULLWIDTH LATIN CAPITAL LETTER A
-	0xFF22, 0xFF42, // FULLWIDTH LATIN CAPITAL LETTER B
-	0xFF23, 0xFF43, // FULLWIDTH LATIN CAPITAL LETTER C
-	0xFF24, 0xFF44, // FULLWIDTH LATIN CAPITAL LETTER D
-	0xFF25, 0xFF45, // FULLWIDTH LATIN CAPITAL LETTER E
-	0xFF26, 0xFF46, // FULLWIDTH LATIN CAPITAL LETTER F
-	0xFF27, 0xFF47, // FULLWIDTH LATIN CAPITAL LETTER G
-	0xFF28, 0xFF48, // FULLWIDTH LATIN CAPITAL LETTER H
-	0xFF29, 0xFF49, // FULLWIDTH LATIN CAPITAL LETTER I
-	0xFF2A, 0xFF4A, // FULLWIDTH LATIN CAPITAL LETTER J
-	0xFF2B, 0xFF4B, // FULLWIDTH LATIN CAPITAL LETTER K
-	0xFF2C, 0xFF4C, // FULLWIDTH LATIN CAPITAL LETTER L
-	0xFF2D, 0xFF4D, // FULLWIDTH LATIN CAPITAL LETTER M
-	0xFF2E, 0xFF4E, // FULLWIDTH LATIN CAPITAL LETTER N
-	0xFF2F, 0xFF4F, // FULLWIDTH LATIN CAPITAL LETTER O
-	0xFF30, 0xFF50, // FULLWIDTH LATIN CAPITAL LETTER P
-	0xFF31, 0xFF51, // FULLWIDTH LATIN CAPITAL LETTER Q
-	0xFF32, 0xFF52, // FULLWIDTH LATIN CAPITAL LETTER R
-	0xFF33, 0xFF53, // FULLWIDTH LATIN CAPITAL LETTER S
-	0xFF34, 0xFF54, // FULLWIDTH LATIN CAPITAL LETTER T
-	0xFF35, 0xFF55, // FULLWIDTH LATIN CAPITAL LETTER U
-	0xFF36, 0xFF56, // FULLWIDTH LATIN CAPITAL LETTER V
-	0xFF37, 0xFF57, // FULLWIDTH LATIN CAPITAL LETTER W
-	0xFF38, 0xFF58, // FULLWIDTH LATIN CAPITAL LETTER X
-	0xFF39, 0xFF59, // FULLWIDTH LATIN CAPITAL LETTER Y
-	0xFF3A, 0xFF5A, // FULLWIDTH LATIN CAPITAL LETTER Z
-};
-
-// ***************************************************************************
-
-// Lowercase to uppercase 16 bits unicode. This table must be sorted. First entry must be unique.
-static const ucchar UnicodeLowerToUpper[]=
-{
-	// 0x0061, 0x0041, // LATIN CAPITAL LETTER A
-	0x0061, 'A', // LATIN CAPITAL LETTER A
-	// 0x0062, 0x0042, // LATIN CAPITAL LETTER B
-	0x0062, 'B', // LATIN CAPITAL LETTER B
-	// 0x0063, 0x0043, // LATIN CAPITAL LETTER C
-	0x0063, 'C', // LATIN CAPITAL LETTER C
-	// 0x0064, 0x0044, // LATIN CAPITAL LETTER D
-	0x0064, 'D', // LATIN CAPITAL LETTER D
-	// 0x0065, 0x0045, // LATIN CAPITAL LETTER E
-	0x0065, 'E', // LATIN CAPITAL LETTER E
-	// 0x0066, 0x0046, // LATIN CAPITAL LETTER F
-	0x0066, 'F', // LATIN CAPITAL LETTER F
-	// 0x0067, 0x0047, // LATIN CAPITAL LETTER G
-	0x0067, 'G', // LATIN CAPITAL LETTER G
-	// 0x0068, 0x0048, // LATIN CAPITAL LETTER H
-	0x0068, 'H', // LATIN CAPITAL LETTER H
-	// 0x0069, 0x0049, // LATIN CAPITAL LETTER I
-	0x0069, 'I', // LATIN CAPITAL LETTER I
-	// 0x006A, 0x004A, // LATIN CAPITAL LETTER J
-	0x006A, 'J', // LATIN CAPITAL LETTER J
-	// 0x006B, 0x004B, // LATIN CAPITAL LETTER K
-	0x006B, 'K', // LATIN CAPITAL LETTER K
-	// 0x006C, 0x004C, // LATIN CAPITAL LETTER L
-	0x006C, 'L', // LATIN CAPITAL LETTER L
-	// 0x006D, 0x004D, // LATIN CAPITAL LETTER M
-	0x006D, 'M', // LATIN CAPITAL LETTER M
-	// 0x006E, 0x004E, // LATIN CAPITAL LETTER N
-	0x006E, 'N', // LATIN CAPITAL LETTER N
-	// 0x006F, 0x004F, // LATIN CAPITAL LETTER O
-	0x006F, 'O', // LATIN CAPITAL LETTER O
-	// 0x0070, 0x0050, // LATIN CAPITAL LETTER P
-	0x0070, 'P', // LATIN CAPITAL LETTER P
-	// 0x0071, 0x0051, // LATIN CAPITAL LETTER Q
-	0x0071, 'Q', // LATIN CAPITAL LETTER Q
-	// 0x0072, 0x0052, // LATIN CAPITAL LETTER R
-	0x0072, 'R', // LATIN CAPITAL LETTER R
-	// 0x0073, 0x0053, // LATIN CAPITAL LETTER S
-	0x0073, 'S', // LATIN CAPITAL LETTER S
-	// 0x0074, 0x0054, // LATIN CAPITAL LETTER T
-	0x0074, 'T', // LATIN CAPITAL LETTER T
-	// 0x0075, 0x0055, // LATIN CAPITAL LETTER U
-	0x0075, 'U', // LATIN CAPITAL LETTER U
-	// 0x0076, 0x0056, // LATIN CAPITAL LETTER V
-	0x0076, 'V', // LATIN CAPITAL LETTER V
-	// 0x0077, 0x0057, // LATIN CAPITAL LETTER W
-	0x0077, 'W', // LATIN CAPITAL LETTER W
-	// 0x0078, 0x0058, // LATIN CAPITAL LETTER X
-	0x0078, 'X', // LATIN CAPITAL LETTER X
-	// 0x0079, 0x0059, // LATIN CAPITAL LETTER Y
-	0x0079, 'Y', // LATIN CAPITAL LETTER Y
-	// 0x007A, 0x005A, // LATIN CAPITAL LETTER Z
-	0x007A, 'Z', // LATIN CAPITAL LETTER Z
-	// 0x00E0, 0x00C0, // LATIN CAPITAL LETTER A WITH GRAVE
-	0x00E0, 'A', // LATIN CAPITAL LETTER A WITH GRAVE
-	// 0x00E1, 0x00C1, // LATIN CAPITAL LETTER A WITH ACUTE
-	0x00E1, 'A', // LATIN CAPITAL LETTER A WITH ACUTE
-	// 0x00E2, 0x00C2, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-	0x00E2, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-	// 0x00E3, 0x00C3, // LATIN CAPITAL LETTER A WITH TILDE
-	0x00E3, 'A', // LATIN CAPITAL LETTER A WITH TILDE
-	// 0x00E4, 0x00C4, // LATIN CAPITAL LETTER A WITH DIAERESIS
-	0x00E4, 'A', // LATIN CAPITAL LETTER A WITH DIAERESIS
-	// 0x00E5, 0x00C5, // LATIN CAPITAL LETTER A WITH RING ABOVE
-	0x00E5, 'A', // LATIN CAPITAL LETTER A WITH RING ABOVE
-	0x00E6, 0x00C6, // LATIN CAPITAL LETTER AE
-	// 0x00E7, 0x00C7, // LATIN CAPITAL LETTER C WITH CEDILLA
-	0x00E7, 'C', // LATIN CAPITAL LETTER C WITH CEDILLA
-	// 0x00E8, 0x00C8, // LATIN CAPITAL LETTER E WITH GRAVE
-	0x00E8, 'E', // LATIN CAPITAL LETTER E WITH GRAVE
-	// 0x00E9, 0x00C9, // LATIN CAPITAL LETTER E WITH ACUTE
-	0x00E9, 'E', // LATIN CAPITAL LETTER E WITH ACUTE
-	// 0x00EA, 0x00CA, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-	0x00EA, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-	// 0x00EB, 0x00CB, // LATIN CAPITAL LETTER E WITH DIAERESIS
-	0x00EB, 'E', // LATIN CAPITAL LETTER E WITH DIAERESIS
-	// 0x00EC, 0x00CC, // LATIN CAPITAL LETTER I WITH GRAVE
-	0x00EC, 'I', // LATIN CAPITAL LETTER I WITH GRAVE
-	// 0x00ED, 0x00CD, // LATIN CAPITAL LETTER I WITH ACUTE
-	0x00ED, 'I', // LATIN CAPITAL LETTER I WITH ACUTE
-	// 0x00EE, 0x00CE, // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-	0x00EE, 'I', // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-	// 0x00EF, 0x00CF, // LATIN CAPITAL LETTER I WITH DIAERESIS
-	0x00EF, 'I', // LATIN CAPITAL LETTER I WITH DIAERESIS
-	0x00F0, 0x00D0, // LATIN CAPITAL LETTER ETH
-	// 0x00F1, 0x00D1, // LATIN CAPITAL LETTER N WITH TILDE
-	0x00F1, 'N', // LATIN CAPITAL LETTER N WITH TILDE
-	// 0x00F2, 0x00D2, // LATIN CAPITAL LETTER O WITH GRAVE
-	0x00F2, 'O', // LATIN CAPITAL LETTER O WITH GRAVE
-	// 0x00F3, 0x00D3, // LATIN CAPITAL LETTER O WITH ACUTE
-	0x00F3, 'O', // LATIN CAPITAL LETTER O WITH ACUTE
-	// 0x00F4, 0x00D4, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-	0x00F4, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-	// 0x00F5, 0x00D5, // LATIN CAPITAL LETTER O WITH TILDE
-	0x00F5, 'O', // LATIN CAPITAL LETTER O WITH TILDE
-	// 0x00F6, 0x00D6, // LATIN CAPITAL LETTER O WITH DIAERESIS
-	0x00F6, 'O', // LATIN CAPITAL LETTER O WITH DIAERESIS
-	// 0x00F8, 0x00D8, // LATIN CAPITAL LETTER O WITH STROKE
-	0x00F8, 'O', // LATIN CAPITAL LETTER O WITH STROKE
-	// 0x00F9, 0x00D9, // LATIN CAPITAL LETTER U WITH GRAVE
-	0x00F9, 'U', // LATIN CAPITAL LETTER U WITH GRAVE
-	// 0x00FA, 0x00DA, // LATIN CAPITAL LETTER U WITH ACUTE
-	0x00FA, 'U', // LATIN CAPITAL LETTER U WITH ACUTE
-	// 0x00FB, 0x00DB, // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-	0x00FB, 'U', // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-	// 0x00FC, 0x00DC, // LATIN CAPITAL LETTER U WITH DIAERESIS
-	0x00FC, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS
-	// 0x00FD, 0x00DD, // LATIN CAPITAL LETTER Y WITH ACUTE
-	0x00FD, 'Y', // LATIN CAPITAL LETTER Y WITH ACUTE
-	0x00FE, 0x00DE, // LATIN CAPITAL LETTER THORN
-	// 0x00FF, 0x0178, // LATIN CAPITAL LETTER Y WITH DIAERESIS
-	0x00FF, 'Y', // LATIN CAPITAL LETTER Y WITH DIAERESIS
-	// 0x0101, 0x0100, // LATIN CAPITAL LETTER A WITH MACRON
-	0x0101, 'A', // LATIN CAPITAL LETTER A WITH MACRON
-	// 0x0103, 0x0102, // LATIN CAPITAL LETTER A WITH BREVE
-	0x0103, 'A', // LATIN CAPITAL LETTER A WITH BREVE
-	// 0x0105, 0x0104, // LATIN CAPITAL LETTER A WITH OGONEK
-	0x0105, 'A', // LATIN CAPITAL LETTER A WITH OGONEK
-	// 0x0107, 0x0106, // LATIN CAPITAL LETTER C WITH ACUTE
-	0x0107, 'C', // LATIN CAPITAL LETTER C WITH ACUTE
-	// 0x0109, 0x0108, // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-	0x0109, 'C', // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-	// 0x010B, 0x010A, // LATIN CAPITAL LETTER C WITH DOT ABOVE
-	0x010B, 'C', // LATIN CAPITAL LETTER C WITH DOT ABOVE
-	// 0x010D, 0x010C, // LATIN CAPITAL LETTER C WITH CARON
-	0x010D, 'C', // LATIN CAPITAL LETTER C WITH CARON
-	// 0x010F, 0x010E, // LATIN CAPITAL LETTER D WITH CARON
-	0x010F, 'D', // LATIN CAPITAL LETTER D WITH CARON
-	// 0x0111, 0x0110, // LATIN CAPITAL LETTER D WITH STROKE
-	0x0111, 'D', // LATIN CAPITAL LETTER D WITH STROKE
-	// 0x0113, 0x0112, // LATIN CAPITAL LETTER E WITH MACRON
-	0x0113, 'E', // LATIN CAPITAL LETTER E WITH MACRON
-	// 0x0115, 0x0114, // LATIN CAPITAL LETTER E WITH BREVE
-	0x0115, 'E', // LATIN CAPITAL LETTER E WITH BREVE
-	// 0x0117, 0x0116, // LATIN CAPITAL LETTER E WITH DOT ABOVE
-	0x0117, 'E', // LATIN CAPITAL LETTER E WITH DOT ABOVE
-	// 0x0119, 0x0118, // LATIN CAPITAL LETTER E WITH OGONEK
-	0x0119, 'E', // LATIN CAPITAL LETTER E WITH OGONEK
-	// 0x011B, 0x011A, // LATIN CAPITAL LETTER E WITH CARON
-	0x011B, 'E', // LATIN CAPITAL LETTER E WITH CARON
-	// 0x011D, 0x011C, // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-	0x011D, 'G', // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-	// 0x011F, 0x011E, // LATIN CAPITAL LETTER G WITH BREVE
-	0x011F, 'G', // LATIN CAPITAL LETTER G WITH BREVE
-	// 0x0121, 0x0120, // LATIN CAPITAL LETTER G WITH DOT ABOVE
-	0x0121, 'G', // LATIN CAPITAL LETTER G WITH DOT ABOVE
-	// 0x0123, 0x0122, // LATIN CAPITAL LETTER G WITH CEDILLA
-	0x0123, 'G', // LATIN CAPITAL LETTER G WITH CEDILLA
-	// 0x0125, 0x0124, // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-	0x0125, 'H', // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-	// 0x0127, 0x0126, // LATIN CAPITAL LETTER H WITH STROKE
-	0x0127, 'H', // LATIN CAPITAL LETTER H WITH STROKE
-	// 0x0129, 0x0128, // LATIN CAPITAL LETTER I WITH TILDE
-	0x0129, 'I', // LATIN CAPITAL LETTER I WITH TILDE
-	// 0x012B, 0x012A, // LATIN CAPITAL LETTER I WITH MACRON
-	0x012B, 'I', // LATIN CAPITAL LETTER I WITH MACRON
-	// 0x012D, 0x012C, // LATIN CAPITAL LETTER I WITH BREVE
-	0x012D, 'I', // LATIN CAPITAL LETTER I WITH BREVE
-	// 0x012F, 0x012E, // LATIN CAPITAL LETTER I WITH OGONEK
-	0x012F, 'I', // LATIN CAPITAL LETTER I WITH OGONEK
-	// 0x0131, 0x0049, // LATIN CAPITAL LETTER I
-	0x0131, 'I', // LATIN CAPITAL LETTER I
-	0x0133, 0x0132, // LATIN CAPITAL LIGATURE IJ
-	// 0x0135, 0x0134, // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-	0x0135, 'J', // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-	// 0x0137, 0x0136, // LATIN CAPITAL LETTER K WITH CEDILLA
-	0x0137, 'K', // LATIN CAPITAL LETTER K WITH CEDILLA
-	// 0x013A, 0x0139, // LATIN CAPITAL LETTER L WITH ACUTE
-	0x013A, 'L', // LATIN CAPITAL LETTER L WITH ACUTE
-	// 0x013C, 0x013B, // LATIN CAPITAL LETTER L WITH CEDILLA
-	0x013C, 'L', // LATIN CAPITAL LETTER L WITH CEDILLA
-	// 0x013E, 0x013D, // LATIN CAPITAL LETTER L WITH CARON
-	0x013E, 'L', // LATIN CAPITAL LETTER L WITH CARON
-	// 0x0140, 0x013F, // LATIN CAPITAL LETTER L WITH MIDDLE DOT
-	0x0140, 'L', // LATIN CAPITAL LETTER L WITH MIDDLE DOT
-	// 0x0142, 0x0141, // LATIN CAPITAL LETTER L WITH STROKE
-	0x0142, 'L', // LATIN CAPITAL LETTER L WITH STROKE
-	// 0x0144, 0x0143, // LATIN CAPITAL LETTER N WITH ACUTE
-	0x0144, 'N', // LATIN CAPITAL LETTER N WITH ACUTE
-	// 0x0146, 0x0145, // LATIN CAPITAL LETTER N WITH CEDILLA
-	0x0146, 'N', // LATIN CAPITAL LETTER N WITH CEDILLA
-	// 0x0148, 0x0147, // LATIN CAPITAL LETTER N WITH CARON
-	0x0148, 'N', // LATIN CAPITAL LETTER N WITH CARON
-	0x014B, 0x014A, // LATIN CAPITAL LETTER ENG
-	// 0x014D, 0x014C, // LATIN CAPITAL LETTER O WITH MACRON
-	0x014D, 'O', // LATIN CAPITAL LETTER O WITH MACRON
-	// 0x014F, 0x014E, // LATIN CAPITAL LETTER O WITH BREVE
-	0x014F, 'O', // LATIN CAPITAL LETTER O WITH BREVE
-	// 0x0151, 0x0150, // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-	0x0151, 'O', // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-	0x0153, 0x0152, // LATIN CAPITAL LIGATURE OE
-	// 0x0155, 0x0154, // LATIN CAPITAL LETTER R WITH ACUTE
-	0x0155, 'R', // LATIN CAPITAL LETTER R WITH ACUTE
-	// 0x0157, 0x0156, // LATIN CAPITAL LETTER R WITH CEDILLA
-	0x0157, 'R', // LATIN CAPITAL LETTER R WITH CEDILLA
-	// 0x0159, 0x0158, // LATIN CAPITAL LETTER R WITH CARON
-	0x0159, 'R', // LATIN CAPITAL LETTER R WITH CARON
-	// 0x015B, 0x015A, // LATIN CAPITAL LETTER S WITH ACUTE
-	0x015B, 'S', // LATIN CAPITAL LETTER S WITH ACUTE
-	// 0x015D, 0x015C, // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-	0x015D, 'S', // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-	// 0x015F, 0x015E, // LATIN CAPITAL LETTER S WITH CEDILLA
-	0x015F, 'S', // LATIN CAPITAL LETTER S WITH CEDILLA
-	// 0x0161, 0x0160, // LATIN CAPITAL LETTER S WITH CARON
-	0x0161, 'S', // LATIN CAPITAL LETTER S WITH CARON
-	// 0x0163, 0x0162, // LATIN CAPITAL LETTER T WITH CEDILLA
-	0x0163, 'T', // LATIN CAPITAL LETTER T WITH CEDILLA
-	// 0x0165, 0x0164, // LATIN CAPITAL LETTER T WITH CARON
-	0x0165, 'T', // LATIN CAPITAL LETTER T WITH CARON
-	// 0x0167, 0x0166, // LATIN CAPITAL LETTER T WITH STROKE
-	0x0167, 'T', // LATIN CAPITAL LETTER T WITH STROKE
-	// 0x0169, 0x0168, // LATIN CAPITAL LETTER U WITH TILDE
-	0x0169, 'U', // LATIN CAPITAL LETTER U WITH TILDE
-	// 0x016B, 0x016A, // LATIN CAPITAL LETTER U WITH MACRON
-	0x016B, 'U', // LATIN CAPITAL LETTER U WITH MACRON
-	// 0x016D, 0x016C, // LATIN CAPITAL LETTER U WITH BREVE
-	0x016D, 'U', // LATIN CAPITAL LETTER U WITH BREVE
-	// 0x016F, 0x016E, // LATIN CAPITAL LETTER U WITH RING ABOVE
-	0x016F, 'U', // LATIN CAPITAL LETTER U WITH RING ABOVE
-	// 0x0171, 0x0170, // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-	0x0171, 'U', // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-	// 0x0173, 0x0172, // LATIN CAPITAL LETTER U WITH OGONEK
-	0x0173, 'U', // LATIN CAPITAL LETTER U WITH OGONEK
-	// 0x0175, 0x0174, // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-	0x0175, 'W', // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-	// 0x0177, 0x0176, // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-	0x0177, 'Y', // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-	// 0x017A, 0x0179, // LATIN CAPITAL LETTER Z WITH ACUTE
-	0x017A, 'Z', // LATIN CAPITAL LETTER Z WITH ACUTE
-	// 0x017C, 0x017B, // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-	0x017C, 'Z', // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-	// 0x017E, 0x017D, // LATIN CAPITAL LETTER Z WITH CARON
-	0x017E, 'Z', // LATIN CAPITAL LETTER Z WITH CARON
-	// 0x0183, 0x0182, // LATIN CAPITAL LETTER B WITH TOPBAR
-	0x0183, 'B', // LATIN CAPITAL LETTER B WITH TOPBAR
-	0x0185, 0x0184, // LATIN CAPITAL LETTER TONE SIX
-	// 0x0188, 0x0187, // LATIN CAPITAL LETTER C WITH HOOK
-	0x0188, 'C', // LATIN CAPITAL LETTER C WITH HOOK
-	// 0x018C, 0x018B, // LATIN CAPITAL LETTER D WITH TOPBAR
-	0x018C, 'D', // LATIN CAPITAL LETTER D WITH TOPBAR
-	// 0x0192, 0x0191, // LATIN CAPITAL LETTER F WITH HOOK
-	0x0192, 'F', // LATIN CAPITAL LETTER F WITH HOOK
-	0x0195, 0x01F6, // LATIN CAPITAL LETTER HWAIR
-	// 0x0199, 0x0198, // LATIN CAPITAL LETTER K WITH HOOK
-	0x0199, 'K', // LATIN CAPITAL LETTER K WITH HOOK
-	// 0x019E, 0x0220, // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-	0x019E, 'N', // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-	// 0x01A1, 0x01A0, // LATIN CAPITAL LETTER O WITH HORN
-	0x01A1, 'O', // LATIN CAPITAL LETTER O WITH HORN
-	0x01A3, 0x01A2, // LATIN CAPITAL LETTER OI
-	// 0x01A5, 0x01A4, // LATIN CAPITAL LETTER P WITH HOOK
-	0x01A5, 'P', // LATIN CAPITAL LETTER P WITH HOOK
-	0x01A8, 0x01A7, // LATIN CAPITAL LETTER TONE TWO
-	// 0x01AD, 0x01AC, // LATIN CAPITAL LETTER T WITH HOOK
-	0x01AD, 'T', // LATIN CAPITAL LETTER T WITH HOOK
-	// 0x01B0, 0x01AF, // LATIN CAPITAL LETTER U WITH HORN
-	0x01B0, 'U', // LATIN CAPITAL LETTER U WITH HORN
-	// 0x01B4, 0x01B3, // LATIN CAPITAL LETTER Y WITH HOOK
-	0x01B4, 'Y', // LATIN CAPITAL LETTER Y WITH HOOK
-	// 0x01B6, 0x01B5, // LATIN CAPITAL LETTER Z WITH STROKE
-	0x01B6, 'Z', // LATIN CAPITAL LETTER Z WITH STROKE
-	0x01B9, 0x01B8, // LATIN CAPITAL LETTER EZH REVERSED
-	0x01BD, 0x01BC, // LATIN CAPITAL LETTER TONE FIVE
-	0x01BF, 0x01F7, // LATIN CAPITAL LETTER WYNN
-	0x01C6, 0x01C4, // LATIN CAPITAL LETTER DZ WITH CARON
-	0x01C9, 0x01C7, // LATIN CAPITAL LETTER LJ
-	0x01CC, 0x01CA, // LATIN CAPITAL LETTER NJ
-	// 0x01CE, 0x01CD, // LATIN CAPITAL LETTER A WITH CARON
-	0x01CE, 'A', // LATIN CAPITAL LETTER A WITH CARON
-	// 0x01D0, 0x01CF, // LATIN CAPITAL LETTER I WITH CARON
-	0x01D0, 'I', // LATIN CAPITAL LETTER I WITH CARON
-	// 0x01D2, 0x01D1, // LATIN CAPITAL LETTER O WITH CARON
-	0x01D2, 'O', // LATIN CAPITAL LETTER O WITH CARON
-	// 0x01D4, 0x01D3, // LATIN CAPITAL LETTER U WITH CARON
-	0x01D4, 'U', // LATIN CAPITAL LETTER U WITH CARON
-	// 0x01D6, 0x01D5, // LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-	0x01D6, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-	// 0x01D8, 0x01D7, // LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-	0x01D8, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-	// 0x01DA, 0x01D9, // LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-	0x01DA, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-	// 0x01DC, 0x01DB, // LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-	0x01DC, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-	0x01DD, 0x018E, // LATIN CAPITAL LETTER REVERSED E
-	// 0x01DF, 0x01DE, // LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-	0x01DF, 'A', // LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-	// 0x01E1, 0x01E0, // LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-	0x01E1, 'A', // LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-	0x01E3, 0x01E2, // LATIN CAPITAL LETTER AE WITH MACRON
-	// 0x01E5, 0x01E4, // LATIN CAPITAL LETTER G WITH STROKE
-	0x01E5, 'G', // LATIN CAPITAL LETTER G WITH STROKE
-	// 0x01E7, 0x01E6, // LATIN CAPITAL LETTER G WITH CARON
-	0x01E7, 'G', // LATIN CAPITAL LETTER G WITH CARON
-	// 0x01E9, 0x01E8, // LATIN CAPITAL LETTER K WITH CARON
-	0x01E9, 'K', // LATIN CAPITAL LETTER K WITH CARON
-	// 0x01EB, 0x01EA, // LATIN CAPITAL LETTER O WITH OGONEK
-	0x01EB, 'O', // LATIN CAPITAL LETTER O WITH OGONEK
-	// 0x01ED, 0x01EC, // LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-	0x01ED, 'O', // LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-	0x01EF, 0x01EE, // LATIN CAPITAL LETTER EZH WITH CARON
-	0x01F3, 0x01F1, // LATIN CAPITAL LETTER DZ
-	// 0x01F5, 0x01F4, // LATIN CAPITAL LETTER G WITH ACUTE
-	0x01F5, 'G', // LATIN CAPITAL LETTER G WITH ACUTE
-	// 0x01F9, 0x01F8, // LATIN CAPITAL LETTER N WITH GRAVE
-	0x01F9, 'N', // LATIN CAPITAL LETTER N WITH GRAVE
-	// 0x01FB, 0x01FA, // LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-	0x01FB, 'A', // LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-	0x01FD, 0x01FC, // LATIN CAPITAL LETTER AE WITH ACUTE
-	// 0x01FF, 0x01FE, // LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-	0x01FF, 'O', // LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-	// 0x0201, 0x0200, // LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-	0x0201, 'A', // LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-	// 0x0203, 0x0202, // LATIN CAPITAL LETTER A WITH INVERTED BREVE
-	0x0203, 'A', // LATIN CAPITAL LETTER A WITH INVERTED BREVE
-	// 0x0205, 0x0204, // LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-	0x0205, 'E', // LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-	// 0x0207, 0x0206, // LATIN CAPITAL LETTER E WITH INVERTED BREVE
-	0x0207, 'E', // LATIN CAPITAL LETTER E WITH INVERTED BREVE
-	// 0x0209, 0x0208, // LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-	0x0209, 'I', // LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-	// 0x020B, 0x020A, // LATIN CAPITAL LETTER I WITH INVERTED BREVE
-	0x020B, 'I', // LATIN CAPITAL LETTER I WITH INVERTED BREVE
-	// 0x020D, 0x020C, // LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-	0x020D, 'O', // LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-	// 0x020F, 0x020E, // LATIN CAPITAL LETTER O WITH INVERTED BREVE
-	0x020F, 'O', // LATIN CAPITAL LETTER O WITH INVERTED BREVE
-	// 0x0211, 0x0210, // LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-	0x0211, 'R', // LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-	// 0x0213, 0x0212, // LATIN CAPITAL LETTER R WITH INVERTED BREVE
-	0x0213, 'R', // LATIN CAPITAL LETTER R WITH INVERTED BREVE
-	// 0x0215, 0x0214, // LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-	0x0215, 'U', // LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-	// 0x0217, 0x0216, // LATIN CAPITAL LETTER U WITH INVERTED BREVE
-	0x0217, 'U', // LATIN CAPITAL LETTER U WITH INVERTED BREVE
-	// 0x0219, 0x0218, // LATIN CAPITAL LETTER S WITH COMMA BELOW
-	0x0219, 'S', // LATIN CAPITAL LETTER S WITH COMMA BELOW
-	// 0x021B, 0x021A, // LATIN CAPITAL LETTER T WITH COMMA BELOW
-	0x021B, 'T', // LATIN CAPITAL LETTER T WITH COMMA BELOW
-	0x021D, 0x021C, // LATIN CAPITAL LETTER YOGH
-	// 0x021F, 0x021E, // LATIN CAPITAL LETTER H WITH CARON
-	0x021F, 'H', // LATIN CAPITAL LETTER H WITH CARON
-	0x0223, 0x0222, // LATIN CAPITAL LETTER OU
-	// 0x0225, 0x0224, // LATIN CAPITAL LETTER Z WITH HOOK
-	0x0225, 'Z', // LATIN CAPITAL LETTER Z WITH HOOK
-	// 0x0227, 0x0226, // LATIN CAPITAL LETTER A WITH DOT ABOVE
-	0x0227, 'A', // LATIN CAPITAL LETTER A WITH DOT ABOVE
-	// 0x0229, 0x0228, // LATIN CAPITAL LETTER E WITH CEDILLA
-	0x0229, 'E', // LATIN CAPITAL LETTER E WITH CEDILLA
-	// 0x022B, 0x022A, // LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-	0x022B, 'O', // LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-	// 0x022D, 0x022C, // LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-	0x022D, 'O', // LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-	// 0x022F, 0x022E, // LATIN CAPITAL LETTER O WITH DOT ABOVE
-	0x022F, 'O', // LATIN CAPITAL LETTER O WITH DOT ABOVE
-	// 0x0231, 0x0230, // LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-	0x0231, 'O', // LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-	// 0x0233, 0x0232, // LATIN CAPITAL LETTER Y WITH MACRON
-	0x0233, 'Y', // LATIN CAPITAL LETTER Y WITH MACRON
-	// 0x0253, 0x0181, // LATIN CAPITAL LETTER B WITH HOOK
-	0x0253, 'B', // LATIN CAPITAL LETTER B WITH HOOK
-	0x0254, 0x0186, // LATIN CAPITAL LETTER OPEN O
-	0x0256, 0x0189, // LATIN CAPITAL LETTER AFRICAN D
-	// 0x0257, 0x018A, // LATIN CAPITAL LETTER D WITH HOOK
-	0x0257, 'D', // LATIN CAPITAL LETTER D WITH HOOK
-	0x0259, 0x018F, // LATIN CAPITAL LETTER SCHWA
-	0x025B, 0x0190, // LATIN CAPITAL LETTER OPEN E
-	// 0x0260, 0x0193, // LATIN CAPITAL LETTER G WITH HOOK
-	0x0260, 'G', // LATIN CAPITAL LETTER G WITH HOOK
-	0x0263, 0x0194, // LATIN CAPITAL LETTER GAMMA
-	// 0x0268, 0x0197, // LATIN CAPITAL LETTER I WITH STROKE
-	0x0268, 'I', // LATIN CAPITAL LETTER I WITH STROKE
-	0x0269, 0x0196, // LATIN CAPITAL LETTER IOTA
-	0x026F, 0x019C, // LATIN CAPITAL LETTER TURNED M
-	// 0x0272, 0x019D, // LATIN CAPITAL LETTER N WITH LEFT HOOK
-	0x0272, 'N', // LATIN CAPITAL LETTER N WITH LEFT HOOK
-	// 0x0275, 0x019F, // LATIN CAPITAL LETTER O WITH MIDDLE TILDE
-	0x0275, 'O', // LATIN CAPITAL LETTER O WITH MIDDLE TILDE
-	0x0280, 0x01A6, // LATIN LETTER YR
-	0x0283, 0x01A9, // LATIN CAPITAL LETTER ESH
-	// 0x0288, 0x01AE, // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
-	0x0288, 'T', // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
-	0x028A, 0x01B1, // LATIN CAPITAL LETTER UPSILON
-	// 0x028B, 0x01B2, // LATIN CAPITAL LETTER V WITH HOOK
-	0x028B, 'V', // LATIN CAPITAL LETTER V WITH HOOK
-	0x0292, 0x01B7, // LATIN CAPITAL LETTER EZH
-	0x03AC, 0x0386, // GREEK CAPITAL LETTER ALPHA WITH TONOS
-	0x03AD, 0x0388, // GREEK CAPITAL LETTER EPSILON WITH TONOS
-	0x03AE, 0x0389, // GREEK CAPITAL LETTER ETA WITH TONOS
-	0x03AF, 0x038A, // GREEK CAPITAL LETTER IOTA WITH TONOS
-	0x03B1, 0x0391, // GREEK CAPITAL LETTER ALPHA
-	0x03B2, 0x0392, // GREEK CAPITAL LETTER BETA
-	0x03B3, 0x0393, // GREEK CAPITAL LETTER GAMMA
-	0x03B4, 0x0394, // GREEK CAPITAL LETTER DELTA
-	0x03B5, 0x0395, // GREEK CAPITAL LETTER EPSILON
-	0x03B6, 0x0396, // GREEK CAPITAL LETTER ZETA
-	0x03B7, 0x0397, // GREEK CAPITAL LETTER ETA
-	0x03B8, 0x0398, // GREEK CAPITAL LETTER THETA
-	0x03B9, 0x0399, // GREEK CAPITAL LETTER IOTA
-	0x03BA, 0x039A, // GREEK CAPITAL LETTER KAPPA
-	0x03BB, 0x039B, // GREEK CAPITAL LETTER LAMDA
-	0x03BC, 0x039C, // GREEK CAPITAL LETTER MU
-	0x03BD, 0x039D, // GREEK CAPITAL LETTER NU
-	0x03BE, 0x039E, // GREEK CAPITAL LETTER XI
-	0x03BF, 0x039F, // GREEK CAPITAL LETTER OMICRON
-	0x03C0, 0x03A0, // GREEK CAPITAL LETTER PI
-	0x03C1, 0x03A1, // GREEK CAPITAL LETTER RHO
-	0x03C3, 0x03A3, // GREEK CAPITAL LETTER SIGMA
-	0x03C4, 0x03A4, // GREEK CAPITAL LETTER TAU
-	0x03C5, 0x03A5, // GREEK CAPITAL LETTER UPSILON
-	0x03C6, 0x03A6, // GREEK CAPITAL LETTER PHI
-	0x03C7, 0x03A7, // GREEK CAPITAL LETTER CHI
-	0x03C8, 0x03A8, // GREEK CAPITAL LETTER PSI
-	0x03C9, 0x03A9, // GREEK CAPITAL LETTER OMEGA
-	0x03CA, 0x03AA, // GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-	0x03CB, 0x03AB, // GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-	0x03CC, 0x038C, // GREEK CAPITAL LETTER OMICRON WITH TONOS
-	0x03CD, 0x038E, // GREEK CAPITAL LETTER UPSILON WITH TONOS
-	0x03CE, 0x038F, // GREEK CAPITAL LETTER OMEGA WITH TONOS
-	0x03D9, 0x03D8, // GREEK LETTER ARCHAIC KOPPA
-	0x03DB, 0x03DA, // GREEK LETTER STIGMA
-	0x03DD, 0x03DC, // GREEK LETTER DIGAMMA
-	0x03DF, 0x03DE, // GREEK LETTER KOPPA
-	0x03E1, 0x03E0, // GREEK LETTER SAMPI
-	0x03E3, 0x03E2, // COPTIC CAPITAL LETTER SHEI
-	0x03E5, 0x03E4, // COPTIC CAPITAL LETTER FEI
-	0x03E7, 0x03E6, // COPTIC CAPITAL LETTER KHEI
-	0x03E9, 0x03E8, // COPTIC CAPITAL LETTER HORI
-	0x03EB, 0x03EA, // COPTIC CAPITAL LETTER GANGIA
-	0x03ED, 0x03EC, // COPTIC CAPITAL LETTER SHIMA
-	0x03EF, 0x03EE, // COPTIC CAPITAL LETTER DEI
-	0x03F2, 0x03F9, // GREEK CAPITAL LUNATE SIGMA SYMBOL
-	0x03F8, 0x03F7, // GREEK CAPITAL LETTER SHO
-	0x03FB, 0x03FA, // GREEK CAPITAL LETTER SAN
-	0x0430, 0x0410, // CYRILLIC CAPITAL LETTER A
-	0x0431, 0x0411, // CYRILLIC CAPITAL LETTER BE
-	0x0432, 0x0412, // CYRILLIC CAPITAL LETTER VE
-	0x0433, 0x0413, // CYRILLIC CAPITAL LETTER GHE
-	0x0434, 0x0414, // CYRILLIC CAPITAL LETTER DE
-	0x0435, 0x0415, // CYRILLIC CAPITAL LETTER IE
-	0x0436, 0x0416, // CYRILLIC CAPITAL LETTER ZHE
-	0x0437, 0x0417, // CYRILLIC CAPITAL LETTER ZE
-	0x0438, 0x0418, // CYRILLIC CAPITAL LETTER I
-	0x0439, 0x0419, // CYRILLIC CAPITAL LETTER SHORT I
-	0x043A, 0x041A, // CYRILLIC CAPITAL LETTER KA
-	0x043B, 0x041B, // CYRILLIC CAPITAL LETTER EL
-	0x043C, 0x041C, // CYRILLIC CAPITAL LETTER EM
-	0x043D, 0x041D, // CYRILLIC CAPITAL LETTER EN
-	0x043E, 0x041E, // CYRILLIC CAPITAL LETTER O
-	0x043F, 0x041F, // CYRILLIC CAPITAL LETTER PE
-	0x0440, 0x0420, // CYRILLIC CAPITAL LETTER ER
-	0x0441, 0x0421, // CYRILLIC CAPITAL LETTER ES
-	0x0442, 0x0422, // CYRILLIC CAPITAL LETTER TE
-	0x0443, 0x0423, // CYRILLIC CAPITAL LETTER U
-	0x0444, 0x0424, // CYRILLIC CAPITAL LETTER EF
-	0x0445, 0x0425, // CYRILLIC CAPITAL LETTER HA
-	0x0446, 0x0426, // CYRILLIC CAPITAL LETTER TSE
-	0x0447, 0x0427, // CYRILLIC CAPITAL LETTER CHE
-	0x0448, 0x0428, // CYRILLIC CAPITAL LETTER SHA
-	0x0449, 0x0429, // CYRILLIC CAPITAL LETTER SHCHA
-	0x044A, 0x042A, // CYRILLIC CAPITAL LETTER HARD SIGN
-	0x044B, 0x042B, // CYRILLIC CAPITAL LETTER YERU
-	0x044C, 0x042C, // CYRILLIC CAPITAL LETTER SOFT SIGN
-	0x044D, 0x042D, // CYRILLIC CAPITAL LETTER E
-	0x044E, 0x042E, // CYRILLIC CAPITAL LETTER YU
-	0x044F, 0x042F, // CYRILLIC CAPITAL LETTER YA
-	0x0450, 0x0400, // CYRILLIC CAPITAL LETTER IE WITH GRAVE
-	0x0451, 0x0401, // CYRILLIC CAPITAL LETTER IO
-	0x0452, 0x0402, // CYRILLIC CAPITAL LETTER DJE
-	0x0453, 0x0403, // CYRILLIC CAPITAL LETTER GJE
-	0x0454, 0x0404, // CYRILLIC CAPITAL LETTER UKRAINIAN IE
-	0x0455, 0x0405, // CYRILLIC CAPITAL LETTER DZE
-	0x0456, 0x0406, // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-	0x0457, 0x0407, // CYRILLIC CAPITAL LETTER YI
-	0x0458, 0x0408, // CYRILLIC CAPITAL LETTER JE
-	0x0459, 0x0409, // CYRILLIC CAPITAL LETTER LJE
-	0x045A, 0x040A, // CYRILLIC CAPITAL LETTER NJE
-	0x045B, 0x040B, // CYRILLIC CAPITAL LETTER TSHE
-	0x045C, 0x040C, // CYRILLIC CAPITAL LETTER KJE
-	0x045D, 0x040D, // CYRILLIC CAPITAL LETTER I WITH GRAVE
-	0x045E, 0x040E, // CYRILLIC CAPITAL LETTER SHORT U
-	0x045F, 0x040F, // CYRILLIC CAPITAL LETTER DZHE
-	0x0461, 0x0460, // CYRILLIC CAPITAL LETTER OMEGA
-	0x0463, 0x0462, // CYRILLIC CAPITAL LETTER YAT
-	0x0465, 0x0464, // CYRILLIC CAPITAL LETTER IOTIFIED E
-	0x0467, 0x0466, // CYRILLIC CAPITAL LETTER LITTLE YUS
-	0x0469, 0x0468, // CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
-	0x046B, 0x046A, // CYRILLIC CAPITAL LETTER BIG YUS
-	0x046D, 0x046C, // CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
-	0x046F, 0x046E, // CYRILLIC CAPITAL LETTER KSI
-	0x0471, 0x0470, // CYRILLIC CAPITAL LETTER PSI
-	0x0473, 0x0472, // CYRILLIC CAPITAL LETTER FITA
-	0x0475, 0x0474, // CYRILLIC CAPITAL LETTER IZHITSA
-	0x0477, 0x0476, // CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-	0x0479, 0x0478, // CYRILLIC CAPITAL LETTER UK
-	0x047B, 0x047A, // CYRILLIC CAPITAL LETTER ROUND OMEGA
-	0x047D, 0x047C, // CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
-	0x047F, 0x047E, // CYRILLIC CAPITAL LETTER OT
-	0x0481, 0x0480, // CYRILLIC CAPITAL LETTER KOPPA
-	0x048B, 0x048A, // CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
-	0x048D, 0x048C, // CYRILLIC CAPITAL LETTER SEMISOFT SIGN
-	0x048F, 0x048E, // CYRILLIC CAPITAL LETTER ER WITH TICK
-	0x0491, 0x0490, // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-	0x0493, 0x0492, // CYRILLIC CAPITAL LETTER GHE WITH STROKE
-	0x0495, 0x0494, // CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
-	0x0497, 0x0496, // CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-	0x0499, 0x0498, // CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-	0x049B, 0x049A, // CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-	0x049D, 0x049C, // CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-	0x049F, 0x049E, // CYRILLIC CAPITAL LETTER KA WITH STROKE
-	0x04A1, 0x04A0, // CYRILLIC CAPITAL LETTER BASHKIR KA
-	0x04A3, 0x04A2, // CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-	0x04A5, 0x04A4, // CYRILLIC CAPITAL LIGATURE EN GHE
-	0x04A7, 0x04A6, // CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
-	0x04A9, 0x04A8, // CYRILLIC CAPITAL LETTER ABKHASIAN HA
-	0x04AB, 0x04AA, // CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-	0x04AD, 0x04AC, // CYRILLIC CAPITAL LETTER TE WITH DESCENDER
-	0x04AF, 0x04AE, // CYRILLIC CAPITAL LETTER STRAIGHT U
-	0x04B1, 0x04B0, // CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-	0x04B3, 0x04B2, // CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-	0x04B5, 0x04B4, // CYRILLIC CAPITAL LIGATURE TE TSE
-	0x04B7, 0x04B6, // CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-	0x04B9, 0x04B8, // CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-	0x04BB, 0x04BA, // CYRILLIC CAPITAL LETTER SHHA
-	0x04BD, 0x04BC, // CYRILLIC CAPITAL LETTER ABKHASIAN CHE
-	0x04BF, 0x04BE, // CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
-	0x04C2, 0x04C1, // CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-	0x04C4, 0x04C3, // CYRILLIC CAPITAL LETTER KA WITH HOOK
-	0x04C6, 0x04C5, // CYRILLIC CAPITAL LETTER EL WITH TAIL
-	0x04C8, 0x04C7, // CYRILLIC CAPITAL LETTER EN WITH HOOK
-	0x04CA, 0x04C9, // CYRILLIC CAPITAL LETTER EN WITH TAIL
-	0x04CC, 0x04CB, // CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
-	0x04CE, 0x04CD, // CYRILLIC CAPITAL LETTER EM WITH TAIL
-	0x04D1, 0x04D0, // CYRILLIC CAPITAL LETTER A WITH BREVE
-	0x04D3, 0x04D2, // CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-	0x04D5, 0x04D4, // CYRILLIC CAPITAL LIGATURE A IE
-	0x04D7, 0x04D6, // CYRILLIC CAPITAL LETTER IE WITH BREVE
-	0x04D9, 0x04D8, // CYRILLIC CAPITAL LETTER SCHWA
-	0x04DB, 0x04DA, // CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-	0x04DD, 0x04DC, // CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-	0x04DF, 0x04DE, // CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-	0x04E1, 0x04E0, // CYRILLIC CAPITAL LETTER ABKHASIAN DZE
-	0x04E3, 0x04E2, // CYRILLIC CAPITAL LETTER I WITH MACRON
-	0x04E5, 0x04E4, // CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-	0x04E7, 0x04E6, // CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-	0x04E9, 0x04E8, // CYRILLIC CAPITAL LETTER BARRED O
-	0x04EB, 0x04EA, // CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-	0x04ED, 0x04EC, // CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-	0x04EF, 0x04EE, // CYRILLIC CAPITAL LETTER U WITH MACRON
-	0x04F1, 0x04F0, // CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-	0x04F3, 0x04F2, // CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-	0x04F5, 0x04F4, // CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-	0x04F9, 0x04F8, // CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-	0x0501, 0x0500, // CYRILLIC CAPITAL LETTER KOMI DE
-	0x0503, 0x0502, // CYRILLIC CAPITAL LETTER KOMI DJE
-	0x0505, 0x0504, // CYRILLIC CAPITAL LETTER KOMI ZJE
-	0x0507, 0x0506, // CYRILLIC CAPITAL LETTER KOMI DZJE
-	0x0509, 0x0508, // CYRILLIC CAPITAL LETTER KOMI LJE
-	0x050B, 0x050A, // CYRILLIC CAPITAL LETTER KOMI NJE
-	0x050D, 0x050C, // CYRILLIC CAPITAL LETTER KOMI SJE
-	0x050F, 0x050E, // CYRILLIC CAPITAL LETTER KOMI TJE
-	0x0561, 0x0531, // ARMENIAN CAPITAL LETTER AYB
-	0x0562, 0x0532, // ARMENIAN CAPITAL LETTER BEN
-	0x0563, 0x0533, // ARMENIAN CAPITAL LETTER GIM
-	0x0564, 0x0534, // ARMENIAN CAPITAL LETTER DA
-	0x0565, 0x0535, // ARMENIAN CAPITAL LETTER ECH
-	0x0566, 0x0536, // ARMENIAN CAPITAL LETTER ZA
-	0x0567, 0x0537, // ARMENIAN CAPITAL LETTER EH
-	0x0568, 0x0538, // ARMENIAN CAPITAL LETTER ET
-	0x0569, 0x0539, // ARMENIAN CAPITAL LETTER TO
-	0x056A, 0x053A, // ARMENIAN CAPITAL LETTER ZHE
-	0x056B, 0x053B, // ARMENIAN CAPITAL LETTER INI
-	0x056C, 0x053C, // ARMENIAN CAPITAL LETTER LIWN
-	0x056D, 0x053D, // ARMENIAN CAPITAL LETTER XEH
-	0x056E, 0x053E, // ARMENIAN CAPITAL LETTER CA
-	0x056F, 0x053F, // ARMENIAN CAPITAL LETTER KEN
-	0x0570, 0x0540, // ARMENIAN CAPITAL LETTER HO
-	0x0571, 0x0541, // ARMENIAN CAPITAL LETTER JA
-	0x0572, 0x0542, // ARMENIAN CAPITAL LETTER GHAD
-	0x0573, 0x0543, // ARMENIAN CAPITAL LETTER CHEH
-	0x0574, 0x0544, // ARMENIAN CAPITAL LETTER MEN
-	0x0575, 0x0545, // ARMENIAN CAPITAL LETTER YI
-	0x0576, 0x0546, // ARMENIAN CAPITAL LETTER NOW
-	0x0577, 0x0547, // ARMENIAN CAPITAL LETTER SHA
-	0x0578, 0x0548, // ARMENIAN CAPITAL LETTER VO
-	0x0579, 0x0549, // ARMENIAN CAPITAL LETTER CHA
-	0x057A, 0x054A, // ARMENIAN CAPITAL LETTER PEH
-	0x057B, 0x054B, // ARMENIAN CAPITAL LETTER JHEH
-	0x057C, 0x054C, // ARMENIAN CAPITAL LETTER RA
-	0x057D, 0x054D, // ARMENIAN CAPITAL LETTER SEH
-	0x057E, 0x054E, // ARMENIAN CAPITAL LETTER VEW
-	0x057F, 0x054F, // ARMENIAN CAPITAL LETTER TIWN
-	0x0580, 0x0550, // ARMENIAN CAPITAL LETTER REH
-	0x0581, 0x0551, // ARMENIAN CAPITAL LETTER CO
-	0x0582, 0x0552, // ARMENIAN CAPITAL LETTER YIWN
-	0x0583, 0x0553, // ARMENIAN CAPITAL LETTER PIWR
-	0x0584, 0x0554, // ARMENIAN CAPITAL LETTER KEH
-	0x0585, 0x0555, // ARMENIAN CAPITAL LETTER OH
-	0x0586, 0x0556, // ARMENIAN CAPITAL LETTER FEH
-	// 0x1E01, 0x1E00, // LATIN CAPITAL LETTER A WITH RING BELOW
-	0x1E01, 'A', // LATIN CAPITAL LETTER A WITH RING BELOW
-	// 0x1E03, 0x1E02, // LATIN CAPITAL LETTER B WITH DOT ABOVE
-	0x1E03, 'B', // LATIN CAPITAL LETTER B WITH DOT ABOVE
-	// 0x1E05, 0x1E04, // LATIN CAPITAL LETTER B WITH DOT BELOW
-	0x1E05, 'B', // LATIN CAPITAL LETTER B WITH DOT BELOW
-	// 0x1E07, 0x1E06, // LATIN CAPITAL LETTER B WITH LINE BELOW
-	0x1E07, 'B', // LATIN CAPITAL LETTER B WITH LINE BELOW
-	// 0x1E09, 0x1E08, // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-	0x1E09, 'C', // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-	// 0x1E0B, 0x1E0A, // LATIN CAPITAL LETTER D WITH DOT ABOVE
-	0x1E0B, 'D', // LATIN CAPITAL LETTER D WITH DOT ABOVE
-	// 0x1E0D, 0x1E0C, // LATIN CAPITAL LETTER D WITH DOT BELOW
-	0x1E0D, 'D', // LATIN CAPITAL LETTER D WITH DOT BELOW
-	// 0x1E0F, 0x1E0E, // LATIN CAPITAL LETTER D WITH LINE BELOW
-	0x1E0F, 'D', // LATIN CAPITAL LETTER D WITH LINE BELOW
-	// 0x1E11, 0x1E10, // LATIN CAPITAL LETTER D WITH CEDILLA
-	0x1E11, 'D', // LATIN CAPITAL LETTER D WITH CEDILLA
-	// 0x1E13, 0x1E12, // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-	0x1E13, 'D', // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-	// 0x1E15, 0x1E14, // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-	0x1E15, 'E', // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-	// 0x1E17, 0x1E16, // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-	0x1E17, 'E', // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-	// 0x1E19, 0x1E18, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-	0x1E19, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-	// 0x1E1B, 0x1E1A, // LATIN CAPITAL LETTER E WITH TILDE BELOW
-	0x1E1B, 'E', // LATIN CAPITAL LETTER E WITH TILDE BELOW
-	// 0x1E1D, 0x1E1C, // LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-	0x1E1D, 'E', // LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-	// 0x1E1F, 0x1E1E, // LATIN CAPITAL LETTER F WITH DOT ABOVE
-	0x1E1F, 'F', // LATIN CAPITAL LETTER F WITH DOT ABOVE
-	// 0x1E21, 0x1E20, // LATIN CAPITAL LETTER G WITH MACRON
-	0x1E21, 'G', // LATIN CAPITAL LETTER G WITH MACRON
-	// 0x1E23, 0x1E22, // LATIN CAPITAL LETTER H WITH DOT ABOVE
-	0x1E23, 'H', // LATIN CAPITAL LETTER H WITH DOT ABOVE
-	// 0x1E25, 0x1E24, // LATIN CAPITAL LETTER H WITH DOT BELOW
-	0x1E25, 'H', // LATIN CAPITAL LETTER H WITH DOT BELOW
-	// 0x1E27, 0x1E26, // LATIN CAPITAL LETTER H WITH DIAERESIS
-	0x1E27, 'H', // LATIN CAPITAL LETTER H WITH DIAERESIS
-	// 0x1E29, 0x1E28, // LATIN CAPITAL LETTER H WITH CEDILLA
-	0x1E29, 'H', // LATIN CAPITAL LETTER H WITH CEDILLA
-	// 0x1E2B, 0x1E2A, // LATIN CAPITAL LETTER H WITH BREVE BELOW
-	0x1E2B, 'H', // LATIN CAPITAL LETTER H WITH BREVE BELOW
-	// 0x1E2D, 0x1E2C, // LATIN CAPITAL LETTER I WITH TILDE BELOW
-	0x1E2D, 'I', // LATIN CAPITAL LETTER I WITH TILDE BELOW
-	// 0x1E2F, 0x1E2E, // LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-	0x1E2F, 'I', // LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-	// 0x1E31, 0x1E30, // LATIN CAPITAL LETTER K WITH ACUTE
-	0x1E31, 'K', // LATIN CAPITAL LETTER K WITH ACUTE
-	// 0x1E33, 0x1E32, // LATIN CAPITAL LETTER K WITH DOT BELOW
-	0x1E33, 'K', // LATIN CAPITAL LETTER K WITH DOT BELOW
-	// 0x1E35, 0x1E34, // LATIN CAPITAL LETTER K WITH LINE BELOW
-	0x1E35, 'K', // LATIN CAPITAL LETTER K WITH LINE BELOW
-	// 0x1E37, 0x1E36, // LATIN CAPITAL LETTER L WITH DOT BELOW
-	0x1E37, 'L', // LATIN CAPITAL LETTER L WITH DOT BELOW
-	// 0x1E39, 0x1E38, // LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-	0x1E39, 'L', // LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-	// 0x1E3B, 0x1E3A, // LATIN CAPITAL LETTER L WITH LINE BELOW
-	0x1E3B, 'L', // LATIN CAPITAL LETTER L WITH LINE BELOW
-	// 0x1E3D, 0x1E3C, // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-	0x1E3D, 'L', // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-	// 0x1E3F, 0x1E3E, // LATIN CAPITAL LETTER M WITH ACUTE
-	0x1E3F, 'M', // LATIN CAPITAL LETTER M WITH ACUTE
-	// 0x1E41, 0x1E40, // LATIN CAPITAL LETTER M WITH DOT ABOVE
-	0x1E41, 'M', // LATIN CAPITAL LETTER M WITH DOT ABOVE
-	// 0x1E43, 0x1E42, // LATIN CAPITAL LETTER M WITH DOT BELOW
-	0x1E43, 'M', // LATIN CAPITAL LETTER M WITH DOT BELOW
-	// 0x1E45, 0x1E44, // LATIN CAPITAL LETTER N WITH DOT ABOVE
-	0x1E45, 'N', // LATIN CAPITAL LETTER N WITH DOT ABOVE
-	// 0x1E47, 0x1E46, // LATIN CAPITAL LETTER N WITH DOT BELOW
-	0x1E47, 'N', // LATIN CAPITAL LETTER N WITH DOT BELOW
-	// 0x1E49, 0x1E48, // LATIN CAPITAL LETTER N WITH LINE BELOW
-	0x1E49, 'N', // LATIN CAPITAL LETTER N WITH LINE BELOW
-	// 0x1E4B, 0x1E4A, // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-	0x1E4B, 'N', // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-	// 0x1E4D, 0x1E4C, // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-	0x1E4D, 'O', // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-	// 0x1E4F, 0x1E4E, // LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-	0x1E4F, 'O', // LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-	// 0x1E51, 0x1E50, // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-	0x1E51, 'O', // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-	// 0x1E53, 0x1E52, // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-	0x1E53, 'O', // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-	// 0x1E55, 0x1E54, // LATIN CAPITAL LETTER P WITH ACUTE
-	0x1E55, 'P', // LATIN CAPITAL LETTER P WITH ACUTE
-	// 0x1E57, 0x1E56, // LATIN CAPITAL LETTER P WITH DOT ABOVE
-	0x1E57, 'P', // LATIN CAPITAL LETTER P WITH DOT ABOVE
-	// 0x1E59, 0x1E58, // LATIN CAPITAL LETTER R WITH DOT ABOVE
-	0x1E59, 'R', // LATIN CAPITAL LETTER R WITH DOT ABOVE
-	// 0x1E5B, 0x1E5A, // LATIN CAPITAL LETTER R WITH DOT BELOW
-	0x1E5B, 'R', // LATIN CAPITAL LETTER R WITH DOT BELOW
-	// 0x1E5D, 0x1E5C, // LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-	0x1E5D, 'R', // LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-	// 0x1E5F, 0x1E5E, // LATIN CAPITAL LETTER R WITH LINE BELOW
-	0x1E5F, 'R', // LATIN CAPITAL LETTER R WITH LINE BELOW
-	// 0x1E61, 0x1E60, // LATIN CAPITAL LETTER S WITH DOT ABOVE
-	0x1E61, 'S', // LATIN CAPITAL LETTER S WITH DOT ABOVE
-	// 0x1E63, 0x1E62, // LATIN CAPITAL LETTER S WITH DOT BELOW
-	0x1E63, 'S', // LATIN CAPITAL LETTER S WITH DOT BELOW
-	// 0x1E65, 0x1E64, // LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-	0x1E65, 'S', // LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-	// 0x1E67, 0x1E66, // LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-	0x1E67, 'S', // LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-	// 0x1E69, 0x1E68, // LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-	0x1E69, 'S', // LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-	// 0x1E6B, 0x1E6A, // LATIN CAPITAL LETTER T WITH DOT ABOVE
-	0x1E6B, 'T', // LATIN CAPITAL LETTER T WITH DOT ABOVE
-	// 0x1E6D, 0x1E6C, // LATIN CAPITAL LETTER T WITH DOT BELOW
-	0x1E6D, 'T', // LATIN CAPITAL LETTER T WITH DOT BELOW
-	// 0x1E6F, 0x1E6E, // LATIN CAPITAL LETTER T WITH LINE BELOW
-	0x1E6F, 'T', // LATIN CAPITAL LETTER T WITH LINE BELOW
-	// 0x1E71, 0x1E70, // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-	0x1E71, 'T', // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-	// 0x1E73, 0x1E72, // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-	0x1E73, 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-	// 0x1E75, 0x1E74, // LATIN CAPITAL LETTER U WITH TILDE BELOW
-	0x1E75, 'U', // LATIN CAPITAL LETTER U WITH TILDE BELOW
-	// 0x1E77, 0x1E76, // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-	0x1E77, 'U', // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-	// 0x1E79, 0x1E78, // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-	0x1E79, 'U', // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-	// 0x1E7B, 0x1E7A, // LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-	0x1E7B, 'U', // LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-	// 0x1E7D, 0x1E7C, // LATIN CAPITAL LETTER V WITH TILDE
-	0x1E7D, 'V', // LATIN CAPITAL LETTER V WITH TILDE
-	// 0x1E7F, 0x1E7E, // LATIN CAPITAL LETTER V WITH DOT BELOW
-	0x1E7F, 'V', // LATIN CAPITAL LETTER V WITH DOT BELOW
-	// 0x1E81, 0x1E80, // LATIN CAPITAL LETTER W WITH GRAVE
-	0x1E81, 'W', // LATIN CAPITAL LETTER W WITH GRAVE
-	// 0x1E83, 0x1E82, // LATIN CAPITAL LETTER W WITH ACUTE
-	0x1E83, 'W', // LATIN CAPITAL LETTER W WITH ACUTE
-	// 0x1E85, 0x1E84, // LATIN CAPITAL LETTER W WITH DIAERESIS
-	0x1E85, 'W', // LATIN CAPITAL LETTER W WITH DIAERESIS
-	// 0x1E87, 0x1E86, // LATIN CAPITAL LETTER W WITH DOT ABOVE
-	0x1E87, 'W', // LATIN CAPITAL LETTER W WITH DOT ABOVE
-	// 0x1E89, 0x1E88, // LATIN CAPITAL LETTER W WITH DOT BELOW
-	0x1E89, 'W', // LATIN CAPITAL LETTER W WITH DOT BELOW
-	// 0x1E8B, 0x1E8A, // LATIN CAPITAL LETTER X WITH DOT ABOVE
-	0x1E8B, 'X', // LATIN CAPITAL LETTER X WITH DOT ABOVE
-	// 0x1E8D, 0x1E8C, // LATIN CAPITAL LETTER X WITH DIAERESIS
-	0x1E8D, 'X', // LATIN CAPITAL LETTER X WITH DIAERESIS
-	// 0x1E8F, 0x1E8E, // LATIN CAPITAL LETTER Y WITH DOT ABOVE
-	0x1E8F, 'Y', // LATIN CAPITAL LETTER Y WITH DOT ABOVE
-	// 0x1E91, 0x1E90, // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-	0x1E91, 'Z', // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-	// 0x1E93, 0x1E92, // LATIN CAPITAL LETTER Z WITH DOT BELOW
-	0x1E93, 'Z', // LATIN CAPITAL LETTER Z WITH DOT BELOW
-	// 0x1E95, 0x1E94, // LATIN CAPITAL LETTER Z WITH LINE BELOW
-	0x1E95, 'Z', // LATIN CAPITAL LETTER Z WITH LINE BELOW
-	// 0x1EA1, 0x1EA0, // LATIN CAPITAL LETTER A WITH DOT BELOW
-	0x1EA1, 'A', // LATIN CAPITAL LETTER A WITH DOT BELOW
-	// 0x1EA3, 0x1EA2, // LATIN CAPITAL LETTER A WITH HOOK ABOVE
-	0x1EA3, 'A', // LATIN CAPITAL LETTER A WITH HOOK ABOVE
-	// 0x1EA5, 0x1EA4, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-	0x1EA5, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-	// 0x1EA7, 0x1EA6, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-	0x1EA7, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-	// 0x1EA9, 0x1EA8, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1EA9, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-	// 0x1EAB, 0x1EAA, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-	0x1EAB, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-	// 0x1EAD, 0x1EAC, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-	0x1EAD, 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-	// 0x1EAF, 0x1EAE, // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-	0x1EAF, 'A', // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-	// 0x1EB1, 0x1EB0, // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-	0x1EB1, 'A', // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-	// 0x1EB3, 0x1EB2, // LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-	0x1EB3, 'A', // LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-	// 0x1EB5, 0x1EB4, // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-	0x1EB5, 'A', // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-	// 0x1EB7, 0x1EB6, // LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-	0x1EB7, 'A', // LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-	// 0x1EB9, 0x1EB8, // LATIN CAPITAL LETTER E WITH DOT BELOW
-	0x1EB9, 'E', // LATIN CAPITAL LETTER E WITH DOT BELOW
-	// 0x1EBB, 0x1EBA, // LATIN CAPITAL LETTER E WITH HOOK ABOVE
-	0x1EBB, 'E', // LATIN CAPITAL LETTER E WITH HOOK ABOVE
-	// 0x1EBD, 0x1EBC, // LATIN CAPITAL LETTER E WITH TILDE
-	0x1EBD, 'E', // LATIN CAPITAL LETTER E WITH TILDE
-	// 0x1EBF, 0x1EBE, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-	0x1EBF, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-	// 0x1EC1, 0x1EC0, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-	0x1EC1, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-	// 0x1EC3, 0x1EC2, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1EC3, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-	// 0x1EC5, 0x1EC4, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-	0x1EC5, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-	// 0x1EC7, 0x1EC6, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-	0x1EC7, 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-	// 0x1EC9, 0x1EC8, // LATIN CAPITAL LETTER I WITH HOOK ABOVE
-	0x1EC9, 'I', // LATIN CAPITAL LETTER I WITH HOOK ABOVE
-	// 0x1ECB, 0x1ECA, // LATIN CAPITAL LETTER I WITH DOT BELOW
-	0x1ECB, 'I', // LATIN CAPITAL LETTER I WITH DOT BELOW
-	// 0x1ECD, 0x1ECC, // LATIN CAPITAL LETTER O WITH DOT BELOW
-	0x1ECD, 'O', // LATIN CAPITAL LETTER O WITH DOT BELOW
-	// 0x1ECF, 0x1ECE, // LATIN CAPITAL LETTER O WITH HOOK ABOVE
-	0x1ECF, 'O', // LATIN CAPITAL LETTER O WITH HOOK ABOVE
-	// 0x1ED1, 0x1ED0, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-	0x1ED1, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-	// 0x1ED3, 0x1ED2, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-	0x1ED3, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-	// 0x1ED5, 0x1ED4, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-	0x1ED5, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-	// 0x1ED7, 0x1ED6, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-	0x1ED7, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-	// 0x1ED9, 0x1ED8, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-	0x1ED9, 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-	// 0x1EDB, 0x1EDA, // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-	0x1EDB, 'O', // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-	// 0x1EDD, 0x1EDC, // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-	0x1EDD, 'O', // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-	// 0x1EDF, 0x1EDE, // LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-	0x1EDF, 'O', // LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-	// 0x1EE1, 0x1EE0, // LATIN CAPITAL LETTER O WITH HORN AND TILDE
-	0x1EE1, 'O', // LATIN CAPITAL LETTER O WITH HORN AND TILDE
-	// 0x1EE3, 0x1EE2, // LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-	0x1EE3, 'O', // LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-	// 0x1EE5, 0x1EE4, // LATIN CAPITAL LETTER U WITH DOT BELOW
-	0x1EE5, 'U', // LATIN CAPITAL LETTER U WITH DOT BELOW
-	// 0x1EE7, 0x1EE6, // LATIN CAPITAL LETTER U WITH HOOK ABOVE
-	0x1EE7, 'U', // LATIN CAPITAL LETTER U WITH HOOK ABOVE
-	// 0x1EE9, 0x1EE8, // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-	0x1EE9, 'U', // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-	// 0x1EEB, 0x1EEA, // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-	0x1EEB, 'U', // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-	// 0x1EED, 0x1EEC, // LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-	0x1EED, 'U', // LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-	// 0x1EEF, 0x1EEE, // LATIN CAPITAL LETTER U WITH HORN AND TILDE
-	0x1EEF, 'U', // LATIN CAPITAL LETTER U WITH HORN AND TILDE
-	// 0x1EF1, 0x1EF0, // LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-	0x1EF1, 'U', // LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-	// 0x1EF3, 0x1EF2, // LATIN CAPITAL LETTER Y WITH GRAVE
-	0x1EF3, 'Y', // LATIN CAPITAL LETTER Y WITH GRAVE
-	// 0x1EF5, 0x1EF4, // LATIN CAPITAL LETTER Y WITH DOT BELOW
-	0x1EF5, 'Y', // LATIN CAPITAL LETTER Y WITH DOT BELOW
-	// 0x1EF7, 0x1EF6, // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-	0x1EF7, 'Y', // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-	// 0x1EF9, 0x1EF8, // LATIN CAPITAL LETTER Y WITH TILDE
-	0x1EF9, 'Y', // LATIN CAPITAL LETTER Y WITH TILDE
-	0x1F00, 0x1F08, // GREEK CAPITAL LETTER ALPHA WITH PSILI
-	0x1F01, 0x1F09, // GREEK CAPITAL LETTER ALPHA WITH DASIA
-	0x1F02, 0x1F0A, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-	0x1F03, 0x1F0B, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-	0x1F04, 0x1F0C, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-	0x1F05, 0x1F0D, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-	0x1F06, 0x1F0E, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-	0x1F07, 0x1F0F, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-	0x1F10, 0x1F18, // GREEK CAPITAL LETTER EPSILON WITH PSILI
-	0x1F11, 0x1F19, // GREEK CAPITAL LETTER EPSILON WITH DASIA
-	0x1F12, 0x1F1A, // GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-	0x1F13, 0x1F1B, // GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-	0x1F14, 0x1F1C, // GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-	0x1F15, 0x1F1D, // GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-	0x1F20, 0x1F28, // GREEK CAPITAL LETTER ETA WITH PSILI
-	0x1F21, 0x1F29, // GREEK CAPITAL LETTER ETA WITH DASIA
-	0x1F22, 0x1F2A, // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-	0x1F23, 0x1F2B, // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-	0x1F24, 0x1F2C, // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-	0x1F25, 0x1F2D, // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-	0x1F26, 0x1F2E, // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-	0x1F27, 0x1F2F, // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-	0x1F30, 0x1F38, // GREEK CAPITAL LETTER IOTA WITH PSILI
-	0x1F31, 0x1F39, // GREEK CAPITAL LETTER IOTA WITH DASIA
-	0x1F32, 0x1F3A, // GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-	0x1F33, 0x1F3B, // GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-	0x1F34, 0x1F3C, // GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-	0x1F35, 0x1F3D, // GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-	0x1F36, 0x1F3E, // GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-	0x1F37, 0x1F3F, // GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-	0x1F40, 0x1F48, // GREEK CAPITAL LETTER OMICRON WITH PSILI
-	0x1F41, 0x1F49, // GREEK CAPITAL LETTER OMICRON WITH DASIA
-	0x1F42, 0x1F4A, // GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-	0x1F43, 0x1F4B, // GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-	0x1F44, 0x1F4C, // GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-	0x1F45, 0x1F4D, // GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-	0x1F51, 0x1F59, // GREEK CAPITAL LETTER UPSILON WITH DASIA
-	0x1F53, 0x1F5B, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-	0x1F55, 0x1F5D, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-	0x1F57, 0x1F5F, // GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-	0x1F60, 0x1F68, // GREEK CAPITAL LETTER OMEGA WITH PSILI
-	0x1F61, 0x1F69, // GREEK CAPITAL LETTER OMEGA WITH DASIA
-	0x1F62, 0x1F6A, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-	0x1F63, 0x1F6B, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-	0x1F64, 0x1F6C, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-	0x1F65, 0x1F6D, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-	0x1F66, 0x1F6E, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-	0x1F67, 0x1F6F, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-	0x1F70, 0x1FBA, // GREEK CAPITAL LETTER ALPHA WITH VARIA
-	0x1F71, 0x1FBB, // GREEK CAPITAL LETTER ALPHA WITH OXIA
-	0x1F72, 0x1FC8, // GREEK CAPITAL LETTER EPSILON WITH VARIA
-	0x1F73, 0x1FC9, // GREEK CAPITAL LETTER EPSILON WITH OXIA
-	0x1F74, 0x1FCA, // GREEK CAPITAL LETTER ETA WITH VARIA
-	0x1F75, 0x1FCB, // GREEK CAPITAL LETTER ETA WITH OXIA
-	0x1F76, 0x1FDA, // GREEK CAPITAL LETTER IOTA WITH VARIA
-	0x1F77, 0x1FDB, // GREEK CAPITAL LETTER IOTA WITH OXIA
-	0x1F78, 0x1FF8, // GREEK CAPITAL LETTER OMICRON WITH VARIA
-	0x1F79, 0x1FF9, // GREEK CAPITAL LETTER OMICRON WITH OXIA
-	0x1F7A, 0x1FEA, // GREEK CAPITAL LETTER UPSILON WITH VARIA
-	0x1F7B, 0x1FEB, // GREEK CAPITAL LETTER UPSILON WITH OXIA
-	0x1F7C, 0x1FFA, // GREEK CAPITAL LETTER OMEGA WITH VARIA
-	0x1F7D, 0x1FFB, // GREEK CAPITAL LETTER OMEGA WITH OXIA
-	0x1F80, 0x1F88, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-	0x1F81, 0x1F89, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-	0x1F82, 0x1F8A, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1F83, 0x1F8B, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1F84, 0x1F8C, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1F85, 0x1F8D, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1F86, 0x1F8E, // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F87, 0x1F8F, // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F90, 0x1F98, // GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-	0x1F91, 0x1F99, // GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-	0x1F92, 0x1F9A, // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1F93, 0x1F9B, // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1F94, 0x1F9C, // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1F95, 0x1F9D, // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1F96, 0x1F9E, // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1F97, 0x1F9F, // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FA0, 0x1FA8, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-	0x1FA1, 0x1FA9, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-	0x1FA2, 0x1FAA, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-	0x1FA3, 0x1FAB, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-	0x1FA4, 0x1FAC, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-	0x1FA5, 0x1FAD, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-	0x1FA6, 0x1FAE, // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FA7, 0x1FAF, // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-	0x1FB0, 0x1FB8, // GREEK CAPITAL LETTER ALPHA WITH VRACHY
-	0x1FB1, 0x1FB9, // GREEK CAPITAL LETTER ALPHA WITH MACRON
-	0x1FB3, 0x1FBC, // GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-	0x1FC3, 0x1FCC, // GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-	0x1FD0, 0x1FD8, // GREEK CAPITAL LETTER IOTA WITH VRACHY
-	0x1FD1, 0x1FD9, // GREEK CAPITAL LETTER IOTA WITH MACRON
-	0x1FE0, 0x1FE8, // GREEK CAPITAL LETTER UPSILON WITH VRACHY
-	0x1FE1, 0x1FE9, // GREEK CAPITAL LETTER UPSILON WITH MACRON
-	0x1FE5, 0x1FEC, // GREEK CAPITAL LETTER RHO WITH DASIA
-	0x1FF3, 0x1FFC, // GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-	0x2170, 0x2160, // ROMAN NUMERAL ONE
-	0x2171, 0x2161, // ROMAN NUMERAL TWO
-	0x2172, 0x2162, // ROMAN NUMERAL THREE
-	0x2173, 0x2163, // ROMAN NUMERAL FOUR
-	0x2174, 0x2164, // ROMAN NUMERAL FIVE
-	0x2175, 0x2165, // ROMAN NUMERAL SIX
-	0x2176, 0x2166, // ROMAN NUMERAL SEVEN
-	0x2177, 0x2167, // ROMAN NUMERAL EIGHT
-	0x2178, 0x2168, // ROMAN NUMERAL NINE
-	0x2179, 0x2169, // ROMAN NUMERAL TEN
-	0x217A, 0x216A, // ROMAN NUMERAL ELEVEN
-	0x217B, 0x216B, // ROMAN NUMERAL TWELVE
-	0x217C, 0x216C, // ROMAN NUMERAL FIFTY
-	0x217D, 0x216D, // ROMAN NUMERAL ONE HUNDRED
-	0x217E, 0x216E, // ROMAN NUMERAL FIVE HUNDRED
-	0x217F, 0x216F, // ROMAN NUMERAL ONE THOUSAND
-	// 0x24D0, 0x24B6, // CIRCLED LATIN CAPITAL LETTER A
-	0x24D0, 'A', // CIRCLED LATIN CAPITAL LETTER A
-	// 0x24D1, 0x24B7, // CIRCLED LATIN CAPITAL LETTER B
-	0x24D1, 'B', // CIRCLED LATIN CAPITAL LETTER B
-	// 0x24D2, 0x24B8, // CIRCLED LATIN CAPITAL LETTER C
-	0x24D2, 'C', // CIRCLED LATIN CAPITAL LETTER C
-	// 0x24D3, 0x24B9, // CIRCLED LATIN CAPITAL LETTER D
-	0x24D3, 'D', // CIRCLED LATIN CAPITAL LETTER D
-	// 0x24D4, 0x24BA, // CIRCLED LATIN CAPITAL LETTER E
-	0x24D4, 'E', // CIRCLED LATIN CAPITAL LETTER E
-	// 0x24D5, 0x24BB, // CIRCLED LATIN CAPITAL LETTER F
-	0x24D5, 'F', // CIRCLED LATIN CAPITAL LETTER F
-	// 0x24D6, 0x24BC, // CIRCLED LATIN CAPITAL LETTER G
-	0x24D6, 'G', // CIRCLED LATIN CAPITAL LETTER G
-	// 0x24D7, 0x24BD, // CIRCLED LATIN CAPITAL LETTER H
-	0x24D7, 'H', // CIRCLED LATIN CAPITAL LETTER H
-	// 0x24D8, 0x24BE, // CIRCLED LATIN CAPITAL LETTER I
-	0x24D8, 'I', // CIRCLED LATIN CAPITAL LETTER I
-	// 0x24D9, 0x24BF, // CIRCLED LATIN CAPITAL LETTER J
-	0x24D9, 'J', // CIRCLED LATIN CAPITAL LETTER J
-	// 0x24DA, 0x24C0, // CIRCLED LATIN CAPITAL LETTER K
-	0x24DA, 'K', // CIRCLED LATIN CAPITAL LETTER K
-	// 0x24DB, 0x24C1, // CIRCLED LATIN CAPITAL LETTER L
-	0x24DB, 'L', // CIRCLED LATIN CAPITAL LETTER L
-	// 0x24DC, 0x24C2, // CIRCLED LATIN CAPITAL LETTER M
-	0x24DC, 'M', // CIRCLED LATIN CAPITAL LETTER M
-	// 0x24DD, 0x24C3, // CIRCLED LATIN CAPITAL LETTER N
-	0x24DD, 'N', // CIRCLED LATIN CAPITAL LETTER N
-	// 0x24DE, 0x24C4, // CIRCLED LATIN CAPITAL LETTER O
-	0x24DE, 'O', // CIRCLED LATIN CAPITAL LETTER O
-	// 0x24DF, 0x24C5, // CIRCLED LATIN CAPITAL LETTER P
-	0x24DF, 'P', // CIRCLED LATIN CAPITAL LETTER P
-	// 0x24E0, 0x24C6, // CIRCLED LATIN CAPITAL LETTER Q
-	0x24E0, 'Q', // CIRCLED LATIN CAPITAL LETTER Q
-	// 0x24E1, 0x24C7, // CIRCLED LATIN CAPITAL LETTER R
-	0x24E1, 'R', // CIRCLED LATIN CAPITAL LETTER R
-	// 0x24E2, 0x24C8, // CIRCLED LATIN CAPITAL LETTER S
-	0x24E2, 'S', // CIRCLED LATIN CAPITAL LETTER S
-	// 0x24E3, 0x24C9, // CIRCLED LATIN CAPITAL LETTER T
-	0x24E3, 'T', // CIRCLED LATIN CAPITAL LETTER T
-	// 0x24E4, 0x24CA, // CIRCLED LATIN CAPITAL LETTER U
-	0x24E4, 'U', // CIRCLED LATIN CAPITAL LETTER U
-	// 0x24E5, 0x24CB, // CIRCLED LATIN CAPITAL LETTER V
-	0x24E5, 'V', // CIRCLED LATIN CAPITAL LETTER V
-	// 0x24E6, 0x24CC, // CIRCLED LATIN CAPITAL LETTER W
-	0x24E6, 'W', // CIRCLED LATIN CAPITAL LETTER W
-	// 0x24E7, 0x24CD, // CIRCLED LATIN CAPITAL LETTER X
-	0x24E7, 'X', // CIRCLED LATIN CAPITAL LETTER X
-	// 0x24E8, 0x24CE, // CIRCLED LATIN CAPITAL LETTER Y
-	0x24E8, 'Y', // CIRCLED LATIN CAPITAL LETTER Y
-	// 0x24E9, 0x24CF, // CIRCLED LATIN CAPITAL LETTER Z
-	0x24E9, 'Z', // CIRCLED LATIN CAPITAL LETTER Z
-	// 0xFF41, 0xFF21, // FULLWIDTH LATIN CAPITAL LETTER A
-	0xFF41, 'A', // FULLWIDTH LATIN CAPITAL LETTER A
-	// 0xFF42, 0xFF22, // FULLWIDTH LATIN CAPITAL LETTER B
-	0xFF42, 'B', // FULLWIDTH LATIN CAPITAL LETTER B
-	// 0xFF43, 0xFF23, // FULLWIDTH LATIN CAPITAL LETTER C
-	0xFF43, 'C', // FULLWIDTH LATIN CAPITAL LETTER C
-	// 0xFF44, 0xFF24, // FULLWIDTH LATIN CAPITAL LETTER D
-	0xFF44, 'D', // FULLWIDTH LATIN CAPITAL LETTER D
-	// 0xFF45, 0xFF25, // FULLWIDTH LATIN CAPITAL LETTER E
-	0xFF45, 'E', // FULLWIDTH LATIN CAPITAL LETTER E
-	// 0xFF46, 0xFF26, // FULLWIDTH LATIN CAPITAL LETTER F
-	0xFF46, 'F', // FULLWIDTH LATIN CAPITAL LETTER F
-	// 0xFF47, 0xFF27, // FULLWIDTH LATIN CAPITAL LETTER G
-	0xFF47, 'G', // FULLWIDTH LATIN CAPITAL LETTER G
-	// 0xFF48, 0xFF28, // FULLWIDTH LATIN CAPITAL LETTER H
-	0xFF48, 'H', // FULLWIDTH LATIN CAPITAL LETTER H
-	// 0xFF49, 0xFF29, // FULLWIDTH LATIN CAPITAL LETTER I
-	0xFF49, 'I', // FULLWIDTH LATIN CAPITAL LETTER I
-	// 0xFF4A, 0xFF2A, // FULLWIDTH LATIN CAPITAL LETTER J
-	0xFF4A, 'J', // FULLWIDTH LATIN CAPITAL LETTER J
-	// 0xFF4B, 0xFF2B, // FULLWIDTH LATIN CAPITAL LETTER K
-	0xFF4B, 'K', // FULLWIDTH LATIN CAPITAL LETTER K
-	// 0xFF4C, 0xFF2C, // FULLWIDTH LATIN CAPITAL LETTER L
-	0xFF4C, 'L', // FULLWIDTH LATIN CAPITAL LETTER L
-	// 0xFF4D, 0xFF2D, // FULLWIDTH LATIN CAPITAL LETTER M
-	0xFF4D, 'M', // FULLWIDTH LATIN CAPITAL LETTER M
-	// 0xFF4E, 0xFF2E, // FULLWIDTH LATIN CAPITAL LETTER N
-	0xFF4E, 'N', // FULLWIDTH LATIN CAPITAL LETTER N
-	// 0xFF4F, 0xFF2F, // FULLWIDTH LATIN CAPITAL LETTER O
-	0xFF4F, 'O', // FULLWIDTH LATIN CAPITAL LETTER O
-	// 0xFF50, 0xFF30, // FULLWIDTH LATIN CAPITAL LETTER P
-	0xFF50, 'P', // FULLWIDTH LATIN CAPITAL LETTER P
-	// 0xFF51, 0xFF31, // FULLWIDTH LATIN CAPITAL LETTER Q
-	0xFF51, 'Q', // FULLWIDTH LATIN CAPITAL LETTER Q
-	// 0xFF52, 0xFF32, // FULLWIDTH LATIN CAPITAL LETTER R
-	0xFF52, 'R', // FULLWIDTH LATIN CAPITAL LETTER R
-	// 0xFF53, 0xFF33, // FULLWIDTH LATIN CAPITAL LETTER S
-	0xFF53, 'S', // FULLWIDTH LATIN CAPITAL LETTER S
-	// 0xFF54, 0xFF34, // FULLWIDTH LATIN CAPITAL LETTER T
-	0xFF54, 'T', // FULLWIDTH LATIN CAPITAL LETTER T
-	// 0xFF55, 0xFF35, // FULLWIDTH LATIN CAPITAL LETTER U
-	0xFF55, 'U', // FULLWIDTH LATIN CAPITAL LETTER U
-	// 0xFF56, 0xFF36, // FULLWIDTH LATIN CAPITAL LETTER V
-	0xFF56, 'V', // FULLWIDTH LATIN CAPITAL LETTER V
-	// 0xFF57, 0xFF37, // FULLWIDTH LATIN CAPITAL LETTER W
-	0xFF57, 'W', // FULLWIDTH LATIN CAPITAL LETTER W
-	// 0xFF58, 0xFF38, // FULLWIDTH LATIN CAPITAL LETTER X
-	0xFF58, 'X', // FULLWIDTH LATIN CAPITAL LETTER X
-	// 0xFF59, 0xFF39, // FULLWIDTH LATIN CAPITAL LETTER Y
-	0xFF59, 'Y', // FULLWIDTH LATIN CAPITAL LETTER Y
-	// 0xFF5A, 0xFF3A, // FULLWIDTH LATIN CAPITAL LETTER Z
-	0xFF5A, 'Z', // FULLWIDTH LATIN CAPITAL LETTER Z
-};
-
-// ***************************************************************************
-
-int toLowerUpperCompare(const void *arg1, const void *arg2)
-{
-	ucchar uc1 = *(ucchar *)arg1;
-	ucchar uc2 = *(ucchar *)arg2;
-	return (uc1<uc2)?-1:(uc1 > uc2)?1:0;
-}
-
-// ***************************************************************************
-
-/* This macro uses bsearch, it can be slow. If it is, a template (inline) version of bsearch working with pointers should be written */
-#define toLowerUpperSearch(value, table) ((ucchar *)bsearch( value, table, sizeof(table)/(2*sizeof(ucchar)), 2*sizeof(ucchar), toLowerUpperCompare))
-
-// ***************************************************************************
-
-ucstring	toLower (const ucstring &str)
+ucstring toLower (const ucstring &str)
 {
-	uint i;
-	ucstring temp = str;
-	const uint size = (uint)temp.size();
-	for (i=0; i<(uint)size; i++)
-	{
-		// Search the key in the table
-		ucchar *result = toLowerUpperSearch (&(temp[i]), UnicodeUpperToLower);
-		if (result)
-			temp[i] = result[1];
-	}
-	return temp;
+	return ucstring::makeFromUtf8(toLower(str.toUtf8()));
 }
 
 // ***************************************************************************
 
-void		toLower (ucchar *str)
+void toLower (ucchar *str)
 {
 	while (*str)
 	{
-		// Search the key in the table
-		ucchar *result = toLowerUpperSearch (str, UnicodeUpperToLower);
-		if (result)
-			*str = result[1];
-		str++;
+		*str = toLower(*str);
+		++str;
 	}
 }
 
 // ***************************************************************************
 
-ucchar		toLower (ucchar c)
+ucchar toLower (ucchar c)
 {
-	// Search the key in the table
-	ucchar *result = toLowerUpperSearch (&c, UnicodeUpperToLower);
-	if (result)
-		return result[1];
-	return c;
+	if ((c & 0xF800) == 0xD800)
+		return c;
+	std::string tmpc, tmpr;
+	CUtfStringView::append(tmpc, c);
+	ptrdiff_t i = 0;
+	appendToLower(tmpr, tmpc, i);
+	ucstring res = CUtfStringView(tmpr).toUtf16();
+	nlassert(res.size() == 1);
+	return res[0];
 }
 
 // ***************************************************************************
 
-ucstring	toUpper (const ucstring &str)
+ucstring toUpper (const ucstring &str)
 {
-	uint i;
-	ucstring temp = str;
-	const uint size = (uint)temp.size();
-	for (i=0; i<size; i++)
-	{
-		// Search the key in the table
-		ucchar *result = toLowerUpperSearch (&(temp[i]), UnicodeLowerToUpper);
-		if (result)
-			temp[i] = result[1];
-	}
-	return temp;
+	return ucstring::makeFromUtf8(toUpper(str.toUtf8()));
 }
 
 // ***************************************************************************
 
-void		toUpper (ucchar *str)
+void toUpper (ucchar *str)
 {
 	while (*str)
 	{
-		// Search the key in the table
-		ucchar *result = toLowerUpperSearch (str, UnicodeLowerToUpper);
-		if (result)
-			*str = result[1];
-		str++;
-	}
-}
-
-// ***************************************************************************
-
-ucchar		toUpper (ucchar c)
-{
-	// Search the key in the table
-	ucchar *result = toLowerUpperSearch (&c, UnicodeLowerToUpper);
-	if (result)
-		return result[1];
-	return c;
-}
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-static const char s_Utf8UpperToLowerC2[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xBC', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerC3[64 * 4] = {
-	'\xC3', '\xA0', '\x00', 0,
-	'\xC3', '\xA1', '\x00', 0,
-	'\xC3', '\xA2', '\x00', 0,
-	'\xC3', '\xA3', '\x00', 0,
-	'\xC3', '\xA4', '\x00', 0,
-	'\xC3', '\xA5', '\x00', 0,
-	'\xC3', '\xA6', '\x00', 0,
-	'\xC3', '\xA7', '\x00', 0,
-	'\xC3', '\xA8', '\x00', 0,
-	'\xC3', '\xA9', '\x00', 0,
-	'\xC3', '\xAA', '\x00', 0,
-	'\xC3', '\xAB', '\x00', 0,
-	'\xC3', '\xAC', '\x00', 0,
-	'\xC3', '\xAD', '\x00', 0,
-	'\xC3', '\xAE', '\x00', 0,
-	'\xC3', '\xAF', '\x00', 0,
-	'\xC3', '\xB0', '\x00', 0,
-	'\xC3', '\xB1', '\x00', 0,
-	'\xC3', '\xB2', '\x00', 0,
-	'\xC3', '\xB3', '\x00', 0,
-	'\xC3', '\xB4', '\x00', 0,
-	'\xC3', '\xB5', '\x00', 0,
-	'\xC3', '\xB6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC3', '\xB8', '\x00', 0,
-	'\xC3', '\xB9', '\x00', 0,
-	'\xC3', '\xBA', '\x00', 0,
-	'\xC3', '\xBB', '\x00', 0,
-	'\xC3', '\xBC', '\x00', 0,
-	'\xC3', '\xBD', '\x00', 0,
-	'\xC3', '\xBE', '\x00', 0,
-	'\xC3', '\x9F', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerC4[64 * 4] = {
-	'\xC4', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x83', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x87', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x91', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x93', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x95', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x97', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\x69', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xB7', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xC4', '\xBA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xBE', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x80', '\x00', 0,
-};
-
-static const char s_Utf8UpperToLowerC5[64 * 4] = {
-	0, 0, 0, 0,
-	'\xC5', '\x82', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x84', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x88', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\xBC', '\x00', 0,
-	'\xC5', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x91', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x93', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x95', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x97', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xB7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC3', '\xBF', '\x00', 0,
-	'\xC5', '\xBA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\xBE', '\x00', 0,
-	0, 0, 0, 0,
-	'\x73', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8UpperToLowerC6[64 * 4] = {
-	0, 0, 0, 0,
-	'\xC9', '\x93', '\x00', 0,
-	'\xC6', '\x83', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC9', '\x94', '\x00', 0,
-	'\xC6', '\x88', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC9', '\x96', '\x00', 0,
-	'\xC9', '\x97', '\x00', 0,
-	'\xC6', '\x8C', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\x9D', '\x00', 0,
-	'\xC9', '\x99', '\x00', 0,
-	'\xC9', '\x9B', '\x00', 0,
-	'\xC6', '\x92', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC9', '\xA0', '\x00', 0,
-	'\xC9', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC9', '\xA9', '\x00', 0,
-	'\xC9', '\xA8', '\x00', 0,
-	'\xC6', '\x99', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC9', '\xAF', '\x00', 0,
-	'\xC9', '\xB2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC9', '\xB5', '\x00', 0,
-	'\xC6', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\x80', '\x00', 0,
-	'\xC6', '\xA8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\x83', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\x88', '\x00', 0,
-	'\xC6', '\xB0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\x8A', '\x00', 0,
-	'\xCA', '\x8B', '\x00', 0,
-	'\xC6', '\xB4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\xB6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCA', '\x92', '\x00', 0,
-	'\xC6', '\xB9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xBD', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerC7[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\x86', '\x00', 0,
-	'\xC7', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x89', '\x00', 0,
-	'\xC7', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x8C', '\x00', 0,
-	'\xC7', '\x8C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x8E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x90', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x92', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x94', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x96', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x98', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x9A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\x9C', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\x6A', '\x00', '\x00', 0,
-	'\xC7', '\xB3', '\x00', 0,
-	'\xC7', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x95', '\x00', 0,
-	'\xC6', '\xBF', '\x00', 0,
-	'\xC7', '\xB9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xBB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xBD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xBF', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerC8[64 * 4] = {
-	'\xC8', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x83', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x87', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x91', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x93', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x95', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x97', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x9E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\xB3', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerCD[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xB9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerCE[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xAD', '\x00', 0,
-	'\xCE', '\xAE', '\x00', 0,
-	'\xCE', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x8C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x8D', '\x00', 0,
-	'\xCF', '\x8E', '\x00', 0,
-	'\xCE', '\xB9', '\x00', 0,
-	'\xCE', '\xB1', '\x00', 0,
-	'\xCE', '\xB2', '\x00', 0,
-	'\xCE', '\xB3', '\x00', 0,
-	'\xCE', '\xB4', '\x00', 0,
-	'\xCE', '\xB5', '\x00', 0,
-	'\xCE', '\xB6', '\x00', 0,
-	'\xCE', '\xB7', '\x00', 0,
-	'\xCE', '\xB8', '\x00', 0,
-	'\xCE', '\xB9', '\x00', 0,
-	'\xCE', '\xBA', '\x00', 0,
-	'\xCE', '\xBB', '\x00', 0,
-	'\xCE', '\xBC', '\x00', 0,
-	'\xCE', '\xBD', '\x00', 0,
-	'\xCE', '\xBE', '\x00', 0,
-	'\xCE', '\xBF', '\x00', 0,
-	'\xCF', '\x80', '\x00', 0,
-	'\xCF', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x83', '\x00', 0,
-	'\xCF', '\x84', '\x00', 0,
-	'\xCF', '\x85', '\x00', 0,
-	'\xCF', '\x86', '\x00', 0,
-	'\xCF', '\x87', '\x00', 0,
-	'\xCF', '\x88', '\x00', 0,
-	'\xCF', '\x89', '\x00', 0,
-	'\xCF', '\x8A', '\x00', 0,
-	'\xCF', '\x8B', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerCF[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x83', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xB2', '\x00', 0,
-	'\xCE', '\xB8', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x86', '\x00', 0,
-	'\xCF', '\x80', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xBA', '\x00', 0,
-	'\xCF', '\x81', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xB8', '\x00', 0,
-	'\xCE', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xB8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xB2', '\x00', 0,
-	'\xCF', '\xBB', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD0[64 * 4] = {
-	'\xD1', '\x90', '\x00', 0,
-	'\xD1', '\x91', '\x00', 0,
-	'\xD1', '\x92', '\x00', 0,
-	'\xD1', '\x93', '\x00', 0,
-	'\xD1', '\x94', '\x00', 0,
-	'\xD1', '\x95', '\x00', 0,
-	'\xD1', '\x96', '\x00', 0,
-	'\xD1', '\x97', '\x00', 0,
-	'\xD1', '\x98', '\x00', 0,
-	'\xD1', '\x99', '\x00', 0,
-	'\xD1', '\x9A', '\x00', 0,
-	'\xD1', '\x9B', '\x00', 0,
-	'\xD1', '\x9C', '\x00', 0,
-	'\xD1', '\x9D', '\x00', 0,
-	'\xD1', '\x9E', '\x00', 0,
-	'\xD1', '\x9F', '\x00', 0,
-	'\xD0', '\xB0', '\x00', 0,
-	'\xD0', '\xB1', '\x00', 0,
-	'\xD0', '\xB2', '\x00', 0,
-	'\xD0', '\xB3', '\x00', 0,
-	'\xD0', '\xB4', '\x00', 0,
-	'\xD0', '\xB5', '\x00', 0,
-	'\xD0', '\xB6', '\x00', 0,
-	'\xD0', '\xB7', '\x00', 0,
-	'\xD0', '\xB8', '\x00', 0,
-	'\xD0', '\xB9', '\x00', 0,
-	'\xD0', '\xBA', '\x00', 0,
-	'\xD0', '\xBB', '\x00', 0,
-	'\xD0', '\xBC', '\x00', 0,
-	'\xD0', '\xBD', '\x00', 0,
-	'\xD0', '\xBE', '\x00', 0,
-	'\xD0', '\xBF', '\x00', 0,
-	'\xD1', '\x80', '\x00', 0,
-	'\xD1', '\x81', '\x00', 0,
-	'\xD1', '\x82', '\x00', 0,
-	'\xD1', '\x83', '\x00', 0,
-	'\xD1', '\x84', '\x00', 0,
-	'\xD1', '\x85', '\x00', 0,
-	'\xD1', '\x86', '\x00', 0,
-	'\xD1', '\x87', '\x00', 0,
-	'\xD1', '\x88', '\x00', 0,
-	'\xD1', '\x89', '\x00', 0,
-	'\xD1', '\x8A', '\x00', 0,
-	'\xD1', '\x8B', '\x00', 0,
-	'\xD1', '\x8C', '\x00', 0,
-	'\xD1', '\x8D', '\x00', 0,
-	'\xD1', '\x8E', '\x00', 0,
-	'\xD1', '\x8F', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD1[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD1', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBF', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD2[64 * 4] = {
-	'\xD2', '\x81', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD2', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x91', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x93', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x95', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x97', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBF', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD3[64 * 4] = {
-	0, 0, 0, 0,
-	'\xD3', '\x82', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x84', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x88', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x8C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x8E', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD3', '\x91', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x93', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x95', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x97', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x99', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA5', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA7', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA9', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAB', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAD', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAF', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB3', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB5', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD3', '\xB9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD4[64 * 4] = {
-	'\xD4', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x83', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x87', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xD5', '\xA1', '\x00', 0,
-	'\xD5', '\xA2', '\x00', 0,
-	'\xD5', '\xA3', '\x00', 0,
-	'\xD5', '\xA4', '\x00', 0,
-	'\xD5', '\xA5', '\x00', 0,
-	'\xD5', '\xA6', '\x00', 0,
-	'\xD5', '\xA7', '\x00', 0,
-	'\xD5', '\xA8', '\x00', 0,
-	'\xD5', '\xA9', '\x00', 0,
-	'\xD5', '\xAA', '\x00', 0,
-	'\xD5', '\xAB', '\x00', 0,
-	'\xD5', '\xAC', '\x00', 0,
-	'\xD5', '\xAD', '\x00', 0,
-	'\xD5', '\xAE', '\x00', 0,
-	'\xD5', '\xAF', '\x00', 0,
-};
-
-static const char s_Utf8UpperToLowerD5[64 * 4] = {
-	'\xD5', '\xB0', '\x00', 0,
-	'\xD5', '\xB1', '\x00', 0,
-	'\xD5', '\xB2', '\x00', 0,
-	'\xD5', '\xB3', '\x00', 0,
-	'\xD5', '\xB4', '\x00', 0,
-	'\xD5', '\xB5', '\x00', 0,
-	'\xD5', '\xB6', '\x00', 0,
-	'\xD5', '\xB7', '\x00', 0,
-	'\xD5', '\xB8', '\x00', 0,
-	'\xD5', '\xB9', '\x00', 0,
-	'\xD5', '\xBA', '\x00', 0,
-	'\xD5', '\xBB', '\x00', 0,
-	'\xD5', '\xBC', '\x00', 0,
-	'\xD5', '\xBD', '\x00', 0,
-	'\xD5', '\xBE', '\x00', 0,
-	'\xD5', '\xBF', '\x00', 0,
-	'\xD6', '\x80', '\x00', 0,
-	'\xD6', '\x81', '\x00', 0,
-	'\xD6', '\x82', '\x00', 0,
-	'\xD6', '\x83', '\x00', 0,
-	'\xD6', '\x84', '\x00', 0,
-	'\xD6', '\x85', '\x00', 0,
-	'\xD6', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerD6[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD5', '\xA5', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1B8[64 * 4] = {
-	'\xE1', '\xB8', '\x81', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x83', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x85', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x87', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x89', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x8B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x8D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x8F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x91', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x93', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x95', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x97', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x99', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x9B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x9D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\x9F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xA1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xA3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xA5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xA7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xA9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xAB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xAD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xAF', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xB1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xB3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xB5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xB7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xB9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xBB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xBD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB8', '\xBF', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1B9[64 * 4] = {
-	'\xE1', '\xB9', '\x81', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x83', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x85', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x87', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x89', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x8B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x8D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x8F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x91', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x93', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x95', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x97', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x99', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x9B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x9D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\x9F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xA1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xA3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xA5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xA7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xA9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xAB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xAD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xAF', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xB1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xB3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xB5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xB7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xB9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xBB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xBD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xB9', '\xBF', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1BA[64 * 4] = {
-	'\xE1', '\xBA', '\x81', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x83', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x85', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x87', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x89', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x8B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x8D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x8F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x91', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x93', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\x95', 0,
-	0, 0, 0, 0,
-	'\x68', '\x00', '\x00', 0,
-	'\x74', '\x00', '\x00', 0,
-	'\x77', '\x00', '\x00', 0,
-	'\x79', '\x00', '\x00', 0,
-	'\x61', '\x00', '\x00', 0,
-	'\xE1', '\xB9', '\xA1', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBA', '\xA1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xA3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xA5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xA7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xA9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xAB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xAD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xAF', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xB1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xB3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xB5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xB7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xB9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xBB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xBD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBA', '\xBF', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1BB[64 * 4] = {
-	'\xE1', '\xBB', '\x81', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x83', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x85', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x87', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x89', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x8B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x8D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x8F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x91', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x93', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x95', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x97', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x99', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x9B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x9D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\x9F', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xA1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xA3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xA5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xA7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xA9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xAB', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xAD', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xAF', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xB1', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xB3', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xB5', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xB7', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBB', '\xB9', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1BC[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\x80', 0,
-	'\xE1', '\xBC', '\x81', 0,
-	'\xE1', '\xBC', '\x82', 0,
-	'\xE1', '\xBC', '\x83', 0,
-	'\xE1', '\xBC', '\x84', 0,
-	'\xE1', '\xBC', '\x85', 0,
-	'\xE1', '\xBC', '\x86', 0,
-	'\xE1', '\xBC', '\x87', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\x90', 0,
-	'\xE1', '\xBC', '\x91', 0,
-	'\xE1', '\xBC', '\x92', 0,
-	'\xE1', '\xBC', '\x93', 0,
-	'\xE1', '\xBC', '\x94', 0,
-	'\xE1', '\xBC', '\x95', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\xA0', 0,
-	'\xE1', '\xBC', '\xA1', 0,
-	'\xE1', '\xBC', '\xA2', 0,
-	'\xE1', '\xBC', '\xA3', 0,
-	'\xE1', '\xBC', '\xA4', 0,
-	'\xE1', '\xBC', '\xA5', 0,
-	'\xE1', '\xBC', '\xA6', 0,
-	'\xE1', '\xBC', '\xA7', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\xB0', 0,
-	'\xE1', '\xBC', '\xB1', 0,
-	'\xE1', '\xBC', '\xB2', 0,
-	'\xE1', '\xBC', '\xB3', 0,
-	'\xE1', '\xBC', '\xB4', 0,
-	'\xE1', '\xBC', '\xB5', 0,
-	'\xE1', '\xBC', '\xB6', 0,
-	'\xE1', '\xBC', '\xB7', 0,
-};
-
-static const char s_Utf8UpperToLowerE1BD[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\x80', 0,
-	'\xE1', '\xBD', '\x81', 0,
-	'\xE1', '\xBD', '\x82', 0,
-	'\xE1', '\xBD', '\x83', 0,
-	'\xE1', '\xBD', '\x84', 0,
-	'\xE1', '\xBD', '\x85', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x91', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x93', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x95', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x97', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\xA0', 0,
-	'\xE1', '\xBD', '\xA1', 0,
-	'\xE1', '\xBD', '\xA2', 0,
-	'\xE1', '\xBD', '\xA3', 0,
-	'\xE1', '\xBD', '\xA4', 0,
-	'\xE1', '\xBD', '\xA5', 0,
-	'\xE1', '\xBD', '\xA6', 0,
-	'\xE1', '\xBD', '\xA7', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1BE[64 * 4] = {
-	'\xE1', '\xBC', '\x80', 0,
-	'\xE1', '\xBC', '\x81', 0,
-	'\xE1', '\xBC', '\x82', 0,
-	'\xE1', '\xBC', '\x83', 0,
-	'\xE1', '\xBC', '\x84', 0,
-	'\xE1', '\xBC', '\x85', 0,
-	'\xE1', '\xBC', '\x86', 0,
-	'\xE1', '\xBC', '\x87', 0,
-	'\xE1', '\xBE', '\x80', 0,
-	'\xE1', '\xBE', '\x81', 0,
-	'\xE1', '\xBE', '\x82', 0,
-	'\xE1', '\xBE', '\x83', 0,
-	'\xE1', '\xBE', '\x84', 0,
-	'\xE1', '\xBE', '\x85', 0,
-	'\xE1', '\xBE', '\x86', 0,
-	'\xE1', '\xBE', '\x87', 0,
-	'\xE1', '\xBC', '\xA0', 0,
-	'\xE1', '\xBC', '\xA1', 0,
-	'\xE1', '\xBC', '\xA2', 0,
-	'\xE1', '\xBC', '\xA3', 0,
-	'\xE1', '\xBC', '\xA4', 0,
-	'\xE1', '\xBC', '\xA5', 0,
-	'\xE1', '\xBC', '\xA6', 0,
-	'\xE1', '\xBC', '\xA7', 0,
-	'\xE1', '\xBE', '\x90', 0,
-	'\xE1', '\xBE', '\x91', 0,
-	'\xE1', '\xBE', '\x92', 0,
-	'\xE1', '\xBE', '\x93', 0,
-	'\xE1', '\xBE', '\x94', 0,
-	'\xE1', '\xBE', '\x95', 0,
-	'\xE1', '\xBE', '\x96', 0,
-	'\xE1', '\xBE', '\x97', 0,
-	'\xE1', '\xBD', '\xA0', 0,
-	'\xE1', '\xBD', '\xA1', 0,
-	'\xE1', '\xBD', '\xA2', 0,
-	'\xE1', '\xBD', '\xA3', 0,
-	'\xE1', '\xBD', '\xA4', 0,
-	'\xE1', '\xBD', '\xA5', 0,
-	'\xE1', '\xBD', '\xA6', 0,
-	'\xE1', '\xBD', '\xA7', 0,
-	'\xE1', '\xBE', '\xA0', 0,
-	'\xE1', '\xBE', '\xA1', 0,
-	'\xE1', '\xBE', '\xA2', 0,
-	'\xE1', '\xBE', '\xA3', 0,
-	'\xE1', '\xBE', '\xA4', 0,
-	'\xE1', '\xBE', '\xA5', 0,
-	'\xE1', '\xBE', '\xA6', 0,
-	'\xE1', '\xBE', '\xA7', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\xB0', 0,
-	'\xCE', '\xB1', '\x00', 0,
-	'\xCE', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xB1', '\x00', 0,
-	'\xCE', '\xB1', '\x00', 0,
-	'\xE1', '\xBE', '\xB0', 0,
-	'\xE1', '\xBE', '\xB1', 0,
-	'\xE1', '\xBD', '\xB0', 0,
-	'\xE1', '\xBD', '\xB1', 0,
-	'\xE1', '\xBE', '\xB3', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xB9', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE1BF[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\xB4', 0,
-	'\xCE', '\xB7', '\x00', 0,
-	'\xCE', '\xAE', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xB7', '\x00', 0,
-	'\xCE', '\xB7', '\x00', 0,
-	'\xE1', '\xBD', '\xB2', 0,
-	'\xE1', '\xBD', '\xB3', 0,
-	'\xE1', '\xBD', '\xB4', 0,
-	'\xE1', '\xBD', '\xB5', 0,
-	'\xE1', '\xBF', '\x83', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xB9', '\x00', 0,
-	'\xCE', '\xB9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\xB9', '\x00', 0,
-	'\xCE', '\xB9', '\x00', 0,
-	'\xE1', '\xBF', '\x90', 0,
-	'\xE1', '\xBF', '\x91', 0,
-	'\xE1', '\xBD', '\xB6', 0,
-	'\xE1', '\xBD', '\xB7', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	'\xCF', '\x85', '\x00', 0,
-	'\xCF', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x85', '\x00', 0,
-	'\xCF', '\x85', '\x00', 0,
-	'\xE1', '\xBF', '\xA0', 0,
-	'\xE1', '\xBF', '\xA1', 0,
-	'\xE1', '\xBD', '\xBA', 0,
-	'\xE1', '\xBD', '\xBB', 0,
-	'\xE1', '\xBF', '\xA5', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\xBC', 0,
-	'\xCF', '\x89', '\x00', 0,
-	'\xCF', '\x8E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x89', '\x00', 0,
-	'\xCF', '\x89', '\x00', 0,
-	'\xE1', '\xBD', '\xB8', 0,
-	'\xE1', '\xBD', '\xB9', 0,
-	'\xE1', '\xBD', '\xBC', 0,
-	'\xE1', '\xBD', '\xBD', 0,
-	'\xE1', '\xBF', '\xB3', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE284[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x6B', '\x00', '\x00', 0,
-	'\xC3', '\xA5', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE285[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE2', '\x85', '\xB0', 0,
-	'\xE2', '\x85', '\xB1', 0,
-	'\xE2', '\x85', '\xB2', 0,
-	'\xE2', '\x85', '\xB3', 0,
-	'\xE2', '\x85', '\xB4', 0,
-	'\xE2', '\x85', '\xB5', 0,
-	'\xE2', '\x85', '\xB6', 0,
-	'\xE2', '\x85', '\xB7', 0,
-	'\xE2', '\x85', '\xB8', 0,
-	'\xE2', '\x85', '\xB9', 0,
-	'\xE2', '\x85', '\xBA', 0,
-	'\xE2', '\x85', '\xBB', 0,
-	'\xE2', '\x85', '\xBC', 0,
-	'\xE2', '\x85', '\xBD', 0,
-	'\xE2', '\x85', '\xBE', 0,
-	'\xE2', '\x85', '\xBF', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerE292[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE2', '\x93', '\x90', 0,
-	'\xE2', '\x93', '\x91', 0,
-	'\xE2', '\x93', '\x92', 0,
-	'\xE2', '\x93', '\x93', 0,
-	'\xE2', '\x93', '\x94', 0,
-	'\xE2', '\x93', '\x95', 0,
-	'\xE2', '\x93', '\x96', 0,
-	'\xE2', '\x93', '\x97', 0,
-	'\xE2', '\x93', '\x98', 0,
-	'\xE2', '\x93', '\x99', 0,
-};
-
-static const char s_Utf8UpperToLowerE293[64 * 4] = {
-	'\xE2', '\x93', '\x9A', 0,
-	'\xE2', '\x93', '\x9B', 0,
-	'\xE2', '\x93', '\x9C', 0,
-	'\xE2', '\x93', '\x9D', 0,
-	'\xE2', '\x93', '\x9E', 0,
-	'\xE2', '\x93', '\x9F', 0,
-	'\xE2', '\x93', '\xA0', 0,
-	'\xE2', '\x93', '\xA1', 0,
-	'\xE2', '\x93', '\xA2', 0,
-	'\xE2', '\x93', '\xA3', 0,
-	'\xE2', '\x93', '\xA4', 0,
-	'\xE2', '\x93', '\xA5', 0,
-	'\xE2', '\x93', '\xA6', 0,
-	'\xE2', '\x93', '\xA7', 0,
-	'\xE2', '\x93', '\xA8', 0,
-	'\xE2', '\x93', '\xA9', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerEFAC[64 * 4] = {
-	'\x66', '\x00', '\x00', 0,
-	'\x66', '\x00', '\x00', 0,
-	'\x66', '\x00', '\x00', 0,
-	'\x66', '\x00', '\x00', 0,
-	'\x66', '\x00', '\x00', 0,
-	'\x73', '\x00', '\x00', 0,
-	'\x73', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD5', '\xB4', '\x00', 0,
-	'\xD5', '\xB4', '\x00', 0,
-	'\xD5', '\xB4', '\x00', 0,
-	'\xD5', '\xBE', '\x00', 0,
-	'\xD5', '\xB4', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8UpperToLowerEFBC[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xEF', '\xBD', '\x81', 0,
-	'\xEF', '\xBD', '\x82', 0,
-	'\xEF', '\xBD', '\x83', 0,
-	'\xEF', '\xBD', '\x84', 0,
-	'\xEF', '\xBD', '\x85', 0,
-	'\xEF', '\xBD', '\x86', 0,
-	'\xEF', '\xBD', '\x87', 0,
-	'\xEF', '\xBD', '\x88', 0,
-	'\xEF', '\xBD', '\x89', 0,
-	'\xEF', '\xBD', '\x8A', 0,
-	'\xEF', '\xBD', '\x8B', 0,
-	'\xEF', '\xBD', '\x8C', 0,
-	'\xEF', '\xBD', '\x8D', 0,
-	'\xEF', '\xBD', '\x8E', 0,
-	'\xEF', '\xBD', '\x8F', 0,
-	'\xEF', '\xBD', '\x90', 0,
-	'\xEF', '\xBD', '\x91', 0,
-	'\xEF', '\xBD', '\x92', 0,
-	'\xEF', '\xBD', '\x93', 0,
-	'\xEF', '\xBD', '\x94', 0,
-	'\xEF', '\xBD', '\x95', 0,
-	'\xEF', '\xBD', '\x96', 0,
-	'\xEF', '\xBD', '\x97', 0,
-	'\xEF', '\xBD', '\x98', 0,
-	'\xEF', '\xBD', '\x99', 0,
-	'\xEF', '\xBD', '\x9A', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char *s_Utf8UpperToLowerTables[32] = {
-	0, 0,
-	s_Utf8UpperToLowerC2,
-	s_Utf8UpperToLowerC3,
-	s_Utf8UpperToLowerC4,
-	s_Utf8UpperToLowerC5,
-	s_Utf8UpperToLowerC6,
-	s_Utf8UpperToLowerC7,
-	s_Utf8UpperToLowerC8,
-	0, 0, 0, 0,
-	s_Utf8UpperToLowerCD,
-	s_Utf8UpperToLowerCE,
-	s_Utf8UpperToLowerCF,
-	s_Utf8UpperToLowerD0,
-	s_Utf8UpperToLowerD1,
-	s_Utf8UpperToLowerD2,
-	s_Utf8UpperToLowerD3,
-	s_Utf8UpperToLowerD4,
-	s_Utf8UpperToLowerD5,
-	s_Utf8UpperToLowerD6,
-	0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char *s_Utf8UpperToLowerTablesE1[64] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8UpperToLowerE1B8,
-	s_Utf8UpperToLowerE1B9,
-	s_Utf8UpperToLowerE1BA,
-	s_Utf8UpperToLowerE1BB,
-	s_Utf8UpperToLowerE1BC,
-	s_Utf8UpperToLowerE1BD,
-	s_Utf8UpperToLowerE1BE,
-	s_Utf8UpperToLowerE1BF,
-};
-
-static const char *s_Utf8UpperToLowerTablesE2[64] = {
-	0, 0, 0, 0,
-	s_Utf8UpperToLowerE284,
-	s_Utf8UpperToLowerE285,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8UpperToLowerE292,
-	s_Utf8UpperToLowerE293,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char *s_Utf8UpperToLowerTablesEF[64] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8UpperToLowerEFAC,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8UpperToLowerEFBC,
-	0, 0, 0,
-};
-
-static const char **s_UtfUpperToLowerMap[16] = {
-	0,
-	s_Utf8UpperToLowerTablesE1,
-	s_Utf8UpperToLowerTablesE2,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8UpperToLowerTablesEF,
-};
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-static const char s_Utf8LowerToUpperC3[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x41', '\x00', '\x00', 0,
-	'\xC3', '\x86', '\x00', 0,
-	'\x43', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\xC3', '\x90', '\x00', 0,
-	'\x4E', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x59', '\x00', '\x00', 0,
-	'\xC3', '\x9E', '\x00', 0,
-	'\x59', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperC4[64 * 4] = {
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC4', '\xB2', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperC5[64 * 4] = {
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC5', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC5', '\x92', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperC6[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x42', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x84', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x46', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\xB6', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\x50', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xA7', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xC6', '\xB8', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xB7', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperC7[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\x84', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xC7', '\x87', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	'\xC6', '\x8E', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xAE', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC7', '\xB1', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC7', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperC8[64 * 4] = {
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC8', '\x9C', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC8', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperC9[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x42', '\x00', '\x00', 0,
-	'\xC6', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x89', '\x00', 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\x90', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\x94', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	'\xC6', '\x96', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\x9C', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperCA[64 * 4] = {
-	'\xC6', '\xA6', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xA9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\xC6', '\xB1', '\x00', 0,
-	'\x56', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xC6', '\xB7', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperCE[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCE', '\x86', '\x00', 0,
-	'\xCE', '\x88', '\x00', 0,
-	'\xCE', '\x89', '\x00', 0,
-	'\xCE', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\x91', '\x00', 0,
-	'\xCE', '\x92', '\x00', 0,
-	'\xCE', '\x93', '\x00', 0,
-	'\xCE', '\x94', '\x00', 0,
-	'\xCE', '\x95', '\x00', 0,
-	'\xCE', '\x96', '\x00', 0,
-	'\xCE', '\x97', '\x00', 0,
-	'\xCE', '\x98', '\x00', 0,
-	'\xCE', '\x99', '\x00', 0,
-	'\xCE', '\x9A', '\x00', 0,
-	'\xCE', '\x9B', '\x00', 0,
-	'\xCE', '\x9C', '\x00', 0,
-	'\xCE', '\x9D', '\x00', 0,
-	'\xCE', '\x9E', '\x00', 0,
-	'\xCE', '\x9F', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperCF[64 * 4] = {
-	'\xCE', '\xA0', '\x00', 0,
-	'\xCE', '\xA1', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCE', '\xA3', '\x00', 0,
-	'\xCE', '\xA4', '\x00', 0,
-	'\xCE', '\xA5', '\x00', 0,
-	'\xCE', '\xA6', '\x00', 0,
-	'\xCE', '\xA7', '\x00', 0,
-	'\xCE', '\xA8', '\x00', 0,
-	'\xCE', '\xA9', '\x00', 0,
-	'\xCE', '\xAA', '\x00', 0,
-	'\xCE', '\xAB', '\x00', 0,
-	'\xCE', '\x8C', '\x00', 0,
-	'\xCE', '\x8E', '\x00', 0,
-	'\xCE', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xCF', '\x98', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\x9E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xA8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xCF', '\xAE', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\xB9', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\xB7', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xCF', '\xBA', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperD0[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD0', '\x90', '\x00', 0,
-	'\xD0', '\x91', '\x00', 0,
-	'\xD0', '\x92', '\x00', 0,
-	'\xD0', '\x93', '\x00', 0,
-	'\xD0', '\x94', '\x00', 0,
-	'\xD0', '\x95', '\x00', 0,
-	'\xD0', '\x96', '\x00', 0,
-	'\xD0', '\x97', '\x00', 0,
-	'\xD0', '\x98', '\x00', 0,
-	'\xD0', '\x99', '\x00', 0,
-	'\xD0', '\x9A', '\x00', 0,
-	'\xD0', '\x9B', '\x00', 0,
-	'\xD0', '\x9C', '\x00', 0,
-	'\xD0', '\x9D', '\x00', 0,
-	'\xD0', '\x9E', '\x00', 0,
-	'\xD0', '\x9F', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperD1[64 * 4] = {
-	'\xD0', '\xA0', '\x00', 0,
-	'\xD0', '\xA1', '\x00', 0,
-	'\xD0', '\xA2', '\x00', 0,
-	'\xD0', '\xA3', '\x00', 0,
-	'\xD0', '\xA4', '\x00', 0,
-	'\xD0', '\xA5', '\x00', 0,
-	'\xD0', '\xA6', '\x00', 0,
-	'\xD0', '\xA7', '\x00', 0,
-	'\xD0', '\xA8', '\x00', 0,
-	'\xD0', '\xA9', '\x00', 0,
-	'\xD0', '\xAA', '\x00', 0,
-	'\xD0', '\xAB', '\x00', 0,
-	'\xD0', '\xAC', '\x00', 0,
-	'\xD0', '\xAD', '\x00', 0,
-	'\xD0', '\xAE', '\x00', 0,
-	'\xD0', '\xAF', '\x00', 0,
-	'\xD0', '\x80', '\x00', 0,
-	'\xD0', '\x81', '\x00', 0,
-	'\xD0', '\x82', '\x00', 0,
-	'\xD0', '\x83', '\x00', 0,
-	'\xD0', '\x84', '\x00', 0,
-	'\xD0', '\x85', '\x00', 0,
-	'\xD0', '\x86', '\x00', 0,
-	'\xD0', '\x87', '\x00', 0,
-	'\xD0', '\x88', '\x00', 0,
-	'\xD0', '\x89', '\x00', 0,
-	'\xD0', '\x8A', '\x00', 0,
-	'\xD0', '\x8B', '\x00', 0,
-	'\xD0', '\x8C', '\x00', 0,
-	'\xD0', '\x8D', '\x00', 0,
-	'\xD0', '\x8E', '\x00', 0,
-	'\xD0', '\x8F', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xA8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xAE', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xB8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD1', '\xBE', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperD2[64 * 4] = {
-	0, 0, 0, 0,
-	'\xD2', '\x80', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD2', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x8C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x8E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x90', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x92', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x94', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x96', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x98', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\x9E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xA8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xAE', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xB8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD2', '\xBE', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperD3[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	'\xD3', '\x81', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x83', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x85', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x87', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x89', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x8B', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x8D', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xD3', '\x90', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x92', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x94', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x96', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x98', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\x9E', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA4', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA6', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xA8', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAA', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAC', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xAE', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB0', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB2', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB4', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xD3', '\xB8', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperD4[64 * 4] = {
-	0, 0, 0, 0,
-	'\xD4', '\x80', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x82', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x84', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x86', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x88', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8A', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8C', '\x00', 0,
-	0, 0, 0, 0,
-	'\xD4', '\x8E', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperD5[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xD4', '\xB1', '\x00', 0,
-	'\xD4', '\xB2', '\x00', 0,
-	'\xD4', '\xB3', '\x00', 0,
-	'\xD4', '\xB4', '\x00', 0,
-	'\xD4', '\xB5', '\x00', 0,
-	'\xD4', '\xB6', '\x00', 0,
-	'\xD4', '\xB7', '\x00', 0,
-	'\xD4', '\xB8', '\x00', 0,
-	'\xD4', '\xB9', '\x00', 0,
-	'\xD4', '\xBA', '\x00', 0,
-	'\xD4', '\xBB', '\x00', 0,
-	'\xD4', '\xBC', '\x00', 0,
-	'\xD4', '\xBD', '\x00', 0,
-	'\xD4', '\xBE', '\x00', 0,
-	'\xD4', '\xBF', '\x00', 0,
-	'\xD5', '\x80', '\x00', 0,
-	'\xD5', '\x81', '\x00', 0,
-	'\xD5', '\x82', '\x00', 0,
-	'\xD5', '\x83', '\x00', 0,
-	'\xD5', '\x84', '\x00', 0,
-	'\xD5', '\x85', '\x00', 0,
-	'\xD5', '\x86', '\x00', 0,
-	'\xD5', '\x87', '\x00', 0,
-	'\xD5', '\x88', '\x00', 0,
-	'\xD5', '\x89', '\x00', 0,
-	'\xD5', '\x8A', '\x00', 0,
-	'\xD5', '\x8B', '\x00', 0,
-	'\xD5', '\x8C', '\x00', 0,
-	'\xD5', '\x8D', '\x00', 0,
-	'\xD5', '\x8E', '\x00', 0,
-	'\xD5', '\x8F', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperD6[64 * 4] = {
-	'\xD5', '\x90', '\x00', 0,
-	'\xD5', '\x91', '\x00', 0,
-	'\xD5', '\x92', '\x00', 0,
-	'\xD5', '\x93', '\x00', 0,
-	'\xD5', '\x94', '\x00', 0,
-	'\xD5', '\x95', '\x00', 0,
-	'\xD5', '\x96', '\x00', 0,
-	0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE1B8[64 * 4] = {
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x42', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x42', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x42', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x43', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x44', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x46', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x47', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x48', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4B', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4C', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4D', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperE1B9[64 * 4] = {
-	0, 0, 0, 0,
-	'\x4D', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4D', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4E', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x50', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x50', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x52', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x53', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x54', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x56', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x56', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperE1BA[64 * 4] = {
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x57', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x58', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x58', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-};
-
-static const char s_Utf8LowerToUpperE1BB[64 * 4] = {
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x45', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x49', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x4F', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x55', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0,
-	'\x59', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE1BC[64 * 4] = {
-	'\xE1', '\xBC', '\x88', 0,
-	'\xE1', '\xBC', '\x89', 0,
-	'\xE1', '\xBC', '\x8A', 0,
-	'\xE1', '\xBC', '\x8B', 0,
-	'\xE1', '\xBC', '\x8C', 0,
-	'\xE1', '\xBC', '\x8D', 0,
-	'\xE1', '\xBC', '\x8E', 0,
-	'\xE1', '\xBC', '\x8F', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\x98', 0,
-	'\xE1', '\xBC', '\x99', 0,
-	'\xE1', '\xBC', '\x9A', 0,
-	'\xE1', '\xBC', '\x9B', 0,
-	'\xE1', '\xBC', '\x9C', 0,
-	'\xE1', '\xBC', '\x9D', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\xA8', 0,
-	'\xE1', '\xBC', '\xA9', 0,
-	'\xE1', '\xBC', '\xAA', 0,
-	'\xE1', '\xBC', '\xAB', 0,
-	'\xE1', '\xBC', '\xAC', 0,
-	'\xE1', '\xBC', '\xAD', 0,
-	'\xE1', '\xBC', '\xAE', 0,
-	'\xE1', '\xBC', '\xAF', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBC', '\xB8', 0,
-	'\xE1', '\xBC', '\xB9', 0,
-	'\xE1', '\xBC', '\xBA', 0,
-	'\xE1', '\xBC', '\xBB', 0,
-	'\xE1', '\xBC', '\xBC', 0,
-	'\xE1', '\xBC', '\xBD', 0,
-	'\xE1', '\xBC', '\xBE', 0,
-	'\xE1', '\xBC', '\xBF', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE1BD[64 * 4] = {
-	'\xE1', '\xBD', '\x88', 0,
-	'\xE1', '\xBD', '\x89', 0,
-	'\xE1', '\xBD', '\x8A', 0,
-	'\xE1', '\xBD', '\x8B', 0,
-	'\xE1', '\xBD', '\x8C', 0,
-	'\xE1', '\xBD', '\x8D', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x99', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x9B', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x9D', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBD', '\x9F', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBD', '\xA8', 0,
-	'\xE1', '\xBD', '\xA9', 0,
-	'\xE1', '\xBD', '\xAA', 0,
-	'\xE1', '\xBD', '\xAB', 0,
-	'\xE1', '\xBD', '\xAC', 0,
-	'\xE1', '\xBD', '\xAD', 0,
-	'\xE1', '\xBD', '\xAE', 0,
-	'\xE1', '\xBD', '\xAF', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBE', '\xBA', 0,
-	'\xE1', '\xBE', '\xBB', 0,
-	'\xE1', '\xBF', '\x88', 0,
-	'\xE1', '\xBF', '\x89', 0,
-	'\xE1', '\xBF', '\x8A', 0,
-	'\xE1', '\xBF', '\x8B', 0,
-	'\xE1', '\xBF', '\x9A', 0,
-	'\xE1', '\xBF', '\x9B', 0,
-	'\xE1', '\xBF', '\xB8', 0,
-	'\xE1', '\xBF', '\xB9', 0,
-	'\xE1', '\xBF', '\xAA', 0,
-	'\xE1', '\xBF', '\xAB', 0,
-	'\xE1', '\xBF', '\xBA', 0,
-	'\xE1', '\xBF', '\xBB', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE1BE[64 * 4] = {
-	'\xE1', '\xBE', '\x88', 0,
-	'\xE1', '\xBE', '\x89', 0,
-	'\xE1', '\xBE', '\x8A', 0,
-	'\xE1', '\xBE', '\x8B', 0,
-	'\xE1', '\xBE', '\x8C', 0,
-	'\xE1', '\xBE', '\x8D', 0,
-	'\xE1', '\xBE', '\x8E', 0,
-	'\xE1', '\xBE', '\x8F', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBE', '\x98', 0,
-	'\xE1', '\xBE', '\x99', 0,
-	'\xE1', '\xBE', '\x9A', 0,
-	'\xE1', '\xBE', '\x9B', 0,
-	'\xE1', '\xBE', '\x9C', 0,
-	'\xE1', '\xBE', '\x9D', 0,
-	'\xE1', '\xBE', '\x9E', 0,
-	'\xE1', '\xBE', '\x9F', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBE', '\xA8', 0,
-	'\xE1', '\xBE', '\xA9', 0,
-	'\xE1', '\xBE', '\xAA', 0,
-	'\xE1', '\xBE', '\xAB', 0,
-	'\xE1', '\xBE', '\xAC', 0,
-	'\xE1', '\xBE', '\xAD', 0,
-	'\xE1', '\xBE', '\xAE', 0,
-	'\xE1', '\xBE', '\xAF', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBE', '\xB8', 0,
-	'\xE1', '\xBE', '\xB9', 0,
-	0, 0, 0, 0,
-	'\xE1', '\xBE', '\xBC', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE1BF[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBF', '\x8C', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBF', '\x98', 0,
-	'\xE1', '\xBF', '\x99', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBF', '\xA8', 0,
-	'\xE1', '\xBF', '\xA9', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBF', '\xAC', 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE1', '\xBF', '\xBC', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperE285[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\xE2', '\x85', '\xA0', 0,
-	'\xE2', '\x85', '\xA1', 0,
-	'\xE2', '\x85', '\xA2', 0,
-	'\xE2', '\x85', '\xA3', 0,
-	'\xE2', '\x85', '\xA4', 0,
-	'\xE2', '\x85', '\xA5', 0,
-	'\xE2', '\x85', '\xA6', 0,
-	'\xE2', '\x85', '\xA7', 0,
-	'\xE2', '\x85', '\xA8', 0,
-	'\xE2', '\x85', '\xA9', 0,
-	'\xE2', '\x85', '\xAA', 0,
-	'\xE2', '\x85', '\xAB', 0,
-	'\xE2', '\x85', '\xAC', 0,
-	'\xE2', '\x85', '\xAD', 0,
-	'\xE2', '\x85', '\xAE', 0,
-	'\xE2', '\x85', '\xAF', 0,
-};
-
-static const char s_Utf8LowerToUpperE293[64 * 4] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x42', '\x00', '\x00', 0,
-	'\x43', '\x00', '\x00', 0,
-	'\x44', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x46', '\x00', '\x00', 0,
-	'\x47', '\x00', '\x00', 0,
-	'\x48', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\x4A', '\x00', '\x00', 0,
-	'\x4B', '\x00', '\x00', 0,
-	'\x4C', '\x00', '\x00', 0,
-	'\x4D', '\x00', '\x00', 0,
-	'\x4E', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x50', '\x00', '\x00', 0,
-	'\x51', '\x00', '\x00', 0,
-	'\x52', '\x00', '\x00', 0,
-	'\x53', '\x00', '\x00', 0,
-	'\x54', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x56', '\x00', '\x00', 0,
-	'\x57', '\x00', '\x00', 0,
-	'\x58', '\x00', '\x00', 0,
-	'\x59', '\x00', '\x00', 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char s_Utf8LowerToUpperEFBD[64 * 4] = {
-	0, 0, 0, 0,
-	'\x41', '\x00', '\x00', 0,
-	'\x42', '\x00', '\x00', 0,
-	'\x43', '\x00', '\x00', 0,
-	'\x44', '\x00', '\x00', 0,
-	'\x45', '\x00', '\x00', 0,
-	'\x46', '\x00', '\x00', 0,
-	'\x47', '\x00', '\x00', 0,
-	'\x48', '\x00', '\x00', 0,
-	'\x49', '\x00', '\x00', 0,
-	'\x4A', '\x00', '\x00', 0,
-	'\x4B', '\x00', '\x00', 0,
-	'\x4C', '\x00', '\x00', 0,
-	'\x4D', '\x00', '\x00', 0,
-	'\x4E', '\x00', '\x00', 0,
-	'\x4F', '\x00', '\x00', 0,
-	'\x50', '\x00', '\x00', 0,
-	'\x51', '\x00', '\x00', 0,
-	'\x52', '\x00', '\x00', 0,
-	'\x53', '\x00', '\x00', 0,
-	'\x54', '\x00', '\x00', 0,
-	'\x55', '\x00', '\x00', 0,
-	'\x56', '\x00', '\x00', 0,
-	'\x57', '\x00', '\x00', 0,
-	'\x58', '\x00', '\x00', 0,
-	'\x59', '\x00', '\x00', 0,
-	'\x5A', '\x00', '\x00', 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char *s_Utf8LowerToUpperTables[32] = {
-	0, 0, 0,
-	s_Utf8LowerToUpperC3,
-	s_Utf8LowerToUpperC4,
-	s_Utf8LowerToUpperC5,
-	s_Utf8LowerToUpperC6,
-	s_Utf8LowerToUpperC7,
-	s_Utf8LowerToUpperC8,
-	s_Utf8LowerToUpperC9,
-	s_Utf8LowerToUpperCA,
-	0, 0, 0,
-	s_Utf8LowerToUpperCE,
-	s_Utf8LowerToUpperCF,
-	s_Utf8LowerToUpperD0,
-	s_Utf8LowerToUpperD1,
-	s_Utf8LowerToUpperD2,
-	s_Utf8LowerToUpperD3,
-	s_Utf8LowerToUpperD4,
-	s_Utf8LowerToUpperD5,
-	s_Utf8LowerToUpperD6,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 
-};
-
-static const char *s_Utf8LowerToUpperTablesE1[64] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8LowerToUpperE1B8,
-	s_Utf8LowerToUpperE1B9,
-	s_Utf8LowerToUpperE1BA,
-	s_Utf8LowerToUpperE1BB,
-	s_Utf8LowerToUpperE1BC,
-	s_Utf8LowerToUpperE1BD,
-	s_Utf8LowerToUpperE1BE,
-	s_Utf8LowerToUpperE1BF,
-};
-
-static const char *s_Utf8LowerToUpperTablesE2[64] = {
-	0, 0, 0, 0, 0,
-	s_Utf8LowerToUpperE285,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8LowerToUpperE293,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const char *s_Utf8LowerToUpperTablesEF[64] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8LowerToUpperEFBD,
-	0, 0,
-};
-
-static const char **s_UtfLowerToUpperMap[16] = {
-	0,
-	s_Utf8LowerToUpperTablesE1,
-	s_Utf8LowerToUpperTablesE2,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	s_Utf8LowerToUpperTablesEF,
-};
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-#if 1
-
-NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
-{
-	unsigned char c = str[i];
-	unsigned char d, e;
-	if (c < 0x80)
-	{
-		if (c >= 'A' && c <= 'Z')
-		{
-			// 1-byte UTF-8
-			c += 'a' - 'A';
-		}
-	}
-	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
-	{
-		// 2-byte UTF-8
-		const char *table = s_Utf8UpperToLowerTables[c & 0x1F];
-		if (table)
-		{
-			unsigned char idx = (d & 0x3F) << 2;
-			if (table[idx])
-			{
-				res += &table[idx];
-				i += 2;
-				return;
-			}
-		}
-	}
-	else if ((c & 0xF0) == 0xE0 && ((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
-	{
-		// 3-byte UTF-8
-		const char **map = s_UtfUpperToLowerMap[c & 0x0F];
-		if (map)
-		{
-			const char *table = map[d & 0x3F];
-			if (table)
-			{
-				unsigned char idx = (d & 0x3F) << 2;
-				if (table[idx])
-				{
-					res += &table[idx];
-					i += 3;
-					return;
-				}
-			}
-		}
-	}
-	res += c;
-	++i;
-}
-
-// ***************************************************************************
-
-std::string toLower(const char *str)
-{
-	// UTF-8 toLower, tables generated from UTF-16 tables
-	std::string res;
-	for (ptrdiff_t i = 0; str[i];)
-		appendToLowerAsUtf8(res, str, i);
-	return res;
-}
-
-// ***************************************************************************
-
-std::string	toLower(const std::string &str)
-{
-	// UTF-8 toLower, tables generated from UTF-16 tables
-	std::string res;
-	res.reserve(str.size() + (str.size() >> 2));
-	const char *cstr = &str[0];
-	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
-		appendToLowerAsUtf8(res, cstr, i);
-	return res;
-}
-
-// ***************************************************************************
-
-void appendToLower(std::string &res, const char *str, ptrdiff_t &i)
-{
-	appendToLowerAsUtf8(res, str, i);
-}
-
-// ***************************************************************************
-
-void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i)
-{
-	appendToLowerAsUtf8(res, &str[0], i);
-}
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-NL_FORCE_INLINE void appendToUpperAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
-{
-	unsigned char c = str[i];
-	unsigned char d, e;
-	if (c < 0x80)
-	{
-		if (c >= 'a' && c <= 'z')
-		{
-			// 1-byte UTF-8
-			c -= 'a' - 'A';
-		}
-	}
-	else if ((c & 0xE0) == 0xC0 && ((d = str[i + 1]) & 0xC0) == 0x80)
-	{
-		// 2-byte UTF-8
-		const char *table = s_Utf8LowerToUpperTables[c & 0x1F];
-		if (table)
-		{
-			unsigned char idx = (d & 0x3F) << 2;
-			if (table[idx])
-			{
-				res += &table[idx];
-				i += 2;
-				return;
-			}
-		}
-	}
-	else if ((c & 0xF0) == 0xE0 && ((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
-	{
-		// 3-byte UTF-8
-		const char **map = s_UtfLowerToUpperMap[c & 0x0F];
-		if (map)
-		{
-			const char *table = map[d & 0x3F];
-			if (table)
-			{
-				unsigned char idx = (d & 0x3F) << 2;
-				if (table[idx])
-				{
-					res += &table[idx];
-					i += 3;
-					return;
-				}
-			}
-		}
-	}
-	res += c;
-	++i;
-}
-
-// ***************************************************************************
-
-std::string toUpper(const char *str)
-{
-	// UTF-8 toLower, tables generated from UTF-16 tables
-	std::string res;
-	for (ptrdiff_t i = 0; str[i];)
-		appendToUpperAsUtf8(res, str, i);
-	return res;
-}
-
-// ***************************************************************************
-
-std::string	toUpper(const std::string &str)
-{
-	// UTF-8 toLower, tables generated from UTF-16 tables
-	std::string res;
-	res.reserve(str.size() + (str.size() >> 2));
-	const char *cstr = &str[0];
-	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
-		appendToUpperAsUtf8(res, cstr, i);
-	return res;
-}
-
-// ***************************************************************************
-
-void appendToUpper(std::string &res, const char *str, ptrdiff_t &i)
-{
-	appendToUpperAsUtf8(res, str, i);
-}
-
-// ***************************************************************************
-
-void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i)
-{
-	appendToUpperAsUtf8(res, &str[0], i);
-}
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-static const char s_UpperAscii[] = {
-	'A', 0, 'B', 0, 'C', 0, 'D', 0, 'E', 0, 'F', 0, 'G', 0, 
-	'H', 0, 'I', 0, 'J', 0, 'K', 0, 'L', 0, 'M', 0, 'N', 0, 
-	'O', 0, 'P', 0, 'Q', 0, 'R', 0, 'S', 0, 'T', 0, 'U', 0, 
-	'V', 0, 'W', 0, 'X', 0, 'Y', 0, 'Z', 0, 0, 0, 0, 0
-};
-
-const char *fetchToUpperAsUtf8(const char **str)
-{
-	unsigned char c = *(*str);
-	unsigned char d, e;
-	if (c < 0x80)
-	{
-		if (c >= 'a' && c <= 'z')
-		{
-			// 1-byte UTF-8
-			++(*str);
-			return &s_UpperAscii[(c - 'a') << 1];
-		}
-	}
-	else if ((c & 0xE0) == 0xC0 && ((d = (*str)[1]) & 0xC0) == 0x80)
-	{
-		// 2-byte UTF-8
-		const char *table = s_Utf8LowerToUpperTables[c & 0x1F];
-		if (table)
-		{
-			unsigned char idx = (d & 0x3F) << 2;
-			if (table[idx])
-			{
-				(*str) += 2;
-				return &table[idx];
-			}
-		}
-	}
-	else if ((c & 0xF0) == 0xE0 && ((d = (*str)[1]) & 0xC0) == 0x80 && ((e = (*str)[2]) & 0xC0) == 0x80)
-	{
-		// 3-byte UTF-8
-		const char **map = s_UtfLowerToUpperMap[c & 0x0F];
-		if (map)
-		{
-			const char *table = map[d & 0x3F];
-			if (table)
-			{
-				unsigned char idx = (d & 0x3F) << 2;
-				if (table[idx])
-				{
-					(*str) += 3;
-					return &table[idx];
-				}
-			}
-		}
-	}
-	return NULL;
-}
-
-int compareCaseInsensitive(const char *a, const char *b)
-{
-	// while (*a != 0 && *b != 0)
-	for (; ;)
-	{
-		const char *ca = fetchToUpperAsUtf8(&a);
-		const char *cb = fetchToUpperAsUtf8(&b);
-		if (!ca && !cb)
-		{
-			// Easy case, ASCII compare or junk
-			if (*a != *b)
-			{
-				if (*a > * b) return 1;
-				else return -1;
-			}
-			else if (!*a) // Equal and NUL, ends both
-			{
-				return 0;
-			}
-			++a;
-			++b;
-		}
-		else if (!cb)
-		{
-			// String a changed lowercase, iterate ca until NUL alongside b
-			nlassert(*ca);
-			do
-			{
-				if (*ca != *b)
-				{
-					if (*ca > *b) return 1;
-					else return -1;
-				}
-				++ca;
-				++b;
-			} while (*ca);
-		}
-		else if (!ca)
-		{
-			// String b changed lowercase, iterate a alongside cb until NUL
-			nlassert(*cb);
-			do
-			{
-				if (*a != *cb)
-				{
-					if (*a > *cb) return 1;
-					else return -1;
-				}
-				++a;
-				++cb;
-			} while (*cb);
-		}
-		else
-		{
-			// Both strings changed lowercase
-			if (ca != cb) // Only check if it's a different result
-			{
-				do
-				{
-					if (*ca != *cb)
-					{
-						if (*ca > *cb) return 1;
-						else return -1;
-					}
-					++ca;
-					++cb;
-				} while (*ca && *cb);
-			}
-		}
-	}
-	// if (*a == *b) return 0;
-	// if (*a > *b) return 1;
-	// return -1;
-}
-
-int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB)
-{
-	const char *ma = a + lenA;
-	const char *mb = b + lenB;
-	for (; ;)
-	{
-		if (a >= ma)
-		{
-			if (b >= mb)
-			{
-				return 0; // Both strings ended
-			}
-			else
-			{
-				return 1; // A is longer
-			}
-		}
-		if (b >= mb)
-		{
-			return -1; // B is longer
-		}
-		const char *ca = fetchToUpperAsUtf8(&a);
-		const char *cb = fetchToUpperAsUtf8(&b);
-		if (!ca && !cb)
-		{
-			// Easy case, ASCII compare or junk
-			if (*a != *b)
-			{
-				if (*a > * b) return 1;
-				else return -1;
-			}
-			/*
-			else if (!*a) // Equal and NUL, ends both
-			{
-				return 0;
-			}
-			*/
-			++a;
-			++b;
-		}
-		else if (!cb)
-		{
-			// String a changed lowercase, iterate ca until NUL alongside b
-			nlassert(*ca);
-			do
-			{
-				if (*ca != *b)
-				{
-					if (*ca > *b) return 1;
-					else return -1;
-				}
-				++ca;
-				++b;
-			} while (*ca);
-		}
-		else if (!ca)
-		{
-			// String b changed lowercase, iterate a alongside cb until NUL
-			nlassert(*cb);
-			do
-			{
-				if (*a != *cb)
-				{
-					if (*a > *cb) return 1;
-					else return -1;
-				}
-				++a;
-				++cb;
-			} while (*cb);
-		}
-		else
-		{
-			// Both strings changed lowercase
-			if (ca != cb) // Only check if it's a different result
-			{
-				do
-				{
-					if (*ca != *cb)
-					{
-						if (*ca > *cb) return 1;
-						else return -1;
-					}
-					++ca;
-					++cb;
-				} while (*ca && *cb);
-			}
-		}
-	}
-}
-
-// ***************************************************************************
-
-#else
-
-// ***************************************************************************
-
-static std::string toLowerAsUtf8(CUtfStringView sv)
-{
-	// UTF-16 implementation-based
-	std::string res;
-	res.reserve(sv.largestSize());
-	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
-	{
-		u32char c = *it;
-		if (c < 0x10000)
-		{
-			ucchar uc = c;
-			ucchar *result = toLowerUpperSearch(&uc, UnicodeUpperToLower);
-			if (result)
-				c = result[1];
-		}
-		CUtfStringView::append(res, c);
+		*str = toUpper(*str);
+		++str;
 	}
-	return res;
-}
-
-std::string toLowerAsUtf8(const char *str)
-{
-	return toLowerAsUtf8(CUtfStringView(str));
-}
-
-// ***************************************************************************
-
-std::string	toLowerAsUtf8(const std::string &str)
-{
-	return toLowerAsUtf8(CUtfStringView(str));
-}
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-static std::string toUpperAsUtf8(CUtfStringView sv)
-{
-	std::string res;
-	res.reserve(sv.largestSize());
-	for (CUtfStringView::iterator it(sv.begin()), end(sv.end()); it != end; ++it)
-	{
-		u32char c = *it;
-		if (c < 0x10000)
-		{
-			ucchar uc = c;
-			ucchar *result = toLowerUpperSearch(&uc, UnicodeLowerToUpper);
-			if (result)
-				c = result[1];
-		}
-		CUtfStringView::append(res, c);
-	}
-	return res;
 }
 
 // ***************************************************************************
 
-std::string toUpperAsUtf8(const char *str)
-{
-	return toUpperAsUtf8(CUtfStringView(str));
-}
-
-// ***************************************************************************
-
-std::string	toUpperAsUtf8(const std::string &str)
-{
-	return toUpperAsUtf8(CUtfStringView(str));
-}
-
-#endif
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
-#if 0
-
-std::string getUtf8(char32_t c)
-{
-	std::string res;
-	if (c < 0x80)
-	{
-		// Encode as 1 byte
-		res += (char)c;
-	}
-	else if (c < 0x0800)
-	{
-		// Encode as 2 bytes
-		res += (char)((c & 0x07C0) >> 6) | 0xC0;
-		res += (char)(c & 0x3F) | 0x80;
-	}
-	else
-	{
-		// Encode as 3 bytes
-		res += (char)((c & 0xF000) >> 12) | 0xE0;
-		res += (char)((c & 0x0FC0) >> 6) | 0x80;
-		res += (char)(c & 0x3F) | 0x80;
-	}
-	return res;
-}
-
-void printStringMap(const std::string &name, std::map<char, std::string> &m, bool trim)
-{
-	std::cout << "static const char " << name << "[" << (trim ? "64" : "256") << " * 4] = {\n";
-	bool zero = false;
-	for (int i = 0; i < (trim ? 64 : 256); ++i)
-	{
-		int x = trim ? i + 0x80 : i;
-		if (m.find(x) == m.end())
-		{
-			if (x % 8 == 7)
-			{
-				zero = false;
-				std::cout << "0, 0, 0, 0,\n";
-			}
-			else
-			{
-				zero = true;
-				std::cout << "0, 0, 0, 0, ";
-			}
-		}
-		else
-		{
-			if (zero) std::cout << "\n";
-			std::cout << "'\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 0 ? (unsigned char)m[x][0] : 0)
-				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 1 ? (unsigned char)m[x][1] : 0)
-				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 2 ? (unsigned char)m[x][2] : 0)
-				<< "', 0,\n";
-			zero = false;
-		}
-	}
-	if (zero) std::cout << "\n";
-	std::cout << "};\n\n";
-}
-
-void printMapMap(const std::string &name, const std::string &strName, std::map<char, std::map<char, std::string>> &m, bool trim)
-{
-	std::cout << "static const char *" << name << "[" << (trim ? "64" : "256") << " * 2] = {\n";
-	bool zero = false;
-	for (int i = 0; i < (trim ? 64 : 256); ++i)
-	{
-		int x = trim ? (i + 0x80) : i;
-		if (m.find(x) == m.end())
-			x = trim ? (i + 0xC0) : i;
-		if (m.find(x) == m.end())
-		{
-			if (x % 32 == 1315)
-			{
-				zero = false;
-				std::cout << "0, \n";
-			}
-			else
-			{
-				zero = true;
-				std::cout << "0, ";
-			}
-		}
-		else
-		{
-			if (zero) std::cout << "\n";
-			std::stringstream n;
-			n << strName;
-			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
-			std::cout << n.str() << ",\n";
-			zero = false;
-		}
-	}
-	if (zero) std::cout << "\n";
-	std::cout << "};\n\n";
-}
-
-void printMapMapMap(const std::string &name, const std::string &mapName, std::map<char, std::map<char, std::map<char, std::string>>> &m, bool trim)
+ucchar toUpper (ucchar c)
 {
-	std::cout << "static const char **" << name << "[" << (trim ? "64" : "256") << " * 2] = {\n";
-	bool zero = false;
-	for (int i = 0; i < (trim ? 64 : 256); ++i)
-	{
-		int x = trim ? (i + 0x80) : i;
-		if (m.find(x) == m.end())
-			x = trim ? (i + 0xC0) : i;
-		if (m.find(x) == m.end())
-		{
-			if (x % 32 == 1315)
-			{
-				zero = false;
-				std::cout << "0, \n";
-			}
-			else
-			{
-				zero = true;
-				std::cout << "0, ";
-			}
-		}
-		else
-		{
-			if (zero) std::cout << "\n";
-			std::stringstream n;
-			n << mapName;
-			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
-			std::cout << n.str() << ",\n";
-			zero = false;
-		}
-	}
-	if (zero) std::cout << "\n";
-	std::cout << "};\n\n";
+	if ((c & 0xF800) == 0xD800)
+		return c;
+	std::string tmpc, tmpr;
+	CUtfStringView::append(tmpc, c);
+	ptrdiff_t i = 0;
+	appendToUpper(tmpr, tmpc, i);
+	ucstring res = CUtfStringView(tmpr).toUtf16();
+	nlassert(res.size() == 1);
+	return res[0];
 }
 
-void generate()
-{
-	std::map<char, std::string> m1;
-	std::map<char, std::map<char, std::string>> m2;
-	std::map<char, std::map<char, std::map<char, std::string>>> m3;
-	for (int i = 0; i < sizeof(UnicodeLowerToUpper) / sizeof(UnicodeLowerToUpper[0]); i += 2)
-	{
-		std::string from = getUtf8(UnicodeLowerToUpper[i]);
-		std::string to = getUtf8(UnicodeLowerToUpper[i + 1]);
-		// assert(from.size() == to.size());
-		if (from.length() == 1)
-		{
-			m1[from[0]] = to;
-		}
-		else if (from.length() == 2)
-		{
-			if (m2.find(from[0]) == m2.end())
-				m2[from[0]] = std::map<char, std::string>();
-			m2[from[0]][from[1]] = to;
-		}
-		else if (from.length() == 3)
-		{
-			if (m3.find(from[0]) == m3.end())
-				m3[from[0]] = std::map<char, std::map<char, std::string>>();
-			if (m3[from[0]].find(from[1]) == m3[from[0]].end())
-				m3[from[0]][from[1]] = std::map<char, std::string>();
-			m3[from[0]][from[1]][from[2]] = to;
-		}
-	}
-	printStringMap("s_Utf8LowerToUpper", m1, false);
-	for (int i = 0; i < 256; ++i)
-	{
-		std::stringstream n;
-		n << "s_Utf8LowerToUpper";
-		if (m2.find(i) != m2.end())
-		{
-			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
-			printStringMap(n.str(), m2[i], true);
-		}
-		else if (m3.find(i) != m3.end())
-		{
-			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
-			for (int j = 0; j < 256; ++j)
-			{
-				if (m3[i].find(j) != m3[i].end())
-				{
-					std::stringstream nn;
-					nn << n.str();
-					nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
-					printStringMap(nn.str(), m3[i][j], true);
-				}
-			}
-		}
-	}
-	printMapMap("s_Utf8LowerToUpperTables", "s_Utf8LowerToUpper", m2, true);
-	for (int i = 0; i < 256; ++i)
-	{
-		std::stringstream n;
-		n << "s_Utf8LowerToUpperTables";
-		std::stringstream nn;
-		nn << "s_Utf8LowerToUpper";
-		if (m3.find(i) != m3.end())
-		{
-			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
-			nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
-			printMapMap(n.str(), nn.str(), m3[i], true);
-		}
-	}
-	printMapMapMap("s_UtfLowerToUpperMap", "s_Utf8LowerToUpperTables", m3, true);
-}
-
-#endif
-
-// ***************************************************************************
-// ***************************************************************************
-// ***************************************************************************
-
 } // NLMISC
diff --git a/nel/tools/misc/CMakeLists.txt b/nel/tools/misc/CMakeLists.txt
index f9112a823..dbe814d3f 100644
--- a/nel/tools/misc/CMakeLists.txt
+++ b/nel/tools/misc/CMakeLists.txt
@@ -12,6 +12,7 @@ IF(WITH_NEL_TOOLS)
     lock
     make_sheet_id
     xml_packer
+    utf_generator
   )
 
   IF(WITH_QT OR WITH_QT5)
diff --git a/nel/tools/misc/utf_generator/CMakeLists.txt b/nel/tools/misc/utf_generator/CMakeLists.txt
new file mode 100644
index 000000000..2f6174986
--- /dev/null
+++ b/nel/tools/misc/utf_generator/CMakeLists.txt
@@ -0,0 +1,11 @@
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(nl_utf_generator ${SRC})
+
+TARGET_LINK_LIBRARIES(nl_utf_generator nelmisc)
+NL_DEFAULT_PROPS(nl_utf_generator "NeL, Tools, Misc: UTF Generator")
+NL_ADD_RUNTIME_FLAGS(nl_utf_generator)
+
+INSTALL(TARGETS nl_utf_generator RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsmisc)
diff --git a/nel/tools/misc/utf_generator/gold_pill.ico b/nel/tools/misc/utf_generator/gold_pill.ico
new file mode 100644
index 0000000000000000000000000000000000000000..618b67a5d196bdbdc4d497a3b7ca998b79039677
GIT binary patch
literal 3638
zcmeH|zityj5XQf`vv2R8lRF0=!64zvLOcRZ@(47%1EO$G<y3BvC=dmeJERCY3R7Z1
z6-9EIP(hItF%<}j0;ram-97svCk9a=bU$gezMXG(*0a(#0Kr3+f#(qSn?N5xuV=sa
zL*Oy5-QqQtfR~Mqr^~r>7suZ;o}Ow9KWIF7uW|24qu=jCYmGObHC}wun9t{!&1Sg$
zP6MyLV>})M&yFz~jWC%^fQS2+=cprf1?md?hZP`8`Oj#}K*|8hER?sITv4;NA<$;R
zq>3WH(P#z%rJ<n63%w|cV@l*RRUpqdad#fO+4+2B-oKpL-q_=oV>$%(X!S5zlUP+N
zzr|;JJa&1AAFqXdR(y5mKwA%eZ9P`}w)9@{Sn*u(Tk&M^-mm(n@m=v)<GIhzjQ?W%
z(ReRjelb3bCx;je2Ee1YwHL2_h&otTpsv6_R{>}3W?H=*(Tyb(EO1J?UWK}aqZ<UG
zpzSKxsK_1dqALRGT&>Wd!Zofe&kK&zR)e`x(xG<j$TAU7!}pZ5DhK7#--I~J+Z^{*
z6oye0aUb&-%52mMIPOJhtF@7uHpsF{Jc)C;K-fw)ZSNEj#f$w(Z0@hje(9Q$W+e_%
z=khQ2+xl<@(`w86FUl*2JJ!EXsjBA-D!@JcxBS3Rp8z+ffZ79m8Q^!Rj&gm<niJN_
Ho<HFiPbAmK

literal 0
HcmV?d00001

diff --git a/nel/tools/misc/utf_generator/main.cpp b/nel/tools/misc/utf_generator/main.cpp
new file mode 100644
index 000000000..77093e0a5
--- /dev/null
+++ b/nel/tools/misc/utf_generator/main.cpp
@@ -0,0 +1,425 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "nel/misc/types_nl.h"
+
+#include "nel/misc/debug.h"
+#include "nel/misc/common.h"
+#include "nel/misc/string_common.h"
+#include "nel/misc/string_view.h"
+#include "nel/misc/utf_string_view.h"
+
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <iostream>
+#include <iomanip>
+
+void printStringMap(const std::string &name, std::map<char, std::string> &m, bool trim)
+{
+	std::cout << "static const char " << name << "[" << std::dec << (trim ? "64" : "256") << " * 4] = {\n";
+	bool zero = false;
+	for (int i = 0; i < (trim ? 64 : 256); ++i)
+	{
+		int x = trim ? i + 0x80 : i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 8 == 7)
+			{
+				zero = false;
+				std::cout << "0, 0, 0, 0,\n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, 0, 0, 0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream ss;
+			ss << "'\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 0 ? (unsigned char)m[x][0] : 0)
+				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 1 ? (unsigned char)m[x][1] : 0)
+				<< "', '\\x" << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (m[x].length() > 2 ? (unsigned char)m[x][2] : 0)
+				<< "', 0,\n";
+			std::cout << ss.str();
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void printMapMap(const std::string &name, const std::string &strName, std::map<char, std::map<char, std::string>> &m, int base, int size)
+{
+	std::cout << "static const char *" << name << "[" << size << "] = {\n";
+	bool zero = false;
+	for (int i = base; i < (base + size); ++i)
+	{
+		int x = i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 32 == 1315)
+			{
+				zero = false;
+				std::cout << "0, \n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream n;
+			n << strName;
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
+			std::cout << n.str() << ",\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << std::dec << "};\n\n";
+}
+
+void printMapMapMap(const std::string &name, const std::string &mapName, std::map<char, std::map<char, std::map<char, std::string>>> &m, int base, int size)
+{
+	std::cout << "static const char **" << name << "[" << size << "] = {\n";
+	bool zero = false;
+	for (int i = base; i < (base + size); ++i)
+	{
+		int x = i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 32 == 1315)
+			{
+				zero = false;
+				std::cout << "0, \n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream n;
+			n << mapName;
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
+			std::cout << n.str() << ",\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void printMapMapMapMap(const std::string &name, const std::string &mapName, std::map<char, std::map<char, std::map<char, std::map<char, std::string>>>> &m, int base, int size)
+{
+	std::cout << "static const char ***" << name << "[" << size << "] = {\n";
+	bool zero = false;
+	for (int i = base; i < (base + size); ++i)
+	{
+		int x = i;
+		if (m.find(x) == m.end())
+		{
+			if (x % 32 == 1315)
+			{
+				zero = false;
+				std::cout << "0, \n";
+			}
+			else
+			{
+				zero = true;
+				std::cout << "0, ";
+			}
+		}
+		else
+		{
+			if (zero) std::cout << "\n";
+			std::stringstream n;
+			n << mapName;
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)x;
+			std::cout << n.str() << ",\n";
+			zero = false;
+		}
+	}
+	if (zero) std::cout << "\n";
+	std::cout << "};\n\n";
+}
+
+void generateMap(const std::string &file, const std::string &name, const std::vector<u32char> &map)
+{
+	std::map<char, std::string> m1;
+	std::map<char, std::map<char, std::string>> m2;
+	std::map<char, std::map<char, std::map<char, std::string>>> m3;
+	std::map<char, std::map<char, std::map<char, std::map<char, std::string>>>> m4;
+	for (u32char i = 0; i < 0x110000; ++i)
+	{
+		if (map[i] != i)
+		{
+			std::string from;
+			NLMISC::CUtfStringView::append(from, i);
+			std::string to;
+			NLMISC::CUtfStringView::append(to, map[i]);
+			// assert(from.size() == to.size());
+			if (from.length() == 1)
+			{
+				m1[from[0]] = to;
+			}
+			else if (from.length() == 2)
+			{
+				if (m2.find(from[0]) == m2.end())
+					m2[from[0]] = std::map<char, std::string>();
+				m2[from[0]][from[1]] = to;
+			}
+			else if (from.length() == 3)
+			{
+				if (m3.find(from[0]) == m3.end())
+					m3[from[0]] = std::map<char, std::map<char, std::string>>();
+				if (m3[from[0]].find(from[1]) == m3[from[0]].end())
+					m3[from[0]][from[1]] = std::map<char, std::string>();
+				m3[from[0]][from[1]][from[2]] = to;
+			}
+			else if (from.length() == 4)
+			{
+				if (m4.find(from[0]) == m4.end())
+					m4[from[0]] = std::map<char, std::map<char, std::map<char, std::string>>>();
+				if (m4[from[0]].find(from[1]) == m4[from[0]].end())
+					m4[from[0]][from[1]] = std::map<char, std::map<char, std::string>>();
+				if (m4[from[0]][from[1]].find(from[2]) == m4[from[0]][from[1]].end())
+					m4[from[0]][from[1]][from[2]] = std::map<char, std::string>();
+				m4[from[0]][from[1]][from[2]][from[3]] = to;
+			}
+		}
+	}
+	printStringMap("s_" + name, m1, false);
+	for (int i = 0; i < 256; ++i)
+	{
+		std::stringstream n;
+		n << "s_" << name;
+		if (m2.find(i) != m2.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			printStringMap(n.str(), m2[i], true);
+		}
+		else if (m3.find(i) != m3.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			for (int j = 0; j < 256; ++j)
+			{
+				if (m3[i].find(j) != m3[i].end())
+				{
+					std::stringstream nn;
+					nn << n.str();
+					nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
+					printStringMap(nn.str(), m3[i][j], true);
+				}
+			}
+		}
+		else if (m4.find(i) != m4.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			for (int j = 0; j < 256; ++j)
+			{
+				if (m4[i].find(j) != m4[i].end())
+				{
+					std::stringstream nn;
+					nn << n.str();
+					nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
+					for (int k = 0; k < 256; ++k)
+					{
+						if (m4[i][j].find(k) != m4[i][j].end())
+						{
+							std::stringstream nnn;
+							nnn << nn.str();
+							nnn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)k;
+							printStringMap(nnn.str(), m4[i][j][k], true);
+						}
+					}
+				}
+			}
+		}
+	}
+	printMapMap("s_" + name + "Map", "s_" + name, m2, 0xC0, 32);
+
+	for (int i = 0; i < 256; ++i)
+	{
+		std::stringstream n;
+		n << "s_" << name << "Map";
+		std::stringstream nn;
+		nn << "s_" << name;
+		if (m3.find(i) != m3.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			printMapMap(n.str(), nn.str(), m3[i], 0x80, 64);
+		}
+	}
+	printMapMapMap("s_" + name + "MapMap", "s_" + name + "Map", m3, 0xE0, 16);
+
+	for (int i = 0; i < 256; ++i)
+	{
+		std::stringstream n;
+		n << "s_" << name << "Map";
+		std::stringstream nn;
+		nn << "s_" << name;
+		std::stringstream nnn;
+		nnn << "s_" << name << "MapMap";
+		if (m4.find(i) != m4.end())
+		{
+			n << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			nn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			nnn << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)i;
+			for (int j = 0; j < 256; ++j)
+			{
+				if (m4[i].find(j) != m4[i].end())
+				{
+					std::stringstream n2, nn2;
+					n2 << n.str() << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
+					nn2 << nn.str() << std::hex << std::setw(2) << std::setfill('0') << std::uppercase << (unsigned int)j;
+					printMapMap(n2.str(), nn2.str(), m4[i][j], 0x80, 64);
+				}
+			}
+			printMapMapMap(nnn.str(), n.str(), m4[i], 0x80, 64);
+		}
+	}
+	printMapMapMapMap("s_" + name + "MapMapMap", "s_" + name + "MapMap", m4, 0xF0, 8);
+}
+
+int main (int argc, char **argv)
+{
+	std::ifstream fi("UnicodeData.txt");
+
+	std::vector<u32char> upper;
+	std::vector<u32char> lower;
+	std::vector<u32char> title;
+	std::vector<u32char> ci;
+
+	upper.resize(0x110000);
+	lower.resize(0x110000);
+	title.resize(0x110000);
+	ci.resize(0x110000);
+
+	for (u32char i = 0; i < 0x110000; ++i)
+	{
+		upper[i] = i;
+		lower[i] = i;
+		title[i] = i;
+		ci[i] = i;
+	}
+
+	std::string line;
+	while (std::getline(fi, line))
+	{
+		std::vector<std::string> cols;
+		NLMISC::explode(line, nlstr(";"), cols, false);
+		nlassert(cols.size() == 15);
+
+		u32char c = NLMISC::atoiInt64(cols[0].c_str(), 16);
+		u32char up = NLMISC::atoiInt64(cols[12].c_str(), 16);
+		u32char low = NLMISC::atoiInt64(cols[13].c_str(), 16);
+		u32char tit = NLMISC::atoiInt64(cols[14].c_str(), 16);
+		
+		if (up) upper[c] = up;
+		if (low) lower[c] = low;
+		if (tit) title[c] = tit;
+	}
+
+	std::vector<u32char> ref;
+	int rounds = 0;
+	for (;;)
+	{
+		ref = ci;
+
+		for (u32char i = 0; i < 0x110000; ++i)
+		{
+			ci[i] = title[ci[i]];
+		}
+
+		for (u32char i = 0; i < 0x110000; ++i)
+		{
+			ci[i] = upper[ci[i]];
+		}
+
+		for (u32char i = 0; i < 0x110000; ++i)
+		{
+			ci[i] = lower[ci[i]];
+		}
+
+		bool equal = true;
+		for (u32char i = 0; i < 0x110000; ++i)
+		{
+			if (ci[i] != ref[i])
+				equal = false;
+		}
+		++rounds;
+		std::cout << rounds << std::endl;
+		if (equal)
+			break;
+	}
+
+	for (u32char i = 0; i < 0x110000; ++i)
+	{
+		if (ci[i] != lower[i])
+			std::cout << i << std::endl;
+	}
+
+	generateMap("string_to_upper", "StringToUpper", upper);
+	//generateMap("string_to_lower", "StringToLower", lower);
+	//generateMap("string_to_title", "StringToTitle", title);
+	//generateMap("string_to_ci", "StringToCaseInsensitive", ci);
+
+	std::string test = nlstr("Οὐχὶ ταὐτὰ παρίσταταί μοι γιγνώσκειν, ὦ ἄνδρες ᾿Αθηναῖοι,");
+	std::string testUpper = NLMISC::toUpper(test);
+	std::string testLower = NLMISC::toLower(test);
+	std::string testUpper2 = NLMISC::toUpper(testLower);
+	std::string testLower2 = NLMISC::toLower(testUpper);
+	std::cout << test << std::endl;
+	std::cout << testUpper << std::endl;
+	std::cout << testLower << std::endl;
+	std::cout << testUpper2 << std::endl;
+	std::cout << testLower2 << std::endl;
+
+	int cci1 = NLMISC::compareCaseInsensitive("bAAAAfdsklj", "Cldsfjslkf");
+	int cci2 = NLMISC::compareCaseInsensitive("Cldsfjslkf", "bAAAAfdsklj");
+	int strc1 = strcmp(NLMISC::toLower("bAAAAfdsklj").c_str(), NLMISC::toLower("Cldsfjslkf").c_str());
+	int strc2 = strcmp(NLMISC::toLower("Cldsfjslkf").c_str(), NLMISC::toLower("bAAAAfdsklj").c_str());
+
+	int bcci1 = NLMISC::compareCaseInsensitive("bAAAAfdsklj", "AnlsqFDS");
+	int bcci2 = NLMISC::compareCaseInsensitive("AnlsqFDS", "bAAAAfdsklj");
+	int bstrc1 = strcmp(NLMISC::toLower("bAAAAfdsklj").c_str(), NLMISC::toLower("AnlsqFDS").c_str());
+	int bstrc2 = strcmp(NLMISC::toLower("AnlsqFDS").c_str(), NLMISC::toLower("bAAAAfdsklj").c_str());
+
+	std::vector<std::string> arr;
+	arr.push_back("AnlsqFDS");
+	arr.push_back("yozeRNZE");
+	arr.push_back("yOzeihfn");
+	arr.push_back("bAAAAfdsklj");
+	arr.push_back("Cldsfjslkf");
+	std::sort(arr.begin(), arr.end(), NLMISC::ltCaseInsensitive);
+	for (int i = 0; i < arr.size(); ++i)
+		std::cout << arr[i] << std::endl;
+
+	return EXIT_SUCCESS;
+}
+
+/* end of file */
diff --git a/nel/tools/misc/utf_generator/main.rc b/nel/tools/misc/utf_generator/main.rc
new file mode 100644
index 000000000..ea4618245
--- /dev/null
+++ b/nel/tools/misc/utf_generator/main.rc
@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL UTF Generator"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "nl_utf_generator" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

From c770191bef90bbe6f3d0d3f39c75cc46ef1304a5 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 10 Nov 2020 11:58:11 +0800
Subject: [PATCH 162/292] Explicitly use toLowerAscii for filenames and
 identifiers

---
 nel/tools/3d/build_clodtex/main.cpp           |  4 +--
 nel/tools/3d/build_interface/main.cpp         |  6 ++--
 nel/tools/3d/ig_elevation/main.cpp            |  2 +-
 .../3d/ig_lighter_lib/ig_lighter_lib.cpp      |  2 +-
 nel/tools/3d/lightmap_optimizer/main.cpp      | 16 ++++-----
 nel/tools/3d/object_viewer/object_viewer.cpp  |  2 +-
 .../3d/object_viewer/snapshot_tool_dlg.cpp    |  2 +-
 nel/tools/3d/panoply_maker/panoply_maker.cpp  |  8 ++---
 nel/tools/3d/shapes_exporter/main.cpp         |  2 +-
 nel/tools/3d/textures_optimizer/main.cpp      |  4 +--
 nel/tools/3d/tga_2_dds/tga2dds.cpp            |  4 +--
 .../zone_dependencies/zone_dependencies.cpp   | 10 +++---
 .../3d/zone_elevation/zone_elevation.cpp      |  2 +-
 .../3d/zone_ig_lighter/zone_ig_lighter.cpp    |  4 +--
 nel/tools/3d/zone_lighter/zone_lighter.cpp    |  8 ++---
 nel/tools/georges/georges2csv/georges2csv.cpp |  6 ++--
 nel/tools/ligo/unbuild_land/unbuild_land.cpp  |  2 +-
 nel/tools/misc/bnp_make/main.cpp              |  8 ++---
 nel/tools/misc/data_mirror/data_mirror.cpp    | 14 ++++----
 nel/tools/misc/data_mirror/data_mirrorDlg.cpp |  4 +--
 .../extract_filename/extract_filename.cpp     | 12 +++----
 .../misc/make_sheet_id/make_sheet_id.cpp      |  4 +--
 nel/tools/misc/snp_make/main.cpp              |  2 +-
 .../georges_dll/georges_edit_doc.cpp          |  4 +--
 .../leveldesign/georges_dll/imagelist_ex.cpp  |  4 +--
 .../mission_compiler_feDlg.cpp                |  4 +--
 .../mission_compiler_lib/mission_compiler.cpp | 32 ++++++++---------
 .../mission_compiler_lib/step_content.cpp     | 16 ++++-----
 ryzom/tools/leveldesign/prim_export/main.cpp  | 10 +++---
 .../world_editor/dialog_properties.cpp        |  8 ++---
 .../world_editor/dialog_properties.h          |  2 +-
 .../world_editor/imagelist_ex.cpp             |  4 +--
 .../world_editor/world_editor/name_dlg.cpp    |  2 +-
 .../world_editor/world_editor.cpp             |  6 ++--
 .../plugin.cpp                                |  4 +--
 .../sound_plugin.cpp                          |  2 +-
 ryzom/tools/make_anim_by_race/main.cpp        |  4 +--
 ryzom/tools/make_anim_melee_impact/main.cpp   |  6 ++--
 ryzom/tools/patch_gen/patch_gen_common.cpp    |  6 ++--
 ryzom/tools/pd_parser/parser.cpp              | 36 +++++++++----------
 .../build_world_packed_col.cpp                |  2 +-
 .../server/build_world_packed_col/village.cpp |  2 +-
 .../tools/skill_extractor/skill_extractor.cpp |  4 +--
 .../extract_new_sheet_names.cpp               |  8 ++---
 44 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/nel/tools/3d/build_clodtex/main.cpp b/nel/tools/3d/build_clodtex/main.cpp
index 69a680574..86387379a 100644
--- a/nel/tools/3d/build_clodtex/main.cpp
+++ b/nel/tools/3d/build_clodtex/main.cpp
@@ -212,8 +212,8 @@ int main(int argc, char *argv[])
 			for(j=0;j<LodFilters.size();j++)
 			{
 				// Make the test case-unsensitive
-				string	lwrFileName= toLower(fileNameIn);
-				string	lwrFilter= toLower(LodFilters[j]);
+				string	lwrFileName= toLowerAscii(fileNameIn);
+				string	lwrFilter= toLowerAscii(LodFilters[j]);
 				if( testWildCard(lwrFileName.c_str(), lwrFilter.c_str()) )
 				{
 					string	clodFile= clod_dir_in+"/"+LodNames[j]+".clod";
diff --git a/nel/tools/3d/build_interface/main.cpp b/nel/tools/3d/build_interface/main.cpp
index 2f0cc88bd..c629e6a33 100644
--- a/nel/tools/3d/build_interface/main.cpp
+++ b/nel/tools/3d/build_interface/main.cpp
@@ -180,7 +180,7 @@ bool writeFileDependingOnFilename(const std::string &filename, CBitmap &bitmap)
 
 	if (out.open(filename))
 	{
-		if (toLower(filename).find(".png") != string::npos)
+		if (toLowerAscii(filename).find(".png") != string::npos)
 		{
 			bitmap.writePNG(out, 32);
 		}
@@ -583,7 +583,7 @@ int main(int argc, char **argv)
 				continue;
 			}
 
-			sTGAname = toLower(string(tgaName));
+			sTGAname = toLowerAscii(string(tgaName));
 
 			// search position of extension
 			std::string tgaExt = CFile::getExtension(sTGAname);
@@ -597,7 +597,7 @@ int main(int argc, char **argv)
 			for (i = 0; i < mapSize; ++i)
 			{
 				// get the string whitout path
-				findTGAName = toLower(CFile::getFilenameWithoutExtension(AllMapNames[i]));
+				findTGAName = toLowerAscii(CFile::getFilenameWithoutExtension(AllMapNames[i]));
 				if( findTGAName == sTGAname )
 					break;
 			}
diff --git a/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp
index 4856051c3..a3d485bd8 100644
--- a/nel/tools/3d/ig_elevation/main.cpp
+++ b/nel/tools/3d/ig_elevation/main.cpp
@@ -353,7 +353,7 @@ int main(int nNbArg, char**ppArgs)
 	vector<string> vAllFiles;
 	for(uint i = 0, len = (uint)vAllFilesUnfiltered.size(); i < len; ++i)
 	{
-		if (toLower(CFile::getExtension(vAllFilesUnfiltered[i])) == "ig")
+		if (toLowerAscii(CFile::getExtension(vAllFilesUnfiltered[i])) == "ig")
 		{
 			vAllFiles.push_back(vAllFilesUnfiltered[i]);
 		}
diff --git a/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
index 24439ff4d..2c88f87a6 100644
--- a/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
+++ b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
@@ -170,7 +170,7 @@ void	CIgLighterLib::lightIg(CInstanceLighter &instanceLighter,
 			string name= igIn.getShapeName(i);
 			bool	shapeFound= true;
 
-			if (toLower (CFile::getExtension (name)) == "pacs_prim")
+			if (toLowerAscii (CFile::getExtension (name)) == "pacs_prim")
 			{
 				nlwarning("EXPORT BUG: Can't read %s (not a shape), should not be part of .ig!", name.c_str());
 				continue;
diff --git a/nel/tools/3d/lightmap_optimizer/main.cpp b/nel/tools/3d/lightmap_optimizer/main.cpp
index f68112ea3..35e764cf3 100644
--- a/nel/tools/3d/lightmap_optimizer/main.cpp
+++ b/nel/tools/3d/lightmap_optimizer/main.cpp
@@ -481,7 +481,7 @@ int main(int nNbArg, char **ppArgs)
 					CTextureFile *pTF = dynamic_cast<CTextureFile*>(pIT);
 					if (pTF != NULL)
 					{
-						string sTexName = NLMISC::toLower(pTF->getFileName());
+						string sTexName = NLMISC::toLowerAscii(pTF->getFileName());
 						if(pTF->getUploadFormat()==ITexture::Luminance)
 							setLM8Bit.insert(sTexName);
 					}
@@ -530,7 +530,7 @@ int main(int nNbArg, char **ppArgs)
 		tmpLMs.clear();
 		for (i = 0; i < (sint32)AllLightmapNames.size(); ++i)
 		{
-			bool	lm8Bit= setLM8Bit.find( NLMISC::toLower(AllLightmapNames[i]) ) !=setLM8Bit.end();
+			bool	lm8Bit= setLM8Bit.find( NLMISC::toLowerAscii(AllLightmapNames[i]) ) !=setLM8Bit.end();
 			// if same mode
 			if( lm8Bit == (lmc8bitMode==1) )
 			{
@@ -824,13 +824,13 @@ int main(int nNbArg, char **ppArgs)
 									CTextureFile *pTF = dynamic_cast<CTextureFile*>(pIT);
 									if (pTF != NULL)
 									{
-										string sTexName = NLMISC::toLower(getBaseName(pTF->getFileName()));
-										string sTexNameMoved = NLMISC::toLower(getBaseName(AllLightmapNames[i]));
+										string sTexName = NLMISC::toLowerAscii(getBaseName(pTF->getFileName()));
+										string sTexNameMoved = NLMISC::toLowerAscii(getBaseName(AllLightmapNames[i]));
 										if (sTexName == sTexNameMoved)
 										{
 											// We must remap the name and indicate to remap uvs
 											bMustRemapUV = true;
-											//string sNewTexName = NLMISC::toLower(getBaseName(AllLightmapNames[j]));
+											//string sNewTexName = NLMISC::toLowerAscii(getBaseName(AllLightmapNames[j]));
 											//sNewTexName += NLMISC::toString(getLayerNb(pTF->getFileName())) + ".tga";
 											//pTF->setFileName (sNewTexName);
 										}
@@ -891,11 +891,11 @@ int main(int nNbArg, char **ppArgs)
 									CTextureFile *pTF = dynamic_cast<CTextureFile*>(pIT);
 									if (pTF != NULL)
 									{
-										string sTexName = NLMISC::toLower(getBaseName(pTF->getFileName()));
-										string sTexNameMoved = NLMISC::toLower(getBaseName(AllLightmapNames[i]));
+										string sTexName = NLMISC::toLowerAscii(getBaseName(pTF->getFileName()));
+										string sTexNameMoved = NLMISC::toLowerAscii(getBaseName(AllLightmapNames[i]));
 										if (sTexName == sTexNameMoved)
 										{
-											string sNewTexName = NLMISC::toLower(getBaseName(AllLightmapNames[j]));
+											string sNewTexName = NLMISC::toLowerAscii(getBaseName(AllLightmapNames[j]));
 											sNewTexName += NLMISC::toString(getLayerNb(pTF->getFileName())) + ".tga";
 											pTF->setFileName (sNewTexName);
 										}
diff --git a/nel/tools/3d/object_viewer/object_viewer.cpp b/nel/tools/3d/object_viewer/object_viewer.cpp
index 5562c4a4f..0b78373a1 100644
--- a/nel/tools/3d/object_viewer/object_viewer.cpp
+++ b/nel/tools/3d/object_viewer/object_viewer.cpp
@@ -3696,7 +3696,7 @@ void		CObjectViewer::shootScene()
 			string extension = NLMISC::CFile::getExtension (tStrToUtf8(fileDlg.GetPathName()));
 
 			// The file name without extension
-			bool jpeg = toLower (extension) == "jpg";
+			bool jpeg = toLowerAscii (extension) == "jpg";
 
 			// Activate the driver
  			CNELU::Driver->activate ();
diff --git a/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
index 159040b1c..33533b28a 100644
--- a/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
+++ b/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
@@ -458,7 +458,7 @@ void CSnapshotToolDlg::OnGo()
 			CString wildCard;
 			m_Filters.GetText(l, wildCard);
 			wildCard.MakeLower();
-			if (testWildCard(toLower(NLMISC::CFile::getFilename(files[k])).c_str(), tStrToUtf8(wildCard).c_str()))
+			if (testWildCard(toLowerAscii(NLMISC::CFile::getFilename(files[k])).c_str(), tStrToUtf8(wildCard).c_str()))
 			{
 				_FilteredFiles.push_back(files[k]);
 				break;
diff --git a/nel/tools/3d/panoply_maker/panoply_maker.cpp b/nel/tools/3d/panoply_maker/panoply_maker.cpp
index dc12e3e5f..3819fb8ba 100644
--- a/nel/tools/3d/panoply_maker/panoply_maker.cpp
+++ b/nel/tools/3d/panoply_maker/panoply_maker.cpp
@@ -325,7 +325,7 @@ int main(int argc, char* argv[])
 					NLMISC::CConfigFile::CVar &bitmap_extensions = cf.getVar ("bitmap_extensions");
 					for (uint k = 0; k < (uint) bitmap_extensions.size(); ++k)
 					{
-						std::string ext = "." + NLMISC::toLower(bitmap_extensions.asString(k));
+						std::string ext = "." + NLMISC::toLowerAscii(bitmap_extensions.asString(k));
 						if (std::find(bi.BitmapExtensions.begin(), bi.BitmapExtensions.end(), ext) == bi.BitmapExtensions.end())
 						{
 							bi.BitmapExtensions.push_back(ext);
@@ -483,7 +483,7 @@ static void BuildColoredVersions(const CBuildInfo &bi)
 		{
 			for (uint l = 0; l < bi.BitmapExtensions.size(); ++l)
 			{
-				std::string fileExt = "." + NLMISC::toLower(NLMISC::CFile::getExtension(files[k]));
+				std::string fileExt = "." + NLMISC::toLowerAscii(NLMISC::CFile::getExtension(files[k]));
 				if (fileExt == bi.BitmapExtensions[l])
 				{
 					//nlwarning("Processing : %s ", files[k].c_str());
@@ -532,7 +532,7 @@ static bool CheckIfNeedRebuildColoredVersionForOneBitmap(const CBuildInfo &bi, c
 	masks.clear();
 
 	std::string fileName = NLMISC::CFile::getFilenameWithoutExtension(fileNameWithExtension);
-	std::string fileExt  = NLMISC::toLower(NLMISC::CFile::getExtension(fileNameWithExtension));
+	std::string fileExt  = NLMISC::toLowerAscii(NLMISC::CFile::getExtension(fileNameWithExtension));
 
 	for (uint k = 0; k < bi.ColorMasks.size(); ++k)
 	{
@@ -721,7 +721,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
 	masks.clear();
 
 	std::string fileName = NLMISC::CFile::getFilenameWithoutExtension(fileNameWithExtension);
-	std::string fileExt  = NLMISC::toLower(NLMISC::CFile::getExtension(fileNameWithExtension));
+	std::string fileExt  = NLMISC::toLowerAscii(NLMISC::CFile::getExtension(fileNameWithExtension));
 
 	uint	k;
 	for (k = 0; k < bi.ColorMasks.size(); ++k)
diff --git a/nel/tools/3d/shapes_exporter/main.cpp b/nel/tools/3d/shapes_exporter/main.cpp
index adc56ac32..fd9b0ab81 100644
--- a/nel/tools/3d/shapes_exporter/main.cpp
+++ b/nel/tools/3d/shapes_exporter/main.cpp
@@ -169,7 +169,7 @@ sint main(int argc, char **argv)
 			if (filenames[i].find(".max") == std::string::npos)
 				continue;
 
-			std::string baseFilename = toLower(CFile::getFilenameWithoutExtension(filenames[i]));
+			std::string baseFilename = toLowerAscii(CFile::getFilenameWithoutExtension(filenames[i]));
 
 			// compute the md5 of .max file
 			std::string md5 = getNewMD5(filenames[i]).toString();
diff --git a/nel/tools/3d/textures_optimizer/main.cpp b/nel/tools/3d/textures_optimizer/main.cpp
index 84b28d421..890a0c8d8 100644
--- a/nel/tools/3d/textures_optimizer/main.cpp
+++ b/nel/tools/3d/textures_optimizer/main.cpp
@@ -104,7 +104,7 @@ bool parseOptions(int argc, char **argv)
 			// Filename
 			else
 			{
-				std::string ext = NLMISC::toLower(NLMISC::CFile::getExtension(option));
+				std::string ext = NLMISC::toLowerAscii(NLMISC::CFile::getExtension(option));
 
 				if (ext == "png" || ext == "tga")
 				{
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
 
 	for(uint i = 0; i < InputFilenames.size(); ++i)
 	{
-		std::string ext = NLMISC::toLower(NLMISC::CFile::getExtension(InputFilenames[i]));
+		std::string ext = NLMISC::toLowerAscii(NLMISC::CFile::getExtension(InputFilenames[i]));
 
 		NLMISC::CIFile input;
 
diff --git a/nel/tools/3d/tga_2_dds/tga2dds.cpp b/nel/tools/3d/tga_2_dds/tga2dds.cpp
index 02adf4038..60de2a073 100644
--- a/nel/tools/3d/tga_2_dds/tga2dds.cpp
+++ b/nel/tools/3d/tga_2_dds/tga2dds.cpp
@@ -327,10 +327,10 @@ int main(int argc, char **argv)
 
 	if (args.haveArg("a"))
 	{
-		std::string strAlgo = args.getArg("a").front();
+		std::string strAlgo = toLowerAscii(args.getArg("a").front());
 
 		if (strAlgo == "1")					OptAlgo = DXT1;
-		else if (toLower(strAlgo) == "1a") 	OptAlgo = DXT1A;
+		else if (strAlgo == "1a") 			OptAlgo = DXT1A;
 		else if (strAlgo == "3")			OptAlgo = DXT3;
 		else if (strAlgo == "5") 			OptAlgo = DXT5;
 		else if (strAlgo == "tga8")			OptAlgo = TGA8;
diff --git a/nel/tools/3d/zone_dependencies/zone_dependencies.cpp b/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
index 933938023..b8b0c1c9e 100644
--- a/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
+++ b/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
@@ -525,7 +525,7 @@ int main (int argc, char* argv[])
 
 							// Write the dependencies file
 							FILE *outputFile;
-							if ((outputFile = nlfopen (toLower (outputFileName), "w")))
+							if ((outputFile = nlfopen (toLowerAscii (outputFileName), "w")))
 							{
 								// Add a dependency entry
 								fprintf (outputFile, "dependencies =\n{\n");
@@ -540,7 +540,7 @@ int main (int argc, char* argv[])
 
 									// Write it
 									string message="\t\""+zoneName+"\"";
-									fprintf (outputFile, "%s", toLower (message).c_str());
+									fprintf (outputFile, "%s", toLowerAscii (message).c_str());
 
 									// Next ite;
 									ite++;
@@ -615,7 +615,7 @@ static void computeIGBBox(const NL3D::CInstanceGroup &ig, CLightingBBox &result,
 			{
 				nlwarning("Unable to find shape '%s'", it->Name.c_str());				
 			}
-			else if (toLower (CFile::getExtension (shapePathName)) == "pacs_prim")
+			else if (toLowerAscii (CFile::getExtension (shapePathName)) == "pacs_prim")
 			{
 				nlwarning("EXPORT BUG: Can't read %s (not a shape), should not be part of .ig!", shapePathName.c_str());
 			}
@@ -711,7 +711,7 @@ static void computeIGBBox(const NL3D::CInstanceGroup &ig, CLightingBBox &result,
 static void computeZoneIGBBox(const char *zoneName, CLightingBBox &result, TShapeMap &shapeMap, const TString2LightingBBox &additionnalIG)
 {
 	result = CLightingBBox(); // starts with a void box	
-	std::string lcZoneName = NLMISC::toLower(std::string(zoneName));
+	std::string lcZoneName = NLMISC::toLowerAscii(std::string(zoneName));
 	TString2LightingBBox::const_iterator zoneIt = additionnalIG.find(lcZoneName);
 	if (zoneIt != additionnalIG.end())
 	{		
@@ -901,7 +901,7 @@ static void computeIGBBoxFromContinent(NLMISC::CConfigFile &parameter,
 					nlwarning("Couldn't get zone name of village %d in continent %s", continentName.c_str(), k);
 					continue;
 				}
-				zoneName = NLMISC::toLower(CFile::getFilenameWithoutExtension(zoneName));				
+				zoneName = NLMISC::toLowerAscii(CFile::getFilenameWithoutExtension(zoneName));				
 				CLightingBBox result;				
 				// ok, it is in the dependant zones
 				computeBBoxFromVillage(currVillage, continentName, k, shapeMap, result);
diff --git a/nel/tools/3d/zone_elevation/zone_elevation.cpp b/nel/tools/3d/zone_elevation/zone_elevation.cpp
index 7fbd07e58..598cfda31 100644
--- a/nel/tools/3d/zone_elevation/zone_elevation.cpp
+++ b/nel/tools/3d/zone_elevation/zone_elevation.cpp
@@ -105,7 +105,7 @@ bool getXYFromZoneName(sint32 &x, sint32 &y, const string &zoneName)
 	}
 	if (xStr.size() != 2)
 		goto Fail;
-	xStr = NLMISC::toUpper(xStr);
+	xStr = NLMISC::toUpperAscii(xStr);
 	x = ((xStr[0] - 'A') * 26 + (xStr[1] - 'A'));
 	return true;
 Fail:
diff --git a/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp b/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
index 26fc9179a..d09267002 100644
--- a/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
+++ b/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
@@ -116,7 +116,7 @@ int main(int argc, char* argv[])
 		if (inputFile.open (argv[1]))
 		{
 			// Zone name
-			string zoneName=toLower (string ("zone_"+getName (argv[1])));
+			string zoneName=toLowerAscii (string ("zone_"+getName (argv[1])));
 
 			// Load the zone
 			try
@@ -413,7 +413,7 @@ int main(int argc, char* argv[])
 						if(group->getInstance(instance).DontCastShadow || group->getInstance(instance).DontCastShadowForExterior)
 							continue;
 
-						if (toLower (CFile::getExtension (name)) == "pacs_prim")
+						if (toLowerAscii (CFile::getExtension (name)) == "pacs_prim")
 						{
 							nlwarning("EXPORT BUG: Can't read %s (not a shape), should not be part of .ig!", name.c_str());
 							continue;
diff --git a/nel/tools/3d/zone_lighter/zone_lighter.cpp b/nel/tools/3d/zone_lighter/zone_lighter.cpp
index 672b9511a..35127abbe 100644
--- a/nel/tools/3d/zone_lighter/zone_lighter.cpp
+++ b/nel/tools/3d/zone_lighter/zone_lighter.cpp
@@ -140,7 +140,7 @@ static void loadIGFromVillage(const NLGEORGES::UFormElm *villageItem, const std:
 		// verify that the ig is not already added (case of tr_water.ig in additional_igs)
 		for(uint igAdd= 0;igAdd<(uint)additionalIgNames.size();igAdd++)
 		{
-			if( toLower(additionalIgNames.asString()) == toLower(igName) )
+			if( toLowerAscii(additionalIgNames.asString()) == toLower(igName) )
 			{
 				nlwarning("Skipping Village Ig %s, cause already exist in additional ig", igName.c_str());
 				continue;
@@ -315,7 +315,7 @@ int main(int argc, char* argv[])
 		if (inputFile.open (argv[1]))
 		{
 			// Zone name
-			string zoneName=toLower (string ("zone_"+getName (argv[1])));
+			string zoneName=toLowerAscii (string ("zone_"+getName (argv[1])));
 
 			// Load the zone
 			try
@@ -702,14 +702,14 @@ int main(int argc, char* argv[])
 								if(group->getInstance(instance).DontCastShadow || group->getInstance(instance).DontCastShadowForExterior)
 									continue;
 
-								if (toLower (CFile::getExtension (name)) == "pacs_prim")
+								if (toLowerAscii (CFile::getExtension (name)) == "pacs_prim")
 								{
 									nlwarning("EXPORT BUG: Can't read %s (not a shape), should not be part of .ig!", name.c_str());
 									continue;
 								}
 
 								// PS ?
-								if (toLower (CFile::getExtension (name)) == "ps")
+								if (toLowerAscii (CFile::getExtension (name)) == "ps")
 									continue;
 								
 								// Add a .shape at the end ?
diff --git a/nel/tools/georges/georges2csv/georges2csv.cpp b/nel/tools/georges/georges2csv/georges2csv.cpp
index 45dcc4006..0105aa1ad 100644
--- a/nel/tools/georges/georges2csv/georges2csv.cpp
+++ b/nel/tools/georges/georges2csv/georges2csv.cpp
@@ -738,7 +738,7 @@ void	convertCsvFile( const string &file, bool generate, const string& sheetType
 			}
 			else if ( nlstricmp( fields[i], "parent" ) == 0 )
 			{
-				fields[i] = toLower( fields[i] );
+				fields[i] = toLowerAscii( fields[i] );
 			}
 			else
 			{
@@ -883,7 +883,7 @@ void	convertCsvFile( const string &file, bool generate, const string& sheetType
 		{
 			filebase += "." + sheetType;
 		}
-		filebase = toLower(filebase);
+		filebase = toLowerAscii(filebase);
 		string	filename, dirbase;
 		bool	isNewSheet=true;
 
@@ -905,7 +905,7 @@ void	convertCsvFile( const string &file, bool generate, const string& sheetType
 			else
 			{
 				// Load template sheet
-				filename = toLower(filebase);
+				filename = toLowerAscii(filebase);
 				form = (CForm*)formLoader->loadForm( (string("_empty.") + sheetType).c_str() );
 				if (form == NULL)
 				{
diff --git a/nel/tools/ligo/unbuild_land/unbuild_land.cpp b/nel/tools/ligo/unbuild_land/unbuild_land.cpp
index 37b3b4e79..a9f5dcd54 100644
--- a/nel/tools/ligo/unbuild_land/unbuild_land.cpp
+++ b/nel/tools/ligo/unbuild_land/unbuild_land.cpp
@@ -104,7 +104,7 @@ bool getXYFromZoneName(sint32 &x, sint32 &y, const string &zoneName)
 	}
 	if (xStr.size() != 2)
 		goto Fail;
-	xStr = NLMISC::toUpper(xStr);
+	xStr = NLMISC::toUpperAscii(xStr);
 	x = ((xStr[0] - 'A') * 26 + (xStr[1] - 'A'));
 	return true;
 Fail:
diff --git a/nel/tools/misc/bnp_make/main.cpp b/nel/tools/misc/bnp_make/main.cpp
index d6842b8fe..2edf0a7ba 100644
--- a/nel/tools/misc/bnp_make/main.cpp
+++ b/nel/tools/misc/bnp_make/main.cpp
@@ -56,7 +56,7 @@ bool keepFile (const std::string &fileName)
 	uint i;
 	bool ifPresent = false;
 	bool ifTrue = false;
-	string file = toLower(CFile::getFilename (fileName));
+	string file = toLowerAscii(CFile::getFilename (fileName));
 	for (i=0; i<WildCards.size(); i++)
 	{
 		if (WildCards[i].Not)
@@ -100,7 +100,7 @@ bool packSubRecurse(const std::string &srcDirectory)
 	// check for files with same name
 	for(uint i = 1, len = pathContent.size(); i < len; ++i)
 	{
-		if (toLower(CFile::getFilename(pathContent[i-1])) == toLower(CFile::getFilename(pathContent[i])))
+		if (toLowerAscii(CFile::getFilename(pathContent[i-1])) == toLowerAscii(CFile::getFilename(pathContent[i])))
 		{
 			nlwarning("File %s is not unique in BNP!", CFile::getFilename(pathContent[i]).c_str());
 			return false;
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
 		for (uint i = 0; i < filters.size(); ++i)
 		{
 			CWildCard card;
-			card.Expression = toLower(filters[i]);
+			card.Expression = toLowerAscii(filters[i]);
 			card.Not = false;
 			WildCards.push_back(card);
 		}
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 		for (uint i = 0; i < filters.size(); ++i)
 		{
 			CWildCard card;
-			card.Expression = toLower(filters[i]);
+			card.Expression = toLowerAscii(filters[i]);
 			card.Not = true;
 			WildCards.push_back(card);
 		}
diff --git a/nel/tools/misc/data_mirror/data_mirror.cpp b/nel/tools/misc/data_mirror/data_mirror.cpp
index 03830cff8..f4d54a1dc 100644
--- a/nel/tools/misc/data_mirror/data_mirror.cpp
+++ b/nel/tools/misc/data_mirror/data_mirror.cpp
@@ -108,21 +108,21 @@ BOOL CData_mirrorApp::InitInstance()
 
 		cf.load (path);
 		MainDirectory = cf.getVar ("MainDirectory").asString ();
-		MainDirectory = toLower (CPath::standardizePath (MainDirectory));
+		MainDirectory = toLowerAscii (CPath::standardizePath (MainDirectory));
 		
 		MirrorDirectory = cf.getVar ("MirrorDirectory").asString ();
-		MirrorDirectory = toLower (CPath::standardizePath (MirrorDirectory));
+		MirrorDirectory = toLowerAscii (CPath::standardizePath (MirrorDirectory));
 		
 		LogDirectory = cf.getVar ("LogDirectory").asString ();
-		LogDirectory = toLower (CPath::standardizePath (LogDirectory));
+		LogDirectory = toLowerAscii (CPath::standardizePath (LogDirectory));
 		
 		IgnoreDirectory = cf.getVar ("IgnoreDirectory").asString ();
-		IgnoreDirectory = toLower (CPath::standardizePath (IgnoreDirectory));
+		IgnoreDirectory = toLowerAscii (CPath::standardizePath (IgnoreDirectory));
 		if (IgnoreDirectory.empty())
 			IgnoreDirectory = MainDirectory;
 
 		string sBinaryCompare = cf.getVar ("BinaryCompare").asString ();
-		sBinaryCompare = toLower (sBinaryCompare);
+		sBinaryCompare = toLowerAscii (sBinaryCompare);
 		BinaryCompare = false;
 		if ((sBinaryCompare == "true") || (sBinaryCompare=="1"))
 			BinaryCompare = true;
@@ -145,12 +145,12 @@ BOOL CData_mirrorApp::InitInstance()
 		if (NLMISC::CFile::isDirectory (CurrentDir))
 		{
 			directory = true;
-			CurrentDir = toLower(CPath::standardizePath (CurrentDir));
+			CurrentDir = toLowerAscii(CPath::standardizePath (CurrentDir));
 		}
 		else if (NLMISC::CFile::fileExists (CurrentDir))
 		{
 			directory = false;
-			CurrentDir = toLower(CPath::standardizePath (NLMISC::CFile::getPath (CurrentDir)));
+			CurrentDir = toLowerAscii(CPath::standardizePath (NLMISC::CFile::getPath (CurrentDir)));
 		}
 		else
 		{
diff --git a/nel/tools/misc/data_mirror/data_mirrorDlg.cpp b/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
index a7f65aa3a..9fdaf7061 100644
--- a/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
+++ b/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
@@ -628,7 +628,7 @@ void CData_mirrorDlg::buildSourceFiles ()
 	{
 		// Get the filename
 		string &str = fileSource[i];
-		str = toLower(str.substr (MainDirectory.size (), str.size ()));
+		str = toLowerAscii(str.substr (MainDirectory.size (), str.size ()));
 
 		// In the ignore list ?
 		if (IgnoreFiles.find (str) == IgnoreFiles.end () && (str != "ignore_list.txt"))
@@ -716,7 +716,7 @@ void CData_mirrorDlg::buildSourceFiles ()
 	{
 		// Get the filename
 		string &str = fileSource[i];
-		str = toLower(str.substr (MirrorDirectory.size (), str.size ()));
+		str = toLowerAscii(str.substr (MirrorDirectory.size (), str.size ()));
 
 		// In the ignore list ?
 		if (IgnoreFiles.find (str) == IgnoreFiles.end () && (str != "ignore_list.txt"))
diff --git a/nel/tools/misc/extract_filename/extract_filename.cpp b/nel/tools/misc/extract_filename/extract_filename.cpp
index 7708f9031..e22fd8243 100644
--- a/nel/tools/misc/extract_filename/extract_filename.cpp
+++ b/nel/tools/misc/extract_filename/extract_filename.cpp
@@ -214,7 +214,7 @@ void extractStringsFromBinary (const vector<char> &fileArray, set<string> &filen
 				if (str != "")
 				{
 					// Lower case
-					str = toLower (str);
+					str = toLowerAscii (str);
 
 					// Filter extensions
 					if (filterExtension (str.c_str(), extensions))
@@ -280,7 +280,7 @@ void extractStringsFromASCII (const vector<char> &fileArray, set<string> &filena
 						temp[c] = begin[c];
 
 					// Lower case
-					temp = toLower (temp);
+					temp = toLowerAscii (temp);
 
 					// Filter extensions
 					if (filterExtension (temp.c_str(), extensions))
@@ -325,7 +325,7 @@ bool loadConfigFiles (const char *ext, const char *input_files, const char *avai
 		while (fgets (name, 512, file))
 		{
 			// To string and lower
-			temp = toLower (string(name));
+			temp = toLowerAscii (string(name));
 
 			// Remove return
 			removeChar (temp, '\n');
@@ -374,8 +374,8 @@ bool loadConfigFiles (const char *ext, const char *input_files, const char *avai
 					while (fgets (name, 512, file))
 					{
 						// To lower
-						temp = toLower (string(name));
-						temp2 = toLower (string(name));
+						temp = toLowerAscii (string(name));
+						temp2 = toLowerAscii (string(name));
 
 						// Remove space
 						removeBeginEndSpaces (temp);
@@ -597,7 +597,7 @@ int main(int argc, char* argv[])
 				// It is used ?
 				if (usedFiles.find (available->first) == usedFiles.end())
 				{
-					string temp = toLower (available->second);
+					string temp = toLowerAscii (available->second);
 					fprintf (stderr, "UNUSED: %s\n", temp.c_str());
 				}
 
diff --git a/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
index be8f9cb53..db024ba38 100644
--- a/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
+++ b/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
@@ -320,10 +320,10 @@ void addId( string fileName )
 	if( itFI == FormToId.end() )
 	{
 		// double check : if file not found we check with lower case version of filename
-		map<string,TFormId>::iterator itFILwr = FormToId.find( toLower(fileName) );
+		map<string,TFormId>::iterator itFILwr = FormToId.find( toLowerAscii(fileName) );
 		if( itFILwr != FormToId.end() )
 		{
-			nlwarning("Trying to add %s but the file %s is already known ! becareful with lower case and upper case.", fileName.c_str(), toLower(fileName).c_str());
+			nlwarning("Trying to add %s but the file %s is already known ! becareful with lower case and upper case.", fileName.c_str(), toLowerAscii(fileName).c_str());
 			NbFilesDiscarded++;
 			return;
 		}
diff --git a/nel/tools/misc/snp_make/main.cpp b/nel/tools/misc/snp_make/main.cpp
index 8b94b7afc..d98992181 100644
--- a/nel/tools/misc/snp_make/main.cpp
+++ b/nel/tools/misc/snp_make/main.cpp
@@ -64,7 +64,7 @@ bool keepFile (const char *fileName)
 	uint i;
 	bool ifPresent = false;
 	bool ifTrue = false;
-	string file = toLower(CFile::getFilename (fileName));
+	string file = toLowerAscii(CFile::getFilename (fileName));
 	for (i=0; i<WildCards.size(); i++)
 	{
 		if (WildCards[i].Not)
diff --git a/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
index d7dcd6b89..c9cc79ea0 100644
--- a/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
@@ -184,7 +184,7 @@ bool CGeorgesEditDocForm::initDocument (const char *dfnName, bool newElement)
 	}
 
 	// Set file name and title
-	std::string name2 = toLower(NLMISC::CFile::getFilenameWithoutExtension(dfnName));
+	std::string name2 = toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(dfnName));
 	SetPathName(nlUtf8ToTStr("*." + name2), FALSE);
 	SetTitle(nlUtf8ToTStr("New " + name2 + " form"));
 
@@ -547,7 +547,7 @@ BOOL CGeorgesEditDoc::OnOpenDocument(LPCTSTR lpszPathName)
 		{
 			// Check form
 			std::string ext = NLMISC::CFile::getExtension(tStrToUtf8(lpszPathName));
-			string extLower = toLower(ext);
+			string extLower = toLowerAscii(ext);
 
 			if (!extLower.empty ())
 			{
diff --git a/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
index 824da9f2a..d25134ebe 100644
--- a/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
@@ -107,7 +107,7 @@ void CImageListEx::addResourceIcon (const char *filename)
 		
 			// Add in the map
 			std::string name = NLMISC::CFile::getFilenameWithoutExtension(filename);
-			_IconMapString.insert (std::map<string, int>::value_type (toLower(name), index));
+			_IconMapString.insert (std::map<string, int>::value_type (toLowerAscii(name), index));
 
 			// Release the icon
 			DestroyIcon (handle);
@@ -132,7 +132,7 @@ int CImageListEx::getImage (int resource) const
 
 int CImageListEx::getImage (const char *filename) const
 {
-	std::string name = toLower(NLMISC::CFile::getFilenameWithoutExtension(filename));
+	std::string name = toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(filename));
 	std::map<string, int>::const_iterator ite = _IconMapString.find (name);
 	if (ite == _IconMapString.end())
 		return -1;
diff --git a/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
index 1198d166d..a66ab8b73 100644
--- a/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
@@ -239,8 +239,8 @@ BOOL CMissionCompilerFeDlg::OnInitDialog()
 			{
 				// We found the same filename : check the path
 				string srcPath = it->second;
-				srcPath  = toUpper(CPath::standardizeDosPath(srcPath));
-				files[i] = toUpper(CPath::standardizeDosPath(files[i]));
+				srcPath  = toUpperAscii(CPath::standardizeDosPath(srcPath));
+				files[i] = toUpperAscii(CPath::standardizeDosPath(files[i]));
 				if (srcPath != files[i])
 				{
 					::MessageBox(NULL, _T("Primitive path and working directory are not the same !"),
diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
index b664bb0e2..3572eb807 100644
--- a/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
@@ -189,7 +189,7 @@ GenderExtractor::GenderExtractor(const std::string & literal, const std::string&
 	const char * f = fs[level];
 	const char * h = hs[level];
 
-	_Identifier = toLower(identifier);
+	_Identifier = toLowerAscii(identifier);
 
 	std::string newPhrase;
 
@@ -657,7 +657,7 @@ bool CMissionCompiler::installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, c
 				// use mission primitive instead
 				fileName = primFileName;
 			}
-			if (loadedPrimitives.find(toLower(fileName)) == loadedPrimitives.end())
+			if (loadedPrimitives.find(toLowerAscii(fileName)) == loadedPrimitives.end())
 			{
 				string fullFileName = CPath::lookup(fileName, false);
 				if (fullFileName.empty())
@@ -670,7 +670,7 @@ bool CMissionCompiler::installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, c
 				if (loadXmlPrimitiveFile(*primDoc, fullFileName, ligoConfig))
 				{
 					// the primitive file is loaded correctly
-					loadedPrimitives.insert(make_pair(toLower(fileName), TLoadedPrimitive(primDoc, fullFileName)));
+					loadedPrimitives.insert(make_pair(toLowerAscii(fileName), TLoadedPrimitive(primDoc, fullFileName)));
 					CPrimitiveContext::instance().CurrentPrimitive = NULL;
 				}
 				else
@@ -679,7 +679,7 @@ bool CMissionCompiler::installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, c
 					throw EParseException(NULL, toString("Can't read primitive file '%s'", fullFileName.c_str()).c_str());
 				}
 			}
-			TLoadedPrimitive &loadedPrim = loadedPrimitives[toLower(fileName)];
+			TLoadedPrimitive &loadedPrim = loadedPrimitives[toLowerAscii(fileName)];
 			CPrimitives *primDoc = loadedPrim.PrimDoc;
 
 			TPrimitiveSet scripts;
@@ -744,7 +744,7 @@ bool CMissionCompiler::installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, c
 				fileName = primFileName;
 			}
 
-			TLoadedPrimitive &loadedPrim = loadedPrimitives[toLower(fileName)];
+			TLoadedPrimitive &loadedPrim = loadedPrimitives[toLowerAscii(fileName)];
 			CPrimitives *primDoc = loadedPrim.PrimDoc;
 			CPrimitiveContext::instance().CurrentPrimitive = primDoc;
 
@@ -1304,7 +1304,7 @@ retry:
 		_Suffixe = tokens.back();
 
 		// generate identifier
-		_PhraseId = toUpper(md.getMissionName()+"_"+_Suffixe);
+		_PhraseId = toUpperAscii(md.getMissionName()+"_"+_Suffixe);
 
 		set<string>	ps;
 		// select only unique params
@@ -1857,11 +1857,11 @@ void CMissionData::parseMissionHeader(NLLIGO::IPrimitive *prim)
 //	_MissionTitle.init(*this, prim, vs); 
 	_MissionDescriptionRaw = getPropertyArray(prim, "mission_description", false, false);
 //	_MissionDescription.init(*this, prim, vs);
-	_MonoInstance = toLower(getProperty(prim, "mono_instance", true, false)) == "true";
-	_RunOnce = toLower(getProperty(prim, "run_only_once", true, false)) == "true";
-	_Replayable = toLower(getProperty(prim, "replayable", true, false)) == "true";
+	_MonoInstance = toBool(getProperty(prim, "mono_instance", true, false));
+	_RunOnce = toBool(getProperty(prim, "run_only_once", true, false));
+	_Replayable = toBool(getProperty(prim, "replayable", true, false));
 	
-	_NeedValidation = toLower(getProperty(prim, "need_validation", true, false)) == "true";
+	_NeedValidation = toBool(getProperty(prim, "need_validation", true, false));
 	
 	_MissionAutoMenuRaw = getPropertyArray(prim, "phrase_auto_menu", false, false);
 
@@ -1872,15 +1872,15 @@ void CMissionData::parseMissionHeader(NLLIGO::IPrimitive *prim)
 	else if (s == "guild")
 		_Guild = true;
 	
-	_NotInJournal = NLMISC::toLower(getProperty(prim, "not_in_journal", false, false)) == "true";
-	_AutoRemoveFromJournal = NLMISC::toLower(getProperty(prim, "auto_remove_from_journal", false, false)) == "true";
+	_NotInJournal = NLMISC::toBool(getProperty(prim, "not_in_journal", false, false));
+	_AutoRemoveFromJournal = NLMISC::toBool(getProperty(prim, "auto_remove_from_journal", false, false));
 	_MissionCategory = getProperty(prim, "mission_category", false, false);
 	NLMISC::fromString(getProperty(prim, "player_replay_timer", true, false), _PlayerReplayTimer);
 	NLMISC::fromString(getProperty(prim, "global_replay_timer", true, false), _GlobalReplayTimer);
-	_NotProposed = NLMISC::toLower(getProperty(prim, "not_proposed", false, false)) == "true";
-	_MissionAuto = NLMISC::toLower(getProperty(prim, "automatic", false, false)) == "true";
-	_NonAbandonnable = NLMISC::toLower(getProperty(prim, "non_abandonnable", false, false)) == "true";
-	_FailIfInventoryIsFull = NLMISC::toLower(getProperty(prim, "fail_if_inventory_is_full", false, false)) == "true";
+	_NotProposed = NLMISC::toBool(getProperty(prim, "not_proposed", false, false));
+	_MissionAuto = NLMISC::toBool(getProperty(prim, "automatic", false, false));
+	_NonAbandonnable = NLMISC::toBool(getProperty(prim, "non_abandonnable", false, false));
+	_FailIfInventoryIsFull = NLMISC::toBool(getProperty(prim, "fail_if_inventory_is_full", false, false));
 	_MissionIcon = getProperty(prim, "mission_icon", false, false);
 
 	if (_MissionAuto)
diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
index 8a3daa1d5..f4d2013f8 100644
--- a/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
@@ -471,7 +471,7 @@ public:
 
 		string s;
 		s = md.getProperty(prim, "hide_others", true, false);
-		_HideOthers = (NLMISC::toLower(s) == "true");
+		_HideOthers = NLMISC::toBool(s);
 	}
 
 	string genCode(CMissionData &md)
@@ -788,7 +788,7 @@ public:
 
 		string s;
 		s = md.getProperty(prim, "group", true, false);
-		_Group = (NLMISC::toLower(s) == "true");
+		_Group = NLMISC::toBool(s);
 
 		_Guild = md.getProperty(prim, "guild", false, true) == "true";
 		// Check: if _Guild is true then check if we are in a guild mission
@@ -866,7 +866,7 @@ public:
 		
 		string s;
 		s = md.getProperty(prim, "group", true, false);
-		_Group = (NLMISC::toLower(s) == "true");
+		_Group = NLMISC::toBool(s);
 
 		_Guild = md.getProperty(prim, "guild", false, true) == "true";
 		// Check: if _Guild is true then check if we are in a guild mission
@@ -1054,7 +1054,7 @@ public:
 
 		string s;
 		s = md.getProperty(prim, "group", true, false);
-		_Group = (NLMISC::toLower(s) == "true");
+		_Group = NLMISC::toBool(s);
 
 		IStepContent::init(md, prim);
 	}
@@ -1111,7 +1111,7 @@ public:
 
 		string s;
 		s = md.getProperty(prim, "group", true, false);
-		_Group = (NLMISC::toLower(s) == "true");
+		_Group = NLMISC::toBool(s);
 
 		IStepContent::init(md, prim);
 	}
@@ -1169,7 +1169,7 @@ public:
 
 		string s;
 		s = md.getProperty(prim, "group", true, false);
-		_Group = (NLMISC::toLower(s) == "true");
+		_Group = NLMISC::toBool(s);
 
 		IStepContent::init(md, prim);
 	}
@@ -1320,7 +1320,7 @@ public:
 		_WorldPosition = md.getProperty(prim, "world_position", true, false);
 		string s;
 		prim->getPropertyByName("once", s);
-		_Once = (NLMISC::toLower(s) == "true");
+		_Once = NLMISC::toBool(s);
 	}
 
 	string genCode(CMissionData &md)
@@ -3212,7 +3212,7 @@ public:
 	{
 		_GroupName = md.getProperty(prim, "group_to_escort", true, false);
 		string s = md.getProperty(prim, "save_all", true, false);
-		_SaveAll = (NLMISC::toLower(s) == "true");
+		_SaveAll = NLMISC::toBool(s);
 
 		CContentObjective::init(md, prim);
 	}
diff --git a/ryzom/tools/leveldesign/prim_export/main.cpp b/ryzom/tools/leveldesign/prim_export/main.cpp
index ad78325d5..6ac9c2ad6 100644
--- a/ryzom/tools/leveldesign/prim_export/main.cpp
+++ b/ryzom/tools/leveldesign/prim_export/main.cpp
@@ -527,7 +527,7 @@ public:
 		formDate = 0;
 
 		// In the map ?
-		string formShortName = NLMISC::toLower(CFile::getFilename (formName));
+		string formShortName = NLMISC::toLowerAscii(CFile::getFilename (formName));
 		map<string, CValue >::iterator ite = _FormMap.find (formShortName);
 		if (ite == _FormMap.end ())
 		{
@@ -614,7 +614,7 @@ void addPointPrimitive (CLandscape &landscape, const char *primFilename, uint32
 				if (point->getPropertyByName ("form", plantFilename))
 				{
 					// Add an extension
-					if (NLMISC::toLower(CFile::getExtension (plantFilename)) != "plant")
+					if (NLMISC::toLowerAscii(CFile::getExtension (plantFilename)) != "plant")
 						plantFilename += ".plant";
 
 					// Load this form
@@ -669,7 +669,7 @@ void addPointPrimitive (CLandscape &landscape, const char *primFilename, uint32
 								instance.Scale = CVector (scale, scale, scale);
 								instance.nParent = -1;
 								instance.Name = shape;
-								instance.InstanceName = NLMISC::toLower(CFile::getFilename (plantFilename));
+								instance.InstanceName = NLMISC::toLowerAscii(CFile::getFilename (plantFilename));
 
 								// Get the instance group ref
 								CIgContainer::CIG	&instances = igs.get (x, y);
@@ -826,7 +826,7 @@ int main (int argc, char**argv)
 				callback.progress ((float)i/(float)files.size ());
 
 				// Zonew ?
-				if (NLMISC::toLower(CFile::getExtension (files[i])) == "zonew")
+				if (NLMISC::toLowerAscii(CFile::getExtension (files[i])) == "zonew")
 				{
 					// Load it
 					try
@@ -890,7 +890,7 @@ int main (int argc, char**argv)
 			for (i=0; i<fileCount; i++)
 			{
 				// Primitive file ?
-				if (NLMISC::toLower(CFile::getExtension (files[i])) == "primitive")
+				if (NLMISC::toLowerAscii(CFile::getExtension (files[i])) == "primitive")
 				{
 					// Progress bar
 					nlinfo (files[i].c_str());
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
index e4cf1e670..1de46ae1b 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
@@ -3485,7 +3485,7 @@ BOOL CMyComboBox::PreTranslateMessage( MSG* pMsg )
 			_LastString.clear();
 
 		// Add this char
-		_LastString.push_back (tolower((TCHAR) pMsg->wParam));
+		_LastString.push_back((wchar_t)NLMISC::toLower((ucchar)pMsg->wParam));
 		search = true;
 
 		// New stroke time
@@ -3518,7 +3518,7 @@ BOOL CMyComboBox::PreTranslateMessage( MSG* pMsg )
 		{
 			// 0 final
 			text[511] = 0;
-			_LastString = tStrToUtf8(text);
+			_LastString = CUtfStringView(tStrToUtf8(text)).toWide();
 			search = true;
 		}
 	}
@@ -3538,11 +3538,11 @@ BOOL CMyComboBox::PreTranslateMessage( MSG* pMsg )
 		{
 			CString rString;
 			GetLBText (i, rString);
-			string tmp = toLower(tStrToUtf8(rString));
+			wstring tmp = CUtfStringView(toLower(tStrToUtf8(rString))).toWide();
 			uint size = std::min (_LastString.size(), tmp.size());
 			if (size > matchSize)
 			{
-				if (strncmp(tmp.c_str(), _LastString.c_str(), size) == 0)
+				if (wcsncmp(tmp.c_str(), _LastString.c_str(), size) == 0)
 				{
 					matchItem = i;
 					matchSize = size;
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
index 330138b27..1784c8ff4 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
@@ -60,7 +60,7 @@ public:
 	bool						loaded;
 
 private:
-	std::string					_LastString;
+	std::wstring				_LastString;
 	sint64						_LastStrokeTime;
 	std::vector<std::string>	_data;
 	void						reloadData();
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
index 5601d3ed4..7feaf0f27 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
@@ -110,7 +110,7 @@ void CImageListEx::addResourceIcon (const char *filename)
 			index = ImageList.Replace( index, handle);
 		
 			// Add in the map
-			std::string name = toLower(NLMISC::CFile::getFilenameWithoutExtension(filename));
+			std::string name = toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(filename));
 			_IconMapString.insert (std::map<string, int>::value_type (name, index));
 
 			// Release the icon
@@ -136,7 +136,7 @@ int CImageListEx::getImage (int resource) const
 
 int CImageListEx::getImage (const char *filename) const
 {
-	std::string name = toLower(NLMISC::CFile::getFilenameWithoutExtension(filename));
+	std::string name = toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(filename));
 	std::map<string, int>::const_iterator ite = _IconMapString.find (name);
 	if (ite == _IconMapString.end())
 		return -1;
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
index d05fb6fc9..757b49cc5 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
@@ -167,7 +167,7 @@ void CNameDlg::updateSearchList()
 			m_nameFilter.UnlockBuffer();
 
 			// filter
-			if (NLMISC::toLower(ig).find(NLMISC::toLower(filter)) != std::string::npos)
+			if (NLMISC::toLowerAscii(ig).find(NLMISC::toLowerAscii(filter)) != std::string::npos)
 			{
 				m_listToName.insert(std::make_pair(j, i));
 				m_searchList.InsertString(j++, nlUtf8ToTStr(s));
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
index c57536fd3..ee47f6afb 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
@@ -555,7 +555,7 @@ bool CWorldEditorApp::initPath (const std::string &filename, CSplashScreen &spla
 							string noRecurse;
 							if (CIXml::getPropertyString (noRecurse, search_path, "NO_RECURSE"))
 							{
-								if (toLower(noRecurse) == "true")
+								if (toBool(noRecurse))
 									recurse = false;
 							}
 
@@ -635,14 +635,14 @@ class CMainFrame *getMainFrame ()
 
 std::string standardizePath (const std::string &str)
 {
-	return NLMISC::toLower(NLMISC::CPath::standardizePath (str, true));
+	return NLMISC::toLowerAscii(NLMISC::CPath::standardizePath (str, true));
 }
 
 // ***************************************************************************
 
 std::string formatString (const std::string &str)
 {
-	string copy = NLMISC::toLower(str);
+	string copy = NLMISC::toLowerAscii(str);
 	return copy;
 }
 
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
index 532d034d0..e8eb3f202 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
@@ -222,7 +222,7 @@ void CPlugin::drawFaunaGraph(CDisplay &display, const NLLIGO::IPrimitive &grp)
 				if (!grp.getChild(child, k)) continue;
 				std::string className;
 				if (!child->getPropertyByName("class", className)) continue;
-				if (NLMISC::toLower(className) != FAUNA_PLACE) continue;
+				if (NLMISC::toLowerAscii(className) != FAUNA_PLACE) continue;
 				if (_PluginAccess->isSelected(*child))
 				{
 					found = true;
@@ -239,7 +239,7 @@ void CPlugin::drawFaunaGraph(CDisplay &display, const NLLIGO::IPrimitive &grp)
 		if (!grp.getChild(child, k)) continue;
 		std::string className;
 		if (!child->getPropertyByName("class", className)) continue;
-		if (NLMISC::toLower(className) != FAUNA_PLACE) continue;
+		if (NLMISC::toLowerAscii(className) != FAUNA_PLACE) continue;
 		std::string indexStr;
 		int index;
 		if (!child->getPropertyByName("index", indexStr)) continue;
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
index c92e90918..8c8ec0cd6 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
@@ -169,7 +169,7 @@ void CSoundPlugin::ReInit()
 	bool	fmodDriver = false;
 	try
 	{
-		fmodDriver = toLower(cf.getVar("DriverSound").asString())=="fmod";
+		fmodDriver = toLowerAscii(cf.getVar("DriverSound").asString())=="fmod"; // FIXME: Support all drivers
 	}
 	catch(...)
 	{
diff --git a/ryzom/tools/make_anim_by_race/main.cpp b/ryzom/tools/make_anim_by_race/main.cpp
index 6400cdcd6..69abc7ec4 100644
--- a/ryzom/tools/make_anim_by_race/main.cpp
+++ b/ryzom/tools/make_anim_by_race/main.cpp
@@ -134,7 +134,7 @@ void	makeAnimByRace(const std::string &animSetFile, const std::vector<string> &a
 		// get the possible anim file name (lowered)
 		static vector<string>	raceAnimNames;
 		raceAnimNames.clear();
-		buildRaceAnimNames(raceAnimNames, toLower(CFile::getFilename(animList[i])));
+		buildRaceAnimNames(raceAnimNames, toLowerAscii(CFile::getFilename(animList[i])));
 
 		// For each line of the animSet
 		uint	lastStructLine= 0;
@@ -142,7 +142,7 @@ void	makeAnimByRace(const std::string &animSetFile, const std::vector<string> &a
 		for(uint j=0;j<animSetText.size();)
 		{
 			string	line= animSetText[j];
-			string	lineLwr= toLower(line);
+			string	lineLwr= toLowerAscii(line);
 
 			// Find <LOG> TAg? => stop
 			if(line.find("<LOG>")!=string::npos)
diff --git a/ryzom/tools/make_anim_melee_impact/main.cpp b/ryzom/tools/make_anim_melee_impact/main.cpp
index 3f67edd5e..2bfdebcb2 100644
--- a/ryzom/tools/make_anim_melee_impact/main.cpp
+++ b/ryzom/tools/make_anim_melee_impact/main.cpp
@@ -87,7 +87,7 @@ void CAnimCombatState::build(const string &line)
 void	makeAnimMeleeImpact(const std::string &animSetFile, const set<CAnimCombatSet> &combatAnimSets)
 {
 	// look if this animSetFile is in the combat list to patch
-	string	shortName= NLMISC::toLower(CFile::getFilenameWithoutExtension(animSetFile));
+	string	shortName= NLMISC::toLowerAscii(CFile::getFilenameWithoutExtension(animSetFile));
 	CAnimCombatSet	key;
 	key.Name= shortName;
 	set<CAnimCombatSet>::const_iterator	it= combatAnimSets.find(key);
@@ -125,7 +125,7 @@ void	makeAnimMeleeImpact(const std::string &animSetFile, const set<CAnimCombatSe
 		for(uint j=0;j<animSetText.size();j++)
 		{
 			string	line= animSetText[j];
-			string	lineLwr= toLower(line);
+			string	lineLwr= toLowerAscii(line);
 
 			// Find <LOG> TAg? => stop
 			if(line.find("<LOG>")!=string::npos)
@@ -405,7 +405,7 @@ To generate the anim.txt file, this code has to be inserted in the client, in
 						if(anim && anim3d)
 						{
 							// name
-							string	name= NLMISC::toLower(_AnimationSet->getAnimationName(anim->id()));
+							string	name= NLMISC::toLowerAscii(_AnimationSet->getAnimationName(anim->id()));
 							if(animName.empty())
 								animName= name;
 							else if(!extended)
diff --git a/ryzom/tools/patch_gen/patch_gen_common.cpp b/ryzom/tools/patch_gen/patch_gen_common.cpp
index a9502517d..6e512ce84 100644
--- a/ryzom/tools/patch_gen/patch_gen_common.cpp
+++ b/ryzom/tools/patch_gen/patch_gen_common.cpp
@@ -459,9 +459,9 @@ void CPackageDescription::buildDefaultFileList()
 	std::vector<std::string> fileList;
 	NLMISC::CPath::getPathContent(_BnpDirectory,false,false,true,fileList);
 	for (uint32 i=0;i<fileList.size();++i)
-		if (NLMISC::toLower(NLMISC::CFile::getExtension(fileList[i]))=="bnp"
-			|| NLMISC::toLower(NLMISC::CFile::getExtension(fileList[i]))=="snp")
-			_Categories.addFile("main",NLMISC::toLower(NLMISC::CFile::getFilename(fileList[i])));
+		if (NLMISC::toLowerAscii(NLMISC::CFile::getExtension(fileList[i]))=="bnp"
+			|| NLMISC::toLowerAscii(NLMISC::CFile::getExtension(fileList[i]))=="snp")
+			_Categories.addFile("main",NLMISC::toLowerAscii(NLMISC::CFile::getFilename(fileList[i])));
 
 	_Categories.addFile("unpacked","root.bnp");
 }
diff --git a/ryzom/tools/pd_parser/parser.cpp b/ryzom/tools/pd_parser/parser.cpp
index 80492e8b6..568fbb3f8 100644
--- a/ryzom/tools/pd_parser/parser.cpp
+++ b/ryzom/tools/pd_parser/parser.cpp
@@ -99,16 +99,16 @@ string	xmlSpecialChars(string str)
 
 string	getFullStdPathNoExt(const string &path)
 {
-	string	dir = NLMISC::toLower(NLMISC::CFile::getPath(path));
-	string	file = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(path));
+	string	dir = NLMISC::toLowerAscii(NLMISC::CFile::getPath(path));
+	string	file = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(path));
 
 	return dir.empty() ? file : NLMISC::CPath::standardizePath(dir)+file;
 }
 
 string	getFullStdPath(const string &path)
 {
-	string	dir = NLMISC::toLower(NLMISC::CFile::getPath(path));
-	string	file = NLMISC::toLower(NLMISC::CFile::getFilename(path));
+	string	dir = NLMISC::toLowerAscii(NLMISC::CFile::getPath(path));
+	string	file = NLMISC::toLowerAscii(NLMISC::CFile::getFilename(path));
 
 	return dir.empty() ? file : NLMISC::CPath::standardizePath(dir)+file;
 }
@@ -258,7 +258,7 @@ bool	CDbNode::epilog()
 	setEnv("db", Name);
 
 	string	fullfile = getFullStdPathNoExt(MainFile.empty() ? Name : MainFile);
-	string	filename = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(fullfile));
+	string	filename = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(fullfile));
 
 	setEnv("filename", filename);
 	setEnv("fullfilename", fullfile);
@@ -788,14 +788,14 @@ void	CDbNode::generateLogContent()
 // get file path from this file
 string	CDbNode::getFileNoExtPath(const std::string& file)
 {
-	string	thisPath = NLMISC::CFile::getPath(NLMISC::toLower(getDbFile()));
-	string	filePath = NLMISC::CFile::getPath(NLMISC::toLower(file));
-	string	fileName = NLMISC::CFile::getFilename(NLMISC::toLower(file));
+	string	thisPath = NLMISC::CFile::getPath(NLMISC::toLowerAscii(getDbFile()));
+	string	filePath = NLMISC::CFile::getPath(NLMISC::toLowerAscii(file));
+	string	fileName = NLMISC::CFile::getFilename(NLMISC::toLowerAscii(file));
 
 	if (thisPath == filePath)
 		return CFile::getFilenameWithoutExtension(fileName);
 	else
-		return CPath::standardizePath(filePath)+CFile::getFilenameWithoutExtension(NLMISC::toLower(file));
+		return CPath::standardizePath(filePath)+CFile::getFilenameWithoutExtension(NLMISC::toLowerAscii(file));
 }
 
 
@@ -825,7 +825,7 @@ bool	CFileNode::generateProlog()
 	if (!db->Description.empty())
 		Hpp << db->Description << "\n";
 
-	string	filename = NLMISC::toLower(CFile::getFilenameWithoutExtension(Name));
+	string	filename = NLMISC::toLowerAscii(CFile::getFilenameWithoutExtension(Name));
 
 	setEnv("fullfilename", getFullStdPathNoExt(Name));
 	setEnv("filename", filename);
@@ -870,7 +870,7 @@ bool	CFileNode::generateProlog()
 	if (SeparatedFlag)
 	{
 		string	fullfile = getFullStdPathNoExt(db->MainFile.empty() ? db->Name : db->MainFile);
-		string	filename = NLMISC::toLower(NLMISC::CFile::getFilenameWithoutExtension(fullfile));
+		string	filename = NLMISC::toLowerAscii(NLMISC::CFile::getFilenameWithoutExtension(fullfile));
 		Hpp << "#include \"" << filename << ".h\"\n";
 		Hpp << "\n";
 	}
@@ -920,7 +920,7 @@ bool	CFileNode::generateEpilog()
 	CDbNode*	db = getDbNode();
 
 	string	fullfile = getFullStdPathNoExt(Name);
-	string	filename = NLMISC::toLower(CFile::getFilenameWithoutExtension(Name));
+	string	filename = NLMISC::toLowerAscii(CFile::getFilenameWithoutExtension(Name));
 
 	Hpp.indent();
 	Hpp << "\n} // End of " << db->Name <<"\n";
@@ -948,14 +948,14 @@ bool	CFileNode::generateEpilog()
 
 string	CFileNode::getFileNoExtPath(const string& file)
 {
-	string	thisPath = NLMISC::CFile::getPath(NLMISC::toLower(Name));
-	string	filePath = NLMISC::CFile::getPath(NLMISC::toLower(file));
-	string	fileName = NLMISC::CFile::getFilename(NLMISC::toLower(file));
+	string	thisPath = NLMISC::CFile::getPath(NLMISC::toLowerAscii(Name));
+	string	filePath = NLMISC::CFile::getPath(NLMISC::toLowerAscii(file));
+	string	fileName = NLMISC::CFile::getFilename(NLMISC::toLowerAscii(file));
 
 	if (thisPath == filePath)
 		return CFile::getFilenameWithoutExtension(fileName);
 	else
-		return CFile::getFilenameWithoutExtension(NLMISC::toLower(file));
+		return CFile::getFilenameWithoutExtension(NLMISC::toLowerAscii(file));
 }
 
 void	CFileNode::writeFile()
@@ -1301,7 +1301,7 @@ bool	CEnumNode::generateContent()
 	gen.add("{");
 	gen.add("return Unknown;");
 	gen.add("}");
-	gen.add("const std::map<std::string, "+Name+">::const_iterator\tit = _ValueMap.find(NLMISC::toLower(v));");
+	gen.add("const std::map<std::string, "+Name+">::const_iterator\tit = _ValueMap.find(NLMISC::toLowerAscii(v));");
 	gen.add("if (it == _ValueMap.end())");
 	gen.add("{");
 	gen.add("nlwarning(\""+Name+"::toString(): string '%s' is not matched, 'Unknown' enum value returned\", v.c_str());");
@@ -1318,7 +1318,7 @@ bool	CEnumNode::generateContent()
 	gen.add("for (i=0; i<"+toString(Values.size())+"; ++i)");
 	gen.add("{");
 	gen.add("_StrTable["+Name+"Convert[i].Value] = "+Name+"Convert[i].Name;");
-	gen.add("_ValueMap[NLMISC::toLower(std::string("+Name+"Convert[i].Name))] = "+Name+"Convert[i].Value;");
+	gen.add("_ValueMap[NLMISC::toLowerAscii(std::string("+Name+"Convert[i].Name))] = "+Name+"Convert[i].Value;");
 	gen.add("}");
 
 	gen.add("_Initialised = true;");
diff --git a/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
index 4bbae8233..6beebb9c9 100644
--- a/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
+++ b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
@@ -180,7 +180,7 @@ int main(int argc, char* argv[])
 			if (!zonePath.empty())
 			{
 				presentZonePathes.push_back(zonePath);
-				presentZoneNames.push_back(toLower(zoneNames[l]));
+				presentZoneNames.push_back(toLowerAscii(zoneNames[l]));
 			}
 		}
 		//
diff --git a/ryzom/tools/server/build_world_packed_col/village.cpp b/ryzom/tools/server/build_world_packed_col/village.cpp
index f29486c61..87e130fd2 100644
--- a/ryzom/tools/server/build_world_packed_col/village.cpp
+++ b/ryzom/tools/server/build_world_packed_col/village.cpp
@@ -266,7 +266,7 @@ void CIGInfo::load(TShapeCache &shapeCache)
 		for(uint k = 0; k < IG->getNumInstance(); ++k)
 		{
 			std::string shapeName = standardizeShapeName(IG->getShapeName(k));			
-			if (NLMISC::toLower(CFile::getExtension(shapeName)) == "pacs_prim")
+			if (NLMISC::toLowerAscii(CFile::getExtension(shapeName)) == "pacs_prim")
 			{
 				continue;
 			}
diff --git a/ryzom/tools/skill_extractor/skill_extractor.cpp b/ryzom/tools/skill_extractor/skill_extractor.cpp
index 054d5788c..31dc00a12 100644
--- a/ryzom/tools/skill_extractor/skill_extractor.cpp
+++ b/ryzom/tools/skill_extractor/skill_extractor.cpp
@@ -311,10 +311,10 @@ sint main( sint argc, char ** argv )
 				}
 				break;
 			case 1: // code
-				skill.Code = toUpper(string( ptr ));
+				skill.Code = toUpperAscii(string( ptr ));
 				break;		
 			case 2: // parent skill
-				skill.ParentSkill = toUpper(string( ptr ));
+				skill.ParentSkill = toUpperAscii(string( ptr ));
 				break;
 			case 3: // max skill value
 				NLMISC::fromString(std::string(ptr), skill.MaxValue);
diff --git a/ryzom/tools/translation_tools/extract_new_sheet_names.cpp b/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
index 4573c5eb5..65b0e96b7 100644
--- a/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
+++ b/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
@@ -58,7 +58,7 @@ struct CSheetWordListBuilder : public IWordListBuilder
 
 	virtual bool	buildWordList(std::vector<string> &allWords, string workSheetFileName)
 	{
-		SheetExt= toLower(SheetExt);
+		SheetExt= toLowerAscii(SheetExt);
 
 		// verify the directory is correct
 		if(!CFile::isDirectory(SheetPath))
@@ -78,7 +78,7 @@ struct CSheetWordListBuilder : public IWordListBuilder
 		for(uint i=0;i<allFiles.size();i++)
 		{
 			string	fileNameWithoutExt= CFile::getFilenameWithoutExtension(allFiles[i]);
-			string	extension= toLower(CFile::getExtension(allFiles[i]));
+			string	extension= toLowerAscii(CFile::getExtension(allFiles[i]));
 			// bad extension?
 			if(extension!=SheetExt)
 				continue;
@@ -86,7 +86,7 @@ struct CSheetWordListBuilder : public IWordListBuilder
 			if(fileNameWithoutExt.empty()||fileNameWithoutExt[0]=='_')
 				continue;
 			// ok, add
-			allWords.push_back(toLower(fileNameWithoutExt));
+			allWords.push_back(toLowerAscii(fileNameWithoutExt));
 		}
 
 		return true;
@@ -168,7 +168,7 @@ struct CRegionPrimWordListBuilder : public IWordListBuilder
 					string primName;
 					if(placeRes[placeId]->getPropertyByName(listProp[cid], primName) && !primName.empty())
 					{
-						primName= toLower(primName);
+						primName= toLowerAscii(primName);
 						// avoid duplicate
 						if(allWordSet.insert(primName).second)
 						{

From cb949ae13a22db0919747626114f2f04581dce03 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 10 Nov 2020 12:10:39 +0800
Subject: [PATCH 163/292] Correct ascii behaviour in tool

---
 ryzom/tools/leveldesign/uni_conv/uni_conv.cpp | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp b/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
index d6afe9a57..554fc0f3d 100644
--- a/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
+++ b/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
@@ -17,6 +17,7 @@
 
 #include <nel/misc/types_nl.h>
 #include <nel/misc/ucstring.h>
+#include <nel/misc/utf_string_view.h>
 #include <nel/misc/common.h>
 #include <nel/misc/sstring.h>
 #include <nel/misc/i18n.h>
@@ -76,21 +77,10 @@ int main(int argc, char *argv[])
 	ucstring	str;
 	CI18N::readTextFile(inputFile, str, false, false);
 
-	if (outMode == ASCII)
-	{
-		// remove any outof ascii char
-		ucstring temp;
-		for (uint i=0; i<str.size(); ++i)
-		{
-			if (str[i] < 256)
-				temp += str[i];
-		}
-		str = temp;
-	}
-
 	if (xmlSupport)
 	{
 		ucstring temp;
+		temp.reserve(str.size());
 		for (uint i=0; i<str.size(); ++i)
 		{
 			switch(str[i])
@@ -121,9 +111,16 @@ int main(int argc, char *argv[])
 		break;
 	case ASCII:
 		{
-			string s = str.toString();
+			std::string res;
+			res.reserve(str.size());
+			for (ucstring::const_iterator it(str.begin()), end(str.end()); it != end; ++it)
+			{
+				ucchar c = *it;
+				if (c < 0x80)
+					res += (char)c;
+			}
 			FILE *fp = nlfopen(outputFile, "wt");
-			fwrite(s.data(), s.size(), 1, fp);
+			fwrite(res.data(), res.size(), 1, fp);
 			fclose(fp);
 		}
 		break;

From 5fed277adfe726ff3b8e3fd714e48c70d74d12d7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 10 Nov 2020 13:06:43 +0800
Subject: [PATCH 164/292] Cleanup

---
 nel/include/nel/misc/common.h    |   2 +
 nel/src/misc/string_to_ci.cpp    | 110 +++++++++++++++++++++++++++++++
 nel/src/misc/string_to_lower.cpp |   4 +-
 nel/src/misc/string_to_upper.cpp |   4 +-
 4 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index 637c3c800..d9edc8e14 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -257,6 +257,8 @@ int compareCaseInsensitive(const char *a, const char *b);
 int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB);
 inline int compareCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()); }
 inline bool ltCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()) < 0; }
+std::string	toCaseInsensitive(const char *str); // UTF-8, case-insensitive toLower
+std::string	toCaseInsensitive(const std::string &str); // UTF-8, case-insensitive toLower
 
 /** ASCII to lowercase. Useful for internal identifiers.
 * Characters outside of the 7-bit ASCII space, and control characters, are replaced.
diff --git a/nel/src/misc/string_to_ci.cpp b/nel/src/misc/string_to_ci.cpp
index bdde3df23..1aeb36da2 100644
--- a/nel/src/misc/string_to_ci.cpp
+++ b/nel/src/misc/string_to_ci.cpp
@@ -2740,4 +2740,114 @@ int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t len
 
 // ***************************************************************************
 
+NL_FORCE_INLINE void appendToCaseInsensitiveAsUtf8(std::string &res, const char *str, ptrdiff_t &i)
+{
+	unsigned char c = str[i];
+	unsigned char d, e, f;
+	if (c < 0x80)
+	{
+		if (c >= 'A' && c <= 'Z')
+		{
+			// 1-byte UTF-8
+			c += 'a' - 'A';
+		}
+	}
+	else if (c < 0xC0)
+	{
+		// non-starting byte
+	}
+	else if (c < 0xE0)
+	{
+		// 2-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80)
+		{
+			const char *table = s_StringToCaseInsensitiveMap[c & 0x1F];
+			if (table)
+			{
+				unsigned char idx = (d & 0x3F) << 2;
+				if (table[idx])
+				{
+					res += &table[idx];
+					i += 2;
+					return;
+				}
+			}
+		}
+	}
+	else if (c < 0xF0)
+	{
+		// 3-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80)
+		{
+			const char **map = s_StringToCaseInsensitiveMapMap[c & 0x0F];
+			if (map)
+			{
+				const char *table = map[d & 0x3F];
+				if (table)
+				{
+					unsigned char idx = (e & 0x3F) << 2;
+					if (table[idx])
+					{
+						res += &table[idx];
+						i += 3;
+						return;
+					}
+				}
+			}
+		}
+	}
+	else if (c < 0xF8)
+	{
+		// 4-byte UTF-8
+		if (((d = str[i + 1]) & 0xC0) == 0x80 && ((e = str[i + 2]) & 0xC0) == 0x80 && ((f = str[i + 3]) & 0xC0) == 0x80)
+		{
+			const char ***mapMap = s_StringToCaseInsensitiveMapMapMap[c & 0x07];
+			if (mapMap)
+			{
+				const char **map = mapMap[d & 0x3F];
+				if (map)
+				{
+					const char *table = map[e & 0x3F];
+					if (table)
+					{
+						unsigned char idx = (f & 0x3F) << 2;
+						if (table[idx])
+						{
+							res += &table[idx];
+							i += 4;
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+	res += c;
+	++i;
+}
+
+// ***************************************************************************
+
+std::string toCaseInsensitive(const char *str)
+{
+	// UTF-8 toCaseInsensitive
+	std::string res;
+	for (ptrdiff_t i = 0; str[i];)
+		appendToCaseInsensitiveAsUtf8(res, str, i);
+	return res;
+}
+
+// ***************************************************************************
+
+std::string	toCaseInsensitive(const std::string &str)
+{
+	// UTF-8 toCaseInsensitive
+	std::string res;
+	res.reserve(str.size() + (str.size() >> 2));
+	const char *cstr = &str[0];
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)str.size();)
+		appendToCaseInsensitiveAsUtf8(res, cstr, i);
+	return res;
+}
+
 } // NLMISC
diff --git a/nel/src/misc/string_to_lower.cpp b/nel/src/misc/string_to_lower.cpp
index cd40abe88..d20dd015f 100644
--- a/nel/src/misc/string_to_lower.cpp
+++ b/nel/src/misc/string_to_lower.cpp
@@ -2530,7 +2530,7 @@ NL_FORCE_INLINE void appendToLowerAsUtf8(std::string &res, const char *str, ptrd
 
 std::string toLower(const char *str)
 {
-	// UTF-8 toLower, tables generated from UTF-16 tables
+	// UTF-8 toLower
 	std::string res;
 	for (ptrdiff_t i = 0; str[i];)
 		appendToLowerAsUtf8(res, str, i);
@@ -2541,7 +2541,7 @@ std::string toLower(const char *str)
 
 std::string	toLower(const std::string &str)
 {
-	// UTF-8 toLower, tables generated from UTF-16 tables
+	// UTF-8 toLower
 	std::string res;
 	res.reserve(str.size() + (str.size() >> 2));
 	const char *cstr = &str[0];
diff --git a/nel/src/misc/string_to_upper.cpp b/nel/src/misc/string_to_upper.cpp
index eb037969c..eefd0c6c6 100644
--- a/nel/src/misc/string_to_upper.cpp
+++ b/nel/src/misc/string_to_upper.cpp
@@ -2624,7 +2624,7 @@ static const char ***s_StringToUpperMapMapMap[8] = {
 
 std::string toUpper(const char *str)
 {
-	// UTF-8 toLower, tables generated from UTF-16 tables
+	// UTF-8 toLower
 	std::string res;
 	for (ptrdiff_t i = 0; str[i];)
 		appendToUpperAsUtf8(res, str, i);
@@ -2635,7 +2635,7 @@ std::string toUpper(const char *str)
 
 std::string	toUpper(const std::string &str)
 {
-	// UTF-8 toLower, tables generated from UTF-16 tables
+	// UTF-8 toLower
 	std::string res;
 	res.reserve(str.size() + (str.size() >> 2));
 	const char *cstr = &str[0];

From b884360c0eb354a9f5edfa3b4d8dbf5b32971f82 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 11 Nov 2020 09:42:29 +0800
Subject: [PATCH 165/292] Add template for pointer with deep copy and move
 semantics

---
 nel/include/nel/misc/deep_ptr.h | 72 +++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 nel/include/nel/misc/deep_ptr.h

diff --git a/nel/include/nel/misc/deep_ptr.h b/nel/include/nel/misc/deep_ptr.h
new file mode 100644
index 000000000..f7bbd9083
--- /dev/null
+++ b/nel/include/nel/misc/deep_ptr.h
@@ -0,0 +1,72 @@
+// NeL - MMORPG Framework <https://wiki.ryzom.dev/>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NLMISC_DEEP_PTR_H
+#define NLMISC_DEEP_PTR_H
+
+#include <nel/misc/types_nl.h>
+
+namespace NLMISC {
+
+/// Pointer template with deep copy and move semantics
+template<class T>
+class CDeepPtr
+{
+public:
+	NL_FORCE_INLINE CDeepPtr() : m(NULL) { } //< Null
+	NL_FORCE_INLINE ~CDeepPtr() { delete m; }
+
+	NL_FORCE_INLINE CDeepPtr(const CDeepPtr &p) : m(p.m ? new T(*p) : NULL) { } //< Copy operator
+	NL_FORCE_INLINE CDeepPtr &operator=(const CDeepPtr &p) { if (p.m) { if (!m) m = new T(*p); else *m = *p; } else { delete m; m = NULL; } return *this; } //< Copy operator
+
+#ifdef NL_CPP14
+	NL_FORCE_INLINE CDeepPtr(CDeepPtr &&p) noexcept : m(p.m) { p.m = NULL; } //< Move operator
+	NL_FORCE_INLINE CDeepPtr &operator=(CDeepPtr &&p) noexcept { delete m; m = p.m; p.m = NULL; return *this; } //< Move operator
+#endif
+
+	NL_FORCE_INLINE CDeepPtr(T *p) : m(p) { } //< Initializer
+	NL_FORCE_INLINE CDeepPtr &operator=(T *p) { delete m; m = p; return *this; } //< Initializer
+
+	NL_FORCE_INLINE bool operator==(const CDeepPtr &p) const { return (m == p.m) || (m && p.m && *m == *p); }
+	NL_FORCE_INLINE bool operator!=(const CDeepPtr &p) const { return !(*this == p); }
+
+	NL_FORCE_INLINE bool operator==(const T *p) const { return (m == p) || (m && p && *m == *p); }
+	NL_FORCE_INLINE bool operator!=(const T *p) const { return !(*this == p); }
+
+	NL_FORCE_INLINE bool operator==(int p) const { return (*this == (const T *)(ptrdiff_t)p); } //< == 0
+	NL_FORCE_INLINE bool operator!=(int p) const { return (*this != (const T *)(ptrdiff_t)p); } //< != 0
+
+	NL_FORCE_INLINE T &operator*() { return *m; }
+	NL_FORCE_INLINE const T &operator*() const { return *m; }
+	NL_FORCE_INLINE T *operator->() { return m; }
+	NL_FORCE_INLINE const T *operator->() const { return m; }
+
+	NL_FORCE_INLINE operator bool() const { return m; }
+	NL_FORCE_INLINE bool operator!() const { return !m; }
+
+	NL_FORCE_INLINE T *ptr() { return m; }
+	NL_FORCE_INLINE const T *ptr() const { return m; }
+
+private:
+	T *m;
+
+};
+
+} /* namespace NLMISC */
+
+#endif /* #ifndef NLMISC_DEEP_PTR_H */
+
+/* end of file */

From 66ef424af0c5e10cb5465f44a679c0d72dff71cb Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 11 Nov 2020 10:15:37 +0800
Subject: [PATCH 166/292] Add template for pointer with deep copy and move
 semantics

---
 nel/include/nel/misc/deep_ptr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/include/nel/misc/deep_ptr.h b/nel/include/nel/misc/deep_ptr.h
index f7bbd9083..f0b5b1f79 100644
--- a/nel/include/nel/misc/deep_ptr.h
+++ b/nel/include/nel/misc/deep_ptr.h
@@ -40,7 +40,7 @@ public:
 	NL_FORCE_INLINE CDeepPtr(T *p) : m(p) { } //< Initializer
 	NL_FORCE_INLINE CDeepPtr &operator=(T *p) { delete m; m = p; return *this; } //< Initializer
 
-	NL_FORCE_INLINE bool operator==(const CDeepPtr &p) const { return (m == p.m) || (m && p.m && *m == *p); }
+	NL_FORCE_INLINE bool operator==(const CDeepPtr &p) const { return /* (m == p.m) || */ (m && p.m && *m == *p); }
 	NL_FORCE_INLINE bool operator!=(const CDeepPtr &p) const { return !(*this == p); }
 
 	NL_FORCE_INLINE bool operator==(const T *p) const { return (m == p) || (m && p && *m == *p); }

From 14da4d1e615b59332dfcb68eb12467f213eb928b Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 11 Nov 2020 10:42:28 +0800
Subject: [PATCH 167/292] Stricter UTF-8, so ascii characters can't get encoded
 as multi-bytes and pass validations

---
 nel/src/misc/utf_string_view.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nel/src/misc/utf_string_view.cpp b/nel/src/misc/utf_string_view.cpp
index 283ef9555..8808930b4 100644
--- a/nel/src/misc/utf_string_view.cpp
+++ b/nel/src/misc/utf_string_view.cpp
@@ -287,6 +287,12 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 								// Replacement character �
 								return 0xFFFD;
 							}
+							else if (c0 < 0x10000)
+							{
+								// Invalid encoding
+								// Replacement character �
+								return 0xFFFD;
+							}
 						}
 						else
 						{
@@ -320,6 +326,12 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 						// Replacement character �
 						return 0xFFFD;
 					}
+					else if (c0 < 0x0800)
+					{
+						// Invalid encoding
+						// Replacement character �
+						return 0xFFFD;
+					}
 				}
 				else
 				{
@@ -327,6 +339,12 @@ u32char CUtfStringView::utf8Iterator(const void **addr)
 					return 0xFFFD;
 				}
 			}
+			else if (c0 < 0x80)
+			{
+				// Invalid encoding
+				// Replacement character �
+				return 0xFFFD;
+			}
 		}
 		else
 		{

From 2e0b00d93cc92819e2a9dd8acb15f61066c6c22f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 11 Nov 2020 13:42:20 +0800
Subject: [PATCH 168/292] Keep a spare memory block in fixed size allocator to
 avoid large allocation overhead on the chunk boundary

---
 nel/include/nel/misc/fixed_size_allocator.h |  1 +
 nel/src/misc/fixed_size_allocator.cpp       | 38 +++++++++++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/nel/include/nel/misc/fixed_size_allocator.h b/nel/include/nel/misc/fixed_size_allocator.h
index e00809344..1f49dfa68 100644
--- a/nel/include/nel/misc/fixed_size_allocator.h
+++ b/nel/include/nel/misc/fixed_size_allocator.h
@@ -107,6 +107,7 @@ private:
 	uint	_NumBlockPerChunk;
 	//
 	uint	_NumAlloc;
+	uint8	*_SpareMem;
 };
 
 } // NLMISC
diff --git a/nel/src/misc/fixed_size_allocator.cpp b/nel/src/misc/fixed_size_allocator.cpp
index 7a082b8d8..6784aff66 100644
--- a/nel/src/misc/fixed_size_allocator.cpp
+++ b/nel/src/misc/fixed_size_allocator.cpp
@@ -41,6 +41,7 @@ CFixedSizeAllocator::CFixedSizeAllocator(uint numBytesPerBlock, uint numBlockPer
 	nlassert(_NumBytesPerBlock >= numBytesPerBlock);
 	_NumBlockPerChunk = std::max(numBlockPerChunk, (uint) 3);
 	_NumAlloc = 0;
+	_SpareMem = NULL;
 }
 
 // *****************************************************************************************************************
@@ -48,16 +49,22 @@ CFixedSizeAllocator::~CFixedSizeAllocator()
 {
 	if (_NumAlloc != 0)
 	{
-		#ifdef NL_DEBUG
-			nlwarning("%d blocks were not freed", (int) _NumAlloc);
-		#endif
-		return;
+#ifdef NL_DEBUG
+		nlwarning("%d blocks were not freed, leaking memory", (int) _NumAlloc);
+#endif
+	}
+	else
+	{
+		if (_NumChunks > 0)
+		{
+			nlassert(_NumChunks == 1);
+			// delete the left chunk. This should force all the left nodes to be removed from the empty list
+			delete _FreeSpace->Chunk;
+		}
 	}
-	if (_NumChunks > 0)
+	if (_SpareMem)
 	{
-		nlassert(_NumChunks == 1);
-		// delete the left chunk. This should force all the left nodes to be removed from the empty list
-		delete _FreeSpace->Chunk;
+		aligned_free(_SpareMem);
 	}
 }
 
@@ -115,7 +122,10 @@ CFixedSizeAllocator::CChunk::~CChunk()
 	nlassert(NumFreeObjs == 0);
 	nlassert(Allocator->_NumChunks > 0);
 	-- (Allocator->_NumChunks);
-	aligned_free(Mem); //delete[] Mem;
+	if (Allocator->_SpareMem)
+		aligned_free(Mem); //delete[] Mem;
+	else
+		Allocator->_SpareMem = Mem;
 }
 
 // *****************************************************************************************************************
@@ -125,7 +135,15 @@ void CFixedSizeAllocator::CChunk::init(CFixedSizeAllocator *alloc)
 	nlassert(alloc != NULL);
 	Allocator = alloc;
 	//
-	Mem = (uint8 *)aligned_malloc(getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk(), NL_DEFAULT_MEMORY_ALIGNMENT); // new uint8[getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk()];
+	if (Allocator->_SpareMem)
+	{
+		Mem = Allocator->_SpareMem;
+		Allocator->_SpareMem = NULL;
+	}
+	else
+	{
+		Mem = (uint8 *)aligned_malloc(getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk(), NL_DEFAULT_MEMORY_ALIGNMENT); // new uint8[getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk()];
+	}
 	//
 	getNode(0).Chunk = this;
 	getNode(0).Next = &getNode(1);

From f9cc9a1abedfffba8d5aa0a6c80dc1cf2a6baffa Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 12 Nov 2020 15:35:02 +0800
Subject: [PATCH 169/292] Fix build

---
 nel/include/nel/misc/deep_ptr.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nel/include/nel/misc/deep_ptr.h b/nel/include/nel/misc/deep_ptr.h
index f0b5b1f79..76493c6e4 100644
--- a/nel/include/nel/misc/deep_ptr.h
+++ b/nel/include/nel/misc/deep_ptr.h
@@ -46,9 +46,20 @@ public:
 	NL_FORCE_INLINE bool operator==(const T *p) const { return (m == p) || (m && p && *m == *p); }
 	NL_FORCE_INLINE bool operator!=(const T *p) const { return !(*this == p); }
 
+	NL_FORCE_INLINE bool operator==(const T &p) const { return (m == &p) || (m && *m == p); }
+	NL_FORCE_INLINE bool operator!=(const T &p) const { return !(*this == p); }
+
+	NL_FORCE_INLINE bool operator==(long int p) const { return (*this == (const T *)(ptrdiff_t)p); } //< == NULL
+	NL_FORCE_INLINE bool operator!=(long int p) const { return (*this != (const T *)(ptrdiff_t)p); } //< != NULL
+
 	NL_FORCE_INLINE bool operator==(int p) const { return (*this == (const T *)(ptrdiff_t)p); } //< == 0
 	NL_FORCE_INLINE bool operator!=(int p) const { return (*this != (const T *)(ptrdiff_t)p); } //< != 0
 
+#ifdef NL_CPP14
+	NL_FORCE_INLINE bool operator==(nullptr_t p) const { return (*this == (const T *)(ptrdiff_t)p); } //< == nullptr
+	NL_FORCE_INLINE bool operator!=(nullptr_t p) const { return (*this != (const T *)(ptrdiff_t)p); } //< != nullptr
+#endif
+
 	NL_FORCE_INLINE T &operator*() { return *m; }
 	NL_FORCE_INLINE const T &operator*() const { return *m; }
 	NL_FORCE_INLINE T *operator->() { return m; }

From 470b48ea0dc0ec461694c2a82cbb2761ad69db60 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 21 Nov 2020 00:29:34 +0800
Subject: [PATCH 170/292] Fix Max version

---
 nel/tools/3d/ligo/plugin_max/version.rc2                  | 4 ++++
 nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2     | 4 ++++
 nel/tools/3d/plugin_max/nel_patch_converter/version.rc2   | 4 ++++
 nel/tools/3d/plugin_max/nel_patch_edit/version.rc2        | 4 ++++
 nel/tools/3d/plugin_max/nel_patch_paint/version.rc2       | 4 ++++
 nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2 | 4 ++++
 nel/tools/3d/plugin_max/tile_utility/version.rc2          | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/nel/tools/3d/ligo/plugin_max/version.rc2 b/nel/tools/3d/ligo/plugin_max/version.rc2
index 56dbaa448..70ff66abb 100644
--- a/nel/tools/3d/ligo/plugin_max/version.rc2
+++ b/nel/tools/3d/ligo/plugin_max/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2 b/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
index d584d0982..ccda8e6e8 100644
--- a/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
+++ b/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
index 57004f301..aabed0e99 100644
--- a/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
+++ b/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
index 92d5dada7..72d296cb2 100644
--- a/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
+++ b/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
index 080d0e24c..abbdc69df 100644
--- a/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
+++ b/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2 b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
index 669cb1c15..dd205b8a1 100644
--- a/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
+++ b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else
diff --git a/nel/tools/3d/plugin_max/tile_utility/version.rc2 b/nel/tools/3d/plugin_max/tile_utility/version.rc2
index 2c4d7869a..c3069afe5 100644
--- a/nel/tools/3d/plugin_max/tile_utility/version.rc2
+++ b/nel/tools/3d/plugin_max/tile_utility/version.rc2
@@ -12,6 +12,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
+#ifndef MAX_PRODUCT_YEAR_NUMBER
+#define MAX_PRODUCT_YEAR_NUMBER MAX_VERSION_MAJOR
+#endif
+
 #ifdef _DEBUG
 #define NL_FILEEXT "_d"
 #else

From b1ef06d9009a7d66da738189c4df6ccb1bb38fcf Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 22 Nov 2020 03:55:50 +0800
Subject: [PATCH 171/292] These asserts don't make sense

---
 nel/src/3d/render_trav.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nel/src/3d/render_trav.cpp b/nel/src/3d/render_trav.cpp
index 1b7e8e84e..a1e1b69be 100644
--- a/nel/src/3d/render_trav.cpp
+++ b/nel/src/3d/render_trav.cpp
@@ -921,7 +921,7 @@ void		CRenderTrav::changeVPLightSetupMaterial(const CMaterial &mat, bool exclude
 		Driver->setUniform4f(IDriver::VertexProgram, program->idxLighted().Diffuse[i], color);
 	}
 
-	nlassert(_VPNumLights < MaxVPLight);
+	nlassert(_VPNumLights <= MaxVPLight);
 	if (i != _VPNumLights)
 	{
 		color= _VPLightDiffuse[i] * matDiff;
@@ -1240,7 +1240,7 @@ std::string		CRenderTrav::getLightVPFragmentNeLVP(uint numActivePointLights, uin
 
 	// Code frag written for 4 light max.
 	nlassert(MaxVPLight==4);
-	nlassert(numActivePointLights<=MaxVPLight-1);
+	nlassert(numActivePointLights<=MaxVPLight);
 
 	// Add LightingVPFragmentNormalize fragment?
 	if(normalize)

From f3f67af69ee554ed07579554140e63a66b924f21 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 22 Nov 2020 11:07:45 +0200
Subject: [PATCH 172/292] Added: form,formaction attributes to submit button

---
 nel/src/gui/group_html.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 6694200bf..6c27461f4 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -5417,7 +5417,7 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::insertFormImageButton(const std::string &name, const std::string &tooltip, const std::string &src, const std::string &over, const std::string &formId, const std::string &action, uint32 minWidth, const std::string &templateName)
 	{
-		_FormSubmit.push_back(SFormSubmitButton(formId, name, "", "image"));
+		_FormSubmit.push_back(SFormSubmitButton(formId, name, "", "image", action));
 		// Action handler parameters
 		std::string param = "name=" + getId() + "|button=" + toString(_FormSubmit.size()-1);
 
@@ -5428,7 +5428,7 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::insertFormTextButton(const std::string &name, const std::string &tooltip, const std::string &value, const std::string &formId, const std::string &formAction, uint32 minWidth, const std::string &templateName)
 	{
-		_FormSubmit.push_back(SFormSubmitButton(formId, name, value, "submit"));
+		_FormSubmit.push_back(SFormSubmitButton(formId, name, value, "submit", formAction));
 		// Action handler parameters
 		string param = "name=" + getId() + "|button=" + toString(_FormSubmit.size()-1);
 
@@ -6065,16 +6065,27 @@ namespace NLGUI
 			string name = elm.getAttribute("name");
 			string src = elm.getAttribute("src");
 			string over = elm.getAttribute("data-over-src");
+			string formId = elm.getAttribute("form");
+			string formAction = elm.getAttribute("formaction");
 
-			insertFormImageButton(name, tooltip, src, over, _Forms.back().id, "", minWidth, templateName);
+			if (formId.empty() && _FormOpen) {
+				formId = _Forms.back().id;
+			}
+
+			insertFormImageButton(name, tooltip, src, over, formId, formAction, minWidth, templateName);
 		}
 		else if (type == "button" || type == "submit")
 		{
-			// The submit button
 			string name = elm.getAttribute("name");
 			string value = elm.getAttribute("value");
+			string formId = elm.getAttribute("form");
+			string formAction = elm.getAttribute("formaction");
+
+			if (formId.empty() && _FormOpen) {
+				formId = _Forms.back().id;
+			}
 
-			insertFormTextButton(name, tooltip, value, _Forms.back().id, "", minWidth, templateName);
+			insertFormTextButton(name, tooltip, value, formId, formAction, minWidth, templateName);
 		}
 		else if (type == "text")
 		{

From 23110247de0c8f637014480ef146a9e540213464 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 24 Nov 2020 03:58:29 +0800
Subject: [PATCH 173/292] Script for rebuilding ring landscapes

---
 nel/tools/build_gamedata/ring_landscape_dev.bat | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 nel/tools/build_gamedata/ring_landscape_dev.bat

diff --git a/nel/tools/build_gamedata/ring_landscape_dev.bat b/nel/tools/build_gamedata/ring_landscape_dev.bat
new file mode 100644
index 000000000..2bcac4dc1
--- /dev/null
+++ b/nel/tools/build_gamedata/ring_landscape_dev.bat
@@ -0,0 +1,15 @@
+title Ryzom Core: 0_setup.py (RING LANDSCAPE)
+0_setup.py --noconf -ipj continents/r2_desert continents/r2_forest continents/r2_jungle continents/r2_lakes continents/r2_roots
+title Ryzom Core: 1_export.py (RING LANDSCAPE)
+1_export.py -ipj continents/r2_desert continents/r2_forest continents/r2_jungle continents/r2_lakes continents/r2_roots
+title Ryzom Core: 2_build.py (RING LANDSCAPE)
+2_build.py -ipj continents/r2_desert continents/r2_forest continents/r2_jungle continents/r2_lakes continents/r2_roots
+title Ryzom Core: 3_install.py (RING LANDSCAPE)
+3_install.py -ipj continents/r2_desert continents/r2_forest continents/r2_jungle continents/r2_lakes continents/r2_roots
+title Ryzom Core: a1_worldedit_data.py (RING LANDSCAPE)
+a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py (RING LANDSCAPE)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (RING LANDSCAPE)
+b2_shard_data.py
+title Ryzom Core: Ready (RING LANDSCAPE)

From 47d6e0909947bd234df1a9154463139a3e1fbfdb Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 07:50:31 +0800
Subject: [PATCH 174/292] Tool for reverse building flora primitive, load
 plants, ryzom/ryzomcore#621

---
 nel/tools/ligo/CMakeLists.txt                 |   3 +
 nel/tools/ligo/unbuild_flora/CMakeLists.txt   |  11 +
 nel/tools/ligo/unbuild_flora/gold_pill.ico    | Bin 0 -> 3638 bytes
 nel/tools/ligo/unbuild_flora/main.rc          |  42 +++
 .../ligo/unbuild_flora/unbuild_flora.cpp      | 259 ++++++++++++++++++
 5 files changed, 315 insertions(+)
 create mode 100644 nel/tools/ligo/unbuild_flora/CMakeLists.txt
 create mode 100644 nel/tools/ligo/unbuild_flora/gold_pill.ico
 create mode 100644 nel/tools/ligo/unbuild_flora/main.rc
 create mode 100644 nel/tools/ligo/unbuild_flora/unbuild_flora.cpp

diff --git a/nel/tools/ligo/CMakeLists.txt b/nel/tools/ligo/CMakeLists.txt
index 9a7f24ebe..230e4c74a 100644
--- a/nel/tools/ligo/CMakeLists.txt
+++ b/nel/tools/ligo/CMakeLists.txt
@@ -2,5 +2,8 @@
 IF(WITH_LIGO)
   IF(WITH_3D)
     ADD_SUBDIRECTORY(unbuild_land)
+    IF(WITH_GEORGES)
+      ADD_SUBDIRECTORY(unbuild_flora)
+    ENDIF()
   ENDIF()
 ENDIF()
diff --git a/nel/tools/ligo/unbuild_flora/CMakeLists.txt b/nel/tools/ligo/unbuild_flora/CMakeLists.txt
new file mode 100644
index 000000000..6c9dc99c4
--- /dev/null
+++ b/nel/tools/ligo/unbuild_flora/CMakeLists.txt
@@ -0,0 +1,11 @@
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(nl_unbuild_flora ${SRC})
+
+TARGET_LINK_LIBRARIES(nl_unbuild_flora nel3d nelmisc nelligo nelgeorges)
+NL_DEFAULT_PROPS(nl_unbuild_flora "NeL, Tools, Ligo: Unbuild Flora")
+NL_ADD_RUNTIME_FLAGS(nl_unbuild_flora)
+
+INSTALL(TARGETS nl_unbuild_flora RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsligo)
diff --git a/nel/tools/ligo/unbuild_flora/gold_pill.ico b/nel/tools/ligo/unbuild_flora/gold_pill.ico
new file mode 100644
index 0000000000000000000000000000000000000000..618b67a5d196bdbdc4d497a3b7ca998b79039677
GIT binary patch
literal 3638
zcmeH|zityj5XQf`vv2R8lRF0=!64zvLOcRZ@(47%1EO$G<y3BvC=dmeJERCY3R7Z1
z6-9EIP(hItF%<}j0;ram-97svCk9a=bU$gezMXG(*0a(#0Kr3+f#(qSn?N5xuV=sa
zL*Oy5-QqQtfR~Mqr^~r>7suZ;o}Ow9KWIF7uW|24qu=jCYmGObHC}wun9t{!&1Sg$
zP6MyLV>})M&yFz~jWC%^fQS2+=cprf1?md?hZP`8`Oj#}K*|8hER?sITv4;NA<$;R
zq>3WH(P#z%rJ<n63%w|cV@l*RRUpqdad#fO+4+2B-oKpL-q_=oV>$%(X!S5zlUP+N
zzr|;JJa&1AAFqXdR(y5mKwA%eZ9P`}w)9@{Sn*u(Tk&M^-mm(n@m=v)<GIhzjQ?W%
z(ReRjelb3bCx;je2Ee1YwHL2_h&otTpsv6_R{>}3W?H=*(Tyb(EO1J?UWK}aqZ<UG
zpzSKxsK_1dqALRGT&>Wd!Zofe&kK&zR)e`x(xG<j$TAU7!}pZ5DhK7#--I~J+Z^{*
z6oye0aUb&-%52mMIPOJhtF@7uHpsF{Jc)C;K-fw)ZSNEj#f$w(Z0@hje(9Q$W+e_%
z=khQ2+xl<@(`w86FUl*2JJ!EXsjBA-D!@JcxBS3Rp8z+ffZ79m8Q^!Rj&gm<niJN_
Ho<HFiPbAmK

literal 0
HcmV?d00001

diff --git a/nel/tools/ligo/unbuild_flora/main.rc b/nel/tools/ligo/unbuild_flora/main.rc
new file mode 100644
index 000000000..b01178a11
--- /dev/null
+++ b/nel/tools/ligo/unbuild_flora/main.rc
@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Unbuild Flora"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "nl_unbuild_flora" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
new file mode 100644
index 000000000..7aeb404b4
--- /dev/null
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -0,0 +1,259 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// This utility is intended to rescue a lost flora .primitive file.
+// It only recovers the generated flora positions, it cannot recover
+// the flora zones.
+//
+// Author: Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+
+// #include "../../3d/zone_lib/zone_utility.h"
+
+#include <iostream>
+
+#include <nel/misc/types_nl.h>
+#include <nel/misc/file.h>
+//#include <nel/misc/o_xml.h>
+#include <nel/misc/common.h>
+#include <nel/misc/cmd_args.h>
+//#include <nel/misc/bitmap.h>
+
+#include <nel/georges/u_form.h>
+#include <nel/georges/u_form_elm.h>
+#include <nel/georges/u_form_loader.h>
+
+//#include <nel/3d/quad_tree.h>
+//#include <nel/3d/zone.h>
+//#include <nel/3d/landscape.h>
+//#include <nel/3d/zone_smoother.h>
+//#include <nel/3d/zone_tgt_smoother.h>
+//#include <nel/3d/zone_corner_smoother.h>
+//#include <nel/ligo/zone_region.h>
+#include <nel/3d/scene_group.h>
+
+#include <vector>
+//#include <set>
+#include <map>
+
+using namespace std;
+using namespace NLMISC;
+//using namespace NL3D;
+using namespace NLGEORGES;
+//using namespace NLLIGO;
+
+namespace /* anonymous */
+{
+
+/*
+
+Process:
+- Load all .plant sheets, map from .shape to .plant and bounding radius
+- Load all source igs
+- Load all reference igs, remove matching entries from source igs
+- Generate primitives
+
+*/
+
+std::string s_DfnDir; /* R:\leveldesign\DFN */
+std::string s_LeveldesignDir; /* R:\leveldesign\game_elem\plant\ecosystem */
+std::string s_SourceDir; /* R:\reference\2008_july\data\r2_desert2 */
+std::string s_ReferenceDir; /* R:\pipeline\export\continents\r2_desert\zone_lighted_ig_land */
+std::string s_PrimitiveFile; /* R:\graphics\primitive\r2_desert\r2_desert.primitive */
+
+/*
+
+Debug arguments:
+
+"R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_desert2" "R:\pipeline\export\continents\r2_desert\zone_lighted_ig_land" "R:\graphics\primitive\r2_desert\r2_desert.primitive"
+
+*/
+
+struct CPoint
+{
+	CVector Pos; /* Position, height not necessarily specified (X="26218.738281" Y="-1092.078979" Z="0.000000") */
+	float Angle; /* (2.827213) */
+	std::string Form; /* (FY_S2_savantree_B) */
+	std::string Name; /* Generated unique name (ilot_008_savantree 13) */
+	float Radius; /* Bounding radius (from plant sheet and scale) (0.450252) */
+	float Scale; /* Scale (0.643217) */
+};
+
+/*
+<CHILD TYPE="CPrimPoint">
+	<PT X="26060.041016" Y="-1033.684692" Z="0.000000"/>
+	<ANGLE VALUE="4.806300"/>
+	<PROPERTY TYPE="string">
+		<NAME>class</NAME>
+		<STRING>prim</STRING>
+	</PROPERTY>
+	<PROPERTY TYPE="string">
+		<NAME>form</NAME>
+		<STRING>FY_S2_savantree_B</STRING>
+	</PROPERTY>
+	<PROPERTY TYPE="string">
+		<NAME>layer</NAME>
+		<STRING>0</STRING>
+	</PROPERTY>
+	<PROPERTY TYPE="string">
+		<NAME>name</NAME>
+		<STRING>ilot_008_savantree 15</STRING>
+	</PROPERTY>
+	<PROPERTY TYPE="string">
+		<NAME>radius</NAME>
+		<STRING>0.784730</STRING>
+	</PROPERTY>
+	<PROPERTY TYPE="string">
+		<NAME>scale</NAME>
+		<STRING>1.121043</STRING>
+	</PROPERTY>
+</CHILD>
+*/
+
+/*
+* <?xml version="1.0"?>
+<PRIMITIVES VERSION="1">
+	<ROOT_PRIMITIVE TYPE="CPrimNode">
+		<ALIAS LAST_GENERATED="0"/>
+		<CHILD TYPE="CPrimNode">
+			<PROPERTY TYPE="string">
+				<NAME>class</NAME>
+				<STRING>flora</STRING>
+			</PROPERTY>
+			<PROPERTY TYPE="string">
+				<NAME>name</NAME>
+				<STRING>R2 flora 1</STRING>
+			</PROPERTY>
+			<CHILD ... />
+			<CHILD ... />
+			<CHILD ... />
+			...
+		</CHILD>
+	</ROOT_PRIMITIVE>
+</PRIMITIVES>
+*/
+
+/*
+instance fy_s2_savantree_c.shape : x = 23031.2, y = -1269.2, z = 75.8, sx = 0.5, sy = 0.5, sz = 0.5
+instance fy_s2_savantree_c.shape : x = 22906.6, y = -1148.1, z = 79.6, sx = 0.6, sy = 0.6, sz = 0.6
+*/
+
+struct CPlant
+{
+	std::string Form;
+	std::string Shape;
+	float Radius;
+};
+
+std::map<std::string, CPlant> s_ShapeToForm;
+
+bool loadLeveldesign()
+{
+	UFormLoader *formLoader = UFormLoader::createLoader();
+	struct CRel0 { CRel0(UFormLoader *v) : m(v) {} ~CRel0() { UFormLoader::releaseLoader(m); } UFormLoader *m; } rel0(formLoader);
+
+	std::vector<std::string> plants;
+	CPath::getFileList("plant", plants);
+
+	for (std::vector<std::string>::iterator it(plants.begin()), end(plants.end()); it != end; ++it)
+	{
+		printf("%s\n", (*it).c_str());
+		CSmartPtr <UForm> form = formLoader->loadForm(*it);
+		if (!form)
+			continue;
+		CPlant plant;
+		plant.Form = toLowerAscii(*it);
+		if (!form->getRootNode().getValueByName(plant.Shape, "3D.Shape"))
+			continue;
+		if (plant.Shape.empty())
+		{
+			if (!form->getRootNode().getValueByName(plant.Shape, "3D.SpringFX.FXName"))
+				continue;
+		}
+		if (plant.Shape.empty())
+			continue;
+		plant.Shape.c_str();
+		toLowerAscii(&plant.Shape[0]);
+		if (!form->getRootNode().getValueByName(plant.Radius, "3D.Bounding Radius"))
+			continue;
+		printf(" = '%s', %f\n", plant.Shape.c_str(), plant.Radius);
+		s_ShapeToForm[plant.Shape] = plant;
+	}
+
+	return true;
+}
+
+bool unbuildFlora()
+{
+	CPath::addSearchPath(s_DfnDir, true, false);
+	CPath::addSearchPath(s_LeveldesignDir, true, false);
+
+	if (!loadLeveldesign())
+		return false;
+
+
+	/*
+	CInstanceGroup ig;
+	CIFile inputStream;
+	if (!inputStream.open(string(argv[1])))
+	{
+		printf("unable to open %s\n", argv[1]);
+		return -1;
+	}
+	*/
+
+	return false;
+}
+
+bool unbuildFlora(NLMISC::CCmdArgs &args)
+{
+	s_DfnDir = args.getAdditionalArg("dfn")[0];
+	s_LeveldesignDir = args.getAdditionalArg("leveldesign")[0];
+	s_SourceDir = args.getAdditionalArg("source")[0];
+	s_ReferenceDir = args.getAdditionalArg("reference")[0];
+	s_PrimitiveFile = args.getAdditionalArg("primitive")[0];
+
+	return unbuildFlora();
+}
+
+} /* anonymous namespace */
+
+int main(int argc, char **argv)
+{
+	NLMISC::CApplicationContext myApplicationContext;
+
+	NLMISC::CCmdArgs args;
+
+	args.addAdditionalArg("dfn", "Input folder with DFN");
+	args.addAdditionalArg("leveldesign", "Input folder with plant sheets");
+	args.addAdditionalArg("source", "Input folder with IGs containing flora");
+	args.addAdditionalArg("reference", "Input folder with IGs missing flora");
+	args.addAdditionalArg("primitive", "Output flora primitive file");
+
+	if (!args.parse(argc, argv))
+	{
+		return EXIT_FAILURE;
+	}
+
+	if (!unbuildFlora(args))
+	{
+		args.displayHelp();
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+/* end of file */

From d6fe42f6a0f3012b7a0d62a08d98ab673e34eef2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 08:43:19 +0800
Subject: [PATCH 175/292] Load and map instances to plants, ryzom/ryzomcore#621

---
 .../ligo/unbuild_flora/unbuild_flora.cpp      | 92 ++++++++++++++-----
 1 file changed, 70 insertions(+), 22 deletions(-)

diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 7aeb404b4..5aa411fc2 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -30,6 +30,7 @@
 #include <nel/misc/common.h>
 #include <nel/misc/cmd_args.h>
 //#include <nel/misc/bitmap.h>
+#include <nel/misc/string_view.h>
 
 #include <nel/georges/u_form.h>
 #include <nel/georges/u_form_elm.h>
@@ -41,16 +42,17 @@
 //#include <nel/3d/zone_smoother.h>
 //#include <nel/3d/zone_tgt_smoother.h>
 //#include <nel/3d/zone_corner_smoother.h>
-//#include <nel/ligo/zone_region.h>
 #include <nel/3d/scene_group.h>
 
+//#include <nel/ligo/zone_region.h>
+
 #include <vector>
 //#include <set>
 #include <map>
 
 using namespace std;
 using namespace NLMISC;
-//using namespace NL3D;
+using namespace NL3D;
 using namespace NLGEORGES;
 //using namespace NLLIGO;
 
@@ -60,8 +62,8 @@ namespace /* anonymous */
 /*
 
 Process:
-- Load all .plant sheets, map from .shape to .plant and bounding radius
-- Load all source igs
+- Load all .plant sheets, map from .shape to .plant and bounding radius (Reference: prim_export, main.cpp)
+- Load all source igs (Reference: ig_info, ig_info.cpp)
 - Load all reference igs, remove matching entries from source igs
 - Generate primitives
 
@@ -83,12 +85,17 @@ Debug arguments:
 
 struct CPoint
 {
+	std::string ZoneLwr;
+
 	CVector Pos; /* Position, height not necessarily specified (X="26218.738281" Y="-1092.078979" Z="0.000000") */
 	float Angle; /* (2.827213) */
+	float Scale; /* Scale (0.643217) */
+
+	bool Plant;
 	std::string Form; /* (FY_S2_savantree_B) */
 	std::string Name; /* Generated unique name (ilot_008_savantree 13) */
-	float Radius; /* Bounding radius (from plant sheet and scale) (0.450252) */
-	float Scale; /* Scale (0.643217) */
+	float Radius; /* Bounding radius (calculated from plant sheet and scale) (0.450252) */
+
 };
 
 /*
@@ -158,6 +165,7 @@ struct CPlant
 };
 
 std::map<std::string, CPlant> s_ShapeToForm;
+std::set<CPoint> s_Instances;
 
 bool loadLeveldesign()
 {
@@ -185,7 +193,7 @@ bool loadLeveldesign()
 		if (plant.Shape.empty())
 			continue;
 		plant.Shape.c_str();
-		toLowerAscii(&plant.Shape[0]);
+		(void)toLowerAscii(&plant.Shape[0]);
 		if (!form->getRootNode().getValueByName(plant.Radius, "3D.Bounding Radius"))
 			continue;
 		printf(" = '%s', %f\n", plant.Shape.c_str(), plant.Radius);
@@ -195,26 +203,66 @@ bool loadLeveldesign()
 	return true;
 }
 
-bool unbuildFlora()
+bool loadInstances()
 {
-	CPath::addSearchPath(s_DfnDir, true, false);
-	CPath::addSearchPath(s_LeveldesignDir, true, false);
-
-	if (!loadLeveldesign())
-		return false;
+	std::vector<std::string> igs;
+	CPath::getPathContent(s_SourceDir, true, false, true, igs);
 
-
-	/*
-	CInstanceGroup ig;
-	CIFile inputStream;
-	if (!inputStream.open(string(argv[1])))
+	for (std::vector<std::string>::iterator it(igs.begin()), end(igs.end()); it != end; ++it)
 	{
-		printf("unable to open %s\n", argv[1]);
-		return -1;
+		if (CFile::getExtension(*it) != nlstr("ig"))
+			continue;
+		printf("%s\n", (*it).c_str());
+		CInstanceGroup ig;
+		CIFile inputStream;
+		if (!inputStream.open(*it))
+		{
+			nlwarning("Unable to open %s\n", (*it).c_str());
+			return false;
+		}
+		ig.serial(inputStream);
+		CVector gpos = ig.getGlobalPos();
+		if (gpos.x != 0.0f || gpos.y != 0.0f || gpos.z != 0.0f)
+		{
+			nlwarning("Invalid global pos: %f, %f, %f", gpos.x, gpos.y, gpos.z);
+			return false;
+		}
+		string zoneLwr = toLowerAscii(CFile::getFilenameWithoutExtension(*it));
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)ig._InstancesInfos.size(); ++i)
+		{
+			CInstanceGroup::CInstance &info = ig._InstancesInfos[i];
+			CPoint instance;
+			instance.Pos = info.Pos;
+			instance.Angle = info.Rot.getAngle();
+			instance.Scale = info.Scale.z;
+			string shape = toLowerAscii(info.Name);
+			printf("%s\n", shape.c_str());
+			std::map<std::string, CPlant>::iterator formIt = s_ShapeToForm.find(shape);
+			if (formIt != s_ShapeToForm.end())
+			{
+				instance.Form = formIt->second.Form;
+				instance.Name = CFile::getFilenameWithoutExtension(instance.Form) + nlstr("_") + zoneLwr + nlstr("_") + toString(i);
+				instance.Radius = instance.Scale * formIt->second.Radius;
+				printf(" = %f, %f, %f, %f, %f, '%s', '%s', %f\n",  instance.Pos.x, instance.Pos.y, instance.Pos.z, instance.Angle, instance.Scale, instance.Form .c_str(), instance.Name.c_str(), instance.Radius);
+				instance.Plant = true;
+			}
+			else
+			{
+				instance.Plant = false;
+			}
+		}
 	}
-	*/
 
-	return false;
+	return true;
+}
+
+bool unbuildFlora()
+{
+	CPath::addSearchPath(s_DfnDir, true, false);
+	CPath::addSearchPath(s_LeveldesignDir, true, false);
+
+	return loadLeveldesign()
+		&& loadInstances();
 }
 
 bool unbuildFlora(NLMISC::CCmdArgs &args)

From 57fbaf1febd5e3c4d958b2ba8426d670ef62f969 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 08:55:14 +0800
Subject: [PATCH 176/292] Erase things from reference that aren't plants,
 ryzom/ryzomcore#621

---
 .../ligo/unbuild_flora/unbuild_flora.cpp      | 90 +++++++++++++++++--
 1 file changed, 84 insertions(+), 6 deletions(-)

diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 5aa411fc2..1b718ca94 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -47,7 +47,7 @@
 //#include <nel/ligo/zone_region.h>
 
 #include <vector>
-//#include <set>
+#include <list>
 #include <map>
 
 using namespace std;
@@ -90,6 +90,7 @@ struct CPoint
 	CVector Pos; /* Position, height not necessarily specified (X="26218.738281" Y="-1092.078979" Z="0.000000") */
 	float Angle; /* (2.827213) */
 	float Scale; /* Scale (0.643217) */
+	std::string Shape;
 
 	bool Plant;
 	std::string Form; /* (FY_S2_savantree_B) */
@@ -165,7 +166,7 @@ struct CPlant
 };
 
 std::map<std::string, CPlant> s_ShapeToForm;
-std::set<CPoint> s_Instances;
+std::list<CPoint> s_Instances;
 
 bool loadLeveldesign()
 {
@@ -235,9 +236,9 @@ bool loadInstances()
 			instance.Pos = info.Pos;
 			instance.Angle = info.Rot.getAngle();
 			instance.Scale = info.Scale.z;
-			string shape = toLowerAscii(info.Name);
-			printf("%s\n", shape.c_str());
-			std::map<std::string, CPlant>::iterator formIt = s_ShapeToForm.find(shape);
+			instance.Shape = toLowerAscii(info.Name);
+			printf("%s\n", instance.Shape.c_str());
+			std::map<std::string, CPlant>::iterator formIt = s_ShapeToForm.find(instance.Shape);
 			if (formIt != s_ShapeToForm.end())
 			{
 				instance.Form = formIt->second.Form;
@@ -250,6 +251,81 @@ bool loadInstances()
 			{
 				instance.Plant = false;
 			}
+			s_Instances.push_back(instance);
+		}
+	}
+
+	return true;
+}
+
+bool eraseReference()
+{
+	std::vector<std::string> igs;
+	CPath::getPathContent(s_ReferenceDir, true, false, true, igs);
+
+	for (std::vector<std::string>::iterator it(igs.begin()), end(igs.end()); it != end; ++it)
+	{
+		if (CFile::getExtension(*it) != nlstr("ig"))
+			continue;
+		printf("%s\n", (*it).c_str());
+		CInstanceGroup ig;
+		CIFile inputStream;
+		if (!inputStream.open(*it))
+		{
+			nlwarning("Unable to open %s\n", (*it).c_str());
+			return false;
+		}
+		ig.serial(inputStream);
+		CVector gpos = ig.getGlobalPos();
+		if (gpos.x != 0.0f || gpos.y != 0.0f || gpos.z != 0.0f)
+		{
+			nlwarning("Invalid global pos: %f, %f, %f", gpos.x, gpos.y, gpos.z);
+			return false;
+		}
+		string zoneLwr = toLowerAscii(CFile::getFilenameWithoutExtension(*it));
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)ig._InstancesInfos.size(); ++i)
+		{
+			CInstanceGroup::CInstance &info = ig._InstancesInfos[i];
+			string shape = toLowerAscii(info.Name);
+			printf("%s\n", shape.c_str());
+			bool erased = false;
+			for (std::list<CPoint>::iterator it(s_Instances.begin()), end(s_Instances.end()); it != end; ++it)
+			{
+				const CPoint &instance = *it;
+				if (instance.Pos.x == info.Pos.x
+					&& instance.Pos.y == info.Pos.y
+					&& instance.Shape == shape)
+				{
+					printf(" = Found and erased\n");
+					s_Instances.erase(it);
+					erased = true;
+					break;
+				}
+			}
+			if (!erased)
+				printf(" = NOT FOUND!\n");
+		}
+	}
+
+	return true;
+}
+
+bool eraseNonPlants()
+{
+	for (std::list<CPoint>::iterator it(s_Instances.begin()), end(s_Instances.end()); it != end;)
+	{
+		const CPoint &instance = *it;
+		if (!instance.Plant)
+		{
+			printf("Erase '%s' because it's not a plant!\n", instance.Shape.c_str());
+			std::list<CPoint>::iterator nextIt = it;
+			++nextIt;
+			s_Instances.erase(it);
+			it = nextIt;
+		}
+		else
+		{
+			++it;
 		}
 	}
 
@@ -262,7 +338,9 @@ bool unbuildFlora()
 	CPath::addSearchPath(s_LeveldesignDir, true, false);
 
 	return loadLeveldesign()
-		&& loadInstances();
+		&& loadInstances()
+		&& eraseReference()
+		&& eraseNonPlants();
 }
 
 bool unbuildFlora(NLMISC::CCmdArgs &args)

From b3bed095f803d479fb65fcfcb77ea030b685790f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 09:17:54 +0800
Subject: [PATCH 177/292] Write XML file, ryzom/ryzomcore#621

---
 .../ligo/unbuild_flora/unbuild_flora.cpp      | 91 ++++++++++++++-----
 1 file changed, 70 insertions(+), 21 deletions(-)

diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 1b718ca94..1537c09ce 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -26,26 +26,18 @@
 
 #include <nel/misc/types_nl.h>
 #include <nel/misc/file.h>
-//#include <nel/misc/o_xml.h>
 #include <nel/misc/common.h>
 #include <nel/misc/cmd_args.h>
-//#include <nel/misc/bitmap.h>
 #include <nel/misc/string_view.h>
 
 #include <nel/georges/u_form.h>
 #include <nel/georges/u_form_elm.h>
 #include <nel/georges/u_form_loader.h>
 
-//#include <nel/3d/quad_tree.h>
-//#include <nel/3d/zone.h>
-//#include <nel/3d/landscape.h>
-//#include <nel/3d/zone_smoother.h>
-//#include <nel/3d/zone_tgt_smoother.h>
-//#include <nel/3d/zone_corner_smoother.h>
 #include <nel/3d/scene_group.h>
 
-//#include <nel/ligo/zone_region.h>
-
+#include <iostream>
+#include <fstream>
 #include <vector>
 #include <list>
 #include <map>
@@ -178,7 +170,7 @@ bool loadLeveldesign()
 
 	for (std::vector<std::string>::iterator it(plants.begin()), end(plants.end()); it != end; ++it)
 	{
-		printf("%s\n", (*it).c_str());
+		printf("%s\n", nlUtf8ToMbcs(*it));
 		CSmartPtr <UForm> form = formLoader->loadForm(*it);
 		if (!form)
 			continue;
@@ -193,11 +185,11 @@ bool loadLeveldesign()
 		}
 		if (plant.Shape.empty())
 			continue;
-		plant.Shape.c_str();
-		(void)toLowerAscii(&plant.Shape[0]);
+		(void)plant.Shape.c_str();
+		toLowerAscii(&plant.Shape[0]);
 		if (!form->getRootNode().getValueByName(plant.Radius, "3D.Bounding Radius"))
 			continue;
-		printf(" = '%s', %f\n", plant.Shape.c_str(), plant.Radius);
+		printf(" = '%s', %f\n", nlUtf8ToMbcs(plant.Shape), plant.Radius);
 		s_ShapeToForm[plant.Shape] = plant;
 	}
 
@@ -213,7 +205,7 @@ bool loadInstances()
 	{
 		if (CFile::getExtension(*it) != nlstr("ig"))
 			continue;
-		printf("%s\n", (*it).c_str());
+		printf("%s\n", nlUtf8ToMbcs(*it));
 		CInstanceGroup ig;
 		CIFile inputStream;
 		if (!inputStream.open(*it))
@@ -237,14 +229,14 @@ bool loadInstances()
 			instance.Angle = info.Rot.getAngle();
 			instance.Scale = info.Scale.z;
 			instance.Shape = toLowerAscii(info.Name);
-			printf("%s\n", instance.Shape.c_str());
+			printf("%s\n", nlUtf8ToMbcs(instance.Shape));
 			std::map<std::string, CPlant>::iterator formIt = s_ShapeToForm.find(instance.Shape);
 			if (formIt != s_ShapeToForm.end())
 			{
 				instance.Form = formIt->second.Form;
 				instance.Name = CFile::getFilenameWithoutExtension(instance.Form) + nlstr("_") + zoneLwr + nlstr("_") + toString(i);
 				instance.Radius = instance.Scale * formIt->second.Radius;
-				printf(" = %f, %f, %f, %f, %f, '%s', '%s', %f\n",  instance.Pos.x, instance.Pos.y, instance.Pos.z, instance.Angle, instance.Scale, instance.Form .c_str(), instance.Name.c_str(), instance.Radius);
+				printf(" = %f, %f, %f, %f, %f, '%s', '%s', %f\n",  instance.Pos.x, instance.Pos.y, instance.Pos.z, instance.Angle, instance.Scale, nlUtf8ToMbcs(instance.Form), nlUtf8ToMbcs(instance.Name), instance.Radius);
 				instance.Plant = true;
 			}
 			else
@@ -267,7 +259,7 @@ bool eraseReference()
 	{
 		if (CFile::getExtension(*it) != nlstr("ig"))
 			continue;
-		printf("%s\n", (*it).c_str());
+		printf("%s\n", nlUtf8ToMbcs(*it));
 		CInstanceGroup ig;
 		CIFile inputStream;
 		if (!inputStream.open(*it))
@@ -287,7 +279,7 @@ bool eraseReference()
 		{
 			CInstanceGroup::CInstance &info = ig._InstancesInfos[i];
 			string shape = toLowerAscii(info.Name);
-			printf("%s\n", shape.c_str());
+			printf("%s\n", nlUtf8ToMbcs(shape));
 			bool erased = false;
 			for (std::list<CPoint>::iterator it(s_Instances.begin()), end(s_Instances.end()); it != end; ++it)
 			{
@@ -317,7 +309,7 @@ bool eraseNonPlants()
 		const CPoint &instance = *it;
 		if (!instance.Plant)
 		{
-			printf("Erase '%s' because it's not a plant!\n", instance.Shape.c_str());
+			printf("Erase '%s' because it's not a plant!\n", nlUtf8ToMbcs(instance.Shape));
 			std::list<CPoint>::iterator nextIt = it;
 			++nextIt;
 			s_Instances.erase(it);
@@ -332,6 +324,62 @@ bool eraseNonPlants()
 	return true;
 }
 
+bool writeFlora()
+{
+	ofstream fo;
+	fo.open(utf8ToWide(s_PrimitiveFile));
+	fo << "<?xml version=\"1.0\"?>\n";
+	fo << "<PRIMITIVES VERSION=\"1\">\n";
+	fo << "  <ROOT_PRIMITIVE TYPE=\"CPrimNode\">\n";
+	fo << "    <ALIAS LAST_GENERATED=\"0\"/>\n";
+	fo << "    <CHILD TYPE=\"CPrimNode\">\n";
+	fo << "      <PROPERTY TYPE=\"string\">\n";
+	fo << "        <NAME>class</NAME>\n";
+	fo << "        <STRING>flora</STRING>\n";
+	fo << "      </PROPERTY>\n";
+	fo << "      <PROPERTY TYPE=\"string\">\n";
+	fo << "        <NAME>name</NAME>\n";
+	fo << "        <STRING>" << CFile::getFilenameWithoutExtension(s_PrimitiveFile) << "_flora</STRING>\n";
+	fo << "      </PROPERTY>\n";
+	for (std::list<CPoint>::iterator it(s_Instances.begin()), end(s_Instances.end()); it != end; ++it)
+	{
+		const CPoint &instance = *it;
+		fo << "      <CHILD TYPE=\"CPrimPoint\">\n";
+		fo << "        <PT X=\"" << instance.Pos.x << "\" Y=\"" << instance.Pos.y << "\" Z=\"0.000000\"/>\n";
+		fo << "        <ANGLE VALUE=\"" << instance.Angle << "\"/>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>class</NAME>\n";
+		fo << "          <STRING>prim</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>form</NAME>\n";
+		fo << "          <STRING>" << CFile::getFilenameWithoutExtension(instance.Form) << "</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>layer</NAME>\n";
+		fo << "          <STRING>0</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>name</NAME>\n";
+		fo << "          <STRING>" << instance.Name << "</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>radius</NAME>\n";
+		fo << "          <STRING>" << instance.Radius << "</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "        <PROPERTY TYPE=\"string\">\n";
+		fo << "          <NAME>scale</NAME>\n";
+		fo << "          <STRING>" << instance.Scale << "</STRING>\n";
+		fo << "        </PROPERTY>\n";
+		fo << "      </CHILD>\n";
+	}
+	fo << "    </CHILD>\n";
+	fo << "  </ROOT_PRIMITIVE>\n";
+	fo << "</PRIMITIVES>\n";
+	printf("Generated:\n%s\n", nlUtf8ToMbcs(s_PrimitiveFile));
+	return true;
+}
+
 bool unbuildFlora()
 {
 	CPath::addSearchPath(s_DfnDir, true, false);
@@ -340,7 +388,8 @@ bool unbuildFlora()
 	return loadLeveldesign()
 		&& loadInstances()
 		&& eraseReference()
-		&& eraseNonPlants();
+		&& eraseNonPlants()
+		&& writeFlora();
 }
 
 bool unbuildFlora(NLMISC::CCmdArgs &args)

From 813b4d72d16e5a33afbc9d2d52d3bc878cfd7423 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 09:31:26 +0800
Subject: [PATCH 178/292] Notes

---
 nel/tools/ligo/unbuild_flora/unbuild_flora.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 1537c09ce..98aa70954 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -72,6 +72,10 @@ std::string s_PrimitiveFile; /* R:\graphics\primitive\r2_desert\r2_desert.primit
 Debug arguments:
 
 "R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_desert2" "R:\pipeline\export\continents\r2_desert\zone_lighted_ig_land" "R:\graphics\primitive\r2_desert\r2_desert.primitive"
+"R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_forest2" "R:\pipeline\export\continents\r2_forest\zone_lighted_ig_land" "R:\graphics\primitive\r2_forest\r2_forest.primitive"
+"R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_jungle2" "R:\pipeline\export\continents\r2_jungle\zone_lighted_ig_land" "R:\graphics\primitive\r2_jungle\r2_jungle.primitive"
+"R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_lakes2" "R:\pipeline\export\continents\r2_lakes\zone_lighted_ig_land" "R:\graphics\primitive\r2_lakes\r2_lakes.primitive"
+"R:\leveldesign\DFN" "R:\leveldesign\game_elem\plant\ecosystem" "R:\reference\2008_july\data\r2_roots2" "R:\pipeline\export\continents\r2_roots\zone_lighted_ig_land" "R:\graphics\primitive\r2_roots\r2_roots.primitive"
 
 */
 

From aa7d667b10403d297948cc3d49b97327c3d78957 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 09:31:52 +0800
Subject: [PATCH 179/292] Show angle

---
 nel/tools/3d/ig_info/ig_info.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/tools/3d/ig_info/ig_info.cpp b/nel/tools/3d/ig_info/ig_info.cpp
index f1fa9b5e2..326d51ac2 100644
--- a/nel/tools/3d/ig_info/ig_info.cpp
+++ b/nel/tools/3d/ig_info/ig_info.cpp
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 		printf("---------\n");
 		for(k = 0; k < ig._InstancesInfos.size(); ++k)
 		{
-			printf("instance %s : x = %.1f, y = %.1f, z = %.1f, sx = %.1f, sy = %.1f, sz = %.1f\n", ig._InstancesInfos[k].Name.c_str(), ig._InstancesInfos[k].Pos.x + gpos.x, ig._InstancesInfos[k].Pos.y + gpos.y, ig._InstancesInfos[k].Pos.z + gpos.z, ig._InstancesInfos[k].Scale.x, ig._InstancesInfos[k].Scale.y, ig._InstancesInfos[k].Scale.z);
+			printf("instance %s : x = %.1f, y = %.1f, z = %.1f, sx = %.1f, sy = %.1f, sz = %.1f, a = %.1f\n", ig._InstancesInfos[k].Name.c_str(), ig._InstancesInfos[k].Pos.x + gpos.x, ig._InstancesInfos[k].Pos.y + gpos.y, ig._InstancesInfos[k].Pos.z + gpos.z, ig._InstancesInfos[k].Scale.x, ig._InstancesInfos[k].Scale.y, ig._InstancesInfos[k].Scale.z, ig._InstancesInfos[k].Rot.getAngle());
 		}
 		printf("\n");
 		printf("Lights\n");

From 257f6a6e237a323b117e7a7c75f5e6ad3422fcb0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 25 Nov 2020 09:43:52 +0800
Subject: [PATCH 180/292] Build fix

---
 nel/tools/ligo/unbuild_flora/unbuild_flora.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 98aa70954..3c6612a10 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -331,7 +331,11 @@ bool eraseNonPlants()
 bool writeFlora()
 {
 	ofstream fo;
+#ifdef NL_OS_WINDOWS
 	fo.open(utf8ToWide(s_PrimitiveFile));
+#else
+	fo.open(s_PrimitiveFile);
+#endif
 	fo << "<?xml version=\"1.0\"?>\n";
 	fo << "<PRIMITIVES VERSION=\"1\">\n";
 	fo << "  <ROOT_PRIMITIVE TYPE=\"CPrimNode\">\n";

From 3df1fd3857a983be4d19e9c4ec656064fdd1f881 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 26 Nov 2020 00:30:49 +0800
Subject: [PATCH 181/292] Notes

---
 nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
index 53aff48ba..c2eb6a4af 100644
--- a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
+++ b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
@@ -366,7 +366,7 @@ void CRTWorld::addNode (INode *pNode, vector< CMesh::CMeshBuild* > &Meshes,  vec
 		{
 			for( uint32 i = 0; i < AllLights.size(); ++i )
 			{
-				if( isInteractionWithLight (AllLights[i], aabbox))
+				if( isInteractionWithLight (AllLights[i], aabbox)) // FIXME: This is always true with sunlight!
 				{
 					bInteract = true;
 					break;
@@ -382,7 +382,7 @@ void CRTWorld::addNode (INode *pNode, vector< CMesh::CMeshBuild* > &Meshes,  vec
 			{
 				CMesh::CMeshBuild *pMB;
 				CMeshBase::CMeshBaseBuild *pMBB;
-				pMB = exportNel.createMeshBuild ( *pNode, tvTime, pMBB);
+				pMB = exportNel.createMeshBuild ( *pNode, tvTime, pMBB); // FIXME: This is slow!
 				if( pMBB->bCastShadows )
 				{
 					Meshes.push_back( pMB );

From 147cb75a80e089a7fefb02b396720c46e132979e Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 26 Nov 2020 01:18:54 +0800
Subject: [PATCH 182/292] Temporary cache implementation for lightmapping
 during export

---
 .../3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp | 98 +++++++++++++++----
 .../3d/plugin_max/nel_mesh_lib/calc_lm_rt.h   |  6 ++
 2 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
index c2eb6a4af..7fc5c4e85 100644
--- a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
+++ b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
@@ -32,6 +32,11 @@ using namespace NLMISC;
 // CRTWorld
 // ***********************************************************************************************
 
+std::map<INode *, std::pair<NL3D::CMesh::CMeshBuild *, NL3D::CMeshBase::CMeshBaseBuild *>> CRTWorld::s_WorldCache;
+std::map<INode *, NLMISC::CAABBox> CRTWorld::s_WorldCacheAABBox;
+INode *CRTWorld::s_WorldCacheRoot;
+std::string CRTWorld::s_WorldCacheFile;
+
 // -----------------------------------------------------------------------------------------------
 CRTWorld::CRTWorld (bool errorInDialog, bool view, bool absolutePath, Interface *ip, std::string errorTitle, CExportNel *exp)
 {
@@ -351,22 +356,33 @@ void CRTWorld::testCell (CRGBAF &retValue, SGridCell &cell, CVector &vLightPos,
 void CRTWorld::addNode (INode *pNode, vector< CMesh::CMeshBuild* > &Meshes,  vector< CMeshBase::CMeshBaseBuild* > &MeshesBase,
 						vector< INode* > &INodes, vector<SLightBuild> &AllLights, const set<INode*> &excludeNode, TimeValue tvTime)
 {
-	if (! RPO::isZone (*pNode, tvTime) )
-	if (CExportNel::isMesh (*pNode, tvTime))
+	if (!RPO::isZone(*pNode, tvTime)
+		&& CExportNel::isMesh(*pNode, tvTime))
 	{
 		// Nel export
-		CExportNel exportNel (_ErrorInDialog, _View, true, _Ip, _ErrorTitle, NULL);
+		nlassert(_Ip->GetRootNode() == s_WorldCacheRoot);
 		CAABBox aabbox;
-		exportNel.buildMeshAABBox(*pNode, aabbox, tvTime);
-		aabbox.setCenter(aabbox.getCenter()+GlobalTrans);
+		std::map<INode *, CAABBox>::iterator aabboxIt = s_WorldCacheAABBox.find(pNode);
+		if (aabboxIt == s_WorldCacheAABBox.end())
+		{
+			CExportNel exportNel(_ErrorInDialog, _View, true, _Ip, _ErrorTitle, NULL);
+			exportNel.buildMeshAABBox(*pNode, aabbox, tvTime);
+			s_WorldCacheAABBox[pNode] = aabbox;
+		}
+		else
+		{
+			// FIXME: This breaks repeated exports while the file is open and being changed!!! Not an issue for now
+			aabbox = aabboxIt->second;
+		}
+		aabbox.setCenter(aabbox.getCenter() + GlobalTrans);
 
 		// Not an excluded node ?
 		bool bInteract = false;
-		if (excludeNode.find (pNode) == excludeNode.end())
+		if (excludeNode.find(pNode) == excludeNode.end())
 		{
-			for( uint32 i = 0; i < AllLights.size(); ++i )
+			for (uint32 i = 0; i < AllLights.size(); ++i)
 			{
-				if( isInteractionWithLight (AllLights[i], aabbox)) // FIXME: This is always true with sunlight!
+				if (isInteractionWithLight(AllLights[i], aabbox)) // FIXME: This is always true with sunlight!
 				{
 					bInteract = true;
 					break;
@@ -374,25 +390,41 @@ void CRTWorld::addNode (INode *pNode, vector< CMesh::CMeshBuild* > &Meshes,  vec
 			}
 		}
 
-
-		if( bInteract )
+		if (bInteract)
 		{
-			int nAccelType = CExportNel::getScriptAppData (pNode, NEL3D_APPDATA_ACCEL, 32);
-			if ((nAccelType&3) == 0) // If not an accelerator
+			int nAccelType = CExportNel::getScriptAppData(pNode, NEL3D_APPDATA_ACCEL, 32);
+			if ((nAccelType & 3) == 0) // If not an accelerator
 			{
+				nlassert(_Ip->GetRootNode() == s_WorldCacheRoot);
+
 				CMesh::CMeshBuild *pMB;
 				CMeshBase::CMeshBaseBuild *pMBB;
-				pMB = exportNel.createMeshBuild ( *pNode, tvTime, pMBB); // FIXME: This is slow!
-				if( pMBB->bCastShadows )
+				std::map<INode *, std::pair<NL3D::CMesh::CMeshBuild *, NL3D::CMeshBase::CMeshBaseBuild *>>::iterator buildIt = s_WorldCache.find(pNode);
+				if (buildIt == s_WorldCache.end())
 				{
-					Meshes.push_back( pMB );
-					MeshesBase.push_back( pMBB );
-					INodes.push_back( pNode );
+					CExportNel exportNel(_ErrorInDialog, _View, true, _Ip, _ErrorTitle, NULL);
+					pMB = exportNel.createMeshBuild(*pNode, tvTime, pMBB);
+					if (!pMBB->bCastShadows)
+					{
+						delete pMB; // No interaction so delete the mesh
+						pMB = NULL;
+						delete pMBB; // No interaction so delete the mesh
+						pMBB = NULL;
+					}
+					s_WorldCache[pNode] = std::make_pair(pMB ? new CMesh::CMeshBuild(*pMB) : NULL, pMBB ? new CMeshBase::CMeshBaseBuild(*pMBB) : NULL);
 				}
 				else
 				{
-					delete pMB; // No interaction so delete the mesh
-					delete pMBB; // No interaction so delete the mesh
+					// FIXME: This breaks repeated exports while the file is open and being changed!!! Not an issue for now
+					pMB = buildIt->second.first ? new CMesh::CMeshBuild(*buildIt->second.first) : NULL;
+					pMBB = buildIt->second.second ? new CMeshBase::CMeshBaseBuild(*buildIt->second.second) : NULL;
+				}
+
+				if (pMBB) // Implies pMBB->bCastShadows
+				{
+					Meshes.push_back(pMB);
+					MeshesBase.push_back(pMBB);
+					INodes.push_back(pNode);
 				}
 			}
 		}
@@ -405,6 +437,20 @@ void CRTWorld::getAllSelectedNode	(vector< CMesh::CMeshBuild* > &Meshes,
 									vector< INode* > &INodes,
 									vector<SLightBuild> &AllLights, const set<INode*> &excludeNode, const set<INode*> &includeNode)
 {
+	if (_Ip->GetRootNode() != s_WorldCacheRoot || MaxTStrToUtf8(_Ip->GetCurFileName()) != s_WorldCacheFile) // FIXME: This breaks repeated exports while the file is open and being changed!!! Not an issue for now
+	{
+		// Erase all cached builds
+		for (std::map<INode *, std::pair<NL3D::CMesh::CMeshBuild *, NL3D::CMeshBase::CMeshBaseBuild *>>::iterator it(s_WorldCache.begin()), end(s_WorldCache.end()); it != end; ++it)
+		{
+			delete it->second.first;
+			delete it->second.second;
+		}
+		s_WorldCache.clear();
+		s_WorldCacheAABBox.clear();
+		s_WorldCacheRoot = _Ip->GetRootNode();
+		s_WorldCacheFile = MaxTStrToUtf8(_Ip->GetCurFileName());
+	}
+
 	// Get time
 	TimeValue tvTime = _Ip->GetTime();
 
@@ -443,6 +489,20 @@ void CRTWorld::getAllNodeInScene	(vector< CMesh::CMeshBuild* > &Meshes,
 									vector<SLightBuild> &AllLights, const set<INode*> &excludeNode,
 									INode* pNode)
 {
+	if (_Ip->GetRootNode() != s_WorldCacheRoot || MaxTStrToUtf8(_Ip->GetCurFileName()) != s_WorldCacheFile) // FIXME: This breaks repeated exports while the file is open and being changed!!! Not an issue for now
+	{
+		// Erase all cached builds
+		for (std::map<INode *, std::pair<NL3D::CMesh::CMeshBuild *, NL3D::CMeshBase::CMeshBaseBuild *>>::iterator it(s_WorldCache.begin()), end(s_WorldCache.end()); it != end; ++it)
+		{
+			delete it->second.first;
+			delete it->second.second;
+		}
+		s_WorldCache.clear();
+		s_WorldCacheAABBox.clear();
+		s_WorldCacheRoot = _Ip->GetRootNode();
+		s_WorldCacheFile = MaxTStrToUtf8(_Ip->GetCurFileName());
+	}
+
 	if( pNode == NULL )
 		pNode = _Ip->GetRootNode();
 
diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
index 11bb825d0..a017ce03c 100644
--- a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
+++ b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
@@ -131,6 +131,12 @@ class CRTWorld
 	//vector<SCubeGrid> cgAccel;	// One cube grid by light point or spot
 	//vector<SDirGrid> dirAccel;	// One grid by light (directionnal only)
 	NLMISC::CVector	GlobalTrans;
+
+	static std::map<INode *, std::pair<NL3D::CMesh::CMeshBuild *, NL3D::CMeshBase::CMeshBaseBuild *>> s_WorldCache;
+	static std::map<INode *, NLMISC::CAABBox> s_WorldCacheAABBox;
+	static INode *s_WorldCacheRoot;
+	static std::string s_WorldCacheFile;
+
 public:
 
 	CRTWorld (bool errorInDialog, bool view, bool absolutePath, Interface *ip, std::string errorTitle, CExportNel *exp);

From abf2715fa31c88e6d1b35bf1391ad9cd02d3eae3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 27 Nov 2020 11:01:17 +0800
Subject: [PATCH 183/292] Create more consistent R2 maps

---
 .../processes/cartographer/0_setup.py          |  8 ++++++--
 .../r2_islands_textures/screenshot_islands.cpp | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/nel/tools/build_gamedata/processes/cartographer/0_setup.py b/nel/tools/build_gamedata/processes/cartographer/0_setup.py
index 6f8b9a754..0263edbda 100644
--- a/nel/tools/build_gamedata/processes/cartographer/0_setup.py
+++ b/nel/tools/build_gamedata/processes/cartographer/0_setup.py
@@ -95,8 +95,12 @@ cfg.write("\t\"" + CartographerContinent + "\", \n")
 cfg.write("};\n")
 cfg.write("\n")
 cfg.write("SeasonSuffixes = {\n")
-for suffix in MultipleTilesPostfix:
-	cfg.write("\t\"" + suffix + "\", \n")
+if CartographerSeasonSuffixes:
+	for suffix in CartographerSeasonSuffixes:
+		cfg.write("\t\"" + suffix + "\", \n")
+else:
+	for suffix in MultipleTilesPostfix:
+		cfg.write("\t\"" + suffix + "\", \n")
 cfg.write("};\n")
 cfg.write("\n")
 cfg.write("InverseZTest = true;\n")
diff --git a/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
index f76b1baf3..13c343881 100644
--- a/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
+++ b/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
@@ -33,6 +33,7 @@
 #include <nel/misc/progress_callback.h>
 #include <nel/misc/random.h>
 #include <nel/misc/common.h>
+#include <nel/misc/wang_hash.h>
 #include <nel/3d/u_material.h>
 
 #include <nel/3d/u_driver.h>
@@ -1369,6 +1370,7 @@ void CScreenshotIslands::buildIslandsTextures()
 	// Create and load landscape
 	ULandscape * landscape = scene->createLandscape();
 	landscape->setThreshold(0.0005);
+	landscape->setTileNear(10000);
 	if(_InverseZTest)
 	{
 		landscape->setZFunc(UMaterial::greaterequal);
@@ -1464,7 +1466,7 @@ void CScreenshotIslands::buildIslandsTextures()
 						vector<string>		zonesAdded;
 						vector<string>		zonesRemoved;
 						IProgressCallback progress;
-						landscape->refreshAllZonesAround(camera.getMatrix().getPos(), 1000, zonesAdded, zonesRemoved, progress);
+						landscape->refreshAllZonesAround(camera.getMatrix().getPos(), 2000, zonesAdded, zonesRemoved, progress);
 						if(_Vegetation)
 						{
 							LandscapeIGManager.unloadArrayZoneIG(zonesRemoved);
@@ -1644,8 +1646,8 @@ void CScreenshotIslands::buildIslandsTextures()
 
 
 							// little tga
-							bitmapLittle.resample(bitmapLittle.getWidth()/10, bitmapLittle.getHeight()/10);
-							if(!isPowerOf2(bitmapLittle.getWidth()) || !isPowerOf2(bitmapLittle.getHeight()) )
+							bitmapLittle.resample(bitmapLittle.getWidth() / 20, bitmapLittle.getHeight() / 20);
+							if (!isPowerOf2(bitmapLittle.getWidth()) || !isPowerOf2(bitmapLittle.getHeight()))
 							{
 								uint pow2w = NLMISC::raiseToNextPowerOf2(bitmapLittle.getWidth());
 								uint pow2h = NLMISC::raiseToNextPowerOf2(bitmapLittle.getHeight());
@@ -1871,15 +1873,19 @@ void CScreenshotIslands::buildBackTextureHLS(const std::string & islandName, con
 	{
 		_BackColor = maxColor;
 
-		CRandom	randomGenerator;
+		std::string islandNameLwr = toLowerAscii(islandName);
+		uint32_t seed = 0;
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)islandNameLwr.size(); ++i)
+			seed += wangHash(seed ^ islandNameLwr[i]);
 
 		uint8 * backPixels = &(_BackBitmap.getPixels(0)[0]);
 
+		uint i = 0;
 		for(uint x=0; x<_BackBitmap.getWidth(); x++)
 		{
-			for(uint y=0; y<_BackBitmap.getHeight(); y++)
+			for(uint y=0; y<_BackBitmap.getHeight(); y++, i++)
 			{
-				sint32 randomVal = randomGenerator.rand(colorsNb-1);
+				sint32 randomVal = wangHash(seed ^ i) % colorsNb;
 				const CRGBA & color = sortedColors[randomVal];
 
 				*backPixels = (uint8) color.R;

From 6bed86797bf467bc261e4b432940a6881bd9db16 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 7 Dec 2020 15:05:02 +0200
Subject: [PATCH 184/292] Add --url, --app options for client patcher

---
 CMakeLists.txt                             |  2 ++
 config.h.cmake                             |  1 +
 ryzom/tools/client/client_patcher/main.cpp | 26 ++++++++++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07fe11c8e..6bbf6235e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,7 @@ SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING
 SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
 SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
 SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
+SET(RYZOM_CLIENT_APP_NAME            "default")
 
 SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
 SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")
@@ -114,6 +115,7 @@ IF(WITH_RYZOM_LIVE)
   SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://account.ryzom.com/payment_profile/index.php")
   SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://account.ryzom.com/payment_profile/lost_secure_password.php")
   SET(RYZOM_CLIENT_PATCH_URL           "http://dl.ryzom.com/patch_live")
+  SET(RYZOM_CLIENT_APP_NAME            "ryzom_live")
 
   SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
   SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
diff --git a/config.h.cmake b/config.h.cmake
index fa4749cb2..fa6c456b9 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -37,6 +37,7 @@
 #cmakedefine RYZOM_CLIENT_EDIT_ACCOUNT_URL "${RYZOM_CLIENT_EDIT_ACCOUNT_URL}"
 #cmakedefine RYZOM_CLIENT_FORGET_PASSWORD_URL "${RYZOM_CLIENT_FORGET_PASSWORD_URL}"
 #cmakedefine RYZOM_CLIENT_PATCH_URL "${RYZOM_CLIENT_PATCH_URL}"
+#cmakedefine RYZOM_CLIENT_APP_NAME "${RYZOM_CLIENT_APP_NAME}"
 
 #cmakedefine RYZOM_WEBIG_MAIN_URL "${RYZOM_WEBIG_MAIN_URL}"
 #cmakedefine RYZOM_WEBIG_TRUSTED_DOMAIN "${RYZOM_WEBIG_TRUSTED_DOMAIN}"
diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
index 26db547ac..6ab6d860b 100644
--- a/ryzom/tools/client/client_patcher/main.cpp
+++ b/ryzom/tools/client/client_patcher/main.cpp
@@ -191,7 +191,8 @@ struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
 };
 
 // hardcoded URL to not depend on external files
-static const std::string PatchUrl = RYZOM_CLIENT_PATCH_URL; // "https://cdn.ryzom.dev/open/patch";
+static const std::string DefaultPatchUrl = RYZOM_CLIENT_PATCH_URL; // "https://cdn.ryzom.dev/open/patch";
+static const std::string DefaultAppName = RYZOM_CLIENT_APP_NAME; // "default"
 
 int main(int argc, char *argv[])
 {
@@ -200,6 +201,8 @@ int main(int argc, char *argv[])
 
 	Args.setVersion(getDisplayVersion());
 	Args.setDescription("Ryzom client");
+	Args.addArg("", "url", "PatchUrl", "Patch server url, ie 'https://dl.ryzom.com/patch_live'");
+	Args.addArg("", "app", "Application", "Patch application name for version file, ie 'ryzom_live' requests ryzom_live.version from PatchUrl");
 
 	if (!Args.parse(argc, argv)) return 1;
 
@@ -240,16 +243,35 @@ int main(int argc, char *argv[])
 	// now translations are read, we don't need it anymore
 	delete trans;
 
+	// create minimal client.cfg file in memory for patcher
+	{
+		CConfigFile::CVar patchUrl;
+		patchUrl.forceAsString(DefaultPatchUrl);
+		if (Args.haveLongArg("url") && !Args.getLongArg("url").empty())
+			patchUrl.forceAsString(Args.getLongArg("url").front());
+
+		CConfigFile::CVar appName;
+		appName.forceAsString(DefaultAppName);
+		if (Args.haveLongArg("app") && !Args.getLongArg("app").empty())
+			appName.forceAsString(Args.getLongArg("app").front());
+
+		ClientCfg.ConfigFile.insertVar("PatchUrl", patchUrl);
+		ClientCfg.ConfigFile.insertVar("Application", appName);
+	}
+
+	//
 	Args.displayVersion();
 	printf("\n");
 	printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
+	printf("Using '%s/%s.version'\n", ClientCfg.ConfigFile.getVar("PatchUrl").asString().c_str(),
+		ClientCfg.ConfigFile.getVar("Application").asString().c_str());
 
 	// initialize patch manager and set the ryzom full path, before it's used
 	CPatchManager *pPM = CPatchManager::getInstance();
 
 	// use PatchUrl
 	vector<string> patchURLs;
-	pPM->init(patchURLs, PatchUrl, "");
+	pPM->init(patchURLs, ClientCfg.ConfigFile.getVar("PatchUrl").asString(), "");
 	pPM->startCheckThread(true /* include background patchs */);
 
 	string state;

From 53437989d4829639fcc8e096bf5d30bd6b99e11c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 31 Dec 2020 15:55:41 +0200
Subject: [PATCH 185/292] Add --list-verbose, --extract options to bnp_make

---
 nel/tools/misc/bnp_make/main.cpp | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/nel/tools/misc/bnp_make/main.cpp b/nel/tools/misc/bnp_make/main.cpp
index 2edf0a7ba..0bda1770e 100644
--- a/nel/tools/misc/bnp_make/main.cpp
+++ b/nel/tools/misc/bnp_make/main.cpp
@@ -138,6 +138,8 @@ int main(int argc, char **argv)
 	args.addArg("o", "output", "destination", "Output directory or file");
 	args.addArg("i", "if", "wildcard", "Add the file if it matches the wilcard (at least one 'if' conditions must be met for a file to be adding)", false);
 	args.addArg("n", "ifnot", "wildcard", "Add the file if it doesn't match the wilcard (all the 'ifnot' conditions must be met for a file to be adding)", false);
+	args.addArg("", "list-verbose", "", "List files using 'pos size name' format");
+	args.addArg("", "extract", "name", "Extract file(s) from BNP into --output");
 	args.addAdditionalArg("input", "Input directory or BNP file depending on command");
 
 	if (!args.parse(argc, argv)) return 1;
@@ -236,6 +238,60 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
+	if (args.haveLongArg("list-verbose"))
+	{
+		gBNPHeader.BigFileName = args.getAdditionalArg("input").front();
+
+		// Read header of BNP file
+		if (!gBNPHeader.readHeader()) return -1;
+
+		for (uint i = 0; i < gBNPHeader.SFiles.size(); ++i)
+		{
+			printf("%u %u %s\n", gBNPHeader.SFiles[i].Pos, gBNPHeader.SFiles[i].Size, gBNPHeader.SFiles[i].Name.c_str());
+		}
+
+		return 0;
+	}
+
+	// --extract <name>
+	if (args.haveLongArg("extract") && !args.getLongArg("extract").empty())
+	{
+		std::string bnpName = args.getAdditionalArg("input").front();
+		CBigFile::getInstance().add(bnpName, BF_ALWAYS_OPENED);
+
+		// Output directory or filename
+		if (!args.haveArg("o") || args.getArg("o").empty())
+		{
+			nlerror("Output file or directory not set");
+		}
+
+		std::string srcName = args.getLongArg("extract").front();
+		std::string dstName = args.getArg("o").front();
+		if (CFile::fileExists(dstName) && CFile::isDirectory(dstName))
+		{
+			dstName += "/" + srcName;
+		}
+
+		CIFile inFile;
+		// bnpName without path
+		if (!inFile.open(CFile::getFilename(bnpName) + "@" + srcName))
+		{
+			nlerror("Unable to open '%s' for reading", inFile.getStreamName().c_str());
+		}
+
+		COFile outFile;
+		if (!outFile.open(dstName))
+		{
+			nlerror("Unable to open '%s' for writing", outFile.getStreamName().c_str());
+		}
+
+		std::string buf;
+		inFile.readAll(buf);
+		outFile.serialBuffer((uint8 *)&buf[0], buf.size());
+
+		return 0;
+	}
+
 	args.displayHelp();
 	return -1;
 }

From 779f87d6e719a771a5c7ad43224e54b4e50e880a Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 29 Dec 2020 12:19:32 +0200
Subject: [PATCH 186/292] Change CFile::setRWAccess to only set rw-rw-r-- (+x
 for directories) on linux/macOS.

---
 nel/include/nel/misc/path.h                |  7 ++++
 nel/src/misc/path.cpp                      | 44 ++++++++++++++++++++--
 ryzom/client/src/login_patch.cpp           |  1 +
 ryzom/tools/client/client_patcher/main.cpp | 22 ++++++-----
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/nel/include/nel/misc/path.h b/nel/include/nel/misc/path.h
index 74e24d715..6f3bb8fe1 100644
--- a/nel/include/nel/misc/path.h
+++ b/nel/include/nel/misc/path.h
@@ -731,11 +731,18 @@ struct CFile
 	static bool	createDirectoryTree(const std::string &dirname);
 
 	/** Try to set the file access to read/write if not already set.
+	 * On linux/macOS also set +x on directory.
 	 * return true if the file doesn't exist or if the file already have RW access.
 	 * \return true if RW access is granted
 	 */
 	static bool	setRWAccess(const std::string &filename);
 
+	/** Try to set +x bit on linux/macOS to make file executable. no-op on Windows
+	 * On Windows, always returns true, even if file does not exist.
+	 * \return true if file exists and +x was set, false if operation failed.
+	 */
+	static bool setExecutable(const std::string &filename);
+
 	/** Delete a file if possible (change the write access if possible)
 	* \return true if the delete occurs.
 	*/
diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index 2c55ac09f..ffa27d193 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -2571,8 +2571,8 @@ bool CFile::createDirectory(const std::string &filename)
 #ifdef NL_OS_WINDOWS
 	return _wmkdir(nlUtf8ToWide(filename)) == 0;
 #else
-	// Set full permissions....
-	return mkdir(filename.c_str(), 0xFFFF)==0;
+	// set rwxrwxr-x permissions
+	return mkdir(filename.c_str(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IXOTH)==0;
 #endif
 }
 
@@ -2810,7 +2810,17 @@ bool CFile::setRWAccess(const std::string &filename)
 	if (access (filename.c_str(), F_OK) == 0)
 	{
 		// try to set the read/write access
-		if (chmod (filename.c_str(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH) == -1)
+		// rw-rw-r--
+		mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
+
+		// set +x only for directory
+		// rwxrwxr-x
+		if (CFile::isDirectory(filename))
+		{
+			mode |= S_IXUSR|S_IXGRP|S_IXOTH;
+		}
+
+		if (chmod (filename.c_str(), mode) == -1)
 		{
 			if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
 			{
@@ -2831,6 +2841,34 @@ bool CFile::setRWAccess(const std::string &filename)
 	return true;
 }
 
+bool CFile::setExecutable(const std::string &filename)
+{
+#ifndef NL_OS_WINDOWS
+	struct stat buf;
+	if (stat(filename.c_str (), &buf) == 0)
+	{
+		mode_t mode = buf.st_mode | S_IXUSR | S_IXGRP | S_IXOTH;
+		if (chmod(filename.c_str(), mode) == -1)
+		{
+			if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
+			{
+				nlwarning ("PATH: Can't set +x flag on file '%s': %d %s", filename.c_str(), errno, strerror(errno));
+			}
+			return false;
+		}
+	}
+	else
+	{
+		if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
+		{
+			nlwarning("PATH: Can't access file '%s': %d %s", filename.c_str(), errno, strerror(errno));
+		}
+		return false;
+	}
+#endif
+	return true;
+}
+
 bool CFile::deleteFile(const std::string &filename)
 {
 	setRWAccess(filename);
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index d9d7e2e99..6fc6da999 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -1035,6 +1035,7 @@ void CPatchManager::executeBatchFile()
 
 	// make script executable
 	CFile::setRWAccess(batchFilename);
+	CFile::setExecutable(batchFilename);
 
 	// append login, password and shard
 	if (!LoginLogin.empty())
diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
index 6ab6d860b..9855a6b65 100644
--- a/ryzom/tools/client/client_patcher/main.cpp
+++ b/ryzom/tools/client/client_patcher/main.cpp
@@ -351,6 +351,7 @@ int main(int argc, char *argv[])
 		try
 		{
 			// move downloaded files to final location
+			// batch file will not be created
 			pPM->createBatchFile(pPM->getDescFile(), false, false);
 			CFile::createEmptyFile("show_eula");
 
@@ -381,17 +382,20 @@ int main(int argc, char *argv[])
 			printError(convert(CI18N::get("uiErrPatchApply")) + " " + error);
 			return 1;
 		}
-
-		pPM->executeBatchFile();
 	}
 
-/*
-	// Start Scanning
-	pPM->startScanDataThread();
-
-	// request to stop the thread
-	pPM->askForStopScanDataThread();
-*/
+	// upgd_nl.sh will normally take care of the permissions
+	//
+	// for linux/macOS (no-op on windows)
+	// Set for current executable (might be 'dev' version),
+	// and also 'ryzom_client_patcher' directly (from patched files)
+	CFile::setExecutable(Args.getProgramPath() + Args.getProgramName());
+	CFile::setExecutable("ryzom_client_patcher");
+	// other
+	CFile::setExecutable("crash_report");
+	CFile::setExecutable("ryzom_client");
+	CFile::setExecutable("ryzom_installer_qt");
+	CFile::setExecutable("ryzom_configuration_qt");
 
 	return 0;
 }

From d9d9c6e1e6b6aad5d7f06029a08c04a744a9a942 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 2 Jan 2021 16:45:39 +0200
Subject: [PATCH 187/292] Fix css style order when using external css files

---
 nel/include/nel/gui/group_html.h  |  7 ++-
 nel/include/nel/gui/html_parser.h | 17 +++++--
 nel/src/gui/group_html.cpp        | 83 ++++++++++++++++++++-----------
 nel/src/gui/html_parser.cpp       | 16 +++---
 4 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index a96f0180a..172c8b434 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -28,6 +28,7 @@
 #include "nel/gui/ctrl_button.h"
 #include "nel/gui/group_table.h"
 #include "nel/gui/html_element.h"
+#include "nel/gui/html_parser.h"
 #include "nel/gui/css_style.h"
 
 // forward declaration
@@ -376,7 +377,9 @@ namespace NLGUI
 		// true if renderer is waiting for css files to finish downloading (link rel=stylesheet)
 		bool			_WaitingForStylesheet;
 		// list of css file urls that are queued up for download
-		std::vector<std::string> _StylesheetQueue;
+		std::vector<CHtmlParser::StyleLink> _StylesheetQueue;
+		// <style> and downloaded <link rel=stylesheet> elements
+		std::vector<std::string> _HtmlStyles;
 
 		// Valid base href was found
 		bool            _IgnoreBaseUrlTag;
@@ -890,7 +893,7 @@ namespace NLGUI
 		std::string localBnpName(const std::string &url);
 
 		// add css file from <link href=".." rel="stylesheet"> to download queue
-		void addStylesheetDownload(std::vector<std::string> links);
+		void addStylesheetDownload(std::vector<CHtmlParser::StyleLink> links);
 
 		// stop all curl downalods (html and data)
 		void releaseDownloads();
diff --git a/nel/include/nel/gui/html_parser.h b/nel/include/nel/gui/html_parser.h
index 760640234..0c36014da 100644
--- a/nel/include/nel/gui/html_parser.h
+++ b/nel/include/nel/gui/html_parser.h
@@ -31,14 +31,23 @@ namespace NLGUI
 	class CHtmlParser
 	{
 	public:
+		// <link rel=stylesheet>
+		struct StyleLink
+		{
+			uint Index;
+			std::string Url;
+			StyleLink(uint i, const std::string &url) : Index(i), Url(url)
+			{ }
+		};
+
 		bool parseHtml(std::string htmlString) const;
 
-		// parse html string into DOM, extract <style> tags into styleString, <link stylesheet> urls into links
-		void getDOM(std::string htmlString, CHtmlElement &parent, std::string &styleString, std::vector<std::string> &links) const;
+		// parse html string into DOM, extract <style> and <link stylesheet> urls
+		void getDOM(std::string htmlString, CHtmlElement &parent, std::vector<std::string> &styles, std::vector<StyleLink> &links) const;
 
 	private:
-		// iterate over libxml html tree, build DOM, and join all <style> tags together
-		void parseNode(xmlNode *a_node, CHtmlElement &parent, std::string &styleString, std::vector<std::string> &links) const;
+		// iterate over libxml html tree, build DOM
+		void parseNode(xmlNode *a_node, CHtmlElement &parent, std::vector<std::string> &styles, std::vector<StyleLink> &links) const;
 
 		// read <style> tag and add its content to styleString
 		void parseStyle(xmlNode *a_node, std::string &styleString) const;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 6c27461f4..3d37e42bc 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -858,21 +858,16 @@ namespace NLGUI
 			CFile::createDirectory( pathName );
 	}
 
-	void CGroupHTML::addStylesheetDownload(std::vector<std::string> links)
+	void CGroupHTML::addStylesheetDownload(const std::vector<CHtmlParser::StyleLink> links)
 	{
 		for(uint i = 0; i < links.size(); ++i)
 		{
-			std::string url = getAbsoluteUrl(links[i]);
-			std::string local = localImageName(url);
+			_StylesheetQueue.push_back(links[i]);
+			std::string url = getAbsoluteUrl(links[i].Url);
+			_StylesheetQueue.back().Url = url;
 
-			// insert only if url not already downloading
-			std::vector<std::string>::const_iterator it = std::find(_StylesheetQueue.begin(), _StylesheetQueue.end(), url);
-			if (it == _StylesheetQueue.end())
-			{
-				_StylesheetQueue.push_back(url);
-				// push to the front of the queue
-				Curls.push_front(CDataDownload(url, local, StylesheetType, NULL, "", ""));
-			}
+			// push to the front of the queue
+			Curls.push_front(CDataDownload(url, localImageName(url), StylesheetType, NULL, "", ""));
 		}
 		pumpCurlQueue();
 	}
@@ -4184,19 +4179,28 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::cssDownloadFinished(const std::string &url, const std::string &local)
 	{
-		// remove file from download queue
-		std::vector<std::string>::iterator it = std::find(_StylesheetQueue.begin(), _StylesheetQueue.end(), url);
-		if (it != _StylesheetQueue.end())
+		for(std::vector<CHtmlParser::StyleLink>::iterator it = _StylesheetQueue.begin();
+				it != _StylesheetQueue.end(); ++it)
 		{
-			_StylesheetQueue.erase(it);
-		}
+			if (it->Url == url)
+			{
+				// read downloaded file into HtmlStyles
+				if (CFile::fileExists(local) && it->Index < _HtmlStyles.size())
+				{
+					CIFile in;
+					if (in.open(local))
+					{
+						if (!in.readAll(_HtmlStyles[it->Index]))
+						{
+							nlwarning("Failed to read downloaded css file(%s), url(%s)", local.c_str(), url.c_str());
+						}
+					}
+				}
 
-		if (!CFile::fileExists(local))
-		{
-			return;
+				_StylesheetQueue.erase(it);
+				break;
+			}
 		}
-
-		parseStylesheetFile(local);
 	}
 
 	void CGroupHTML::renderDocument()
@@ -4214,6 +4218,16 @@ namespace NLGUI
 		beginBuild();
 		removeContent();
 
+		// process all <style> and <link rel=stylesheet> elements
+		for(uint i = 0; i < _HtmlStyles.size(); ++i)
+		{
+			if (!_HtmlStyles[i].empty())
+			{
+				_Style.parseStylesheet(_HtmlStyles[i]);
+			}
+		}
+		_HtmlStyles.clear();
+
 		std::list<CHtmlElement>::iterator it = _HtmlDOM.Children.begin();
 		while(it != _HtmlDOM.Children.end())
 		{
@@ -4821,9 +4835,6 @@ namespace NLGUI
 	// ***************************************************************************
 	bool CGroupHTML::parseHtml(const std::string &htmlString)
 	{
-		std::vector<std::string> links;
-		std::string styleString;
-
 		CHtmlElement *parsedDOM;
 		if (_CurrentHTMLElement == NULL)
 		{
@@ -4836,16 +4847,28 @@ namespace NLGUI
 			parsedDOM = _CurrentHTMLElement;
 		}
 
+		std::vector<CHtmlParser::StyleLink> links;
+
 		CHtmlParser parser;
-		parser.getDOM(htmlString, *parsedDOM, styleString, links);
+		parser.getDOM(htmlString, *parsedDOM, _HtmlStyles, links);
 
-		if (!styleString.empty())
+		// <link> elements inserted from lua::parseHtml are ignored
+		if (_CurrentHTMLElement == NULL && !links.empty())
 		{
-			_Style.parseStylesheet(styleString);
+			addStylesheetDownload(links);
 		}
-		if (!links.empty())
+		else if (_CurrentHTMLElement != NULL)
 		{
-			addStylesheetDownload(links);
+			// Called from active element (lua)
+			// <style> order is not preserved as document is already being rendered
+			for(uint i = 0; i < _HtmlStyles.size(); ++i)
+			{
+				if (!_HtmlStyles[i].empty())
+				{
+					_Style.parseStylesheet(_HtmlStyles[i]);
+				}
+			}
+			_HtmlStyles.clear();
 		}
 
 		// this should rarely fail as first element should be <html>
@@ -4856,7 +4879,7 @@ namespace NLGUI
 		{
 			if (it->Type == CHtmlElement::ELEMENT_NODE && it->Value == "html")
 			{
-				// more newly parsed childs from <body> into siblings
+				// move newly parsed childs from <body> into siblings
 				if (_CurrentHTMLElement) {
 					std::list<CHtmlElement>::iterator it2 = it->Children.begin();
 					while(it2 != it->Children.end())
diff --git a/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
index de1a0e4d9..bcb83bf8e 100644
--- a/nel/src/gui/html_parser.cpp
+++ b/nel/src/gui/html_parser.cpp
@@ -57,7 +57,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 	// recursive function to walk html document
-	void CHtmlParser::parseNode(xmlNode *a_node, CHtmlElement &parent, std::string &styleString, std::vector<std::string> &links) const
+	void CHtmlParser::parseNode(xmlNode *a_node, CHtmlElement &parent, std::vector<std::string> &styles, std::vector<StyleLink> &links) const
 	{
 		uint childIndex = 0;
 		uint element_number;
@@ -145,7 +145,9 @@ namespace NLGUI
 
 					if (useStyle)
 					{
-						parseStyle(node->children, styleString);
+						std::string style;
+						parseStyle(node->children, style);
+						styles.push_back(style);
 					}
 					// style tag is kept in dom
 				}
@@ -163,13 +165,14 @@ namespace NLGUI
 
 					if (useStyle)
 					{
-						links.push_back(elm.getAttribute("href"));
+						styles.push_back("");
+						links.push_back(StyleLink(styles.size()-1, elm.getAttribute("href")));
 					}
 					// link tag is kept in dom
 				}
 				else if (node->children)
 				{
-					parseNode(node->children, elm, styleString, links);
+					parseNode(node->children, elm, styles, links);
 
 					// must cleanup nested tags that libxml2 does not fix
 					// dt without end tag: <dl><dt><dt></dl>
@@ -406,7 +409,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	void CHtmlParser::getDOM(std::string htmlString, CHtmlElement &dom, std::string &styleString, std::vector<std::string> &links) const
+	void CHtmlParser::getDOM(std::string htmlString, CHtmlElement &dom, std::vector<std::string> &styles, std::vector<StyleLink> &links) const
 	{
 		htmlParserCtxtPtr parser = htmlCreatePushParserCtxt(NULL, NULL, NULL, 0, NULL, XML_CHAR_ENCODING_UTF8);
 		if (!parser)
@@ -428,8 +431,7 @@ namespace NLGUI
 			xmlNode *root = xmlDocGetRootElement(parser->myDoc);
 			if (root)
 			{
-				styleString.clear();
-				parseNode(root, dom, styleString, links);
+				parseNode(root, dom, styles, links);
 			}
 			else
 			{

From a1f1bd888c44d2aa273099ff72dd63483a2689d9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 09:58:35 +0800
Subject: [PATCH 188/292] Fix rbank water mapping

---
 .../build_gamedata/processes/rbank/2_build.py | 26 +++++++++++----
 nel/tools/pacs/build_rbank/prim_checker.cpp   | 32 +++++++++++++------
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/nel/tools/build_gamedata/processes/rbank/2_build.py b/nel/tools/build_gamedata/processes/rbank/2_build.py
index b38aea94b..b4c0ca674 100755
--- a/nel/tools/build_gamedata/processes/rbank/2_build.py
+++ b/nel/tools/build_gamedata/processes/rbank/2_build.py
@@ -55,6 +55,7 @@ printLog(log, "")
 # Build rbank bbox
 printLog(log, ">>> Build rbank bbox <<<")
 tempBbox = ExportBuildDirectory + "/" + RbankBboxBuildDirectory + "/temp.bbox"
+rebuiltBbox = False
 if BuildIgBoxes == "":
 	toolLogFail(log, BuildIgBoxesTool, ToolSuffix)
 else:
@@ -70,6 +71,7 @@ else:
 	else:
 		printLog(log, "DETECT SKIP Shape->Bbox")
 	if needUpdateIg or needUpdateShape:
+		rebuiltBbox = True
 		printLog(log, "DETECT DECIDE UPDATE")
 		cf = open("build_ig_boxes.cfg", "w")
 		cf.write("\n")
@@ -204,23 +206,35 @@ elif ExecTimeout == "":
 	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
 else:
 	zonefiles = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonew")
+	zonesToBuild = []
 	for zonefile in zonefiles:
 		zone = os.path.basename(zonefile)[0:-len(".zonew")]
 		lr1 = ExportBuildDirectory + "/" + RbankSmoothBuildDirectory + "/" + zone + ".lr"
 		nearzones = subprocess.Popen([ GetNeighbors, zone ], stdout = subprocess.PIPE).communicate()[0].strip().split(" ")
 		printLog(log, "ZONE " + zone + ": " + str(nearzones))
-		zone_to_build = 0
+		zoneToBuild = 0
 		for nearzone in nearzones:
 			sourcePath = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + nearzone + ".zonew"
 			if (os.path.isfile(sourcePath)):
-				if (needUpdate(log, sourcePath, lr1)):
-					zone_to_build = 1
+				if (rebuiltBbox or needUpdate(log, sourcePath, lr1)):
+					zoneToBuild = 1
+					zonesToBuild.append(os.path.basename(zonefile))
 		sourcePath = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + zone + ".zonew"
-		if zone_to_build:
+		if zoneToBuild:
 			printLog(log, sourcePath + " -> " + lr1)
-			subprocess.call([ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g", os.path.basename(zonefile) ])
+			# subprocess.call([ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g", os.path.basename(zonefile) ])
 		else:
 			printLog(log, "SKIP " + lr1)
+	while len(zonesToBuild) > 0:
+		processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
+		processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
+		if len(zonesToBuild) > 64:
+			zonesToBuild = zonesToBuild[64:]
+		else:
+			zonesToBuild = []
+		print processCommand
+		print len(processCommand)
+		subprocess.call(processCommand)
 printLog(log, "")
 
 printLog(log, ">>> Detect modifications to rebuild lr <<<")
@@ -245,7 +259,7 @@ if needUpdateBboxRbank:
 else:
 	printLog(log, "DETECT SKIP Lr->Rbank")
 
-if needUpdateCmbLr or needUpdateCmbRbank or needUpdateLrRbank or needUpdateBboxRbank:
+if rebuiltBbox or needUpdateCmbLr or needUpdateCmbRbank or needUpdateLrRbank or needUpdateBboxRbank:
 	printLog(log, "DETECT DECIDE UPDATE")
 	printLog(log, ">>> Build rbank process global <<<") # This generates temp lr files. TODO: Check if the LR changed?
 	if BuildRbank == "":
diff --git a/nel/tools/pacs/build_rbank/prim_checker.cpp b/nel/tools/pacs/build_rbank/prim_checker.cpp
index e4c2b0b91..effd07bd7 100644
--- a/nel/tools/pacs/build_rbank/prim_checker.cpp
+++ b/nel/tools/pacs/build_rbank/prim_checker.cpp
@@ -336,13 +336,19 @@ void	CPrimChecker::render(CPrimZone *zone, uint8 bits)
  */
 void	CPrimChecker::render(const CPolygon &poly, uint16 value)
 {
+	static const sint centerOffset = 20480; // zones are max 40960
+	CPolygon polyOffset = poly;
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)polyOffset.Vertices.size(); ++i)
+		// center to computeBorders range (-32k to 32k)
+		polyOffset.Vertices[i] += CVector(-centerOffset, centerOffset, 0);
+
 	list<CPolygon>		convex;
 
 	// divide poly in convex polys
-	if (!poly.toConvexPolygons(convex, CMatrix::Identity))
+	if (!polyOffset.toConvexPolygons(convex, CMatrix::Identity))
 	{
 		convex.clear();
-		CPolygon	reverse = poly;
+		CPolygon	reverse = polyOffset;
 		std::reverse(reverse.Vertices.begin(), reverse.Vertices.end());
 		if (!reverse.toConvexPolygons(convex, CMatrix::Identity))
 			return;
@@ -357,6 +363,7 @@ void	CPrimChecker::render(const CPolygon &poly, uint16 value)
 		sint						ymin;
 
 		convex2d.computeBorders(rasterized, ymin);
+		ymin -= centerOffset; // uncenter
 
 		sint	dy;
 		for (dy=0; dy<(sint)rasterized.size(); ++dy)
@@ -365,19 +372,19 @@ void	CPrimChecker::render(const CPolygon &poly, uint16 value)
 
 			for (x=rasterized[dy].first; x<=rasterized[dy].second; ++x)
 			{
-				uint8	prevBits = _Grid.get((uint)x, (uint)(ymin+dy));
+				uint8	prevBits = _Grid.get((uint)x + centerOffset, (uint)(ymin + dy));
 
 				// only set if there was not a water shape there or if previous was lower
 				if ((prevBits & Water) != 0)
 				{
-					uint16	prevWS = _Grid.index((uint)x, (uint)(ymin+dy));
+					uint16	prevWS = _Grid.index((uint)x + centerOffset, (uint)(ymin + dy));
 
 					if (_WaterHeight[value] < _WaterHeight[prevWS])
 						continue;
 				}
 
-				_Grid.index((uint)x, (uint)(ymin+dy), value);
-				_Grid.set((uint)x, (uint)(ymin+dy), Water);
+				_Grid.index((uint)x + centerOffset, (uint)(ymin + dy), value);
+				_Grid.set((uint)x + centerOffset, (uint)(ymin + dy), Water);
 			}
 		}
 	}
@@ -389,13 +396,19 @@ void	CPrimChecker::render(const CPolygon &poly, uint16 value)
  */
 void	CPrimChecker::renderBits(const CPolygon &poly, uint8 bits)
 {
+	static const sint centerOffset = 20480; // zones are max 40960
+	CPolygon polyOffset = poly;
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)polyOffset.Vertices.size(); ++i)
+		// center to computeBorders range (-32k to 32k)
+		polyOffset.Vertices[i] += CVector(-centerOffset, centerOffset, 0);
+
 	list<CPolygon>		convex;
 
 	// divide poly in convex polys
-	if (!poly.toConvexPolygons(convex, CMatrix::Identity))
+	if (!polyOffset.toConvexPolygons(convex, CMatrix::Identity))
 	{
 		convex.clear();
-		CPolygon	reverse = poly;
+		CPolygon	reverse = polyOffset;
 		std::reverse(reverse.Vertices.begin(), reverse.Vertices.end());
 		if (!reverse.toConvexPolygons(convex, CMatrix::Identity))
 			return;
@@ -410,6 +423,7 @@ void	CPrimChecker::renderBits(const CPolygon &poly, uint8 bits)
 		sint						ymin;
 
 		convex2d.computeBorders(rasterized, ymin);
+		ymin -= centerOffset; // uncenter
 
 		sint	dy;
 		for (dy=0; dy<(sint)rasterized.size(); ++dy)
@@ -418,7 +432,7 @@ void	CPrimChecker::renderBits(const CPolygon &poly, uint8 bits)
 
 			for (x=rasterized[dy].first; x<=rasterized[dy].second; ++x)
 			{
-				_Grid.set((uint)x, (uint)(ymin+dy), bits);
+				_Grid.set((uint)x + centerOffset, (uint)(ymin + dy), bits);
 			}
 		}
 	}

From 76d29b2eda54ff250a66580478fb8fdca221ca8c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 4 Jan 2021 12:38:39 +0200
Subject: [PATCH 189/292] Fixed: Only call curl cleanup when needed.

---
 nel/src/web/http_client_curl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nel/src/web/http_client_curl.cpp b/nel/src/web/http_client_curl.cpp
index 10bb0776c..b62300089 100644
--- a/nel/src/web/http_client_curl.cpp
+++ b/nel/src/web/http_client_curl.cpp
@@ -55,7 +55,10 @@ bool CCurlHttpClient::connect(const std::string &/* server */)
 	curl_global_init(CURL_GLOBAL_ALL);
 	_CurlStruct = curl_easy_init();
 	if(_Curl == NULL)
+	{
+		curl_global_cleanup();
 		return false;
+	}
 
 	return true;
 }
@@ -195,8 +198,8 @@ void CCurlHttpClient::disconnect()
 	{
 		curl_easy_cleanup(_Curl);
 		_CurlStruct = NULL;
+		curl_global_cleanup();
 	}
-	curl_global_cleanup();
 }
 
 CCurlHttpClient CurlHttpClient;

From 00520d6c1198c107e11a69403502d9e9968472cf Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 09:58:44 +0800
Subject: [PATCH 190/292] Process rbank in parallel

---
 .../build_gamedata/processes/rbank/2_build.py | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/nel/tools/build_gamedata/processes/rbank/2_build.py b/nel/tools/build_gamedata/processes/rbank/2_build.py
index b4c0ca674..ee41ede7f 100755
--- a/nel/tools/build_gamedata/processes/rbank/2_build.py
+++ b/nel/tools/build_gamedata/processes/rbank/2_build.py
@@ -24,7 +24,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util
+import time, sys, os, shutil, subprocess, distutils.dir_util, multiprocessing
 sys.path.append("../../configuration")
 
 if os.path.isfile("log.log"):
@@ -226,15 +226,20 @@ else:
 		else:
 			printLog(log, "SKIP " + lr1)
 	while len(zonesToBuild) > 0:
-		processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
-		processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
-		if len(zonesToBuild) > 64:
-			zonesToBuild = zonesToBuild[64:]
-		else:
-			zonesToBuild = []
-		print processCommand
-		print len(processCommand)
-		subprocess.call(processCommand)
+		procs = []
+		for i in range(0, multiprocessing.cpu_count()):
+			processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
+			processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
+			if len(zonesToBuild) > 64:
+				zonesToBuild = zonesToBuild[64:]
+			else:
+				zonesToBuild = []
+			print processCommand
+			print len(processCommand)
+			proc = subprocess.Popen(processCommand)
+			procs.append(proc)
+		for proc in procs:
+			proc.wait()
 printLog(log, "")
 
 printLog(log, ">>> Detect modifications to rebuild lr <<<")

From 8fff5b875428ec36851814729d729ec66dc9d6f1 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 10:42:52 +0800
Subject: [PATCH 191/292] Disable CPU mask in zone lighter

---
 nel/src/3d/zone_lighter.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nel/src/3d/zone_lighter.cpp b/nel/src/3d/zone_lighter.cpp
index 570ba1075..0ba8c2b95 100644
--- a/nel/src/3d/zone_lighter.cpp
+++ b/nel/src/3d/zone_lighter.cpp
@@ -350,7 +350,7 @@ void setCPUMask (IThread *thread, uint process)
 		}
 
 		// Set the CPU mask
-		thread->setCPUMask (1<<i);
+		// thread->setCPUMask (1<<i);
 	}
 }
 
@@ -379,7 +379,7 @@ public:
 	void run()
 	{
 		// Set the CPU mask
-		setCPUMask (Thread, _Process);
+		// setCPUMask (Thread, _Process);
 
 		_ZoneLighter->processCalc (_Process, *_Description);
 		_ZoneLighter->_ProcessExitedMutex.enter();
@@ -624,7 +624,7 @@ void RenderTriangle (const CZoneLighter::CTriangle &triangle, const CZoneLighter
 void NL3D::CRenderZBuffer::run()
 {
 	// Set the CPU mask
-	setCPUMask (Thread, _Process);
+	// setCPUMask (Thread, _Process);
 
 	// Span array
 	CPolygon2D::TRasterVect borders;
@@ -927,7 +927,7 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight
 	// Backup thread mask
 	IThread *currentThread = IThread::getCurrentThread ();
 	uint64 threadMask = currentThread->getCPUMask();
-	currentThread->setCPUMask (1);
+	// currentThread->setCPUMask (1);
 
 	// Calc the ray basis
 	_SunDirection=description.SunDirection;
@@ -1219,7 +1219,7 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight
 	}
 
 	// Reset old thread mask
-	currentThread->setCPUMask (threadMask);
+	// currentThread->setCPUMask (threadMask);
 
 	// overflow ?
 	if (_ZBufferOverflow)

From 06006cffd3cc05cf35a90d3b82c833dfa03e623f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 10:44:42 +0800
Subject: [PATCH 192/292] Parallel processing of rbank, zone heightmap, and
 zone lighter

---
 .../build_gamedata/configuration/scripts.py   | 23 ++++++++++++++++-
 .../build_gamedata/processes/rbank/2_build.py | 25 ++++++++-----------
 .../build_gamedata/processes/zone/2_build.py  |  3 ++-
 .../processes/zone_light/2_build.py           |  3 ++-
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/nel/tools/build_gamedata/configuration/scripts.py b/nel/tools/build_gamedata/configuration/scripts.py
index 5bbed497f..6e885bdd3 100755
--- a/nel/tools/build_gamedata/configuration/scripts.py
+++ b/nel/tools/build_gamedata/configuration/scripts.py
@@ -23,7 +23,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util
+import time, sys, os, shutil, subprocess, distutils.dir_util, multiprocessing, math
 
 ActiveProjectDirectory = os.getenv("NELBUILDACTIVEPROJECT", "configuration/project")
 sys.path.append(ActiveProjectDirectory)
@@ -32,6 +32,27 @@ def printLog(log, text):
 	log.write(text + "\n")
 	print text
 
+pendingProcesses = []
+processLimit = math.ceil(multiprocessing.cpu_count() * 0.75)
+
+def callParallelProcess(command):
+	res = 0
+	if len(pendingProcesses) >= processLimit:
+		waitingProc = pendingProcesses.pop(0)
+		res = waitingProc.wait()
+	proc = subprocess.Popen(command)
+	pendingProcesses.append(proc)
+	return res
+
+def flushParallelProcesses():
+	res = 0
+	while (len(pendingProcesses) > 0):
+		waitingProc = pendingProcesses.pop(0)
+		procRes = waitingProc.wait()
+		if procRes != 0:
+			res = procRes
+	return res
+
 def mkPath(log, path):
 	printLog(log, "DIR " + path)
 	distutils.dir_util.mkpath(path)
diff --git a/nel/tools/build_gamedata/processes/rbank/2_build.py b/nel/tools/build_gamedata/processes/rbank/2_build.py
index ee41ede7f..6a55e94fc 100755
--- a/nel/tools/build_gamedata/processes/rbank/2_build.py
+++ b/nel/tools/build_gamedata/processes/rbank/2_build.py
@@ -24,7 +24,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util, multiprocessing
+import time, sys, os, shutil, subprocess, distutils.dir_util
 sys.path.append("../../configuration")
 
 if os.path.isfile("log.log"):
@@ -226,20 +226,15 @@ else:
 		else:
 			printLog(log, "SKIP " + lr1)
 	while len(zonesToBuild) > 0:
-		procs = []
-		for i in range(0, multiprocessing.cpu_count()):
-			processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
-			processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
-			if len(zonesToBuild) > 64:
-				zonesToBuild = zonesToBuild[64:]
-			else:
-				zonesToBuild = []
-			print processCommand
-			print len(processCommand)
-			proc = subprocess.Popen(processCommand)
-			procs.append(proc)
-		for proc in procs:
-			proc.wait()
+		processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
+		processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
+		if len(zonesToBuild) > 64:
+			zonesToBuild = zonesToBuild[64:]
+		else:
+			zonesToBuild = []
+		print processCommand
+		callParallelProcess(processCommand)
+	flushParallelProcesses()
 printLog(log, "")
 
 printLog(log, ">>> Detect modifications to rebuild lr <<<")
diff --git a/nel/tools/build_gamedata/processes/zone/2_build.py b/nel/tools/build_gamedata/processes/zone/2_build.py
index f9a31e3c4..cb9287c36 100755
--- a/nel/tools/build_gamedata/processes/zone/2_build.py
+++ b/nel/tools/build_gamedata/processes/zone/2_build.py
@@ -147,7 +147,8 @@ else:
 		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
 		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zonew"
 		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-			subprocess.call([ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ])
+			callParallelProcess([ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ])
+	flushParallelProcesses()
 printLog(log, "")
 
 log.close()
diff --git a/nel/tools/build_gamedata/processes/zone_light/2_build.py b/nel/tools/build_gamedata/processes/zone_light/2_build.py
index 84d2b26a4..53a926c29 100755
--- a/nel/tools/build_gamedata/processes/zone_light/2_build.py
+++ b/nel/tools/build_gamedata/processes/zone_light/2_build.py
@@ -68,7 +68,8 @@ else:
 		destFile = destDir + "/" + file[0:-len(".zonew")] + ".zonel"
 		if (needUpdateLogRemoveDest(log, srcFile, destFile)):
 			dependFile = dependDir + "/" + file[0:-len(".zonew")] + ".depend"
-			subprocess.call([ ExecTimeout, str(ZoneLightBuildTimeout), ZoneLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
+			callParallelProcess([ ExecTimeout, str(ZoneLightBuildTimeout), ZoneLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
+	flushParallelProcesses()
 printLog(log, "")
 
 # For each zone_light ig

From 06be2d003cd908f46ab36d7869c7787462aaa794 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 11:13:20 +0800
Subject: [PATCH 193/292] Parallel wmap sizes

---
 .../build_gamedata/processes/ai_wmap/2_build.py    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nel/tools/build_gamedata/processes/ai_wmap/2_build.py b/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
index 8aa63f62f..8dd43be16 100755
--- a/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
+++ b/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
@@ -68,13 +68,15 @@ else:
 		printLog(log, ">>> Generate sized wmap <<<")
 		subprocess.call([ AiBuildWmap, "pacsBuildGabarit " + AiWmapContinentName ])
 		printLog(log, ">>> Generate cwmaps for each size <<<")
-		subprocess.call([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_0" ])
-		subprocess.call([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_1" ])
-		subprocess.call([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_2" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_0" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_1" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_2" ])
+		flushParallelProcesses()
 		printLog(log, ">>> Generate bitmap for each size <<<")
-		subprocess.call([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_0" ])
-		subprocess.call([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_1" ])
-		subprocess.call([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_2" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_0" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_1" ])
+		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_2" ])
+		flushParallelProcesses()
 		printLog(log, ">>> Clear height maps for size 1 and 2 <<<")
 		subprocess.call([ AiBuildWmap, "pacsClearHeightmap " + AiWmapContinentName ])
 		printLog(log, ">>> Cut tga for world editor <<<")

From 3164e5fe3e884cf96f4b3d7523dce67ca30dae4c Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 4 Jan 2021 20:25:28 +0800
Subject: [PATCH 194/292] Parallel ig light

---
 nel/tools/build_gamedata/processes/zone_light/2_build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nel/tools/build_gamedata/processes/zone_light/2_build.py b/nel/tools/build_gamedata/processes/zone_light/2_build.py
index 53a926c29..1e8e0c925 100755
--- a/nel/tools/build_gamedata/processes/zone_light/2_build.py
+++ b/nel/tools/build_gamedata/processes/zone_light/2_build.py
@@ -95,7 +95,8 @@ else:
 			if (needUpdateLogRemoveDest(log, igsrcFile, destFile)):
 				srcFile = srcDir + "/" + file
 				dependFile = dependDir + "/" + file[0:-len(".zonel")] + ".depend"
-				subprocess.call([ ExecTimeout, str(ZoneIgLightBuildTimeout), ZoneIgLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
+				callParallelProcess([ ExecTimeout, str(ZoneIgLightBuildTimeout), ZoneIgLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
+	flushParallelProcesses()
 printLog(log, "")
 
 log.close()

From 30ece314c58cd81e584d65a99c2c7d7ef9220895 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 5 Jan 2021 12:10:32 +0800
Subject: [PATCH 195/292] Add tool to unbuild heightmaps

---
 nel/tools/3d/CMakeLists.txt                   |   1 +
 nel/tools/3d/unbuild_elevation/CMakeLists.txt |  11 +
 nel/tools/3d/unbuild_elevation/gold_pill.ico  | Bin 0 -> 3638 bytes
 nel/tools/3d/unbuild_elevation/main.rc        |  42 ++
 .../unbuild_elevation/unbuild_elevation.cpp   | 477 ++++++++++++++++++
 5 files changed, 531 insertions(+)
 create mode 100644 nel/tools/3d/unbuild_elevation/CMakeLists.txt
 create mode 100644 nel/tools/3d/unbuild_elevation/gold_pill.ico
 create mode 100644 nel/tools/3d/unbuild_elevation/main.rc
 create mode 100644 nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp

diff --git a/nel/tools/3d/CMakeLists.txt b/nel/tools/3d/CMakeLists.txt
index e6ba62e3b..8bf56b6c8 100644
--- a/nel/tools/3d/CMakeLists.txt
+++ b/nel/tools/3d/CMakeLists.txt
@@ -32,6 +32,7 @@ IF(WITH_NEL_TOOLS)
       zone_ig_lighter
       zone_lighter
       zone_welder
+      unbuild_elevation
       zone_elevation
       shapes_exporter
       shape2obj
diff --git a/nel/tools/3d/unbuild_elevation/CMakeLists.txt b/nel/tools/3d/unbuild_elevation/CMakeLists.txt
new file mode 100644
index 000000000..e6b7636d3
--- /dev/null
+++ b/nel/tools/3d/unbuild_elevation/CMakeLists.txt
@@ -0,0 +1,11 @@
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(unbuild_elevation ${SRC})
+
+TARGET_LINK_LIBRARIES(unbuild_elevation nel3d nelmisc nelligo)
+NL_DEFAULT_PROPS(unbuild_elevation "NeL, Tools, 3D: Unbuild Elevation")
+NL_ADD_RUNTIME_FLAGS(unbuild_elevation)
+
+INSTALL(TARGETS unbuild_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
diff --git a/nel/tools/3d/unbuild_elevation/gold_pill.ico b/nel/tools/3d/unbuild_elevation/gold_pill.ico
new file mode 100644
index 0000000000000000000000000000000000000000..618b67a5d196bdbdc4d497a3b7ca998b79039677
GIT binary patch
literal 3638
zcmeH|zityj5XQf`vv2R8lRF0=!64zvLOcRZ@(47%1EO$G<y3BvC=dmeJERCY3R7Z1
z6-9EIP(hItF%<}j0;ram-97svCk9a=bU$gezMXG(*0a(#0Kr3+f#(qSn?N5xuV=sa
zL*Oy5-QqQtfR~Mqr^~r>7suZ;o}Ow9KWIF7uW|24qu=jCYmGObHC}wun9t{!&1Sg$
zP6MyLV>})M&yFz~jWC%^fQS2+=cprf1?md?hZP`8`Oj#}K*|8hER?sITv4;NA<$;R
zq>3WH(P#z%rJ<n63%w|cV@l*RRUpqdad#fO+4+2B-oKpL-q_=oV>$%(X!S5zlUP+N
zzr|;JJa&1AAFqXdR(y5mKwA%eZ9P`}w)9@{Sn*u(Tk&M^-mm(n@m=v)<GIhzjQ?W%
z(ReRjelb3bCx;je2Ee1YwHL2_h&otTpsv6_R{>}3W?H=*(Tyb(EO1J?UWK}aqZ<UG
zpzSKxsK_1dqALRGT&>Wd!Zofe&kK&zR)e`x(xG<j$TAU7!}pZ5DhK7#--I~J+Z^{*
z6oye0aUb&-%52mMIPOJhtF@7uHpsF{Jc)C;K-fw)ZSNEj#f$w(Z0@hje(9Q$W+e_%
z=khQ2+xl<@(`w86FUl*2JJ!EXsjBA-D!@JcxBS3Rp8z+ffZ79m8Q^!Rj&gm<niJN_
Ho<HFiPbAmK

literal 0
HcmV?d00001

diff --git a/nel/tools/3d/unbuild_elevation/main.rc b/nel/tools/3d/unbuild_elevation/main.rc
new file mode 100644
index 000000000..d784a3092
--- /dev/null
+++ b/nel/tools/3d/unbuild_elevation/main.rc
@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Zone Elevation"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "zone_elevation" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
diff --git a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
new file mode 100644
index 000000000..f3c109a25
--- /dev/null
+++ b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
@@ -0,0 +1,477 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "../zone_lib/zone_utility.h"
+
+#include <iostream>
+#include <nel/misc/types_nl.h>
+#include <nel/misc/file.h>
+#include <nel/misc/i_xml.h>
+#include <nel/misc/common.h>
+#include <nel/misc/cmd_args.h>
+#include <nel/misc/bitmap.h>
+//#include <nel/3d/quad_tree.h>
+#include <nel/3d/zone.h>
+//#include <nel/3d/landscape.h>
+//#include <nel/3d/zone_smoother.h>
+//#include <nel/3d/zone_tgt_smoother.h>
+//#include <nel/3d/zone_corner_smoother.h>
+#include <nel/ligo/zone_region.h>
+#include <vector>
+#include <set>
+
+using namespace NL3D;
+using namespace NLMISC;
+using namespace NLLIGO;
+using namespace std;
+
+namespace /* anonymous */
+{
+
+sint32 s_ZoneMinX, s_ZoneMinY, s_ZoneMaxX, s_ZoneMaxY;
+float s_CellSize = 160.0f;
+
+std::string s_SourceDir; /* R:\reference\2008_july\data\r2_desert */
+std::string s_ReferenceDir; /* R:\pipeline\export\continents\r2_desert\zone_weld */
+
+std::string s_OutputPy; 
+
+std::string s_SourceExt = "zonel";
+std::string s_ReferenceExt = "zonenhw";
+
+CZoneRegion s_Land; /* "R:\graphics\landscape\ligo\desert\r2_desert.land" */
+
+int s_Warnings;
+
+// unbuild_elevation --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "Y:\temp\r2_desert_elevation.Py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld"
+// --land "R:\graphics\landscape\ligo\jungle\zorai.land" --referenceext zonenhw "X:\wsl\big_zorai.py" "R:\reference\2008_july\data\zorai_zones" "R:\pipeline\export\continents\zorai\zone_weld"
+// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "X:\wsl\big_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld"
+// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" "X:\wsl\big_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld"
+// --land "R:\graphics\landscape\ligo\jungle\r2_forest.land" "X:\wsl\big_r2_forest.py" "R:\reference\2008_july\data\r2_forest" "R:\pipeline\export\continents\r2_forest\zone_weld"
+// --land "R:\graphics\landscape\ligo\lacustre\r2_lakes.land" "X:\wsl\big_r2_lakes.py" "R:\reference\2008_july\data\r2_lakes" "R:\pipeline\export\continents\r2_lakes\zone_weld"
+// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" "X:\wsl\big_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld"
+
+bool loadLand(const string &filename)
+{
+	try
+	{
+		CIFile fileIn;
+		if (fileIn.open (filename))
+		{
+			CIXml xml(true);
+			nlverify(xml.init(fileIn));
+			s_Land.serial(xml);
+		}
+		else
+		{
+			nlwarning("Can't open the land file: %s", filename.c_str());
+			return false;
+		}
+	}
+	catch (const Exception& e)
+	{
+		nlwarning("Error in land file: %s", e.what());
+		return true;
+	}
+	return true;
+}
+
+bool getXYFromZoneName(sint32 &x, sint32 &y, const string &zoneName)
+{
+	string xStr, yStr;
+	uint32 i = 0;
+	while (zoneName[i] != '_')
+	{
+		yStr += zoneName[i];
+		++i;
+		if (i == zoneName.size())
+			goto Fail;
+	}
+	if (!NLMISC::fromString(yStr, y))
+		goto Fail;
+	y = -y;
+	++i;
+	while (i < zoneName.size())
+	{
+		xStr += zoneName[i];
+		++i;
+	}
+	if (xStr.size() != 2)
+		goto Fail;
+	xStr = NLMISC::toUpperAscii(xStr);
+	x = ((xStr[0] - 'A') * 26 + (xStr[1] - 'A'));
+	return true;
+Fail:
+	x = -1;
+	y = -1;
+	return false;
+}
+
+void getBitmapSize(int &w, int &h)
+{
+	sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
+	sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
+	w = sizeX * 20;
+	h = sizeY * 20;
+}
+
+void getBitmapCoord(float &xc, float &yc, float x, float y)
+{
+	float deltaZ = 0.0f, deltaZ2 = 0.0f;
+	CRGBAF color;
+	sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
+	sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
+
+	clamp(x, s_CellSize * s_ZoneMinX, s_CellSize * (s_ZoneMaxX + 1));
+	clamp(y, s_CellSize * s_ZoneMinY, s_CellSize * (s_ZoneMaxY + 1));
+
+	xc = (x - s_CellSize * s_ZoneMinX) / (s_CellSize * sizeX);
+	yc = 1.0f - ((y - s_CellSize * s_ZoneMinY) / (s_CellSize * sizeY));
+}
+
+bool processZone(std::vector<NLMISC::CVector> &output, const std::string &sourceFile, const std::string &referenceFile)
+{
+	std::string zone = CFile::getFilenameWithoutExtension(referenceFile);
+
+	std::vector<CVector> sourceVertices;
+	std::vector<CVector> referenceVertices;
+	{
+		CZoneInfo zoneInfo;
+		{
+			CZone zone;
+			{
+				CIFile f(sourceFile);
+				zone.serial(f);
+				f.close();
+			}
+			zone.retrieve(zoneInfo);
+		}
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)zoneInfo.Patchs.size(); ++i)
+		{
+			sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[0]);
+			sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[1]);
+			sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[2]);
+			sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[3]);
+		}
+	}
+	{
+		CZoneInfo zoneInfo;
+		{
+			CZone zone;
+			{
+				CIFile f(referenceFile);
+				zone.serial(f);
+				f.close();
+			}
+			zone.retrieve(zoneInfo);
+		}
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)zoneInfo.Patchs.size(); ++i)
+		{
+			referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[0]);
+			referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[1]);
+			referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[2]);
+			referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[3]);
+		}
+	}
+	printf("Source vertices: %i, reference vertices: %i\n", (int)sourceVertices.size(), (int)referenceVertices.size());
+	if (sourceVertices.size() != referenceVertices.size())
+	{
+		nlwarning("Mismatching vertex count in zone %s, source vertices: %i, reference vertices: %i", zone.c_str(), (int)sourceVertices.size(), (int)referenceVertices.size());
+		++s_Warnings;
+	}
+
+	std::vector<bool> processedSourceIndices;
+	std::vector<bool> processedReferenceIndices;
+	processedSourceIndices.resize(sourceVertices.size());
+	processedReferenceIndices.resize(referenceVertices.size());
+
+	int referenceProcessedCount = 0;
+	int sourceProcessedCount = 0;
+
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)referenceVertices.size(); ++i)
+	{
+		if (processedReferenceIndices[i])
+			continue;
+
+		float referenceHeight = referenceVertices[i].z;
+		int referenceHeightDiv = 1;
+		++referenceProcessedCount;
+
+		for (ptrdiff_t j = i + 1; j < (ptrdiff_t)referenceVertices.size(); ++j)
+		{
+			if (processedReferenceIndices[j])
+				continue;
+
+			if (abs(referenceVertices[i].x - referenceVertices[j].x) < 0.1f
+				&& abs(referenceVertices[i].y - referenceVertices[j].y) < 0.1f)
+			{
+				processedReferenceIndices[j] = true;
+				referenceHeight += referenceVertices[j].z;
+				++referenceHeightDiv;
+				++referenceProcessedCount;
+			}
+		}
+
+		float sourceHeight = 0.f;
+		int sourceHeightDiv = 0;
+
+		for (ptrdiff_t j = 0; j < (ptrdiff_t)sourceVertices.size(); ++j)
+		{
+			if (processedSourceIndices[j])
+				continue;
+
+			if (abs(referenceVertices[i].x - sourceVertices[j].x) < 0.1f
+				&& abs(referenceVertices[i].y - sourceVertices[j].y) < 0.1f)
+			{
+				processedSourceIndices[j] = true;
+				sourceHeight += sourceVertices[j].z;
+				++sourceHeightDiv;
+				++sourceProcessedCount;
+			}
+		}
+
+		if (!sourceHeightDiv)
+		{
+			nlwarning("No matching vertices in source for zone %s, x: %f, y: %f", zone.c_str(), referenceVertices[i].x, referenceVertices[i].y);
+			++s_Warnings;
+			continue;
+		}
+
+		if (referenceHeightDiv != sourceHeightDiv)
+		{
+			nlwarning("Mismatching vertex count for zone %s, x: %f, y: %f (reference: %i, source: %i)", zone.c_str(), referenceVertices[i].x, referenceVertices[i].y, referenceHeightDiv, sourceHeightDiv);
+			++s_Warnings;
+			continue;
+		}
+
+		referenceHeight /= (float)referenceHeightDiv;
+		sourceHeight /= (float)sourceHeightDiv;
+
+		output.push_back(NLMISC::CVector(referenceVertices[i].x, referenceVertices[i].y, sourceHeight - referenceHeight));
+	}
+
+	return true;
+}
+
+bool unbuildElevation()
+{
+	std::vector<std::string> referenceZones;
+	CPath::getPathContent(s_ReferenceDir, true, false, true, referenceZones);
+	int totalZones = 0;
+
+	std::vector<NLMISC::CVector> output;
+
+	for (std::vector<std::string>::iterator it(referenceZones.begin()), end(referenceZones.end()); it != end; ++it)
+	{
+		if (CFile::getExtension(*it) != s_ReferenceExt)
+			continue;
+
+		std::string zone = CFile::getFilenameWithoutExtension(*it);
+		std::string sourceZone = s_SourceDir + "/" + CFile::getFilenameWithoutExtension(*it) + "." + s_SourceExt;
+
+		if (!CFile::fileExists(sourceZone))
+			continue;
+
+		printf("%s\n", nlUtf8ToMbcs(zone));
+		++totalZones;
+
+		if (!processZone(output, sourceZone, *it))
+			return false;
+
+		printf("\n");
+	}
+
+	printf("Total zones: %i\n", totalZones);
+
+#if 1
+
+	std::vector<bool> processedOutput;
+	processedOutput.resize(output.size());
+	std::vector<NLMISC::CVector> reducedOutput;
+	for (ptrdiff_t i = 0; i < (ptrdiff_t)output.size(); ++i)
+	{
+		if (processedOutput[i])
+			continue;
+
+		CVector v = output[i];
+		int div = 1;
+
+		for (ptrdiff_t j = i + 1; j < (ptrdiff_t)output.size(); ++j)
+		{
+			if (processedOutput[j])
+				continue;
+
+			if (abs(output[i].x - output[j].x) < 0.1f
+				&& abs(output[i].y - output[j].y) < 0.1f)
+			{
+				processedOutput[j] = true;
+				v.z += output[j].z;
+				++div;
+			}
+		}
+
+		v.z /= (float)div;
+		reducedOutput.push_back(v);
+	}
+
+	printf("Reduced vertex count from %i to %i\n", (int)output.size(), (int)reducedOutput.size());
+
+#else
+
+	std::vector<NLMISC::CVector> reducedOutput = output;
+
+#endif
+
+	{
+		int w, h;
+		getBitmapSize(w, h);
+
+		FILE *fo = fopen(nlUtf8ToMbcs(s_OutputPy), "w");
+		if (!fo)
+			return false;
+
+		fprintf(fo, "import naturalneighbor # https://github.com/innolitics/natural-neighbor-interpolation - pip3 install naturalneighbor\n");
+		fprintf(fo, "import numpy as np\n");
+		fprintf(fo, "import png # pip3 install pypng\n");
+		fprintf(fo, "grid_ranges = [[0, 1, %i%s], [0, 1, %i%s], [-1, 1, 1j]]\n", w, "j", h, "j");
+
+		fprintf(fo, "points = np.array([\n");
+
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)reducedOutput.size(); ++i)
+		{
+			float x, y;
+			getBitmapCoord(x, y, reducedOutput[i].x, reducedOutput[i].y);
+			fprintf(fo, "\t[ %f, %f, 0 ], # %f, %f\n", x, y, reducedOutput[i].x, reducedOutput[i].y);
+		}
+
+		fprintf(fo, "])\n");
+		fprintf(fo, "\n");
+		fprintf(fo, "values = np.array([\n");
+
+		for (ptrdiff_t i = 0; i < (ptrdiff_t)reducedOutput.size(); ++i)
+		{
+			fprintf(fo, "\t%f,\n", reducedOutput[i].z);
+		}
+
+		fprintf(fo, "])\n");
+
+		fprintf(fo, "nn_interpolated_values = naturalneighbor.griddata(points, values, grid_ranges)\n");
+		fprintf(fo, "img = []\n");
+		fprintf(fo, "for y in range(0, %i):\n", h);
+		fprintf(fo, "\tline = []\n");
+		fprintf(fo, "\tfor x in range(0, %i):\n", w);
+		fprintf(fo, "\t\tline.append(np.round(nn_interpolated_values[x][y][0]).astype(int) + 127)\n");
+		fprintf(fo, "\timg.append(line)\n");
+		fprintf(fo, "with open('%s.png', 'wb') as f:\n", CFile::getFilenameWithoutExtension(s_OutputPy).c_str());
+		fprintf(fo, "\tw = png.Writer(%i, %i, greyscale=True)\n", w, h);
+		fprintf(fo, "\tw.write(f, img)\n");
+		fflush(fo);
+		fclose(fo);
+	}
+
+	printf("Warnings: %i\n", s_Warnings);
+	return true;
+}
+
+bool unbuildElevation(NLMISC::CCmdArgs &args)
+{
+	s_OutputPy = args.getAdditionalArg("output")[0];
+	s_SourceDir = args.getAdditionalArg("source")[0];
+	s_ReferenceDir = args.getAdditionalArg("reference")[0];
+
+	if (args.haveLongArg("zonemin") && args.haveLongArg("zonemax"))
+	{
+		sint32 zoneMinX, zoneMinY;
+		sint32 zoneMaxX, zoneMaxY;
+		if (!getXYFromZoneName(zoneMinX, zoneMinY, args.getLongArg("zonemin")[0])
+			|| !getXYFromZoneName(zoneMaxX, zoneMaxY, args.getLongArg("zonemax")[0]))
+		{
+			return false;
+		}
+		s_ZoneMinX = min(zoneMinX, zoneMaxX);
+		s_ZoneMaxX = max(zoneMinX, zoneMaxX);
+		s_ZoneMinY = min(zoneMinY, zoneMaxY);
+		s_ZoneMaxY = max(zoneMinY, zoneMaxY);
+	}
+	else if (args.haveLongArg("land"))
+	{
+		if (!loadLand(args.getLongArg("land")[0]))
+			return false;
+		s_ZoneMinX = s_Land.getMinX();
+		s_ZoneMaxX = s_Land.getMaxX();
+		s_ZoneMinY = s_Land.getMinY();
+		s_ZoneMaxY = s_Land.getMaxY();
+	}
+	else
+	{
+		nlwarning("Must have either both 'zonemin' and 'zonemax', or 'land' specified");
+		return false;
+	}
+
+	if (args.haveLongArg("cellsize"))
+	{
+		if (!NLMISC::fromString(args.getLongArg("cellsize")[0], s_CellSize))
+			return false;
+	}
+
+	if (args.haveLongArg("sourceext"))
+	{
+		s_SourceExt = args.getLongArg("sourceext")[0];
+	}
+
+	if (args.haveLongArg("referenceext"))
+	{
+		s_ReferenceExt = args.getLongArg("referenceext")[0];
+	}
+
+	return unbuildElevation();
+}
+
+} /* anonymous namespace */
+
+int main(int argc, char **argv)
+{
+	NLMISC::CApplicationContext myApplicationContext;
+
+	NLMISC::CCmdArgs args;
+
+	args.addAdditionalArg("output", "Output Python file path");
+	args.addAdditionalArg("source", "Input folder with zones at the right height");
+	args.addAdditionalArg("reference", "Input folder with zones at the wrong height");
+
+	args.addArg("", "sourceext", "extension", "Source zone extension (default: zonel)");
+	args.addArg("", "referenceext", "extension", "Reference zone extension (default: zonew)");
+
+	args.addArg("", "land", "land", "Ligo land file (either specify this or the boundaries)");
+	args.addArg("", "zonemin", "zone", "Zone boundary");
+	args.addArg("", "zonemax", "zone", "Zone boundary");
+	args.addArg("", "cellsize", "meters", "Zone cell size (default: 160)");
+
+	if (!args.parse(argc, argv))
+	{
+		return EXIT_FAILURE;
+	}
+
+	if (!unbuildElevation(args))
+	{
+		args.displayHelp();
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+/* end of file */
\ No newline at end of file

From 87b5a77d4fb29c00301d153bb322f58f9e3b9b79 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 5 Jan 2021 22:41:55 +0800
Subject: [PATCH 196/292] Add elevation snippets to weld bound vertices

---
 .../3d/zone_elevation/zone_elevation.cpp      | 196 ++++++++++++++++++
 1 file changed, 196 insertions(+)

diff --git a/nel/tools/3d/zone_elevation/zone_elevation.cpp b/nel/tools/3d/zone_elevation/zone_elevation.cpp
index 598cfda31..abe9b511c 100644
--- a/nel/tools/3d/zone_elevation/zone_elevation.cpp
+++ b/nel/tools/3d/zone_elevation/zone_elevation.cpp
@@ -186,6 +186,111 @@ NLMISC::CVector getHeightNormal(float x, float y)
 	// compute the heightmap normal with the tangents
 	return (ds ^ dt).normed();
 }
+// ***************************************************************************
+// void CExport::computeSubdividedTangents(uint numBinds, const NL3D::CBezierPatch &patch, uint edge, NLMISC::CVector subTangents[8])
+void computeSubdividedTangents(uint numBinds, const NL3D::CBezierPatch &patch, uint edge, NLMISC::CVector subTangents[8])
+{
+	// Subdivide the Bezier patch to get the correct tangents to apply to neighbors
+	CBezierPatch	subPatchs1_2[2];
+	CBezierPatch	subPatchs1_4[4];
+
+	// subdivide on s if edge is horizontal
+	bool		subDivideOnS= (edge&1)==1;
+
+	// Subdivide one time.
+	if(subDivideOnS)	patch.subdivideS(subPatchs1_2[0], subPatchs1_2[1]);
+	else				patch.subdivideT(subPatchs1_2[0], subPatchs1_2[1]);
+
+	// Subdivide again for bind 1/4.
+	if(numBinds==4)
+	{
+		if(subDivideOnS)
+		{
+			subPatchs1_2[0].subdivideS(subPatchs1_4[0], subPatchs1_4[1]);
+			subPatchs1_2[1].subdivideS(subPatchs1_4[2], subPatchs1_4[3]);
+		}
+		else
+		{
+			subPatchs1_2[0].subdivideT(subPatchs1_4[0], subPatchs1_4[1]);
+			subPatchs1_2[1].subdivideT(subPatchs1_4[2], subPatchs1_4[3]);
+		}
+	}
+
+	// Now, fill the tangents according to edge.
+	bool	invertPaSrc= edge>=2;
+	// Bind 1/2 case.
+	if(numBinds==2)
+	{
+		// 4 tangents to fill.
+		for(uint i=0;i<4;i++)
+		{
+			// get patch id from 0 to 1.
+			uint	paSrcId= i/2;
+			// invert if edge is 2 or 3
+			if(invertPaSrc) paSrcId= 1-paSrcId;
+			// get tg id in this patch.
+			uint	tgSrcId= (i&1) + edge*2;
+			// fill result.
+			subTangents[i]= subPatchs1_2[paSrcId].Tangents[tgSrcId];
+		}
+	}
+	// Bind 1/4 case.
+	else
+	{
+		// 8 tangents to fill.
+		for(uint i=0;i<8;i++)
+		{
+			// get patch id from 0 to 3.
+			uint	paSrcId= i/2;
+			// invert if edge is 2 or 3
+			if(invertPaSrc) paSrcId= 3-paSrcId;
+			// get tg id in this patch.
+			uint	tgSrcId= (i&1) + edge*2;
+			// fill result.
+			subTangents[i]= subPatchs1_4[paSrcId].Tangents[tgSrcId];
+		}
+	}
+}
+
+// ***************************************************************************
+// bool CExport::applyVertexBind(NL3D::CPatchInfo &pa, NL3D::CPatchInfo &oldPa, uint edgeToModify, bool startEdge, ...
+bool applyVertexBind(NL3D::CPatchInfo &pa, NL3D::CPatchInfo &oldPa, uint edgeToModify, bool startEdge,
+	const NLMISC::CMatrix &oldTgSpace, const NLMISC::CMatrix &newTgSpace,
+	const NLMISC::CVector &bindedPos, const NLMISC::CVector &bindedTangent )
+{
+	// Get the vertex to modify according to edge/startEdge
+	uint	vertexToModify= edgeToModify + (startEdge?0:1);
+	vertexToModify&=3;
+
+	// If already moved, no-op
+	if(pa.Patch.Vertices[vertexToModify]==bindedPos)
+		return false;
+	else
+	{
+		// Change the vertex
+		pa.Patch.Vertices[vertexToModify]= bindedPos;
+
+		// change the tangent, according to startEdge
+		pa.Patch.Tangents[edgeToModify*2 + (startEdge?0:1) ]= bindedTangent;
+
+		// Must change the tangent which is on the other side of the vertex:
+		uint	tgToModify= 8 + edgeToModify*2 + (startEdge?-1:+2);
+		tgToModify&=7;
+		/* To keep the same continuity aspect around the vertex, we compute the original tangent in a
+		special space: the Binded Patch Tangent Space. Once we have the original tangent in the original patch TgSpace,
+		we reapply it in the transformed patch TgSpace, to get the transformed tangent
+		*/
+		pa.Patch.Tangents[tgToModify]= newTgSpace * ( oldTgSpace.inverted() * oldPa.Patch.Tangents[tgToModify] );
+
+
+		// Do the same to the associated interior.
+		pa.Patch.Interiors[vertexToModify]= newTgSpace * ( oldTgSpace.inverted() * oldPa.Patch.Interiors[vertexToModify] );
+
+
+		// modified
+		return true;
+	}
+}
 
 void applyZoneHeightmap()
 {
@@ -201,6 +306,9 @@ void applyZoneHeightmap()
 	std::vector<CBorderVertex> zoneBorderVertices;
 	zone.retrieve(zonePatches, zoneBorderVertices);
 
+	// Bkup the original patchs.
+	vector<CPatchInfo> oldPatchInfos = zonePatches;
+
 	// Apply the Heighmap to all vertices/tangents/interiors (see Land Export tool.)
 	for (size_t i = 0; i < zonePatches.size(); ++i)
 	{
@@ -254,6 +362,94 @@ void applyZoneHeightmap()
 		}
 	}
 
+	// See `void CExport::transformZone (CZone &zeZone, sint32 nPosX, sint32 nPosY, uint8 nRot, uint8 nFlip, bool computeHeightmap)`
+	// 3. For all binds, reset the position of near vertices/tangents/interiors. Must do it at last
+	// --------
+	bool bindVertexModified = true;
+	// Since this is a recursive problem (binded patchs may bind other patchs), do it unitl all vertices no more move :)
+	while (bindVertexModified)
+	{
+		bindVertexModified = false;
+		for (size_t i = 0; i < zonePatches.size(); ++i)
+		{
+			CPatchInfo &rPI = zonePatches[i];
+
+			// For all edges
+			for (size_t j = 0; j < 4; ++j)
+			{
+				uint numBinds = rPI.BindEdges[j].NPatchs;
+				// If this edge is binded on 2 or 4 patches.
+				if (numBinds == 2 || numBinds == 4)
+				{
+					// compute the 4 or 8 tangents along the edge (in CCW)
+					CVector subTangents[8];
+					computeSubdividedTangents(numBinds, rPI.Patch, j, subTangents);
+
+					// For all vertex to bind: 1 or 3.
+					for (uint vb = 0; vb < numBinds - 1; vb++)
+					{
+						// compute the s/t coordinate
+						float bindS, bindT;
+						// 0.5, or 0.25, 0.5, 0.75
+						float ec = (float)(vb + 1) / (float)numBinds;
+						switch (j)
+						{
+						case 0:	bindS= 0;	 bindT= ec; break;
+						case 1:	bindS= ec;	 bindT= 1; break;
+						case 2:	bindS= 1;	 bindT= 1-ec; break;
+						case 3:	bindS= 1-ec; bindT= 0; break;
+						}
+
+						// compute the vertex position from big patch.
+						CVector bindedPos;
+						bindedPos = rPI.Patch.eval(bindS, bindT);
+
+						// Compute a TgSpace matrix around this position.
+						CMatrix oldTgSpace;
+						CMatrix newTgSpace;
+
+						// Build the original tgtSpace (patch before deformation)
+						oldTgSpace.setRot(oldPatchInfos[i].Patch.evalTangentS(bindS, bindT),
+						    oldPatchInfos[i].Patch.evalTangentT(bindS, bindT),
+						    oldPatchInfos[i].Patch.evalNormal(bindS, bindT));
+						oldTgSpace.normalize(CMatrix::ZYX);
+						oldTgSpace.setPos(oldPatchInfos[i].Patch.eval(bindS, bindT));
+
+						// Build the new tgtSpace
+						newTgSpace.setRot(rPI.Patch.evalTangentS(bindS, bindT),
+						    rPI.Patch.evalTangentT(bindS, bindT),
+						    rPI.Patch.evalNormal(bindS, bindT));
+						newTgSpace.normalize(CMatrix::ZYX);
+						newTgSpace.setPos(bindedPos);
+
+						// apply to the 2 smaller binded patchs which share this vertex.
+						uint edgeToModify;
+						sint ngbId;
+						CVector bindedTangent;
+
+						// The first patch (CCW) must change the vertex which starts on the edge (CCW)
+						edgeToModify = rPI.BindEdges[j].Edge[vb];
+						// get the tangent to set
+						bindedTangent = subTangents[vb * 2 + 1];
+						// get the patch id.
+						ngbId = rPI.BindEdges[j].Next[vb];
+						bindVertexModified |= applyVertexBind(zonePatches[ngbId], oldPatchInfos[ngbId], edgeToModify,
+						    true, oldTgSpace, newTgSpace, bindedPos, bindedTangent);
+
+						// The second patch (CCW) must change the vertex which ends on the edge (CCW)
+						edgeToModify = rPI.BindEdges[j].Edge[vb + 1];
+						// get the tangent to set
+						bindedTangent = subTangents[vb * 2 + 2];
+						// get the patch id.
+						ngbId = rPI.BindEdges[j].Next[vb + 1];
+						bindVertexModified |= applyVertexBind(zonePatches[ngbId], oldPatchInfos[ngbId], edgeToModify,
+						    false, oldTgSpace, newTgSpace, bindedPos, bindedTangent);
+					}
+				}
+			}
+		}
+	}
+
 	// Save zone
 	zone.build(zoneId, zonePatches, zoneBorderVertices);
 	COFile centerSave(s_OutputZone);

From 661a2bdaf7827cac9c863ab1eb4c69edafd244da Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 4 Jan 2021 20:34:56 +0200
Subject: [PATCH 197/292] Added small program to measure font atlas
 performance, ryzom/ryzomcore#626

---
 nel/samples/3d/CMakeLists.txt           |   1 +
 nel/samples/3d/font/main.cpp            |  32 +++++++-
 nel/samples/3d/font_perf/CMakeLists.txt |  14 ++++
 nel/samples/3d/font_perf/beteckna.ttf   | Bin 0 -> 16488 bytes
 nel/samples/3d/font_perf/main.cpp       |  99 ++++++++++++++++++++++++
 5 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 nel/samples/3d/font_perf/CMakeLists.txt
 create mode 100644 nel/samples/3d/font_perf/beteckna.ttf
 create mode 100644 nel/samples/3d/font_perf/main.cpp

diff --git a/nel/samples/3d/CMakeLists.txt b/nel/samples/3d/CMakeLists.txt
index 772ab0056..1062579cd 100644
--- a/nel/samples/3d/CMakeLists.txt
+++ b/nel/samples/3d/CMakeLists.txt
@@ -1,4 +1,5 @@
 ADD_SUBDIRECTORY(font)
+ADD_SUBDIRECTORY(font_perf)
 ADD_SUBDIRECTORY(cluster_viewer)
 ADD_SUBDIRECTORY(shape_viewer)
 
diff --git a/nel/samples/3d/font/main.cpp b/nel/samples/3d/font/main.cpp
index 5a656be49..1d5eaa114 100644
--- a/nel/samples/3d/font/main.cpp
+++ b/nel/samples/3d/font/main.cpp
@@ -22,6 +22,7 @@
 #include "nel/misc/event_emitter.h"
 #include "nel/misc/event_listener.h"
 #include "nel/misc/path.h"
+#include "nel/misc/random.h"
 
 // look at 3dinit example
 #include "nel/3d/nelu.h"
@@ -97,10 +98,12 @@ int main(int argc, char **argv)
 	CNELU::EventServer.addEmitter(CNELU::Driver->getEventEmitter());
 	CNELU::AsyncListener.addToServer(CNELU::EventServer);
 
+	NLMISC::CValueSmoother smoothFPS;
+	NLMISC::CRandom rnd;
 	do
 	{
 		// look at 3dinit example
-		CNELU::clearBuffers(CRGBA(0,0,0));
+		CNELU::clearBuffers(CRGBA(120,120,0));
 
 		// now, every frame, we have to render the computer string.
 
@@ -168,12 +171,39 @@ int main(int argc, char **argv)
 		tc.setHotSpot (CComputedString::BottomRight);
 		tc.printAt (0.99f, 0.01f, string("Press <ESC> to quit"));
 
+		/*for(uint i = 0; i < 1000; ++i)
+		{
+			uint fontSize = rnd.rand(40) + 10;
+			tc.setColor(CRGBA(rnd.rand(255), rnd.rand(255), rnd.rand(255)));
+			tc.setFontSize(fontSize);
+			tc.setHotSpot(CComputedString::MiddleMiddle);
+			tc.printAt(rnd.frand(1.f), rnd.frand(1.f), toString("%d", fontSize));
+		}*/
+
+		{
+			static TTicks oldTick = CTime::getPerformanceTime();
+			TTicks newTick = CTime::getPerformanceTime();
+			double deltaTime = CTime::ticksToSecond (newTick-oldTick);
+			oldTick = newTick;
+			smoothFPS.addValue((float)deltaTime);
+			deltaTime = smoothFPS.getSmoothValue ();
+			if (deltaTime > 0.0)
+			{
+				//printf("FPS: %.5f\n", 1.f/deltaTime);
+				tc.setFontSize(16);
+				tc.setColor(CRGBA::Yellow);
+				tc.setHotSpot(CComputedString::TopLeft);
+				tc.printAt(0.01f, 0.99f, toString("FPS:%.f", 1.0f/deltaTime));
+			}
+		}
+
 		// look 3dinit example
 		CNELU::swapBuffers();
 		CNELU::screenshot();
 
 		// look at event example
 		CNELU::EventServer.pump(true);
+
 	}
 	while(!CNELU::AsyncListener.isKeyPushed(KeyESCAPE));
 
diff --git a/nel/samples/3d/font_perf/CMakeLists.txt b/nel/samples/3d/font_perf/CMakeLists.txt
new file mode 100644
index 000000000..2f794c983
--- /dev/null
+++ b/nel/samples/3d/font_perf/CMakeLists.txt
@@ -0,0 +1,14 @@
+FILE(GLOB SRC *.cpp)
+
+ADD_EXECUTABLE(nl_sample_font_perf ${SRC})
+
+ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font_perf/\\"")
+
+TARGET_LINK_LIBRARIES(nl_sample_font_perf nelmisc nel3d)
+NL_DEFAULT_PROPS(nl_sample_font_perf "NeL, Samples, 3D: Font Performance Test")
+NL_ADD_RUNTIME_FLAGS(nl_sample_font_perf)
+
+INSTALL(TARGETS nl_sample_font_perf RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samples3d)
+INSTALL(FILES beteckna.ttf DESTINATION ${NL_SHARE_PREFIX}/nl_sample_font_perf COMPONENT samples3d)
+
+
diff --git a/nel/samples/3d/font_perf/beteckna.ttf b/nel/samples/3d/font_perf/beteckna.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e9a117f4d4906362913e2eebe10d06c0119ce957
GIT binary patch
literal 16488
zcmeHu2Yg%A{qH&FUfrubEy+{Xuq9iPWm(gE$4Trs)3FneB#yHQ&Ljz;BmojgNLYQ8
z(Xu-K6bc1G!f5`i0EM=UKp1VI1qv;t6#k{ObVYjKb7hAl4|xB+Pd}gc-se*#SGxDy
zbAEfBVL}NZCbEkNWPMjxU+>hPmgf=DIs>i6Q#+@0kxFtNAvJ69?3y}z*1TWctSQ0s
z_XsiGG<Dwm_O(}Sz5>q&@ZLRZUUlr%`+xNbA#@v_myDe~y59f#;S3=H`qKwjj&53?
z%>omtS%&xOm21yk(X(RJ+k{AcgaqDSwS08hdwEZI@$MhEQmfFQ-YM?J*aV)-R-L_h
zoBKz>d3b&m*YUOM#zw^j#=V57R^k2oXOC`MPaY#2{{lR_$4Adz-t}C3oRCN>+A{0c
zZQA_I-<Y3}D1R;^oOiln1@-Q_WU;C7PedoYixzUU|1!Lv_?5C-#dhHhJgN!ft@vP^
z@J4nk85G|lBzs6~S0Lry<-X5RTFxOK6P?n)M^dG&HP?X%>;n2RQ4zu}Wk0~nU*>-C
zwuYiNBNF7qKf4I&P`(Lq^XJ(srYyscJDU~U*;-Bs*@tJ&3t_jh`}jM;06WH8XfLjN
z@n#1#(mql^e@KGtb#eoXk{<REX&_%EHmWB98XyUBoRrfKNvqQK2C2fY5pddA9Vw-k
zkZG)#6w(YSp|2A&JwaS-CW+8DNhJ#r9}|e5e4RKkM#t8W8SHv8j^ANcMuvrbWK@Wd
zA@&H_Ck&D;LO$8et|phWv&bG{Gug)eL9U^D$u&$(8iZ1EA=^TB3LD6Fp@m!{jFP$R
zCiL5c-?uUDb+VToCR;J)QoJ7%j*^7XL3ROln@~iy(P7d^-zN!JK#Yx$ud`}WExb#s
zJ`?{a*`?rrgY2c_WFLK&xCAHJ!8Vffh52Nyg1>`wvj2g8y`+`>jO=8OlI^GAw*!AU
z*}%R{;_MG(j6F-P0=^v_-{gh<r3$~C=id<fDeXgNzJvTE@&gjUm7-<P%L<Z$mAxl^
zmplY@a+}~+aZcalUOaKl7ZZ_OhhHyrFT!}XlUwobQSt<Nn!HTjB=3;ll0OStcY(Vk
zpw8lhzHX(@Bjj=N6#BeD-X`xVee&JKxjxxnWe;a>&)$-~DSJcq%IqcCJ=u%0TTd)|
zW8jVXKRt`&Y#e~T_(P=$<3u-Z*(bedav10rM3p3~HCmnCU^JO6R$HFk;mj{6EGjN>
zmAXA%Us<_7P*E8Sg{vaf(VAF1kxZp)>*^aCo0?l%+uA!2sisbw-rX~!cjm0wbLP(L
zo8LdMVBz4<@Q8wC=@?l~R*+RI$!fBOtUYTIH6dqzdYijjyy(o9)1Q~*9ye@UxBm1O
zcp4?#Ge7T>M{@t7WSHzFuTn1^r@QHQ=u?cad{)n<v0=7`-NGJZZwqBYyRb$0k?;#K
zC2kb25uX%a6F*X^Ro$xRRUb$(X^nKN^pNy|Tqq~xc6o`sUA|QQmVCdOs4LWK)i<c$
zQvXF$rfJj+YIbR^)7+zZQuDIrJ<UI~YOO<?&~DS-rTsuB>hg6<blY`%b>GoFqI+KV
zo-U(r)GyQDs(;nsG9(O34BHIX7>*c@8$K{vjc#M7ah35K#-ADgVse<)m@YTnV|w3Q
zW^OkxG2d%`+5C~kXlb^LTd%SG85&0Hp^q^;tWzc=Zt+;kJr+-lUYYp@4QGxs`-$Jh
z=-r4?Mk3Gy?0)n!U_@N-$%$s_u;)o$KlKf&hKzwo0RP$jnW;yLz0_0UD)Vs*Dqs=X
zz&<8=Qb35USx6`RMrxNF&QEW<g<^wMEDQN)<nB*zSwvOgjO3S;QdgmQz2Vdc4mU`q
z(5u;6QbbAtH*Sw7aoK&!<xBePzGNU7Px_Lj6t9-e9PDktr+08>9X>M$+1djK4h+p3
z_zFI>zi)^R_90nukG&!LCX2HV6nWGTQVy6x+%BhM4yWvwjm!ah1X&71SRn0iI%27G
z${+CKv6<2Co*q@tjG|PVyD~h@9g@S<(@X2BRQATBzNoF#+#Pi_G}?*+(MUmhTA?P`
zGk!qO57R<RVRJwh!|6tAfxfD<FR`ykGHWageFk-Dad^OD(^^`m_cm8>`c$L`(Ot`2
z(3TCn2S^As<~dTygkRzsaZ!7okw&QS8ExfG8ldL~{Qf|5u(2T+Y-kKV5WuIN-|-fD
zUM#aG_Wc68qcGo=SLm-%8)M$Ggh7|2^-h~D-(j^mCK}@gZE|%ivl}8}q#^q*JH)<6
z%8-c&^`}z~XF5V9E-j}~%yYU}I+b?D1F5vnA(uNPS%Sz?G&0guy3Ua{Em`NYxbh{t
zxwNbxPcrwfNo<>*-m)br%v1R@zkMe;Exg@kj?u3!p6-#|iBgZQ$QY>at<)D+hHC4)
zb$vcj-%)q|!rilG{l|wXS=CY(UCL!eiH$|b9`+}q;g&}sB3NEtcb?xD^sz|MY;TE+
zl@>PU`UX%Xyd$WIg^;w1I+LK#462hxDof@H&GMPEjg;!=&0ZnXt5;m<U*9~gqjS}3
z8&>-EkEt_vEBF%G?c|SwR)K+Wh<qtCY$FMHdFGF_IT*TmvzM!{S$>s&eaqPZp*gE@
zW!a?waaWFxa^%7X*(byUn$y+P>u;g~8E)na$j*4mVWOq9MY#eI8oyVPJfbcyPbYd+
zszOPn@@lLVDzVb6^{A-CzLRIATFD^_PL+XL^QcC2Tl5u-Rp>2lQJurrN^YUwXXU*5
zp-DOIa|Y~CRg&Jhj}D1f9H4`=agbj5Wi~{=_BBPO*{8`RWCyH|q;nC#D9Fu%A3DwR
zh03hva<y5d*GWva6i+F1(bAH<a!0YKmFxv}JyR8O7*({M9;Da8$AD91r}t#O#IX$V
zcSewPfb8Ttn}Cl9W6A}W))EhOmz4Uv=+}nM51^I+jJS`czqf{3m$8R(S*tXAf)%p=
z1S}V%2>YXHI0ys=%aapn#4V@8?vRZXN<J@KwZE#S&b^?o$UB@0Ua~*lFLXu@9Ef((
zb$eP`bq#F?E^qPW1tRsEujp&9D@iUqe9v%8Al?dUIla^HC9&rb--t~Pv`}Xaf{`!a
z`+8yX#c@jMD5Z=Rr+1__o%qAdnYl5A*(_u1Vd4Pow3$;O$$^y9B}gV(ZdWA>X`|Oz
z8S)JnXD0VI4pvE3kvnKPgtR9y+M!jKRmRR1Xk^yX4aqlzA&RUFI!dyi&^G}SH8ViM
z>Ly?^Np?}A;FAI{>sUJ0jNlOP1!!@&%8{2UpPx6Q`SP~K0edJIWM!=jYR+C=U)ETW
zA8JG34h#wOCV53wg<j6{Mdu5&d1$;kJUTGD&MVe-TFf-mKDEifnPS8Yyw9)~a0d;R
zTLfx}%RCB)Xp+*FgVY+K!DWx0MaTX~^_h?9FEifxH-96<P*ziDNkCP7gkZj66A)EF
zFqOUj04N8+NFY$1oQ?<9(Q`U$icJMmqVcwPG`yv*VNt43UEvGPn=U-f*pbXFqUd+_
zPES#%tJxJ4f}MTydYmO@_T+4Z#t6x021Q0mV2VIau!VREf!*ho?0HW3E07CL2SOM1
zd4V;Z2NHPb;NmpW7^5uDR&>F%h2`bWj=9Te-{RW&Hl5X|p|rH1ysv3%x20%xdWtJH
zbI?^(QrSk0){ZG7p|)P?oawxHv&32%^*Hr~#WkMF?t=2-vkGUcL!B-v^rS`#L@FDa
zxjZWIbw4}EGqTMdr*RrcPCJo#=R9hq?BK|W+t`qRX_!EK*$<c+K2U^gSckp|FaUOt
z10)%#Sz!W(kW8fg&O8@WLSO(%EXPuW8ks#0uF&o;P0yW~@`i-Ev4D4NW7`IgXK_<U
zsI{jpm=4Fo!Q_AVtG$VaxG(B2p?|HOpC6?D`~@{tz3t=uu~1ba8tqx#+5X#bTL~>`
ztEy?!Yjpb7n>DGBC+eV%s3)9K!%dlDo3FDcQ9+<IutBt-HyvR{#xqws<)SiT39^Lb
z^G4|I+U_2kU8Lo;t?9Cn=8@Wl<sC?Ck-@ev-BBKBiZ5uSe@Zl}i;Ie?{As69SQqLT
zt7a^`qN`?b`&atu>&ps*N=?Zy*D+z<@+xA=r%?-0#g>a-xN`=o1NhH!KeHyo3|(8~
zrlmzLj~nI#`gPe~V(#$^K!K&68U2Kl&@5-hK`|G;h6_p&zHEMbu}Y(I<Rcu41$4Lw
z1x0ZQP*5@hGbS_Z<9eqm*{Mng(#)LM+AxD|q<{W9>wBy?badtJ^A%dg$x|%MOiG=C
z$fHV^J5_;=j6TRR?fjd17SIJB;sRV$vCN%=Yg0L8RUjQ0ru!OZWG+7gEO;CS?x#@y
zlyWPy#hebKV1hf^<#;-gYJtljjlx@GXEXhj<IH-2stsnVI^=iLA!aBKR+g<^SUcOD
zkQ(e0vi;6xUB1n3QAYyp^&U&2vLYPp3eFw#mUZMsPJDGz<O*-2#403VCo>3wY&n9L
zHzL4@;j5^^c!k4#(I4P-PQc%cBE#WK#(A-kbJi3bmy-yWb}^>|g=RTyjawM6(~Oke
z=km4mCfYX6tSjuRx@p$*y}?wXu+lp`!&EjjJ58x8*4$BIm8UaFU@A>_eu06`@ocK=
zxX{~B*0!>tyfNU-H)dY)#1dgOqf`@0#5{wjkF=E?{lk&{%Tw*avgqF4x{mS^V~MLk
zcF(B|Ppxza293V7cy`s4vLbzcfjhcuhTE42_in0KI6FnDN@p}{-txq4%u}Lk(z?p1
zJqdjbVJh|_dkt$EJVQIFFW`}V)E1EG6_vDTaewCba~4y_C96i+&xcQ3c=#~8BD4K3
ze}Ncb8T*iD((EqSzlYa}wzxCp0{^l%FOFXpkbOxR0Y-_iNn!Hl(jSW9X_XdT$jfM?
z!=(-mw`gvy8CX|VEt`_%ORf*ZWOJ&V-NmS{c4~XQNnj2AV|^(Ig0fY|R8<Z26_jRv
z{UMEZO{qb4qGU_<zu4P|yU4~!y{Lv{t~e-&KcF%+GDIl`{W7wk$!W7sH7@ebxxOsg
zvnsxREYcX>zIml*|8RTFW9%WJSZA=dSWBs}xOe4~(R^0s?Wm}dO_phtUbgxi&Nm~w
zvl(_hJ4EcH99*Xyal~{br%19_@&<es6*mySY>PQk>1O8tz}91~A8W5Lc=VMkd+c#@
zGFCiBZ!SEmM>WGMl(o(A#F|WMc96lVQn8|`H(s`>P)5jS2VZIJq4dQ2OlQnnwqX_6
zBbS2!39%d6vROPyk1`4IBrm7iGVdHcO0Ddk6Eo+2GVk%Z=({JIrN3tPD)p%)ZsF4v
zPjb%)x{2)IiC#K=-V<{<%x$P={=trM9a5Qxbw2;#rVo>b?N16+dBL9?@mLG>rP<%9
zHMVcs^2X6+lB(;{1+hd<x`xHxXsmXqz^BvBX^q#74vUvkdiGz<nn;AP()e`?=YMNE
zf|F1JQMcM$j9K&MBxm%tt|`rLy{sGbTm!qh9_t~fd1&0?vy|hCmrxID9vsXZ8Xl%S
z?C^<hnx>hj*geyK37udJu8)-YBka)TyJiS+;{FrUm3Ix<m+9A#|4})lxuXVzxXr<h
zVp-YD)(R#KYH4J~$dbxwg<@bq1AR5)?ONAVWWt1!k_#c58`+&i%W2V2ALX=I=!Y9K
z@6kD%GKYtU*`1jqnXBol%ysOp%n$gOotV#l0v)0FfR5}Q%WJeKvlp8A<~(*c-fz$T
zT_Eg5t``jz;zdGSpbur<@b#BI`xDoIk9O02C&KiZ%tut0iKCywU-oVGUGTtjHb}rQ
z%LfDWh_HaZn2E9nGG_Yzi7;$)ZuW#=VUJ^lA&g;O=xjn`FhoVEff(jX2)j@+FF{yN
z&GZJpx36E8miHIA3iGEd3k%|^5uZC69yq^|vZhOheSV*N;QS^g#MjTNVw<#uH!m7K
zV3S1s!mVwC2lCXjG`7|Idgom|ZkAN0Rr_bpx?;Uu4|?_>z7)V$bnq5pLx4b45RffA
zE-0m!@8aj0hbw7lar^4w;kE9lQ^>3KutSvA^{*JHhoc{7Z1hb}O?}L(_}<*?A13(Y
z)*3@iD?8-?&*&`C%$!~$a|!VnW;W?kXgVU$Z!WleAWB2Q#-6%?&GRmvQx%?bQFr}F
zT?z9xjyBA05<9z7`l3Q1(6*W#ZCbkH!d*2T&F$%?WxMw5T-G$Zx_9Y{rM=Yw)r^KF
zLtyFBk*UDTV*tLEU=Cm=m~z-qT=2kW^9hm<-zS;d{aj*R#Ab+;e|!10I@4-lcp+zz
zaTbqITG2Ll)^tbad$bOGKFwCYG07%uWN-HGY!22KgPhA#*9H*QK67zktZ{l-q-IW8
zR2@sqElyMyGF#`*11Y=DIydcY?{JiaQt^_eIVIZaKK7`!xFe_*qm6C0Vy!pXJSX^-
z64|1)j{1!nPib_q#i6x!&Fbsmtb&%U@W)p6edGvY^Vns<m$U`8(x(rJBjSDR&e`<D
zHz^zD(**RrlrXlD-9hpRDWb@aP%^3~#or=ATKEkss7$7l!9vVhhC~{ivT$TUX8^O6
zJ2E4|u8=c7G&RiVO_{}QD_cCw*RrCCep7)vmi;+<4KV>UP#Y>%8n-!_ZsVfNf0kx`
zw`ju(dIwdX@XuhEXLxp^B$54{utc#tLW^iXhgq(U`fT*sTRs}N`Es-6iklaHOgCoE
zV?U&sYT6U<XAaV1C(;V8UEnvv9)u5(c-mG?<CqgO6Sdi$)%e-f{^X9~?Sm~{y=!J~
zeWreO?M+wIj?l_`ckNoVW+OfKQ06&IYWv>$DK8F{c_jN1=-{%87ty#5R?@cm@WIu;
zrEApe-pmKon)zzxkU+c99sRe#u5M?yDKXn4Q;%Jhrk>;U<+{v$^t=-<wbR*|W9+uU
zjA4k4P$dsjf+Yr8f;t`XBrZ5HFXD5fCc0=B-EkqkfIY%SPW*kC%LM&y&&_E)NcFTe
z^YJoj!}}BM3ho&41s*vZPlyH(dIRw^wJy4VUbutpT0G2DBbWeFtfgD%<LnnazCo;*
zlhVicUpLg4VAh{JLzPJ=CDqwGXcm1@m?HuvX*N?c7dZ**?@s!O@KfGSWoMeMX}UHh
z{B-)c)$pl**CPKv)*^>LzZN-kqKDTa^I-?@DXbryQH$*Q{91&^J=7vR+M#$0VA1dN
zS_ChY#FoaSAy<kFUB9kvPJ9Xz!r>XKcAYFmhUc}GmIy*$S8em~z+@%Tr;)s&mVtF6
z{r%}4)yYakXpD5Uv`yRQEo4FyN)gb#7qMXfXVoIn&#y)HVca{P)*|~(twmg@MRt5v
zEizT9MdV@4=hq@TP>Wpuzt$qZ`=VOpeAFU;I<*%0+3B^&TI89J&ZtH1`WMwAov1|^
zY7q-oZV74;t~1n*D8x@zA}A)&np+EjhUsP7+9IN=t?S%#r<Z$Fs+LsSoVD|2EtFJ=
z^w^EJE)G=)^1uk&w77j}%lx5%(1!Z9ad%)=By`<^S=XeNZb@9yb@`$(gix{zb%*VX
z>W*EgJAyQ{q;2)ch?10T)!r|tJ6f}UKu+Lw)qk_@xDs_o4Go2wX4Lhg?wA`6DRoD!
zi`N~EO5Ksv7Z-~Dwl)7u-LVtQ4gGKHj-CI<bq8uw*748O9rOQPcl@jBjtz)4AAWA#
zvEiSpJL0gDb+CW!MBO3yP;<u<tM0pJ^}BS9OiwR8DB(_X&6#z_BlM-uuR9pIioL^1
zg;l5*u<k`qu1}SpyrbX9txRS9EB7muPj21$_)T#s-@~KWBX_cC6Ey*fd8Tc?ZlWd-
zay5bQ2I>VpR@s!AK|XbrVkP=6JAI`>_~o?i)f-M*t(b)K`bjvzQ%X-+?f4Pk%sB(j
zYk)I;8XR$gp2Z5!#e8q@v-my@@|&m2;Gr{+6iqHo`6h1yr=i3yeko$vwZbOM{VbSm
zU~Q0|+<n7*if_pIPs3POke^==2`59LBvx8ZTg4ILW`n_E(i<!utUQ#s%UF5hbaaTF
z${K@kJ7hH>an&g+4KxTzWnP_JZxC*uer{yxWS*ZKdvIbbq%5C0b_2!^oE&-&<hy2a
zDEPD^za1A=DzYsnsKq}^wv$u5W|qL@HRfV@Mm90~qYvlS0%2~-dh1;$r+LlGTYSE@
zvl|y)F;E@tKhQrh4-|YQFhlJ4_!N8Od&<}G3E$X^>gwLHl}mdgvzqxlaIC3m+0KhG
z9pp9oq%Hm1CjV`d6DJh@uiGRJiLvL%mxTc(Mquw_a>sr$J|yxB3i2c2L>T`Cr`cdM
zn-B*)Ua_pCw47oY6V65gEQRw^?<sqYSRg{xol0Z<$gxu>aJvMdrbx&1CbrgAqRB6*
znxQdIGw76YDON?UWWQ3zVbKul<&w-#E!2vRQnyM96=+0*iQQ%^)j5j8vvuZfEwU2g
z49E93_Ir%uXE#p8$k(Sn8~u4K-{TTkv`9yFXV9Xzy43l_Aj~vf55gD$UDU~bJpunz
z%F?GkoJQuwpHH*J>ekwet7hrV-8wM9$a~pa#di80=_k)ae0-K-VwjZRNC@JdGj4ZA
z`5uAnM1?B{{M9s?tj6hufE+b3iE|fkp=eB}_{K*nj)hiaQwR?mHq4nP(EwJl&`qh8
zvG5>B-fD))b_+}ToYmCC5vCI@LLluAF>JY}{mB*~mBdLBy8;Hac5d;O|8TG(U&^(c
zu)hyz%xR($h!W^61!_r9F&*FZU@T8XsZ*_{29c>X8Z{MzDiswe6|ACxQb{nV90rN1
zRQXl|Y(cFPv`iEQ*<chgP(_zZ0xdL9f#JVOtI=7_1$v!E5Je^#byf|dszQy<#=FY-
zE?H($p#i%f0@DGipc5pjmNZ(trYfr_Nd;=F$y!yemDF-m$Yhk%Mu!u-;d$q2tva)4
zu^4qGlT|}6GV>8sFbf8;(4^B+fhMikBBr(?K`jb`P(b4bgQOCu9=tHo#>^g1ifQyZ
zShR-etb&XcD9Y4oQI<h!=3Qz~8P$|w*NK5RwWN~;K_xP?S`Z9cEjp{Pex(vsq9m(|
z@+7TnGE<w)V9}~&NhsDE)oK|#rxNxqFkaFb0&bmbG;~%Oj5=e4d9>=H;-XQlppi`=
zTfliYEKTdkL)jmTEjW8)z~QuWFoW5POnepj8qVzfp8OFO2FsA8JQIw@-$Jp=Rt*H7
z8bv^{h}35qM6%R$QtxuLq)et^WPy~!E=$$S4@<-HFxDAiJbn~L)!ZISVIUEX%*5A_
z?M}t2qf#lBTyyr!C*|A_6=QB;pW1R-v1J|z6kA3(NTfJ4zw9t!Pk}b8Oh&cFY>r5h
z5TVDg4OVDU$pt!_rBJWeLSi_nptor}T0J*MmAasmn@SNja-k-@!w6FmaRNjxp!wRM
zw=L#qi9~hId~A$3F3{R^W+5K3X?D6)RKRIM0S0UrwE`D36aL|4MwyDj&jeY`5;|kO
zR;`0^+EmiF3k@2REJJ7ZJPTL89Rsv#4Xi+gy(pJt6>&sIW=0hVpem`rW&|d+UeIV%
zYNJsFC!x}p%z|tcMXyD0VC(K|(c`vSWuq}|HmPb}V|tZIqtdI@k{&iMs+a}*7`0k>
zA8^Q$q*fKfnA9c<&9fP-FeU&kF&Og=c9q7O4Ev^3mv?xzn&Oh;F|DXpn`oZa{AZKJ
zfW0Dt$vP}SYgA@Y5KV$upb-o@xx5Qhuz_-wN<-Be5uI)|!yC<lQ7qz)B02<jp{H1s
z6)%BIS#>F#3B=hbHT%42rq%0;b(CqT9uA3VgIXhSvY1&CMH9Gav#a$MY)bHtk=%(a
zlKVJGbmE?3?Q?MA9(jsvn79|PD)89Ey@)=4ow!%wOmXf+HjaZ6HJyrzi;7s2BoSP>
zdx~}UX%qJh@qKLKUO?-%iF*-!elu~eB5rK{<;F^YpCp}RBTi{<CF8_RmXdSv-A&e!
zRcPZaz4+aXf1B`c9a>1|#?h_g?xp9tyVtE69e4MRZr;3U(>lCp$9dAtxW>p?=r@Xn
z<(rp}oi&cTUNkRLTp4FedzUX;eGY!R6nLAJ-;HD?y0}RVIE&)99@m-ha;-HaiL-C~
zilJwe*T!Az#y5AZ+qiPMyCxEK*Sjb2;<hGPm8^<Iqv&-exKqgM2kwpFZ?!^^TY<|d
zNho)2Li(3)+_ZY#xH}rHiQo(dTD|}p&xgt<dr|JZdG6_yZ@zg-(Mv$3uYzV}=v;&O
zsSf%xz;;Z~mxWj{m(0UnkpsKR`KSvDar&efa~>CFL2m3bdvUg-4EwHroK3928G<0z
zW5SS2gj9p>8sLtDgCt2oMzuJ#Qje4EjiiY*lNQp7Q(f&iL*GfJK>kx<E7PI%9-IT{
zB{Rt^GMmgHbICl?N9H4^50C|9AuM+YXBI{fi7z8};0*OrX!^&H+)5lDUQO0Q=Nrg+
z@+DZ;VR9c%S|3945#@8nS4ZQ~HvSt+M{D_S7d~79IC0GsOULdeKcS^O39umwxlBrt
z;!X>`U4*V3-8>FS@pnWyt<7(8?_J>h%=i2aJ!|<!J|@?X!{xf+en^eo3Zyi=<U*cb
zXqc{{-=cqGQS91WjlUXrTwp?<a9DU=cux$AE5ut=lB!I#U3H7Zq-D}QvRUqzKgQNY
zivCS~fNfO2rBQ2An!jjgs^1cx*WRTo)b;6Z(--H)=$rMg8M+Lw0>3?bHF0LY0xGOo
zerCj${Vg<TBG*FaH$lHQgV*bz*?#D@0&l9I+b{`cU&dXBqTOmmw_)fuNYdF$NL?1%
z%|@Z$X40752OZZzv;EL*1$0{l-PVw9jPC)YUa|xljzh-@Xt@$Pu7QrL(K}8C0Ba#&
z4QBn&buSstUJHHC1Z^g=2sYUR3dca<7$_VC<`;qaVPJj;=Tct;<{yxz?6ZLKBA`4B
zDCYyhj}&{}P0X2f7`+dpFU9CR;4eb_pecw`j*09mpf^Ig@Z62(Uhq4ZJqFu1!II6O
z#R4lXL2Pp26n|Ov1yYs$7VsYf{-ePE2=HGI{PzI=)ua>ed$W&%j$@$XC?H))hO)PU
zmWRnm_Pg*f6Rgz&Yb}A-yKvmyk6yv-K@tPCiR@#b<0$Aj2s$F9FZ&W8JPj&L*$u>!
z-GWhd7*!8CHe%!p82LQtnTL@t0RIu--v|gV0K)U2V?BH(3cSZ)b0+MEn-N(p<RU=X
z11J~6%VO}dD&TksvA~2dX@)0S;87*GT<9%*X6qnm<$5^}{XrLMq!M_h3s($rAPvpe
zL8JB1awA&i;;s+&GJy7lXdgxl$iwJ0#GD<&=yNc73r3#>y+py)E^xI0^4JfqE+Mtq
z$DyAnxY`A-Hb5@**j@iBWOF@PfOmu0Z@^9}5Tz7)vRxDOTmXn)0>t=)oQ?wGOMrL`
zx?2X_rJ%bo^tJ-f;}bGF3g}JH-7@Gd1;{1Peh|9b3=E;qmBn+P`{u`7bBK0k#3u`4
zT?wKWmr@niHy}4;ZvzF-Ky%-Qww{Ni>L95EFh2sTc>tPwkXvxJ1rTOI|DAxa2oM%S
z|K|hBY(RJrqwj{^&j*CFG4dcrK8=x2Dz<+XMlJ{L^%!{(M(zgZ$HDnA;C&q2Rsm-e
zI78t0I7Z(IZjT|}n_!urYGxdA3`35Gpqcw1$HyVZBaq`0(9V5;csC&41&H5=EW?oH
zA!zD8Ku<waFG5q?FQ0(6?gN&)fn^+6_!$bt1~_NPeI=lg+dxzHRrI)u`(O4au#kJf
z_c5G%eSx^}TbA7oI-UR>h)95whL`Z{lFKi382tidu^Tiz0UBP0O!mX>BCxx9*j*Pg
zoe6oyjEG}FmMKBrbs^?g!S9-YiTnKsqz7BdUIV;e1HO9T;~x4ndTmCm3WE2SfVU3+
zx&XBcHr@%GxI@3`h-yj{0S7Z7)mf0oJhaWnxB-k<i2lRC%rWc-hASs9JOT_)oPy!S
z&%yA>1coQT*%xE5fz$ILza!vu4>-LTobG@go59cR!1i_MJ_KFf1AguR2hE`WcF_KH
z=xrMG_6YO_D}>*UK#w?E2|Kkwx@FltfN(b;JOFw(LLwD_@&cgz7&LRabV4efkV-qG
zvIkJ_2Gj>Y?-h_pB_tArG%6sCG^Ei9X>k3UkO$4#=WurkXx$51F9NOg!159x*5IxN
z5UUl~-DvB@-9oet;lf{-fyUVX3waE=<n!_vj|BhyJk|+mo|()3)fwscu=VdMezpag
zJr8nkhTL1A;jPf{D~jx^P$lpTSqIHQ8<2DbJmpbnb}Kad3N-r?{3!zMo&$YULKm<X
z_#OANjqtMt(CAh`-U`TDpwS@o7KHW^=vjrD(}etChAmj|HkSp?L9a^m;?)AL6q?|b
zub_7bams|+#Ekf9AvdD;?SOeZdZ$sV)SwdWgaxEPUl?O~b<zg9YGE@Cu#IVel?2un
zeDkWb3ZtedZ|hKr)WahifvZz#t$~krqIOAPR2cqNkDS<s`XdHTYd}>BcFcP>VI<FP
z1MqO3;pW1w>k(NR&@u&_S3@GRVWAbEp4YAwN=-2iJ6{P7&IJeC!NEFkkbt~*L*D1W
zldgcg_am-81sW2N@ovcY9AIsRPu>Kdyb*EqDahnIfE)tUu#)+>r%waa3jvkKdG6^+
zKs^qqPXOvGfQp!cY*&ZBQLWEL5Up1MLlPK{0|Vj-WHW&G3-Nw1TMFo5MCmQSP=)H>
z1WwF|Cl>Hng0&DAxd9SSK*}*hfkz?f3h;|~0!!gDmxk>9u#<z3WC9WlLV__!Eexsg
zj57@q3qoQYN?aU--w$Pf2)lVo$#$K<G#?f@9hi8vw+t3}A+XE`)Q17}K3Ly{u(*w&
z^L~tc79)S6$aV)tZUc?H!nqbBc_j-efU+R)#z0E~G&VvS3g>9=MmzqJ6m(U9t`5-D
zjJZaG!ae7_Sg~UZG*yCX$Ax@R#%&E*H;Bj@Lsm$D`!wpIT0GZf4@0(xfZ<+XfE}S<
zH`;pvaW3*&A9T>4{T}4}BWUpmWPKPsY|7aP;Ecd>d8M`ue2jpP^MQ2-u$~LrPz{2M
z!R*aE&Y}LX;I0fZDhC&SNRa=%a0Pl)!qS7#X%%LG5!h-qG!mb%{xl?Ci`F{DQs={p
z=Rua!VXf7m^*Pvl0zHDzSS{#24x5j{=Bpv=TcEvqNT~sK5XGokK&XSAPlKKF>^dJ(
zyB$`(M6s0vu*M&Q{;NU%S3v(|kXrAA)b4^*>jAS8(t8xrI|7(V_)-)S>s2H+9ei}7
zp6CVqnV@DCbT${%%|m-1w-xjp0nKIL|I6S%1jrA8|0rNW)3Btf>`qV>!&4HRR|Ctd
zxa0HnPEgMOiee6EnDBYPm;xAGfH4()rb7nZfYAeMoq_h=><yqI1uD|uooDj|xaHMs
zCwLEn_c`F5N4{ajTKG)r2Jn63g#B@gZv-_t|40GCskK7`o_PJx1Zq2hgZoM^U{3l9
z_Y+<_^n>2X`eA6Ih8O|84D(1M{t;!yP9c*f%<Q>*us^BHHt}_|V%<gj;jxxCmDb1B
IAK&yp0rp)PE&u=k

literal 0
HcmV?d00001

diff --git a/nel/samples/3d/font_perf/main.cpp b/nel/samples/3d/font_perf/main.cpp
new file mode 100644
index 000000000..d183d3fa8
--- /dev/null
+++ b/nel/samples/3d/font_perf/main.cpp
@@ -0,0 +1,99 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2020  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "nel/misc/types_nl.h"
+
+#include "nel/misc/event_emitter.h"
+#include "nel/misc/event_listener.h"
+#include "nel/misc/path.h"
+#include "nel/misc/random.h"
+
+// look at 3dinit example
+#include "nel/3d/nelu.h"
+
+// used for font management
+#include "nel/3d/font_manager.h"
+#include "nel/3d/computed_string.h"
+#include "nel/3d/text_context.h"
+#include "nel/3d/driver_user.h"
+
+#ifdef NL_OS_WINDOWS
+	#ifndef NL_COMP_MINGW
+		#define NOMINMAX
+	#endif
+	#include <windows.h>
+#endif // NL_OS_WINDOWS
+
+#ifndef FONT_DIR
+#	define FONT_DIR "."
+#endif
+
+using namespace std;
+using namespace NL3D;
+using namespace NLMISC;
+
+int main(int argc, char **argv)
+{
+	// look at 3dinit example
+	CNELU::init (800, 600, CViewport(), 32, true, 0, false, false);
+
+	NLMISC::CPath::addSearchPath(FONT_DIR);
+
+	// create a font manager
+	CFontManager fontManager;
+
+	// set the font cache to 2 megabytes (default is 1mb)
+	fontManager.setMaxMemory(2000000);
+
+	CTextContext tc;
+
+	tc.init (CNELU::Driver, &fontManager);
+
+	// The first param is the font name (could be ttf, pfb, fon, etc...). The
+	// second one is optional, it's the font kerning file
+	tc.setFontGenerator (NLMISC::CPath::lookup("beteckna.ttf"));
+
+	NLMISC::CRandom rnd;
+
+	uint nbCount = 100000;
+	TTicks startTick = CTime::getPerformanceTime();
+	std::string txt;
+	for(uint i = 0; i < nbCount; ++i)
+	{
+		uint fontSize = rnd.rand(200);
+		bool embolden = rnd.rand(1) == 1;
+		bool oblique = rnd.rand(1) == 1;
+		txt = toString("Lorem ipsum %03d", fontSize);
+
+		CComputedString cs;
+		fontManager.computeString(txt, tc.getFontGenerator(), CRGBA::White, fontSize, embolden, oblique, CNELU::Driver, cs);
+	}
+
+	TTicks endTick = CTime::getPerformanceTime();
+
+	double deltaTime = CTime::ticksToSecond(endTick-startTick);
+	std::string msg = toString("Generated %d strings in %.2fs\n", nbCount, deltaTime);
+
+	nlinfo("%s", msg.c_str());
+	printf("%s", msg.c_str());
+
+	fontManager.dumpCache ("font_pref_cache_dump.tga");
+
+	// look at 3dinit example
+	CNELU::release();
+
+	return EXIT_SUCCESS;
+}

From 990c38ca813e8b066e47417d734dd005b1e83910 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 5 Jan 2021 13:48:28 +0200
Subject: [PATCH 198/292] Change letter cache to map lookup,
 ryzom/ryzomcore#626

---
 nel/include/nel/3d/texture_font.h | 59 +++++++++++++++++--------------
 nel/src/3d/texture_font.cpp       | 18 ++++------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
index b250fecd8..9ca423315 100644
--- a/nel/include/nel/3d/texture_font.h
+++ b/nel/include/nel/3d/texture_font.h
@@ -38,6 +38,36 @@ class CTextureFont : public ITexture
 
 public:
 
+	struct SLetterKey
+	{
+		u32char Char;
+		sint Size;
+		bool Embolden;
+		bool Oblique;
+		CFontGenerator *FontGenerator;
+
+		SLetterKey() : Char(0), Size(0), Embolden(false), Oblique(false), FontGenerator(NULL)
+		{
+		}
+
+		// Does not use FontGenerator in return value
+		inline uint64 getVal() const
+		{
+			return Char                           // 32 bits
+				| (uint64(Size & 0xFFFF) << 32)   // 16 bits
+				| (uint64(Embolden) << (32+16))   // 1 bit
+				| (uint64(Oblique) << (32+16+1)); // 1 bit
+		}
+
+		bool operator<(const SLetterKey &rhs) const
+		{
+			uint64 a = getVal();
+			uint64 b = rhs.getVal();
+			return (a < b) || ((a == b) && (FontGenerator < rhs.FontGenerator));
+		}
+	};
+
+
 	// Holds info for glyphs rendered on atlas
 	struct SGlyphInfo
 	{
@@ -70,14 +100,8 @@ public:
 	};
 
 	// Holds info for glyphs displayed on screen
-	struct SLetterInfo
+	struct SLetterInfo : SLetterKey
 	{
-		u32char Char;
-		sint Size;
-		bool Embolden;
-		bool Oblique;
-		CFontGenerator *FontGenerator;
-
 		uint32 GlyphIndex;
 		uint32 CharWidth;	// Displayed glyph height
 		uint32 CharHeight;	// Displayed glyph height
@@ -88,29 +112,12 @@ public:
 		SGlyphInfo* glyph;
 
 		SLetterInfo()
-			: Char(0), Size(0), Embolden(false), Oblique(false), FontGenerator(NULL),
-			  GlyphIndex(0), CharWidth(0), CharHeight(0), Top(0), Left(0), AdvX(0),
+			: GlyphIndex(0), CharWidth(0), CharHeight(0), Top(0), Left(0), AdvX(0),
 			  glyph(NULL)
 		{
 		}
 	};
 
-	struct SLetterKey
-	{
-		u32char Char;
-		sint Size;
-		bool Embolden;
-		bool Oblique;
-		CFontGenerator *FontGenerator;
-
-		// Does not use FontGenerator in return value
-		uint32 getVal();
-
-		SLetterKey():Char(0), FontGenerator(NULL), Size(0), Embolden(false), Oblique(false)
-		{
-		}
-	};
-
 public:
 
 	/**
@@ -151,7 +158,7 @@ private:
 	// Keep track of available space in main texture
 	std::vector<NLMISC::CRect> _AtlasNodes;
 
-	std::vector <SLetterInfo> _Letters;
+	std::map<SLetterKey, SLetterInfo> _Letters;
 
 	// lookup letter from letter cache or create new
 	SLetterInfo* findLetter(SLetterKey& k, bool insert);
diff --git a/nel/src/3d/texture_font.cpp b/nel/src/3d/texture_font.cpp
index b40083516..dd966eb8d 100644
--- a/nel/src/3d/texture_font.cpp
+++ b/nel/src/3d/texture_font.cpp
@@ -112,9 +112,9 @@ void CTextureFont::clearAtlas()
 	_Data[0].fill(0);
 
 	// clear glyph cache
-	for(uint i = 0; i< _Letters.size(); ++i)
+	for(std::map<SLetterKey, SLetterInfo>::iterator it = _Letters.begin(); it != _Letters.end(); ++it)
 	{
-		_Letters[i].glyph = NULL;
+		it->second.glyph = NULL;
 	}
 	_GlyphCache.clear();
 
@@ -473,21 +473,15 @@ CTextureFont::SGlyphInfo* CTextureFont::findLetterGlyph(SLetterInfo *letter, boo
 // ---------------------------------------------------------------------------
 CTextureFont::SLetterInfo* CTextureFont::findLetter(SLetterKey &k, bool insert)
 {
-	// TODO: use std::map<uint64>
-	for(uint i = 0; i < _Letters.size(); ++i)
+	std::map<SLetterKey, SLetterInfo>::iterator it = _Letters.find(k);
+	if (it != _Letters.end())
 	{
-		if (_Letters[i].Char == k.Char && _Letters[i].Size == k.Size &&
-			_Letters[i].Embolden == k.Embolden && _Letters[i].Oblique == k.Oblique &&
-			_Letters[i].FontGenerator == k.FontGenerator)
-		{
-			return &_Letters[i];
-		}
+		return &(it->second);
 	}
 
 	if (insert)
 	{
-		_Letters.push_back(SLetterInfo());
-		SLetterInfo* letter = &_Letters.back();
+		SLetterInfo* letter = &_Letters[k];
 
 		// get metrics for requested size
 		letter->Char = k.Char;

From f39038f98d2a8cb36b2aff4f84b05eb2add753be Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 5 Jan 2021 17:33:19 +0200
Subject: [PATCH 199/292] Change glyph cache to map lookup, ryzom/ryzomcore#626

---
 nel/include/nel/3d/texture_font.h | 18 ++++++----------
 nel/src/3d/texture_font.cpp       | 35 +++++++++++--------------------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
index 9ca423315..61e92fa58 100644
--- a/nel/include/nel/3d/texture_font.h
+++ b/nel/include/nel/3d/texture_font.h
@@ -67,13 +67,14 @@ public:
 		}
 	};
 
-
 	// Holds info for glyphs rendered on atlas
-	struct SGlyphInfo
+	struct SGlyphInfo : SLetterKey
 	{
 		// font atlas info
 		uint32 CacheVersion;
 
+		uint32 GlyphIndex;
+
 		// atlas region with padding
 		uint32 X, Y, W, H;
 
@@ -84,17 +85,10 @@ public:
 		// UV coords for rendered glyph without padding
 		float U0, V0, U1, V1;
 
-		uint32 GlyphIndex;
-		sint Size;
-		bool Embolden;
-		bool Oblique;
-		CFontGenerator *FontGenerator;
-
 		SGlyphInfo()
-			: CacheVersion(0),
+			: CacheVersion(0), GlyphIndex(0),
 			  U0(0.f), V0(0.f), U1(0.f), V1(0.f),
-			  X(0), Y(0), W(0), H(0), CharWidth(0), CharHeight(0),
-			  GlyphIndex(0), Size(0), Embolden(false), Oblique(false), FontGenerator(NULL)
+			  X(0), Y(0), W(0), H(0), CharWidth(0), CharHeight(0)
 		{
 		}
 	};
@@ -172,7 +166,7 @@ private:
 	uint _GlyphSizeStep;
 
 	// rendered glyph cache
-	std::list<SGlyphInfo> _GlyphCache;
+	std::map<SLetterKey, SGlyphInfo> _GlyphCache;
 	SGlyphInfo* findLetterGlyph(SLetterInfo *letter, bool insert);
 
 	// render letter glyph into glyph cache
diff --git a/nel/src/3d/texture_font.cpp b/nel/src/3d/texture_font.cpp
index dd966eb8d..9aa08ca15 100644
--- a/nel/src/3d/texture_font.cpp
+++ b/nel/src/3d/texture_font.cpp
@@ -161,15 +161,15 @@ void CTextureFont::repackAtlas(uint32 newW, uint32 newH)
 	_AtlasNodes.push_back(CRect(0, 0, _TextureSizeX, _TextureSizeY));
 
 	CObjectVector<uint8>&src = btm.getPixels();
-	for(std::list<SGlyphInfo>::iterator it = _GlyphCache.begin(); it != _GlyphCache.end(); ++it)
+	for(std::map<SLetterKey, SGlyphInfo>::iterator it = _GlyphCache.begin(); it != _GlyphCache.end(); ++it)
 	{
-		if (it->CacheVersion != _CacheVersion)
+		if (it->second.CacheVersion != _CacheVersion)
 		{
 			// TODO: must remove glyph from all letters before removing glyph from cache
 			//continue;
 		}
 
-		SGlyphInfo &glyph = *it;
+		SGlyphInfo &glyph = it->second;
 
 		glyph.CacheVersion = newCacheVersion;
 
@@ -403,18 +403,10 @@ CTextureFont::SGlyphInfo* CTextureFont::renderLetterGlyph(SLetterInfo *letter, u
 	}
 	copyGlyphBitmap(bitmap, charWidth, charHeight, atlasX, atlasY);
 
-	SGlyphInfo* glyphInfo = NULL;
-	{
-		// keep cache sorted by height (smaller first)
-		std::list<SGlyphInfo>::iterator it = _GlyphCache.begin();
-		while(it != _GlyphCache.end() && it->CharHeight < charHeight)
-		{
-			++it;
-		}
+	SLetterKey k = *letter;
+	k.Size = bitmapFontSize;
 
-		it = _GlyphCache.insert(it, SGlyphInfo());
-		glyphInfo = &(*it);
-	}
+	SGlyphInfo* glyphInfo = &_GlyphCache[k];
 
 	glyphInfo->GlyphIndex = glyphIndex;
 	glyphInfo->Size = bitmapFontSize;
@@ -450,16 +442,13 @@ CTextureFont::SGlyphInfo* CTextureFont::findLetterGlyph(SLetterInfo *letter, boo
 	}
 
 	// CacheVersion not checked, all glyphs in cache must be rendered on texture
-	for(std::list<SGlyphInfo>::iterator it = _GlyphCache.begin(); it != _GlyphCache.end(); ++it)
+	SLetterKey g = *letter;
+	g.Size = bitmapFontSize;
+
+	std::map<SLetterKey, SGlyphInfo>::iterator it = _GlyphCache.find(g);
+	if (it != _GlyphCache.end())
 	{
-		if (it->GlyphIndex == letter->GlyphIndex &&
-			it->Size == bitmapFontSize &&
-			it->Embolden == letter->Embolden &&
-			it->Oblique == letter->Oblique &&
-			it->FontGenerator == letter->FontGenerator)
-		{
-			return &(*it);
-		}
+		return &(it->second);
 	}
 
 	if (insert)

From 2bf8faf29ee1c3b778176c79001c644ab54b9931 Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Tue, 5 Jan 2021 06:51:20 +0100
Subject: [PATCH 200/292] Fixed bad check of args

---
 ryzom/tools/client/client_patcher/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
index 1fb6e9c3a..fb1801fc5 100644
--- a/ryzom/tools/client/client_patcher/main.cpp
+++ b/ryzom/tools/client/client_patcher/main.cpp
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
 
 	if (!Args.parse(argc, argv)) return 1;
 
-	if (Args.haveArg("p") && Args.haveArg("p") && Args.haveArg("p"))
+	if (Args.haveArg("p") && Args.haveArg("s") && Args.haveArg("d"))
 	{
 		string	patchName = Args.getArg("p").front();
 		string	sourceName = Args.getArg("s").front();

From cb77552121ed23a99fe12fb4b877d77cc038c3b1 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 6 Jan 2021 13:20:13 +0200
Subject: [PATCH 201/292] Remove file from bad merge

---
 .../tools/client/client_patcher/main.cpp      | 423 ------------------
 1 file changed, 423 deletions(-)
 delete mode 100644 code/ryzom/tools/client/client_patcher/main.cpp

diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp
deleted file mode 100644
index 21fc58959..000000000
--- a/code/ryzom/tools/client/client_patcher/main.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-#include "stdpch.h"
-#include "login_patch.h"
-#include "client_cfg.h"
-#include "user_agent.h"
-
-#include "nel/misc/cmd_args.h"
-
-#ifdef NL_OS_WINDOWS
-#include <windows.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-using namespace NLMISC;
-using namespace std;
-
-// simplified implementation to not depend on client_cfg.cpp
-CClientConfig::CClientConfig()
-{
-}
-
-void CClientConfig::serial(NLMISC::IStream &/* f */)
-{
-}
-
-bool CClientConfig::getDefaultConfigLocation(std::string&/* p_name */) const
-{
-	return false;
-}
-
-CClientConfig ClientCfg;
-
-// stuff which is defined as extern in other .cpp files
-void quitCrashReport()
-{
-}
-
-/// domain server version for patch
-string	R2ServerVersion;
-/// name of the version (used to alias many version under the same name),
-/// the value is used to get the release not if not empty
-string	VersionName;
-
-string LoginLogin, LoginPassword;
-uint32 LoginShardId = 0xFFFFFFFF;
-
-CCmdArgs Args;
-
-bool useEsc = false;
-
-#ifdef NL_OS_WINDOWS
-HANDLE hStdout = NULL;
-sint attributes = 0;
-#endif
-
-std::string convert(const ucstring &str)
-{
-	return str.toString();
-}
-
-void printError(const std::string &str)
-{
-	// display error in red if possible
-	if (useEsc)
-	{
-		printf("\033[1;31mError: %s\033[0m\n", str.c_str());
-	}
-	else
-	{
-#ifdef NL_OS_WINDOWS
-		if (hStdout != INVALID_HANDLE_VALUE && hStdout)
-			SetConsoleTextAttribute(hStdout, FOREGROUND_RED|FOREGROUND_INTENSITY);
-#endif
-
-		printf("Error: %s\n", str.c_str());
-
-#ifdef NL_OS_WINDOWS
-		if (hStdout != INVALID_HANDLE_VALUE && hStdout)
-			SetConsoleTextAttribute(hStdout, attributes);
-#endif
-	}
-}
-
-void printCheck(const std::string &str)
-{
-	// display check
-	printf("%s\n", str.c_str());
-}
-
-void printDownload(const std::string &str)
-{
-	static char spaces[80];
-
-	uint maxLength = 80;
-
-	// if "COLUMNS" environnement variable is defined, use it
-	if (getenv("COLUMNS"))
-	{
-		NLMISC::fromString(std::string(getenv("COLUMNS")), maxLength);
-	}
-
-	// only use 79 columns to not wrap
-	--maxLength;
-
-	// temporary modified string
-	std::string nstr = str;
-
-	uint length = (uint)nstr.length();
-
-	if (length > maxLength)
-	{
-		nstr = std::string("...") + nstr.substr(length - maxLength + 3);
-		length = maxLength;
-	}
-
-	// add padding with spaces
-	memset(spaces, ' ', maxLength);
-	spaces[maxLength - length] = '\0';
-
-	// display download in purple
-	if (useEsc)
-	{
-		printf("\033[1;35m%s%s\033[0m\r", nstr.c_str(), spaces);
-	}
-	else
-	{
-#ifdef NL_OS_WINDOWS
-		if (hStdout != INVALID_HANDLE_VALUE && hStdout)
-			SetConsoleTextAttribute(hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_INTENSITY);
-#endif
-
-		printf("%s%s\r", nstr.c_str(), spaces);
-
-#ifdef NL_OS_WINDOWS
-		if (hStdout != INVALID_HANDLE_VALUE && hStdout)
-			SetConsoleTextAttribute(hStdout, attributes);
-#endif
-	}
-
-	fflush(stdout);
-}
-
-// hardcoded english translations to not depend on external files
-struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
-{
-	virtual void loadStringFile(const std::string &filename, ucstring &text)
-	{
-		text.fromUtf8(
-			"TheSagaOfRyzom	[Ryzom]\n"
-			"uiErrPatchApply	[Error: Patch process ended but the patch has not been successfully applied.]\n"
-			"uiErrChecking	[Error: Patch files failed - checking.]\n"
-			"uiByte	[B]\n"
-			"uiKb	[KiB]\n"
-			"uiMb	[MiB]\n"
-			"uiLoginGetFile	[Getting File:]\n"
-			"uiDLWithCurl	[Downloading File With Curl:]\n"
-			"uiDecompressing	[Decompressing File:]\n"
-			"uiCheckInt	[Checking Integrity:]\n"
-			"uiNoVersionFound	[No Version Found]\n"
-			"uiVersionFound	[Version Found:]\n"
-			"uiApplyingDelta	[Applying Delta:]\n"
-			"uiClientVersion	[Client Version]\n"
-			"uiServerVersion	[Server Version]\n"
-			"uiCheckingFile	[Checking File]\n"
-			"uiNeededPatches	[Required Patches:]\n"
-			"uiCheckInBNP	[Checking inside BNP:]\n"
-			"uiSHA1Diff	[Force BNP Unpacking: checksums do not correspond:]\n"
-			"uiCheckEndNoErr	[Checking file ended with no errors]\n"
-			"uiCheckEndWithErr	[Checking file ended with errors:]\n"
-			"uiPatchEndNoErr	[Patching file ended with no errors]\n"
-			"uiPatchEndWithErr	[Patch failed!]\n"
-			"uiPatchDiskFull	[Disk full!]\n"
-			"uiPatchWriteError	[Disk write error! (disk full?)]\n"
-			"uiProcessing	[Processing file:]\n"
-			"uiUnpack	[BNP Unpacking:]\n"
-			"uiUnpackErrHead	[Cannot read bnp header:]\n"
-			"uiChangeDate	[Changing the mod date:]\n"
-			"uiChgDateErr	[Cannot change file time:]\n"
-			"uiNowDate	[Now the date is:]\n"
-			"uiSetAttrib	[Set file attributes:]\n"
-			"uiAttribErr	[Cannot have read/write access:]\n"
-			"uiDelFile	[Delete file:]\n"
-			"uiDelErr	[Cannot delete file:]\n"
-			"uiDelNoFile	[Delete file (no file)]\n"
-			"uiRenameFile	[Rename File:]\n"
-			"uiRenameErr	[Cannot rename file:]\n"
-		);
-	}
-};
-
-// hardcoded URL to not depend on external files
-static const std::string DefaultPatchUrl = RYZOM_CLIENT_PATCH_URL; // "https://cdn.ryzom.dev/open/patch";
-static const std::string DefaultAppName = RYZOM_CLIENT_APP_NAME; // "default"
-
-int main(int argc, char *argv[])
-{
-	// init the Nel context
-	CApplicationContext appContext;
-
-	Args.setVersion(getDisplayVersion());
-	Args.setDescription("Ryzom client");
-	Args.addArg("p", "patch", "patch", "Name of the file to use tp xdelta the source file");
-	Args.addArg("s", "source", "source", "Name of source file to xdelta with patch file");
-	Args.addArg("d", "destination", "destination", "Name of destination operation (patch or unpack)");
-	Args.addArg("u", "unpack", "unpack", "Name of bnp file to unpack");
-	Args.addArg("", "url", "PatchUrl", "Patch server url, ie 'https://dl.ryzom.com/patch_live'");
-	Args.addArg("", "app", "Application", "Patch application name for version file, ie 'ryzom_live' requests ryzom_live.version from PatchUrl");
-
-	if (!Args.parse(argc, argv)) return 1;
-
-	if (Args.haveArg("p") && Args.haveArg("s") && Args.haveArg("d"))
-	{
-		string	patchName = Args.getArg("p").front();
-		string	sourceName = Args.getArg("s").front();
-		string	destinationName = Args.getArg("d").front();
-
-		std::string errorMsg;
-		CXDeltaPatch::TApplyResult ar = CXDeltaPatch::apply(patchName, sourceName, destinationName, errorMsg);
-		nlinfo("%s", errorMsg.c_str());
-		return ar;
-	}
-
-	// initialize patch manager and set the ryzom full path, before it's used
-	CPatchManager *pPM = CPatchManager::getInstance();
-
-	if (Args.haveArg("u") && Args.haveArg("d"))
-	{
-		string	bnpName = Args.getArg("u").front();
-		string	destinationName = Args.getArg("d").front();
-		vector<string> vFilenames;
-		if (pPM->bnpUnpack(bnpName, destinationName, vFilenames))
-			return 0;
-		return 1;
-	}
-
-	// create logs in temporary directory
-	createDebug(CPath::getTemporaryDirectory().c_str(), true, true);
-
-	// disable log display on stdout
-	INelContext::getInstance().getDebugLog()->removeDisplayer("DEFAULT_SD");
-	INelContext::getInstance().getInfoLog()->removeDisplayer("DEFAULT_SD");
-	INelContext::getInstance().getWarningLog()->removeDisplayer("DEFAULT_SD");
-
-	// check if console supports colors
-	std::string term = toLower(std::string(getenv("TERM") ? getenv("TERM"):""));
-	useEsc = (term.find("xterm") != string::npos || term.find("linux") != string::npos);
-
-#ifdef NL_OS_WINDOWS
-	// setup Windows console
-	hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
-
-	if (hStdout != INVALID_HANDLE_VALUE)
-	{
-		CONSOLE_SCREEN_BUFFER_INFO consoleScreenBufferInfo;
-
-		if (GetConsoleScreenBufferInfo(hStdout, &consoleScreenBufferInfo))
-			attributes = consoleScreenBufferInfo.wAttributes;
-	}
-#endif
-
-	// allocate translations proxy
-	CClientPatcherTranslations *trans = new CClientPatcherTranslations();
-
-	// use proxy
-	CI18N::setLoadProxy(trans);
-
- 	// load english translations
-	CI18N::load("en");
-
-	// now translations are read, we don't need it anymore
-	delete trans;
-
-	// create minimal client.cfg file in memory for patcher
-	{
-		CConfigFile::CVar patchUrl;
-		patchUrl.forceAsString(DefaultPatchUrl);
-		if (Args.haveLongArg("url") && !Args.getLongArg("url").empty())
-			patchUrl.forceAsString(Args.getLongArg("url").front());
-
-		CConfigFile::CVar appName;
-		appName.forceAsString(DefaultAppName);
-		if (Args.haveLongArg("app") && !Args.getLongArg("app").empty())
-			appName.forceAsString(Args.getLongArg("app").front());
-
-		ClientCfg.ConfigFile.insertVar("PatchUrl", patchUrl);
-		ClientCfg.ConfigFile.insertVar("Application", appName);
-	}
-
-	//
-	Args.displayVersion();
-	printf("\n");
-	printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
-	printf("Using '%s/%s.version'\n", ClientCfg.ConfigFile.getVar("PatchUrl").asString().c_str(),
-		ClientCfg.ConfigFile.getVar("Application").asString().c_str());
-
-	// use PatchUrl
-	vector<string> patchURLs;
-	pPM->init(patchURLs, ClientCfg.ConfigFile.getVar("PatchUrl").asString(), "");
-	pPM->startCheckThread(true /* include background patchs */);
-
-	ucstring state;
-	vector<ucstring> log;
-	bool res = false;
-	bool finished = false;
-
-	while (!finished)
-	{
-		nlSleep(100);
-
-		finished = pPM->isCheckThreadEnded(res);
-
-		if (pPM->getThreadState(state, log))
-		{
-			for(uint i = 0; i < log.size(); ++i)
-			{
-				printCheck(convert(log[i]));
-			}
-		}
-	}
-
-	if (!res && !pPM->getLastErrorMessage().empty())
-	{
-		printError(convert(CI18N::get("uiErrChecking") + " " + pPM->getLastErrorMessage()));
-		return 1;
-	}
-
-	CPatchManager::SPatchInfo InfoOnPatch;
-
-	// Check is good now ask the player if he wants to apply the patch
-	pPM->getInfoToDisp(InfoOnPatch);
-
-	// Get the list of optional categories to patch
-	vector<string> vCategories;
-
-	for(uint i = 0; i < InfoOnPatch.OptCat.size(); i++)
-	{
-		// Ok for the moment all optional categories must be patched even if the player
-		// does not want it. Because we can't detect that a continent have to be patched ingame.
-		vCategories.push_back(InfoOnPatch.OptCat[i].Name);
-	}
-
-	// start patch thread
-	pPM->startPatchThread(vCategories, true);
-
-	res = false;
-	finished = false;
-
-	while (!finished)
-	{
-		nlSleep(100);
-
-		finished = pPM->isPatchThreadEnded(res);
-
-		if (pPM->getThreadState(state, log))
-		{
-			printDownload(convert(state));
-
-			for(uint i = 0; i < log.size(); ++i)
-			{
-				printCheck(convert(log[i]));
-			}
-		}
-	}
-
-	if (!res && !pPM->getLastErrorMessage().empty())
-	{
-		printError(convert(CI18N::get("uiErrPatchApply") + " " + pPM->getLastErrorMessage()));
-		return 1;
-	}
-
-	if (CPatchManager::getInstance()->mustLaunchBatFile())
-	{
-		std::string error;
-
-		try
-		{
-			// move downloaded files to final location
-			pPM->createBatchFile(pPM->getDescFile(), false, false);
-			CFile::createEmptyFile("show_eula");
-
-			if (!pPM->getLastErrorMessage().empty())
-			{
-				error = convert(pPM->getLastErrorMessage());
-			}
-		}
-		catch(const EDiskFullError &)
-		{
-			error = convert(CI18N::get("uiPatchDiskFull"));;
-		}
-		catch(const EWriteError &)
-		{
-			error = convert(CI18N::get("uiPatchWriteError"));;
-		}
-		catch(const Exception &e)
-		{
-			error = convert(CI18N::get("uiCheckEndWithErr") + " " + e.what());
-		}
-		catch(...)
-		{
-			error = "unknown exception";
-		}
-
-		if (!error.empty())
-		{
-			printError(convert(CI18N::get("uiErrPatchApply")) + " " + error);
-			return 1;
-		}
-
-		pPM->executeBatchFile();
-	}
-
-/*
-	// Start Scanning
-	pPM->startScanDataThread();
-
-	// request to stop the thread
-	pPM->askForStopScanDataThread();
-*/
-
-	return 0;
-}

From 46410206ad0f37a77d37aac158ff531e96579c3f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 5 Jan 2021 23:13:34 +0800
Subject: [PATCH 202/292] Weld borders again after elevation, for bindings

---
 .../build_gamedata/processes/zone/2_build.py    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nel/tools/build_gamedata/processes/zone/2_build.py b/nel/tools/build_gamedata/processes/zone/2_build.py
index cb9287c36..6dca1c0d5 100755
--- a/nel/tools/build_gamedata/processes/zone/2_build.py
+++ b/nel/tools/build_gamedata/processes/zone/2_build.py
@@ -145,12 +145,27 @@ else:
 	files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonenhw")
 	for file in files:
 		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
-		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zonew"
+		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zone"
 		if needUpdateLogRemoveDest(log, sourceFile, destFile):
 			callParallelProcess([ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ])
 	flushParallelProcesses()
 printLog(log, "")
 
+printLog(log, ">>> Re-weld zone with heightmap <<<")
+if ZoneWelder == "":
+	toolLogFail(log, ZoneWelderTool, ToolSuffix)
+elif ExecTimeout == "":
+	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
+else:
+	mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
+	files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zone")
+	for file in files:
+		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
+		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zone")] + ".zonew"
+		if needUpdateLogRemoveDest(log, sourceFile, destFile):
+			subprocess.call([ ExecTimeout, str(ZoneBuildWeldTimeout), ZoneWelder, sourceFile, destFile ])
+printLog(log, "")
+
 log.close()
 
 

From b6b05b595a2ab2cd7ef1ee1d7b88197a6f925240 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 6 Jan 2021 05:56:24 +0800
Subject: [PATCH 203/292] Make heightmap bitmap coordinates stable between map
 extensions

---
 nel/tools/3d/ig_elevation/main.cpp            | 34 +++++++++++++++----
 .../unbuild_elevation/unbuild_elevation.cpp   | 31 ++++++++++++-----
 .../3d/zone_elevation/zone_elevation.cpp      | 24 +++++++++++--
 .../build_gamedata/processes/ig/2_build.py    |  1 +
 .../build_gamedata/processes/ligo/0_setup.py  |  1 +
 .../build_gamedata/processes/zone/2_build.py  |  5 ++-
 .../world_editor/land_export/main.cpp         |  1 +
 .../world_editor/land_export_lib/export.cpp   | 29 ++++++++++++----
 .../world_editor/land_export_lib/export.h     |  1 +
 9 files changed, 101 insertions(+), 26 deletions(-)

diff --git a/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp
index a3d485bd8..65de8fb82 100644
--- a/nel/tools/3d/ig_elevation/main.cpp
+++ b/nel/tools/3d/ig_elevation/main.cpp
@@ -65,6 +65,7 @@ struct SExportOptions
 	float	ZFactor1;
 	string	HeightMapFile2;
 	float	ZFactor2;
+	bool	ExtendCoords;
 	string	LandFile;
 
 	// -----------------------------------------------------------------------
@@ -105,6 +106,9 @@ struct SExportOptions
 			CConfigFile::CVar &cvZFactor2 = cf.getVar("ZFactor2");
 			ZFactor2 = cvZFactor2.asFloat();
 
+			CConfigFile::CVar &cvExtendCoords = cf.getVar("ExtendCoords");
+			ExtendCoords = cvExtendCoords.asFloat();
+
 			CConfigFile::CVar &cvLandFile = cf.getVar("LandFile");
 			LandFile = cvLandFile.asString();
 		}
@@ -214,13 +218,19 @@ static float  getHeightMapZ(float x, float y, const CZoneLimits &zl, const SExpo
 	sint32 SizeX = zl._ZoneMaxX - zl._ZoneMinX + 1;
 	sint32 SizeY = zl._ZoneMaxY - zl._ZoneMinY + 1;
 
-	clamp (x, options.CellSize * zl._ZoneMinX, options.CellSize * (zl._ZoneMaxX + 1));
-	clamp (y, options.CellSize * zl._ZoneMinY, options.CellSize * (zl._ZoneMaxY + 1));
-
 	if (heightMap1 != NULL)
 	{
-		color = heightMap1->getColor (	(x - options.CellSize * zl._ZoneMinX) / (options.CellSize * SizeX), 
-										1.0f - ((y - options.CellSize * zl._ZoneMinY) / (options.CellSize * SizeY)));
+		float xc = (x - options.CellSize * zl._ZoneMinX) / (options.CellSize * SizeX);
+		float yc = 1.0f - ((y - options.CellSize * zl._ZoneMinY) / (options.CellSize * SizeY));
+		if (options.ExtendCoords)
+		{
+			uint32 w = heightMap1->getWidth(), h = heightMap1->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
+		color = heightMap1->getColor(xc, yc);
 		color *= 255.f;
 		deltaZ = color.A;
 		deltaZ = deltaZ - 127.0f; // Median intensity is 127
@@ -229,8 +239,17 @@ static float  getHeightMapZ(float x, float y, const CZoneLimits &zl, const SExpo
 
 	if (heightMap2 != NULL)
 	{
-		color = heightMap2->getColor (	(x - options.CellSize * zl._ZoneMinX) / (options.CellSize * SizeX), 
-										1.0f - ((y - options.CellSize * zl._ZoneMinY) / (options.CellSize * SizeY)));
+		float xc = (x - options.CellSize * zl._ZoneMinX) / (options.CellSize * SizeX);
+		float yc = 1.0f - ((y - options.CellSize * zl._ZoneMinY) / (options.CellSize * SizeY));
+		if (options.ExtendCoords)
+		{
+			uint32 w = heightMap2->getWidth(), h = heightMap2->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
+		color = heightMap2->getColor(xc, yc);
 		color *= 255.f;
 		deltaZ2 = color.A;
 		deltaZ2 = deltaZ2 - 127.0f; // Median intensity is 127
@@ -260,6 +279,7 @@ int main(int nNbArg, char**ppArgs)
 		printf ("ZFactor1 = 1.0;\n");
 		printf ("HeightMapFile2 = \"R:/graphics/landscape/ligo/jungle/noise.tga\";\n");
 		printf ("ZFactor2 = 0.5;\n");
+		printf ("ExtendCoords = 0;\n");
 		printf ("LandFile = \"w:/matis.land\";\n");
 
 		return EXIT_FAILURE;
diff --git a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
index f3c109a25..ffb428deb 100644
--- a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
+++ b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
@@ -43,6 +43,7 @@ namespace /* anonymous */
 
 sint32 s_ZoneMinX, s_ZoneMinY, s_ZoneMaxX, s_ZoneMaxY;
 float s_CellSize = 160.0f;
+bool s_ExtendCoords;
 
 std::string s_SourceDir; /* R:\reference\2008_july\data\r2_desert */
 std::string s_ReferenceDir; /* R:\pipeline\export\continents\r2_desert\zone_weld */
@@ -58,11 +59,15 @@ int s_Warnings;
 
 // unbuild_elevation --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "Y:\temp\r2_desert_elevation.Py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld"
 // --land "R:\graphics\landscape\ligo\jungle\zorai.land" --referenceext zonenhw "X:\wsl\big_zorai.py" "R:\reference\2008_july\data\zorai_zones" "R:\pipeline\export\continents\zorai\zone_weld"
-// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "X:\wsl\big_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld"
-// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" "X:\wsl\big_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld"
-// --land "R:\graphics\landscape\ligo\jungle\r2_forest.land" "X:\wsl\big_r2_forest.py" "R:\reference\2008_july\data\r2_forest" "R:\pipeline\export\continents\r2_forest\zone_weld"
-// --land "R:\graphics\landscape\ligo\lacustre\r2_lakes.land" "X:\wsl\big_r2_lakes.py" "R:\reference\2008_july\data\r2_lakes" "R:\pipeline\export\continents\r2_lakes\zone_weld"
-// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" "X:\wsl\big_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld"
+
+// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "X:\wsl\big_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" "X:\wsl\big_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\jungle\r2_forest.land" "X:\wsl\big_r2_forest.py" "R:\reference\2008_july\data\r2_forest" "R:\pipeline\export\continents\r2_forest\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\lacustre\r2_lakes.land" "X:\wsl\big_r2_lakes.py" "R:\reference\2008_july\data\r2_lakes" "R:\pipeline\export\continents\r2_lakes\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" "X:\wsl\big_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld" --extendcoords
+
+// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" --referenceext zonew "X:\wsl\check_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" --referenceext zonew "X:\wsl\check_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld" --extendcoords
 
 bool loadLand(const string &filename)
 {
@@ -135,11 +140,18 @@ void getBitmapCoord(float &xc, float &yc, float x, float y)
 	sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
 	sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
 
-	clamp(x, s_CellSize * s_ZoneMinX, s_CellSize * (s_ZoneMaxX + 1));
-	clamp(y, s_CellSize * s_ZoneMinY, s_CellSize * (s_ZoneMaxY + 1));
-
 	xc = (x - s_CellSize * s_ZoneMinX) / (s_CellSize * sizeX);
 	yc = 1.0f - ((y - s_CellSize * s_ZoneMinY) / (s_CellSize * sizeY));
+
+	if (s_ExtendCoords)
+	{
+		int w, h;
+		getBitmapSize(w, h);
+		xc -= .5f / (float)w;
+		yc -= .5f / (float)h;
+		xc = xc * (float)(w + 1) / (float)w;
+		yc = yc * (float)(h + 1) / (float)h;
+	}
 }
 
 bool processZone(std::vector<NLMISC::CVector> &output, const std::string &sourceFile, const std::string &referenceFile)
@@ -427,6 +439,8 @@ bool unbuildElevation(NLMISC::CCmdArgs &args)
 			return false;
 	}
 
+	s_ExtendCoords = args.haveLongArg("extendcoords");
+
 	if (args.haveLongArg("sourceext"))
 	{
 		s_SourceExt = args.getLongArg("sourceext")[0];
@@ -459,6 +473,7 @@ int main(int argc, char **argv)
 	args.addArg("", "zonemin", "zone", "Zone boundary");
 	args.addArg("", "zonemax", "zone", "Zone boundary");
 	args.addArg("", "cellsize", "meters", "Zone cell size (default: 160)");
+	args.addArg("", "extendcoords", "flag", "Extend coordinates to edge of bitmap pixels");
 
 	if (!args.parse(argc, argv))
 	{
diff --git a/nel/tools/3d/zone_elevation/zone_elevation.cpp b/nel/tools/3d/zone_elevation/zone_elevation.cpp
index abe9b511c..fe583a87d 100644
--- a/nel/tools/3d/zone_elevation/zone_elevation.cpp
+++ b/nel/tools/3d/zone_elevation/zone_elevation.cpp
@@ -53,6 +53,8 @@ NLMISC::CBitmap *s_HeightMap;
 float s_ZFactor2 = 1.0f;
 NLMISC::CBitmap *s_HeightMap2;
 
+bool s_ExtendCoords;
+
 std::string s_InputZone; // UTF-8
 std::string s_OutputZone; // UTF-8
 
@@ -121,13 +123,18 @@ float getHeight(float x, float y)
 	sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
 	sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
 
-	clamp(x, s_CellSize * s_ZoneMinX, s_CellSize * (s_ZoneMaxX + 1));
-	clamp(y, s_CellSize * s_ZoneMinY, s_CellSize * (s_ZoneMaxY + 1));
-
 	if (s_HeightMap != NULL)
 	{
 		float xc = (x - s_CellSize * s_ZoneMinX) / (s_CellSize * sizeX);
 		float yc = 1.0f - ((y - s_CellSize * s_ZoneMinY) / (s_CellSize * sizeY));
+		if (s_ExtendCoords)
+		{
+			uint32 w = s_HeightMap->getWidth(), h = s_HeightMap->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
 		color = s_HeightMap->getColor(xc, yc);
 		color *= 255;
 		deltaZ = color.A;
@@ -139,6 +146,14 @@ float getHeight(float x, float y)
 	{
 		float xc = (x - s_CellSize * s_ZoneMinX) / (s_CellSize * sizeX);
 		float yc = 1.0f - ((y - s_CellSize * s_ZoneMinY) / (s_CellSize * sizeY));
+		if (s_ExtendCoords)
+		{
+			uint32 w = s_HeightMap2->getWidth(), h = s_HeightMap2->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
 		color = s_HeightMap2->getColor(xc, yc);
 		color *= 255;
 		deltaZ2 = color.A;
@@ -475,6 +490,7 @@ int main(int argc, char **argv)
 	args.addArg("", "heightmap", "bitmap", "Heightmap");
 	args.addArg("", "zfactor2", "factor", "Factor for second heightmap");
 	args.addArg("", "heightmap2", "bitmap", "Second heightmap");
+	args.addArg("", "extendcoords", "flag", "Extend coordinates to edge of bitmap pixels");
 	// TODO: args.addArg("", "batch", "", "Process all zones in input (specify input as C:/folder/.zonenhw)");
 
 	if (!args.parse(argc, argv))
@@ -578,6 +594,8 @@ int main(int argc, char **argv)
 			goto Fail;
 	}
 
+	s_ExtendCoords = args.haveLongArg("extendcoords");
+
 	if (args.haveLongArg("cellsize"))
 	{
 		if (!NLMISC::fromString(args.getLongArg("cellsize")[0], s_CellSize))
diff --git a/nel/tools/build_gamedata/processes/ig/2_build.py b/nel/tools/build_gamedata/processes/ig/2_build.py
index c2ab57059..2d461de99 100755
--- a/nel/tools/build_gamedata/processes/ig/2_build.py
+++ b/nel/tools/build_gamedata/processes/ig/2_build.py
@@ -94,6 +94,7 @@ def igElevation(inputIgDir, outputIgDir):
 		cf.write("ZFactor1 = " + LigoExportZFactor1 + ";\n")
 		cf.write("HeightMapFile2 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2 + "\";\n")
 		cf.write("ZFactor2 = " + LigoExportZFactor2 + ";\n")
+		cf.write("ExtendCoords = " + str(LigoExportExtendCoords) + ";\n")
 		cf.write("\n")
 		cf.write("LandFile = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportLand + "\";\n")
 		cf.write("\n")
diff --git a/nel/tools/build_gamedata/processes/ligo/0_setup.py b/nel/tools/build_gamedata/processes/ligo/0_setup.py
index 32a74bf63..79fb2a43b 100755
--- a/nel/tools/build_gamedata/processes/ligo/0_setup.py
+++ b/nel/tools/build_gamedata/processes/ligo/0_setup.py
@@ -96,6 +96,7 @@ if LigoExportLand != "":
 	cf.write("ZFactor1 = " + LigoExportZFactor1 + ";\n")
 	cf.write("HeightMapFile2 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2 + "\";\n")
 	cf.write("ZFactor2 = " + LigoExportZFactor2 + ";\n")
+	cf.write("ExtendCoords = " + str(LigoExportExtendCoords) + ";\n")
 	cf.write("\n")
 	cf.write("ZoneLight = 0;\n")
 	cf.write("CellSize = 160;\n")
diff --git a/nel/tools/build_gamedata/processes/zone/2_build.py b/nel/tools/build_gamedata/processes/zone/2_build.py
index 6dca1c0d5..1e018031a 100755
--- a/nel/tools/build_gamedata/processes/zone/2_build.py
+++ b/nel/tools/build_gamedata/processes/zone/2_build.py
@@ -147,7 +147,10 @@ else:
 		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
 		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zone"
 		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-			callParallelProcess([ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ])
+			command = [ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ]
+			if LigoExportExtendCoords != 0:
+				command.append("--extendcoords")
+			callParallelProcess(command)
 	flushParallelProcesses()
 printLog(log, "")
 
diff --git a/ryzom/tools/leveldesign/world_editor/land_export/main.cpp b/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
index 205002417..78ab057c1 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
+++ b/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
@@ -176,6 +176,7 @@ struct SOptions : public SExportOptions
 			this->ZFactor = getFloat ("ZFactor1");
 			this->HeightMapFile2 = getStr ("HeightMapFile2");
 			this->ZFactor2 = getFloat ("ZFactor2");
+			this->ExtendCoords = getFloat ("ExtendCoords");
 			this->Light = (uint8)getInt ("ZoneLight");
 			this->CellSize = getFloat ("CellSize");
 			this->Threshold = getFloat ("Threshold");
diff --git a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
index 319925584..d49a64b0f 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
+++ b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
@@ -2171,13 +2171,19 @@ float CExport::getHeight (float x, float y)
 	sint32 SizeX = _ZoneMaxX - _ZoneMinX + 1;
 	sint32 SizeY = _ZoneMaxY - _ZoneMinY + 1;
 
-	clamp (x, _Options->CellSize*_ZoneMinX, _Options->CellSize*(_ZoneMaxX+1));
-	clamp (y, _Options->CellSize*_ZoneMinY, _Options->CellSize*(_ZoneMaxY+1));
-
 	if (_HeightMap != NULL)
 	{
-		color = _HeightMap->getColor (	(x-_Options->CellSize*_ZoneMinX)/(_Options->CellSize*SizeX),
-										1.0f - ((y-_Options->CellSize*_ZoneMinY)/(_Options->CellSize*SizeY)));
+		float xc = (x - _Options->CellSize * _ZoneMinX) / (_Options->CellSize * SizeX);
+		float yc = 1.0f - ((y - _Options->CellSize * _ZoneMinY) / (_Options->CellSize * SizeY));
+		if (_Options->ExtendCoords)
+		{
+			uint32 w = _HeightMap->getWidth(), h = _HeightMap->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
+		color = _HeightMap->getColor(xc, yc);
 		color *= 255;
 		deltaZ = color.A;
 		deltaZ = deltaZ - 127.0f; // Median intensity is 127
@@ -2186,8 +2192,17 @@ float CExport::getHeight (float x, float y)
 
 	if (_HeightMap2 != NULL)
 	{
-		color = _HeightMap2->getColor (	(x-_Options->CellSize*_ZoneMinX)/(_Options->CellSize*SizeX),
-										1.0f - ((y-_Options->CellSize*_ZoneMinY)/(_Options->CellSize*SizeY)));
+		float xc = (x - _Options->CellSize * _ZoneMinX) / (_Options->CellSize * SizeX);
+		float yc = 1.0f - ((y - _Options->CellSize * _ZoneMinY) / (_Options->CellSize * SizeY));
+		if (_Options->ExtendCoords)
+		{
+			uint32 w = _HeightMap2->getWidth(), h = _HeightMap2->getHeight();
+			xc -= .5f / (float)w;
+			yc -= .5f / (float)h;
+			xc = xc * (float)(w + 1) / (float)w;
+			yc = yc * (float)(h + 1) / (float)h;
+		}
+		color = _HeightMap2->getColor(xc, yc);
 		color *= 255;
 		deltaZ2 = color.A;
 		deltaZ2 = deltaZ2 - 127.0f; // Median intensity is 127
diff --git a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
index a8a6b93cb..46ec0f4b7 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
+++ b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
@@ -101,6 +101,7 @@ struct SExportOptions
 	float			ZFactor;
 	std::string		HeightMapFile2;
 	float			ZFactor2;
+	bool			ExtendCoords;
 
 	uint8			Light; // Roughly light the zone (0-none, 1-patch, 2-noise)
 

From 93ad5e469c308654e67605b82c5a915380610a36 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 6 Jan 2021 09:57:07 +0800
Subject: [PATCH 204/292] Ignore broken zone

---
 nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
index ffb428deb..d3c15e478 100644
--- a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
+++ b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
@@ -68,6 +68,7 @@ int s_Warnings;
 
 // --land "R:\graphics\landscape\ligo\desert\r2_desert.land" --referenceext zonew "X:\wsl\check_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld" --extendcoords
 // --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" --referenceext zonew "X:\wsl\check_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld" --extendcoords
+// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" --referenceext zonew "X:\wsl\check_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld" --extendcoords
 
 bool loadLand(const string &filename)
 {
@@ -297,6 +298,9 @@ bool unbuildElevation()
 		if (!CFile::fileExists(sourceZone))
 			continue;
 
+		if (zone == "137_JK") // Bad zone
+			continue;
+
 		printf("%s\n", nlUtf8ToMbcs(zone));
 		++totalZones;
 

From ea1b3dbc286c019e43272762e7454bb2c3789238 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 6 Jan 2021 23:20:54 +0800
Subject: [PATCH 205/292] Without extending coords, expect an additional 1px to
 align

---
 nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
index d3c15e478..656109cae 100644
--- a/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
+++ b/nel/tools/3d/unbuild_elevation/unbuild_elevation.cpp
@@ -132,6 +132,12 @@ void getBitmapSize(int &w, int &h)
 	sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
 	w = sizeX * 20;
 	h = sizeY * 20;
+
+	if (!s_ExtendCoords)
+	{
+		++w;
+		++h;
+	}
 }
 
 void getBitmapCoord(float &xc, float &yc, float x, float y)

From 00037b364406989684f02ea86d97243174ffc46d Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 7 Jan 2021 07:20:54 +0800
Subject: [PATCH 206/292] Apply elevation to ig_static_other

---
 nel/tools/build_gamedata/processes/ig/2_build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nel/tools/build_gamedata/processes/ig/2_build.py b/nel/tools/build_gamedata/processes/ig/2_build.py
index 2d461de99..d5e989bfc 100755
--- a/nel/tools/build_gamedata/processes/ig/2_build.py
+++ b/nel/tools/build_gamedata/processes/ig/2_build.py
@@ -265,7 +265,8 @@ printLog(log, ">>> Merge other IGs <<<") # (not true merge, since not necesserar
 mkPath(log, ExportBuildDirectory + "/" + IgStaticOtherExportDirectory)
 mkPath(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory)
 mkPath(log, ExportBuildDirectory + "/" + IgOtherBuildDirectory)
-copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + IgStaticOtherExportDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory, ".ig")
+# copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + IgStaticOtherExportDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory, ".ig")
+igElevation(ExportBuildDirectory + "/" + IgStaticOtherExportDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory)
 copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory, ".ig")
 
 log.close()

From 29ef76e53792dfe764b19d482289df04ecdaeb95 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 13 Feb 2021 15:05:40 +0200
Subject: [PATCH 207/292] utf-8 fixes, ryzom/ryzomcore#335

---
 .../src/interface_v3/group_in_scene_bubble.cpp       | 12 +++++-------
 ryzom/client/src/interface_v3/interface_manager.cpp  |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 1ea6f35f9..0dd5179a8 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -645,26 +645,24 @@ void CGroupInSceneBubbleManager::addMessagePopupCenter (const string &message, C
 		"ui:interface", templateParams.empty()?NULL:&(templateParams[0]), (uint)templateParams.size());
 	if (group)
 	{
-		ucstring finalMessage = message;
+		string finalMessage = message;
 
-		ucstring::size_type pos = message.find(ucstring("|"));
+		string::size_type pos = message.find("|");
 		if (pos != std::string::npos)
 		{
 			CViewBitmap *pViewIcon = dynamic_cast<CViewBitmap*>(group->getView("iconA"));
 			if (pViewIcon != NULL)
 			{
-				string texture = message.substr(0, pos).toString();
-				pViewIcon->setTexture(texture);
+				pViewIcon->setTexture(message.substr(0, pos));
 			}
 
-			ucstring::size_type end = message.find(ucstring("|"), pos+1);
+			string::size_type end = message.find("|", pos+1);
 			if (end != std::string::npos)
 			{
 				CViewBitmap *pViewIcon = dynamic_cast<CViewBitmap*>(group->getView("iconZ"));
 				if (pViewIcon != NULL)
 				{
-					string texture = message.substr(end+1).toString();
-					pViewIcon->setTexture(texture);
+					pViewIcon->setTexture(message.substr(end+1));
 				}
 				finalMessage = message.substr(pos+1, end-pos-1);
 			}
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 2cfdfe752..8f3294ffc 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2532,11 +2532,11 @@ void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
 	CClientConfig::SSysInfoParam::TMode mode = CClientConfig::SSysInfoParam::Normal;
 	CRGBA color = CRGBA::White;
 
-	ucstring cleanStr = str;
-	ucstring::size_type pos = str.find(ucstring("|"));
+	string cleanStr = str;
+	string::size_type pos = str.find("|");
 	if (pos != std::string::npos)
 	{
-		ucstring::size_type end = str.find(ucstring("|"), pos+1);
+		string::size_type end = str.find("|", pos+1);
 		if (end != std::string::npos)
 			cleanStr = str.substr(pos+1, end-pos-1);
 		else

From 65415dfc55fd6ffe6bc4ca613c47e9df022aa716 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 14 Feb 2021 13:03:37 +0200
Subject: [PATCH 208/292] Fixed infinite loop crash from string comparison

---
 nel/src/gui/dbgroup_combo_box.cpp             | 2 +-
 ryzom/client/src/interface_v3/people_list.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index b54d33e8f..9adffab86 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -46,7 +46,7 @@ namespace NLGUI
 	static inline bool lt_text(const std::pair<int,std::string> &s1, const std::pair<int,std::string> &s2)
 	{
 		// return toLower(s1.second) < toLower(s2.second);
-		return -NLMISC::compareCaseInsensitive(s1.second, s2.second);
+		return NLMISC::compareCaseInsensitive(s1.second, s2.second) < 0;
 	}
 
 	std::string CDBGroupComboBox::measureMenu;
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index d99089a69..246f3bc0a 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -195,7 +195,7 @@ bool CPeopleList::sortExByContactId(const CPeople& a, const CPeople& b)
 //==================================================================
 bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 {
-	return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
+	return NLMISC::compareCaseInsensitive(a.getName(), b.getName()) < 0; // FIXME: Locale-dependent sort
 }
 
 //==================================================================
@@ -204,7 +204,7 @@ bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 	// We want order: online/alpha, offworld/alpha, offline/alpha
 	if (a.Online == b.Online)
 	{
-		return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
+		return NLMISC::compareCaseInsensitive(a.getName(), b.getName()) < 0; // FIXME: Locale-dependent sort
 	}
 	else
 	{

From 9262302baa41b50f23ee24875f1d6ebc13451ca7 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 31 Mar 2021 13:30:43 +0300
Subject: [PATCH 209/292] Add macros to read properties from xmlNode

---
 nel/include/nel/misc/xml_macros.h | 74 +++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 nel/include/nel/misc/xml_macros.h

diff --git a/nel/include/nel/misc/xml_macros.h b/nel/include/nel/misc/xml_macros.h
new file mode 100644
index 000000000..d25cd4c30
--- /dev/null
+++ b/nel/include/nel/misc/xml_macros.h
@@ -0,0 +1,74 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+#ifndef XML_MACROS_H
+#define XML_MACROS_H
+
+//
+// xmlNodePtr cur;
+// CXMLAutoPtr prop;
+//
+// sint i;
+// XML_READ_SINT(cur, "prop_name", i, -1);
+//
+
+#define XML_READ_UINT(node, name, var, def) { \
+	uint tmp; \
+	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
+	if (prop && fromString((const char*)prop, tmp)) \
+		var = tmp; \
+	else \
+		var = def; \
+}
+
+#define XML_READ_SINT(node, name, var, def) { \
+	sint tmp; \
+	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
+	if (prop && fromString((const char*)prop, tmp)) \
+		var = tmp; \
+	else \
+		var = def; \
+}
+
+#define XML_READ_BOOL(node, name, var, def) { \
+	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
+	if (prop) \
+		var = NLMISC::toBool((const char*)prop); \
+	else \
+		var = def; \
+}
+
+#define XML_READ_COLOR(node, name, var, def) { \
+	NLMISC::CRGBA tmp; \
+	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
+	if (prop && fromString((const char*)prop, tmp)) \
+		var = tmp; \
+	else \
+		var = def; \
+}
+
+#define XML_READ_STRING(node, name, var, def) { \
+	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
+	if (prop) \
+		var = (const char*)prop; \
+	else \
+		var = def; \
+}
+
+#endif // XML_MACROS_H
+

From d210c23b26e75c6bdc7494feb103e492ac2ba7af Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 31 Mar 2021 15:06:13 +0300
Subject: [PATCH 210/292] Add xml options for icon regen text

---
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 128 ++++++++++++++----
 ryzom/client/src/interface_v3/dbctrl_sheet.h  |  23 ++++
 2 files changed, 122 insertions(+), 29 deletions(-)

diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index f24137f23..f1f3a650e 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -56,6 +56,7 @@
 #include "../r2/editor.h"
 
 #include "nel/gui/lua_manager.h"
+#include "nel/misc/xml_macros.h"
 
 extern CSheetManager SheetMngr;
 
@@ -565,6 +566,14 @@ CCtrlDraggable(param)
 
 	_RegenText = NULL;
 	_RegenTextValue = 0;
+	_RegenTextEnabled = true;
+	_RegenTextShadow = true;
+	_RegenTextOutline = false;
+	_RegenTextY = 2;
+	_RegenTextFontSize = 8;
+	_RegenTextColor = NLMISC::CRGBA::White;
+	_RegenTextShadowColor = NLMISC::CRGBA::Black;
+	_RegenTextOutlineColor = NLMISC::CRGBA::Black;
 }
 
 // ----------------------------------------------------------------------------
@@ -677,6 +686,15 @@ bool CDBCtrlSheet::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"focus_buff_icon" );
 	if (prop)	_FocusBuffIcon = string((const char *)prop);
 
+	XML_READ_BOOL(cur, "regen_text", _RegenTextEnabled, true);
+	XML_READ_BOOL(cur, "regen_text_shadow", _RegenTextShadow, true);
+	XML_READ_BOOL(cur, "regen_text_outline", _RegenTextOutline, false);
+	XML_READ_SINT(cur, "regen_text_y", _RegenTextY, 2);
+	XML_READ_UINT(cur, "regen_text_fontsize", _RegenTextFontSize, 8);
+	XML_READ_COLOR(cur, "regen_text_color", _RegenTextColor, NLMISC::CRGBA::White);
+	XML_READ_COLOR(cur, "regen_text_shadow_color", _RegenTextShadowColor, NLMISC::CRGBA::Black);
+	XML_READ_COLOR(cur, "regen_text_outline_color", _RegenTextOutlineColor, NLMISC::CRGBA::Black);
+
 	updateActualType();
 	// Init size for Type
 	initSheetSize();
@@ -2108,35 +2126,8 @@ void CDBCtrlSheet::draw()
 				rVR.drawQuad(_RenderLayer + 1, regenTris[tri], backTex, CRGBA::White, false);
 			}
 
-			if (!_RegenText) {
-				_RegenText = new CViewText(CViewBase::TCtorParam());
-				_RegenText->setId(getId() + ":regen");
-				_RegenText->setParent(_Parent);
-				_RegenText->setOverflowText(std::string());
-				_RegenText->setModulateGlobalColor(false);
-				_RegenText->setMultiLine(false);
-				_RegenText->setTextMode(CViewText::ClipWord);
-				_RegenText->setFontSizing("0", "0");
-				// TODO: font size / color hardcoded.
-				_RegenText->setFontSize(8);
-				_RegenText->setColor(CRGBA::White);
-				_RegenText->setShadow(true);
-				_RegenText->setActive(true);
-				_RegenText->updateTextContext();
-			}
-
-			// TODO: ticks in second hardcoded
-			uint32 nextValue = _RegenTickRange.EndTick > LastGameCycle ? (_RegenTickRange.EndTick - LastGameCycle) / 10 : 0;
-			if (_RegenTextValue != nextValue)
-			{
-				_RegenTextValue = nextValue;
-				_RegenText->setText(toString("%d", _RegenTextValue));
-				_RegenText->updateTextContext();
-			}
-			_RegenText->setXReal(_XReal+1);
-			_RegenText->setYReal(_YReal+2);
-			_RegenText->setRenderLayer(_RenderLayer+2);
-			_RegenText->draw();
+			if (_RegenTextEnabled)
+				drawRegenText();
 		}
 	}
 
@@ -2166,6 +2157,85 @@ void CDBCtrlSheet::draw()
 	}
 }
 
+// ----------------------------------------------------------------------------
+void CDBCtrlSheet::drawRegenText()
+{
+	if (!_RegenText) {
+		_RegenText = new CViewText(CViewBase::TCtorParam());
+		_RegenText->setId(getId() + ":regen");
+		_RegenText->setParent(_Parent);
+		_RegenText->setOverflowText(std::string());
+		_RegenText->setModulateGlobalColor(false);
+		_RegenText->setMultiLine(false);
+		_RegenText->setTextMode(CViewText::ClipWord);
+		_RegenText->setFontSize(_RegenTextFontSize);
+		_RegenText->setColor(_RegenTextColor);
+		// do not set shadow if outline is set to avoid clearing it on draw (would call invalidate)
+		_RegenText->setShadow(_RegenTextShadow && !_RegenTextOutline);
+		_RegenText->setShadowOutline(false);//_RegenTextOutline);
+		_RegenText->setShadowColor(_RegenTextShadowColor);
+
+		_RegenText->setActive(true);
+		_RegenText->updateTextContext();
+	}
+
+	// TODO: 10 hardcoded (ticks in second)
+	uint32 nextValue = _RegenTickRange.EndTick > LastGameCycle ? (_RegenTickRange.EndTick - LastGameCycle) / 10 : 0;
+	if (_RegenTextValue != nextValue)
+	{
+		_RegenTextValue = nextValue;
+		// format as "10m", "9'59", "59"
+		if (_RegenTextValue > 600)
+		{
+			_RegenText->setText(toString("%dm", _RegenTextValue / 60));
+		}
+		else if (_RegenTextValue > 0)
+		{
+			if (_RegenTextValue < 60)
+				_RegenText->setText(toString("%d", _RegenTextValue));
+			else
+				_RegenText->setText(toString("%d'%02d", _RegenTextValue / 60, _RegenTextValue % 60));
+		}
+		else
+		{
+			_RegenText->setText("");
+		}
+
+		_RegenText->updateTextContext();
+		// todo: posref
+		_RegenText->setX(_WReal / 2 -_RegenText->getMaxUsedW() / 2);
+		// move RegenTextY=0 to baseline
+		_RegenText->setY(_RegenTextY - _RegenText->getFontLegHeight());
+	}
+
+	_RegenText->setXReal(_XReal + _RegenText->getX());
+	_RegenText->setYReal(_YReal + _RegenText->getY());
+	_RegenText->setRenderLayer(_RenderLayer+2);
+
+	// TODO: create shader for this
+	if (_RegenTextOutline)
+	{
+		// player.xml t_bonus_text template way of drawing
+		sint x = _RegenText->getXReal();
+		sint y = _RegenText->getYReal();
+
+		_RegenText->setColor(_RegenTextShadowColor);
+		_RegenText->setXReal(x-1); _RegenText->setYReal(y+0); _RegenText->draw();
+		_RegenText->setXReal(x+1); _RegenText->setYReal(y+0); _RegenText->draw();
+		_RegenText->setXReal(x+0); _RegenText->setYReal(y-1); _RegenText->draw();
+		_RegenText->setXReal(x+0); _RegenText->setYReal(y+1); _RegenText->draw();
+
+		_RegenText->setColor(_RegenTextColor);
+		_RegenText->setXReal(x); _RegenText->setYReal(y);
+		_RegenText->draw();
+		_RegenText->draw();
+	}
+	else
+	{
+		_RegenText->draw();
+		_RegenText->draw();
+	}
+}
 
 // ----------------------------------------------------------------------------
 void CDBCtrlSheet::drawRotatedQuad(CViewRenderer &vr, float angle, float scale, uint renderLayer, uint32 texId, sint32 texWidth, sint32 texHeight)
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index a26a74b22..fee96150f 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -602,6 +602,16 @@ public:
 	void	setRegenTickRange(const CTickRange &tickRange);
 	const CTickRange &getRegenTickRange() const { return _RegenTickRange; }
 
+	// Default regen text is displayed on bottom of icon.
+	void setRegenText(bool b) { _RegenTextEnabled = b; }
+	void setRegenTextY(sint32 y) { _RegenTextY = y; }
+	void setRegenTextShadow(bool b) { _RegenTextShadow = b; }
+	void setRegenTextShadowColor(NLMISC::CRGBA c) { _RegenTextShadowColor = c; }
+	void setRegenTextOutline(bool b) { _RegenTextOutline = b; }
+	void setRegenTextOutlineColor(NLMISC::CRGBA c) { _RegenTextOutlineColor = c; }
+	void setRegenTextFontSize(uint32 s) { _RegenTextFontSize = s; }
+	void setRegenTextColor(NLMISC::CRGBA c) { _RegenTextColor = c; }
+
 	// start notify anim (at the end of regen usually)
 	void	startNotifyAnim();
 
@@ -739,6 +749,16 @@ protected:
 	CTickRange		_RegenTickRange;
 	NLGUI::CViewText	*_RegenText;
 	uint32			_RegenTextValue;
+	//
+	bool			_RegenTextEnabled;
+	bool			_RegenTextShadow;
+	bool			_RegenTextOutline;
+	sint32			_RegenTextY;
+	uint32			_RegenTextFontSize;
+	NLMISC::CRGBA	_RegenTextShadowColor;
+	NLMISC::CRGBA	_RegenTextOutlineColor;
+	NLMISC::CRGBA	_RegenTextColor;
+
 
 	/// D'n'd
 	sint32		_DragX, _DragY;
@@ -852,6 +872,9 @@ private:
 	// gelper to draw the notify animation
 	void drawRotatedQuad(CViewRenderer &vr, float angle, float scale, uint renderLayer, uint32 textureId, sint32 texWidth, sint32 texHeight);
 
+	// create and draw regen text over icon
+	void drawRegenText();
+
 };
 
 /** User type (used with expression system of the interface, see interface_expr.h, that contains a pointer to a CDBCtrlSheet

From 27826eb448f8af23d9178e86b5fecf0937241740 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 31 Mar 2021 17:59:53 +0300
Subject: [PATCH 211/292] Show bonus/malus timer text if available

---
 .../dbgroup_list_sheet_bonus_malus.cpp        | 123 ++++++++++--------
 .../dbgroup_list_sheet_bonus_malus.h          |  28 +++-
 2 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
index 175d7339b..5fb68745c 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
@@ -23,7 +23,7 @@
 #include "stdpch.h"
 #include "dbgroup_list_sheet_bonus_malus.h"
 #include "interface_manager.h"
-
+#include "nel/misc/xml_macros.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -35,87 +35,102 @@ NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListSheetBonusMalus, std::string, "lis
 
 // ***************************************************************************
 CDBGroupListSheetBonusMalus::CDBGroupListSheetBonusMalus(const TCtorParam &param)
-:	CDBGroupListSheet(param)
+:	CDBGroupListSheet(param),
+	_RegenTextY(-14), _RegenTextFontSize(8),
+	_RegenTextColor(NLMISC::CRGBA::White),
+	_RegenTextDisabledColor(NLMISC::CRGBA(127,127,127))
 {
-	_TextId= -1;
-
 	// want leave space between controls in the list
 	// Yoyo: I think it's better like this, + this is important for space consideration and because of XPCat/PVPOutpost
 	//_ListLeaveSpace= false;
 }
 
-
 // ***************************************************************************
-bool CDBGroupListSheetBonusMalus::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
+CDBGroupListSheetBonusMalus::CSheetChildTimer::CSheetChildTimer()
+:	TimerDB(NULL), DisabledDB(NULL), TimerCache(0),
+	_RegenTextColor(NLMISC::CRGBA::White),
+	_RegenTextDisabledColor(NLMISC::CRGBA(127,127,127))
 {
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+}
 
-	if(!CDBGroupListSheet::parse(cur, parentGroup))
-		return false;
+// ***************************************************************************
+void CDBGroupListSheetBonusMalus::CSheetChildTimer::init(CDBGroupListSheet *pFather, uint index)
+{
+	// init my parent
+	CSheetChild::init(pFather, index);
 
-	// read the texture
-	CXMLAutoPtr	prop;
-	prop = (char*) xmlGetProp( cur, (xmlChar*)"disable_texture" );
-	if (prop)
+	CCDBNodeBranch *root = Ctrl->getRootBranch();
+	if (root)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		_TextId= rVR.getTextureIdFromName ((const char *)prop);
+		TimerDB = dynamic_cast<CCDBNodeLeaf *>(root->getNode(ICDBNode::CTextId("DISABLED_TIME"), false));
+		DisabledDB = dynamic_cast<CCDBNodeLeaf *>(root->getNode(ICDBNode::CTextId("DISABLED"), false));
 	}
 
-	// get the Node leaves to be tested each frame
-	uint	i= 0;
-	for(;;)
+	if (Ctrl)
 	{
-		string	db= toString("%s:%d:" DISABLE_LEAF, _DbBranchName.c_str(), i);
-		CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(db, false);
-		if(!node)
+		CDBGroupListSheetBonusMalus *owner = dynamic_cast<CDBGroupListSheetBonusMalus *>(pFather);
+		if (owner)
 		{
-			break;
+			_RegenTextColor = owner->_RegenTextColor;
+			_RegenTextDisabledColor = owner->_RegenTextDisabledColor;
+			Ctrl->setRegenText(owner->_RegenTextEnabled);
+			Ctrl->setRegenTextY(owner->_RegenTextY);
+			Ctrl->setRegenTextColor(owner->_RegenTextColor);
+			Ctrl->setRegenTextFontSize(owner->_RegenTextFontSize);
 		}
-		else
-		{
-			_DisableStates.push_back(node);
-			i++;
-		}
-	}
 
-	return true;
+		Ctrl->setRegenTextOutline(true);
+	}
 }
 
 // ***************************************************************************
-void CDBGroupListSheetBonusMalus::draw ()
+void CDBGroupListSheetBonusMalus::CSheetChildTimer::update(CDBGroupListSheet * /* pFather */)
 {
-	CDBGroupListSheet::draw();
-
-//	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-//	CViewRenderer		&rVR= *CViewRenderer::getInstance();
-
-//	sint32	drl= getRenderLayer()+1;
+	if(!TimerDB)
+		return;
 
-	// May draw disable bitmaps on the ctrl sheets if disabled.
-	uint	numCtrls= (uint)min(_SheetChildren.size(), _DisableStates.size());
-	for(uint i=0;i<numCtrls;i++)
+	NLMISC::TGameCycle tick = TimerDB->getValue32();
+	if (TimerCache != tick)
 	{
-		CDBCtrlSheet	*ctrl= _SheetChildren[i]->Ctrl;
-		// if the ctrl is displayed, and if the state is disabled
-		if(ctrl->getActive())
+		TimerCache = TimerDB->getValue32();
+		Ctrl->setRegenTickRange(CTickRange(LastGameCycle, TimerCache));
+		if (DisabledDB)
 		{
-			if(_DisableStates[i]->getValue32()!=0)
+			if (DisabledDB->getValue32() == 0)
 			{
-				ctrl->setGrayed(true);
-				/*
-				// YOYO: for now, don't display the gray bitmap. cross not cool.
-				CRGBA	crossColor= ctrl->getSheetColor();
-				crossColor.A>>= 2;
-				// Draw the disable bitmap on this control. +1 for the slot (ugly)
-				rVR.drawRotFlipBitmap(drl, ctrl->getXReal()+1, ctrl->getYReal()+1,
-					CCtrlSheetInfo::BrickSheetWidth, CCtrlSheetInfo::BrickSheetHeight, 0, 0, _TextId, crossColor);
-				*/
+				// active timer
+				Ctrl->setGrayed(false);
+				Ctrl->setRegenTextColor(_RegenTextColor);
 			}
 			else
-				ctrl->setGrayed(false);
+			{
+				// skill disabled timer
+				Ctrl->setGrayed(true);
+				Ctrl->setRegenTextColor(_RegenTextDisabledColor);
+			}
+		}
+		else
+		{
+			Ctrl->setGrayed(true);
 		}
 	}
 }
 
+// ***************************************************************************
+bool CDBGroupListSheetBonusMalus::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
+{
+	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+
+	if(!CDBGroupListSheet::parse(cur, parentGroup))
+		return false;
+
+	CXMLAutoPtr prop;
+	XML_READ_BOOL(cur, "regen_text", _RegenTextEnabled, true);
+	XML_READ_SINT(cur, "regen_text_y", _RegenTextY, -14);
+	XML_READ_UINT(cur, "regen_text_fontsize", _RegenTextFontSize, 8);
+	XML_READ_COLOR(cur, "regen_text_color", _RegenTextColor, NLMISC::CRGBA::White);
+	XML_READ_COLOR(cur, "regen_text_disabled_color", _RegenTextDisabledColor, NLMISC::CRGBA(127, 127, 127));
+
+	return true;
+}
+
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
index 05774ec8d..c70e9f465 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
@@ -25,7 +25,6 @@
 #include "nel/misc/types_nl.h"
 #include "dbgroup_list_sheet.h"
 
-
 // ***************************************************************************
 /**
  * Special list_sheet that display some disalbe bitmap if needed according to DB
@@ -40,14 +39,33 @@ public:
 	/// Constructor
 	CDBGroupListSheetBonusMalus(const TCtorParam &param);
 
-	virtual bool parse (xmlNodePtr cur, CInterfaceGroup *parentGroup);
+	// A child node
+	struct	CSheetChildTimer : public CDBGroupListSheet::CSheetChild
+	{
+		CSheetChildTimer();
+		virtual void init(CDBGroupListSheet *pFather, uint index) NL_OVERRIDE;
+		virtual void update(CDBGroupListSheet *pFather) NL_OVERRIDE;
+
+		NLMISC::CCDBNodeLeaf *TimerDB;
+		NLMISC::CCDBNodeLeaf *DisabledDB;
+		uint TimerCache;
+
+		NLMISC::CRGBA _RegenTextColor;
+		NLMISC::CRGBA _RegenTextDisabledColor;
+	};
+
+	virtual bool parse(xmlNodePtr cur, CInterfaceGroup *parentGroup) NL_OVERRIDE;
 
-	virtual void draw ();
+	virtual CSheetChild *createSheetChild() NL_OVERRIDE { return new CSheetChildTimer; }
 
 private:
-	sint32							_TextId;
+	friend CSheetChildTimer;
 
-	std::vector<NLMISC::CCDBNodeLeaf*>		_DisableStates;
+	bool _RegenTextEnabled;
+	sint32 _RegenTextY;
+	uint32 _RegenTextFontSize;
+	NLMISC::CRGBA _RegenTextColor;
+	NLMISC::CRGBA _RegenTextDisabledColor;
 };
 
 

From 2f5b4d7c5bde3724cb5a68b9f3f4a517ac35ae31 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 1 Apr 2021 14:16:10 +0300
Subject: [PATCH 212/292] Add custom formatter for regen text

---
 .../client/src/interface_v3/dbctrl_sheet.cpp  | 68 +++++++++++++++----
 ryzom/client/src/interface_v3/dbctrl_sheet.h  | 13 +++-
 .../dbgroup_list_sheet_bonus_malus.cpp        |  4 ++
 .../dbgroup_list_sheet_bonus_malus.h          |  1 +
 4 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index f1f3a650e..70efd1f59 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -569,6 +569,7 @@ CCtrlDraggable(param)
 	_RegenTextEnabled = true;
 	_RegenTextShadow = true;
 	_RegenTextOutline = false;
+	_RegenTextFctLua = false;
 	_RegenTextY = 2;
 	_RegenTextFontSize = 8;
 	_RegenTextColor = NLMISC::CRGBA::White;
@@ -694,6 +695,8 @@ bool CDBCtrlSheet::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	XML_READ_COLOR(cur, "regen_text_color", _RegenTextColor, NLMISC::CRGBA::White);
 	XML_READ_COLOR(cur, "regen_text_shadow_color", _RegenTextShadowColor, NLMISC::CRGBA::Black);
 	XML_READ_COLOR(cur, "regen_text_outline_color", _RegenTextOutlineColor, NLMISC::CRGBA::Black);
+	XML_READ_STRING(cur, "regen_text_fct", _RegenTextFct, "");
+	_RegenTextFctLua = startsWith(_RegenTextFct, "lua:");
 
 	updateActualType();
 	// Init size for Type
@@ -2166,13 +2169,13 @@ void CDBCtrlSheet::drawRegenText()
 		_RegenText->setParent(_Parent);
 		_RegenText->setOverflowText(std::string());
 		_RegenText->setModulateGlobalColor(false);
-		_RegenText->setMultiLine(false);
+		_RegenText->setMultiLine(true);
 		_RegenText->setTextMode(CViewText::ClipWord);
 		_RegenText->setFontSize(_RegenTextFontSize);
 		_RegenText->setColor(_RegenTextColor);
 		// do not set shadow if outline is set to avoid clearing it on draw (would call invalidate)
 		_RegenText->setShadow(_RegenTextShadow && !_RegenTextOutline);
-		_RegenText->setShadowOutline(false);//_RegenTextOutline);
+		_RegenText->setShadowOutline(false);
 		_RegenText->setShadowColor(_RegenTextShadowColor);
 
 		_RegenText->setActive(true);
@@ -2180,29 +2183,62 @@ void CDBCtrlSheet::drawRegenText()
 	}
 
 	// TODO: 10 hardcoded (ticks in second)
-	uint32 nextValue = _RegenTickRange.EndTick > LastGameCycle ? (_RegenTickRange.EndTick - LastGameCycle) / 10 : 0;
+	sint32 nextValue;
+	if (_RegenTickRange.EndTick > LastGameCycle)
+		nextValue = (_RegenTickRange.EndTick - LastGameCycle) / 10;
+	else if (_RegenTextFctLua)
+		nextValue = ((sint64)_RegenTickRange.EndTick - (sint64)LastGameCycle) / 10;
+	else
+		nextValue = 0;
+
 	if (_RegenTextValue != nextValue)
 	{
 		_RegenTextValue = nextValue;
-		// format as "10m", "9'59", "59"
-		if (_RegenTextValue > 600)
-		{
-			_RegenText->setText(toString("%dm", _RegenTextValue / 60));
-		}
-		else if (_RegenTextValue > 0)
+		if (_RegenTextFct.empty())
 		{
-			if (_RegenTextValue < 60)
-				_RegenText->setText(toString("%d", _RegenTextValue));
+			// format as "10m", "9'59", "59"
+			if (_RegenTextValue > 600)
+			{
+				_RegenText->setText(toString("%dm", _RegenTextValue / 60));
+			}
+			else if (_RegenTextValue > 0)
+			{
+				if (_RegenTextValue < 60)
+					_RegenText->setText(toString("%d", _RegenTextValue));
+				else
+					_RegenText->setText(toString("%d'%02d", _RegenTextValue / 60, _RegenTextValue % 60));
+			}
 			else
-				_RegenText->setText(toString("%d'%02d", _RegenTextValue / 60, _RegenTextValue % 60));
+			{
+				_RegenText->setText("");
+			}
 		}
 		else
 		{
-			_RegenText->setText("");
+			std::string fct;
+			if (_RegenTextFctLua)
+			{
+				CCDBNodeBranch *root = getRootBranch();
+				if (root)
+					fct = toString("%s(%d, '%s')", _RegenTextFct.c_str(), _RegenTextValue, root->getFullName().c_str());
+				else
+					fct = toString("%s(%d, nil)", _RegenTextFct.c_str(), _RegenTextValue);
+			}
+			else
+			{
+				fct = toString("%s(%d)", _RegenTextFct.c_str(), _RegenTextValue);
+			}
+
+			// if using color tags in format, then RegenText color should be set to CRGBA::White
+			// as tag color is modulated with main color
+			std::string result;
+			if (CInterfaceExpr::evalAsString(fct, result))
+				_RegenText->setTextFormatTaged(result);
 		}
 
 		_RegenText->updateTextContext();
 		// todo: posref
+		// note: if x,y is moved outside icon area it might get cliped and not be visible (wreal/hreal == 0)
 		_RegenText->setX(_WReal / 2 -_RegenText->getMaxUsedW() / 2);
 		// move RegenTextY=0 to baseline
 		_RegenText->setY(_RegenTextY - _RegenText->getFontLegHeight());
@@ -4830,6 +4866,12 @@ std::string CDBCtrlSheet::getContextHelpWindowName() const
 	return CCtrlBase::getContextHelpWindowName();
 }
 
+// ***************************************************************************
+void CDBCtrlSheet::setRegenTextFct(const std::string &s)
+{
+	_RegenTextFct = s;
+	_RegenTextFctLua = startsWith(s, "lua:");
+}
 
 // ***************************************************************************
 void CDBCtrlSheet::setRegenTickRange(const CTickRange &tickRange)
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index fee96150f..ab44ce99f 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -604,6 +604,15 @@ public:
 
 	// Default regen text is displayed on bottom of icon.
 	void setRegenText(bool b) { _RegenTextEnabled = b; }
+	// Allow to override default formatter.
+	// First parameter will be replaced with current timer value (always >= 0)
+	// If its a lua function, then parameters are
+	// 1: current timer value; can be negative
+	// 2: DB path for ctrl root (ie UI:VARIABLES:BONUSES:0), or nil
+	//
+	// ie: "secondsToTimeStringShort"     -> CInterfaceExpr::evalAsString("secondsToTimeStringShort(123)", ret)
+	// ie: "lua:secondsToTimeStringShort" -> CInterfaceExpr::evalAsString("lua:secondsToTimeStringShort(123, 'UI:VARIABLES:BONUSES:0')", ret)
+	void setRegenTextFct(const std::string &s);
 	void setRegenTextY(sint32 y) { _RegenTextY = y; }
 	void setRegenTextShadow(bool b) { _RegenTextShadow = b; }
 	void setRegenTextShadowColor(NLMISC::CRGBA c) { _RegenTextShadowColor = c; }
@@ -748,8 +757,10 @@ protected:
 
 	CTickRange		_RegenTickRange;
 	NLGUI::CViewText	*_RegenText;
-	uint32			_RegenTextValue;
+	sint32			_RegenTextValue;
 	//
+	std::string		_RegenTextFct;
+	bool			_RegenTextFctLua;
 	bool			_RegenTextEnabled;
 	bool			_RegenTextShadow;
 	bool			_RegenTextOutline;
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
index 5fb68745c..f41dd3085 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
@@ -36,6 +36,7 @@ NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListSheetBonusMalus, std::string, "lis
 // ***************************************************************************
 CDBGroupListSheetBonusMalus::CDBGroupListSheetBonusMalus(const TCtorParam &param)
 :	CDBGroupListSheet(param),
+	_RegenTextEnabled(true),
 	_RegenTextY(-14), _RegenTextFontSize(8),
 	_RegenTextColor(NLMISC::CRGBA::White),
 	_RegenTextDisabledColor(NLMISC::CRGBA(127,127,127))
@@ -77,6 +78,8 @@ void CDBGroupListSheetBonusMalus::CSheetChildTimer::init(CDBGroupListSheet *pFat
 			Ctrl->setRegenTextY(owner->_RegenTextY);
 			Ctrl->setRegenTextColor(owner->_RegenTextColor);
 			Ctrl->setRegenTextFontSize(owner->_RegenTextFontSize);
+			if (!owner->_RegenTextFct.empty())
+				Ctrl->setRegenTextFct(owner->_RegenTextFct);
 		}
 
 		Ctrl->setRegenTextOutline(true);
@@ -130,6 +133,7 @@ bool CDBGroupListSheetBonusMalus::parse (xmlNodePtr cur, CInterfaceGroup *parent
 	XML_READ_UINT(cur, "regen_text_fontsize", _RegenTextFontSize, 8);
 	XML_READ_COLOR(cur, "regen_text_color", _RegenTextColor, NLMISC::CRGBA::White);
 	XML_READ_COLOR(cur, "regen_text_disabled_color", _RegenTextDisabledColor, NLMISC::CRGBA(127, 127, 127));
+	XML_READ_STRING(cur, "regen_text_fct", _RegenTextFct, "");
 
 	return true;
 }
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
index c70e9f465..d63e664ed 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
@@ -62,6 +62,7 @@ private:
 	friend CSheetChildTimer;
 
 	bool _RegenTextEnabled;
+	std::string _RegenTextFct;
 	sint32 _RegenTextY;
 	uint32 _RegenTextFontSize;
 	NLMISC::CRGBA _RegenTextColor;

From 4505ecf8a2f3338d7135619d70e57849ae18ece4 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 1 Apr 2021 20:51:57 +0300
Subject: [PATCH 213/292] Revert "Add missing PowerRoot effect families to
 sheetid conversions table."

This reverts commit ff9aa6c6081a61444cb36a3e79e49c92d0abf084.
---
 ryzom/common/src/game_share/effect_families.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/ryzom/common/src/game_share/effect_families.cpp b/ryzom/common/src/game_share/effect_families.cpp
index 391626393..8d00cf200 100644
--- a/ryzom/common/src/game_share/effect_families.cpp
+++ b/ryzom/common/src/game_share/effect_families.cpp
@@ -323,19 +323,6 @@ namespace EFFECT_FAMILIES
 		{ "thorn_wall_aura.sbrick",		PowerThornWall },
 		{ "water_wall_aura.sbrick",		PowerWaterWall },
 		{ "lightning_wall_aura.sbrick",	PowerLightningWall },
-
-		{ "life_aura.sbrick",			PowerRootLifeAura },
-		{ "stamina_aura.sbrick",		PowerRootStaminaAura },
-		{ "sap_aura.sbrick",			PowerRootSapAura },
-		{ "umbrella_aura.sbrick",		PowerRootUmbrella },
-		{ "melee_protection_aura.sbrick",	PowerRootProtection },
-		{ "anti_magic_shield_aura.sbrick",	PowerRootAntiMagicShield },
-		{ "war_cry_aura.sbrick",		PowerRootWarCry },
-		{ "fire_wall_aura.sbrick",		PowerRootFireWall },
-		{ "thorn_wall_aura.sbrick",		PowerRootThornWall },
-		{ "water_wall_aura.sbrick",		PowerRootWaterWall },
-		{ "lightning_wall_aura.sbrick",	PowerRootLightningWall },
-
 		{ "chg_charac.sbrick",			PowerChgCharac },
 		{ "mod_defense.sbrick",					PowerModDefenseSkill },
 		{ "mod_dodge.sbrick",					PowerModDodgeSkill },

From 36d482e6d18268c0fa4a00a3fa1c234e352664bd Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 20 Apr 2021 22:24:56 +0300
Subject: [PATCH 214/292] Fixed parsing of css unversal (*) selector

---
 nel/src/gui/css_parser.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index ab9f6edb7..4aa91e3e9 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -366,6 +366,14 @@ namespace NLGUI
 				continue;
 			}
 
+			if (sel[pos] == '*' && current.empty())
+			{
+				pos++;
+				current.Element = "*";
+				start = pos;
+				continue;
+			}
+
 			if(sel[pos] == '#')
 			{
 				pos++;

From 87e88cee6ff866ecb87edc355042b60b974c8629 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 22 Apr 2021 13:38:58 +0300
Subject: [PATCH 215/292] Initial support for css var() function

---
 nel/include/nel/gui/css_style.h |   6 +
 nel/src/gui/css_parser.cpp      |   6 +-
 nel/src/gui/css_style.cpp       | 218 +++++++++++++++++++++++++++++---
 3 files changed, 212 insertions(+), 18 deletions(-)

diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 5521818a4..9e8ad4b0e 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -188,6 +188,12 @@ namespace NLGUI
 		void applyLineStyle(const std::string &value, CSSLineStyle *dest, const CSSLineStyle &currentStyle) const;
 		void applyPaddingWidth(const std::string &value, uint32 *dest, const uint32 currentPadding, uint32 fontSize) const;
 
+		// parse and replace var(--name, fallback) function
+		// return false if property should be ignored
+		bool cssFuncVar(std::string &func, const TStyle &styleRules, const std::set<std::string> &seenProperties) const;
+		// return false if property was not defined
+		bool lookupPropertyValue(const std::string &name, std::string &value, const TStyle &styleRules) const;
+
 	public:
 		void reset();
 
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index 4aa91e3e9..e59e67156 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -50,7 +50,11 @@ namespace NLGUI
 			pos = elements[i].find_first_of(':');
 			if (pos != std::string::npos)
 			{
-				std::string key = trim(toLowerAscii(elements[i].substr(0, pos)));
+				// css properties are case-insensitive, but
+				// custom properties (--name; ...;) are case sensitive
+				std::string key = trim(elements[i].substr(0, pos));
+				if (key.size() < 2 || (key[0] != '-' && key[1] != '-'))
+					key = toLowerAscii(key);
 				std::string value = trim(elements[i].substr(pos+1));
 				styles.push_back(TStylePair(key, value));
 			}
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index ac36da726..3ff9744bc 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -386,27 +386,35 @@ namespace NLGUI
 	// - normalize values
 	void CCssStyle::normalize(const TStyle &styleRules, CStyleParams &style, const CStyleParams &current) const
 	{
+		std::set<std::string> seenProperties;
+
 		TStyle::const_iterator it;
 		for (it=styleRules.begin(); it != styleRules.end(); ++it)
 		{
+			std::string value = it->second;
+
+			// replace possible custom properties, ignore property if var() fails
+			if (!cssFuncVar(value, styleRules, seenProperties))
+				continue;
+
 			// update local copy of applied style
-			style.StyleRules[it->first] = it->second;
+			style.StyleRules[it->first] = value;
 
 			if (it->first == "color")
 			{
-				if (it->second == "inherit")
+				if (value == "inherit")
 				{
 					style.TextColor = current.TextColor;
 				}
 				else
 				{
-					scanHTMLColor(it->second.c_str(), style.TextColor);
+					scanHTMLColor(value.c_str(), style.TextColor);
 				}
 			}
 			else
 			if (it->first == "font")
 			{
-				if (it->second == "inherit")
+				if (value == "inherit")
 				{
 					style.FontSize = current.FontSize;
 					style.FontFamily = current.FontFamily;
@@ -417,42 +425,42 @@ namespace NLGUI
 			else
 			if (it->first == "font-size")
 			{
-				if (it->second == "inherit")
+				if (value == "inherit")
 				{
 					style.FontSize = current.FontSize;
 				}
-				else if (it->second == "x-small")
+				else if (value == "x-small")
 				{
 					style.FontSize = 10; // 62.5%
 				}
-				else if (it->second == "small")
+				else if (value == "small")
 				{
 					style.FontSize = 13; // 80%;
 				}
-				else if (it->second == "medium")
+				else if (value == "medium")
 				{
 					style.FontSize = 16; // 100%;
 				}
-				else if (it->second == "large")
+				else if (value == "large")
 				{
 					style.FontSize = 18; // 112.5%
 				}
-				else if (it->second == "x-large")
+				else if (value == "x-large")
 				{
 					style.FontSize = 24; // 150%
 				}
-				else if (it->second == "xx-large")
+				else if (value == "xx-large")
 				{
 					style.FontSize = 32; // 200%;
 				}
-				else if (it->second == "smaller")
+				else if (value == "smaller")
 				{
 					if (style.FontSize < 5)
 						style.FontSize = 3;
 					else
 						style.FontSize -= 2;
 				}
-				else if (it->second == "larger")
+				else if (value == "larger")
 				{
 					style.FontSize += 2;
 				}
@@ -460,7 +468,7 @@ namespace NLGUI
 				{
 					float tmpf;
 					std::string unit;
-					if (getCssLength(tmpf, unit, it->second.c_str()))
+					if (getCssLength(tmpf, unit, value.c_str()))
 					{
 						if (unit == "rem")
 							style.FontSize = Root.FontSize * tmpf;
@@ -479,16 +487,16 @@ namespace NLGUI
 			if (it->first == "background-repeat")
 			{
 				// old ryzom specific value
-				if (it->second == "1")
+				if (value == "1")
 					style.StyleRules[it->first] = "repeat";
 			}
 			else
 			if (it->first == "display")
 			{
-				if (it->second == "inherit")
+				if (value == "inherit")
 					style.DisplayBlock = current.DisplayBlock;
 				else
-					style.DisplayBlock = (it->second == "block" || it->second == "table");
+					style.DisplayBlock = (value == "block" || value == "table");
 			}
 		}
 	}
@@ -1668,5 +1676,181 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	static void skipString(const std::string &value, std::string::size_type &pos)
+	{
+		char quote = value[pos];
+		while(pos < value.size() && value[pos] != quote)
+		{
+			if (value[pos] == '\\')
+				pos++;
+
+			pos++;
+		}
+	}
+	static void skipBlock(const std::string &value, std::string::size_type &pos, bool isString)
+	{
+		char openChar = value[pos];
+		char closeChar = value[pos];
+		if (openChar == '(') closeChar = ')';
+		else if (openChar == '[') closeChar = ']';
+		else if (openChar == '{') closeChar = '}';
+		pos++;
+
+		while(pos < value.size())
+		{
+			char c = value[pos];
+			if (c == '\\')
+				pos++;
+			else if (!isString && (c == '(' || c == '[' || c == '{'))
+				skipBlock(value, pos, false);
+			else if (c == closeChar)
+				break;
+			else if (c == '"' || c == '\'')
+			{
+				if (isString)
+					break;
+
+				skipBlock(value, pos, true);
+			}
+
+			pos++;
+		}
+	}
+
+	static void skipWhitespace(const std::string &value, std::string::size_type &pos)
+	{
+		while(pos < value.size() && (value[pos] == ' ' || value[pos] == '\t' || value[pos] == '\r'))
+			pos++;
+	}
+
+	// ***************************************************************************
+	bool CCssStyle::cssFuncVar(std::string &func, const TStyle &styleRules, const std::set<std::string> &seenProperties) const
+	{
+		// TODO: fails if var() is inside string, ie '--text: ".. var(...) .."';
+
+		// start of 'var('
+		std::string::size_type pos = func.find("var(");
+		if (pos == std::string::npos)
+			return true;
+
+		// simple test to make sure 'var' is not substring
+		if (pos > 0 && (func[pos-1] != '_') && ((func[pos-1] >= 'a' && func[pos-1] <= 'z') || (func[pos-1] >= 'A' && func[pos-1] <='Z')))
+			return true;
+
+		// find closing ')'
+		std::string::size_type funcStart = pos;
+		std::string::size_type funcEnd = funcStart + 3;
+		skipBlock(func, funcEnd, false);
+
+		pos += 4;
+
+		// ',' separator
+		std::string::size_type sep = func.find_first_of(",)", pos);
+		if (sep > funcEnd)
+		{
+			// unlikely
+			sep = funcEnd;
+		}
+		else if (sep + 1 == funcEnd)
+		{
+			// no whitespace between ',' and ')', ie 'var(--name,)'
+			return false;
+		}
+
+		// extract name
+		std::string name = func.substr(funcStart + 4, sep - pos);
+		if (seenProperties.count(name) > 0)
+			return false;
+
+		std::string value;
+		// if name is not defined or resolves to 'initial', use fallback
+		bool found = lookupPropertyValue(name, value, styleRules);
+		if (found) {
+			// check if substituted value has 'var()'
+			std::set<std::string> newSeen = seenProperties;
+			newSeen.insert(name);
+			found = cssFuncVar(value, styleRules, newSeen);
+			if (value == "initial")
+				found = false;
+		}
+
+		// --name failed and we have fallback
+		if (!found && func[sep] == ',')
+		{
+			sep++;
+			skipWhitespace(func, sep);
+
+			value = func.substr(sep, funcEnd - sep);
+			if (value.empty())
+			{
+				found = true;
+			}
+			else
+			{
+				// check if substituted fallback has 'var()'
+				std::set<std::string> newSeen = seenProperties;
+				newSeen.insert(name);
+				found = cssFuncVar(value, styleRules, newSeen);
+				if (value == "initial")
+					found = false;
+			}
+		}
+
+		// invalidate property as both name and fallback failed
+		if (!found)
+			return false;
+
+		// everything before 'var(' and after ')'
+		std::string result;
+		if (funcStart > 0)
+			result = trim(func.substr(0, funcStart)) + " ";
+
+		result += trim(value);
+		if ((funcEnd+1) < func.size())
+			result += " " + trim(func.substr(funcEnd+1));
+
+		// check replaced string for var()
+		std::set<std::string> newSeen = seenProperties;
+		newSeen.insert(name);
+		bool success = cssFuncVar(result, styleRules, newSeen);
+		if (result == "initial")
+			success = false;
+
+		func = result;
+		return success;
+	}
+
+	// ***************************************************************************
+	bool CCssStyle::lookupPropertyValue(const std::string &name, std::string &value, const TStyle &styleRules) const
+	{
+		bool success = true;
+		TStyle::const_iterator it = styleRules.find(name);
+		if (it != styleRules.end())
+			value = it->second;
+		else if (Current.hasStyle(name))
+			value = Current.getStyle(name);
+		else
+			success = false;
+
+		if (success && value != "inherit")
+			return true;
+
+		std::vector<CStyleParams>::const_reverse_iterator rit = _StyleStack.rbegin();
+		for(; rit != _StyleStack.rend(); ++rit)
+		{
+			if (rit->hasStyle(name))
+			{
+				value = rit->getStyle(name);
+				if (value != "inherit")
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 } // namespace
 

From 89a921e14060f423fcd7db35b0a82a11a77972ab Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 10:55:53 +0300
Subject: [PATCH 216/292] Function to get html element lang value

---
 nel/include/nel/gui/html_element.h |  3 +++
 nel/src/gui/html_element.cpp       | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/nel/include/nel/gui/html_element.h b/nel/include/nel/gui/html_element.h
index b7bceb4ab..22f037cd4 100644
--- a/nel/include/nel/gui/html_element.h
+++ b/nel/include/nel/gui/html_element.h
@@ -84,6 +84,9 @@ namespace NLGUI
 		TStyle getPseudo(const std::string &key) const;
 		void setPseudo(const std::string &key, const TStyle &style);
 
+		// return lang property for css :lang() pseudo class
+		std::string getInheritedLanguage() const;
+
 	private:
 		// pseudo elements like ":before" and ":after"
 		std::map<std::string, TStyle> _Pseudo;
diff --git a/nel/src/gui/html_element.cpp b/nel/src/gui/html_element.cpp
index f0b764640..8735cc56e 100644
--- a/nel/src/gui/html_element.cpp
+++ b/nel/src/gui/html_element.cpp
@@ -122,6 +122,21 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	std::string CHtmlElement::getInheritedLanguage() const
+	{
+		const CHtmlElement *node = this;
+		while(node)
+		{
+			if (node->hasAttribute("lang"))
+				return node->getAttribute("lang");
+
+			node = node->parent;
+		}
+
+		return "";
+	}
+
 	// ***************************************************************************
 	std::string CHtmlElement::toString(bool tree, uint depth) const
 	{

From 92eb1dcdc7a3dcb674073569839884fa0cfadfbf Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 10:56:43 +0300
Subject: [PATCH 217/292] Forward declare xmlNode

---
 nel/include/nel/gui/html_parser.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nel/include/nel/gui/html_parser.h b/nel/include/nel/gui/html_parser.h
index 0c36014da..cf1392c0b 100644
--- a/nel/include/nel/gui/html_parser.h
+++ b/nel/include/nel/gui/html_parser.h
@@ -19,6 +19,9 @@
 
 #include "nel/misc/types_nl.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+
 namespace NLGUI
 {
 	class CHtmlElement;

From 95cacf75a6e730f97e349d77d2bec6897d838c24 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 11:48:13 +0300
Subject: [PATCH 218/292] Add css :lang selector

---
 nel/include/nel/gui/css_selector.h |  2 ++
 nel/src/gui/css_selector.cpp       | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/nel/include/nel/gui/css_selector.h b/nel/include/nel/gui/css_selector.h
index ed04ba86d..3228869f3 100644
--- a/nel/include/nel/gui/css_selector.h
+++ b/nel/include/nel/gui/css_selector.h
@@ -96,6 +96,8 @@ namespace NLGUI
 
 		// match An+B rule to child index (1 based)
 		bool matchNth(sint childNr, sint a, sint b) const;
+		// match :lang(xx)
+		bool matchLang(const CHtmlElement &elm, const std::string &pseudo) const;
 
 		// parse nth-child string to 'a' and 'b' components
 		// :nth-child(odd)
diff --git a/nel/src/gui/css_selector.cpp b/nel/src/gui/css_selector.cpp
index 18d0375b0..dfc01b855 100644
--- a/nel/src/gui/css_selector.cpp
+++ b/nel/src/gui/css_selector.cpp
@@ -235,6 +235,11 @@ namespace NLGUI
 					// 1st child should be '1' and not '0'
 					if (!matchNth(elm.childIndex+1, a, b)) return false;
 				}
+				else if (startsWith(PseudoClass[i], "lang("))
+				{
+					std::string lang = PseudoClass[i].substr(5, PseudoClass[i].size() - 6);
+					if (lang.empty() || !matchLang(elm, lang)) return false;
+				}
 				else
 				{
 					return false;
@@ -324,6 +329,29 @@ namespace NLGUI
 		}
 	}
 
+	bool CCssSelector::matchLang(const CHtmlElement &elm, const std::string &pseudo) const
+	{
+		// TODO: does not support comma separated, or escaped/quoted/wildcard tags
+		std::string lang = toLowerAscii(elm.getInheritedLanguage());
+		if (lang.empty() || pseudo.empty())
+			return false;
+
+		// lang = 'en', pseudo = 'en-US'
+		if (lang.size() < pseudo.size())
+			return false;
+
+		std::string selector = toLowerAscii(pseudo);
+		bool selectorHasRegion = selector.find("-") != std::string::npos;
+		bool langHasRegion = lang.find("-") != std::string::npos;
+
+		// both are 'en', or 'en-US' type
+		if (langHasRegion == selectorHasRegion)
+			return lang == selector;
+
+		// lang = 'en-US', selector = 'en'
+		return lang[selector.size()] == '-' && startsWith(lang, selector);
+	}
+
 	std::string CCssSelector::toString() const
 	{
 		std::string ret;

From db7afb07bdb0a61543307806580d89f4e432cf2b Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 13:47:28 +0300
Subject: [PATCH 219/292] Fix parsing css selectors with commas

---
 nel/include/nel/gui/css_parser.h |  2 +-
 nel/src/gui/css_parser.cpp       | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/nel/include/nel/gui/css_parser.h b/nel/include/nel/gui/css_parser.h
index c3a426ee7..360e70a8d 100644
--- a/nel/include/nel/gui/css_parser.h
+++ b/nel/include/nel/gui/css_parser.h
@@ -73,7 +73,7 @@ namespace NLGUI
 		void preprocess();
 
 		// parse selectors + combinators
-		std::vector<CCssSelector> parse_selector(const std::string &sel, std::string &pseudoElement) const;
+		std::vector<CCssSelector> parse_selector(const std::string &sel, std::string &pseudoElement, std::string::size_type &pos) const;
 
 		// parse selector and style
 		void parseRule(const std::string &selectorString, const std::string &styleString);
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index e59e67156..b3e3861bb 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -98,25 +98,22 @@ namespace NLGUI
 	// @internal
 	void CCssParser::parseRule(const std::string &selectorString, const std::string &styleString)
 	{
-		std::vector<std::string> selectors;
-		NLMISC::explode(selectorString, std::string(","), selectors);
-
 		TStyleVec props;
 		props = parseDecls(styleString);
 
 		// duplicate props to each selector in selector list,
 		// example 'div > p, h1' creates 'div>p' and 'h1'
-		for(uint i=0; i<selectors.size(); ++i)
+		for(std::string::size_type pos = 0; pos < selectorString.size(); pos++)
 		{
-			CCssStyle::SStyleRule rule;
+			while(pos < selectorString.size() && is_whitespace(selectorString[pos]))
+				pos++;
 
-			rule.Selector = parse_selector(trim(selectors[i]), rule.PseudoElement);
+			CCssStyle::SStyleRule rule;
+			rule.Selector = parse_selector(selectorString, rule.PseudoElement, pos);
 			rule.Properties = props;
-
 			if (!rule.Selector.empty())
-			{
 				_Rules.push_back(rule);
-			}
+
 		}
 	}
 
@@ -345,7 +342,7 @@ namespace NLGUI
 	// ***************************************************************************
 	// parse selector list
 	// @internal
-	std::vector<CCssSelector> CCssParser::parse_selector(const std::string &sel, std::string &pseudoElement) const
+	std::vector<CCssSelector> CCssParser::parse_selector(const std::string &sel, std::string &pseudoElement, std::string::size_type &pos) const
 	{
 		std::vector<CCssSelector> result;
 		CCssSelector current;
@@ -353,8 +350,8 @@ namespace NLGUI
 		pseudoElement.clear();
 
 		bool failed = false;
-		std::string::size_type start = 0, pos = 0;
-		while(pos < sel.size())
+		std::string::size_type start = pos;
+		while(pos < sel.size() && sel[pos] != ',')
 		{
 			std::string uc;
 			uc = sel[pos];
@@ -624,7 +621,8 @@ namespace NLGUI
 				}
 				else if (isSpace)
 				{
-					current.Combinator = ' ';
+					if (sel[pos] != ',' && sel[pos] != '\0')
+						current.Combinator = ' ';
 				}
 				else
 				{

From dbc77c7fc01c908b1134546ba9e3d5b6de0701c8 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 16:15:14 +0300
Subject: [PATCH 220/292] Update gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7796bda9f..4b691209f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,9 @@ aes_state.txt
 # intellij project folder
 .idea/
 
+# VSCode project folder
+.vscode/
+
 # Python cache
 *.pyd
 *.pyc
@@ -242,6 +245,9 @@ external_stlport
 nel_tools*
 ryzom_tools*
 
+#personal projects
+personal/
+
 # Dumps
 *.dmp
 

From e5c0c63e3e24f7a7e9ef16f57af788e09b679e28 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 24 Apr 2021 21:44:40 +0300
Subject: [PATCH 221/292] Draw tab char as space

---
 nel/src/3d/font_manager.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index 3d468f987..a2f0f6cb2 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -146,6 +146,9 @@ void CFontManager::computeString (NLMISC::CUtfStringView sv,
 		{
 			// Creating font
 			k.Char = *it;
+			// draw tab as space
+			if (k.Char == '\t')
+				k.Char = ' ';
 			if (k.Char < 0x20) // Control Characters
 				k.Char += 0x2400;
 			if (k.Char == 0x7F) // DEL
@@ -304,6 +307,9 @@ void CFontManager::computeStringInfo (	NLMISC::CUtfStringView sv,
 	{
 		// Creating font
 		k.Char = *it;
+		// draw tab as space
+		if (k.Char == '\t')
+			k.Char = ' ';
 		if (k.Char < 0x20)
 			k.Char += 0x2400;
 		k.FontGenerator = fontGen;

From e1e7bd837c8e5aeedbc86e61f9972681f97c08b3 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 25 Apr 2021 09:55:20 +0300
Subject: [PATCH 222/292] Fix temp file collision and image update on http/304
 response

---
 nel/include/nel/gui/group_html.h |   1 +
 nel/src/gui/group_html.cpp       | 100 ++++++++++++++++---------------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 172c8b434..600c9b248 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -858,6 +858,7 @@ namespace NLGUI
 			CCurlWWWData *data;
 			std::string url;
 			std::string dest;
+			std::string tmpdest;
 			std::string luaScript;
 			std::string md5sum;
 			TDataType type;
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 3d37e42bc..04988b790 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -525,18 +525,19 @@ namespace NLGUI
 			return false;
 		}
 
-		string tmpdest = download.dest + ".tmp";
+		// use browser Id so that two browsers would not use same temp file
+		download.tmpdest = localImageName(_Id + download.dest) + ".tmp";
 
 		// erase the tmp file if exists
-		if (CFile::fileExists(tmpdest))
+		if (CFile::fileExists(download.tmpdest))
 		{
-			CFile::deleteFile(tmpdest);
+			CFile::deleteFile(download.tmpdest);
 		}
 
-		FILE *fp = nlfopen (tmpdest, "wb");
+		FILE *fp = nlfopen (download.tmpdest, "wb");
 		if (fp == NULL)
 		{
-			nlwarning("Can't open file '%s' for writing: code=%d '%s'", tmpdest.c_str (), errno, strerror(errno));
+			nlwarning("Can't open file '%s' for writing: code=%d '%s'", download.tmpdest.c_str (), errno, strerror(errno));
 			return false;
 		}
 
@@ -544,7 +545,7 @@ namespace NLGUI
 		if (!curl)
 		{
 			fclose(fp);
-			CFile::deleteFile(tmpdest);
+			CFile::deleteFile(download.tmpdest);
 
 			nlwarning("Creating cURL handle failed, unable to download '%s'", download.url.c_str());
 			return false;
@@ -608,54 +609,57 @@ namespace NLGUI
 
 	void CGroupHTML::finishCurlDownload(const CDataDownload &download)
 	{
-		std::string tmpfile = download.dest + ".tmp";
-
 		if (download.type == ImgType)
 		{
-			// there is race condition if two browser instances are downloading same file
-			// second instance deletes first tmpfile and creates new file for itself.
-			if (CFile::getFileSize(tmpfile) > 0)
+			if (CFile::fileExists(download.tmpdest) && CFile::getFileSize(download.tmpdest) > 0)
 			{
 				try
 				{
 					// verify that image is not corrupted
 					uint32 w, h;
-					CBitmap::loadSize(tmpfile, w, h);
+					CBitmap::loadSize(download.tmpdest, w, h);
 					if (w != 0 && h != 0)
 					{
-						// if not tmpfile, then img is already in cache
-						if (CFile::fileExists(tmpfile))
-						{
-							if (CFile::fileExists(download.dest))
-							{
-								CFile::deleteFile(download.dest);
-							}
-
-							// to reload image on page, the easiest seems to be changing texture
-							// to temp file temporarily. that forces driver to reload texture from disk
-							// ITexture::touch() seem not to do this.
-							// cache was updated, first set texture as temp file
-							for(uint i = 0; i < download.imgs.size(); i++)
-							{
-								setImage(download.imgs[i].Image, tmpfile, download.imgs[i].Type);
-								setImageSize(download.imgs[i].Image, download.imgs[i].Style);
-							}
-
-							CFile::moveFile(download.dest, tmpfile);
-						}
+						if (CFile::fileExists(download.dest))
+							CFile::deleteFile(download.dest);
 
+						// to reload image on page, the easiest seems to be changing texture
+						// to temp file temporarily. that forces driver to reload texture from disk
+						// ITexture::touch() seem not to do this.
+						// cache was updated, first set texture as temp file
 						for(uint i = 0; i < download.imgs.size(); i++)
 						{
-							setImage(download.imgs[i].Image, download.dest, download.imgs[i].Type);
+							setImage(download.imgs[i].Image, download.tmpdest, download.imgs[i].Type);
 							setImageSize(download.imgs[i].Image, download.imgs[i].Style);
 						}
 
+						CFile::moveFile(download.dest, download.tmpdest);
 					}
 				}
 				catch(const NLMISC::Exception &e)
 				{
 					// exception message has .tmp file name, so keep it for further analysis
-					nlwarning("Invalid image (%s): %s", download.url.c_str(), e.what());
+					nlwarning("Invalid image (%s) from url (%s): %s", download.tmpdest.c_str(), download.url.c_str(), e.what());
+				}
+			}
+
+			if (CFile::fileExists(download.dest) && CFile::getFileSize(download.dest) > 0)
+			{
+				try
+				{
+					// verify that image is not corrupted
+					uint32 w, h;
+					CBitmap::loadSize(download.dest, w, h);
+					if (w != 0 && h != 0)
+					for(uint i = 0; i < download.imgs.size(); i++)
+					{
+						setImage(download.imgs[i].Image, download.dest, download.imgs[i].Type);
+						setImageSize(download.imgs[i].Image, download.imgs[i].Style);
+					}
+				}
+				catch(const NLMISC::Exception &e)
+				{
+					nlwarning("Invalid image (%s) from url (%s): %s", download.dest.c_str(), download.url.c_str(), e.what());
 				}
 			}
 
@@ -664,13 +668,13 @@ namespace NLGUI
 
 		if (download.type == StylesheetType)
 		{
-			if (CFile::fileExists(tmpfile))
+			if (CFile::fileExists(download.tmpdest))
 			{
 				if (CFile::fileExists(download.dest))
 				{
 					CFile::deleteFile(download.dest);
 				}
-				CFile::moveFile(download.dest, tmpfile);
+				CFile::moveFile(download.dest, download.tmpdest);
 			}
 			cssDownloadFinished(download.url, download.dest);
 
@@ -681,20 +685,20 @@ namespace NLGUI
 		{
 			bool verified = false;
 			// no tmpfile if file was already in cache
-			if (CFile::fileExists(tmpfile))
+			if (CFile::fileExists(download.tmpdest))
 			{
-				verified = download.md5sum.empty() || (download.md5sum != getMD5(tmpfile).toString());
+				verified = download.md5sum.empty() || (download.md5sum != getMD5(download.tmpdest).toString());
 				if (verified)
 				{
 					if (CFile::fileExists(download.dest))
 					{
 						CFile::deleteFile(download.dest);
 					}
-					CFile::moveFile(download.dest, tmpfile);
+					CFile::moveFile(download.dest, download.tmpdest);
 				}
 				else
 				{
-					CFile::deleteFile(tmpfile);
+					CFile::deleteFile(download.tmpdest);
 				}
 			}
 			else if (CFile::fileExists(download.dest))
@@ -746,7 +750,7 @@ namespace NLGUI
 		if (type != OverImage)
 		{
 			std::string temp = dest;
-			if (!CFile::fileExists(temp))
+			if (!CFile::fileExists(temp) || CFile::getFileSize(temp) == 0)
 			{
 				temp = placeholder;
 			}
@@ -967,9 +971,9 @@ namespace NLGUI
 				{
 					fclose(it->fp);
 
-					if (CFile::fileExists(it->dest + ".tmp"))
+					if (CFile::fileExists(it->tmpdest))
 					{
-						CFile::deleteFile(it->dest + ".tmp");
+						CFile::deleteFile(it->tmpdest);
 					}
 				}
 			}
@@ -4071,10 +4075,9 @@ namespace NLGUI
 				obj.LastModified = data.data->getLastModified();
 
 				CHttpCache::getInstance()->store(data.dest, obj);
-				std::string tmpfile = data.dest + ".tmp";
-				if (code == 304 && CFile::fileExists(tmpfile))
+				if (code == 304 && CFile::fileExists(data.tmpdest))
 				{
-					CFile::deleteFile(tmpfile);
+					CFile::deleteFile(data.tmpdest);
 				}
 			}
 			else if ((code >= 301 && code <= 303) || code == 307 || code == 308)
@@ -4102,10 +4105,9 @@ namespace NLGUI
 
 						LOG_DL("Redirect '%s'", location.c_str());
 						// no finished callback called, so cleanup old temp
-						std::string tmpfile = data.dest + ".tmp";
-						if (CFile::fileExists(tmpfile))
+						if (CFile::fileExists(data.tmpdest))
 						{
-							CFile::deleteFile(tmpfile);
+							CFile::deleteFile(data.tmpdest);
 						}
 						return;
 					}

From cc44eaf93584f0418eecc56fb1b9e92a26a47efe Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 25 Apr 2021 11:05:07 +0300
Subject: [PATCH 223/292] Ignore first linebreak after pre, textarea open tag

---
 nel/src/gui/html_parser.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
index bcb83bf8e..80725552e 100644
--- a/nel/src/gui/html_parser.cpp
+++ b/nel/src/gui/html_parser.cpp
@@ -66,7 +66,15 @@ namespace NLGUI
 		{
 			if (node->type == XML_TEXT_NODE)
 			{
-				parent.Children.push_back(CHtmlElement(CHtmlElement::TEXT_NODE, (const char*)(node->content)));
+				// linebreak right after pre,textare open tag should be removed
+				if (parent.Children.empty() && (*node->content == '\n') && (parent.ID == HTML_PRE || parent.ID == HTML_TEXTAREA))
+				{
+					parent.Children.push_back(CHtmlElement(CHtmlElement::TEXT_NODE, (const char*)(node->content) + 1));
+				}
+				else
+				{
+					parent.Children.push_back(CHtmlElement(CHtmlElement::TEXT_NODE, (const char*)(node->content)));
+				}
 			}
 			else
 			if (node->type == XML_ELEMENT_NODE)

From 04b4ae5333b11f27b864ffa4272b32a97b05627a Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 25 Apr 2021 13:07:04 +0300
Subject: [PATCH 224/292] Ignore last linebreak in pre tag

---
 nel/src/gui/html_parser.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
index 80725552e..b8eb0176b 100644
--- a/nel/src/gui/html_parser.cpp
+++ b/nel/src/gui/html_parser.cpp
@@ -182,6 +182,16 @@ namespace NLGUI
 				{
 					parseNode(node->children, elm, styles, links);
 
+					if (!elm.Children.empty() && elm.ID == HTML_PRE && elm.Children.back().Type == CHtmlElement::TEXT_NODE)
+					{
+						std::string::size_type size = elm.Children.back().Value.size();
+						// strip last '\n' from non-empty line
+						if (size > 1 && elm.Children.back().Value[size-1] == '\n')
+						{
+							elm.Children.back().Value = elm.Children.back().Value.substr(0, size - 1);
+						}
+					}
+
 					// must cleanup nested tags that libxml2 does not fix
 					// dt without end tag: <dl><dt><dt></dl>
 					// dd without end tag: <dl><dd><dd></dl>

From 8f1db245041a86ec1eab410da3ad705ce29f4dff Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 25 Apr 2021 14:11:19 +0300
Subject: [PATCH 225/292] Fix detecting jpg image

---
 nel/src/misc/bitmap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/misc/bitmap.cpp b/nel/src/misc/bitmap.cpp
index 33c0cec43..ee6a0e69e 100644
--- a/nel/src/misc/bitmap.cpp
+++ b/nel/src/misc/bitmap.cpp
@@ -3568,7 +3568,7 @@ void	CBitmap::loadSize(NLMISC::IStream &f, uint32 &retWidth, uint32 &retHeight)
 		}
 		while(!eof);
 	}
-	else if(fileType == JPG_HEADER)
+	else if(memcmp(&fileType, &JPG_HEADER, 2) == 0)
 	{
 		uint8 blockMarker1 = 0;
 		uint8 blockMarker2 = 0;

From cd4914ab94063d33586e2aba172e4379f1c41bbf Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 1 May 2021 12:37:41 +0300
Subject: [PATCH 226/292] Cleanup CGroupHTML old properties

---
 nel/include/nel/gui/group_html.h              |  23 -
 nel/src/gui/group_html.cpp                    | 393 +-----------------
 .../src/interface_v3/group_quick_help.cpp     |   4 +-
 3 files changed, 4 insertions(+), 416 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 600c9b248..a16a16d82 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -139,37 +139,15 @@ namespace NLGUI
 		float	getTimeout() const {return (float)_TimeoutValue;}
 
 		// Some constants
-		NLMISC::CRGBA	BgColor;
 		NLMISC::CRGBA	ErrorColor;
 		NLMISC::CRGBA	LinkColor;
-		NLMISC::CRGBA	TextColor;
-		NLMISC::CRGBA	H1Color;
-		NLMISC::CRGBA	H2Color;
-		NLMISC::CRGBA	H3Color;
-		NLMISC::CRGBA	H4Color;
-		NLMISC::CRGBA	H5Color;
-		NLMISC::CRGBA	H6Color;
 		bool			ErrorColorGlobalColor;
 		bool			LinkColorGlobalColor;
 		bool			TextColorGlobalColor;
-		bool			H1ColorGlobalColor;
-		bool			H2ColorGlobalColor;
-		bool			H3ColorGlobalColor;
-		bool			H4ColorGlobalColor;
-		bool			H5ColorGlobalColor;
-		bool			H6ColorGlobalColor;
-		uint			TextFontSize;
-		uint			H1FontSize;
-		uint			H2FontSize;
-		uint			H3FontSize;
-		uint			H4FontSize;
-		uint			H5FontSize;
-		uint			H6FontSize;
 		uint			TDBeginSpace;
 		uint			PBeginSpace;
 		uint			LIBeginSpace;
 		uint			ULBeginSpace;
-		uint			LIIndent;
 		uint			ULIndent;
 		float			LineSpaceFontFactor;
 		std::string		DefaultButtonGroup;
@@ -184,7 +162,6 @@ namespace NLGUI
 		std::string		DefaultRadioButtonBitmapPushed;
 		std::string		DefaultRadioButtonBitmapOver;
 		std::string		DefaultBackgroundBitmapView;
-		std::string		CurrentLinkTitle;
 
 		struct TFormField {
 		public:
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 04988b790..9939b4794 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1460,37 +1460,15 @@ namespace NLGUI
 		CWidgetManager::getInstance()->registerClockMsgTarget(this);
 
 		// HTML parameters
-		BgColor = CRGBA::Black;
 		ErrorColor = CRGBA(255, 0, 0);
 		LinkColor = CRGBA(0, 0, 255);
-		TextColor = CRGBA(255, 255, 255);
-		H1Color = CRGBA(255, 255, 255);
-		H2Color = CRGBA(255, 255, 255);
-		H3Color = CRGBA(255, 255, 255);
-		H4Color = CRGBA(255, 255, 255);
-		H5Color = CRGBA(255, 255, 255);
-		H6Color = CRGBA(255, 255, 255);
 		ErrorColorGlobalColor = false;
 		LinkColorGlobalColor = false;
 		TextColorGlobalColor = false;
-		H1ColorGlobalColor = false;
-		H2ColorGlobalColor = false;
-		H3ColorGlobalColor = false;
-		H4ColorGlobalColor = false;
-		H5ColorGlobalColor = false;
-		H6ColorGlobalColor = false;
-		TextFontSize = 9;
-		H1FontSize = 18;
-		H2FontSize = 15;
-		H3FontSize = 12;
-		H4FontSize = 9;
-		H5FontSize = 9;
-		H6FontSize = 9;
 		LIBeginSpace = 4;
 		ULBeginSpace = 12;
 		PBeginSpace	 = 12;
 		TDBeginSpace = 0;
-		LIIndent = -10;
 		ULIndent = 30;
 		LineSpaceFontFactor = 0.5f;
 		DefaultButtonGroup =			"html_text_button";
@@ -1562,11 +1540,6 @@ namespace NLGUI
 			return _TitlePrefix;
 		}
 		else
-		if( name == "background_color" )
-		{
-			return toString( BgColor );
-		}
-		else
 		if( name == "error_color" )
 		{
 			return toString( ErrorColor );
@@ -1577,36 +1550,6 @@ namespace NLGUI
 			return toString( LinkColor );
 		}
 		else
-		if( name == "h1_color" )
-		{
-			return toString( H1Color );
-		}
-		else
-		if( name == "h2_color" )
-		{
-			return toString( H2Color );
-		}
-		else
-		if( name == "h3_color" )
-		{
-			return toString( H3Color );
-		}
-		else
-		if( name == "h4_color" )
-		{
-			return toString( H4Color );
-		}
-		else
-		if( name == "h5_color" )
-		{
-			return toString( H5Color );
-		}
-		else
-		if( name == "h6_color" )
-		{
-			return toString( H6Color );
-		}
-		else
 		if( name == "error_color_global_color" )
 		{
 			return toString( ErrorColorGlobalColor );
@@ -1622,71 +1565,6 @@ namespace NLGUI
 			return toString( TextColorGlobalColor );
 		}
 		else
-		if( name == "h1_color_global_color" )
-		{
-			return toString( H1ColorGlobalColor );
-		}
-		else
-		if( name == "h2_color_global_color" )
-		{
-			return toString( H2ColorGlobalColor );
-		}
-		else
-		if( name == "h3_color_global_color" )
-		{
-			return toString( H3ColorGlobalColor );
-		}
-		else
-		if( name == "h4_color_global_color" )
-		{
-			return toString( H4ColorGlobalColor );
-		}
-		else
-		if( name == "h5_color_global_color" )
-		{
-			return toString( H5ColorGlobalColor );
-		}
-		else
-		if( name == "h6_color_global_color" )
-		{
-			return toString( H6ColorGlobalColor );
-		}
-		else
-		if( name == "text_font_size" )
-		{
-			return toString( TextFontSize );
-		}
-		else
-		if( name == "h1_font_size" )
-		{
-			return toString( H1FontSize );
-		}
-		else
-		if( name == "h2_font_size" )
-		{
-			return toString( H2FontSize );
-		}
-		else
-		if( name == "h3_font_size" )
-		{
-			return toString( H3FontSize );
-		}
-		else
-		if( name == "h4_font_size" )
-		{
-			return toString( H4FontSize );
-		}
-		else
-		if( name == "h5_font_size" )
-		{
-			return toString( H5FontSize );
-		}
-		else
-		if( name == "h6_font_size" )
-		{
-			return toString( H6FontSize );
-		}
-		else
 		if( name == "td_begin_space" )
 		{
 			return toString( TDBeginSpace );
@@ -1707,11 +1585,6 @@ namespace NLGUI
 			return toString( ULBeginSpace );
 		}
 		else
-		if( name == "li_indent" )
-		{
-			return toString( LIIndent );
-		}
-		else
 		if( name == "ul_indent" )
 		{
 			return toString( ULIndent );
@@ -1824,14 +1697,6 @@ namespace NLGUI
 			return;
 		}
 		else
-		if( name == "background_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				BgColor = c;
-			return;
-		}
-		else
 		if( name == "error_color" )
 		{
 			CRGBA c;
@@ -1848,54 +1713,6 @@ namespace NLGUI
 			return;
 		}
 		else
-		if( name == "h1_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H1Color = c;
-			return;
-		}
-		else
-		if( name == "h2_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H2Color = c;
-			return;
-		}
-		else
-		if( name == "h3_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H3Color = c;
-			return;
-		}
-		else
-		if( name == "h4_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H4Color = c;
-			return;
-		}
-		else
-		if( name == "h5_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H5Color = c;
-			return;
-		}
-		else
-		if( name == "h6_color" )
-		{
-			CRGBA c;
-			if( fromString( value, c ) )
-				H6Color = c;
-			return;
-		}
-		else
 		if( name == "error_color_global_color" )
 		{
 			bool b;
@@ -1920,110 +1737,6 @@ namespace NLGUI
 			return;
 		}
 		else
-		if( name == "h1_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H1ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "h2_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H2ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "h3_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H3ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "h4_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H4ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "h5_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H5ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "h6_color_global_color" )
-		{
-			bool b;
-			if( fromString( value, b ) )
-				H6ColorGlobalColor = b;
-			return;
-		}
-		else
-		if( name == "text_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				TextFontSize = i;
-			return;
-		}
-		else
-		if( name == "h1_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H1FontSize = i;
-			return;
-		}
-		else
-		if( name == "h2_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H2FontSize = i;
-			return;
-		}
-		else
-		if( name == "h3_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H3FontSize = i;
-			return;
-		}
-		else
-		if( name == "h4_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H4FontSize = i;
-			return;
-		}
-		else
-		if( name == "h5_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H5FontSize = i;
-			return;
-		}
-		else
-		if( name == "h6_font_size" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				H6FontSize = i;
-			return;
-		}
-		else
 		if( name == "td_begin_space" )
 		{
 			uint i;
@@ -2056,14 +1769,6 @@ namespace NLGUI
 			return;
 		}
 		else
-		if( name == "li_indent" )
-		{
-			uint i;
-			if( fromString( value, i ) )
-				LIIndent = i;
-			return;
-		}
-		else
 		if( name == "ul_indent" )
 		{
 			uint i;
@@ -2222,16 +1927,8 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "html" );
 		xmlSetProp( node, BAD_CAST "url", BAD_CAST _URL.c_str() );
 		xmlSetProp( node, BAD_CAST "title_prefix", BAD_CAST _TitlePrefix.c_str() );
-		xmlSetProp( node, BAD_CAST "background_color", BAD_CAST toString( BgColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "error_color", BAD_CAST toString( ErrorColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "link_color", BAD_CAST toString( LinkColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "background_color", BAD_CAST toString( BgColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h1_color", BAD_CAST toString( H1Color ).c_str() );
-		xmlSetProp( node, BAD_CAST "h2_color", BAD_CAST toString( H2Color ).c_str() );
-		xmlSetProp( node, BAD_CAST "h3_color", BAD_CAST toString( H3Color ).c_str() );
-		xmlSetProp( node, BAD_CAST "h4_color", BAD_CAST toString( H4Color ).c_str() );
-		xmlSetProp( node, BAD_CAST "h5_color", BAD_CAST toString( H5Color ).c_str() );
-		xmlSetProp( node, BAD_CAST "h6_color", BAD_CAST toString( H6Color ).c_str() );
 
 		xmlSetProp( node, BAD_CAST "error_color_global_color",
 			BAD_CAST toString( ErrorColorGlobalColor ).c_str() );
@@ -2239,31 +1936,11 @@ namespace NLGUI
 			BAD_CAST toString( LinkColorGlobalColor ).c_str() );
 		xmlSetProp( node, BAD_CAST "text_color_global_color",
 			BAD_CAST toString( TextColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h1_color_global_color",
-			BAD_CAST toString( H1ColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h2_color_global_color",
-			BAD_CAST toString( H2ColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h3_color_global_color",
-			BAD_CAST toString( H3ColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h4_color_global_color",
-			BAD_CAST toString( H4ColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h5_color_global_color",
-			BAD_CAST toString( H5ColorGlobalColor ).c_str() );
-		xmlSetProp( node, BAD_CAST "h6_color_global_color",
-			BAD_CAST toString( H6ColorGlobalColor ).c_str() );
-
-		xmlSetProp( node, BAD_CAST "text_font_size", BAD_CAST toString( TextFontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h1_font_size", BAD_CAST toString( H1FontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h2_font_size", BAD_CAST toString( H2FontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h3_font_size", BAD_CAST toString( H3FontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h4_font_size", BAD_CAST toString( H4FontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h5_font_size", BAD_CAST toString( H5FontSize ).c_str() );
-		xmlSetProp( node, BAD_CAST "h6_font_size", BAD_CAST toString( H6FontSize ).c_str() );
+
 		xmlSetProp( node, BAD_CAST "td_begin_space", BAD_CAST toString( TDBeginSpace ).c_str() );
 		xmlSetProp( node, BAD_CAST "paragraph_begin_space", BAD_CAST toString( PBeginSpace ).c_str() );
 		xmlSetProp( node, BAD_CAST "li_begin_space", BAD_CAST toString( LIBeginSpace ).c_str() );
 		xmlSetProp( node, BAD_CAST "ul_begin_space", BAD_CAST toString( ULBeginSpace ).c_str() );
-		xmlSetProp( node, BAD_CAST "li_indent", BAD_CAST toString( LIIndent ).c_str() );
 		xmlSetProp( node, BAD_CAST "ul_indent", BAD_CAST toString( ULIndent ).c_str() );
 		xmlSetProp( node, BAD_CAST "multi_line_space_factor", BAD_CAST toString( LineSpaceFontFactor ).c_str() );
 		xmlSetProp( node, BAD_CAST "form_text_area_group", BAD_CAST DefaultFormTextGroup.c_str() );
@@ -2315,36 +1992,12 @@ namespace NLGUI
 			_TitlePrefix = CI18N::get((const char*)ptr);
 
 		// Parameters
-		ptr = xmlGetProp (cur, (xmlChar*)"background_color");
-		if (ptr)
-			BgColor = convertColor(ptr);
 		ptr = xmlGetProp (cur, (xmlChar*)"error_color");
 		if (ptr)
 			ErrorColor = convertColor(ptr);
 		ptr = xmlGetProp (cur, (xmlChar*)"link_color");
 		if (ptr)
 			LinkColor = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"text_color");
-		if (ptr)
-			TextColor = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h1_color");
-		if (ptr)
-			H1Color = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h2_color");
-		if (ptr)
-			H2Color = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h3_color");
-		if (ptr)
-			H3Color = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h4_color");
-		if (ptr)
-			H4Color = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h5_color");
-		if (ptr)
-			H5Color = convertColor(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h6_color");
-		if (ptr)
-			H6Color = convertColor(ptr);
 		ptr = xmlGetProp (cur, (xmlChar*)"error_color_global_color");
 		if (ptr)
 			ErrorColorGlobalColor = convertBool(ptr);
@@ -2354,45 +2007,6 @@ namespace NLGUI
 		ptr = xmlGetProp (cur, (xmlChar*)"text_color_global_color");
 		if (ptr)
 			TextColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h1_color_global_color");
-		if (ptr)
-			H1ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h2_color_global_color");
-		if (ptr)
-			H2ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h3_color_global_color");
-		if (ptr)
-			H3ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h4_color_global_color");
-		if (ptr)
-			H4ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h5_color_global_color");
-		if (ptr)
-			H5ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"h6_color_global_color");
-		if (ptr)
-			H6ColorGlobalColor = convertBool(ptr);
-		ptr = xmlGetProp (cur, (xmlChar*)"text_font_size");
-		if (ptr)
-			fromString((const char*)ptr, TextFontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h1_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H1FontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h2_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H2FontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h3_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H3FontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h4_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H4FontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h5_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H5FontSize);
-		ptr = xmlGetProp (cur, (xmlChar*)"h6_font_size");
-		if (ptr)
-			fromString((const char*)ptr, H6FontSize);
 		ptr = xmlGetProp (cur, (xmlChar*)"td_begin_space");
 		if (ptr)
 			fromString((const char*)ptr, TDBeginSpace);
@@ -2405,9 +2019,6 @@ namespace NLGUI
 		ptr = xmlGetProp (cur, (xmlChar*)"ul_begin_space");
 		if (ptr)
 			fromString((const char*)ptr, ULBeginSpace);
-		ptr = xmlGetProp (cur, (xmlChar*)"li_indent");
-		if (ptr)
-			fromString((const char*)ptr, LIIndent);
 		ptr = xmlGetProp (cur, (xmlChar*)"ul_indent");
 		if (ptr)
 			fromString((const char*)ptr, ULIndent);
@@ -4395,7 +4006,7 @@ namespace NLGUI
 		clearContext();
 
 		// Reset default background color
-		setBackgroundColor (BgColor);
+		setBackgroundColor (_BrowserStyle.Current.BackgroundColor);
 		setBackground ("blank.tga", true, false);
 
 		paragraphChange ();
diff --git a/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp
index 8a5e925cf..c8d5fdd9b 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.cpp
+++ b/ryzom/client/src/interface_v3/group_quick_help.cpp
@@ -168,8 +168,8 @@ void CGroupQuickHelp::setGroupTextSize (CInterfaceGroup *group, bool selected)
 {
 	bool globalColor = selected ? TextColorGlobalColor : _NonSelectedGlobalColor;
 	bool linkGlobalColor = selected ? LinkColorGlobalColor : _NonSelectedGlobalColor;
-	uint fontSize = selected ? TextFontSize : _NonSelectedSize;
-	NLMISC::CRGBA color = selected ? TextColor : _NonSelectedColor;
+	uint fontSize = selected ? _BrowserStyle.Current.FontSize : _NonSelectedSize;
+	NLMISC::CRGBA color = selected ? _BrowserStyle.Current.TextColor : _NonSelectedColor;
 	NLMISC::CRGBA linkColor = selected ? LinkColor : _NonSelectedLinkColor;
 
 	// Look for text in this group

From f8d498e4b25e44921dfee99656356b68336994f4 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 3 May 2021 13:10:42 +0300
Subject: [PATCH 227/292] Minor refactor

---
 nel/include/nel/gui/group_html.h |  4 +++
 nel/src/gui/group_html.cpp       | 50 ++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index a16a16d82..351c232d2 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -36,6 +36,7 @@ typedef void CURLM;
 
 namespace NLGUI
 {
+	class CViewLink;
 	class CCtrlButton;
 	class CCtrlTextButton;
 	class CCtrlScroll;
@@ -301,6 +302,9 @@ namespace NLGUI
 		// Translate a char
 		bool translateChar(u32char &output, u32char input, u32char lastChar) const;
 
+		// return true if text has same style
+		bool isSameStyle(CViewLink *text, const CStyleParams &style) const;
+
 		// Add a string in the current paragraph
 		void addString(const std::string &str);
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 9939b4794..b649693cd 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2359,6 +2359,34 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	bool CGroupHTML::isSameStyle(CViewLink *text, const CStyleParams &style) const
+	{
+		if (!text) return false;
+
+		bool embolden = style.FontWeight >= FONT_WEIGHT_BOLD;
+		bool sameShadow = style.TextShadow.Enabled && text->getShadow();
+		if (sameShadow && style.TextShadow.Enabled)
+		{
+			sint sx, sy;
+			text->getShadowOffset(sx, sy);
+			sameShadow = (style.TextShadow.Color == text->getShadowColor());
+			sameShadow = sameShadow && (style.TextShadow.Outline == text->getShadowOutline());
+			sameShadow = sameShadow && (style.TextShadow.X == sx) && (style.TextShadow.Y == sy);
+		}
+		// Compatible with current parameters ?
+		return sameShadow &&
+			(style.TextColor == text->getColor()) &&
+			(style.FontFamily == text->getFontName()) &&
+			(style.FontSize == (uint)text->getFontSize()) &&
+			(style.Underlined == text->getUnderlined()) &&
+			(style.StrikeThrough == text->getStrikeThrough()) &&
+			(embolden == text->getEmbolden()) &&
+			(style.FontOblique == text->getOblique()) &&
+			(getLink() == text->Link) &&
+			(style.GlobalColor == text->getModulateGlobalColor());
+	}
+
 	// ***************************************************************************
 
 	void CGroupHTML::addString(const std::string &str)
@@ -2433,32 +2461,12 @@ namespace NLGUI
 
 			// Text added ?
 			bool added = false;
-			bool embolden = style.FontWeight >= FONT_WEIGHT_BOLD;
 
 			// Number of child in this paragraph
 			if (_CurrentViewLink)
 			{
 				bool skipLine = !_CurrentViewLink->getText().empty() && *(_CurrentViewLink->getText().rbegin()) == '\n';
-				bool sameShadow = style.TextShadow.Enabled && _CurrentViewLink->getShadow();
-				if (sameShadow && style.TextShadow.Enabled)
-				{
-					sint sx, sy;
-					_CurrentViewLink->getShadowOffset(sx, sy);
-					sameShadow = (style.TextShadow.Color == _CurrentViewLink->getShadowColor());
-					sameShadow = sameShadow && (style.TextShadow.Outline == _CurrentViewLink->getShadowOutline());
-					sameShadow = sameShadow && (style.TextShadow.X == sx) && (style.TextShadow.Y == sy);
-				}
-				// Compatible with current parameters ?
-				if (!skipLine && sameShadow &&
-					(style.TextColor == _CurrentViewLink->getColor()) &&
-					(style.FontFamily == _CurrentViewLink->getFontName()) &&
-					(style.FontSize == (uint)_CurrentViewLink->getFontSize()) &&
-					(style.Underlined == _CurrentViewLink->getUnderlined()) &&
-					(style.StrikeThrough == _CurrentViewLink->getStrikeThrough()) &&
-					(embolden == _CurrentViewLink->getEmbolden()) &&
-					(style.FontOblique == _CurrentViewLink->getOblique()) &&
-					(getLink() == _CurrentViewLink->Link) &&
-					(style.GlobalColor == _CurrentViewLink->getModulateGlobalColor()))
+				if (!skipLine && isSameStyle(_CurrentViewLink, style))
 				{
 					// Concat the text
 					_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr);

From 624d78fe1af7ba07904e65792b2629719b61debc Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 4 May 2021 12:26:32 +0300
Subject: [PATCH 228/292] Methods to serialize CHtmlElement back to string

---
 nel/include/nel/gui/html_element.h | 12 ++++
 nel/src/gui/html_element.cpp       | 98 ++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/nel/include/nel/gui/html_element.h b/nel/include/nel/gui/html_element.h
index 22f037cd4..d96b00508 100644
--- a/nel/include/nel/gui/html_element.h
+++ b/nel/include/nel/gui/html_element.h
@@ -75,6 +75,18 @@ namespace NLGUI
 		// update Children index/parent/next/prevSibling pointers
 		void reindexChilds();
 
+		// escape text tag or attribute value
+		std::string htmlEscape(std::string val, bool isAttribute = false) const;
+
+		// serialize element attributes as string
+		std::string serializeAttributes() const;
+
+		// serialize child elements as html string
+		std::string serializeChilds() const;
+
+		// serialize itself and children as html string
+		std::string serialize() const;
+
 		// debug
 		std::string toString(bool tree = false, uint depth = 0) const;
 
diff --git a/nel/src/gui/html_element.cpp b/nel/src/gui/html_element.cpp
index 8735cc56e..454833a5a 100644
--- a/nel/src/gui/html_element.cpp
+++ b/nel/src/gui/html_element.cpp
@@ -18,6 +18,7 @@
 #include "stdpch.h"
 
 #include "nel/gui/html_element.h"
+#include "nel/gui/libwww.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -137,6 +138,103 @@ namespace NLGUI
 		return "";
 	}
 
+	// ***************************************************************************
+	std::string CHtmlElement::htmlEscape(std::string val, bool isAttribute) const
+	{
+		static const std::vector<std::string> searchReplace = {
+			"&", "&amp;",
+			"<", "&lt;",
+			">", "&gt;",
+			"\xA0", "&nbsp;",
+		};
+
+		for(uint i = 0; i < searchReplace.size(); i+=2)
+			val = strFindReplaceAll(val, searchReplace[i], searchReplace[i+1]);
+
+		if (isAttribute)
+		{
+			static const std::string q = "\"";
+			static const std::string quot = "&quot;";
+			val = strFindReplaceAll(val, q, quot);
+		}
+
+		return val;
+	}
+
+	// ***************************************************************************
+	std::string CHtmlElement::serializeAttributes() const
+	{
+		std::string result;
+		for(std::map<std::string, std::string>::const_iterator it = Attributes.begin(); it != Attributes.end(); ++it)
+		{
+			if (it->first == "class")
+			{
+				result += " class=\"";
+				for(std::set<std::string>::const_iterator it2 = ClassNames.begin(); it2 != ClassNames.end(); ++it2)
+				{
+					if (it2 != ClassNames.begin())
+					{
+						result += " ";
+					}
+					result += htmlEscape(*it2, true);
+				}
+				result += "\"";
+			}
+			else
+			{
+				result += " " + it->first + "=\"" + htmlEscape(it->second, true) + "\"";
+			}
+		}
+		return result;
+	}
+
+	// ***************************************************************************
+	std::string CHtmlElement::serializeChilds() const
+	{
+		std::string result;
+		for(std::list<CHtmlElement>::const_iterator it = Children.begin(); it != Children.end(); ++it)
+			result += it->serialize();
+
+		return result;
+	}
+
+	// ***************************************************************************
+	std::string CHtmlElement::serialize() const
+	{
+		if (Type == TEXT_NODE)
+		{
+			if (parent && (parent->ID == HTML_SCRIPT || parent->ID == HTML_STYLE ||
+				parent->ID == HTML_IFRAME || parent->ID == HTML_NOEMBED ||
+				parent->ID == HTML_NOSCRIPT))
+			{
+				return Value;
+			} else {
+				return htmlEscape(Value);
+			}
+		}
+
+		std::string result = "<" + Value + serializeAttributes() + ">";
+
+		if (ID == HTML_AREA || ID == HTML_BASE || ID == HTML_BR ||
+			ID == HTML_COL || ID == HTML_EMBED || ID == HTML_HR ||
+			ID == HTML_IMG || ID == HTML_INPUT || ID == HTML_LINK ||
+			ID == HTML_META || ID == HTML_PARAM || ID == HTML_WBR)
+		{
+			return result;
+		}
+
+		// first linebreak that will be ignored on parse time
+		if (ID == HTML_PRE || ID == HTML_TEXTAREA)
+			result += "\n";
+
+		if (!Children.empty())
+			result += serializeChilds();
+
+		result += "</" + Value + ">";
+
+		return result;
+	}
+
 	// ***************************************************************************
 	std::string CHtmlElement::toString(bool tree, uint depth) const
 	{

From aaa699014eb746896fd5a9977986cf4ac4d17b36 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 4 May 2021 12:28:31 +0300
Subject: [PATCH 229/292] Ignore any tags inside title, textarea elements.

---
 nel/include/nel/gui/group_html.h |  4 ---
 nel/src/gui/group_html.cpp       | 60 ++++++++++----------------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 351c232d2..26eb7d83a 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -730,9 +730,7 @@ namespace NLGUI
 		bool			_Localize;
 
 		// Current node is a text area
-		bool			_TextArea;
 		std::string		_TextAreaTemplate;
-		std::string		_TextAreaContent;
 		std::string		_TextAreaName;
 		uint			_TextAreaRow;
 		uint			_TextAreaCols;
@@ -983,11 +981,9 @@ namespace NLGUI
 		void htmlTD(const CHtmlElement &elm);
 		void htmlTDend(const CHtmlElement &elm);
 		void htmlTEXTAREA(const CHtmlElement &elm);
-		void htmlTEXTAREAend(const CHtmlElement &elm);
 		void htmlTH(const CHtmlElement &elm);
 		void htmlTHend(const CHtmlElement &elm);
 		void htmlTITLE(const CHtmlElement &elm);
-		void htmlTITLEend(const CHtmlElement &elm);
 		void htmlTR(const CHtmlElement &elm);
 		void htmlTRend(const CHtmlElement &elm);
 		//void htmlU(const CHtmlElement &elm);
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index b649693cd..179232566 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1231,10 +1231,10 @@ namespace NLGUI
 		case HTML_TABLE:    htmlTABLEend(elm); break;
 		case HTML_TD:       htmlTDend(elm); break;
 		case HTML_TBODY:    renderPseudoElement(":after", elm); break;
-		case HTML_TEXTAREA: htmlTEXTAREAend(elm); break;
+		case HTML_TEXTAREA: break;
 		case HTML_TFOOT:    renderPseudoElement(":after", elm); break;
 		case HTML_TH:       htmlTHend(elm); break;
-		case HTML_TITLE:    htmlTITLEend(elm); break;
+		case HTML_TITLE:    break;
 		case HTML_TR:       htmlTRend(elm); break;
 		case HTML_U:        renderPseudoElement(":after", elm); break;
 		case HTML_UL:       htmlULend(elm); break;
@@ -1396,9 +1396,9 @@ namespace NLGUI
 		{
 			beginElement(elm);
 
-			std::list<CHtmlElement>::iterator it = elm.Children.begin();
 			if (!_IgnoreChildElements)
 			{
+				std::list<CHtmlElement>::iterator it = elm.Children.begin();
 				while(it != elm.Children.end())
 				{
 					renderDOM(*it);
@@ -2426,15 +2426,7 @@ namespace NLGUI
 		}
 
 		// In title ?
-		if (_Title)
-		{
-			_TitleString += tmpStr;
-		}
-		else if (_TextArea)
-		{
-			_TextAreaContent += tmpStr;
-		}
-		else if (_Object)
+		if (_Object)
 		{
 			_ObjectScript += tmpStr;
 		}
@@ -2899,8 +2891,6 @@ namespace NLGUI
 		_Anchors.clear();
 		_AnchorName.clear();
 		_CellParams.clear();
-		_Title = false;
-		_TextArea = false;
 		_Object = false;
 		_Localize = false;
 		_ReadingHeadTag = false;
@@ -3036,12 +3026,10 @@ namespace NLGUI
 
 	void CGroupHTML::setTitle(const std::string &title)
 	{
-		_TitleString.clear();
-		if(!_TitlePrefix.empty())
-		{
-			_TitleString = _TitlePrefix + " - ";
-		}
-		_TitleString += title;
+		if(_TitlePrefix.empty())
+			_TitleString = title;
+		else
+			_TitleString = _TitlePrefix + " - " + title;
 
 		setContainerTitle(_TitleString);
 	}
@@ -6601,6 +6589,9 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::htmlTEXTAREA(const CHtmlElement &elm)
 	{
+		_IgnoreChildElements = true;
+
+		// TODO: allow textarea without form
 		if (_Forms.empty())
 			return;
 
@@ -6615,7 +6606,6 @@ namespace NLGUI
 		_TextAreaName.clear();
 		_TextAreaRow = 1;
 		_TextAreaCols = 10;
-		_TextAreaContent.clear();
 		_TextAreaMaxLength = 1024;
 		if (elm.hasNonEmptyAttribute("name"))
 			_TextAreaName = elm.getAttribute("name");
@@ -6627,16 +6617,11 @@ namespace NLGUI
 			fromString(elm.getAttribute("maxlength"), _TextAreaMaxLength);
 
 		_TextAreaTemplate = !templateName.empty() ? templateName : DefaultFormTextAreaGroup;
-		_TextArea = true;
-		_PRE.push_back(true);
-	}
 
-	void CGroupHTML::htmlTEXTAREAend(const CHtmlElement &elm)
-	{
-		if (_Forms.empty())
-			return;
+		std::string content = strFindReplaceAll(elm.serializeChilds(), std::string("\t"), std::string(" "));
+		content = strFindReplaceAll(content, std::string("\n"), std::string(" "));
 
-		CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, _TextAreaContent, _TextAreaMaxLength);
+		CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, content, _TextAreaMaxLength);
 		if (textArea)
 		{
 			// Add the text area to the form
@@ -6645,9 +6630,6 @@ namespace NLGUI
 			entry.TextArea = textArea;
 			_Forms.back().Entries.push_back (entry);
 		}
-
-		_TextArea = false;
-		popIfNotEmpty (_PRE);
 	}
 
 	// ***************************************************************************
@@ -6664,18 +6646,14 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::htmlTITLE(const CHtmlElement &elm)
 	{
+		_IgnoreChildElements = true;
+
 		// TODO: only from <head>
 		// if (!_ReadingHeadTag) return;
-		if(!_TitlePrefix.empty())
-			_TitleString = _TitlePrefix + " - ";
-		else
-			_TitleString.clear();
-		_Title = true;
-	}
 
-	void CGroupHTML::htmlTITLEend(const CHtmlElement &elm)
-	{
-		_Title = false;
+		// consume all child elements
+		_TitleString = strFindReplaceAll(elm.serializeChilds(), std::string("\t"), std::string(" "));
+		_TitleString = strFindReplaceAll(_TitleString, std::string("\n"), std::string(" "));
 		setTitle(_TitleString);
 	}
 

From acd12c7c37f8deb35c847f0395f955dba008f242 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 4 May 2021 21:45:47 +0300
Subject: [PATCH 230/292] Add initial support for centered multiline text in
 table

---
 nel/include/nel/gui/group_paragraph.h |  7 +++++++
 nel/src/gui/group_html.cpp            | 16 ++++++++++++++++
 nel/src/gui/group_paragraph.cpp       | 11 +++++++++++
 3 files changed, 34 insertions(+)

diff --git a/nel/include/nel/gui/group_paragraph.h b/nel/include/nel/gui/group_paragraph.h
index 20bc50585..b05d4e12e 100644
--- a/nel/include/nel/gui/group_paragraph.h
+++ b/nel/include/nel/gui/group_paragraph.h
@@ -55,6 +55,8 @@ namespace NLGUI
 			Right
 		};
 
+		enum TTextAlign { AlignLeft = 0, AlignCenter, AlignRight, AlignJustify };
+
 		///constructor
 		CGroupParagraph(const TCtorParam &param);
 
@@ -98,6 +100,8 @@ namespace NLGUI
 		// the same, but with id taken from the database
 		void addTextChildID (const std::string &dbPath, bool multiLine = true);
 
+		void setTextAlign(const TTextAlign align) { _TextAlign = align; }
+
 	protected:
 
 		void delChild (CViewBase* child);
@@ -271,6 +275,9 @@ namespace NLGUI
 		// (the element drawn are stored in _views, _contrlos or _childrengroups of cinterfacegroup
 		std::vector<CElementInfo> _Elements;
 
+		// Horizontal align for elements
+		TTextAlign _TextAlign;
+
 		// Last parent width
 		sint32		_LastW;
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 179232566..a95914ef6 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2158,6 +2158,17 @@ namespace NLGUI
 		newParagraph->setResizeFromChildH(true);
 
 		newParagraph->setMarginLeft(getIndent());
+		if (!_Style.Current.TextAlign.empty())
+		{
+			if (_Style.Current.TextAlign == "left")
+				newParagraph->setTextAlign(CGroupParagraph::AlignLeft);
+			else if (_Style.Current.TextAlign == "center")
+				newParagraph->setTextAlign(CGroupParagraph::AlignCenter);
+			else if (_Style.Current.TextAlign == "right")
+				newParagraph->setTextAlign(CGroupParagraph::AlignRight);
+			else if (_Style.Current.TextAlign == "justify")
+				newParagraph->setTextAlign(CGroupParagraph::AlignJustify);
+		}
 
 		// Add to the group
 		addHtmlGroup (newParagraph, beginSpace);
@@ -4986,6 +4997,11 @@ namespace NLGUI
 				cellParams.Align = CGroupCell::Center;
 			else if (align == "right")
 				cellParams.Align = CGroupCell::Right;
+			else if (align != "justify")
+				align.clear();
+
+			// copy td align (can be empty) attribute back into css
+			_Style.Current.TextAlign = align;
 		}
 
 		{
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index 4ca13c8ae..623975b98 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -65,6 +65,7 @@ namespace NLGUI
 		_Indent = 0;
 		_FirstViewIndentView = false;
 		_TextId = 0;
+		_TextAlign = AlignLeft;
 	}
 
 	// ----------------------------------------------------------------------------
@@ -713,6 +714,10 @@ namespace NLGUI
 							CViewText *viewText = dynamic_cast<CViewText*>(_Elements[i].Element);
 							if (viewText)
 							{
+								// FIXME: this does not work with multiple view text on same line
+								if (_TextAlign == AlignCenter && elmCount == 1)
+									viewText->setTextMode(CViewText::Centered);
+
 								viewText->setFirstLineX(x + ((i==0)?_FirstViewIndentView:0));
 								viewText->setX(0);
 								viewText->updateTextContext();
@@ -730,6 +735,12 @@ namespace NLGUI
 							// Does we balance the last line height ?
 							if (viewText)
 							{
+								if (_TextAlign == AlignCenter && elmCount == 1)
+								{
+									sint pad =  width - viewText->getWReal();
+									viewText->setX(pad/2);
+								}
+
 								changeLine = viewText->getNumLine() > 1;
 								if (!viewText->getText().empty() && *(viewText->getText().rbegin()) == '\n')
 								{

From 825d70a80ec88792d8b7e4854c76d2583c17ca3a Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 7 May 2021 13:26:33 +0300
Subject: [PATCH 231/292] Minor refactor

---
 nel/include/nel/gui/group_html.h |   3 +
 nel/src/gui/group_html.cpp       | 153 ++++++++++++++++---------------
 2 files changed, 84 insertions(+), 72 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 26eb7d83a..90a51ea68 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -304,6 +304,9 @@ namespace NLGUI
 
 		// return true if text has same style
 		bool isSameStyle(CViewLink *text, const CStyleParams &style) const;
+		// add text link using template
+		void newTextButton(const std::string &text, const std::string &tpl);
+		void newTextLink(const std::string &text);
 
 		// Add a string in the current paragraph
 		void addString(const std::string &str);
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index a95914ef6..8a0073245 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2398,6 +2398,85 @@ namespace NLGUI
 			(style.GlobalColor == text->getModulateGlobalColor());
 	}
 
+	// ***************************************************************************
+	void CGroupHTML::newTextButton(const std::string &text, const std::string &tpl)
+	{
+		_CurrentViewLink = NULL;
+		_CurrentViewImage = NULL;
+
+		// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
+		string param = "name=" + this->_Id + "|url=" + getLink();
+		string name;
+		if (!_AnchorName.empty())
+			name = _AnchorName.back();
+
+		typedef pair<string, string> TTmplParam;
+		vector<TTmplParam> tmplParams;
+		tmplParams.push_back(TTmplParam("id", ""));
+		tmplParams.push_back(TTmplParam("onclick", "browse"));
+		tmplParams.push_back(TTmplParam("onclick_param", param));
+		tmplParams.push_back(TTmplParam("active", "true"));
+		CInterfaceGroup *buttonGroup = CWidgetManager::getInstance()->getParser()->createGroupInstance(tpl, getId()+":"+name, tmplParams);
+		if (!buttonGroup)
+		{
+			nlinfo("Text button template '%s' not found", tpl.c_str());
+			return;
+		}
+		buttonGroup->setId(getId()+":"+name);
+
+		// Add the ctrl button
+		CCtrlTextButton *ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("button"));
+		if (!ctrlButton) ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("b"));
+		if (!ctrlButton)
+		{
+			nlinfo("Text button template '%s' is missing :button or :b text element", tpl.c_str());
+			return;
+		}
+		ctrlButton->setModulateGlobalColorAll(false);
+
+		// Translate the tooltip
+		ctrlButton->setText(text);
+		ctrlButton->setDefaultContextHelp(std::string(getLinkTitle()));
+		// empty url / button disabled
+		ctrlButton->setFrozen(*getLink() == '\0');
+
+		setTextButtonStyle(ctrlButton, _Style.Current);
+
+		_Paragraph->addChild(buttonGroup);
+	}
+
+	// ***************************************************************************
+	void CGroupHTML::newTextLink(const std::string &text)
+	{
+		CViewLink *newLink = new CViewLink(CViewBase::TCtorParam());
+		if (getA())
+		{
+			newLink->Link = getLink();
+			newLink->LinkTitle = getLinkTitle();
+			if (!newLink->Link.empty())
+			{
+				newLink->setHTMLView (this);
+				newLink->setActionOnLeftClick("browse");
+				newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
+			}
+		}
+		newLink->setText(text);
+		newLink->setMultiLineSpace((uint)((float)(_Style.Current.FontSize)*LineSpaceFontFactor));
+		newLink->setMultiLine(true);
+		newLink->setModulateGlobalColor(_Style.Current.GlobalColor);
+		setTextStyle(newLink, _Style.Current);
+
+		registerAnchor(newLink);
+
+		if (getA() && !newLink->Link.empty())
+			getParagraph()->addChildLink(newLink);
+		else
+			getParagraph()->addChild(newLink);
+
+		_CurrentViewLink = newLink;
+		_CurrentViewImage = NULL;
+	}
+
 	// ***************************************************************************
 
 	void CGroupHTML::addString(const std::string &str)
@@ -2465,7 +2544,6 @@ namespace NLGUI
 			// Text added ?
 			bool added = false;
 
-			// Number of child in this paragraph
 			if (_CurrentViewLink)
 			{
 				bool skipLine = !_CurrentViewLink->getText().empty() && *(_CurrentViewLink->getText().rbegin()) == '\n';
@@ -2482,78 +2560,9 @@ namespace NLGUI
 			if (!added)
 			{
 				if (getA() && string(getLinkClass()) == "ryzom-ui-button")
-				{
-					string buttonTemplate = DefaultButtonGroup;
-					// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-					string param = "name=" + this->_Id + "|url=" + getLink();
-					string name;
-					if (!_AnchorName.empty())
-						name = _AnchorName.back();
-					typedef pair<string, string> TTmplParam;
-					vector<TTmplParam> tmplParams;
-					tmplParams.push_back(TTmplParam("id", ""));
-					tmplParams.push_back(TTmplParam("onclick", "browse"));
-					tmplParams.push_back(TTmplParam("onclick_param", param));
-					tmplParams.push_back(TTmplParam("active", "true"));
-					CInterfaceGroup *buttonGroup = CWidgetManager::getInstance()->getParser()->createGroupInstance(buttonTemplate, getId()+":"+name, tmplParams);
-					if (buttonGroup)
-					{
-						buttonGroup->setId(getId()+":"+name);
-						// Add the ctrl button
-						CCtrlTextButton *ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("button"));
-						if (!ctrlButton) ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("b"));
-						if (ctrlButton)
-						{
-							ctrlButton->setModulateGlobalColorAll (false);
-
-							// Translate the tooltip
-							ctrlButton->setDefaultContextHelp(getLinkTitle());
-							ctrlButton->setText(tmpStr);
-							// empty url / button disabled
-							bool disabled = string(getLink()).empty();
-							ctrlButton->setFrozen(disabled);
-
-							setTextButtonStyle(ctrlButton, style);
-						}
-						getParagraph()->addChild (buttonGroup);
-						paragraphChange ();
-					}
-
-				}
+					newTextButton(tmpStr, DefaultButtonGroup);
 				else
-				{
-					CViewLink *newLink = new CViewLink(CViewBase::TCtorParam());
-					if (getA())
-					{
-						newLink->Link = getLink();
-						newLink->LinkTitle = getLinkTitle();
-						if (!newLink->Link.empty())
-						{
-							newLink->setHTMLView (this);
-
-							newLink->setActionOnLeftClick("browse");
-							newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
-						}
-					}
-					newLink->setText(tmpStr);
-					newLink->setMultiLineSpace((uint)((float)(style.FontSize)*LineSpaceFontFactor));
-					newLink->setMultiLine(true);
-					newLink->setModulateGlobalColor(style.GlobalColor);
-					setTextStyle(newLink, style);
-					// newLink->setLineAtBottom (true);
-
-					registerAnchor(newLink);
-
-					if (getA() && !newLink->Link.empty())
-					{
-						getParagraph()->addChildLink(newLink);
-					}
-					else
-					{
-						getParagraph()->addChild(newLink);
-					}
-					paragraphChange ();
-				}
+					newTextLink(tmpStr);
 			}
 		}
 	}

From a7bc98b0b469ba1273fe60163f2c8a7a9779e976 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 19 May 2021 20:17:48 +0300
Subject: [PATCH 232/292] Fix mission give item window sometimes not appearing.

---
 ryzom/client/src/user_entity.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index dce3191dd..2ed7355b0 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -2670,17 +2670,6 @@ void CUserEntity::selection(const CLFECOMMON::TCLEntityId &slot)	// virtual
 		{
 			playerGiftNeeded->setValue32(0);
 		}
-		//
-		missionOption = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:TITLE", (int) k), false);
-		if (missionOption)
-		{
-			missionOption->setValue32(0);
-		}
-		playerGiftNeeded = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:PLAYER_GIFT_NEEDED", (int) k), false);
-		if (playerGiftNeeded)
-		{
-			playerGiftNeeded->setValue32(0);
-		}
 	}
 /* TODO ULU : Add RP tags */
 

From 5abdccfd6362073e78b732487ff3fe43fba20428 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 20 May 2021 08:49:31 +0300
Subject: [PATCH 233/292] Inherit -ryzom-modulate-bgcolor in table/td

---
 nel/src/gui/group_html.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 8a0073245..e9505abdc 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -6423,10 +6423,12 @@ namespace NLGUI
 			string image = _Style.getStyle("background-image");
 			addImageDownload(image, table, CStyleParams(), NormalImage, "");
 		}
+		else
+		{
+			// will be set in addImageDownload if background-image exists
+			table->setModulateGlobalColor(_Style.Current.GlobalColor);
+		}
 
-		// setting ModulateGlobalColor must be after addImageDownload
-		if (_Style.checkStyle("-ryzom-modulate-bgcolor", "true"))
-			table->setModulateGlobalColor(true);
 		table->setMarginLeft(getIndent());
 		addHtmlGroup (table, 0);
 
@@ -6510,6 +6512,11 @@ namespace NLGUI
 			string image = _Style.getStyle("background-image");
 			addImageDownload(image, _Cells.back(), CStyleParams(), NormalImage, "");
 		}
+		else
+		{
+			// will be set in addImageDownload if background-image is set
+			_Cells.back()->setModulateGlobalColor(_Style.Current.GlobalColor);
+		}
 
 		if (elm.hasNonEmptyAttribute("colspan"))
 			fromString(elm.getAttribute("colspan"), _Cells.back()->ColSpan);
@@ -6546,10 +6553,6 @@ namespace NLGUI
 
 		_Cells.back()->NewLine = getTR();
 
-		// setting ModulateGlobalColor must be after addImageDownload
-		if (_Style.checkStyle("-ryzom-modulate-bgcolor", "true"))
-			_Cells.back()->setModulateGlobalColor(true);
-
 		// border from <table border="1">
 		if (table->CellBorder)
 		{

From 1e465b6cff2080cd17edf05a6b25b203f85d4f75 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 15 Feb 2021 13:25:37 +0200
Subject: [PATCH 234/292] Show reload link when curl fails to open connection
 to website

---
 nel/include/nel/gui/group_html.h |  3 +++
 nel/src/gui/group_html.cpp       | 28 +++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 90a51ea68..b37d80272 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -118,6 +118,9 @@ namespace NLGUI
 		// Browse error
 		void browseError (const char *msg);
 
+		// Error message with html content
+		void browseErrorHtml(const std::string &html);
+
 		bool isBrowsing();
 
 		// Update coords
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index e9505abdc..eb75c1481 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2262,6 +2262,17 @@ namespace NLGUI
 		invalidateCoords();
 	}
 
+	void CGroupHTML::browseErrorHtml(const std::string &html)
+	{
+		releaseDownloads();
+		removeContent();
+
+		renderHtmlString(html);
+
+		updateRefreshButton();
+		invalidateCoords();
+	}
+
 	// ***************************************************************************
 
 	bool CGroupHTML::isBrowsing()
@@ -3586,11 +3597,22 @@ namespace NLGUI
 	{
 		if (!success)
 		{
+			CUrlParser uri(_CurlWWW->Url);
+
+			// potentially unwanted chars
+			std::string url = _CurlWWW->Url;
+			url = strFindReplaceAll(url, string("<"), string("%3C"));
+			url = strFindReplaceAll(url, string(">"), string("%3E"));
+			url = strFindReplaceAll(url, string("\""), string("%22"));
+			url = strFindReplaceAll(url, string("'"), string("%27"));
+
 			std::string err;
-			err = "Connection failed with cURL error: ";
+			err = "<html><head><title>cURL error</title></head><body>";
+			err += "<h1>Connection failed with cURL error</h1>";
 			err += error;
-			err += "\nURL '" + _CurlWWW->Url + "'";
-			browseError(err.c_str());
+			err += "<hr>(" + uri.scheme + "://" + uri.host + ") <a href=\"" + url + "\">reload</a>";
+			err += "</body></html>";
+			browseErrorHtml(err);
 			return;
 		}
 

From 474802810bb53e161ad5599ce5d8ae11cee2a2e3 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 20 May 2021 12:37:01 +0300
Subject: [PATCH 235/292] Fixed throw(type) deprecated in C++11 warning

---
 nel/include/nel/misc/streamed_package.h | 4 ++--
 nel/src/misc/streamed_package.cpp       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nel/include/nel/misc/streamed_package.h b/nel/include/nel/misc/streamed_package.h
index 82a138482..093f87a30 100644
--- a/nel/include/nel/misc/streamed_package.h
+++ b/nel/include/nel/misc/streamed_package.h
@@ -32,7 +32,7 @@ public:
 		uint32 Size;
 		uint32 LastModified;
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 
 	};
 
@@ -40,7 +40,7 @@ public:
 	CStreamedPackage();
 	~CStreamedPackage();
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// result: [out] ex. /00/00/000000000..
 	/// hash: [in]
diff --git a/nel/src/misc/streamed_package.cpp b/nel/src/misc/streamed_package.cpp
index 28e2db956..ad013cccf 100644
--- a/nel/src/misc/streamed_package.cpp
+++ b/nel/src/misc/streamed_package.cpp
@@ -32,7 +32,7 @@ CStreamedPackage::~CStreamedPackage()
 	// release
 }
 
-void CStreamedPackage::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStreamedPackage::serial(NLMISC::IStream &f)
 {
 	f.serialCheck(NELID("SNPK"));
 
@@ -42,7 +42,7 @@ void CStreamedPackage::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 	f.serialCont(Entries);
 }
 
-void CStreamedPackage::CEntry::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStreamedPackage::CEntry::serial(NLMISC::IStream &f)
 {
 	uint version = 1;
 	f.serialVersion(version);

From 3b91146d230cef081d4c111f070b9c4ed8c9e528 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 25 Jun 2020 14:44:45 +0300
Subject: [PATCH 236/292] Changed: Allow to use 2x/4x hi-res texture atlas for
 GUI elements

---
 nel/include/nel/gui/view_renderer.h |  4 ++++
 nel/src/gui/view_renderer.cpp       | 26 +++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/nel/include/nel/gui/view_renderer.h b/nel/include/nel/gui/view_renderer.h
index aefbb315f..4498a436a 100644
--- a/nel/include/nel/gui/view_renderer.h
+++ b/nel/include/nel/gui/view_renderer.h
@@ -444,9 +444,13 @@ namespace NLGUI
 			SGlobalTexture ()
 			{
 				FromGlobaleTexture = true;
+				Scale = 1.f;
 			}
 			uint32				Width, Height;
 			uint32				DefaultWidth, DefaultHeight;
+			// used by texture atlas to unscale individual texture
+			// getTextureSizeFromId() calls to return 1x size for GUI.
+			float				Scale;
 			NL3D::UTexture		*Texture;
 			std::string			Name;
 			bool				FromGlobaleTexture;
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 66aea4cfb..76e064dfd 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -622,9 +622,7 @@ namespace NLGUI
 			return;
 
 		sint32 txw, txh;
-		SImage &rImage = *getSImage(nTxId);
-		txw = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width+0.5f);
-		txh = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height+0.5f);
+		getTextureSizeFromId(nTxId, txw, txh);
 
 		drawRotFlipBitmap (layerId, x, y, txw, txh, rot, flipv, nTxId, col);
 	}
@@ -860,6 +858,14 @@ namespace NLGUI
 		CIFile ifTmp;
 		if (ifTmp.open(filename))
 			CBitmap::loadSize (ifTmp, gt.Width, gt.Height);
+
+		// extract textures scale from filename
+		// texture_interface_v3_2x.tga / texture_interface_v3_4x.tga
+		if (textureFileName.find("_2x.") != std::string::npos)
+			gt.Scale = 2.f;
+		else if (textureFileName.find("_4x.") != std::string::npos)
+			gt.Scale = 4.f;
+
 		gt.Texture = driver->createTextureFile (filename);
 		// Force to generate the texture now. This way we can extract the mouse bitmaps from it now without having to load it again.
 		// Its why we don't release it at the end, because it is likely to be uploaded soon)
@@ -934,6 +940,10 @@ namespace NLGUI
 						CBitmap curs;
 						curs.resize(x1 - x0, y1 - y0);
 						curs.blit(*texDatas, x0, y0, (x1 - x0), (y1 - y0), 0, 0);
+						// TODO: scaled cursors not supported
+						if (gt.Scale > 1.f) {
+							curs.resample((sint)(curs.getWidth() / gt.Scale), (sint)(curs.getHeight() / gt.Scale));
+						}
 						driver->addCursor(image.Name, curs);
 					}
 				}
@@ -1359,8 +1369,8 @@ namespace NLGUI
 		else
 		{
 			SImage &rImage = *getSImage(id);
-			width = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width+0.5f);
-			height = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height+0.5f);
+			width = (sint32)(((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width / rImage.GlobalTexturePtr->Scale)+0.5f);
+			height = (sint32)(((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height / rImage.GlobalTexturePtr->Scale)+0.5f);
 		}
 	}
 	/*
@@ -1375,9 +1385,11 @@ namespace NLGUI
 
 		SImage &rImage = *getSImage(id);
 		SGlobalTexture &rGT = *rImage.GlobalTexturePtr;
+		// get (possibly) scaled width/height
 		sint32 width, height;
-		width = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rGT.Width+0.5f);
-		height = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rGT.Height+0.5f);
+		getTextureSizeFromId(id, width, height);
+		if (width == 0 || height == 0)
+			return CRGBA(255,255,255);
 		float xRatio = ((float)x) / ((float)(width));
 		float yRatio = ((float)y) / ((float)(height));
 		UTexture *pTF = rGT.Texture;

From 52e0e71c4a968a1447395e615a1ee2078c1c7f7c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 20 May 2021 13:27:36 +0300
Subject: [PATCH 237/292] Simple html/css test tool

---
 nel/tools/CMakeLists.txt                      |   5 +
 nel/tools/htmlcss_test/CMakeLists.txt         |  15 ++
 nel/tools/htmlcss_test/htmlcss_test.cpp       | 183 ++++++++++++++++++
 .../htmlcss_test/tests/01-syntax-tests.html   |  28 +++
 .../tests/css-tricks/01-var-toggle.html       |  24 +++
 .../tests/custom-properties/e01.basic.html    |  18 ++
 .../e02.case-sensitive-name.html              |  23 +++
 .../custom-properties/e03.value-syntax.html   |  17 ++
 .../custom-properties/e05.inherited.html      |  17 ++
 .../tests/custom-properties/e06.i18n.html     |  15 ++
 .../e07-safe-use-not-cyclic.html              |  15 ++
 .../tests/custom-properties/e08-cyclic.html   |  14 ++
 .../custom-properties/e09-not-cyclic.html     |  15 ++
 .../tests/custom-properties/e10.fallback.html |  24 +++
 .../e11.1.invalid-property-name.html          |  12 ++
 .../e11.2.whitespace-after-var.html           |  13 ++
 .../e13.invalid-variables.html                |  13 ++
 17 files changed, 451 insertions(+)
 create mode 100644 nel/tools/htmlcss_test/CMakeLists.txt
 create mode 100644 nel/tools/htmlcss_test/htmlcss_test.cpp
 create mode 100644 nel/tools/htmlcss_test/tests/01-syntax-tests.html
 create mode 100644 nel/tools/htmlcss_test/tests/css-tricks/01-var-toggle.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e01.basic.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e02.case-sensitive-name.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e03.value-syntax.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e05.inherited.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e06.i18n.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e07-safe-use-not-cyclic.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e08-cyclic.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e09-not-cyclic.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e10.fallback.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e11.1.invalid-property-name.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e11.2.whitespace-after-var.html
 create mode 100644 nel/tools/htmlcss_test/tests/custom-properties/e13.invalid-variables.html

diff --git a/nel/tools/CMakeLists.txt b/nel/tools/CMakeLists.txt
index 5297f34a4..079ded560 100644
--- a/nel/tools/CMakeLists.txt
+++ b/nel/tools/CMakeLists.txt
@@ -37,3 +37,8 @@ ENDIF()
 IF(WITH_NEL_TESTS)
   ADD_SUBDIRECTORY(nel_unit_test)
 ENDIF()
+
+IF(WITH_HTMLCSS_TEST)
+  ADD_SUBDIRECTORY(htmlcss_test)
+ENDIF()
+
diff --git a/nel/tools/htmlcss_test/CMakeLists.txt b/nel/tools/htmlcss_test/CMakeLists.txt
new file mode 100644
index 000000000..d37498f60
--- /dev/null
+++ b/nel/tools/htmlcss_test/CMakeLists.txt
@@ -0,0 +1,15 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1)
+CMAKE_POLICY(SET CMP0015 NEW)
+
+LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_LIBRARY_DIR})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
+FILE(GLOB SRC htmlcss_test.cpp)
+ADD_EXECUTABLE(htmlcss_test ${SRC})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LUA_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} )
+TARGET_LINK_LIBRARIES(htmlcss_test nelmisc nelgui ${LUA_LIBRARIES} ${LIBXML2_LIBRARIES})
+NL_DEFAULT_PROPS(htmlcss_test "Ryzom, Tests: html/css parser tests")
+NL_ADD_RUNTIME_FLAGS(htmlcss_test)
+
+INSTALL(TARGETS htmlcss_test   RUNTIME DESTINATION bin COMPONENT tools)
+# TODO: test fixtures
diff --git a/nel/tools/htmlcss_test/htmlcss_test.cpp b/nel/tools/htmlcss_test/htmlcss_test.cpp
new file mode 100644
index 000000000..4e5b79843
--- /dev/null
+++ b/nel/tools/htmlcss_test/htmlcss_test.cpp
@@ -0,0 +1,183 @@
+/*
+ * File:   main.cpp
+ * Author: Karu <nimetu@gmail.com>
+ *
+ * Created on 2015-04-11
+ */
+
+typedef struct _xmlNode xmlNode;
+
+#include <string>
+#include <fstream>
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/file.h"
+#include "nel/misc/path.h"
+
+#include "nel/gui/html_parser.h"
+#include "nel/gui/css_parser.h"
+#include "nel/gui/html_element.h"
+#include "nel/gui/css_style.h"
+
+#include "nel/gui/libwww.h"
+
+using namespace std;
+using namespace NLMISC;
+using namespace NLGUI;
+
+sint indent { 0 };
+
+// ***************************************************************************
+void checkRuleset(CHtmlElement &elm, CCssStyle &style, TStyleVec testset, bool exists)
+{
+	bool verbose = false;
+	std::string existsMessage = exists ? "exist" : "unset";
+	for (auto it : testset)
+	{
+		bool failed = (exists != style.hasStyle(it.first));
+		if (failed)
+		{
+			bool failed2 = true;
+			if (it.first == "font-size")
+			{
+				printf("[%s]: font-size: %d; expected '%s'\n", existsMessage.c_str(), style.Current.FontSize, it.second.c_str());
+				printf("     (%s)\n", elm.toString().c_str());
+				failed2 = false;
+			}
+			else if (it.first == "background-color")
+			{
+				printf("[%s]: background-color: '%s'; expected '%s'\n", existsMessage.c_str(), style.Current.BackgroundColor.toString().c_str(), it.second.c_str());
+				printf("     (%s)\n", elm.toString().c_str());
+				failed2 = false;
+			}
+
+			if (failed2)
+			{
+				printf("[%s] FAIL: '%s': '%s'\n", existsMessage.c_str(), it.first.c_str(), it.second.c_str());
+				printf("     (%s)\n", elm.toString().c_str());
+				for (auto it2 : style.Current.StyleRules)
+					printf("'%s': '%s'\n", it2.first.c_str(), it2.second.c_str());
+			}
+		}
+		else if (exists && !style.checkStyle(it.first, it.second))
+		{
+			printf("[%s] FAIL: expecting '%s': '%s', got '%s'\n", existsMessage.c_str(), it.first.c_str(), it.second.c_str(), style.getStyle(it.first).c_str());
+			printf("     (%s)\n", elm.toString().c_str());
+		}
+		else if (!failed)
+		{
+			if (verbose)
+				printf("[%s] PASS: '%s': '%s'\n", existsMessage.c_str(), it.first.c_str(), it.second.c_str());
+		}
+	}
+}
+
+// ***************************************************************************
+void recursiveHtmlRender(CHtmlElement &elm, CCssStyle &style)
+{
+	bool verbose = false;
+	if (elm.Type == CHtmlElement::TEXT_NODE)
+	{
+		std::string val = trim(elm.Value);
+		if (verbose)
+			if (!val.empty())
+				printf("[%d] '%s'\n", indent, val.c_str());
+	}
+	else if (elm.Type == CHtmlElement::ELEMENT_NODE)
+	{
+		style.pushStyle();
+
+		if (verbose)
+			printf("========= '%s'\n", elm.toString().c_str());
+
+		style.getStyleFor(elm);
+		style.applyStyle(elm.Style);
+		if (elm.hasAttribute("data-ruleset"))
+		{
+			TStyleVec testset = CCssParser::parseDecls(elm.getAttribute("data-ruleset"));
+			checkRuleset(elm, style, testset, true);
+		}
+
+		if (elm.hasAttribute("data-ruleunset"))
+		{
+			TStyleVec testset = CCssParser::parseDecls(elm.getAttribute("data-ruleunset"));
+			checkRuleset(elm, style, testset, false);
+		}
+
+		if (elm.hasAttribute("data-ruleset-before"))
+		{
+			TStyleVec testset = CCssParser::parseDecls(elm.getAttribute("data-ruleset-before"));
+
+		}
+
+		for (auto it = elm.Children.begin(); it != elm.Children.end(); ++it)
+		{
+			recursiveHtmlRender(*it, style);
+		}
+
+		style.popStyle();
+	}
+}
+
+// ***************************************************************************
+void runTestOnFile(const std::string &filename)
+{
+	CHtmlElement dom;
+
+	CHtmlParser htmlParser;
+
+	std::vector<CHtmlParser::StyleLink> links;
+	std::vector<std::string> styles;
+	//, elm, styles, links
+
+	ifstream f(filename);
+	if (!f.is_open())
+	{
+		printf("!! failed to open file '%s'\n", filename.c_str());
+		return;
+	}
+
+	printf(": %s\n", filename.c_str());
+	std::string htmlString;
+	std::string line;
+	while (getline(f, line))
+		htmlString += line;
+
+	htmlParser.getDOM(htmlString, dom, styles, links);
+
+	CCssStyle style;
+	for (std::string s : styles)
+	{
+		if (!s.empty())
+			style.parseStylesheet(s);
+	}
+
+	for (auto it = dom.Children.begin(); it != dom.Children.end(); ++it)
+		recursiveHtmlRender(*it, style);
+}
+
+// ***************************************************************************
+int main(int argc, const char *argv[])
+{
+	CApplicationContext *appContext = new CApplicationContext;
+
+	// htmlcss_test file.html
+	if (argc == 2)
+	{
+		runTestOnFile(argv[1]);
+	}
+	else
+	{
+		std::vector<std::string> result;
+		CPath::getPathContent("tests/", true /*recursive*/, false /*wantDir*/, true /*wantFile*/, result, NULL /*callback*/, true /*showEverything*/);
+		printf(":: got %ld files\n", result.size());
+		for (const auto &fname : result)
+		{
+			if (endsWith(fname, ".html") && fname != "tests/XX-template.html")
+				runTestOnFile(fname);
+		}
+	}
+
+	printf(">>> all done\n");
+	return EXIT_SUCCESS;
+}
diff --git a/nel/tools/htmlcss_test/tests/01-syntax-tests.html b/nel/tools/htmlcss_test/tests/01-syntax-tests.html
new file mode 100644
index 000000000..f9b2c9356
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/01-syntax-tests.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:lang(en) { --text: '(en)'; }
+:lang(de-DE) { --text: '(de-DE)'; }
+a { test: " (" var(--lang) ")"}
+
+div {
+	/* '--a' and '--b' are both 'initial' */
+	--should-not-exist: var(--a, var(--b, ( "p() " ) ), { "b" [ "r" ] });
+	/* 'before -var- after' */
+	--concate-test: 'before' var(--exists) 'after';
+	--exists: '-var-';
+	/* fallback should be at least one char */
+	--invalid-fallback: var(--exists,);
+	/* using fallback */
+	--fallback: var(--a, 'ok');
+}
+		</style>
+		<div data-ruleset="--concate-test: 'before' '-var-' 'after'; --exists: '-var-'; --fallback: 'ok';"
+			data-ruleunset="--should-not-exists: 1; --invalid-fallback: 1;" />
+
+		<a lang="en" data-ruleset="--text: '(en)';">link</a>
+		<a lang="de" data-ruleunset="--text: 1;">link</a>
+
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/css-tricks/01-var-toggle.html b/nel/tools/htmlcss_test/tests/css-tricks/01-var-toggle.html
new file mode 100644
index 000000000..72e49b854
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/css-tricks/01-var-toggle.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+p {
+	--mq-sm: initial;
+}
+
+.small {
+	--mq-sm: ;
+}
+
+p {
+	--padding-when-small: var(--mq-sm) 2rem;
+	--padding-when-large: 4rem;
+	padding: var(--padding-when-small, var(--padding-when-large));
+}
+		</style>
+		<p data-ruleset="padding-left: 4rem;" comment="--mq-sm==initial, should use fallback value" />
+		<div>
+			<p class="small" data-ruleset="padding-left: 2rem;" comment="--mq-sm==;, should use defined value"/>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e01.basic.html b/nel/tools/htmlcss_test/tests/custom-properties/e01.basic.html
new file mode 100644
index 000000000..c5085b8ef
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e01.basic.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root {
+	--main-color: #06c;
+	--accent-color: #006;
+}
+/* The rest of the CSS file */
+#foo h1 {
+	color: var(--main-color);
+}
+		</style>
+		<div id="foo">
+			<h1 data-ruleset="color: #06c;">Header</h1>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e02.case-sensitive-name.html b/nel/tools/htmlcss_test/tests/custom-properties/e02.case-sensitive-name.html
new file mode 100644
index 000000000..1d9dc7b88
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e02.case-sensitive-name.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root {
+	--main-color: #06c;
+	--accent-color: #006;
+	--MAIN-COLOR: #f00;
+}
+/* The rest of the CSS file */
+#foo h1 {
+	color: var(--main-color);
+}
+h2 {
+	color: var(--MAIN-COLOR);
+}
+		</style>
+		<div id="foo">
+			<h1 data-ruleset="color: #06c;">Header1</h1>
+			<h2 data-ruleset="color: #f00;">Header2</h1>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e03.value-syntax.html b/nel/tools/htmlcss_test/tests/custom-properties/e03.value-syntax.html
new file mode 100644
index 000000000..28f0a9c69
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e03.value-syntax.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root {
+	--foo: if(x > 5) this.width = 10;
+}
+/* The rest of the CSS file */
+#foo h1 {
+	test: var(--foo)
+}
+		</style>
+		<div id="foo">
+			<h1 data-ruleset="test: if(x > 5) this.width = 10;">Header</h1>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e05.inherited.html b/nel/tools/htmlcss_test/tests/custom-properties/e05.inherited.html
new file mode 100644
index 000000000..bafbbf37f
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e05.inherited.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root { --color: blue; }
+div { --color: green; }
+#alert { --color: red; }
+* { color: var(--color); }
+		</style>
+		<p data-ruleset="color: blue;">I inherited blue from the root element!</p>
+		<div data-ruleset="color: green;">I got green set directly on me!</div>
+		<div id='alert' data-ruleset="color: red;">
+			While I got red set directly on me!
+			<p data-ruleset="color: red;">I’m red too, because of inheritance!</p>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e06.i18n.html b/nel/tools/htmlcss_test/tests/custom-properties/e06.i18n.html
new file mode 100644
index 000000000..861e60412
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e06.i18n.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+a:lang(en) {--lang: 'en';}
+a:lang(de) {--lang: 'de';}
+a { test: var(--lang); }
+		</style>
+
+		<a lang="en" data-ruleset="test: 'en';">link</a>
+
+		<a lang="de" data-ruleset="test: 'de';">link</a>
+
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e07-safe-use-not-cyclic.html b/nel/tools/htmlcss_test/tests/custom-properties/e07-safe-use-not-cyclic.html
new file mode 100644
index 000000000..39ed3a299
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e07-safe-use-not-cyclic.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root {
+	--main-color: #c06;
+    --accent-background: var(--main-color);
+}
+div {
+	test: var(--accent-background);
+}
+		</style>
+		<div data-ruleset="test: #c06;"/>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e08-cyclic.html b/nel/tools/htmlcss_test/tests/custom-properties/e08-cyclic.html
new file mode 100644
index 000000000..4d1f5fdd8
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e08-cyclic.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+div {
+	--one: calc(var(--two) + 20px);
+	--two: calc(var(--one) - 20px);
+	--ok: 'ok';
+}
+		</style>
+		<div data-ruleset="--ok: 'ok';"
+			data-ruleunset="--one: 1; --two: 1;" />
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e09-not-cyclic.html b/nel/tools/htmlcss_test/tests/custom-properties/e09-not-cyclic.html
new file mode 100644
index 000000000..f3e1788ee
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e09-not-cyclic.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+one   { --foo: 10px; }
+two   { --bar: calc(var(--foo) + 10px); }
+three { --foo: calc(var(--bar) + 10px); }
+		</style>
+		<one data-ruleset="--foo: 10px;">
+			<two data-ruleset="--bar: calc( 10px + 10px);">
+				<three data-ruleset="--foo: calc( calc( 10px + 10px) + 10px);"/>
+			</two>
+		</one>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e10.fallback.html b/nel/tools/htmlcss_test/tests/custom-properties/e10.fallback.html
new file mode 100644
index 000000000..5d785bffa
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e10.fallback.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+/* In the component’s style: */
+.component .header {
+	color: var(--header-color, blue);
+}
+.component .text {
+	color: var(--text-color, black);
+}
+
+/* In the larger application’s style: */
+.component {
+	--text-color: #080;
+	/* header-color isn’t set, and so remains blue, the fallback value */
+}
+		</style>
+		<div class="component">
+			<h1 class="header" data-ruleset="color: blue;">header</h1>
+			<p class="text" data-ruleset="color: #080;">text</p>
+		</div>
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e11.1.invalid-property-name.html b/nel/tools/htmlcss_test/tests/custom-properties/e11.1.invalid-property-name.html
new file mode 100644
index 000000000..488e733a9
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e11.1.invalid-property-name.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+			div {
+			  --side: margin-top;
+			  var(--side): 20px;
+			}
+		</style>
+		<div data-ruleset="--side: margin-top;" data-ruleunset="var(--side): 1;" />
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e11.2.whitespace-after-var.html b/nel/tools/htmlcss_test/tests/custom-properties/e11.2.whitespace-after-var.html
new file mode 100644
index 000000000..a67b4ba1d
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e11.2.whitespace-after-var.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+			div {
+			  --gap: 20;
+			  margin-top: var(--gap)px;
+			}
+		</style>
+		<!-- should have whitespace, ie '20 px' -->
+		<div data-ruleset="margin-top: 20 px;" />
+	</body>
+</html>
diff --git a/nel/tools/htmlcss_test/tests/custom-properties/e13.invalid-variables.html b/nel/tools/htmlcss_test/tests/custom-properties/e13.invalid-variables.html
new file mode 100644
index 000000000..f60877d82
--- /dev/null
+++ b/nel/tools/htmlcss_test/tests/custom-properties/e13.invalid-variables.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+	<body>
+		<style>
+:root { --not-a-color: 20px; }
+p { background-color: red; }
+p { background-color: var(--not-a-color); }
+		</style>
+		<!-- this should have 'red' because var() has invalid value for color -->
+		<!-- TODO: not really supported by NEL currently -->
+		<div data-ruleset="background-color: red;" />
+	</body>
+</html>

From 96a03d1cf5a4a062af4551b010af1bca24f6f549 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 12 Mar 2020 18:17:33 +0200
Subject: [PATCH 238/292] Changed: Preserve icon text case as is

---
 ryzom/client/src/client_sheets/item_sheet.cpp             | 1 -
 ryzom/client/src/client_sheets/outpost_building_sheet.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
index 5918ba73c..d5831167c 100644
--- a/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -274,7 +274,6 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	string IconText;
 	if(!item.getValueByName (IconText, "3d.text overlay"))
 		debug("key '3d.text overlay' not found.");
-	IconText = toLowerAscii(IconText);
 	IdIconText = ClientSheetsStrings.add(IconText);
 
 	// See if this item can be hiden when equipped
diff --git a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
index 42083c83f..0f741c1a2 100644
--- a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
+++ b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
@@ -131,7 +131,6 @@ void COutpostBuildingSheet::build(const NLGEORGES::UFormElm &root)
 	string IconText;
 	if(!root.getValueByName (IconText, "text overlay"))
 		debug("key 'text overlay' not found.");
-	IconText = toLowerAscii(IconText);
 	IdIconText = ClientSheetsStrings.add(IconText);
 }
 

From 5614028f632d370b6f2d9d37b8651126bb54dfbc Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 21 May 2021 14:43:05 +0300
Subject: [PATCH 239/292] Fix bad merge

---
 ryzom/client/src/interface_v3/chat_text_manager.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 4b1ea3a5a..40d349396 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -423,10 +423,6 @@ CViewBase *CChatTextManager::createMsgTextComplex(const string &msg, NLMISC::CRG
 
 	string::size_type pos = 0;
 
-	// Manage Translations
-	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
-	bool originalFirst = node->getValueBool();
-
 	string::size_type startTr = msg.find("{:");
 	string::size_type endOfOriginal = msg.find("}@{");
 

From 1aba4c13cbba02725cf88e7c1a553172f2701ef7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 24 May 2021 12:50:13 +0800
Subject: [PATCH 240/292] Reduce audio log when switching between looping and
 streaming source

---
 nel/src/sound/driver/xaudio2/source_xaudio2.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
index 13a613d6d..fa4213386 100644
--- a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
+++ b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
@@ -359,7 +359,8 @@ void CSourceXAudio2::setStreaming(bool streaming)
 		_SourceVoice->GetState(&voice_state);
 		if (!voice_state.BuffersQueued)
 		{
-			nlwarning(NLSOUND_XAUDIO2_PREFIX "Switched streaming mode while buffer still queued!?! Flush");
+			if (!_IsLooping)
+				nlwarning(NLSOUND_XAUDIO2_PREFIX "Switched streaming mode while buffer still queued!?! Flush");
 			_SoundDriver->getXAudio2()->CommitChanges(_OperationSet);
 			if (FAILED(_SourceVoice->FlushSourceBuffers())) 
 				nlwarning(NLSOUND_XAUDIO2_PREFIX "FAILED FlushSourceBuffers");
@@ -555,7 +556,7 @@ bool CSourceXAudio2::preparePlay(IBuffer::TBufferFormat bufferFormat, uint8 chan
 	}
 	if (_SourceVoice && (bufferFormat != _Format || channels != _Channels || bitsPerSample != _BitsPerSample))
 	{
-		nlwarning(NLSOUND_XAUDIO2_PREFIX "Switching format %u to %u!", (uint32)_Format, (uint32)bufferFormat);
+		// nlwarning(NLSOUND_XAUDIO2_PREFIX "Switching format %u to %u!", (uint32)_Format, (uint32)bufferFormat);
 		// destroy existing voice
 		_SoundDriver->getXAudio2()->CommitChanges(_OperationSet);
 		_SoundDriver->destroySourceVoice(_SourceVoice); _SourceVoice = NULL;

From 85ec6e618e0a67da4bf75b923816c02e11224584 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 25 May 2021 14:38:09 +0800
Subject: [PATCH 241/292] Fix build on vs2008

---
 nel/src/gui/html_element.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nel/src/gui/html_element.cpp b/nel/src/gui/html_element.cpp
index 454833a5a..f0bb76482 100644
--- a/nel/src/gui/html_element.cpp
+++ b/nel/src/gui/html_element.cpp
@@ -141,14 +141,14 @@ namespace NLGUI
 	// ***************************************************************************
 	std::string CHtmlElement::htmlEscape(std::string val, bool isAttribute) const
 	{
-		static const std::vector<std::string> searchReplace = {
+		static const std::string searchReplace[] = {
 			"&", "&amp;",
 			"<", "&lt;",
 			">", "&gt;",
 			"\xA0", "&nbsp;",
 		};
-
-		for(uint i = 0; i < searchReplace.size(); i+=2)
+		
+		for(uint i = 0; i < (sizeof(searchReplace) / sizeof(searchReplace[0])); i+=2)
 			val = strFindReplaceAll(val, searchReplace[i], searchReplace[i+1]);
 
 		if (isAttribute)

From c5ed59638e0db38abf335746f5737ffa2fcc3bc8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 25 May 2021 16:30:43 +0800
Subject: [PATCH 242/292] Add missing lookup entries to object viewer config

---
 nel/tools/3d/object_viewer/object_viewer.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/tools/3d/object_viewer/object_viewer.cfg b/nel/tools/3d/object_viewer/object_viewer.cfg
index 712731d27..f3c48f7d7 100644
--- a/nel/tools/3d/object_viewer/object_viewer.cfg
+++ b/nel/tools/3d/object_viewer/object_viewer.cfg
@@ -3,6 +3,10 @@
 // your searhc pathes, (where to find textures, shapes, tiles, zones ...)
 search_pathes = 
 {
+	"R:\graphics\stuff\generique\agents\_textures\accessories",
+	"R:\graphics\stuff\generique\agents\_textures\actors",
+	"R:\graphics\stuff\generique\decors\_textures\batiments",
+	"R:\graphics\stuff\generique\decors\_textures",
 	"R:\graphics\stuff\fyros\agents\_textures\actors",
 	"R:\graphics\stuff\tryker\agents\_textures\actors",
 	"R:\graphics\stuff\matis\agents\_textures\actors",

From cdc2cacfc05f1a9758ed113a62bc5710297cbd65 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 25 May 2021 16:33:30 +0800
Subject: [PATCH 243/292] Fixup shape2obj

---
 nel/tools/3d/shape2obj/main.cpp | 134 +++++++++++++++++---------------
 1 file changed, 73 insertions(+), 61 deletions(-)

diff --git a/nel/tools/3d/shape2obj/main.cpp b/nel/tools/3d/shape2obj/main.cpp
index 7d106a887..fbfc713d4 100644
--- a/nel/tools/3d/shape2obj/main.cpp
+++ b/nel/tools/3d/shape2obj/main.cpp
@@ -45,9 +45,24 @@ bool operator == (const CVertex &v1, const CVertex &v2)
 
 bool operator < (const CVertex &v1, const CVertex &v2)
 {
+	/*
+	if (v1.vertex == v2.vertex)
+	{
+		if (v1.normal == v2.normal)
+		{
+			return (v1.uv < v2.uv);
+		}
+		return (v1.normal < v1.normal);
+	}
+	*/
 	return (v1.vertex < v2.vertex);
 }
 
+const CIndexBuffer *getRdrPassPrimitiveBlock(const CMeshGeom *mesh, uint lodId, uint renderPass)
+{
+	return &(mesh->getRdrPassPrimitiveBlock(lodId, renderPass));
+}
+
 const CIndexBuffer *getRdrPassPrimitiveBlock(const CMeshMRMGeom *mesh, uint lodId, uint renderPass)
 {
 	return &(mesh->getRdrPassPrimitiveBlock(lodId, renderPass));
@@ -66,7 +81,7 @@ const CIndexBuffer *getRdrPassPrimitiveBlock(const CMeshMRMSkinnedGeom *mesh, ui
 
 bool ProcessMeshMRMSkinned(const std::string &filename, IShape *shapeMesh);
 bool ProcessMeshMRM(const std::string &filename, IShape *shapeMesh);
-//bool ProcessMesh(const std::string &filename, IShape *shapeMesh);
+bool ProcessMesh(const std::string &filename, IShape *shapeMesh);
 
 int main(int argc, char* argv[])
 {
@@ -110,9 +125,9 @@ int main(int argc, char* argv[])
 
 	if (ProcessMeshMRMSkinned(filename, shapeMesh)) return 0;
 	if (ProcessMeshMRM(filename, shapeMesh)) return 0;
-//	if (ProcessMesh(filename, shapeMesh)) return 0;
+	if (ProcessMesh(filename, shapeMesh)) return 0;
 
-	return 0;
+	return 1;
 }
 
 bool ProcessMeshMRMSkinned(const std::string &filename, IShape *shapeMesh)
@@ -256,7 +271,7 @@ bool ProcessMeshMRMSkinned(const std::string &filename, IShape *shapeMesh)
 
 		ofs << "v " << v.x << " " << v.y << " " << v.z << endl;
 		ofs << "vn " << vn.x << " " << vn.y << " " << vn.z << endl;
-		ofs << "vt " << vt.U << " " << vt.V << endl;
+		ofs << "vt " << vt.U << " " << (1.0f - vt.V) << endl;
 	}
 
 	// **** Get All Faces 
@@ -457,7 +472,7 @@ bool ProcessMeshMRM(const std::string &filename, IShape *shapeMesh)
 
 		ofs << "v " << v.x << " " << v.y << " " << v.z << endl;
 		ofs << "vn " << vn.x << " " << vn.y << " " << vn.z << endl;
-		ofs << "vt " << vt.U << " " << vt.V << endl;
+		ofs << "vt " << vt.U << " " << (1.0f - vt.V) << endl;
 	}
 
 	// **** Get All Faces 
@@ -519,9 +534,6 @@ bool ProcessMeshMRM(const std::string &filename, IShape *shapeMesh)
 	return true;
 }
 
-/*
-
-TODO: implement this
 
 bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 {
@@ -531,71 +543,73 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 
 	COFile ofile;
 
-	CMeshGeom* meshIn = (CMeshGeom*)&mesh->getMeshGeom();
+	const CMeshGeom *meshIn = &mesh->getMeshGeom();
 
 	CVertexBuffer vertexBuffer = meshIn->getVertexBuffer();
 
-//	CVertexBufferRead vba;
-//	vertexBuffer.lock (vba);
-
-	uint i = vertexBuffer.getNumVertices();
-
-	std::vector<NLMISC::CVector> vertices;
-	meshIn->retrieveVertices(vertices);
+	CVertexBufferRead vba;
+	vertexBuffer.lock (vba);
+	uint	i, j;
 
-	std::vector<uint32> indices;
-	meshIn->retrieveTriangles(indices);
+	// **** First, for the best lod indicate what vertex is used or not. Also index geomorphs to know what real vertex is used
+	vector<sint>		vertexUsed;
+	// -1 means "not used"
+	vertexUsed.resize(vertexBuffer.capacity(), -1);
+	// Parse all triangles.
+	for(i=0;i<meshIn->getNbRdrPass(0); ++i)
+	{
+		const CIndexBuffer *pb = getRdrPassPrimitiveBlock(meshIn, 0, i);
+		CIndexBufferRead iba;
+		pb->lock (iba);
+		if (iba.getFormat() == CIndexBuffer::Indices32)
+		{
+			const uint32	*triPtr= (const uint32 *) iba.getPtr();
+			for(j=0;j<pb->getNumIndexes(); ++j)
+			{
+				uint	idx= *triPtr;
+				// Flag the vertex with its own index => used.
+				vertexUsed[idx]= idx;
+				triPtr++;
+			}
+		}
+		else
+		{
+			const uint16	*triPtr= (const uint16 *) iba.getPtr();
+			for(j=0;j<pb->getNumIndexes(); ++j)
+			{
+				uint	idx= *triPtr;
+				// Flag the vertex with its own index => used.
+				vertexUsed[idx]= idx;
+				triPtr++;
+			}
+		}
+	}
 
 
 	// **** For all vertices used (not geomorphs), compute vertex Skins.
 	vector<CVertex>		shadowVertices;
 	vector<sint>		vertexToVSkin;
-	vertexToVSkin.resize(indices.size());
-	shadowVertices.reserve(indices.size());
+	vertexToVSkin.resize(vertexUsed.size());
+	shadowVertices.reserve(vertexUsed.size());
 	// use a map to remove duplicates (because of UV/normal discontinuities before!!)
-	map<CVertex, uint>	shadowVertexMap;
 	uint						numMerged= 0;
-	// Skip Geomorphs.
-	for(i=0;i<indices.size(); ++i)
+	
+	for(i=0;i<vertexUsed.size(); ++i)
 	{
-		// Build the vertex
-		CVertex shadowVert;
-		CUV uv;
-		shadowVert.vertex = *(CVector*)vba.getVertexCoordPointer(i);
-		shadowVert.normal = *(CVector*)vba.getNormalCoordPointer(i);
-		shadowVert.uv = *(CUV*)vba.getTexCoordPointer(i);
-
-		// Select the best Matrix.
-		CMesh::CSkinWeight		sw= skinWeights[i];
-		float	maxW= 0;
-		uint	matId= 0;
-		for(j=0;j<NL3D_MESH_SKINNING_MAX_MATRIX;j++)
+		// If this vertex is used.
+		if(vertexUsed[i]!=-1)
 		{
-			// if no more matrix influenced, stop
-			if(sw.Weights[j]==0)
-				break;
-			if(sw.Weights[j]>maxW)
-			{
-				matId= sw.MatrixId[j];
-				maxW= sw.Weights[j];
-			}
-		}
+			// Build the vertex
+			CVertex shadowVert;
+			CUV uv;
+			shadowVert.vertex = *(CVector*)vba.getVertexCoordPointer(i);
+			shadowVert.normal = *(CVector*)vba.getNormalCoordPointer(i);
+			shadowVert.uv = *(CUV*)vba.getTexCoordPointer(i);
 
-		// If dont find the shadowVertex in the map.
-		map<CVertex, uint>::iterator		it= shadowVertexMap.find(shadowVert);
-		if(it==shadowVertexMap.end())
-		{
 			// Append
 			uint	index= shadowVertices.size();
 			vertexToVSkin[i]= index;
 			shadowVertices.push_back(shadowVert);
-			shadowVertexMap.insert(make_pair(shadowVert, index));
-		}
-		else
-		{
-			// Ok, map.
-			vertexToVSkin[i]= it->second;
-			numMerged++;
 		}
 	}
 
@@ -609,7 +623,7 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 
 		ofs << "v " << v.x << " " << v.y << " " << v.z << endl;
 		ofs << "vn " << vn.x << " " << vn.y << " " << vn.z << endl;
-		ofs << "vt " << vt.U << " " << vt.V << endl;
+		ofs << "vt " << vt.U << " " << (1.0f - vt.V) << endl;
 	}
 
 	// **** Get All Faces 
@@ -617,11 +631,11 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 	vector<uint32>			shadowTriangles;
 	shadowTriangles.reserve(1000);
 	// Parse all input tri of the mesh.
-	for(i=0; i<meshIn->getNbRdrPass(lodId); ++i)
+	for(i=0; i<meshIn->getNbRdrPass(0); ++i)
 	{
-		ofs << "g pass" << i << endl;
+		ofs << "g " << filename << endl;
 
-		const CIndexBuffer *pb = getRdrPassPrimitiveBlock(meshIn, lodId, i);
+		const CIndexBuffer *pb = getRdrPassPrimitiveBlock(meshIn, 0, i);
 		CIndexBufferRead iba;
 		pb->lock (iba);
 		if (iba.getFormat() == CIndexBuffer::Indices32)
@@ -670,5 +684,3 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 
 	return true;
 }
-
-*/
\ No newline at end of file

From d4a3a5bc06fed666b09a2d3275b64c3dda2b65b8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 26 May 2021 03:11:36 +0800
Subject: [PATCH 244/292] Weld vertices

---
 nel/tools/3d/shape2obj/main.cpp | 39 ++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/nel/tools/3d/shape2obj/main.cpp b/nel/tools/3d/shape2obj/main.cpp
index fbfc713d4..6268a9aaa 100644
--- a/nel/tools/3d/shape2obj/main.cpp
+++ b/nel/tools/3d/shape2obj/main.cpp
@@ -591,8 +591,6 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 	vector<sint>		vertexToVSkin;
 	vertexToVSkin.resize(vertexUsed.size());
 	shadowVertices.reserve(vertexUsed.size());
-	// use a map to remove duplicates (because of UV/normal discontinuities before!!)
-	uint						numMerged= 0;
 	
 	for(i=0;i<vertexUsed.size(); ++i)
 	{
@@ -615,13 +613,38 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 
 	ofstream ofs(string(filename + ".obj").c_str());
 
+	map<CVector, sint> weldedVerticesToId;
+	vector<CVector> weldedVertices;
+	vector<sint> shadowToWelded;
+	weldedVertices.reserve(shadowVertices.size());
+	shadowToWelded.resize(shadowVertices.size());
+
+	for (i = 0; i < shadowVertices.size(); ++i)
+	{
+		CVector v = shadowVertices[i].vertex;
+		map<CVector, sint>::iterator it = weldedVerticesToId.find(v);
+		if (it == weldedVerticesToId.end())
+		{
+			weldedVerticesToId[v] = weldedVertices.size();
+			shadowToWelded[i] = weldedVertices.size();
+			weldedVertices.push_back(v);
+		}
+		else
+		{
+			shadowToWelded[i] = it->second;
+		}
+	}
+
+	for(size_t y = 0; y < weldedVertices.size(); ++y)
+	{
+		CVector v = weldedVertices[y];
+		ofs << "v " << v.x << " " << v.y << " " << v.z << endl;
+	}
+
 	for(size_t y = 0; y < shadowVertices.size(); ++y)
 	{
-		CVector v = shadowVertices[y].vertex;
 		CVector vn = shadowVertices[y].normal;
 		CUV vt = shadowVertices[y].uv;
-
-		ofs << "v " << v.x << " " << v.y << " " << v.z << endl;
 		ofs << "vn " << vn.x << " " << vn.y << " " << vn.z << endl;
 		ofs << "vt " << vt.U << " " << (1.0f - vt.V) << endl;
 	}
@@ -672,9 +695,9 @@ bool ProcessMesh(const std::string &filename, IShape *shapeMesh)
 
 		for(size_t pass = 0; pass<shadowTriangles.size(); pass += 3)
 		{
-			ofs << "f " << shadowTriangles[pass]+1 << "/" << shadowTriangles[pass]+1 << "/" << shadowTriangles[pass]+1 << " ";
-			ofs << shadowTriangles[pass+1]+1 << "/" << shadowTriangles[pass+1]+1 << "/" << shadowTriangles[pass+1]+1 << " ";
-			ofs << shadowTriangles[pass+2]+1 << "/" << shadowTriangles[pass+2]+1 << "/" << shadowTriangles[pass+2]+1 << endl;
+			ofs << "f " << shadowToWelded[shadowTriangles[pass]]+1 << "/" << shadowTriangles[pass]+1 << "/" << shadowTriangles[pass]+1 << " ";
+			ofs << shadowToWelded[shadowTriangles[pass+1]]+1 << "/" << shadowTriangles[pass+1]+1 << "/" << shadowTriangles[pass+1]+1 << " ";
+			ofs << shadowToWelded[shadowTriangles[pass+2]]+1 << "/" << shadowTriangles[pass+2]+1 << "/" << shadowTriangles[pass+2]+1 << endl;
 		}
 
 		shadowTriangles.clear();

From b9bdabd1f0c9b2f05aadcd70995b443244ed69b0 Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Wed, 26 May 2021 08:21:08 +0800
Subject: [PATCH 245/292] Add missing path to georges config

---
 ryzom/tools/leveldesign/install/georges.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ryzom/tools/leveldesign/install/georges.cfg b/ryzom/tools/leveldesign/install/georges.cfg
index d108f3100..cc3723933 100644
--- a/ryzom/tools/leveldesign/install/georges.cfg
+++ b/ryzom/tools/leveldesign/install/georges.cfg
@@ -13,3 +13,4 @@ UserType             = {
 StartExpanded        = 1;
 SamplePath           = "R:\sound\samplebanks";
 PackedSheetPath      = "R:\sound\";
+IconPath             = "R:\graphics\interfaces";

From 2c167fb360f599832aaa3052036632f7c87cd86d Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Thu, 27 May 2021 11:19:43 +0800
Subject: [PATCH 246/292] Don't apply skin color to weapons in info preview,
 caused by conflicting naming of lead weapon textures, fix
 ryzomclassic/issues#201

---
 ryzom/client/src/interface_v3/character_3d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/character_3d.cpp b/ryzom/client/src/interface_v3/character_3d.cpp
index 8d6b30c51..6e2e5a16d 100644
--- a/ryzom/client/src/interface_v3/character_3d.cpp
+++ b/ryzom/client/src/interface_v3/character_3d.cpp
@@ -898,7 +898,7 @@ void CCharacter3D::setup (const SCharacter3DSetup &c3ds)
 		if (c3ds.People != EGSPD::CPeople::Undefined)
 		if ((c3ds.People != _CurrentSetup.People) || bInstanceRebuilt || bQualityRebuilt)
 		{
-			if (!_Instances[i].empty())
+			if (!_Instances[i].empty() && i != Char3DPart_HandRightItem && i != Char3DPart_HandLeftItem)
 			{
 				ColorSlotManager.setInstanceSlot (	_Instances[i],
 													0u, // Slot 0 is for skin

From c6f8baa058decbf3159bb16c2d655a3230de228a Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Fri, 28 May 2021 05:59:40 +0800
Subject: [PATCH 247/292] Use streaming vertex buffer for animating regular
 skinned meshes, writing to a read locked and shared vertex buffer is illegal,
 fix kaetemi/ryzomclassic#93

---
 nel/include/nel/3d/mesh.h |   2 +-
 nel/src/3d/mesh.cpp       | 100 ++++++++++++++++++++++++++++++++++----
 2 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/nel/include/nel/3d/mesh.h b/nel/include/nel/3d/mesh.h
index 25872a063..0d47037aa 100644
--- a/nel/include/nel/3d/mesh.h
+++ b/nel/include/nel/3d/mesh.h
@@ -837,7 +837,7 @@ private:
 	void	restoreOriginalSkinVertices();
 
 	// apply Skin to all vertices from _OriginalSkin* to _VBuffer.
-	void	applySkin(CSkeletonModel *skeleton);
+	void	applySkin(void *dstVb, CSkeletonModel *skeleton);
 
 
 	void	flagSkinVerticesForMatrixBlock(uint8 *skinFlags, CMatrixBlock &mb);
diff --git a/nel/src/3d/mesh.cpp b/nel/src/3d/mesh.cpp
index 51b07fdec..f5a391f6e 100644
--- a/nel/src/3d/mesh.cpp
+++ b/nel/src/3d/mesh.cpp
@@ -30,6 +30,7 @@
 #include "nel/3d/render_trav.h"
 #include "nel/3d/visual_collision_mesh.h"
 #include "nel/3d/meshvp_wind_tree.h"
+#include "nel/3d/vertex_stream_manager.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -764,9 +765,38 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 	// NB: the skeleton matrix has already been setuped by CSkeletonModel
 	// NB: the normalize flag has already been setuped by CSkeletonModel
 
+	bool supportVertexStream = ((_VBuffer.getVertexFormat() & ~(CVertexBuffer::PaletteSkinFlag | CVertexBuffer::WeightFlag))
+		== (CVertexBuffer::PositionFlag | CVertexBuffer::NormalFlag | CVertexBuffer::TexCoord0Flag))
+		&& (_VBuffer.getValueType(CVertexBuffer::TexCoord0) == CVertexBuffer::Float2)
+		&& (_OriginalSkinNormals.size()) && (!_OriginalTGSpace.size());
+	CVertexStreamManager *meshSkinManager = renderTrav->getMeshSkinManager();
+
+	if (supportVertexStream)
+	{
+		uint maxVertices = meshSkinManager->getMaxVertices();
+		uint vertexSize = meshSkinManager->getVertexSize();
+		nlassert(vertexSize == 32);
+
+		if (_OriginalSkinVertices.size() <= maxVertices)
+		{
+			// apply the skinning
+			uint8 *dstVb = meshSkinManager->lock();
+			applySkin(dstVb, skeleton);
+			meshSkinManager->unlock(_OriginalSkinVertices.size());
+		}
+		else
+		{
+			supportVertexStream = false;
+			nlwarning("Unable to animate skinned model, too many vertices");
+		}
+	}
+	else
+	{
+		nlwarning("Unable to animate skinned model, unsupported vertex format");
+	}
 
 	// apply the skinning: _VBuffer is modified.
-	applySkin(skeleton);
+	// applySkin(skeleton);
 
 
 	// Setup meshVertexProgram
@@ -786,7 +816,14 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 	// Render the mesh.
 	//===========
 	// active VB.
-	drv->activeVertexBuffer(_VBuffer);
+	if (supportVertexStream)
+	{
+		meshSkinManager->activate();
+	}
+	else
+	{
+		drv->activeVertexBuffer(_VBuffer);
+	}
 
 
 	// For all _MatrixBlocks
@@ -816,6 +853,11 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 		}
 	}
 
+	if (supportVertexStream)
+	{
+		meshSkinManager->swapVBHard();
+	}
+
 	// End VertexProgram effect
 	if(useMeshVP)
 	{
@@ -1787,7 +1829,7 @@ void	CMeshGeom::restoreOriginalSkinVertices()
 
 
 // ***************************************************************************
-void	CMeshGeom::applySkin(CSkeletonModel *skeleton)
+void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 {
 	// init.
 	//===================
@@ -1802,10 +1844,12 @@ void	CMeshGeom::applySkin(CSkeletonModel *skeleton)
 		skinType= SkinWithNormal;
 	else
 		skinType= SkinWithTgSpace;
+	nlassert(skinType == SkinWithNormal); // Only support the streamable vertex buffer format
 
 	// Get VB src/dst info/ptrs.
 	uint	numVertices= (uint)_OriginalSkinVertices.size();
-	uint	dstStride= _VBuffer.getVertexSize();
+	static const uint	dstStride = 32; // _VBuffer.getVertexSize();
+	uint	srcStride = _VBuffer.getVertexSize();
 	// Get dst TgSpace.
 	uint	tgSpaceStage = 0;
 	if( skinType>= SkinWithTgSpace)
@@ -1823,6 +1867,10 @@ void	CMeshGeom::applySkin(CSkeletonModel *skeleton)
 	CVertexBufferRead vba;
 	_VBuffer.lock (vba);
 
+	uint8 *dstVbPos = (uint8 *)dstVb;
+	uint8 *dstVbNormal = dstVbPos + 12;
+	uint8 *dstVbUV = dstVbPos + 24;
+
 	// For all MatrixBlocks
 	//===================
 	for(uint mb= 0; mb<_MatrixBlocks.size();mb++)
@@ -1839,25 +1887,25 @@ void	CMeshGeom::applySkin(CSkeletonModel *skeleton)
 		CVector		*srcVector= &_OriginalSkinVertices[0];
 		uint8		*srcPal= (uint8*)vba.getPaletteSkinPointer(0);
 		uint8		*srcWgt= (uint8*)vba.getWeightPointer(0);
-		uint8		*dstVector= (uint8*)vba.getVertexCoordPointer(0);
+		uint8		*dstVector = dstVbPos; // (uint8 *)vba.getVertexCoordPointer(0);
 		// Normal.
 		CVector		*srcNormal= NULL;
 		uint8		*dstNormal= NULL;
 		if(skinType>=SkinWithNormal)
 		{
 			srcNormal= &_OriginalSkinNormals[0];
-			dstNormal= (uint8*)vba.getNormalCoordPointer(0);
+			dstNormal = dstVbNormal; // (uint8 *)vba.getNormalCoordPointer(0);
 		}
 		// TgSpace.
 		CVector		*srcTgSpace= NULL;
 		uint8		*dstTgSpace= NULL;
 		if(skinType>=SkinWithTgSpace)
 		{
+			nlassert(false);
 			srcTgSpace= &_OriginalTGSpace[0];
-			dstTgSpace= (uint8*)vba.getTexCoordPointer(0, tgSpaceStage);
+			dstTgSpace = (uint8 *)vba.getTexCoordPointer(0, tgSpaceStage);
 		}
 
-
 		// For all vertices that need to be computed.
 		uint		size= numVertices;
 		for(;size>0;size--)
@@ -1895,14 +1943,46 @@ void	CMeshGeom::applySkin(CSkeletonModel *skeleton)
 			srcNormal++;
 			srcTgSpace++;
 			// inc paletteSkin and dst  (all whatever skin type used...)
-			srcPal+= dstStride;
-			srcWgt+= dstStride;
+			srcPal+= srcStride;
+			srcWgt+= srcStride;
 			dstVector+= dstStride;
 			dstNormal+= dstStride;
 			dstTgSpace+= dstStride;
 		}
 	}
 
+	// Remaining vertices
+	{
+		uint8 *pFlag = &skinFlags[0];
+		CVector *srcVector = &_OriginalSkinVertices[0];
+		uint8 *dstVector = dstVbPos;
+		CVector *srcNormal = &_OriginalSkinNormals[0];
+		uint8 *dstNormal = dstVbNormal;
+		uint8 *srcUV = (uint8 *)vba.getTexCoordPointer(0, 0);
+		uint8 *dstUV = dstVbUV;
+		uint srcStride = _VBuffer.getVertexSize();
+
+		for (uint i = 0; i < numVertices; ++i)
+		{
+			if (*pFlag != NL3D_SOFTSKIN_VCOMPUTED)
+			{
+				*(CVector *)dstVector = *srcVector;
+				*(CVector *)dstNormal = *srcNormal;
+			}
+			*(CVector2f *)dstUV = *(CVector2f *)srcUV;
+
+			// inc flags.
+			pFlag++;
+			// inc src (all whatever skin type used...)
+			srcVector++;
+			srcNormal++;
+			srcUV += srcStride;
+			// inc paletteSkin and dst  (all whatever skin type used...)
+			dstVector += dstStride;
+			dstNormal += dstStride;
+			dstUV += dstStride;
+		}
+	}
 
 	// dirt
 	_OriginalSkinRestored= false;

From bb03f80d8433351d3c66312f5e06de258dc699e5 Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Fri, 28 May 2021 07:03:30 +0800
Subject: [PATCH 248/292] Remove dead code, ref kaetemi/ryzomclassic#93

---
 nel/src/3d/mesh.cpp | 57 +++++++--------------------------------------
 1 file changed, 8 insertions(+), 49 deletions(-)

diff --git a/nel/src/3d/mesh.cpp b/nel/src/3d/mesh.cpp
index f5a391f6e..325f26f8c 100644
--- a/nel/src/3d/mesh.cpp
+++ b/nel/src/3d/mesh.cpp
@@ -775,9 +775,8 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 	{
 		uint maxVertices = meshSkinManager->getMaxVertices();
 		uint vertexSize = meshSkinManager->getVertexSize();
-		nlassert(vertexSize == 32);
 
-		if (_OriginalSkinVertices.size() <= maxVertices)
+		if (maxVertices >= _OriginalSkinVertices.size() && vertexSize == 32)
 		{
 			// apply the skinning
 			uint8 *dstVb = meshSkinManager->lock();
@@ -787,7 +786,7 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 		else
 		{
 			supportVertexStream = false;
-			nlwarning("Unable to animate skinned model, too many vertices");
+			nlwarning("Unable to animate skinned model, too many vertices, or stream format unsupported");
 		}
 	}
 	else
@@ -795,9 +794,6 @@ void	CMeshGeom::renderSkin(CTransformShape *trans, float alphaMRM)
 		nlwarning("Unable to animate skinned model, unsupported vertex format");
 	}
 
-	// apply the skinning: _VBuffer is modified.
-	// applySkin(skeleton);
-
 
 	// Setup meshVertexProgram
 	//===========
@@ -1837,26 +1833,13 @@ void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 		return;
 
 	// Use correct skinning
-	TSkinType	skinType;
-	if( _OriginalSkinNormals.empty() )
-		skinType= SkinPosOnly;
-	else if( _OriginalTGSpace.empty() )
-		skinType= SkinWithNormal;
-	else
-		skinType= SkinWithTgSpace;
-	nlassert(skinType == SkinWithNormal); // Only support the streamable vertex buffer format
+	nlassert(!_OriginalSkinNormals.empty());
+	nlassert(_OriginalTGSpace.empty());
 
 	// Get VB src/dst info/ptrs.
 	uint	numVertices= (uint)_OriginalSkinVertices.size();
 	static const uint	dstStride = 32; // _VBuffer.getVertexSize();
 	uint	srcStride = _VBuffer.getVertexSize();
-	// Get dst TgSpace.
-	uint	tgSpaceStage = 0;
-	if( skinType>= SkinWithTgSpace)
-	{
-		nlassert(_VBuffer.getNumTexCoordUsed() > 0);
-		tgSpaceStage= _VBuffer.getNumTexCoordUsed() - 1;
-	}
 
 	// Mark all vertices flag to not computed.
 	static	vector<uint8>	skinFlags;
@@ -1887,24 +1870,10 @@ void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 		CVector		*srcVector= &_OriginalSkinVertices[0];
 		uint8		*srcPal= (uint8*)vba.getPaletteSkinPointer(0);
 		uint8		*srcWgt= (uint8*)vba.getWeightPointer(0);
-		uint8		*dstVector = dstVbPos; // (uint8 *)vba.getVertexCoordPointer(0);
+		uint8		*dstVector = dstVbPos;
 		// Normal.
-		CVector		*srcNormal= NULL;
-		uint8		*dstNormal= NULL;
-		if(skinType>=SkinWithNormal)
-		{
-			srcNormal= &_OriginalSkinNormals[0];
-			dstNormal = dstVbNormal; // (uint8 *)vba.getNormalCoordPointer(0);
-		}
-		// TgSpace.
-		CVector		*srcTgSpace= NULL;
-		uint8		*dstTgSpace= NULL;
-		if(skinType>=SkinWithTgSpace)
-		{
-			nlassert(false);
-			srcTgSpace= &_OriginalTGSpace[0];
-			dstTgSpace = (uint8 *)vba.getTexCoordPointer(0, tgSpaceStage);
-		}
+		CVector		*srcNormal= &_OriginalSkinNormals[0];
+		uint8		*dstNormal = dstVbNormal;
 
 		// For all vertices that need to be computed.
 		uint		size= numVertices;
@@ -1928,12 +1897,7 @@ void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 				computeSoftwarePointSkinning(matrixes, srcVector, psPal, (float*)srcWgt, (CVector*)dstVector);
 
 				// compute normal part.
-				if(skinType>=SkinWithNormal)
-					computeSoftwareVectorSkinning(matrixes, srcNormal, psPal, (float*)srcWgt, (CVector*)dstNormal);
-
-				// compute tg part.
-				if(skinType>=SkinWithTgSpace)
-					computeSoftwareVectorSkinning(matrixes, srcTgSpace, psPal, (float*)srcWgt, (CVector*)dstTgSpace);
+				computeSoftwareVectorSkinning(matrixes, srcNormal, psPal, (float*)srcWgt, (CVector*)dstNormal);
 			}
 
 			// inc flags.
@@ -1941,13 +1905,11 @@ void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 			// inc src (all whatever skin type used...)
 			srcVector++;
 			srcNormal++;
-			srcTgSpace++;
 			// inc paletteSkin and dst  (all whatever skin type used...)
 			srcPal+= srcStride;
 			srcWgt+= srcStride;
 			dstVector+= dstStride;
 			dstNormal+= dstStride;
-			dstTgSpace+= dstStride;
 		}
 	}
 
@@ -1983,9 +1945,6 @@ void	CMeshGeom::applySkin(void *dstVb, CSkeletonModel *skeleton)
 			dstUV += dstStride;
 		}
 	}
-
-	// dirt
-	_OriginalSkinRestored= false;
 }
 
 

From c70ca1f8ababfd29bc3a44a57c6553ed88e09ade Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Tue, 1 Jun 2021 10:30:43 +0800
Subject: [PATCH 249/292] Update GPL headers

---
 nel/include/nel/3d/async_file_manager_3d.h               | 3 +++
 nel/include/nel/3d/computed_string.h                     | 2 +-
 nel/include/nel/3d/font_generator.h                      | 2 +-
 nel/include/nel/3d/font_manager.h                        | 2 +-
 nel/include/nel/3d/text_context.h                        | 2 +-
 nel/include/nel/3d/text_context_user.h                   | 2 +-
 nel/include/nel/3d/texture_font.h                        | 2 +-
 nel/include/nel/3d/u_text_context.h                      | 2 +-
 nel/include/nel/georges/form.h                           | 2 +-
 nel/include/nel/georges/form_elm.h                       | 2 +-
 nel/include/nel/gui/action_handler.h                     | 1 +
 nel/include/nel/gui/css_border_renderer.h                | 2 +-
 nel/include/nel/gui/css_parser.h                         | 2 +-
 nel/include/nel/gui/css_selector.h                       | 2 +-
 nel/include/nel/gui/css_style.h                          | 2 +-
 nel/include/nel/gui/css_types.h                          | 2 +-
 nel/include/nel/gui/ctrl_base.h                          | 2 +-
 nel/include/nel/gui/ctrl_scroll.h                        | 3 ++-
 nel/include/nel/gui/ctrl_text_button.h                   | 2 +-
 nel/include/nel/gui/dbgroup_combo_box.h                  | 2 +-
 nel/include/nel/gui/event_descriptor.h                   | 2 +-
 nel/include/nel/gui/group_container_base.h               | 2 +-
 nel/include/nel/gui/group_editbox.h                      | 2 +-
 nel/include/nel/gui/group_html.h                         | 2 +-
 nel/include/nel/gui/group_paragraph.h                    | 2 +-
 nel/include/nel/gui/group_scrolltext.h                   | 2 +-
 nel/include/nel/gui/group_table.h                        | 2 +-
 nel/include/nel/gui/group_tree.h                         | 2 +-
 nel/include/nel/gui/html_element.h                       | 2 +-
 nel/include/nel/gui/html_parser.h                        | 2 +-
 nel/include/nel/gui/http_cache.h                         | 2 +-
 nel/include/nel/gui/http_hsts.h                          | 2 +-
 nel/include/nel/gui/interface_element.h                  | 2 +-
 nel/include/nel/gui/libwww.h                             | 2 +-
 nel/include/nel/gui/lua_ihm.h                            | 1 +
 nel/include/nel/gui/reflect.h                            | 2 +-
 nel/include/nel/gui/url_parser.h                         | 2 +-
 nel/include/nel/gui/view_bitmap.h                        | 2 +-
 nel/include/nel/gui/view_link.h                          | 2 +-
 nel/include/nel/gui/view_renderer.h                      | 2 +-
 nel/include/nel/gui/view_text.h                          | 2 +-
 nel/include/nel/gui/widget_manager.h                     | 2 +-
 nel/include/nel/misc/base64.h                            | 2 +-
 nel/include/nel/misc/bitmap.h                            | 2 +-
 nel/include/nel/misc/common.h                            | 2 +-
 nel/include/nel/misc/factory.h                           | 3 +++
 nel/include/nel/misc/file.h                              | 2 +-
 nel/include/nel/misc/fixed_size_allocator.h              | 2 +-
 nel/include/nel/misc/path.h                              | 2 +-
 nel/include/nel/misc/rgba.h                              | 2 +-
 nel/include/nel/misc/streamed_package.h                  | 3 +++
 nel/include/nel/misc/win_event_emitter.h                 | 1 +
 nel/include/nel/misc/xml_macros.h                        | 2 +-
 nel/include/nel/sound/audio_decoder.h                    | 3 +++
 nel/include/nel/sound/audio_decoder_mp3.h                | 2 +-
 nel/include/nel/sound/audio_decoder_vorbis.h             | 3 +++
 nel/include/nel/sound/audio_mixer_user.h                 | 2 +-
 nel/include/nel/sound/driver/sound_driver.h              | 2 +-
 nel/include/nel/sound/stream_file_source.h               | 3 +++
 nel/include/nel/sound/u_audio_mixer.h                    | 2 +-
 nel/include/nel/web/curl_certificates.h                  | 2 +-
 nel/samples/3d/font/main.cpp                             | 2 +-
 nel/samples/3d/font_perf/main.cpp                        | 2 +-
 nel/src/3d/animation_set.cpp                             | 3 +++
 nel/src/3d/async_texture_manager.cpp                     | 3 +++
 nel/src/3d/coarse_mesh_build.cpp                         | 3 +++
 nel/src/3d/driver.cpp                                    | 2 +-
 nel/src/3d/driver/direct3d/driver_direct3d.cpp           | 2 +-
 nel/src/3d/driver/direct3d/driver_direct3d.h             | 2 +-
 nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp    | 2 +-
 nel/src/3d/driver/opengl/driver_opengl.cpp               | 4 ++--
 nel/src/3d/driver/opengl/driver_opengl.h                 | 2 +-
 nel/src/3d/driver/opengl/driver_opengl_extension.cpp     | 2 +-
 nel/src/3d/driver/opengl/driver_opengl_inputs.cpp        | 2 +-
 nel/src/3d/driver/opengl/driver_opengl_material.cpp      | 2 +-
 nel/src/3d/driver/opengl/driver_opengl_window.cpp        | 2 +-
 nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h     | 2 +-
 nel/src/3d/font_generator.cpp                            | 2 +-
 nel/src/3d/font_manager.cpp                              | 2 +-
 nel/src/3d/hls_texture_bank.cpp                          | 2 +-
 nel/src/3d/hls_texture_manager.cpp                       | 3 +++
 nel/src/3d/instance_lighter.cpp                          | 2 +-
 nel/src/3d/landscapeig_manager.cpp                       | 3 +++
 nel/src/3d/meshvp_wind_tree.cpp                          | 2 +-
 nel/src/3d/ps_util.cpp                                   | 2 +-
 nel/src/3d/scene_group.cpp                               | 2 +-
 nel/src/3d/shape_info.cpp                                | 3 +++
 nel/src/3d/text_context.cpp                              | 2 +-
 nel/src/3d/text_context_user.cpp                         | 2 +-
 nel/src/3d/texture_file.cpp                              | 3 +++
 nel/src/3d/texture_font.cpp                              | 2 +-
 nel/src/3d/tile_bank.cpp                                 | 2 +-
 nel/src/3d/zone_lighter.cpp                              | 2 +-
 nel/src/georges/form_dfn.cpp                             | 2 +-
 nel/src/georges/form_elm.cpp                             | 2 +-
 nel/src/georges/form_loader.cpp                          | 3 +++
 nel/src/gui/action_handler.cpp                           | 2 +-
 nel/src/gui/css_border_renderer.cpp                      | 2 +-
 nel/src/gui/css_parser.cpp                               | 2 +-
 nel/src/gui/css_selector.cpp                             | 5 ++++-
 nel/src/gui/css_style.cpp                                | 5 ++++-
 nel/src/gui/ctrl_base_button.cpp                         | 1 +
 nel/src/gui/ctrl_button.cpp                              | 3 ++-
 nel/src/gui/ctrl_col_pick.cpp                            | 1 +
 nel/src/gui/ctrl_scroll.cpp                              | 2 +-
 nel/src/gui/ctrl_text_button.cpp                         | 2 +-
 nel/src/gui/dbgroup_combo_box.cpp                        | 2 +-
 nel/src/gui/group_container.cpp                          | 2 +-
 nel/src/gui/group_editbox.cpp                            | 2 +-
 nel/src/gui/group_html.cpp                               | 2 +-
 nel/src/gui/group_list.cpp                               | 2 +-
 nel/src/gui/group_paragraph.cpp                          | 2 +-
 nel/src/gui/group_scrolltext.cpp                         | 2 +-
 nel/src/gui/group_table.cpp                              | 2 +-
 nel/src/gui/group_tree.cpp                               | 2 +-
 nel/src/gui/html_element.cpp                             | 5 ++++-
 nel/src/gui/html_parser.cpp                              | 5 ++++-
 nel/src/gui/http_cache.cpp                               | 2 +-
 nel/src/gui/http_hsts.cpp                                | 4 ++--
 nel/src/gui/interface_anim.cpp                           | 2 +-
 nel/src/gui/interface_element.cpp                        | 3 ++-
 nel/src/gui/interface_group.cpp                          | 2 +-
 nel/src/gui/interface_options.cpp                        | 2 +-
 nel/src/gui/interface_parser.cpp                         | 4 ++--
 nel/src/gui/libwww.cpp                                   | 3 ++-
 nel/src/gui/stdpch.h                                     | 2 +-
 nel/src/gui/url_parser.cpp                               | 5 ++++-
 nel/src/gui/view_bitmap.cpp                              | 2 +-
 nel/src/gui/view_renderer.cpp                            | 2 +-
 nel/src/gui/view_text.cpp                                | 2 +-
 nel/src/gui/widget_manager.cpp                           | 2 +-
 nel/src/ligo/primitive_class.cpp                         | 3 +++
 nel/src/ligo/primitive_configuration.cpp                 | 3 +++
 nel/src/misc/app_context.cpp                             | 2 +-
 nel/src/misc/bitmap.cpp                                  | 2 +-
 nel/src/misc/bitmap_gif.cpp                              | 2 +-
 nel/src/misc/command.cpp                                 | 3 +++
 nel/src/misc/common.cpp                                  | 2 +-
 nel/src/misc/file.cpp                                    | 2 +-
 nel/src/misc/fixed_size_allocator.cpp                    | 2 +-
 nel/src/misc/path.cpp                                    | 2 +-
 nel/src/misc/rgba.cpp                                    | 2 +-
 nel/src/misc/sheet_id.cpp                                | 2 +-
 nel/src/misc/streamed_package.cpp                        | 5 ++++-
 nel/src/misc/streamed_package_manager.cpp                | 2 +-
 nel/src/net/email.cpp                                    | 3 +++
 nel/src/net/service.cpp                                  | 2 +-
 nel/src/sound/audio_decoder.cpp                          | 3 +++
 nel/src/sound/audio_decoder_ffmpeg.cpp                   | 2 +-
 nel/src/sound/audio_decoder_mp3.cpp                      | 2 +-
 nel/src/sound/audio_decoder_vorbis.cpp                   | 3 +++
 nel/src/sound/audio_mixer_user.cpp                       | 4 ++--
 nel/src/sound/complex_source.cpp                         | 2 +-
 nel/src/sound/driver/fmod/sound_driver_fmod.cpp          | 2 +-
 nel/src/sound/driver/fmod/sound_driver_fmod.h            | 2 +-
 nel/src/sound/driver/openal/source_al.cpp                | 2 +-
 nel/src/sound/driver/xaudio2/source_xaudio2.cpp          | 2 +-
 nel/src/sound/group_controller_root.cpp                  | 2 +-
 nel/src/sound/sample_bank_manager.cpp                    | 2 +-
 nel/src/sound/stream_file_source.cpp                     | 3 +++
 nel/src/sound/stream_source.cpp                          | 1 +
 nel/src/web/curl_certificates.cpp                        | 4 ++--
 nel/src/web/http_client_curl.cpp                         | 2 +-
 nel/src/web/stdweb.cpp                                   | 2 +-
 nel/tools/3d/build_clodtex/main.cpp                      | 3 +++
 nel/tools/3d/build_interface/main.cpp                    | 5 ++++-
 nel/tools/3d/ig_elevation/main.cpp                       | 2 +-
 nel/tools/3d/ig_info/ig_info.cpp                         | 3 +++
 nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp           | 2 +-
 nel/tools/3d/lightmap_optimizer/main.cpp                 | 2 +-
 nel/tools/3d/object_viewer/object_viewer.cpp             | 2 +-
 nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp         | 2 +-
 nel/tools/3d/panoply_maker/panoply_maker.cpp             | 2 +-
 nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp      | 2 +-
 nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h        | 3 +++
 nel/tools/3d/shape2obj/main.cpp                          | 3 +++
 nel/tools/3d/shapes_exporter/main.cpp                    | 2 +-
 nel/tools/3d/textures_optimizer/main.cpp                 | 3 +++
 nel/tools/3d/tga_2_dds/tga2dds.cpp                       | 2 +-
 nel/tools/3d/zone_dependencies/zone_dependencies.cpp     | 2 +-
 nel/tools/3d/zone_elevation/zone_elevation.cpp           | 2 +-
 nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp         | 2 +-
 nel/tools/3d/zone_lighter/zone_lighter.cpp               | 2 +-
 nel/tools/georges/georges2csv/georges2csv.cpp            | 2 +-
 nel/tools/ligo/unbuild_flora/unbuild_flora.cpp           | 2 +-
 nel/tools/ligo/unbuild_land/unbuild_land.cpp             | 2 +-
 nel/tools/misc/bnp_make/main.cpp                         | 5 ++++-
 nel/tools/misc/data_mirror/data_mirror.cpp               | 2 +-
 nel/tools/misc/data_mirror/data_mirrorDlg.cpp            | 2 +-
 nel/tools/misc/extract_filename/extract_filename.cpp     | 3 +++
 nel/tools/misc/make_sheet_id/make_sheet_id.cpp           | 2 +-
 nel/tools/misc/snp_make/main.cpp                         | 2 +-
 nel/tools/nel_unit_test/ut_misc.h                        | 2 +-
 nel/tools/nel_unit_test/ut_misc_base64.h                 | 2 +-
 nel/tools/nel_unit_test/ut_misc_common.h                 | 2 +-
 nel/tools/pacs/build_rbank/prim_checker.cpp              | 2 +-
 ryzom/client/src/animation_fx.cpp                        | 3 +++
 ryzom/client/src/auto_anim.cpp                           | 3 +++
 ryzom/client/src/bg_downloader_access.h                  | 3 +++
 ryzom/client/src/candidate.h                             | 3 +++
 ryzom/client/src/client.cpp                              | 2 +-
 ryzom/client/src/client_cfg.cpp                          | 2 +-
 ryzom/client/src/client_cfg.h                            | 2 +-
 ryzom/client/src/client_chat_manager.h                   | 1 +
 ryzom/client/src/client_sheets/automaton_list_sheet.cpp  | 3 +++
 .../client/src/client_sheets/outpost_building_sheet.cpp  | 3 +++
 ryzom/client/src/client_sheets/player_sheet.cpp          | 3 +++
 ryzom/client/src/client_sheets/sbrick_sheet.cpp          | 3 +++
 ryzom/client/src/color_slot_manager.cpp                  | 3 +++
 ryzom/client/src/commands.h                              | 1 +
 ryzom/client/src/connection.h                            | 3 +++
 ryzom/client/src/contextual_cursor.h                     | 3 +++
 ryzom/client/src/continent.h                             | 3 +++
 ryzom/client/src/continent_manager.cpp                   | 4 ++--
 ryzom/client/src/continent_manager.h                     | 2 +-
 ryzom/client/src/continent_manager_build.h               | 3 +++
 ryzom/client/src/cursor_functions.cpp                    | 2 +-
 ryzom/client/src/decal.cpp                               | 2 +-
 ryzom/client/src/door_manager.cpp                        | 3 +++
 ryzom/client/src/entities.cpp                            | 2 +-
 ryzom/client/src/entities.h                              | 2 +-
 ryzom/client/src/entity_animation_manager.cpp            | 3 +++
 ryzom/client/src/entity_cl.cpp                           | 2 +-
 ryzom/client/src/entity_cl.h                             | 2 +-
 ryzom/client/src/events_listener.cpp                     | 4 ++--
 ryzom/client/src/far_tp.cpp                              | 2 +-
 ryzom/client/src/global.cpp                              | 2 +-
 ryzom/client/src/ground_fx_manager.cpp                   | 2 +-
 ryzom/client/src/hair_set.cpp                            | 3 +++
 ryzom/client/src/ig_callback.cpp                         | 3 +++
 ryzom/client/src/init.cpp                                | 2 +-
 ryzom/client/src/init_main_loop.cpp                      | 2 +-
 ryzom/client/src/input.cpp                               | 2 +-
 ryzom/client/src/interface_v3/action_handler_base.cpp    | 2 +-
 ryzom/client/src/interface_v3/action_handler_edit.cpp    | 2 +-
 ryzom/client/src/interface_v3/action_handler_game.cpp    | 2 +-
 ryzom/client/src/interface_v3/action_handler_help.cpp    | 2 +-
 ryzom/client/src/interface_v3/action_handler_misc.cpp    | 4 ++--
 ryzom/client/src/interface_v3/action_handler_misc.h      | 1 +
 ryzom/client/src/interface_v3/action_handler_move.cpp    | 1 +
 ryzom/client/src/interface_v3/action_handler_outpost.cpp | 1 +
 ryzom/client/src/interface_v3/action_handler_phrase.cpp  | 2 +-
 ryzom/client/src/interface_v3/action_phrase_faber.cpp    | 2 +-
 ryzom/client/src/interface_v3/bot_chat_page_trade.h      | 1 +
 ryzom/client/src/interface_v3/character_3d.cpp           | 1 +
 ryzom/client/src/interface_v3/chat_displayer.h           | 1 +
 ryzom/client/src/interface_v3/chat_filter.cpp            | 1 +
 ryzom/client/src/interface_v3/chat_filter.h              | 3 +++
 ryzom/client/src/interface_v3/chat_text_manager.cpp      | 2 +-
 ryzom/client/src/interface_v3/chat_text_manager.h        | 3 ++-
 ryzom/client/src/interface_v3/chat_window.cpp            | 2 +-
 ryzom/client/src/interface_v3/dbctrl_sheet.cpp           | 2 +-
 ryzom/client/src/interface_v3/dbctrl_sheet.h             | 2 +-
 ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp     | 2 +-
 ryzom/client/src/interface_v3/dbgroup_list_sheet.h       | 2 +-
 .../src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp  | 2 +-
 .../src/interface_v3/dbgroup_list_sheet_bonus_malus.h    | 2 +-
 .../client/src/interface_v3/dbgroup_list_sheet_mission.h | 3 +++
 .../client/src/interface_v3/dbgroup_list_sheet_text.cpp  | 2 +-
 ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h  | 2 +-
 ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h | 1 +
 ryzom/client/src/interface_v3/flying_text_manager.h      | 3 +++
 ryzom/client/src/interface_v3/group_career.cpp           | 1 +
 ryzom/client/src/interface_v3/group_compas.cpp           | 2 +-
 ryzom/client/src/interface_v3/group_compas.h             | 3 ++-
 ryzom/client/src/interface_v3/group_html_cs.cpp          | 2 +-
 ryzom/client/src/interface_v3/group_html_cs.h            | 2 +-
 ryzom/client/src/interface_v3/group_html_forum.cpp       | 4 ++--
 ryzom/client/src/interface_v3/group_html_forum.h         | 2 +-
 ryzom/client/src/interface_v3/group_html_mail.cpp        | 4 ++--
 ryzom/client/src/interface_v3/group_html_mail.h          | 2 +-
 ryzom/client/src/interface_v3/group_html_webig.cpp       | 4 ++--
 ryzom/client/src/interface_v3/group_html_webig.h         | 2 +-
 ryzom/client/src/interface_v3/group_in_scene.cpp         | 2 +-
 ryzom/client/src/interface_v3/group_in_scene_bubble.cpp  | 2 +-
 ryzom/client/src/interface_v3/group_in_scene_bubble.h    | 1 +
 ryzom/client/src/interface_v3/group_map.cpp              | 2 +-
 ryzom/client/src/interface_v3/group_map.h                | 2 +-
 ryzom/client/src/interface_v3/group_quick_help.cpp       | 2 +-
 ryzom/client/src/interface_v3/group_quick_help.h         | 2 +-
 ryzom/client/src/interface_v3/guild_manager.h            | 1 +
 ryzom/client/src/interface_v3/interface_3d_scene.cpp     | 2 +-
 ryzom/client/src/interface_v3/interface_ddx.h            | 1 +
 ryzom/client/src/interface_v3/interface_manager.cpp      | 2 +-
 ryzom/client/src/interface_v3/interface_manager.h        | 2 +-
 ryzom/client/src/interface_v3/inventory_manager.h        | 1 +
 ryzom/client/src/interface_v3/item_consumable_effect.cpp | 3 +++
 ryzom/client/src/interface_v3/item_consumable_effect.h   | 3 +++
 ryzom/client/src/interface_v3/item_info_waiter.h         | 2 +-
 ryzom/client/src/interface_v3/item_special_effect.cpp    | 3 +++
 ryzom/client/src/interface_v3/item_special_effect.h      | 3 +++
 ryzom/client/src/interface_v3/macrocmd_manager.cpp       | 2 +-
 ryzom/client/src/interface_v3/macrocmd_manager.h         | 2 +-
 ryzom/client/src/interface_v3/music_player.cpp           | 2 +-
 ryzom/client/src/interface_v3/music_player.h             | 2 +-
 ryzom/client/src/interface_v3/obs_huge_list.cpp          | 2 +-
 ryzom/client/src/interface_v3/obs_huge_list.h            | 2 +-
 ryzom/client/src/interface_v3/parser_modules.cpp         | 2 +-
 ryzom/client/src/interface_v3/parser_modules.h           | 2 +-
 ryzom/client/src/interface_v3/people_interraction.h      | 3 +++
 ryzom/client/src/interface_v3/people_list.cpp            | 2 +-
 ryzom/client/src/interface_v3/people_list.h              | 1 +
 .../src/interface_v3/register_interface_elements.cpp     | 2 +-
 ryzom/client/src/interface_v3/req_skill_formula.cpp      | 3 +++
 ryzom/client/src/interface_v3/req_skill_formula.h        | 3 +++
 ryzom/client/src/interface_v3/sbrick_manager.cpp         | 2 +-
 ryzom/client/src/interface_v3/sphrase_manager.cpp        | 2 +-
 ryzom/client/src/interface_v3/sphrase_manager.h          | 4 ++--
 ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp   | 1 +
 ryzom/client/src/interface_v3/view_radar.cpp             | 3 ++-
 ryzom/client/src/interface_v3/view_radar.h               | 2 +-
 ryzom/client/src/item_group_manager.cpp                  | 2 +-
 ryzom/client/src/light_cycle_manager.cpp                 | 2 +-
 ryzom/client/src/login_patch.cpp                         | 2 +-
 ryzom/client/src/login_patch.h                           | 3 +++
 ryzom/client/src/main_loop.cpp                           | 2 +-
 ryzom/client/src/main_loop_utilities.cpp                 | 2 +-
 ryzom/client/src/mesh_camera_col_manager.cpp             | 3 +++
 ryzom/client/src/misc.cpp                                | 3 ++-
 ryzom/client/src/misc.h                                  | 2 +-
 ryzom/client/src/outpost.cpp                             | 3 +++
 ryzom/client/src/pacs_client.cpp                         | 3 +++
 ryzom/client/src/player_r2_cl.cpp                        | 1 +
 ryzom/client/src/progress.h                              | 3 +++
 ryzom/client/src/r2/dmc/action_historic.cpp              | 1 +
 ryzom/client/src/r2/dmc/com_lua_module.cpp               | 2 +-
 ryzom/client/src/r2/editor.cpp                           | 2 +-
 ryzom/client/src/r2/instance.cpp                         | 1 +
 ryzom/client/src/r2/tool.cpp                             | 2 +-
 ryzom/client/src/r2/tool_draw_prim.cpp                   | 1 +
 ryzom/client/src/release.cpp                             | 4 ++--
 ryzom/client/src/release.h                               | 2 +-
 ryzom/client/src/sky.cpp                                 | 2 +-
 ryzom/client/src/streamable_ig.cpp                       | 2 +-
 ryzom/client/src/string_manager_client.cpp               | 3 +++
 ryzom/client/src/teleport.cpp                            | 3 +++
 ryzom/client/src/text_manager.cpp                        | 3 +++
 ryzom/client/src/text_manager.h                          | 3 +++
 ryzom/client/src/user_entity.h                           | 1 +
 ryzom/client/src/weather_manager_client.cpp              | 2 +-
 ryzom/client/src/weather_manager_client.h                | 2 +-
 ryzom/client/src/zone_util.cpp                           | 3 +++
 ryzom/common/src/game_share/bg_downloader_msg.cpp        | 3 +++
 ryzom/common/src/game_share/bg_downloader_msg.h          | 3 +++
 ryzom/common/src/game_share/character_summary.h          | 3 +++
 ryzom/common/src/game_share/character_title.h            | 3 +++
 ryzom/common/src/game_share/ecosystem.cpp                | 3 +++
 ryzom/common/src/game_share/fame.cpp                     | 2 +-
 ryzom/common/src/game_share/generic_xml_msg_mngr.cpp     | 1 +
 ryzom/common/src/game_share/generic_xml_msg_mngr.h       | 3 +++
 ryzom/common/src/game_share/guild_grade.cpp              | 3 +++
 ryzom/common/src/game_share/guild_grade_inline.h         | 3 +++
 ryzom/common/src/game_share/item_infos.h                 | 3 +++
 ryzom/common/src/game_share/mainland_summary.h           | 3 +++
 ryzom/common/src/game_share/msg_client_server.h          | 3 +++
 ryzom/common/src/game_share/people_pd.cpp                | 3 +++
 ryzom/common/src/game_share/people_pd_inline.h           | 3 +++
 ryzom/common/src/game_share/pvp_clan.cpp                 | 3 +++
 ryzom/common/src/game_share/sabrina_com.cpp              | 2 +-
 ryzom/common/src/game_share/sabrina_com.h                | 2 +-
 ryzom/common/src/game_share/season.cpp                   | 3 +++
 ryzom/common/src/game_share/season_inline.h              | 3 +++
 ryzom/common/src/game_share/server_edition_module.cpp    | 3 +++
 ryzom/common/src/game_share/sp_type.cpp                  | 3 +++
 ryzom/common/src/game_share/sp_type_inline.h             | 3 +++
 ryzom/common/src/game_share/sphrase_com.h                | 3 +++
 .../src/game_share/time_weather_season/time_and_season.h | 2 +-
 .../game_share/time_weather_season/weather_manager.cpp   | 3 +++
 .../time_weather_season/weather_setup_sheet_base.cpp     | 3 +++
 .../client/r2_islands_textures/screenshot_islands.cpp    | 2 +-
 .../tools/client/ryzom_installer/src/operationdialog.cpp | 2 +-
 ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp | 2 +-
 ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp     | 2 +-
 .../mission_compiler_fe/mission_compiler_feDlg.cpp       | 2 +-
 .../mission_compiler_lib/mission_compiler.cpp            | 2 +-
 .../leveldesign/mission_compiler_lib/step_content.cpp    | 1 +
 ryzom/tools/leveldesign/prim_export/main.cpp             | 2 +-
 ryzom/tools/leveldesign/uni_conv/uni_conv.cpp            | 3 +++
 .../tools/leveldesign/world_editor/land_export/main.cpp  | 2 +-
 .../leveldesign/world_editor/land_export_lib/export.cpp  | 2 +-
 .../leveldesign/world_editor/land_export_lib/export.h    | 2 +-
 .../world_editor/world_editor/dialog_properties.cpp      | 2 +-
 .../world_editor/world_editor/dialog_properties.h        | 3 +++
 .../world_editor/world_editor/imagelist_ex.cpp           | 2 +-
 .../leveldesign/world_editor/world_editor/name_dlg.cpp   | 2 +-
 .../world_editor_fauna_graph_plugin/plugin.cpp           | 3 +++
 .../world_editor_sound_plugin/sound_plugin.cpp           | 3 +++
 ryzom/tools/make_anim_by_race/main.cpp                   | 3 +++
 ryzom/tools/make_anim_melee_impact/main.cpp              | 3 +++
 ryzom/tools/patch_gen/patch_gen_common.cpp               | 2 +-
 ryzom/tools/pd_parser/parser.cpp                         | 2 +-
 .../build_world_packed_col/build_world_packed_col.cpp    | 2 +-
 ryzom/tools/server/build_world_packed_col/village.cpp    | 3 +++
 ryzom/tools/skill_extractor/skill_extractor.cpp          | 3 +++
 .../tools/translation_tools/extract_new_sheet_names.cpp  | 3 +++
 tool/attribution/annotate.py                             | 9 +++++++--
 396 files changed, 637 insertions(+), 285 deletions(-)

diff --git a/nel/include/nel/3d/async_file_manager_3d.h b/nel/include/nel/3d/async_file_manager_3d.h
index 3f43a01e3..fee82d74b 100644
--- a/nel/include/nel/3d/async_file_manager_3d.h
+++ b/nel/include/nel/3d/async_file_manager_3d.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/3d/computed_string.h b/nel/include/nel/3d/computed_string.h
index c0ae90578..fb1a5873c 100644
--- a/nel/include/nel/3d/computed_string.h
+++ b/nel/include/nel/3d/computed_string.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/font_generator.h b/nel/include/nel/3d/font_generator.h
index f79b3c109..c756ed2b4 100644
--- a/nel/include/nel/3d/font_generator.h
+++ b/nel/include/nel/3d/font_generator.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/font_manager.h b/nel/include/nel/3d/font_manager.h
index 620b2164f..fc6708256 100644
--- a/nel/include/nel/3d/font_manager.h
+++ b/nel/include/nel/3d/font_manager.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/text_context.h b/nel/include/nel/3d/text_context.h
index a8d4188a8..8ce97216d 100644
--- a/nel/include/nel/3d/text_context.h
+++ b/nel/include/nel/3d/text_context.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/text_context_user.h b/nel/include/nel/3d/text_context_user.h
index b673bfa8f..6be074090 100644
--- a/nel/include/nel/3d/text_context_user.h
+++ b/nel/include/nel/3d/text_context_user.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
index 61e92fa58..cacb8a6ac 100644
--- a/nel/include/nel/3d/texture_font.h
+++ b/nel/include/nel/3d/texture_font.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
index f7f833c47..b068a4b36 100644
--- a/nel/include/nel/3d/u_text_context.h
+++ b/nel/include/nel/3d/u_text_context.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/georges/form.h b/nel/include/nel/georges/form.h
index 732a45840..5a387bb6d 100644
--- a/nel/include/nel/georges/form.h
+++ b/nel/include/nel/georges/form.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/georges/form_elm.h b/nel/include/nel/georges/form_elm.h
index f94d9842c..9ad0df30f 100644
--- a/nel/include/nel/georges/form_elm.h
+++ b/nel/include/nel/georges/form_elm.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/action_handler.h b/nel/include/nel/gui/action_handler.h
index 5bdad89ba..5edcd3035 100644
--- a/nel/include/nel/gui/action_handler.h
+++ b/nel/include/nel/gui/action_handler.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/css_border_renderer.h b/nel/include/nel/gui/css_border_renderer.h
index 41ea3b7e6..1c5db47d4 100644
--- a/nel/include/nel/gui/css_border_renderer.h
+++ b/nel/include/nel/gui/css_border_renderer.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/css_parser.h b/nel/include/nel/gui/css_parser.h
index 360e70a8d..8b320bc4e 100644
--- a/nel/include/nel/gui/css_parser.h
+++ b/nel/include/nel/gui/css_parser.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/gui/css_selector.h b/nel/include/nel/gui/css_selector.h
index 3228869f3..c68369e8a 100644
--- a/nel/include/nel/gui/css_selector.h
+++ b/nel/include/nel/gui/css_selector.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 9e8ad4b0e..7a1d11ee5 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/css_types.h b/nel/include/nel/gui/css_types.h
index 9dd41de36..fd526858e 100644
--- a/nel/include/nel/gui/css_types.h
+++ b/nel/include/nel/gui/css_types.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/ctrl_base.h b/nel/include/nel/gui/ctrl_base.h
index 55983bfbb..e0a90736b 100644
--- a/nel/include/nel/gui/ctrl_base.h
+++ b/nel/include/nel/gui/ctrl_base.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/ctrl_scroll.h b/nel/include/nel/gui/ctrl_scroll.h
index 4052e6cea..02f814acf 100644
--- a/nel/include/nel/gui/ctrl_scroll.h
+++ b/nel/include/nel/gui/ctrl_scroll.h
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/ctrl_text_button.h b/nel/include/nel/gui/ctrl_text_button.h
index 98223a802..608035ba2 100644
--- a/nel/include/nel/gui/ctrl_text_button.h
+++ b/nel/include/nel/gui/ctrl_text_button.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/dbgroup_combo_box.h b/nel/include/nel/gui/dbgroup_combo_box.h
index 3826bf00f..93d6f4d4d 100644
--- a/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/nel/include/nel/gui/dbgroup_combo_box.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/event_descriptor.h b/nel/include/nel/gui/event_descriptor.h
index 69c90ff5d..41c99e101 100644
--- a/nel/include/nel/gui/event_descriptor.h
+++ b/nel/include/nel/gui/event_descriptor.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_container_base.h b/nel/include/nel/gui/group_container_base.h
index ab65b005b..7f99cac3c 100644
--- a/nel/include/nel/gui/group_container_base.h
+++ b/nel/include/nel/gui/group_container_base.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
index ebd9aeeaf..1f4f316fc 100644
--- a/nel/include/nel/gui/group_editbox.h
+++ b/nel/include/nel/gui/group_editbox.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index b37d80272..3c94e7fa9 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_paragraph.h b/nel/include/nel/gui/group_paragraph.h
index b05d4e12e..d08133b4b 100644
--- a/nel/include/nel/gui/group_paragraph.h
+++ b/nel/include/nel/gui/group_paragraph.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_scrolltext.h b/nel/include/nel/gui/group_scrolltext.h
index b9916aec8..5837761ae 100644
--- a/nel/include/nel/gui/group_scrolltext.h
+++ b/nel/include/nel/gui/group_scrolltext.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_table.h b/nel/include/nel/gui/group_table.h
index e23ea5af8..74f5ae18d 100644
--- a/nel/include/nel/gui/group_table.h
+++ b/nel/include/nel/gui/group_table.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/group_tree.h b/nel/include/nel/gui/group_tree.h
index 7a39ccfea..8c78cd4c5 100644
--- a/nel/include/nel/gui/group_tree.h
+++ b/nel/include/nel/gui/group_tree.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/html_element.h b/nel/include/nel/gui/html_element.h
index d96b00508..cc59d2126 100644
--- a/nel/include/nel/gui/html_element.h
+++ b/nel/include/nel/gui/html_element.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/html_parser.h b/nel/include/nel/gui/html_parser.h
index cf1392c0b..cfc066822 100644
--- a/nel/include/nel/gui/html_parser.h
+++ b/nel/include/nel/gui/html_parser.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/http_cache.h b/nel/include/nel/gui/http_cache.h
index 0921b2f64..a7f6c82b4 100644
--- a/nel/include/nel/gui/http_cache.h
+++ b/nel/include/nel/gui/http_cache.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/http_hsts.h b/nel/include/nel/gui/http_hsts.h
index 84adfc9fe..78a3b6514 100644
--- a/nel/include/nel/gui/http_hsts.h
+++ b/nel/include/nel/gui/http_hsts.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2018  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/gui/interface_element.h b/nel/include/nel/gui/interface_element.h
index 42fa1de2f..2aaccf3be 100644
--- a/nel/include/nel/gui/interface_element.h
+++ b/nel/include/nel/gui/interface_element.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/libwww.h b/nel/include/nel/gui/libwww.h
index 1f1e07902..df9c20cd8 100644
--- a/nel/include/nel/gui/libwww.h
+++ b/nel/include/nel/gui/libwww.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2015  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/lua_ihm.h b/nel/include/nel/gui/lua_ihm.h
index ec047e69a..c5625d55b 100644
--- a/nel/include/nel/gui/lua_ihm.h
+++ b/nel/include/nel/gui/lua_ihm.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/reflect.h b/nel/include/nel/gui/reflect.h
index 3f0b936a9..10c5907cb 100644
--- a/nel/include/nel/gui/reflect.h
+++ b/nel/include/nel/gui/reflect.h
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/url_parser.h b/nel/include/nel/gui/url_parser.h
index 758f1d340..6c59ee3c9 100644
--- a/nel/include/nel/gui/url_parser.h
+++ b/nel/include/nel/gui/url_parser.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/gui/view_bitmap.h b/nel/include/nel/gui/view_bitmap.h
index 3d41ae283..f7a77cb30 100644
--- a/nel/include/nel/gui/view_bitmap.h
+++ b/nel/include/nel/gui/view_bitmap.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/view_link.h b/nel/include/nel/gui/view_link.h
index 2b65fd120..a5eb2ac3d 100644
--- a/nel/include/nel/gui/view_link.h
+++ b/nel/include/nel/gui/view_link.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/view_renderer.h b/nel/include/nel/gui/view_renderer.h
index 4498a436a..35d806aab 100644
--- a/nel/include/nel/gui/view_renderer.h
+++ b/nel/include/nel/gui/view_renderer.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
index 3fb92f88c..cc92cf47d 100644
--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/gui/widget_manager.h b/nel/include/nel/gui/widget_manager.h
index dc1d75063..090bca02d 100644
--- a/nel/include/nel/gui/widget_manager.h
+++ b/nel/include/nel/gui/widget_manager.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/misc/base64.h b/nel/include/nel/misc/base64.h
index 2d61cf254..0bf01e8a3 100644
--- a/nel/include/nel/misc/base64.h
+++ b/nel/include/nel/misc/base64.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/bitmap.h b/nel/include/nel/misc/bitmap.h
index d726a4a94..1f691a859 100644
--- a/nel/include/nel/misc/bitmap.h
+++ b/nel/include/nel/misc/bitmap.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
index d9edc8e14..01817fa98 100644
--- a/nel/include/nel/misc/common.h
+++ b/nel/include/nel/misc/common.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/include/nel/misc/factory.h b/nel/include/nel/misc/factory.h
index 82da7ce7d..0da1e24f6 100644
--- a/nel/include/nel/misc/factory.h
+++ b/nel/include/nel/misc/factory.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/file.h b/nel/include/nel/misc/file.h
index 6f0584dd7..2d3912842 100644
--- a/nel/include/nel/misc/file.h
+++ b/nel/include/nel/misc/file.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/misc/fixed_size_allocator.h b/nel/include/nel/misc/fixed_size_allocator.h
index 1f49dfa68..9fcf4842a 100644
--- a/nel/include/nel/misc/fixed_size_allocator.h
+++ b/nel/include/nel/misc/fixed_size_allocator.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/path.h b/nel/include/nel/misc/path.h
index 6f3bb8fe1..668dc4582 100644
--- a/nel/include/nel/misc/path.h
+++ b/nel/include/nel/misc/path.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2015  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/misc/rgba.h b/nel/include/nel/misc/rgba.h
index 9f6ea6607..6d3fe189c 100644
--- a/nel/include/nel/misc/rgba.h
+++ b/nel/include/nel/misc/rgba.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/include/nel/misc/streamed_package.h b/nel/include/nel/misc/streamed_package.h
index 093f87a30..f4602caab 100644
--- a/nel/include/nel/misc/streamed_package.h
+++ b/nel/include/nel/misc/streamed_package.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2021  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/misc/win_event_emitter.h b/nel/include/nel/misc/win_event_emitter.h
index ee709ec04..91ee85175 100644
--- a/nel/include/nel/misc/win_event_emitter.h
+++ b/nel/include/nel/misc/win_event_emitter.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/misc/xml_macros.h b/nel/include/nel/misc/xml_macros.h
index d25cd4c30..d5c8efc93 100644
--- a/nel/include/nel/misc/xml_macros.h
+++ b/nel/include/nel/misc/xml_macros.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/include/nel/sound/audio_decoder.h b/nel/include/nel/sound/audio_decoder.h
index e40211896..b9f609b99 100644
--- a/nel/include/nel/sound/audio_decoder.h
+++ b/nel/include/nel/sound/audio_decoder.h
@@ -9,6 +9,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2008-2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2016  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/sound/audio_decoder_mp3.h b/nel/include/nel/sound/audio_decoder_mp3.h
index d67cf1eaa..52426c921 100644
--- a/nel/include/nel/sound/audio_decoder_mp3.h
+++ b/nel/include/nel/sound/audio_decoder_mp3.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2018  Winch Gate Property Limited
+// Copyright (C) 2018-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/sound/audio_decoder_vorbis.h b/nel/include/nel/sound/audio_decoder_vorbis.h
index cfb9faa69..c762a9170 100644
--- a/nel/include/nel/sound/audio_decoder_vorbis.h
+++ b/nel/include/nel/sound/audio_decoder_vorbis.h
@@ -10,6 +10,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2008-2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2016  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/sound/audio_mixer_user.h b/nel/include/nel/sound/audio_mixer_user.h
index d0f6f1d82..a58075e0e 100644
--- a/nel/include/nel/sound/audio_mixer_user.h
+++ b/nel/include/nel/sound/audio_mixer_user.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/include/nel/sound/driver/sound_driver.h b/nel/include/nel/sound/driver/sound_driver.h
index 9c758487a..ebe904cb8 100644
--- a/nel/include/nel/sound/driver/sound_driver.h
+++ b/nel/include/nel/sound/driver/sound_driver.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/include/nel/sound/stream_file_source.h b/nel/include/nel/sound/stream_file_source.h
index 1ade68572..2d4818484 100644
--- a/nel/include/nel/sound/stream_file_source.h
+++ b/nel/include/nel/sound/stream_file_source.h
@@ -9,6 +9,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2018  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/include/nel/sound/u_audio_mixer.h b/nel/include/nel/sound/u_audio_mixer.h
index 311f69516..84257e8ce 100644
--- a/nel/include/nel/sound/u_audio_mixer.h
+++ b/nel/include/nel/sound/u_audio_mixer.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/include/nel/web/curl_certificates.h b/nel/include/nel/web/curl_certificates.h
index bfb230f01..9c5befdb5 100644
--- a/nel/include/nel/web/curl_certificates.h
+++ b/nel/include/nel/web/curl_certificates.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/samples/3d/font/main.cpp b/nel/samples/3d/font/main.cpp
index 1d5eaa114..8486e347b 100644
--- a/nel/samples/3d/font/main.cpp
+++ b/nel/samples/3d/font/main.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/samples/3d/font_perf/main.cpp b/nel/samples/3d/font_perf/main.cpp
index d183d3fa8..7e57a755b 100644
--- a/nel/samples/3d/font_perf/main.cpp
+++ b/nel/samples/3d/font_perf/main.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2020  Winch Gate Property Limited
+// Copyright (C) 2020-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/animation_set.cpp b/nel/src/3d/animation_set.cpp
index 462587b09..a3b210fed 100644
--- a/nel/src/3d/animation_set.cpp
+++ b/nel/src/3d/animation_set.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/async_texture_manager.cpp b/nel/src/3d/async_texture_manager.cpp
index 22c4969ea..77cc47f89 100644
--- a/nel/src/3d/async_texture_manager.cpp
+++ b/nel/src/3d/async_texture_manager.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/coarse_mesh_build.cpp b/nel/src/3d/coarse_mesh_build.cpp
index e89c8da8d..f3ef5b85c 100644
--- a/nel/src/3d/coarse_mesh_build.cpp
+++ b/nel/src/3d/coarse_mesh_build.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/driver.cpp b/nel/src/3d/driver.cpp
index 71600d3c9..0dd9f7617 100644
--- a/nel/src/3d/driver.cpp
+++ b/nel/src/3d/driver.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index f8a678957..f201455af 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d.h b/nel/src/3d/driver/direct3d/driver_direct3d.h
index 9a434cab2..eed6c222d 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d.h
+++ b/nel/src/3d/driver/direct3d/driver_direct3d.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
index d5b4ef482..a18bb3a6e 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl.cpp b/nel/src/3d/driver/opengl/driver_opengl.cpp
index 6fe9ae7c4..1d20edd27 100644
--- a/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -1,9 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl.h b/nel/src/3d/driver/opengl/driver_opengl.h
index 5be157403..4941a98d1 100644
--- a/nel/src/3d/driver/opengl/driver_opengl.h
+++ b/nel/src/3d/driver/opengl/driver_opengl.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index ff5252c61..f1967836e 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp b/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
index 3ede88b41..685a94aa1 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/nel/src/3d/driver/opengl/driver_opengl_material.cpp
index 4dbe0226a..e27e66e0f 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_material.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_material.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index 163f64843..06f95c38c 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h b/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
index 1e9881b47..87963266b 100644
--- a/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
+++ b/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
index 8cc24c4b6..96a5945f3 100644
--- a/nel/src/3d/font_generator.cpp
+++ b/nel/src/3d/font_generator.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
index a2f0f6cb2..43f0e44ac 100644
--- a/nel/src/3d/font_manager.cpp
+++ b/nel/src/3d/font_manager.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/hls_texture_bank.cpp b/nel/src/3d/hls_texture_bank.cpp
index 9077f1638..9c014bd28 100644
--- a/nel/src/3d/hls_texture_bank.cpp
+++ b/nel/src/3d/hls_texture_bank.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2010  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/hls_texture_manager.cpp b/nel/src/3d/hls_texture_manager.cpp
index 3f585eb6b..59020646a 100644
--- a/nel/src/3d/hls_texture_manager.cpp
+++ b/nel/src/3d/hls_texture_manager.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/instance_lighter.cpp b/nel/src/3d/instance_lighter.cpp
index a08a0a38f..3b1887bb4 100644
--- a/nel/src/3d/instance_lighter.cpp
+++ b/nel/src/3d/instance_lighter.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/landscapeig_manager.cpp b/nel/src/3d/landscapeig_manager.cpp
index 78154deda..1d56a4785 100644
--- a/nel/src/3d/landscapeig_manager.cpp
+++ b/nel/src/3d/landscapeig_manager.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/meshvp_wind_tree.cpp b/nel/src/3d/meshvp_wind_tree.cpp
index 5e9fdfdcd..55b39ce8b 100644
--- a/nel/src/3d/meshvp_wind_tree.cpp
+++ b/nel/src/3d/meshvp_wind_tree.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/ps_util.cpp b/nel/src/3d/ps_util.cpp
index b25f10e10..efeaf2125 100644
--- a/nel/src/3d/ps_util.cpp
+++ b/nel/src/3d/ps_util.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/scene_group.cpp b/nel/src/3d/scene_group.cpp
index 131f5feaf..4867209e7 100644
--- a/nel/src/3d/scene_group.cpp
+++ b/nel/src/3d/scene_group.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/shape_info.cpp b/nel/src/3d/shape_info.cpp
index 4385b044e..71ac3f7dc 100644
--- a/nel/src/3d/shape_info.cpp
+++ b/nel/src/3d/shape_info.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/text_context.cpp b/nel/src/3d/text_context.cpp
index 4549622da..1399ac31c 100644
--- a/nel/src/3d/text_context.cpp
+++ b/nel/src/3d/text_context.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
index 01bfe21df..bdd1e4a51 100644
--- a/nel/src/3d/text_context_user.cpp
+++ b/nel/src/3d/text_context_user.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/3d/texture_file.cpp b/nel/src/3d/texture_file.cpp
index 58f2f333f..859eacbb3 100644
--- a/nel/src/3d/texture_file.cpp
+++ b/nel/src/3d/texture_file.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/3d/texture_font.cpp b/nel/src/3d/texture_font.cpp
index 9aa08ca15..58be439c3 100644
--- a/nel/src/3d/texture_font.cpp
+++ b/nel/src/3d/texture_font.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/tile_bank.cpp b/nel/src/3d/tile_bank.cpp
index 9ba3ca756..c8c232ecf 100644
--- a/nel/src/3d/tile_bank.cpp
+++ b/nel/src/3d/tile_bank.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2010  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/3d/zone_lighter.cpp b/nel/src/3d/zone_lighter.cpp
index 0ba8c2b95..55019259d 100644
--- a/nel/src/3d/zone_lighter.cpp
+++ b/nel/src/3d/zone_lighter.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/georges/form_dfn.cpp b/nel/src/georges/form_dfn.cpp
index 628077579..82f4dc1db 100644
--- a/nel/src/georges/form_dfn.cpp
+++ b/nel/src/georges/form_dfn.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/georges/form_elm.cpp b/nel/src/georges/form_elm.cpp
index 358b45f65..3dac9b5a0 100644
--- a/nel/src/georges/form_elm.cpp
+++ b/nel/src/georges/form_elm.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/georges/form_loader.cpp b/nel/src/georges/form_loader.cpp
index e757fb9d0..7a56f7bf9 100644
--- a/nel/src/georges/form_loader.cpp
+++ b/nel/src/georges/form_loader.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
index 601175361..873461586 100644
--- a/nel/src/gui/action_handler.cpp
+++ b/nel/src/gui/action_handler.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/css_border_renderer.cpp b/nel/src/gui/css_border_renderer.cpp
index a7002cd9a..e41d11857 100644
--- a/nel/src/gui/css_border_renderer.cpp
+++ b/nel/src/gui/css_border_renderer.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index b3e3861bb..d4980784a 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/gui/css_selector.cpp b/nel/src/gui/css_selector.cpp
index dfc01b855..16b7cec33 100644
--- a/nel/src/gui/css_selector.cpp
+++ b/nel/src/gui/css_selector.cpp
@@ -1,5 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index 3ff9744bc..01bd812f1 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -1,5 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_base_button.cpp b/nel/src/gui/ctrl_base_button.cpp
index 68aa19f15..f306c8b52 100644
--- a/nel/src/gui/ctrl_base_button.cpp
+++ b/nel/src/gui/ctrl_base_button.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_button.cpp b/nel/src/gui/ctrl_button.cpp
index cc38e50e4..15bf33897 100644
--- a/nel/src/gui/ctrl_button.cpp
+++ b/nel/src/gui/ctrl_button.cpp
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_col_pick.cpp b/nel/src/gui/ctrl_col_pick.cpp
index 251c655c2..7daeb1591 100644
--- a/nel/src/gui/ctrl_col_pick.cpp
+++ b/nel/src/gui/ctrl_col_pick.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/ctrl_scroll.cpp b/nel/src/gui/ctrl_scroll.cpp
index 00f089660..28d7f2fed 100644
--- a/nel/src/gui/ctrl_scroll.cpp
+++ b/nel/src/gui/ctrl_scroll.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
index 8697fb212..a986a5cb3 100644
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
index 9adffab86..8fe7f8a65 100644
--- a/nel/src/gui/dbgroup_combo_box.cpp
+++ b/nel/src/gui/dbgroup_combo_box.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
index 9047fbfcb..916e95b13 100644
--- a/nel/src/gui/group_container.cpp
+++ b/nel/src/gui/group_container.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
index 563a27312..1410e2cb1 100644
--- a/nel/src/gui/group_editbox.cpp
+++ b/nel/src/gui/group_editbox.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index eb75c1481..6eeecfdb9 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
index b21784836..8f7336d28 100644
--- a/nel/src/gui/group_list.cpp
+++ b/nel/src/gui/group_list.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
index 623975b98..3317a0dea 100644
--- a/nel/src/gui/group_paragraph.cpp
+++ b/nel/src/gui/group_paragraph.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_scrolltext.cpp b/nel/src/gui/group_scrolltext.cpp
index c456a4dd4..8f6b471bc 100644
--- a/nel/src/gui/group_scrolltext.cpp
+++ b/nel/src/gui/group_scrolltext.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_table.cpp b/nel/src/gui/group_table.cpp
index 4b63903e4..2144d0020 100644
--- a/nel/src/gui/group_table.cpp
+++ b/nel/src/gui/group_table.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
index 44636f1d6..2fecc005d 100644
--- a/nel/src/gui/group_tree.cpp
+++ b/nel/src/gui/group_tree.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/html_element.cpp b/nel/src/gui/html_element.cpp
index f0bb76482..8eb706cc9 100644
--- a/nel/src/gui/html_element.cpp
+++ b/nel/src/gui/html_element.cpp
@@ -1,5 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
index b8eb0176b..2425d7f95 100644
--- a/nel/src/gui/html_parser.cpp
+++ b/nel/src/gui/html_parser.cpp
@@ -1,5 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/http_cache.cpp b/nel/src/gui/http_cache.cpp
index a032247fc..245ffbe20 100644
--- a/nel/src/gui/http_cache.cpp
+++ b/nel/src/gui/http_cache.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/http_hsts.cpp b/nel/src/gui/http_hsts.cpp
index e5a13e26a..2befe7932 100644
--- a/nel/src/gui/http_hsts.cpp
+++ b/nel/src/gui/http_hsts.cpp
@@ -1,8 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2018  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2018-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_anim.cpp b/nel/src/gui/interface_anim.cpp
index d23c69330..36a5d82f4 100644
--- a/nel/src/gui/interface_anim.cpp
+++ b/nel/src/gui/interface_anim.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_element.cpp b/nel/src/gui/interface_element.cpp
index bc5da4e03..d94c5fed4 100644
--- a/nel/src/gui/interface_element.cpp
+++ b/nel/src/gui/interface_element.cpp
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_group.cpp b/nel/src/gui/interface_group.cpp
index 703070d82..87504cf24 100644
--- a/nel/src/gui/interface_group.cpp
+++ b/nel/src/gui/interface_group.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/interface_options.cpp b/nel/src/gui/interface_options.cpp
index 172e6ab41..27b7ebbb5 100644
--- a/nel/src/gui/interface_options.cpp
+++ b/nel/src/gui/interface_options.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/interface_parser.cpp b/nel/src/gui/interface_parser.cpp
index afb5c3d4d..eab381d22 100644
--- a/nel/src/gui/interface_parser.cpp
+++ b/nel/src/gui/interface_parser.cpp
@@ -1,9 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
index 8ebb1eaa1..362dce8e2 100644
--- a/nel/src/gui/libwww.cpp
+++ b/nel/src/gui/libwww.cpp
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/stdpch.h b/nel/src/gui/stdpch.h
index 9a2586a2b..4b4a1a99e 100644
--- a/nel/src/gui/stdpch.h
+++ b/nel/src/gui/stdpch.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/gui/url_parser.cpp b/nel/src/gui/url_parser.cpp
index f965b05b3..b009221df 100644
--- a/nel/src/gui/url_parser.cpp
+++ b/nel/src/gui/url_parser.cpp
@@ -1,5 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/gui/view_bitmap.cpp b/nel/src/gui/view_bitmap.cpp
index 8922d5c4e..4186a4362 100644
--- a/nel/src/gui/view_bitmap.cpp
+++ b/nel/src/gui/view_bitmap.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 76e064dfd..796479e82 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
index 510567d8e..89f31d40d 100644
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
index df4f5d706..c052f4c18 100644
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/ligo/primitive_class.cpp b/nel/src/ligo/primitive_class.cpp
index 9386ca6b9..29203aa13 100644
--- a/nel/src/ligo/primitive_class.cpp
+++ b/nel/src/ligo/primitive_class.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/ligo/primitive_configuration.cpp b/nel/src/ligo/primitive_configuration.cpp
index d85d626eb..f73e5acb6 100644
--- a/nel/src/ligo/primitive_configuration.cpp
+++ b/nel/src/ligo/primitive_configuration.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/app_context.cpp b/nel/src/misc/app_context.cpp
index fc8c64e5f..df105244d 100644
--- a/nel/src/misc/app_context.cpp
+++ b/nel/src/misc/app_context.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/bitmap.cpp b/nel/src/misc/bitmap.cpp
index ee6a0e69e..59360adb6 100644
--- a/nel/src/misc/bitmap.cpp
+++ b/nel/src/misc/bitmap.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/misc/bitmap_gif.cpp b/nel/src/misc/bitmap_gif.cpp
index 653942d08..3ca98593c 100644
--- a/nel/src/misc/bitmap_gif.cpp
+++ b/nel/src/misc/bitmap_gif.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/command.cpp b/nel/src/misc/command.cpp
index d6afbcd84..0f9d84c29 100644
--- a/nel/src/misc/command.cpp
+++ b/nel/src/misc/command.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
index df802e20d..7e2c775d8 100644
--- a/nel/src/misc/common.cpp
+++ b/nel/src/misc/common.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/misc/file.cpp b/nel/src/misc/file.cpp
index 138e85c88..dc0863c63 100644
--- a/nel/src/misc/file.cpp
+++ b/nel/src/misc/file.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/misc/fixed_size_allocator.cpp b/nel/src/misc/fixed_size_allocator.cpp
index 6784aff66..b397046bc 100644
--- a/nel/src/misc/fixed_size_allocator.cpp
+++ b/nel/src/misc/fixed_size_allocator.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
index ffa27d193..ce787b196 100644
--- a/nel/src/misc/path.cpp
+++ b/nel/src/misc/path.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/misc/rgba.cpp b/nel/src/misc/rgba.cpp
index d7eb00dce..4db5846bc 100644
--- a/nel/src/misc/rgba.cpp
+++ b/nel/src/misc/rgba.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/misc/sheet_id.cpp b/nel/src/misc/sheet_id.cpp
index f84b4afb7..ab7d0d254 100644
--- a/nel/src/misc/sheet_id.cpp
+++ b/nel/src/misc/sheet_id.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/streamed_package.cpp b/nel/src/misc/streamed_package.cpp
index ad013cccf..66b13c429 100644
--- a/nel/src/misc/streamed_package.cpp
+++ b/nel/src/misc/streamed_package.cpp
@@ -1,5 +1,8 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2021  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/misc/streamed_package_manager.cpp b/nel/src/misc/streamed_package_manager.cpp
index aa36a8ec6..d7eecd85e 100644
--- a/nel/src/misc/streamed_package_manager.cpp
+++ b/nel/src/misc/streamed_package_manager.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/net/email.cpp b/nel/src/net/email.cpp
index 8d2854125..0521da12d 100644
--- a/nel/src/net/email.cpp
+++ b/nel/src/net/email.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/net/service.cpp b/nel/src/net/service.cpp
index 0f679fa84..f5af03236 100644
--- a/nel/src/net/service.cpp
+++ b/nel/src/net/service.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2016-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/audio_decoder.cpp b/nel/src/sound/audio_decoder.cpp
index 4f264ccaf..2f6f1508a 100644
--- a/nel/src/sound/audio_decoder.cpp
+++ b/nel/src/sound/audio_decoder.cpp
@@ -9,6 +9,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2016-2020  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/sound/audio_decoder_ffmpeg.cpp b/nel/src/sound/audio_decoder_ffmpeg.cpp
index 158c0ddc3..a0389e2e7 100644
--- a/nel/src/sound/audio_decoder_ffmpeg.cpp
+++ b/nel/src/sound/audio_decoder_ffmpeg.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2018  Winch Gate Property Limited
+// Copyright (C) 2018-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/audio_decoder_mp3.cpp b/nel/src/sound/audio_decoder_mp3.cpp
index 9785b7944..f19da18c8 100644
--- a/nel/src/sound/audio_decoder_mp3.cpp
+++ b/nel/src/sound/audio_decoder_mp3.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2018  Winch Gate Property Limited
+// Copyright (C) 2018-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/sound/audio_decoder_vorbis.cpp b/nel/src/sound/audio_decoder_vorbis.cpp
index 097a791f7..45a8da7f6 100644
--- a/nel/src/sound/audio_decoder_vorbis.cpp
+++ b/nel/src/sound/audio_decoder_vorbis.cpp
@@ -9,6 +9,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2008-2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2016  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/sound/audio_mixer_user.cpp b/nel/src/sound/audio_mixer_user.cpp
index 3f6a5dcbe..d6098e6a9 100644
--- a/nel/src/sound/audio_mixer_user.cpp
+++ b/nel/src/sound/audio_mixer_user.cpp
@@ -1,9 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2012-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/complex_source.cpp b/nel/src/sound/complex_source.cpp
index 224cb7374..6160b0bfe 100644
--- a/nel/src/sound/complex_source.cpp
+++ b/nel/src/sound/complex_source.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
index 2b250a1d3..a473b5bd9 100644
--- a/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
+++ b/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/driver/fmod/sound_driver_fmod.h b/nel/src/sound/driver/fmod/sound_driver_fmod.h
index 73d3b8673..b486b74cc 100644
--- a/nel/src/sound/driver/fmod/sound_driver_fmod.h
+++ b/nel/src/sound/driver/fmod/sound_driver_fmod.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/driver/openal/source_al.cpp b/nel/src/sound/driver/openal/source_al.cpp
index fa3908f10..f0cf670b7 100644
--- a/nel/src/sound/driver/openal/source_al.cpp
+++ b/nel/src/sound/driver/openal/source_al.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
index fa4213386..3110c174c 100644
--- a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
+++ b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2008-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2008-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/group_controller_root.cpp b/nel/src/sound/group_controller_root.cpp
index a32f87d78..5a4ea4db5 100644
--- a/nel/src/sound/group_controller_root.cpp
+++ b/nel/src/sound/group_controller_root.cpp
@@ -7,7 +7,7 @@
  */
 
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/sound/sample_bank_manager.cpp b/nel/src/sound/sample_bank_manager.cpp
index 50104296f..bb4f680b7 100644
--- a/nel/src/sound/sample_bank_manager.cpp
+++ b/nel/src/sound/sample_bank_manager.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/nel/src/sound/stream_file_source.cpp b/nel/src/sound/stream_file_source.cpp
index a7b45b948..bd547eda4 100644
--- a/nel/src/sound/stream_file_source.cpp
+++ b/nel/src/sound/stream_file_source.cpp
@@ -9,6 +9,9 @@
 // NeL - MMORPG Framework <https://wiki.ryzom.dev/>
 // Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2018  Winch Gate Property Limited
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/src/sound/stream_source.cpp b/nel/src/sound/stream_source.cpp
index 3e6216df2..fc8db8dd4 100644
--- a/nel/src/sound/stream_source.cpp
+++ b/nel/src/sound/stream_source.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
+// Copyright (C) 2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/web/curl_certificates.cpp b/nel/src/web/curl_certificates.cpp
index ac88792bb..fdf69604f 100644
--- a/nel/src/web/curl_certificates.cpp
+++ b/nel/src/web/curl_certificates.cpp
@@ -1,8 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/src/web/http_client_curl.cpp b/nel/src/web/http_client_curl.cpp
index b62300089..b0ea66de3 100644
--- a/nel/src/web/http_client_curl.cpp
+++ b/nel/src/web/http_client_curl.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/web/stdweb.cpp b/nel/src/web/stdweb.cpp
index c53564266..4ac8d7579 100644
--- a/nel/src/web/stdweb.cpp
+++ b/nel/src/web/stdweb.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/tools/3d/build_clodtex/main.cpp b/nel/tools/3d/build_clodtex/main.cpp
index 86387379a..5b7a89ab7 100644
--- a/nel/tools/3d/build_clodtex/main.cpp
+++ b/nel/tools/3d/build_clodtex/main.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/build_interface/main.cpp b/nel/tools/3d/build_interface/main.cpp
index c629e6a33..1d3c518b9 100644
--- a/nel/tools/3d/build_interface/main.cpp
+++ b/nel/tools/3d/build_interface/main.cpp
@@ -1,5 +1,8 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp
index 65de8fb82..3d4d9ad6a 100644
--- a/nel/tools/3d/ig_elevation/main.cpp
+++ b/nel/tools/3d/ig_elevation/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/ig_info/ig_info.cpp b/nel/tools/3d/ig_info/ig_info.cpp
index 326d51ac2..f88eae972 100644
--- a/nel/tools/3d/ig_info/ig_info.cpp
+++ b/nel/tools/3d/ig_info/ig_info.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
index 2c88f87a6..c79aec20a 100644
--- a/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
+++ b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/lightmap_optimizer/main.cpp b/nel/tools/3d/lightmap_optimizer/main.cpp
index 35e764cf3..84e661a0a 100644
--- a/nel/tools/3d/lightmap_optimizer/main.cpp
+++ b/nel/tools/3d/lightmap_optimizer/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/object_viewer/object_viewer.cpp b/nel/tools/3d/object_viewer/object_viewer.cpp
index 0b78373a1..e431430b6 100644
--- a/nel/tools/3d/object_viewer/object_viewer.cpp
+++ b/nel/tools/3d/object_viewer/object_viewer.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
index 33533b28a..ded81bdcd 100644
--- a/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
+++ b/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/panoply_maker/panoply_maker.cpp b/nel/tools/3d/panoply_maker/panoply_maker.cpp
index 3819fb8ba..46081a69d 100644
--- a/nel/tools/3d/panoply_maker/panoply_maker.cpp
+++ b/nel/tools/3d/panoply_maker/panoply_maker.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2010  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
index 7fc5c4e85..8fe46d672 100644
--- a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
+++ b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
index a017ce03c..804a45b07 100644
--- a/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
+++ b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/shape2obj/main.cpp b/nel/tools/3d/shape2obj/main.cpp
index 6268a9aaa..d956392bf 100644
--- a/nel/tools/3d/shape2obj/main.cpp
+++ b/nel/tools/3d/shape2obj/main.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/shapes_exporter/main.cpp b/nel/tools/3d/shapes_exporter/main.cpp
index fd9b0ab81..a1a1ddfc8 100644
--- a/nel/tools/3d/shapes_exporter/main.cpp
+++ b/nel/tools/3d/shapes_exporter/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/textures_optimizer/main.cpp b/nel/tools/3d/textures_optimizer/main.cpp
index 890a0c8d8..3c3292e45 100644
--- a/nel/tools/3d/textures_optimizer/main.cpp
+++ b/nel/tools/3d/textures_optimizer/main.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/3d/tga_2_dds/tga2dds.cpp b/nel/tools/3d/tga_2_dds/tga2dds.cpp
index 60de2a073..48c10452f 100644
--- a/nel/tools/3d/tga_2_dds/tga2dds.cpp
+++ b/nel/tools/3d/tga_2_dds/tga2dds.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2010-2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/zone_dependencies/zone_dependencies.cpp b/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
index b8b0c1c9e..b4d99c3a6 100644
--- a/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
+++ b/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/zone_elevation/zone_elevation.cpp b/nel/tools/3d/zone_elevation/zone_elevation.cpp
index fe583a87d..ce6415c01 100644
--- a/nel/tools/3d/zone_elevation/zone_elevation.cpp
+++ b/nel/tools/3d/zone_elevation/zone_elevation.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp b/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
index d09267002..7f1f74c4f 100644
--- a/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
+++ b/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/3d/zone_lighter/zone_lighter.cpp b/nel/tools/3d/zone_lighter/zone_lighter.cpp
index 35127abbe..20a8ddc0e 100644
--- a/nel/tools/3d/zone_lighter/zone_lighter.cpp
+++ b/nel/tools/3d/zone_lighter/zone_lighter.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/georges/georges2csv/georges2csv.cpp b/nel/tools/georges/georges2csv/georges2csv.cpp
index 0105aa1ad..d201229da 100644
--- a/nel/tools/georges/georges2csv/georges2csv.cpp
+++ b/nel/tools/georges/georges2csv/georges2csv.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
index 3c6612a10..83e25eb69 100644
--- a/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
+++ b/nel/tools/ligo/unbuild_flora/unbuild_flora.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/ligo/unbuild_land/unbuild_land.cpp b/nel/tools/ligo/unbuild_land/unbuild_land.cpp
index a9f5dcd54..534f01a12 100644
--- a/nel/tools/ligo/unbuild_land/unbuild_land.cpp
+++ b/nel/tools/ligo/unbuild_land/unbuild_land.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/misc/bnp_make/main.cpp b/nel/tools/misc/bnp_make/main.cpp
index 0bda1770e..823962f59 100644
--- a/nel/tools/misc/bnp_make/main.cpp
+++ b/nel/tools/misc/bnp_make/main.cpp
@@ -1,5 +1,8 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
+//
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/misc/data_mirror/data_mirror.cpp b/nel/tools/misc/data_mirror/data_mirror.cpp
index f4d54a1dc..6ae79994e 100644
--- a/nel/tools/misc/data_mirror/data_mirror.cpp
+++ b/nel/tools/misc/data_mirror/data_mirror.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/misc/data_mirror/data_mirrorDlg.cpp b/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
index 9fdaf7061..0f5e33041 100644
--- a/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
+++ b/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/misc/extract_filename/extract_filename.cpp b/nel/tools/misc/extract_filename/extract_filename.cpp
index e22fd8243..3dbf05b8d 100644
--- a/nel/tools/misc/extract_filename/extract_filename.cpp
+++ b/nel/tools/misc/extract_filename/extract_filename.cpp
@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
index db024ba38..3bf7db43c 100644
--- a/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
+++ b/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/misc/snp_make/main.cpp b/nel/tools/misc/snp_make/main.cpp
index d98992181..3cadfec6e 100644
--- a/nel/tools/misc/snp_make/main.cpp
+++ b/nel/tools/misc/snp_make/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/nel_unit_test/ut_misc.h b/nel/tools/nel_unit_test/ut_misc.h
index aef1e4c90..97bc0d410 100644
--- a/nel/tools/nel_unit_test/ut_misc.h
+++ b/nel/tools/nel_unit_test/ut_misc.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/nel_unit_test/ut_misc_base64.h b/nel/tools/nel_unit_test/ut_misc_base64.h
index 84ddfcefc..ff5d24c4c 100644
--- a/nel/tools/nel_unit_test/ut_misc_base64.h
+++ b/nel/tools/nel_unit_test/ut_misc_base64.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/nel_unit_test/ut_misc_common.h b/nel/tools/nel_unit_test/ut_misc_common.h
index 8a7aab150..b21fa22f3 100644
--- a/nel/tools/nel_unit_test/ut_misc_common.h
+++ b/nel/tools/nel_unit_test/ut_misc_common.h
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/nel/tools/pacs/build_rbank/prim_checker.cpp b/nel/tools/pacs/build_rbank/prim_checker.cpp
index effd07bd7..f8e14b88a 100644
--- a/nel/tools/pacs/build_rbank/prim_checker.cpp
+++ b/nel/tools/pacs/build_rbank/prim_checker.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/animation_fx.cpp b/ryzom/client/src/animation_fx.cpp
index b87464cb3..0ab586a92 100644
--- a/ryzom/client/src/animation_fx.cpp
+++ b/ryzom/client/src/animation_fx.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/auto_anim.cpp b/ryzom/client/src/auto_anim.cpp
index 71b6116ea..97efb324e 100644
--- a/ryzom/client/src/auto_anim.cpp
+++ b/ryzom/client/src/auto_anim.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/bg_downloader_access.h b/ryzom/client/src/bg_downloader_access.h
index 5b4e7094b..00bc4cd05 100644
--- a/ryzom/client/src/bg_downloader_access.h
+++ b/ryzom/client/src/bg_downloader_access.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/candidate.h b/ryzom/client/src/candidate.h
index ee169f77d..7b33cdabe 100644
--- a/ryzom/client/src/candidate.h
+++ b/ryzom/client/src/candidate.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client.cpp b/ryzom/client/src/client.cpp
index 84abb8cd4..5fb236ad9 100644
--- a/ryzom/client/src/client.cpp
+++ b/ryzom/client/src/client.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
-// Copyright (C) 2015-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index 8e46e028a..db38c1177 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h
index 47c32d003..28d42a45d 100644
--- a/ryzom/client/src/client_cfg.h
+++ b/ryzom/client/src/client_cfg.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/ryzom/client/src/client_chat_manager.h b/ryzom/client/src/client_chat_manager.h
index 014481c0f..2cdc44c24 100644
--- a/ryzom/client/src/client_chat_manager.h
+++ b/ryzom/client/src/client_chat_manager.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
index 2d9c9564d..c7a3bd6bd 100644
--- a/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
+++ b/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
index 0f741c1a2..8c54bc9fd 100644
--- a/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
+++ b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client_sheets/player_sheet.cpp b/ryzom/client/src/client_sheets/player_sheet.cpp
index 03bddd9dd..999b683c6 100644
--- a/ryzom/client/src/client_sheets/player_sheet.cpp
+++ b/ryzom/client/src/client_sheets/player_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
index 5c2584cfc..edbd5a8b4 100644
--- a/ryzom/client/src/client_sheets/sbrick_sheet.cpp
+++ b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/color_slot_manager.cpp b/ryzom/client/src/color_slot_manager.cpp
index 87b7815bf..254cfb43e 100644
--- a/ryzom/client/src/color_slot_manager.cpp
+++ b/ryzom/client/src/color_slot_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/commands.h b/ryzom/client/src/commands.h
index 2d724f289..0d77b38cc 100644
--- a/ryzom/client/src/commands.h
+++ b/ryzom/client/src/commands.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/connection.h b/ryzom/client/src/connection.h
index 7c81b0c80..931c04751 100644
--- a/ryzom/client/src/connection.h
+++ b/ryzom/client/src/connection.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/contextual_cursor.h b/ryzom/client/src/contextual_cursor.h
index 31ba7a3c5..93eb1509f 100644
--- a/ryzom/client/src/contextual_cursor.h
+++ b/ryzom/client/src/contextual_cursor.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/continent.h b/ryzom/client/src/continent.h
index f48b4b043..96417160a 100644
--- a/ryzom/client/src/continent.h
+++ b/ryzom/client/src/continent.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/continent_manager.cpp b/ryzom/client/src/continent_manager.cpp
index 7148dfcd9..3001eac34 100644
--- a/ryzom/client/src/continent_manager.cpp
+++ b/ryzom/client/src/continent_manager.cpp
@@ -1,9 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/continent_manager.h b/ryzom/client/src/continent_manager.h
index 1a0641627..4e6d0774c 100644
--- a/ryzom/client/src/continent_manager.h
+++ b/ryzom/client/src/continent_manager.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/continent_manager_build.h b/ryzom/client/src/continent_manager_build.h
index b8d7a7e82..9a86ea00f 100644
--- a/ryzom/client/src/continent_manager_build.h
+++ b/ryzom/client/src/continent_manager_build.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/cursor_functions.cpp b/ryzom/client/src/cursor_functions.cpp
index 0354e11f8..17bef41f5 100644
--- a/ryzom/client/src/cursor_functions.cpp
+++ b/ryzom/client/src/cursor_functions.cpp
@@ -3,8 +3,8 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/decal.cpp b/ryzom/client/src/decal.cpp
index a16cb93bf..24e3e756b 100644
--- a/ryzom/client/src/decal.cpp
+++ b/ryzom/client/src/decal.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/door_manager.cpp b/ryzom/client/src/door_manager.cpp
index 24641f9e0..1b094ad7b 100644
--- a/ryzom/client/src/door_manager.cpp
+++ b/ryzom/client/src/door_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
index 7743cb02e..6a64ea449 100644
--- a/ryzom/client/src/entities.cpp
+++ b/ryzom/client/src/entities.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/entities.h b/ryzom/client/src/entities.h
index d6d286ced..d7a0c34c5 100644
--- a/ryzom/client/src/entities.h
+++ b/ryzom/client/src/entities.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/entity_animation_manager.cpp b/ryzom/client/src/entity_animation_manager.cpp
index 51bc5304a..c2bcb28d8 100644
--- a/ryzom/client/src/entity_animation_manager.cpp
+++ b/ryzom/client/src/entity_animation_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
index 8f96cb96b..9b7ca340e 100644
--- a/ryzom/client/src/entity_cl.cpp
+++ b/ryzom/client/src/entity_cl.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
index 04689a3ac..f2f99b347 100644
--- a/ryzom/client/src/entity_cl.h
+++ b/ryzom/client/src/entity_cl.h
@@ -3,8 +3,8 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/events_listener.cpp b/ryzom/client/src/events_listener.cpp
index cfa9d2b3c..83385a0e7 100644
--- a/ryzom/client/src/events_listener.cpp
+++ b/ryzom/client/src/events_listener.cpp
@@ -1,8 +1,8 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index 6b0d18409..396e48395 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2011  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/global.cpp b/ryzom/client/src/global.cpp
index 22a568306..6d83d4d8d 100644
--- a/ryzom/client/src/global.cpp
+++ b/ryzom/client/src/global.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/ground_fx_manager.cpp b/ryzom/client/src/ground_fx_manager.cpp
index 0eb68bcc5..41e6895a5 100644
--- a/ryzom/client/src/ground_fx_manager.cpp
+++ b/ryzom/client/src/ground_fx_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/hair_set.cpp b/ryzom/client/src/hair_set.cpp
index ba687a5b1..e196ad836 100644
--- a/ryzom/client/src/hair_set.cpp
+++ b/ryzom/client/src/hair_set.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/ig_callback.cpp b/ryzom/client/src/ig_callback.cpp
index 9632f2fcf..e59c844aa 100644
--- a/ryzom/client/src/ig_callback.cpp
+++ b/ryzom/client/src/ig_callback.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
index 88a2cbb51..7e4e09521 100644
--- a/ryzom/client/src/init.cpp
+++ b/ryzom/client/src/init.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2011  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index d7cce447d..8d5badcd2 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/input.cpp b/ryzom/client/src/input.cpp
index 2b0b83c96..cdd813a4a 100644
--- a/ryzom/client/src/input.cpp
+++ b/ryzom/client/src/input.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/ryzom/client/src/interface_v3/action_handler_base.cpp b/ryzom/client/src/interface_v3/action_handler_base.cpp
index 6bb27d772..925fc7827 100644
--- a/ryzom/client/src/interface_v3/action_handler_base.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_base.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
index 1f3b7ee4f..d3fd022ad 100644
--- a/ryzom/client/src/interface_v3/action_handler_edit.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_edit.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index 2fedf8aad..f3b5d42ab 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index cd79f0192..3c5f47df6 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
index b9c71bc56..91e00807d 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -1,9 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_misc.h b/ryzom/client/src/interface_v3/action_handler_misc.h
index 93db8080b..61fbbc552 100644
--- a/ryzom/client/src/interface_v3/action_handler_misc.h
+++ b/ryzom/client/src/interface_v3/action_handler_misc.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_move.cpp b/ryzom/client/src/interface_v3/action_handler_move.cpp
index 415dedbbc..71f7b55ee 100644
--- a/ryzom/client/src/interface_v3/action_handler_move.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_move.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_outpost.cpp b/ryzom/client/src/interface_v3/action_handler_outpost.cpp
index a4270e309..67e90ce02 100644
--- a/ryzom/client/src/interface_v3/action_handler_outpost.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_outpost.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 489dcbc35..f886a1fa1 100644
--- a/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 71e8a28d1..4fcf6b2fa 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.h b/ryzom/client/src/interface_v3/bot_chat_page_trade.h
index 58a4e572d..5023406af 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.h
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/character_3d.cpp b/ryzom/client/src/interface_v3/character_3d.cpp
index 6e2e5a16d..30e592e7d 100644
--- a/ryzom/client/src/interface_v3/character_3d.cpp
+++ b/ryzom/client/src/interface_v3/character_3d.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_displayer.h b/ryzom/client/src/interface_v3/chat_displayer.h
index 217b4beb8..b42ff339a 100644
--- a/ryzom/client/src/interface_v3/chat_displayer.h
+++ b/ryzom/client/src/interface_v3/chat_displayer.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_filter.cpp b/ryzom/client/src/interface_v3/chat_filter.cpp
index c77a93fa5..d1d6d78c2 100644
--- a/ryzom/client/src/interface_v3/chat_filter.cpp
+++ b/ryzom/client/src/interface_v3/chat_filter.cpp
@@ -4,6 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_filter.h b/ryzom/client/src/interface_v3/chat_filter.h
index 317069899..eb644f586 100644
--- a/ryzom/client/src/interface_v3/chat_filter.h
+++ b/ryzom/client/src/interface_v3/chat_filter.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index fd6e752ee..4895463b0 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.h b/ryzom/client/src/interface_v3/chat_text_manager.h
index 2cc71dd0e..5fb05999b 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.h
+++ b/ryzom/client/src/interface_v3/chat_text_manager.h
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index e1667839d..b33f82bb3 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 70efd1f59..4b7b536fd 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2011-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
index ab44ce99f..e2ed7f447 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2011-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
index c2074ee03..487b77c99 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
index f6f4bbc8d..211d872dc 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
index f41dd3085..405a83868 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
index d63e664ed..382b8e216 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
index 59913998d..da29a753e 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index 02d009661..8cc114508 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
index 1cb977978..329d7bcea 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
index 0678ab145..c7123957d 100644
--- a/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
+++ b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/flying_text_manager.h b/ryzom/client/src/interface_v3/flying_text_manager.h
index 14e24c887..d3d4c8957 100644
--- a/ryzom/client/src/interface_v3/flying_text_manager.h
+++ b/ryzom/client/src/interface_v3/flying_text_manager.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/group_career.cpp b/ryzom/client/src/interface_v3/group_career.cpp
index c04d98841..56ac4e1d2 100644
--- a/ryzom/client/src/interface_v3/group_career.cpp
+++ b/ryzom/client/src/interface_v3/group_career.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
index 5089149b4..97eb64bcb 100644
--- a/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/ryzom/client/src/interface_v3/group_compas.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_compas.h b/ryzom/client/src/interface_v3/group_compas.h
index 6a57b0294..804c36cb9 100644
--- a/ryzom/client/src/interface_v3/group_compas.h
+++ b/ryzom/client/src/interface_v3/group_compas.h
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_cs.cpp b/ryzom/client/src/interface_v3/group_html_cs.cpp
index d02940e60..34b91f81c 100644
--- a/ryzom/client/src/interface_v3/group_html_cs.cpp
+++ b/ryzom/client/src/interface_v3/group_html_cs.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_html_cs.h b/ryzom/client/src/interface_v3/group_html_cs.h
index f21eb0834..c4dead71b 100644
--- a/ryzom/client/src/interface_v3/group_html_cs.h
+++ b/ryzom/client/src/interface_v3/group_html_cs.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_html_forum.cpp b/ryzom/client/src/interface_v3/group_html_forum.cpp
index e6e6ff34f..37ba77891 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.cpp
+++ b/ryzom/client/src/interface_v3/group_html_forum.cpp
@@ -1,10 +1,10 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_forum.h b/ryzom/client/src/interface_v3/group_html_forum.h
index ef7a98063..33d759faa 100644
--- a/ryzom/client/src/interface_v3/group_html_forum.h
+++ b/ryzom/client/src/interface_v3/group_html_forum.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_html_mail.cpp b/ryzom/client/src/interface_v3/group_html_mail.cpp
index eb49e5d78..61105e085 100644
--- a/ryzom/client/src/interface_v3/group_html_mail.cpp
+++ b/ryzom/client/src/interface_v3/group_html_mail.cpp
@@ -1,10 +1,10 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_mail.h b/ryzom/client/src/interface_v3/group_html_mail.h
index 1a24469cb..14cba4586 100644
--- a/ryzom/client/src/interface_v3/group_html_mail.h
+++ b/ryzom/client/src/interface_v3/group_html_mail.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_html_webig.cpp b/ryzom/client/src/interface_v3/group_html_webig.cpp
index 7dda8b004..95ec3aa0e 100644
--- a/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -1,10 +1,10 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_html_webig.h b/ryzom/client/src/interface_v3/group_html_webig.h
index be6412710..dfa7fcc3c 100644
--- a/ryzom/client/src/interface_v3/group_html_webig.h
+++ b/ryzom/client/src/interface_v3/group_html_webig.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_in_scene.cpp b/ryzom/client/src/interface_v3/group_in_scene.cpp
index e0d36fd7f..6bfbe7518 100644
--- a/ryzom/client/src/interface_v3/group_in_scene.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index ab9f1c6c7..4cfde7914 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.h b/ryzom/client/src/interface_v3/group_in_scene_bubble.h
index f341153fa..cd7e6c57e 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.h
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index 56d00d15e..79f232ec4 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_map.h b/ryzom/client/src/interface_v3/group_map.h
index 1471b8975..4b3a87728 100644
--- a/ryzom/client/src/interface_v3/group_map.h
+++ b/ryzom/client/src/interface_v3/group_map.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp
index c8d5fdd9b..567926e06 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.cpp
+++ b/ryzom/client/src/interface_v3/group_quick_help.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_quick_help.h b/ryzom/client/src/interface_v3/group_quick_help.h
index 6f9c748a3..8c7b42973 100644
--- a/ryzom/client/src/interface_v3/group_quick_help.h
+++ b/ryzom/client/src/interface_v3/group_quick_help.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/guild_manager.h b/ryzom/client/src/interface_v3/guild_manager.h
index 11c44210c..301932e51 100644
--- a/ryzom/client/src/interface_v3/guild_manager.h
+++ b/ryzom/client/src/interface_v3/guild_manager.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/ryzom/client/src/interface_v3/interface_3d_scene.cpp
index bf3d13da8..cd2160489 100644
--- a/ryzom/client/src/interface_v3/interface_3d_scene.cpp
+++ b/ryzom/client/src/interface_v3/interface_3d_scene.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_ddx.h b/ryzom/client/src/interface_v3/interface_ddx.h
index 2be1c84b4..e15f44381 100644
--- a/ryzom/client/src/interface_v3/interface_ddx.h
+++ b/ryzom/client/src/interface_v3/interface_ddx.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 66ed24233..ab015e0d6 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
index 5206e0513..efdee3046 100644
--- a/ryzom/client/src/interface_v3/interface_manager.h
+++ b/ryzom/client/src/interface_v3/interface_manager.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/inventory_manager.h b/ryzom/client/src/interface_v3/inventory_manager.h
index 6af8414de..4fc300c31 100644
--- a/ryzom/client/src/interface_v3/inventory_manager.h
+++ b/ryzom/client/src/interface_v3/inventory_manager.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
index ea3a0036b..2e4499228 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/item_consumable_effect.h b/ryzom/client/src/interface_v3/item_consumable_effect.h
index a6150204a..a34d26503 100644
--- a/ryzom/client/src/interface_v3/item_consumable_effect.h
+++ b/ryzom/client/src/interface_v3/item_consumable_effect.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/item_info_waiter.h b/ryzom/client/src/interface_v3/item_info_waiter.h
index 7976f94f2..74da340cd 100644
--- a/ryzom/client/src/interface_v3/item_info_waiter.h
+++ b/ryzom/client/src/interface_v3/item_info_waiter.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
index a4a0851da..dd4485f9d 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.cpp
+++ b/ryzom/client/src/interface_v3/item_special_effect.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/item_special_effect.h b/ryzom/client/src/interface_v3/item_special_effect.h
index 201c83927..df97f539c 100644
--- a/ryzom/client/src/interface_v3/item_special_effect.h
+++ b/ryzom/client/src/interface_v3/item_special_effect.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 54bc39d29..f942ae7e1 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/macrocmd_manager.h b/ryzom/client/src/interface_v3/macrocmd_manager.h
index 37f2f7bee..0bc2eec03 100644
--- a/ryzom/client/src/interface_v3/macrocmd_manager.h
+++ b/ryzom/client/src/interface_v3/macrocmd_manager.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index e211bb9d2..e406b83a8 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/music_player.h b/ryzom/client/src/interface_v3/music_player.h
index febfde719..e9c73a88c 100644
--- a/ryzom/client/src/interface_v3/music_player.h
+++ b/ryzom/client/src/interface_v3/music_player.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/obs_huge_list.cpp b/ryzom/client/src/interface_v3/obs_huge_list.cpp
index d28499791..0c0da5677 100644
--- a/ryzom/client/src/interface_v3/obs_huge_list.cpp
+++ b/ryzom/client/src/interface_v3/obs_huge_list.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/obs_huge_list.h b/ryzom/client/src/interface_v3/obs_huge_list.h
index 664f2ab46..d37c35867 100644
--- a/ryzom/client/src/interface_v3/obs_huge_list.h
+++ b/ryzom/client/src/interface_v3/obs_huge_list.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/parser_modules.cpp b/ryzom/client/src/interface_v3/parser_modules.cpp
index 37f93eda5..17be41bb4 100644
--- a/ryzom/client/src/interface_v3/parser_modules.cpp
+++ b/ryzom/client/src/interface_v3/parser_modules.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/parser_modules.h b/ryzom/client/src/interface_v3/parser_modules.h
index 780991ccc..112803cc0 100644
--- a/ryzom/client/src/interface_v3/parser_modules.h
+++ b/ryzom/client/src/interface_v3/parser_modules.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/people_interraction.h b/ryzom/client/src/interface_v3/people_interraction.h
index 8181c1705..5c58f4d34 100644
--- a/ryzom/client/src/interface_v3/people_interraction.h
+++ b/ryzom/client/src/interface_v3/people_interraction.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
index 246f3bc0a..f784bef42 100644
--- a/ryzom/client/src/interface_v3/people_list.cpp
+++ b/ryzom/client/src/interface_v3/people_list.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index ccd8e2f41..20a23d0ea 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/register_interface_elements.cpp b/ryzom/client/src/interface_v3/register_interface_elements.cpp
index c425f8401..dc2c731e6 100644
--- a/ryzom/client/src/interface_v3/register_interface_elements.cpp
+++ b/ryzom/client/src/interface_v3/register_interface_elements.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/req_skill_formula.cpp b/ryzom/client/src/interface_v3/req_skill_formula.cpp
index 5099d325f..c661a61b5 100644
--- a/ryzom/client/src/interface_v3/req_skill_formula.cpp
+++ b/ryzom/client/src/interface_v3/req_skill_formula.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/req_skill_formula.h b/ryzom/client/src/interface_v3/req_skill_formula.h
index bf0ef5dc0..90ec882e3 100644
--- a/ryzom/client/src/interface_v3/req_skill_formula.h
+++ b/ryzom/client/src/interface_v3/req_skill_formula.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/interface_v3/sbrick_manager.cpp b/ryzom/client/src/interface_v3/sbrick_manager.cpp
index 34537689e..6bf830ecd 100644
--- a/ryzom/client/src/interface_v3/sbrick_manager.cpp
+++ b/ryzom/client/src/interface_v3/sbrick_manager.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
index d03b71411..4ba54229d 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.cpp
+++ b/ryzom/client/src/interface_v3/sphrase_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/sphrase_manager.h b/ryzom/client/src/interface_v3/sphrase_manager.h
index 59150927e..ad8abee80 100644
--- a/ryzom/client/src/interface_v3/sphrase_manager.h
+++ b/ryzom/client/src/interface_v3/sphrase_manager.h
@@ -1,9 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2014  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
index b0a6538dd..83b413b7d 100644
--- a/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
+++ b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/view_radar.cpp b/ryzom/client/src/interface_v3/view_radar.cpp
index 49f305bb2..eb50cc664 100644
--- a/ryzom/client/src/interface_v3/view_radar.cpp
+++ b/ryzom/client/src/interface_v3/view_radar.cpp
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/interface_v3/view_radar.h b/ryzom/client/src/interface_v3/view_radar.h
index cc0ffc1dc..fb11150bd 100644
--- a/ryzom/client/src/interface_v3/view_radar.h
+++ b/ryzom/client/src/interface_v3/view_radar.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2015  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index e1fc52eb7..471c80228 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/light_cycle_manager.cpp b/ryzom/client/src/light_cycle_manager.cpp
index 40b784cf2..2448bf1ae 100644
--- a/ryzom/client/src/light_cycle_manager.cpp
+++ b/ryzom/client/src/light_cycle_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 6fc6da999..4233a23c2 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2014  Matthew LAGOE (Botanic) <cyberempires@gmail.com>
diff --git a/ryzom/client/src/login_patch.h b/ryzom/client/src/login_patch.h
index dfd46b49c..6813c9ae6 100644
--- a/ryzom/client/src/login_patch.h
+++ b/ryzom/client/src/login_patch.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index bab17a7b6..8827918ef 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/main_loop_utilities.cpp b/ryzom/client/src/main_loop_utilities.cpp
index 4a4b2bc38..d93e24481 100644
--- a/ryzom/client/src/main_loop_utilities.cpp
+++ b/ryzom/client/src/main_loop_utilities.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/mesh_camera_col_manager.cpp b/ryzom/client/src/mesh_camera_col_manager.cpp
index bf5994583..96cedbf7e 100644
--- a/ryzom/client/src/mesh_camera_col_manager.cpp
+++ b/ryzom/client/src/mesh_camera_col_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/misc.cpp b/ryzom/client/src/misc.cpp
index 0432abf1a..2653c0e45 100644
--- a/ryzom/client/src/misc.cpp
+++ b/ryzom/client/src/misc.cpp
@@ -1,8 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/misc.h b/ryzom/client/src/misc.h
index c48b18137..6ac9c1730 100644
--- a/ryzom/client/src/misc.h
+++ b/ryzom/client/src/misc.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/outpost.cpp b/ryzom/client/src/outpost.cpp
index 8637ded60..9f9723b62 100644
--- a/ryzom/client/src/outpost.cpp
+++ b/ryzom/client/src/outpost.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/pacs_client.cpp b/ryzom/client/src/pacs_client.cpp
index 7bf4a0195..d7b2674c4 100644
--- a/ryzom/client/src/pacs_client.cpp
+++ b/ryzom/client/src/pacs_client.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/player_r2_cl.cpp b/ryzom/client/src/player_r2_cl.cpp
index 75effe9bf..4fb1e1afb 100644
--- a/ryzom/client/src/player_r2_cl.cpp
+++ b/ryzom/client/src/player_r2_cl.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/progress.h b/ryzom/client/src/progress.h
index ee9495028..69e9901d4 100644
--- a/ryzom/client/src/progress.h
+++ b/ryzom/client/src/progress.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/r2/dmc/action_historic.cpp b/ryzom/client/src/r2/dmc/action_historic.cpp
index cab232895..7a018d10a 100644
--- a/ryzom/client/src/r2/dmc/action_historic.cpp
+++ b/ryzom/client/src/r2/dmc/action_historic.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/dmc/com_lua_module.cpp b/ryzom/client/src/r2/dmc/com_lua_module.cpp
index 789884c76..9675a1e1c 100644
--- a/ryzom/client/src/r2/dmc/com_lua_module.cpp
+++ b/ryzom/client/src/r2/dmc/com_lua_module.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
index 8d0f14e02..e6cd487d2 100644
--- a/ryzom/client/src/r2/editor.cpp
+++ b/ryzom/client/src/r2/editor.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2016  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/r2/instance.cpp b/ryzom/client/src/r2/instance.cpp
index 78845fb66..1e2d785d1 100644
--- a/ryzom/client/src/r2/instance.cpp
+++ b/ryzom/client/src/r2/instance.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/tool.cpp b/ryzom/client/src/r2/tool.cpp
index 756ca5de1..191ec1cba 100644
--- a/ryzom/client/src/r2/tool.cpp
+++ b/ryzom/client/src/r2/tool.cpp
@@ -2,8 +2,8 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/r2/tool_draw_prim.cpp b/ryzom/client/src/r2/tool_draw_prim.cpp
index 7ec119e29..3cf05944f 100644
--- a/ryzom/client/src/r2/tool_draw_prim.cpp
+++ b/ryzom/client/src/r2/tool_draw_prim.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index b29683149..b23b2ae72 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -1,9 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/release.h b/ryzom/client/src/release.h
index 56ceca73d..17610eb1d 100644
--- a/ryzom/client/src/release.h
+++ b/ryzom/client/src/release.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/sky.cpp b/ryzom/client/src/sky.cpp
index cbe9ee609..bca0a0d3e 100644
--- a/ryzom/client/src/sky.cpp
+++ b/ryzom/client/src/sky.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/streamable_ig.cpp b/ryzom/client/src/streamable_ig.cpp
index 2d26acaed..3e633cb73 100644
--- a/ryzom/client/src/streamable_ig.cpp
+++ b/ryzom/client/src/streamable_ig.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
index b868b8104..bf26471b9 100644
--- a/ryzom/client/src/string_manager_client.cpp
+++ b/ryzom/client/src/string_manager_client.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2017  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/teleport.cpp b/ryzom/client/src/teleport.cpp
index 825de0add..a30c2ab56 100644
--- a/ryzom/client/src/teleport.cpp
+++ b/ryzom/client/src/teleport.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/text_manager.cpp b/ryzom/client/src/text_manager.cpp
index 9873b4986..005013eae 100644
--- a/ryzom/client/src/text_manager.cpp
+++ b/ryzom/client/src/text_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/text_manager.h b/ryzom/client/src/text_manager.h
index d154541e3..579466d45 100644
--- a/ryzom/client/src/text_manager.h
+++ b/ryzom/client/src/text_manager.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/client/src/user_entity.h b/ryzom/client/src/user_entity.h
index 3dccc362a..0155d013b 100644
--- a/ryzom/client/src/user_entity.h
+++ b/ryzom/client/src/user_entity.h
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/weather_manager_client.cpp b/ryzom/client/src/weather_manager_client.cpp
index caa3a6099..6f13c7ee5 100644
--- a/ryzom/client/src/weather_manager_client.cpp
+++ b/ryzom/client/src/weather_manager_client.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/weather_manager_client.h b/ryzom/client/src/weather_manager_client.h
index 98cd8f3af..8cea856ee 100644
--- a/ryzom/client/src/weather_manager_client.h
+++ b/ryzom/client/src/weather_manager_client.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/zone_util.cpp b/ryzom/client/src/zone_util.cpp
index 0f2a84636..e81ee4606 100644
--- a/ryzom/client/src/zone_util.cpp
+++ b/ryzom/client/src/zone_util.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/bg_downloader_msg.cpp b/ryzom/common/src/game_share/bg_downloader_msg.cpp
index e26aad9be..68720bc91 100644
--- a/ryzom/common/src/game_share/bg_downloader_msg.cpp
+++ b/ryzom/common/src/game_share/bg_downloader_msg.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/bg_downloader_msg.h b/ryzom/common/src/game_share/bg_downloader_msg.h
index 4ed562168..34b89e6cb 100644
--- a/ryzom/common/src/game_share/bg_downloader_msg.h
+++ b/ryzom/common/src/game_share/bg_downloader_msg.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/character_summary.h b/ryzom/common/src/game_share/character_summary.h
index 4397d1146..ea589d848 100644
--- a/ryzom/common/src/game_share/character_summary.h
+++ b/ryzom/common/src/game_share/character_summary.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/character_title.h b/ryzom/common/src/game_share/character_title.h
index bae0c2a4b..d3382ab46 100644
--- a/ryzom/common/src/game_share/character_title.h
+++ b/ryzom/common/src/game_share/character_title.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/ecosystem.cpp b/ryzom/common/src/game_share/ecosystem.cpp
index c0d2bb0c2..ce3973853 100644
--- a/ryzom/common/src/game_share/ecosystem.cpp
+++ b/ryzom/common/src/game_share/ecosystem.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/fame.cpp b/ryzom/common/src/game_share/fame.cpp
index 17400018f..dad273151 100644
--- a/ryzom/common/src/game_share/fame.cpp
+++ b/ryzom/common/src/game_share/fame.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2012  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2012-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp b/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
index 3568cf7d2..0aee5c6d7 100644
--- a/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
+++ b/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/generic_xml_msg_mngr.h b/ryzom/common/src/game_share/generic_xml_msg_mngr.h
index 45a89ec8c..4bce11d92 100644
--- a/ryzom/common/src/game_share/generic_xml_msg_mngr.h
+++ b/ryzom/common/src/game_share/generic_xml_msg_mngr.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/guild_grade.cpp b/ryzom/common/src/game_share/guild_grade.cpp
index fd0fd66fd..9f83f62f0 100644
--- a/ryzom/common/src/game_share/guild_grade.cpp
+++ b/ryzom/common/src/game_share/guild_grade.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/guild_grade_inline.h b/ryzom/common/src/game_share/guild_grade_inline.h
index e81e199ba..3c35e3cc2 100644
--- a/ryzom/common/src/game_share/guild_grade_inline.h
+++ b/ryzom/common/src/game_share/guild_grade_inline.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/item_infos.h b/ryzom/common/src/game_share/item_infos.h
index 1a0746f3b..4cdfe67ef 100644
--- a/ryzom/common/src/game_share/item_infos.h
+++ b/ryzom/common/src/game_share/item_infos.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/mainland_summary.h b/ryzom/common/src/game_share/mainland_summary.h
index 98f73439a..68d321ba7 100644
--- a/ryzom/common/src/game_share/mainland_summary.h
+++ b/ryzom/common/src/game_share/mainland_summary.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/msg_client_server.h b/ryzom/common/src/game_share/msg_client_server.h
index ce942291e..64f803e0a 100644
--- a/ryzom/common/src/game_share/msg_client_server.h
+++ b/ryzom/common/src/game_share/msg_client_server.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/people_pd.cpp b/ryzom/common/src/game_share/people_pd.cpp
index acf3a4e40..cf5d41690 100644
--- a/ryzom/common/src/game_share/people_pd.cpp
+++ b/ryzom/common/src/game_share/people_pd.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/people_pd_inline.h b/ryzom/common/src/game_share/people_pd_inline.h
index 4ad6fd661..5e749eda9 100644
--- a/ryzom/common/src/game_share/people_pd_inline.h
+++ b/ryzom/common/src/game_share/people_pd_inline.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/pvp_clan.cpp b/ryzom/common/src/game_share/pvp_clan.cpp
index 92255fab9..b25ce9971 100644
--- a/ryzom/common/src/game_share/pvp_clan.cpp
+++ b/ryzom/common/src/game_share/pvp_clan.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010-2018  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/sabrina_com.cpp b/ryzom/common/src/game_share/sabrina_com.cpp
index e7d21cd60..570993f27 100644
--- a/ryzom/common/src/game_share/sabrina_com.cpp
+++ b/ryzom/common/src/game_share/sabrina_com.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/sabrina_com.h b/ryzom/common/src/game_share/sabrina_com.h
index d799a421e..9ae501c29 100644
--- a/ryzom/common/src/game_share/sabrina_com.h
+++ b/ryzom/common/src/game_share/sabrina_com.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2018  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/season.cpp b/ryzom/common/src/game_share/season.cpp
index aa110f2fe..bfe2b5c4f 100644
--- a/ryzom/common/src/game_share/season.cpp
+++ b/ryzom/common/src/game_share/season.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/season_inline.h b/ryzom/common/src/game_share/season_inline.h
index e81509d6e..69a308c95 100644
--- a/ryzom/common/src/game_share/season_inline.h
+++ b/ryzom/common/src/game_share/season_inline.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/server_edition_module.cpp b/ryzom/common/src/game_share/server_edition_module.cpp
index 70fc2a5dc..5936247a1 100644
--- a/ryzom/common/src/game_share/server_edition_module.cpp
+++ b/ryzom/common/src/game_share/server_edition_module.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/sp_type.cpp b/ryzom/common/src/game_share/sp_type.cpp
index 3b4332b44..7e506e344 100644
--- a/ryzom/common/src/game_share/sp_type.cpp
+++ b/ryzom/common/src/game_share/sp_type.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/sp_type_inline.h b/ryzom/common/src/game_share/sp_type_inline.h
index 6c904f572..71fa89f66 100644
--- a/ryzom/common/src/game_share/sp_type_inline.h
+++ b/ryzom/common/src/game_share/sp_type_inline.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/sphrase_com.h b/ryzom/common/src/game_share/sphrase_com.h
index dd2c053ae..a71a0824b 100644
--- a/ryzom/common/src/game_share/sphrase_com.h
+++ b/ryzom/common/src/game_share/sphrase_com.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/time_weather_season/time_and_season.h b/ryzom/common/src/game_share/time_weather_season/time_and_season.h
index 47734a2ba..d59258822 100644
--- a/ryzom/common/src/game_share/time_weather_season/time_and_season.h
+++ b/ryzom/common/src/game_share/time_weather_season/time_and_season.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp b/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
index 43a03fefb..06e3269b4 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
index 2c98e5e7e..cd9e9080c 100644
--- a/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
+++ b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
index 13c343881..ae8595bf8 100644
--- a/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
+++ b/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
index a1380407c..2a1eac76a 100644
--- a/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
index c9cc79ea0..3505cc48c 100644
--- a/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
index d25134ebe..380aafcac 100644
--- a/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
+++ b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
index a66ab8b73..1f2e63f3d 100644
--- a/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
index 3572eb807..d58ecbb43 100644
--- a/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2011  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2013-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
index f4d2013f8..073f6ddea 100644
--- a/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
+++ b/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2011  Fabien HENON
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/prim_export/main.cpp b/ryzom/tools/leveldesign/prim_export/main.cpp
index 6ac9c2ad6..4d219ba78 100644
--- a/ryzom/tools/leveldesign/prim_export/main.cpp
+++ b/ryzom/tools/leveldesign/prim_export/main.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2010-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp b/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
index 554fc0f3d..c43265a7f 100644
--- a/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
+++ b/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/leveldesign/world_editor/land_export/main.cpp b/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
index 78ab057c1..8da783c21 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
+++ b/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
index d49a64b0f..63d175470 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
+++ b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
index 46ec0f4b7..e9bb28423 100644
--- a/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
+++ b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2021  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
index 1de46ae1b..8c869b220 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
index 1784c8ff4..5e1956381 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
index 7feaf0f27..63c658d07 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
index 757b49cc5..25d1931f4 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
index e8eb3f202..f5bc7c003 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
index 8c8ec0cd6..007bb1e45 100644
--- a/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
+++ b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/make_anim_by_race/main.cpp b/ryzom/tools/make_anim_by_race/main.cpp
index 69abc7ec4..ccc6fd997 100644
--- a/ryzom/tools/make_anim_by_race/main.cpp
+++ b/ryzom/tools/make_anim_by_race/main.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/make_anim_melee_impact/main.cpp b/ryzom/tools/make_anim_melee_impact/main.cpp
index 2bfdebcb2..f5b0d0364 100644
--- a/ryzom/tools/make_anim_melee_impact/main.cpp
+++ b/ryzom/tools/make_anim_melee_impact/main.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/patch_gen/patch_gen_common.cpp b/ryzom/tools/patch_gen/patch_gen_common.cpp
index 6e512ce84..799804c84 100644
--- a/ryzom/tools/patch_gen/patch_gen_common.cpp
+++ b/ryzom/tools/patch_gen/patch_gen_common.cpp
@@ -4,7 +4,7 @@
 // This source file has been modified by the following contributors:
 // Copyright (C) 2011-2013  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
 // Copyright (C) 2014  Matthew LAGOE (Botanic) <cyberempires@gmail.com>
-// Copyright (C) 2014-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/pd_parser/parser.cpp b/ryzom/tools/pd_parser/parser.cpp
index 568fbb3f8..0d4629726 100644
--- a/ryzom/tools/pd_parser/parser.cpp
+++ b/ryzom/tools/pd_parser/parser.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2010  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2015  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2015-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
index 6beebb9c9..55aa255f0 100644
--- a/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
+++ b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2010-2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/tools/server/build_world_packed_col/village.cpp b/ryzom/tools/server/build_world_packed_col/village.cpp
index 87e130fd2..42c537a1b 100644
--- a/ryzom/tools/server/build_world_packed_col/village.cpp
+++ b/ryzom/tools/server/build_world_packed_col/village.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/skill_extractor/skill_extractor.cpp b/ryzom/tools/skill_extractor/skill_extractor.cpp
index 31dc00a12..889108711 100644
--- a/ryzom/tools/skill_extractor/skill_extractor.cpp
+++ b/ryzom/tools/skill_extractor/skill_extractor.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/ryzom/tools/translation_tools/extract_new_sheet_names.cpp b/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
index 65b0e96b7..15004cd59 100644
--- a/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
+++ b/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
@@ -1,6 +1,9 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
diff --git a/tool/attribution/annotate.py b/tool/attribution/annotate.py
index 6029f9aeb..40942deea 100644
--- a/tool/attribution/annotate.py
+++ b/tool/attribution/annotate.py
@@ -178,7 +178,7 @@ short_authors["Xtarsia"] = "xtarsia"
 # short_authors["Michael Witrant <mike@lepton.fr>"] = "-"
 
 generic_authors = [ ]
-generic_authors += [ "Ryzom Core <http://ryzomcore.org/>" ]
+generic_authors += [ "Ryzom Core <http://ryzom.dev/>" ]
 generic_authors += [ "by authors" ]
 
 # Reverse mapping for parsing original annotation
@@ -229,6 +229,9 @@ def remap_author(blob, commit, author):
 	short_author = short_authors.get(author)
 	if short_author == None:
 		short_author = "?"
+	if "Update GPL headers" in commit.message:
+		# Ignore if commit message matches "Update GPL headers"
+		short_author = "-"
 	# If you're paid by Winch Gate, or signed copyright transfer with 
 	# them, remap here, limit by authored_date if needed.
 	if short_author == "ulukyn" or short_author == "ace":
@@ -242,7 +245,9 @@ def remap_author(blob, commit, author):
 	if "feature-export-assimp" in commit.message and authored_date.year <= 2015:
 		# Project paid for by Winch Gate
 		short_author = "winch_gate"
-	if short_author == "kervala" or short_author == "nimetu":
+	if short_author == "nimetu" and authored_date.year >= 2009:
+		short_author = "winch_gate"
+	if short_author == "kervala":
 		# Don't know if they signed the copyright assignment agreement with Winch Gate or Ryzom Forge
 		short_author = "?"
 	if short_author == "karu" or short_author == "kishan" or short_author == "glorf":

From 58b5941bbed60eaa71f82e1fb4b3ae925676b99a Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Wed, 6 Jan 2021 19:32:42 +0100
Subject: [PATCH 250/292] Flag to use preset folders

---
 nel/tools/build_gamedata/0_setup.py | 191 ++++++++++++++++------------
 1 file changed, 112 insertions(+), 79 deletions(-)

diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py
index de868d8eb..cd1a4dace 100755
--- a/nel/tools/build_gamedata/0_setup.py
+++ b/nel/tools/build_gamedata/0_setup.py
@@ -30,6 +30,7 @@ sys.path.append("configuration")
 parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Setup')
 parser.add_argument('--noconf', '-nc', action='store_true')
 parser.add_argument('--noverify', '-nv', action='store_true')
+parser.add_argument('--preset', '-p', action='store_true')
 # parser.add_argument('--haltonerror', '-eh', action='store_true')
 parser.add_argument('--includeproject', '-ipj', nargs='+')
 parser.add_argument('--excludeproject', '-epj', nargs='+')
@@ -64,127 +65,158 @@ if not args.noconf:
 	except NameError:
 		BuildQuality = 1
 	try:
-		ToolDirectories
+		if not args.preset:
+			ToolDirectories
 	except NameError:
-		ToolDirectories = [ 'R:/build/dev/bin/Release', 'R:/external/bin' ]
+		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64-distribution', 'R:/distribution/ryzom_tools_win_x64-distribution' ]
 	try:
 		ToolSuffix
 	except NameError:
 		ToolSuffix = ".exe"
 	try:
-		ScriptDirectory
+		if not args.preset:
+			ScriptDirectory
 	except NameError:
 		ScriptDirectory = "R:/code/nel/tools/build_gamedata"
 	try:
-		WorkspaceDirectory
+		if not args.preset:
+			WorkspaceDirectory
 	except NameError:
 		WorkspaceDirectory = "R:/leveldesign/workspace"
 	try:
-		DatabaseDirectory
+		if not args.preset:
+			DatabaseDirectory
 	except NameError:
 		DatabaseDirectory = "R:/graphics"
 	try:
-		SoundDirectory
+		if not args.preset:
+			SoundDirectory
 	except NameError:
 		SoundDirectory = "R:/sound"
 	try:
-		SoundDfnDirectory
+		if not args.preset:
+			SoundDfnDirectory
 	except NameError:
 		SoundDfnDirectory = "R:/sound/DFN"
 	try:
-		ExportBuildDirectory
+		if not args.preset:
+			ExportBuildDirectory
 	except NameError:
 		ExportBuildDirectory = "R:/pipeline/export"
 	try:
-		InstallDirectory
+		if not args.preset:
+			InstallDirectory
 	except NameError:
 		InstallDirectory = "R:/pipeline/install"
 	try:
-		ClientDevDirectory
+		if not args.preset:
+			ClientDevDirectory
 	except NameError:
 		ClientDevDirectory = "R:/pipeline/client_dev"
 	try:
-		ClientPatchDirectory
+		if not args.preset:
+			ClientPatchDirectory
 	except NameError:
 		ClientPatchDirectory = "R:/pipeline/client_patch"
 	try:
-		ClientInstallDirectory
+		if not args.preset:
+			ClientInstallDirectory
 	except NameError:
 		ClientInstallDirectory = "R:/pipeline/client_install"
 	try:
-		ShardInstallDirectory
+		if not args.preset:
+			ShardInstallDirectory
 	except NameError:
 		ShardInstallDirectory = "R:/pipeline/shard"
 	try:
-		WorldEditInstallDirectory
+		if not args.preset:
+			WorldEditInstallDirectory
 	except NameError:
 		WorldEditInstallDirectory = "R:/pipeline/worldedit"
 	try:
-		LeveldesignDirectory
+		if not args.preset:
+			WorldEditorFilesDirectory
+	except NameError:
+		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
+	try:
+		if not args.preset:
+			LeveldesignDirectory
 	except NameError:
 		LeveldesignDirectory = "R:/leveldesign"
 	try:
-		LeveldesignDfnDirectory
+		if not args.preset:
+			LeveldesignDfnDirectory
 	except NameError:
 		LeveldesignDfnDirectory = "R:/leveldesign/DFN"
 	try:
-		LeveldesignWorldDirectory
+		if not args.preset:
+			LeveldesignWorldDirectory
 	except NameError:
 		LeveldesignWorldDirectory = "R:/leveldesign/world"
 	try:
-		PrimitivesDirectory
+		if not args.preset:
+			PrimitivesDirectory
 	except NameError:
 		PrimitivesDirectory = "R:/leveldesign/primitives"
 	try:
-		GamedevDirectory
+		if not args.preset:
+			LeveldesignDataCommonDirectory
 	except NameError:
-		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
-	try:
-		DataShardDirectory
-	except NameError:
-		DataShardDirectory = "R:/code/ryzom/server/data_shard"
+		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
 	try:
-		DataCommonDirectory
+		if not args.preset:
+			LeveldesignDataShardDirectory
 	except NameError:
-		DataCommonDirectory = "R:/code/ryzom/common/data_common"
+		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
 	try:
-		LeveldesignDataShardDirectory
+		if not args.preset:
+			TranslationDirectory
 	except NameError:
-		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
+		TranslationDirectory = "R:/leveldesign/translation"
 	try:
-		LeveldesignDataCommonDirectory
+		if not args.preset:
+			GamedevDirectory
 	except NameError:
-		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
+		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
 	try:
-		TranslationDirectory
+		if not args.preset:
+			DataCommonDirectory
 	except NameError:
-		TranslationDirectory = "R:/leveldesign/translation"
+		DataCommonDirectory = "R:/code/ryzom/common/data_common"
 	try:
-		WorldEditorFilesDirectory
+		if not args.preset:
+			DataShardDirectory
 	except NameError:
-		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
+		DataShardDirectory = "R:/code/ryzom/server/data_shard"
 	try:
-		WindowsExeDllCfgDirectories
+		if not args.preset:
+			WindowsExeDllCfgDirectories
 	except NameError:
-		WindowsExeDllCfgDirectories = [ 'C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86', 'R:/external/bin', 'R:/build/dev/bin/Release', 'R:/code/ryzom/client', 'R:/code/nel/lib', 'R:/code/ryzom/bin', 'R:/code/ryzom/tools/client/client_config/bin' ]
+		# TODO: Separate 64bit and 32bit
+		WindowsExeDllCfgDirectories = [ '', 'R:/build/fv_x64/bin/Release', 'R:/distribution/external_x64', 'R:/code/ryzom/client', '', '', '' ]
 	try:
-		LinuxServiceExecutableDirectory
+		if not args.preset:
+			LinuxServiceExecutableDirectory
 	except NameError:
 		LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin"
 	try:
-		LinuxClientExecutableDirectory
+		if not args.preset:
+			LinuxClientExecutableDirectory
 	except NameError:
 		LinuxClientExecutableDirectory = "R:/build/gcc_client/bin"
 	try:
-		PatchmanCfgAdminDirectory
+		if not args.preset:
+			PatchmanCfgAdminDirectory
 	except NameError:
 		PatchmanCfgAdminDirectory = "R:/patchman/admin_install"
 	try:
-		PatchmanCfgDefaultDirectory
+		if not args.preset:
+			PatchmanCfgDefaultDirectory
 	except NameError:
 		PatchmanCfgDefaultDirectory = "R:/patchman/default"
 	try:
-		PatchmanBridgeServerDirectory
+		if not args.preset:
+			PatchmanBridgeServerDirectory
 	except NameError:
 		PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server"
 	try:
@@ -232,44 +264,45 @@ if not args.noconf:
 	printLog(log, "Use -- if you need to insert an empty value.")
 	printLog(log, "")
 	BuildQuality = int(askVar(log, "Build Quality", str(BuildQuality)))
-	ToolDirectories[0] = askVar(log, "[IN] Primary Tool Directory", ToolDirectories[0]).replace("\\", "/")
-	ToolDirectories[1] = askVar(log, "[IN] Secondary Tool Directory", ToolDirectories[1]).replace("\\", "/")
-	ToolSuffix = askVar(log, "Tool Suffix", ToolSuffix)
-	ScriptDirectory = askVar(log, "[IN] Script Directory", os.getcwd().replace("\\", "/")).replace("\\", "/")
-	WorkspaceDirectory = askVar(log, "[IN] Workspace Directory", WorkspaceDirectory).replace("\\", "/")
-	DatabaseDirectory = askVar(log, "[IN] Database Directory", DatabaseDirectory).replace("\\", "/")
-	SoundDirectory = askVar(log, "[IN] Sound Directory", SoundDirectory).replace("\\", "/")
-	SoundDfnDirectory = askVar(log, "[IN] Sound DFN Directory", SoundDfnDirectory).replace("\\", "/")
-	ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
-	InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
-	ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
-	ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
-	ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
-	ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
-	WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
-	LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
-	LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
-	LeveldesignWorldDirectory = askVar(log, "[IN] Leveldesign World Directory", LeveldesignWorldDirectory).replace("\\", "/")
-	PrimitivesDirectory = askVar(log, "[IN] Primitives Directory", PrimitivesDirectory).replace("\\", "/")
-	GamedevDirectory = askVar(log, "[IN] Gamedev Directory", GamedevDirectory).replace("\\", "/")
-	DataShardDirectory = askVar(log, "[IN] Data Shard Directory", DataShardDirectory).replace("\\", "/")
-	DataCommonDirectory = askVar(log, "[IN] Data Common Directory", DataCommonDirectory).replace("\\", "/")
-	TranslationDirectory = askVar(log, "[IN] Translation Directory", TranslationDirectory).replace("\\", "/")
-	LeveldesignDataShardDirectory = askVar(log, "[IN] Leveldesign Data Shard Directory", LeveldesignDataShardDirectory).replace("\\", "/")
-	LeveldesignDataCommonDirectory = askVar(log, "[IN] Leveldesign Data Common Directory", LeveldesignDataCommonDirectory).replace("\\", "/")
-	WorldEditorFilesDirectory = askVar(log, "[IN] World Editor Files Directory", WorldEditorFilesDirectory).replace("\\", "/")
-	WindowsExeDllCfgDirectories[0] = askVar(log, "[IN] Primary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[0]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[1] = askVar(log, "[IN] Secondary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[1]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[2] = askVar(log, "[IN] Tertiary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[2]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[3] = askVar(log, "[IN] Quaternary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[3]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[4] = askVar(log, "[IN] Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[5] = askVar(log, "[IN] Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
-	LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
-	LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
-	PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
-	PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
-	PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
+	if not args.preset:
+		ToolDirectories[0] = askVar(log, "[IN] Primary Tool Directory", ToolDirectories[0]).replace("\\", "/")
+		ToolDirectories[1] = askVar(log, "[IN] Secondary Tool Directory", ToolDirectories[1]).replace("\\", "/")
+		ToolSuffix = askVar(log, "Tool Suffix", ToolSuffix)
+		ScriptDirectory = askVar(log, "[IN] Script Directory", os.getcwd().replace("\\", "/")).replace("\\", "/")
+		WorkspaceDirectory = askVar(log, "[IN] Workspace Directory", WorkspaceDirectory).replace("\\", "/")
+		DatabaseDirectory = askVar(log, "[IN] Database Directory", DatabaseDirectory).replace("\\", "/")
+		SoundDirectory = askVar(log, "[IN] Sound Directory", SoundDirectory).replace("\\", "/")
+		SoundDfnDirectory = askVar(log, "[IN] Sound DFN Directory", SoundDfnDirectory).replace("\\", "/")
+		ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
+		InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
+		ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
+		ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
+		ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
+		ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
+		WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
+		LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
+		LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
+		LeveldesignWorldDirectory = askVar(log, "[IN] Leveldesign World Directory", LeveldesignWorldDirectory).replace("\\", "/")
+		PrimitivesDirectory = askVar(log, "[IN] Primitives Directory", PrimitivesDirectory).replace("\\", "/")
+		GamedevDirectory = askVar(log, "[IN] Gamedev Directory", GamedevDirectory).replace("\\", "/")
+		DataShardDirectory = askVar(log, "[IN] Data Shard Directory", DataShardDirectory).replace("\\", "/")
+		DataCommonDirectory = askVar(log, "[IN] Data Common Directory", DataCommonDirectory).replace("\\", "/")
+		TranslationDirectory = askVar(log, "[IN] Translation Directory", TranslationDirectory).replace("\\", "/")
+		LeveldesignDataShardDirectory = askVar(log, "[IN] Leveldesign Data Shard Directory", LeveldesignDataShardDirectory).replace("\\", "/")
+		LeveldesignDataCommonDirectory = askVar(log, "[IN] Leveldesign Data Common Directory", LeveldesignDataCommonDirectory).replace("\\", "/")
+		WorldEditorFilesDirectory = askVar(log, "[IN] World Editor Files Directory", WorldEditorFilesDirectory).replace("\\", "/")
+		WindowsExeDllCfgDirectories[0] = askVar(log, "[IN] Primary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[0]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[1] = askVar(log, "[IN] Secondary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[1]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[2] = askVar(log, "[IN] Tertiary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[2]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[3] = askVar(log, "[IN] Quaternary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[3]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[4] = askVar(log, "[IN] Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[5] = askVar(log, "[IN] Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/")
+		WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
+		LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
+		LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
+		PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
+		PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
+		PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
 	SignToolExecutable = askVar(log, "Sign Tool Executable", SignToolExecutable).replace("\\", "/")
 	SignToolSha1 = askVar(log, "Sign Tool Signature SHA1", SignToolSha1)
 	SignToolTimestamp = askVar(log, "Sign Tool Timestamp Authority", SignToolTimestamp)

From 9d303b2a9a69c2ea936fe39c21c1f75163eede4e Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Wed, 2 Jun 2021 12:46:57 +0800
Subject: [PATCH 251/292] Preload data in dev client as well, ref
 kaetemi/ryzomclassic#168

---
 nel/tools/build_gamedata/b1_client_dev.py |  3 ++-
 ryzom/client/src/client_cfg.cpp           |  3 +++
 ryzom/client/src/client_cfg.h             |  2 ++
 ryzom/client/src/init_main_loop.cpp       | 28 +++++++++++++++++------
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/nel/tools/build_gamedata/b1_client_dev.py b/nel/tools/build_gamedata/b1_client_dev.py
index a23ee693c..3e9a5d488 100755
--- a/nel/tools/build_gamedata/b1_client_dev.py
+++ b/nel/tools/build_gamedata/b1_client_dev.py
@@ -50,8 +50,9 @@ if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
 	cfg = open(ClientDevDirectory + "/client.cfg", "w")
 	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
 	cfg.write("PreDataPath          = {\n")
-	cfg.write("\t\"" + InstallDirectory + "\", \"user\", \"patch\", \"data\", \"examples\" \n")
+	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
 	cfg.write("};\n")
+	cfg.write("PreLoadPath          = \"" + InstallDirectory + "\";\n")
 	cfg.write("PatchWanted          = 0;\n")
 	cfg.write("DisplayLuaDebugInfo  = 1;\n")
 	cfg.write("AllowDebugLua        = 1;\n")
diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
index db38c1177..f67c4e1db 100644
--- a/ryzom/client/src/client_cfg.cpp
+++ b/ryzom/client/src/client_cfg.cpp
@@ -1314,6 +1314,9 @@ void CClientConfig::setValues()
 	// Data Path no recurse.
 	READ_STRINGVECTOR_FV(DataPathNoRecurse);
 
+	// Pre-load path
+	READ_STRING_DEV(PreLoadPath);
+
 	// Streamed package path
 	READ_STRING_FV(StreamedPackagePath);
 
diff --git a/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h
index 28d42a45d..22fe46f61 100644
--- a/ryzom/client/src/client_cfg.h
+++ b/ryzom/client/src/client_cfg.h
@@ -391,6 +391,8 @@ struct CClientConfig
 	std::vector<string>			DataPath;
 	/// Data Path no recurse.
 	std::vector<string>			DataPathNoRecurse;
+	/// Pre-load path
+	std::string					PreLoadPath;
 	/// Streamed package path
 	std::string					StreamedPackagePath;
 	/// Streamed package hosts
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index 8d5badcd2..9d1ebf784 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -1071,14 +1071,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0, 0.25f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/characters/shapes", "*.shape", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/characters/shapes" : ClientCfg.PreLoadPath + "/characters_shapes",
+						"*.shape", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.25f);
 				ProgressBar.pushCropedValues (0.25f,0.5f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/characters/skeletons", "*.skel", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/characters/skeletons" : ClientCfg.PreLoadPath + "/characters_skeletons",
+						"*.skel", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1126,14 +1130,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.5f, 0.75f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/fauna/shapes", "*.shape", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/fauna/shapes" : ClientCfg.PreLoadPath + "/fauna_shapes",
+						"*.shape", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.75f);
 				ProgressBar.pushCropedValues (0.75f,1);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/fauna/skeletons", "*.skel", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/fauna/skeletons" : ClientCfg.PreLoadPath + "/fauna_skeletons",
+						"*.skel", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1174,14 +1182,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.0f, 0.5f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX, "data/3d/common/sfx", "*.ps", true, &ProgressBar, preloadFXTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/sfx" : ClientCfg.PreLoadPath + "/sfx",
+						"*.ps", true, &ProgressBar, preloadFXTextures);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.5f);
 				ProgressBar.pushCropedValues (0.5f,1);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX, "data/3d/common/sfx", "*.shape", true, &ProgressBar, preloadFXTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/sfx" : ClientCfg.PreLoadPath + "/sfx",
+						"*.shape", true, &ProgressBar, preloadFXTextures);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1214,7 +1226,9 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.0f, 1.f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameObjects, "data/3d/common/objects", "*.shape", true, &ProgressBar, preloadObjectTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameObjects,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/objects" : ClientCfg.PreLoadPath + "/objects",
+						"*.shape", true, &ProgressBar, preloadObjectTextures);
 				}
 				ProgressBar.popCropedValues ();
 			}

From efc1883cca7df23366de6d7c44f15cb516466a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?=
 <nuno@troispetits.net>
Date: Wed, 2 Jun 2021 16:33:28 +0200
Subject: [PATCH 252/292] Move files to root

---
 code/.clang-format => .clang-format           |   0
 code/CMakeLists.txt => CMakeLists.txt         |   0
 .../AndroidToolChain.cmake                    |   0
 .../CheckDepends.cmake                        |   0
 .../ConfigureChecks.cmake                     |   0
 .../Find3dsMaxSDK.cmake                       |   0
 .../FindCEGUI.cmake                           |   0
 .../FindCppTest.cmake                         |   0
 .../FindCustomMFC.cmake                       |   0
 .../FindDSound.cmake                          |   0
 .../FindDirectXSDK.cmake                      |   0
 .../FindEFXUtil.cmake                         |   0
 .../FindExternal.cmake                        |   0
 .../FindFFmpeg.cmake                          |   0
 .../FindFMOD.cmake                            |   0
 .../FindFreeType.cmake                        |   0
 .../FindGLIB2.cmake                           |   0
 .../FindGOBJECT2.cmake                        |   0
 .../FindGTK2.cmake                            |   0
 .../FindHelpers.cmake                         |   0
 .../FindIconv.cmake                           |   0
 .../FindJpeg.cmake                            |   0
 .../FindLIBGSF.cmake                          |   0
 .../FindLibOVR.cmake                          |   0
 .../FindLibVR.cmake                           |   0
 .../FindLua52.cmake                           |   0
 .../FindLua53.cmake                           |   0
 .../FindLuabind.cmake                         |   0
 .../FindMSVC.cmake                            |   0
 .../FindMercurial.cmake                       |   0
 .../FindMySQL.cmake                           |   0
 .../FindNeL.cmake                             |   0
 .../FindOgg.cmake                             |   0
 .../FindOpenGLES.cmake                        |   0
 .../FindRyzomGameShare.cmake                  |   0
 .../FindSTLport.cmake                         |   0
 .../FindSquish.cmake                          |   0
 .../FindSteam.cmake                           |   0
 .../FindVorbis.cmake                          |   0
 .../FindWindowsSDK.cmake                      |   0
 .../FindXF86VidMode.cmake                     |   0
 .../Findassimp.cmake                          |   0
 .../GetRevision.cmake                         |   0
 .../OSXToolChain.cmake                        |   0
 .../PCHSupport.cmake                          |   0
 .../iOSToolChain.cmake                        |   0
 {code/CMakeModules => CMakeModules}/nel.cmake |   0
 code/CMakePackaging.txt => CMakePackaging.txt |   0
 code/COPYING => COPYING                       |   0
 code/CTestConfig.cmake => CTestConfig.cmake   |   0
 code/README => README                         |   0
 code/changelog.template => changelog.template |   0
 code/.editorconfig                            |  23 ------------------
 code/config.h.cmake => config.h.cmake         |   0
 {code/nel => nel}/3rdparty/CMakeLists.txt     |   0
 {code/nel => nel}/3rdparty/seven_zip/7z.h     |   0
 .../nel => nel}/3rdparty/seven_zip/7zAlloc.c  |   0
 .../nel => nel}/3rdparty/seven_zip/7zAlloc.h  |   0
 .../nel => nel}/3rdparty/seven_zip/7zArcIn.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/7zBuf.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/7zBuf.h  |   0
 {code/nel => nel}/3rdparty/seven_zip/7zBuf2.c |   0
 {code/nel => nel}/3rdparty/seven_zip/7zCrc.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/7zCrc.h  |   0
 .../nel => nel}/3rdparty/seven_zip/7zCrcOpt.c |   0
 {code/nel => nel}/3rdparty/seven_zip/7zDec.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/7zFile.c |   0
 {code/nel => nel}/3rdparty/seven_zip/7zFile.h |   0
 .../nel => nel}/3rdparty/seven_zip/7zStream.c |   0
 .../nel => nel}/3rdparty/seven_zip/7zTypes.h  |   0
 .../3rdparty/seven_zip/7zVersion.h            |   0
 .../3rdparty/seven_zip/7zVersion.rc           |   0
 {code/nel => nel}/3rdparty/seven_zip/Aes.c    |   0
 {code/nel => nel}/3rdparty/seven_zip/Aes.h    |   0
 {code/nel => nel}/3rdparty/seven_zip/AesOpt.c |   0
 {code/nel => nel}/3rdparty/seven_zip/Alloc.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/Alloc.h  |   0
 {code/nel => nel}/3rdparty/seven_zip/Bcj2.c   |   0
 {code/nel => nel}/3rdparty/seven_zip/Bcj2.h   |   0
 .../nel => nel}/3rdparty/seven_zip/Bcj2Enc.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/Bra.c    |   0
 {code/nel => nel}/3rdparty/seven_zip/Bra.h    |   0
 {code/nel => nel}/3rdparty/seven_zip/Bra86.c  |   0
 .../nel => nel}/3rdparty/seven_zip/BraIA64.c  |   0
 .../3rdparty/seven_zip/CMakeLists.txt         |   0
 .../nel => nel}/3rdparty/seven_zip/Compiler.h |   0
 .../nel => nel}/3rdparty/seven_zip/CpuArch.c  |   0
 .../nel => nel}/3rdparty/seven_zip/CpuArch.h  |   0
 {code/nel => nel}/3rdparty/seven_zip/Delta.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/Delta.h  |   0
 .../nel => nel}/3rdparty/seven_zip/DllSecur.c |   0
 .../nel => nel}/3rdparty/seven_zip/DllSecur.h |   0
 {code/nel => nel}/3rdparty/seven_zip/LzFind.c |   0
 {code/nel => nel}/3rdparty/seven_zip/LzFind.h |   0
 {code/nel => nel}/3rdparty/seven_zip/LzHash.h |   0
 .../nel => nel}/3rdparty/seven_zip/Lzma2Dec.c |   0
 .../nel => nel}/3rdparty/seven_zip/Lzma2Dec.h |   0
 .../3rdparty/seven_zip/Lzma2DecMt.c           |   0
 .../3rdparty/seven_zip/Lzma2DecMt.h           |   0
 .../nel => nel}/3rdparty/seven_zip/Lzma2Enc.c |   0
 .../nel => nel}/3rdparty/seven_zip/Lzma2Enc.h |   0
 {code/nel => nel}/3rdparty/seven_zip/Lzma86.h |   0
 .../3rdparty/seven_zip/Lzma86Dec.c            |   0
 .../3rdparty/seven_zip/Lzma86Enc.c            |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaDec.c  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaDec.h  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaEnc.c  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaEnc.h  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaLib.c  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaLib.h  |   0
 .../nel => nel}/3rdparty/seven_zip/LzmaUtil.c |   0
 {code/nel => nel}/3rdparty/seven_zip/Ppmd.h   |   0
 {code/nel => nel}/3rdparty/seven_zip/Ppmd7.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/Ppmd7.h  |   0
 .../nel => nel}/3rdparty/seven_zip/Ppmd7Dec.c |   0
 .../nel => nel}/3rdparty/seven_zip/Ppmd7Enc.c |   0
 .../nel => nel}/3rdparty/seven_zip/Precomp.h  |   0
 .../3rdparty/seven_zip/RotateDefs.h           |   0
 {code/nel => nel}/3rdparty/seven_zip/Sha256.c |   0
 {code/nel => nel}/3rdparty/seven_zip/Sha256.h |   0
 {code/nel => nel}/3rdparty/seven_zip/Sort.c   |   0
 {code/nel => nel}/3rdparty/seven_zip/Sort.h   |   0
 {code/nel => nel}/3rdparty/seven_zip/Xz.c     |   0
 {code/nel => nel}/3rdparty/seven_zip/Xz.h     |   0
 .../nel => nel}/3rdparty/seven_zip/XzCrc64.c  |   0
 .../nel => nel}/3rdparty/seven_zip/XzCrc64.h  |   0
 .../3rdparty/seven_zip/XzCrc64Opt.c           |   0
 {code/nel => nel}/3rdparty/seven_zip/XzDec.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/XzEnc.c  |   0
 {code/nel => nel}/3rdparty/seven_zip/XzEnc.h  |   0
 {code/nel => nel}/3rdparty/seven_zip/XzIn.c   |   0
 {code/nel => nel}/AUTHORS                     |   0
 {code/nel => nel}/CMakeLists.txt              |   0
 {code/nel => nel}/COPYING                     |   0
 {code/nel => nel}/ChangeLog                   |   0
 {code/nel => nel}/INSTALL                     |   0
 {code/nel => nel}/NEWS                        |   0
 {code/nel => nel}/README                      |   0
 {code/nel => nel}/doc/Doxyfile.cmake.in       |   0
 {code/nel => nel}/doc/html/index.html         |   0
 {code/nel => nel}/doc/make_all_dox.sh         |   0
 {code/nel => nel}/doc/make_nel_dox.bat        |   0
 {code/nel => nel}/doc/make_nel_dox.sh         |   0
 {code/nel => nel}/doc/make_nelns_dox.bat      |   0
 {code/nel => nel}/doc/make_nelns_dox.sh       |   0
 {code/nel => nel}/doc/make_neltools_dox.bat   |   0
 {code/nel => nel}/doc/make_neltools_dox.sh    |   0
 {code/nel => nel}/doc/make_packages_doc.bat   |   0
 {code/nel => nel}/doc/make_packages_doc.sh    |   0
 {code/nel => nel}/doc/misc/event_callback.vsd | Bin
 {code/nel => nel}/doc/misc/event_listener.vsd | Bin
 {code/nel => nel}/doc/misc/event_pump.vsd     | Bin
 {code/nel => nel}/doc/nel.dox                 |   0
 {code/nel => nel}/doc/nel.hhp                 |   0
 {code/nel => nel}/doc/nelns.dox               |   0
 {code/nel => nel}/doc/nelns.hhp               |   0
 {code/nel => nel}/doc/neltools.dox            |   0
 {code/nel => nel}/doc/neltools.hhp            |   0
 {code/nel => nel}/doc/net/login_system.vsd    | Bin
 .../doc/net/nelnet-layer1-server-obj.png      | Bin
 {code/nel => nel}/doc/net/net.dxt             |   0
 {code/nel => nel}/include/CMakeLists.txt      |   0
 .../nel => nel}/include/nel/3d/CMakeLists.txt |   0
 {code/nel => nel}/include/nel/3d/anim_ctrl.h  |   0
 .../include/nel/3d/anim_detail_trav.h         |   0
 {code/nel => nel}/include/nel/3d/animatable.h |   0
 .../include/nel/3d/animated_lightmap.h        |   0
 .../include/nel/3d/animated_material.h        |   0
 .../include/nel/3d/animated_morph.h           |   0
 .../include/nel/3d/animated_value.h           |   0
 {code/nel => nel}/include/nel/3d/animation.h  |   0
 .../include/nel/3d/animation_optimizer.h      |   0
 .../include/nel/3d/animation_playlist.h       |   0
 .../include/nel/3d/animation_set.h            |   0
 .../include/nel/3d/animation_set_user.h       |   0
 .../include/nel/3d/animation_time.h           |   0
 .../include/nel/3d/async_file_manager_3d.h    |   0
 .../include/nel/3d/async_texture_block.h      |   0
 .../include/nel/3d/async_texture_manager.h    |   0
 .../nel => nel}/include/nel/3d/bezier_patch.h |   0
 .../nel => nel}/include/nel/3d/bloom_effect.h |   0
 {code/nel => nel}/include/nel/3d/bone.h       |   0
 {code/nel => nel}/include/nel/3d/bsp_tree.h   |   0
 {code/nel => nel}/include/nel/3d/camera.h     |   0
 {code/nel => nel}/include/nel/3d/camera_col.h |   0
 .../include/nel/3d/channel_mixer.h            |   0
 {code/nel => nel}/include/nel/3d/clip_trav.h  |   0
 {code/nel => nel}/include/nel/3d/cloud.h      |   0
 .../nel => nel}/include/nel/3d/cloud_scape.h  |   0
 .../include/nel/3d/cloud_scape_user.h         |   0
 {code/nel => nel}/include/nel/3d/cluster.h    |   0
 .../include/nel/3d/coarse_mesh_build.h        |   0
 .../include/nel/3d/coarse_mesh_manager.h      |   0
 .../include/nel/3d/computed_string.h          |   0
 {code/nel => nel}/include/nel/3d/cube_grid.h  |   0
 .../include/nel/3d/cube_map_builder.h         |   0
 {code/nel => nel}/include/nel/3d/debug_vb.h   |   0
 {code/nel => nel}/include/nel/3d/deform_2d.h  |   0
 {code/nel => nel}/include/nel/3d/driver.h     |   0
 .../include/nel/3d/driver_material_inline.h   |   0
 .../nel => nel}/include/nel/3d/driver_user.h  |   0
 {code/nel => nel}/include/nel/3d/dru.h        |   0
 .../include/nel/3d/event_mouse_listener.h     |   0
 .../include/nel/3d/fast_ptr_list.h            |   0
 .../include/nel/3d/fasthls_modifier.h         |   0
 .../nel => nel}/include/nel/3d/flare_model.h  |   0
 .../nel => nel}/include/nel/3d/flare_shape.h  |   0
 .../include/nel/3d/font_generator.h           |   0
 .../nel => nel}/include/nel/3d/font_manager.h |   0
 {code/nel => nel}/include/nel/3d/frustum.h    |   0
 {code/nel => nel}/include/nel/3d/fxaa.h       |   0
 .../include/nel/3d/geometry_program.h         |   0
 .../include/nel/3d/gpu_program_params.h       |   0
 {code/nel => nel}/include/nel/3d/heat_haze.h  |   0
 {code/nel => nel}/include/nel/3d/height_map.h |   0
 .../include/nel/3d/hls_color_texture.h        |   0
 .../include/nel/3d/hls_texture_bank.h         |   0
 .../include/nel/3d/hls_texture_manager.h      |   0
 {code/nel => nel}/include/nel/3d/hrc_trav.h   |   0
 .../include/nel/3d/ig_surface_light.h         |   0
 .../include/nel/3d/ig_surface_light_build.h   |   0
 .../nel => nel}/include/nel/3d/index_buffer.h |   0
 {code/nel => nel}/include/nel/3d/init_3d.h    |   0
 .../include/nel/3d/instance_group_user.h      |   0
 .../include/nel/3d/instance_lighter.h         |   0
 {code/nel => nel}/include/nel/3d/key.h        |   0
 {code/nel => nel}/include/nel/3d/landscape.h  |   0
 .../include/nel/3d/landscape_collision_grid.h |   0
 .../include/nel/3d/landscape_def.h            |   0
 .../nel/3d/landscape_face_vector_manager.h    |   0
 .../include/nel/3d/landscape_model.h          |   0
 .../include/nel/3d/landscape_profile.h        |   0
 .../include/nel/3d/landscape_user.h           |   0
 .../nel/3d/landscape_vegetable_block.h        |   0
 .../include/nel/3d/landscapeig_manager.h      |   0
 .../include/nel/3d/landscapevb_allocator.h    |   0
 .../include/nel/3d/landscapevb_info.h         |   0
 .../include/nel/3d/layered_ordering_table.h   |   0
 {code/nel => nel}/include/nel/3d/light.h      |   0
 .../include/nel/3d/light_contribution.h       |   0
 .../nel/3d/light_influence_interpolator.h     |   0
 {code/nel => nel}/include/nel/3d/light_trav.h |   0
 {code/nel => nel}/include/nel/3d/light_user.h |   0
 .../include/nel/3d/lighting_manager.h         |   0
 .../include/nel/3d/load_balancing_trav.h      |   0
 .../include/nel/3d/lod_character_builder.h    |   0
 .../include/nel/3d/lod_character_instance.h   |   0
 .../include/nel/3d/lod_character_manager.h    |   0
 .../include/nel/3d/lod_character_shape.h      |   0
 .../include/nel/3d/lod_character_shape_bank.h |   0
 .../include/nel/3d/lod_character_texture.h    |   0
 {code/nel => nel}/include/nel/3d/logic_info.h |   0
 {code/nel => nel}/include/nel/3d/material.h   |   0
 {code/nel => nel}/include/nel/3d/matrix_3x4.h |   0
 {code/nel => nel}/include/nel/3d/mesh.h       |   0
 {code/nel => nel}/include/nel/3d/mesh_base.h  |   0
 .../include/nel/3d/mesh_base_instance.h       |   0
 .../nel => nel}/include/nel/3d/mesh_blender.h |   0
 .../include/nel/3d/mesh_block_manager.h       |   0
 {code/nel => nel}/include/nel/3d/mesh_geom.h  |   0
 .../include/nel/3d/mesh_instance.h            |   0
 .../nel => nel}/include/nel/3d/mesh_morpher.h |   0
 {code/nel => nel}/include/nel/3d/mesh_mrm.h   |   0
 .../include/nel/3d/mesh_mrm_instance.h        |   0
 .../include/nel/3d/mesh_mrm_skinned.h         |   0
 .../nel/3d/mesh_mrm_skinned_instance.h        |   0
 .../include/nel/3d/mesh_multi_lod.h           |   0
 .../include/nel/3d/mesh_multi_lod_instance.h  |   0
 .../include/nel/3d/mesh_vertex_program.h      |   0
 .../include/nel/3d/meshvp_per_pixel_light.h   |   0
 .../include/nel/3d/meshvp_wind_tree.h         |   0
 {code/nel => nel}/include/nel/3d/mini_col.h   |   0
 .../nel => nel}/include/nel/3d/motion_blur.h  |   0
 .../nel => nel}/include/nel/3d/mrm_builder.h  |   0
 .../nel => nel}/include/nel/3d/mrm_internal.h |   0
 .../include/nel/3d/mrm_level_detail.h         |   0
 {code/nel => nel}/include/nel/3d/mrm_mesh.h   |   0
 .../include/nel/3d/mrm_parameters.h           |   0
 {code/nel => nel}/include/nel/3d/nelu.h       |   0
 {code/nel => nel}/include/nel/3d/noise_3d.h   |   0
 .../include/nel/3d/occlusion_query.h          |   0
 .../include/nel/3d/ordering_table.h           |   0
 .../nel => nel}/include/nel/3d/packed_world.h |   0
 .../nel => nel}/include/nel/3d/packed_zone.h  |   0
 .../include/nel/3d/particle_system.h          |   0
 .../include/nel/3d/particle_system_manager.h  |   0
 .../include/nel/3d/particle_system_model.h    |   0
 .../include/nel/3d/particle_system_process.h  |   0
 .../include/nel/3d/particle_system_shape.h    |   0
 {code/nel => nel}/include/nel/3d/patch.h      |   0
 .../include/nel/3d/patch_rdr_pass.h           |   0
 .../include/nel/3d/patchdlm_context.h         |   0
 .../include/nel/3d/patchuv_locator.h          |   0
 .../include/nel/3d/pixel_program.h            |   0
 .../include/nel/3d/play_list_manager.h        |   0
 .../include/nel/3d/play_list_manager_user.h   |   0
 .../include/nel/3d/play_list_user.h           |   0
 .../nel => nel}/include/nel/3d/point_light.h  |   0
 .../include/nel/3d/point_light_influence.h    |   0
 .../include/nel/3d/point_light_model.h        |   0
 .../include/nel/3d/point_light_named.h        |   0
 .../include/nel/3d/point_light_named_array.h  |   0
 {code/nel => nel}/include/nel/3d/portal.h     |   0
 .../include/nel/3d/primitive_profile.h        |   0
 {code/nel => nel}/include/nel/3d/program.h    |   0
 .../nel => nel}/include/nel/3d/ps_allocator.h |   0
 {code/nel => nel}/include/nel/3d/ps_attrib.h  |   0
 .../include/nel/3d/ps_attrib_maker.h          |   0
 .../include/nel/3d/ps_attrib_maker_bin_op.h   |   0
 .../nel/3d/ps_attrib_maker_bin_op_inline.h    |   0
 .../include/nel/3d/ps_attrib_maker_helper.h   |   0
 .../nel/3d/ps_attrib_maker_iterators.h        |   0
 .../include/nel/3d/ps_attrib_maker_template.h |   0
 {code/nel => nel}/include/nel/3d/ps_color.h   |   0
 .../nel => nel}/include/nel/3d/ps_direction.h |   0
 {code/nel => nel}/include/nel/3d/ps_dot.h     |   0
 {code/nel => nel}/include/nel/3d/ps_edit.h    |   0
 {code/nel => nel}/include/nel/3d/ps_emitter.h |   0
 {code/nel => nel}/include/nel/3d/ps_face.h    |   0
 .../include/nel/3d/ps_face_look_at.h          |   0
 .../nel => nel}/include/nel/3d/ps_fan_light.h |   0
 {code/nel => nel}/include/nel/3d/ps_float.h   |   0
 {code/nel => nel}/include/nel/3d/ps_force.h   |   0
 {code/nel => nel}/include/nel/3d/ps_int.h     |   0
 .../nel => nel}/include/nel/3d/ps_iterator.h  |   0
 {code/nel => nel}/include/nel/3d/ps_light.h   |   0
 {code/nel => nel}/include/nel/3d/ps_located.h |   0
 {code/nel => nel}/include/nel/3d/ps_lod.h     |   0
 {code/nel => nel}/include/nel/3d/ps_macro.h   |   0
 {code/nel => nel}/include/nel/3d/ps_mesh.h    |   0
 {code/nel => nel}/include/nel/3d/ps_misc.h    |   0
 .../nel => nel}/include/nel/3d/ps_particle.h  |   0
 .../nel => nel}/include/nel/3d/ps_particle2.h |   0
 .../include/nel/3d/ps_particle_basic.h        |   0
 .../include/nel/3d/ps_plane_basis.h           |   0
 .../include/nel/3d/ps_plane_basis_maker.h     |   0
 {code/nel => nel}/include/nel/3d/ps_quad.h    |   0
 .../nel/3d/ps_register_color_attribs.h        |   0
 .../nel/3d/ps_register_float_attribs.h        |   0
 .../include/nel/3d/ps_register_int_attribs.h  |   0
 .../nel/3d/ps_register_plane_basis_attribs.h  |   0
 {code/nel => nel}/include/nel/3d/ps_ribbon.h  |   0
 .../include/nel/3d/ps_ribbon_base.h           |   0
 .../include/nel/3d/ps_ribbon_look_at.h        |   0
 .../nel => nel}/include/nel/3d/ps_shockwave.h |   0
 {code/nel => nel}/include/nel/3d/ps_sound.h   |   0
 .../include/nel/3d/ps_spawn_info.h            |   0
 .../nel => nel}/include/nel/3d/ps_tail_dot.h  |   0
 {code/nel => nel}/include/nel/3d/ps_util.h    |   0
 {code/nel => nel}/include/nel/3d/ps_zone.h    |   0
 {code/nel => nel}/include/nel/3d/ptr_set.h    |   0
 .../nel => nel}/include/nel/3d/quad_effect.h  |   0
 {code/nel => nel}/include/nel/3d/quad_grid.h  |   0
 .../include/nel/3d/quad_grid_clip_cluster.h   |   0
 .../include/nel/3d/quad_grid_clip_manager.h   |   0
 {code/nel => nel}/include/nel/3d/quad_tree.h  |   0
 {code/nel => nel}/include/nel/3d/radix_sort.h |   0
 {code/nel => nel}/include/nel/3d/raw_skin.h   |   0
 .../nel => nel}/include/nel/3d/raw_skinned.h  |   0
 {code/nel => nel}/include/nel/3d/ray_mesh.h   |   0
 .../nel => nel}/include/nel/3d/register_3d.h  |   0
 .../include/nel/3d/render_target_manager.h    |   0
 .../nel => nel}/include/nel/3d/render_trav.h  |   0
 {code/nel => nel}/include/nel/3d/root_model.h |   0
 {code/nel => nel}/include/nel/3d/scene.h      |   0
 .../nel => nel}/include/nel/3d/scene_group.h  |   0
 {code/nel => nel}/include/nel/3d/scene_user.h |   0
 {code/nel => nel}/include/nel/3d/scissor.h    |   0
 .../include/nel/3d/seg_remanence.h            |   0
 .../include/nel/3d/seg_remanence_shape.h      |   0
 {code/nel => nel}/include/nel/3d/shadow_map.h |   0
 .../include/nel/3d/shadow_map_manager.h       |   0
 .../include/nel/3d/shadow_poly_receiver.h     |   0
 .../nel => nel}/include/nel/3d/shadow_skin.h  |   0
 {code/nel => nel}/include/nel/3d/shape.h      |   0
 {code/nel => nel}/include/nel/3d/shape_bank.h |   0
 .../include/nel/3d/shape_bank_user.h          |   0
 {code/nel => nel}/include/nel/3d/shape_info.h |   0
 .../include/nel/3d/shifted_triangle_cache.h   |   0
 .../include/nel/3d/skeleton_model.h           |   0
 .../include/nel/3d/skeleton_shape.h           |   0
 .../include/nel/3d/skeleton_spawn_script.h    |   0
 .../include/nel/3d/skeleton_weight.h          |   0
 .../include/nel/3d/static_quad_grid.h         |   0
 .../include/nel/3d/stereo_debugger.h          |   0
 .../include/nel/3d/stereo_display.h           |   0
 {code/nel => nel}/include/nel/3d/stereo_hmd.h |   0
 .../nel => nel}/include/nel/3d/stereo_libvr.h |   0
 {code/nel => nel}/include/nel/3d/stereo_ovr.h |   0
 .../include/nel/3d/stereo_ovr_04.h            |   0
 {code/nel => nel}/include/nel/3d/stripifier.h |   0
 .../include/nel/3d/surface_light_grid.h       |   0
 .../include/nel/3d/tangent_space_build.h      |   0
 .../include/nel/3d/target_anim_ctrl.h         |   0
 {code/nel => nel}/include/nel/3d/tess_block.h |   0
 .../include/nel/3d/tess_face_priority_list.h  |   0
 {code/nel => nel}/include/nel/3d/tess_list.h  |   0
 .../nel => nel}/include/nel/3d/tessellation.h |   0
 .../nel => nel}/include/nel/3d/text_context.h |   0
 .../include/nel/3d/text_context_user.h        |   0
 {code/nel => nel}/include/nel/3d/texture.h    |   0
 .../include/nel/3d/texture_blank.h            |   0
 .../include/nel/3d/texture_blend.h            |   0
 .../include/nel/3d/texture_bloom.h            |   0
 .../nel => nel}/include/nel/3d/texture_bump.h |   0
 .../nel => nel}/include/nel/3d/texture_cube.h |   0
 .../nel => nel}/include/nel/3d/texture_dlm.h  |   0
 .../include/nel/3d/texture_emboss.h           |   0
 .../nel => nel}/include/nel/3d/texture_far.h  |   0
 .../nel => nel}/include/nel/3d/texture_file.h |   0
 .../nel => nel}/include/nel/3d/texture_font.h |   0
 .../include/nel/3d/texture_grouped.h          |   0
 .../nel => nel}/include/nel/3d/texture_mem.h  |   0
 .../include/nel/3d/texture_multi_file.h       |   0
 .../nel => nel}/include/nel/3d/texture_near.h |   0
 .../nel => nel}/include/nel/3d/texture_user.h |   0
 {code/nel => nel}/include/nel/3d/tile_bank.h  |   0
 {code/nel => nel}/include/nel/3d/tile_color.h |   0
 .../nel => nel}/include/nel/3d/tile_element.h |   0
 .../include/nel/3d/tile_far_bank.h            |   0
 .../include/nel/3d/tile_light_influence.h     |   0
 {code/nel => nel}/include/nel/3d/tile_lumel.h |   0
 .../include/nel/3d/tile_noise_map.h           |   0
 .../include/nel/3d/tile_vegetable_desc.h      |   0
 {code/nel => nel}/include/nel/3d/track.h      |   0
 .../nel => nel}/include/nel/3d/track_bezier.h |   0
 .../include/nel/3d/track_keyframer.h          |   0
 .../include/nel/3d/track_sampled_common.h     |   0
 .../include/nel/3d/track_sampled_quat.h       |   0
 .../nel/3d/track_sampled_quat_small_header.h  |   0
 .../include/nel/3d/track_sampled_vector.h     |   0
 {code/nel => nel}/include/nel/3d/track_tcb.h  |   0
 {code/nel => nel}/include/nel/3d/transform.h  |   0
 .../include/nel/3d/transform_shape.h          |   0
 .../include/nel/3d/transformable.h            |   0
 {code/nel => nel}/include/nel/3d/trav_scene.h |   0
 .../include/nel/3d/u_3d_mouse_listener.h      |   0
 .../nel => nel}/include/nel/3d/u_animation.h  |   0
 .../include/nel/3d/u_animation_set.h          |   0
 {code/nel => nel}/include/nel/3d/u_bone.h     |   0
 {code/nel => nel}/include/nel/3d/u_camera.h   |   0
 .../include/nel/3d/u_cloud_scape.h            |   0
 {code/nel => nel}/include/nel/3d/u_driver.h   |   0
 {code/nel => nel}/include/nel/3d/u_instance.h |   0
 .../include/nel/3d/u_instance_group.h         |   0
 .../include/nel/3d/u_instance_material.h      |   0
 .../nel => nel}/include/nel/3d/u_landscape.h  |   0
 {code/nel => nel}/include/nel/3d/u_light.h    |   0
 {code/nel => nel}/include/nel/3d/u_material.h |   0
 .../nel/3d/u_particle_system_instance.h       |   0
 .../include/nel/3d/u_particle_system_sound.h  |   0
 .../nel => nel}/include/nel/3d/u_play_list.h  |   0
 .../include/nel/3d/u_play_list_manager.h      |   0
 .../include/nel/3d/u_point_light.h            |   0
 .../include/nel/3d/u_ps_sound_impl.h          |   0
 .../include/nel/3d/u_ps_sound_interface.h     |   0
 {code/nel => nel}/include/nel/3d/u_scene.h    |   0
 {code/nel => nel}/include/nel/3d/u_shape.h    |   0
 .../nel => nel}/include/nel/3d/u_shape_bank.h |   0
 {code/nel => nel}/include/nel/3d/u_skeleton.h |   0
 .../include/nel/3d/u_text_context.h           |   0
 {code/nel => nel}/include/nel/3d/u_texture.h  |   0
 {code/nel => nel}/include/nel/3d/u_track.h    |   0
 .../nel => nel}/include/nel/3d/u_transform.h  |   0
 .../include/nel/3d/u_transformable.h          |   0
 .../nel/3d/u_visual_collision_entity.h        |   0
 .../nel/3d/u_visual_collision_manager.h       |   0
 .../include/nel/3d/u_visual_collision_mesh.h  |   0
 {code/nel => nel}/include/nel/3d/u_water.h    |   0
 .../include/nel/3d/u_water_env_map.h          |   0
 {code/nel => nel}/include/nel/3d/vegetable.h  |   0
 .../nel/3d/vegetable_blend_layer_model.h      |   0
 .../include/nel/3d/vegetable_clip_block.h     |   0
 .../include/nel/3d/vegetable_def.h            |   0
 .../include/nel/3d/vegetable_instance_group.h |   0
 .../include/nel/3d/vegetable_light_ex.h       |   0
 .../include/nel/3d/vegetable_manager.h        |   0
 .../include/nel/3d/vegetable_quadrant.h       |   0
 .../include/nel/3d/vegetable_shape.h          |   0
 .../include/nel/3d/vegetable_sort_block.h     |   0
 .../include/nel/3d/vegetable_uv8.h            |   0
 .../include/nel/3d/vegetablevb_allocator.h    |   0
 .../include/nel/3d/vertex_buffer.h            |   0
 .../include/nel/3d/vertex_buffer_heap.h       |   0
 .../include/nel/3d/vertex_program.h           |   0
 .../include/nel/3d/vertex_program_parse.h     |   0
 .../include/nel/3d/vertex_stream_manager.h    |   0
 {code/nel => nel}/include/nel/3d/viewport.h   |   0
 .../include/nel/3d/visual_collision_entity.h  |   0
 .../nel/3d/visual_collision_entity_user.h     |   0
 .../include/nel/3d/visual_collision_manager.h |   0
 .../nel/3d/visual_collision_manager_user.h    |   0
 .../include/nel/3d/visual_collision_mesh.h    |   0
 .../include/nel/3d/water_env_map.h            |   0
 .../include/nel/3d/water_env_map_user.h       |   0
 .../include/nel/3d/water_height_map.h         |   0
 .../nel => nel}/include/nel/3d/water_model.h  |   0
 .../include/nel/3d/water_pool_manager.h       |   0
 .../nel => nel}/include/nel/3d/water_shape.h  |   0
 {code/nel => nel}/include/nel/3d/zone.h       |   0
 .../include/nel/3d/zone_corner_smoother.h     |   0
 .../nel => nel}/include/nel/3d/zone_lighter.h |   0
 .../nel => nel}/include/nel/3d/zone_manager.h |   0
 .../nel => nel}/include/nel/3d/zone_search.h  |   0
 .../include/nel/3d/zone_smoother.h            |   0
 .../include/nel/3d/zone_symmetrisation.h      |   0
 .../include/nel/3d/zone_tgt_smoother.h        |   0
 {code/nel => nel}/include/nel/CMakeLists.txt  |   0
 .../include/nel/cegui/CMakeLists.txt          |   0
 .../include/nel/cegui/inellibrary.h           |   0
 .../nel => nel}/include/nel/cegui/nellogger.h |   0
 .../include/nel/cegui/nelrenderer.h           |   0
 .../include/nel/cegui/nelresourceprovider.h   |   0
 .../include/nel/cegui/neltexture.h            |   0
 .../include/nel/georges/CMakeLists.txt        |   0
 {code/nel => nel}/include/nel/georges/form.h  |   0
 .../include/nel/georges/form_dfn.h            |   0
 .../include/nel/georges/form_elm.h            |   0
 .../include/nel/georges/form_loader.h         |   0
 .../nel => nel}/include/nel/georges/header.h  |   0
 .../include/nel/georges/load_form.h           |   0
 {code/nel => nel}/include/nel/georges/type.h  |   0
 .../nel => nel}/include/nel/georges/u_form.h  |   0
 .../include/nel/georges/u_form_dfn.h          |   0
 .../include/nel/georges/u_form_elm.h          |   0
 .../include/nel/georges/u_form_loader.h       |   0
 .../nel => nel}/include/nel/georges/u_type.h  |   0
 .../include/nel/gui/CMakeLists.txt            |   0
 .../include/nel/gui/action_handler.h          |   0
 .../include/nel/gui/css_border_renderer.h     |   0
 .../nel => nel}/include/nel/gui/css_parser.h  |   0
 .../include/nel/gui/css_selector.h            |   0
 {code/nel => nel}/include/nel/gui/css_style.h |   0
 {code/nel => nel}/include/nel/gui/css_types.h |   0
 {code/nel => nel}/include/nel/gui/ctrl_base.h |   0
 .../include/nel/gui/ctrl_base_button.h        |   0
 .../nel => nel}/include/nel/gui/ctrl_button.h |   0
 .../include/nel/gui/ctrl_col_pick.h           |   0
 .../include/nel/gui/ctrl_draggable.h          |   0
 .../include/nel/gui/ctrl_polygon.h            |   0
 {code/nel => nel}/include/nel/gui/ctrl_quad.h |   0
 .../nel => nel}/include/nel/gui/ctrl_scroll.h |   0
 .../include/nel/gui/ctrl_scroll_base.h        |   0
 .../include/nel/gui/ctrl_sheet_selection.h    |   0
 .../include/nel/gui/ctrl_text_button.h        |   0
 .../include/nel/gui/ctrl_tooltip.h            |   0
 .../nel => nel}/include/nel/gui/db_manager.h  |   0
 .../include/nel/gui/dbgroup_combo_box.h       |   0
 .../include/nel/gui/dbgroup_select_number.h   |   0
 .../nel => nel}/include/nel/gui/dbview_bar.h  |   0
 .../nel => nel}/include/nel/gui/dbview_bar3.h |   0
 .../include/nel/gui/dbview_digit.h            |   0
 .../include/nel/gui/dbview_number.h           |   0
 .../include/nel/gui/dbview_quantity.h         |   0
 .../nel/gui/editor_selection_watcher.h        |   0
 .../include/nel/gui/event_descriptor.h        |   0
 .../include/nel/gui/event_listener.h          |   0
 .../include/nel/gui/group_container.h         |   0
 .../include/nel/gui/group_container_base.h    |   0
 .../include/nel/gui/group_editbox.h           |   0
 .../include/nel/gui/group_editbox_base.h      |   0
 .../include/nel/gui/group_editbox_decor.h     |   0
 .../nel => nel}/include/nel/gui/group_frame.h |   0
 .../include/nel/gui/group_header.h            |   0
 .../nel => nel}/include/nel/gui/group_html.h  |   0
 .../nel => nel}/include/nel/gui/group_list.h  |   0
 .../nel => nel}/include/nel/gui/group_menu.h  |   0
 .../nel => nel}/include/nel/gui/group_modal.h |   0
 .../include/nel/gui/group_paragraph.h         |   0
 .../include/nel/gui/group_scrolltext.h        |   0
 .../include/nel/gui/group_submenu_base.h      |   0
 {code/nel => nel}/include/nel/gui/group_tab.h |   0
 .../nel => nel}/include/nel/gui/group_table.h |   0
 .../nel => nel}/include/nel/gui/group_tree.h  |   0
 .../nel => nel}/include/nel/gui/group_wheel.h |   0
 .../include/nel/gui/html_element.h            |   0
 .../nel => nel}/include/nel/gui/html_parser.h |   0
 .../nel => nel}/include/nel/gui/http_cache.h  |   0
 {code/nel => nel}/include/nel/gui/http_hsts.h |   0
 .../include/nel/gui/input_event_listener.h    |   0
 .../include/nel/gui/input_handler.h           |   0
 .../include/nel/gui/interface_anim.h          |   0
 .../include/nel/gui/interface_common.h        |   0
 .../include/nel/gui/interface_element.h       |   0
 .../include/nel/gui/interface_expr.h          |   0
 .../include/nel/gui/interface_expr_node.h     |   0
 .../include/nel/gui/interface_factory.h       |   0
 .../include/nel/gui/interface_group.h         |   0
 .../include/nel/gui/interface_link.h          |   0
 .../include/nel/gui/interface_options.h       |   0
 .../include/nel/gui/interface_parser.h        |   0
 .../include/nel/gui/interface_property.h      |   0
 {code/nel => nel}/include/nel/gui/libwww.h    |   0
 {code/nel => nel}/include/nel/gui/link_data.h |   0
 .../nel => nel}/include/nel/gui/lua_helper.h  |   0
 .../include/nel/gui/lua_helper_inline.h       |   0
 {code/nel => nel}/include/nel/gui/lua_ihm.h   |   0
 .../nel => nel}/include/nel/gui/lua_loadlib.h |   0
 .../nel => nel}/include/nel/gui/lua_manager.h |   0
 .../nel => nel}/include/nel/gui/lua_object.h  |   0
 {code/nel => nel}/include/nel/gui/parser.h    |   0
 {code/nel => nel}/include/nel/gui/proc.h      |   0
 {code/nel => nel}/include/nel/gui/reflect.h   |   0
 .../include/nel/gui/reflect_register.h        |   0
 .../nel => nel}/include/nel/gui/root_group.h  |   0
 .../nel => nel}/include/nel/gui/string_case.h |   0
 .../nel => nel}/include/nel/gui/url_parser.h  |   0
 .../include/nel/gui/variable_data.h           |   0
 {code/nel => nel}/include/nel/gui/view_base.h |   0
 .../nel => nel}/include/nel/gui/view_bitmap.h |   0
 .../include/nel/gui/view_bitmap_combo.h       |   0
 {code/nel => nel}/include/nel/gui/view_link.h |   0
 .../include/nel/gui/view_pointer.h            |   0
 .../include/nel/gui/view_pointer_base.h       |   0
 .../include/nel/gui/view_polygon.h            |   0
 {code/nel => nel}/include/nel/gui/view_quad.h |   0
 .../include/nel/gui/view_renderer.h           |   0
 {code/nel => nel}/include/nel/gui/view_text.h |   0
 .../include/nel/gui/view_text_formated.h      |   0
 .../include/nel/gui/view_text_id.h            |   0
 .../include/nel/gui/view_text_id_formated.h   |   0
 .../include/nel/gui/widget_manager.h          |   0
 .../include/nel/ligo/CMakeLists.txt           |   0
 .../include/nel/ligo/ligo_config.h            |   0
 .../nel => nel}/include/nel/ligo/ligo_error.h |   0
 .../include/nel/ligo/ligo_material.h          |   0
 .../nel => nel}/include/nel/ligo/primitive.h  |   0
 .../include/nel/ligo/primitive_class.h        |   0
 .../nel/ligo/primitive_configuration.h        |   0
 .../include/nel/ligo/primitive_utils.h        |   0
 .../nel => nel}/include/nel/ligo/transition.h |   0
 .../nel => nel}/include/nel/ligo/zone_bank.h  |   0
 .../nel => nel}/include/nel/ligo/zone_edge.h  |   0
 .../include/nel/ligo/zone_region.h            |   0
 .../include/nel/ligo/zone_template.h          |   0
 .../include/nel/logic/CMakeLists.txt          |   0
 .../include/nel/logic/logic_condition.h       |   0
 .../include/nel/logic/logic_event.h           |   0
 .../include/nel/logic/logic_state.h           |   0
 .../include/nel/logic/logic_state_machine.h   |   0
 .../include/nel/logic/logic_variable.h        |   0
 .../include/nel/misc/CMakeLists.txt           |   0
 {code/nel => nel}/include/nel/misc/aabbox.h   |   0
 {code/nel => nel}/include/nel/misc/algo.h     |   0
 .../include/nel/misc/app_context.h            |   0
 {code/nel => nel}/include/nel/misc/array_2d.h |   0
 .../include/nel/misc/async_file_manager.h     |   0
 {code/nel => nel}/include/nel/misc/base64.h   |   0
 {code/nel => nel}/include/nel/misc/big_file.h |   0
 .../include/nel/misc/bit_mem_stream.h         |   0
 {code/nel => nel}/include/nel/misc/bit_set.h  |   0
 {code/nel => nel}/include/nel/misc/bitmap.h   |   0
 .../include/nel/misc/block_memory.h           |   0
 {code/nel => nel}/include/nel/misc/bsphere.h  |   0
 {code/nel => nel}/include/nel/misc/buf_fifo.h |   0
 {code/nel => nel}/include/nel/misc/callback.h |   0
 {code/nel => nel}/include/nel/misc/cdb.h      |   0
 .../include/nel/misc/cdb_bank_handler.h       |   0
 .../nel => nel}/include/nel/misc/cdb_branch.h |   0
 .../nel/misc/cdb_branch_observing_handler.h   |   0
 .../include/nel/misc/cdb_check_sum.h          |   0
 {code/nel => nel}/include/nel/misc/cdb_leaf.h |   0
 .../include/nel/misc/cdb_manager.h            |   0
 .../nel => nel}/include/nel/misc/check_fpu.h  |   0
 {code/nel => nel}/include/nel/misc/class_id.h |   0
 .../include/nel/misc/class_registry.h         |   0
 {code/nel => nel}/include/nel/misc/cmd_args.h |   0
 {code/nel => nel}/include/nel/misc/co_task.h  |   0
 {code/nel => nel}/include/nel/misc/command.h  |   0
 {code/nel => nel}/include/nel/misc/common.h   |   0
 .../include/nel/misc/config_file.h            |   0
 .../nel/misc/contiguous_block_allocator.h     |   0
 .../include/nel/misc/cpu_time_stat.h          |   0
 {code/nel => nel}/include/nel/misc/debug.h    |   0
 .../nel => nel}/include/nel/misc/diff_tool.h  |   0
 .../nel => nel}/include/nel/misc/displayer.h  |   0
 .../include/nel/misc/dummy_window.h           |   0
 .../nel => nel}/include/nel/misc/dynloadlib.h |   0
 .../include/nel/misc/eid_translator.h         |   0
 .../nel => nel}/include/nel/misc/entity_id.h  |   0
 .../include/nel/misc/enum_bitset.h            |   0
 .../include/nel/misc/eval_num_expr.h          |   0
 .../include/nel/misc/event_emitter.h          |   0
 .../include/nel/misc/event_emitter_multi.h    |   0
 .../include/nel/misc/event_listener.h         |   0
 .../include/nel/misc/event_server.h           |   0
 {code/nel => nel}/include/nel/misc/events.h   |   0
 {code/nel => nel}/include/nel/misc/factory.h  |   0
 .../nel => nel}/include/nel/misc/fast_floor.h |   0
 .../include/nel/misc/fast_id_map.h            |   0
 {code/nel => nel}/include/nel/misc/fast_mem.h |   0
 {code/nel => nel}/include/nel/misc/file.h     |   0
 .../include/nel/misc/fixed_size_allocator.h   |   0
 {code/nel => nel}/include/nel/misc/geom_ext.h |   0
 .../include/nel/misc/grid_traversal.h         |   0
 .../include/nel/misc/gtk_displayer.h          |   0
 .../include/nel/misc/heap_memory.h            |   0
 .../include/nel/misc/hierarchical_timer.h     |   0
 {code/nel => nel}/include/nel/misc/historic.h |   0
 {code/nel => nel}/include/nel/misc/i18n.h     |   0
 .../nel/misc/i_streamed_package_provider.h    |   0
 {code/nel => nel}/include/nel/misc/i_xml.h    |   0
 .../include/nel/misc/inter_window_msg_queue.h |   0
 {code/nel => nel}/include/nel/misc/line.h     |   0
 {code/nel => nel}/include/nel/misc/log.h      |   0
 {code/nel => nel}/include/nel/misc/matrix.h   |   0
 {code/nel => nel}/include/nel/misc/md5.h      |   0
 .../include/nel/misc/mem_displayer.h          |   0
 .../nel => nel}/include/nel/misc/mem_stream.h |   0
 .../include/nel/misc/mouse_smoother.h         |   0
 .../include/nel/misc/mutable_container.h      |   0
 {code/nel => nel}/include/nel/misc/mutex.h    |   0
 .../include/nel/misc/noise_value.h            |   0
 {code/nel => nel}/include/nel/misc/o_xml.h    |   0
 .../include/nel/misc/object_arena_allocator.h |   0
 .../include/nel/misc/object_vector.h          |   0
 {code/nel => nel}/include/nel/misc/p_thread.h |   0
 {code/nel => nel}/include/nel/misc/path.h     |   0
 {code/nel => nel}/include/nel/misc/plane.h    |   0
 .../include/nel/misc/plane_inline.h           |   0
 {code/nel => nel}/include/nel/misc/polygon.h  |   0
 .../include/nel/misc/pool_memory.h            |   0
 .../include/nel/misc/progress_callback.h      |   0
 {code/nel => nel}/include/nel/misc/quad.h     |   0
 {code/nel => nel}/include/nel/misc/quat.h     |   0
 {code/nel => nel}/include/nel/misc/random.h   |   0
 .../include/nel/misc/reader_writer.h          |   0
 {code/nel => nel}/include/nel/misc/rect.h     |   0
 {code/nel => nel}/include/nel/misc/report.h   |   0
 .../include/nel/misc/resource_ptr.h           |   0
 .../include/nel/misc/resource_ptr_inline.h    |   0
 {code/nel => nel}/include/nel/misc/rgba.h     |   0
 .../nel => nel}/include/nel/misc/seven_zip.h  |   0
 {code/nel => nel}/include/nel/misc/sha1.h     |   0
 .../include/nel/misc/shared_memory.h          |   0
 {code/nel => nel}/include/nel/misc/sheet_id.h |   0
 .../nel => nel}/include/nel/misc/singleton.h  |   0
 .../nel => nel}/include/nel/misc/smart_ptr.h  |   0
 .../include/nel/misc/smart_ptr_inline.h       |   0
 .../include/nel/misc/speaker_listener.h       |   0
 {code/nel => nel}/include/nel/misc/sstring.h  |   0
 .../nel => nel}/include/nel/misc/static_map.h |   0
 .../include/nel/misc/stl_block_allocator.h    |   0
 .../include/nel/misc/stl_block_list.h         |   0
 .../nel => nel}/include/nel/misc/stop_watch.h |   0
 {code/nel => nel}/include/nel/misc/stream.h   |   0
 .../include/nel/misc/stream_inline.h          |   0
 .../include/nel/misc/streamed_package.h       |   0
 .../nel/misc/streamed_package_manager.h       |   0
 .../include/nel/misc/string_common.h          |   0
 .../include/nel/misc/string_conversion.h      |   0
 .../include/nel/misc/string_id_array.h        |   0
 .../include/nel/misc/string_mapper.h          |   0
 .../include/nel/misc/string_stream.h          |   0
 .../include/nel/misc/system_info.h            |   0
 .../include/nel/misc/system_utils.h           |   0
 .../include/nel/misc/task_manager.h           |   0
 {code/nel => nel}/include/nel/misc/tds.h      |   0
 {code/nel => nel}/include/nel/misc/thread.h   |   0
 {code/nel => nel}/include/nel/misc/time_nl.h  |   0
 .../nel/misc/timeout_assertion_thread.h       |   0
 .../nel => nel}/include/nel/misc/traits_nl.h  |   0
 {code/nel => nel}/include/nel/misc/triangle.h |   0
 {code/nel => nel}/include/nel/misc/twin_map.h |   0
 {code/nel => nel}/include/nel/misc/types_nl.h |   0
 {code/nel => nel}/include/nel/misc/ucstring.h |   0
 {code/nel => nel}/include/nel/misc/uv.h       |   0
 .../include/nel/misc/value_smoother.h         |   0
 {code/nel => nel}/include/nel/misc/variable.h |   0
 {code/nel => nel}/include/nel/misc/vector.h   |   0
 .../nel => nel}/include/nel/misc/vector_2d.h  |   0
 .../nel => nel}/include/nel/misc/vector_2f.h  |   0
 {code/nel => nel}/include/nel/misc/vector_h.h |   0
 .../include/nel/misc/vector_inline.h          |   0
 {code/nel => nel}/include/nel/misc/vectord.h  |   0
 .../include/nel/misc/vectord_inline.h         |   0
 .../include/nel/misc/version_nl.cmake         |   0
 .../nel => nel}/include/nel/misc/wang_hash.h  |   0
 .../nel => nel}/include/nel/misc/win32_util.h |   0
 .../include/nel/misc/win_displayer.h          |   0
 .../include/nel/misc/win_event_emitter.h      |   0
 .../nel => nel}/include/nel/misc/win_thread.h |   0
 .../include/nel/misc/window_displayer.h       |   0
 .../include/nel/misc/words_dictionary.h       |   0
 .../include/nel/misc/xml_auto_ptr.h           |   0
 .../nel => nel}/include/nel/misc/xml_macros.h |   0
 {code/nel => nel}/include/nel/misc/xml_pack.h |   0
 .../include/nel/net/CMakeLists.txt            |   0
 {code/nel => nel}/include/nel/net/admin.h     |   0
 .../nel => nel}/include/nel/net/buf_client.h  |   0
 .../include/nel/net/buf_net_base.h            |   0
 .../nel => nel}/include/nel/net/buf_server.h  |   0
 {code/nel => nel}/include/nel/net/buf_sock.h  |   0
 .../include/nel/net/callback_client.h         |   0
 .../include/nel/net/callback_net_base.h       |   0
 .../include/nel/net/callback_server.h         |   0
 .../include/nel/net/cvar_log_filter.h         |   0
 .../include/nel/net/dummy_tcp_sock.h          |   0
 {code/nel => nel}/include/nel/net/email.h     |   0
 .../include/nel/net/inet_address.h            |   0
 .../nel => nel}/include/nel/net/listen_sock.h |   0
 .../include/nel/net/login_client.h            |   0
 .../include/nel/net/login_cookie.h            |   0
 .../include/nel/net/login_server.h            |   0
 {code/nel => nel}/include/nel/net/message.h   |   0
 .../include/nel/net/message_recorder.h        |   0
 {code/nel => nel}/include/nel/net/module.h    |   0
 .../include/nel/net/module_builder_parts.h    |   0
 .../include/nel/net/module_common.h           |   0
 .../include/nel/net/module_gateway.h          |   0
 .../include/nel/net/module_manager.h          |   0
 .../include/nel/net/module_message.h          |   0
 .../include/nel/net/module_socket.h           |   0
 .../include/nel/net/naming_client.h           |   0
 .../include/nel/net/net_displayer.h           |   0
 {code/nel => nel}/include/nel/net/net_log.h   |   0
 .../nel => nel}/include/nel/net/net_manager.h |   0
 .../nel => nel}/include/nel/net/pacs_client.h |   0
 {code/nel => nel}/include/nel/net/service.h   |   0
 {code/nel => nel}/include/nel/net/sock.h      |   0
 {code/nel => nel}/include/nel/net/tcp_sock.h  |   0
 .../include/nel/net/transport_class.h         |   0
 .../include/nel/net/udp_sim_sock.h            |   0
 {code/nel => nel}/include/nel/net/udp_sock.h  |   0
 .../include/nel/net/unified_network.h         |   0
 {code/nel => nel}/include/nel/net/unitime.h   |   0
 {code/nel => nel}/include/nel/net/varpath.h   |   0
 .../include/nel/pacs/CMakeLists.txt           |   0
 .../include/nel/pacs/build_indoor.h           |   0
 {code/nel => nel}/include/nel/pacs/chain.h    |   0
 .../nel => nel}/include/nel/pacs/chain_quad.h |   0
 .../include/nel/pacs/collision_callback.h     |   0
 .../include/nel/pacs/collision_desc.h         |   0
 .../include/nel/pacs/collision_mesh_build.h   |   0
 .../include/nel/pacs/collision_ot.h           |   0
 .../include/nel/pacs/collision_surface_temp.h |   0
 .../include/nel/pacs/edge_collide.h           |   0
 .../nel => nel}/include/nel/pacs/edge_quad.h  |   0
 .../include/nel/pacs/exterior_mesh.h          |   0
 .../nel => nel}/include/nel/pacs/face_grid.h  |   0
 .../include/nel/pacs/global_retriever.h       |   0
 .../include/nel/pacs/local_retriever.h        |   0
 .../nel => nel}/include/nel/pacs/move_cell.h  |   0
 .../include/nel/pacs/move_container.h         |   0
 .../include/nel/pacs/move_container_inline.h  |   0
 .../include/nel/pacs/move_element.h           |   0
 .../include/nel/pacs/move_element_inline.h    |   0
 .../include/nel/pacs/move_primitive.h         |   0
 .../include/nel/pacs/primitive_block.h        |   0
 .../include/nel/pacs/primitive_world_image.h  |   0
 .../nel => nel}/include/nel/pacs/quad_grid.h  |   0
 .../include/nel/pacs/retrievable_surface.h    |   0
 .../include/nel/pacs/retriever_bank.h         |   0
 .../include/nel/pacs/retriever_instance.h     |   0
 .../include/nel/pacs/surface_quad.h           |   0
 .../include/nel/pacs/u_collision_desc.h       |   0
 .../include/nel/pacs/u_global_position.h      |   0
 .../include/nel/pacs/u_global_retriever.h     |   0
 .../include/nel/pacs/u_move_container.h       |   0
 .../include/nel/pacs/u_move_primitive.h       |   0
 .../include/nel/pacs/u_primitive_block.h      |   0
 .../include/nel/pacs/u_retriever_bank.h       |   0
 .../nel => nel}/include/nel/pacs/vector_2s.h  |   0
 .../include/nel/pipeline/database_config.h    |   0
 .../include/nel/pipeline/project_config.h     |   0
 .../include/nel/pipeline/tool_logger.h        |   0
 .../include/nel/sound/CMakeLists.txt          |   0
 .../nel/sound/async_file_manager_sound.h      |   0
 .../include/nel/sound/audio_decoder.h         |   0
 .../include/nel/sound/audio_decoder_ffmpeg.h  |   0
 .../include/nel/sound/audio_decoder_mp3.h     |   0
 .../include/nel/sound/audio_decoder_vorbis.h  |   0
 .../include/nel/sound/audio_mixer_user.h      |   0
 .../include/nel/sound/background_sound.h      |   0
 .../nel/sound/background_sound_manager.h      |   0
 .../include/nel/sound/background_source.h     |   0
 .../include/nel/sound/clustered_sound.h       |   0
 .../include/nel/sound/complex_sound.h         |   0
 .../include/nel/sound/complex_source.h        |   0
 .../include/nel/sound/containers.h            |   0
 .../include/nel/sound/context_sound.h         |   0
 .../include/nel/sound/decoder/dr_mp3.h        |   0
 .../include/nel/sound/driver/CMakeLists.txt   |   0
 .../include/nel/sound/driver/buffer.h         |   0
 .../include/nel/sound/driver/effect.h         |   0
 .../include/nel/sound/driver/listener.h       |   0
 .../include/nel/sound/driver/music_channel.h  |   0
 .../include/nel/sound/driver/sound_driver.h   |   0
 .../include/nel/sound/driver/source.h         |   0
 .../include/nel/sound/group_controller.h      |   0
 .../include/nel/sound/group_controller_root.h |   0
 .../include/nel/sound/listener_user.h         |   0
 .../include/nel/sound/mixing_track.h          |   0
 .../include/nel/sound/music_channel_fader.h   |   0
 .../include/nel/sound/music_sound.h           |   0
 .../include/nel/sound/music_sound_manager.h   |   0
 .../include/nel/sound/music_source.h          |   0
 .../include/nel/sound/sample_bank.h           |   0
 .../include/nel/sound/sample_bank_manager.h   |   0
 .../include/nel/sound/simple_sound.h          |   0
 .../include/nel/sound/simple_source.h         |   0
 {code/nel => nel}/include/nel/sound/sound.h   |   0
 .../include/nel/sound/sound_anim_manager.h    |   0
 .../include/nel/sound/sound_anim_marker.h     |   0
 .../include/nel/sound/sound_animation.h       |   0
 .../include/nel/sound/sound_bank.h            |   0
 .../include/nel/sound/sound_pattern.h         |   0
 .../include/nel/sound/source_common.h         |   0
 .../include/nel/sound/source_music_channel.h  |   0
 .../include/nel/sound/stream_file_sound.h     |   0
 .../include/nel/sound/stream_file_source.h    |   0
 .../include/nel/sound/stream_sound.h          |   0
 .../include/nel/sound/stream_source.h         |   0
 .../include/nel/sound/u_audio_mixer.h         |   0
 .../include/nel/sound/u_group_controller.h    |   0
 .../include/nel/sound/u_listener.h            |   0
 .../nel => nel}/include/nel/sound/u_source.h  |   0
 .../include/nel/sound/u_stream_source.h       |   0
 .../include/nel/web/CMakeLists.txt            |   0
 .../include/nel/web/curl_certificates.h       |   0
 .../include/nel/web/http_client_curl.h        |   0
 .../include/nel/web/http_package_provider.h   |   0
 {code/nel => nel}/nel-config.in               |   0
 {code/nel => nel}/resources/nel.bmp           | Bin
 {code/nel => nel}/resources/nel.png           | Bin
 {code/nel => nel}/resources/nevraxpill.ico    | Bin
 {code/nel => nel}/samples/3d/CMakeLists.txt   |   0
 .../samples/3d/cegui/CMakeLists.txt           |   0
 .../samples/3d/cegui/NeLDriver.cpp            |   0
 .../nel => nel}/samples/3d/cegui/NeLDriver.h  |   0
 .../3d/cegui/datafiles/fonts/Commonv2c.ttf    | Bin
 .../datafiles/fonts/Commonwealth-10.font      |   0
 .../samples/3d/cegui/datafiles/fonts/Font.xsd |   0
 .../3d/cegui/datafiles/fonts/Legal.txt        |   0
 .../samples/3d/cegui/datafiles/fonts/README   |   0
 .../3d/cegui/datafiles/fonts/common.txt       |   0
 .../3d/cegui/datafiles/fonts/tahoma-12.font   |   0
 .../3d/cegui/datafiles/fonts/tahoma.ttf       | Bin
 .../datafiles/imagesets/GPN-2000-001437.tga   | Bin
 .../3d/cegui/datafiles/imagesets/Imageset.xsd |   0
 .../3d/cegui/datafiles/imagesets/ReadMe.txt   |   0
 .../datafiles/imagesets/TaharezLook.imageset  |   0
 .../cegui/datafiles/imagesets/TaharezLook.tga | Bin
 .../datafiles/imagesets/WerewolfLook.tga      | Bin
 .../datafiles/imagesets/WindowsLook.imageset  |   0
 .../cegui/datafiles/imagesets/WindowsLook.tga | Bin
 .../datafiles/imagesets/ogregui.imageset      |   0
 .../3d/cegui/datafiles/imagesets/ogregui.tga  | Bin
 .../datafiles/imagesets/werewolfgui.imageset  |   0
 .../cegui/datafiles/imagesets/werewolfgui.tga | Bin
 .../datafiles/layouts/Demo7Windows.layout     |   0
 .../3d/cegui/datafiles/layouts/GUILayout.xsd  |   0
 .../3d/cegui/datafiles/looknfeel/Falagard.xsd |   0
 .../datafiles/looknfeel/TaharezLook.looknfeel |   0
 .../datafiles/looknfeel/Vanilla.looknfeel     |   0
 .../datafiles/looknfeel/WindowsLook.looknfeel |   0
 .../samples/3d/cegui/datafiles/n019003l.pfb   | Bin
 .../3d/cegui/datafiles/schemes/GUIScheme.xsd  |   0
 .../datafiles/schemes/TaharezLook.scheme      |   0
 .../schemes/TaharezLookWidgetAliases.scheme   |   0
 .../schemes/TaharezLookWidgets.scheme         |   0
 .../datafiles/schemes/WindowsLook.scheme      |   0
 .../schemes/WindowsLookWidgets.scheme         |   0
 {code/nel => nel}/samples/3d/cegui/demonel.rc |   0
 {code/nel => nel}/samples/3d/cegui/globals.h  |   0
 {code/nel => nel}/samples/3d/cegui/icon1.ico  | Bin
 {code/nel => nel}/samples/3d/cegui/main.cpp   |   0
 {code/nel => nel}/samples/3d/cegui/resource.h |   0
 .../nel => nel}/samples/3d/cegui/resource1.h  |   0
 .../samples/3d/cluster_viewer/CMakeLists.txt  |   0
 .../3d/cluster_viewer/fonts/n019003l.pfb      | Bin
 .../3d/cluster_viewer/groups/street.ig        | Bin
 .../samples/3d/cluster_viewer/main.cpp        |   0
 .../samples/3d/cluster_viewer/main.cvs        |   0
 .../samples/3d/cluster_viewer/max/street.max  | Bin
 .../samples/3d/cluster_viewer/readme.txt      |   0
 .../3d/cluster_viewer/shapes/box02.shape      | Bin
 .../3d/cluster_viewer/shapes/sphere01.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere02.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere03.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere04.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere05.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere06.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere07.shape   | Bin
 .../3d/cluster_viewer/shapes/sphere08.shape   | Bin
 .../samples/3d/font/CMakeLists.txt            |   0
 .../nel => nel}/samples/3d/font/beteckna.ttf  | Bin
 {code/nel => nel}/samples/3d/font/main.cpp    |   0
 .../samples/3d/nel_qt/callback.cpp            |   0
 .../nel => nel}/samples/3d/nel_qt/callback.h  |   0
 .../samples/3d/nel_qt/command_log.cpp         |   0
 .../samples/3d/nel_qt/command_log.h           |   0
 .../samples/3d/nel_qt/configuration.cpp       |   0
 .../samples/3d/nel_qt/configuration.h         |   0
 .../samples/3d/nel_qt/data/andbasr.ttf        | Bin
 .../samples/3d/nel_qt/data/andbasr.txt        |   0
 .../nel => nel}/samples/3d/nel_qt/data/en.uxt |   0
 .../samples/3d/nel_qt/graphics_config.cpp     |   0
 .../samples/3d/nel_qt/graphics_config.h       |   0
 .../samples/3d/nel_qt/graphics_viewport.cpp   |   0
 .../samples/3d/nel_qt/graphics_viewport.h     |   0
 .../3d/nel_qt/internationalization.cpp        |   0
 .../samples/3d/nel_qt/internationalization.h  |   0
 .../samples/3d/nel_qt/main_window.cpp         |   0
 .../samples/3d/nel_qt/main_window.h           |   0
 .../nel => nel}/samples/3d/nel_qt/nel_qt.cfg  |   0
 .../nel => nel}/samples/3d/nel_qt/nel_qt.cpp  |   0
 {code/nel => nel}/samples/3d/nel_qt/nel_qt.h  |   0
 .../samples/3d/nel_qt/nel_qt_config.h         |   0
 .../samples/3d/nel_qt/nel_qt_default.cfg      |   0
 .../samples/3d/nel_qt/qtcolorpicker.h         |   0
 .../samples/3d/nel_qt/qtcolorpicker_cpp.h     |   0
 .../samples/3d/nel_qt/sound_utilities.cpp     |   0
 .../samples/3d/nel_qt/sound_utilities.h       |   0
 .../samples/3d/nel_qt/undo_redo_binders.cpp   |   0
 .../samples/3d/nel_qt/undo_redo_binders.h     |   0
 .../samples/3d/qtnel/CMakeLists.txt           |   0
 {code/nel => nel}/samples/3d/qtnel/main.cpp   |   0
 .../samples/3d/qtnel/qnelwidget.cpp           |   0
 .../nel => nel}/samples/3d/qtnel/qnelwidget.h |   0
 .../samples/3d/qtnel/qnelwindow.cpp           |   0
 .../nel => nel}/samples/3d/qtnel/qnelwindow.h |   0
 .../samples/3d/shape_viewer/CMakeLists.txt    |   0
 .../samples/3d/shape_viewer/main.cpp          |   0
 {code/nel => nel}/samples/CMakeLists.txt      |   0
 .../samples/georges/CMakeLists.txt            |   0
 {code/nel => nel}/samples/georges/boolean.typ |   0
 .../samples/georges/coolfilesinfo.dfn         |   0
 .../samples/georges/default.sample_config     |   0
 {code/nel => nel}/samples/georges/int.typ     |   0
 {code/nel => nel}/samples/georges/main.cpp    |   0
 .../samples/georges/positiondata.dfn          |   0
 .../samples/georges/sample_config.dfn         |   0
 .../nel => nel}/samples/georges/sheet_id.bin  | Bin
 {code/nel => nel}/samples/georges/string.typ  |   0
 {code/nel => nel}/samples/misc/CMakeLists.txt |   0
 .../samples/misc/callback/CMakeLists.txt      |   0
 .../samples/misc/callback/main.cpp            |   0
 .../samples/misc/command/CMakeLists.txt       |   0
 .../nel => nel}/samples/misc/command/main.cpp |   0
 .../samples/misc/configfile/CMakeLists.txt    |   0
 .../samples/misc/configfile/main.cpp          |   0
 .../samples/misc/configfile/simpletest.txt    |   0
 .../samples/misc/debug/CMakeLists.txt         |   0
 {code/nel => nel}/samples/misc/debug/main.cpp |   0
 .../samples/misc/i18n/CMakeLists.txt          |   0
 {code/nel => nel}/samples/misc/i18n/de.uxt    |   0
 {code/nel => nel}/samples/misc/i18n/en.uxt    |   0
 {code/nel => nel}/samples/misc/i18n/fr.uxt    |   0
 {code/nel => nel}/samples/misc/i18n/main.cpp  |   0
 .../samples/misc/log/CMakeLists.txt           |   0
 {code/nel => nel}/samples/misc/log/main.cpp   |   0
 .../samples/misc/strings/CMakeLists.txt       |   0
 .../nel => nel}/samples/misc/strings/main.cpp |   0
 .../samples/misc/types_check/CMakeLists.txt   |   0
 .../samples/misc/types_check/main.cpp         |   0
 {code/nel => nel}/samples/net/CMakeLists.txt  |   0
 .../samples/net/chat/CMakeLists.txt           |   0
 .../samples/net/chat/chat_service.cfg         |   0
 {code/nel => nel}/samples/net/chat/client.cfg |   0
 {code/nel => nel}/samples/net/chat/client.cpp |   0
 {code/nel => nel}/samples/net/chat/kbhit.cpp  |   0
 {code/nel => nel}/samples/net/chat/kbhit.h    |   0
 {code/nel => nel}/samples/net/chat/server.cpp |   0
 .../net/class_transport/CMakeLists.txt        |   0
 .../net/class_transport/ai_service.cfg        |   0
 .../net/class_transport/ai_service.cpp        |   0
 .../net/class_transport/gd_service.cfg        |   0
 .../net/class_transport/gd_service.cpp        |   0
 .../samples/net/login_system/CMakeLists.txt   |   0
 .../samples/net/login_system/client.cfg       |   0
 .../samples/net/login_system/client.cpp       |   0
 .../net/login_system/frontend_service.cfg     |   0
 .../net/login_system/frontend_service.cpp     |   0
 .../samples/net/multi_shards/client.cpp       |   0
 .../net/multi_shards/frontend_service.cpp     |   0
 .../01_admin_executor_service.lnk             | Bin
 .../shard_config/02_login_service.lnk         | Bin
 .../shard_config/03_naming_service_shard1.lnk | Bin
 .../04_welcome_service_shard1.lnk             | Bin
 .../05_frontend_service_shard1.lnk            | Bin
 .../shard_config/06_naming_service_shard2.lnk | Bin
 .../07_welcome_service_shard2.lnk             | Bin
 .../08_frontend_service_shard2.lnk            | Bin
 .../shard_config/09_naming_service_shard3.lnk | Bin
 .../10_frontend_service_shard3.lnk            | Bin
 .../11_welcome_service_shard3.lnk             | Bin
 .../multi_shards/shard_config/12_client.lnk   | Bin
 .../shard_config/admin_executor_service.cfg   |   0
 .../net/multi_shards/shard_config/client.cfg  |   0
 .../shard_config/login_service.cfg            |   0
 .../shard_config/login_service_database.cfg   |   0
 .../shard1_config/frontend_service.cfg        |   0
 .../shard1_config/naming_service.cfg          |   0
 .../shard1_config/welcome_service.cfg         |   0
 .../shard2_config/frontend_service.cfg        |   0
 .../shard2_config/naming_service.cfg          |   0
 .../shard2_config/welcome_service.cfg         |   0
 .../shard3_config/frontend_service.cfg        |   0
 .../shard3_config/naming_service.cfg          |   0
 .../shard3_config/welcome_service.cfg         |   0
 .../samples/net/net_layer3/client.cpp         |   0
 .../net/net_layer3/frontend_service.cfg       |   0
 .../net/net_layer3/frontend_service.cpp       |   0
 .../samples/net/net_layer3/ping_service.cfg   |   0
 .../samples/net/net_layer3/ping_service.cpp   |   0
 .../samples/net/net_layer4/client.cpp         |   0
 .../net/net_layer4/frontend_service.cfg       |   0
 .../net/net_layer4/frontend_service.cpp       |   0
 .../samples/net/net_layer4/ping_service.cfg   |   0
 .../samples/net/net_layer4/ping_service.cpp   |   0
 .../samples/net/net_layer5/flood_service.cfg  |   0
 .../samples/net/net_layer5/flood_service.cpp  |   0
 .../net/net_layer5/frontend_service.cfg       |   0
 .../net/net_layer5/frontend_service.cpp       |   0
 .../samples/net/net_layer5/gpm_service.cfg    |   0
 .../samples/net/net_layer5/gpm_service.cpp    |   0
 .../samples/net/net_layer5/ping_service.cfg   |   0
 .../samples/net/net_layer5/ping_service.cpp   |   0
 .../samples/net/net_layer5/player_service.cfg |   0
 .../samples/net/net_layer5/player_service.cpp |   0
 .../samples/net/service/chat_service.cfg      |   0
 .../samples/net/service/chat_service.cpp      |   0
 .../samples/net/udp/CMakeLists.txt            |   0
 .../samples/net/udp/bench_service.cfg         |   0
 .../samples/net/udp/bench_service.cpp         |   0
 {code/nel => nel}/samples/net/udp/client.cfg  |   0
 {code/nel => nel}/samples/net/udp/client.cpp  |   0
 {code/nel => nel}/samples/net/udp/graph.cpp   |   0
 {code/nel => nel}/samples/net/udp/graph.h     |   0
 .../nel => nel}/samples/net/udp/n019003l.pfb  | Bin
 {code/nel => nel}/samples/net/udp/readme.txt  |   0
 .../samples/net/udp/receive_task.cpp          |   0
 .../samples/net/udp/receive_task.h            |   0
 {code/nel => nel}/samples/net/udp/simlag.cpp  |   0
 {code/nel => nel}/samples/net/udp/simlag.h    |   0
 .../samples/net/udp_ping/client.cpp           |   0
 .../samples/net/udp_ping/udp_service.cfg      |   0
 .../samples/net/udp_ping/udp_service.cpp      |   0
 {code/nel => nel}/samples/pacs/CMakeLists.txt |   0
 {code/nel => nel}/samples/pacs/main.cpp       |   0
 {code/nel => nel}/samples/pacs/object.cpp     |   0
 {code/nel => nel}/samples/pacs/object.h       |   0
 {code/nel => nel}/samples/pacs/readme.txt     |   0
 .../samples/pacs/shapes/arena.shape           | Bin
 .../samples/pacs/shapes/cylinder.shape        | Bin
 .../samples/pacs/shapes/rectangle.shape       | Bin
 .../nel => nel}/samples/sound/CMakeLists.txt  |   0
 .../sound/sound_sources/CMakeLists.txt        |   0
 .../sound/sound_sources/data/DFN/alpha.typ    |   0
 .../sound/sound_sources/data/DFN/angle.typ    |   0
 .../data/DFN/backgound_sound_item.dfn         |   0
 .../data/DFN/background_flag_config.dfn       |   0
 .../data/DFN/background_sound.dfn             |   0
 .../sound_sources/data/DFN/basics/_typ.dfn    |   0
 .../sound_sources/data/DFN/basics/_type.typ   |   0
 .../sound_sources/data/DFN/basics/boolean.typ |   0
 .../data/DFN/basics/filename.typ              |   0
 .../sound_sources/data/DFN/basics/float.typ   |   0
 .../data/DFN/basics/iboolean.typ              |   0
 .../sound_sources/data/DFN/basics/int.typ     |   0
 .../sound_sources/data/DFN/basics/string.typ  |   0
 .../sound_sources/data/DFN/basics/typ.dfn     |   0
 .../sound_sources/data/DFN/complex_sound.dfn  |   0
 .../sound_sources/data/DFN/context_sound.dfn  |   0
 .../sound_sources/data/DFN/direction.dfn      |   0
 .../sound/sound_sources/data/DFN/distance.typ |   0
 .../sound/sound_sources/data/DFN/doppler.typ  |   0
 .../sound/sound_sources/data/DFN/gain.typ     |   0
 .../sound/sound_sources/data/DFN/listener.dfn |   0
 .../sound_sources/data/DFN/mixer_config.dfn   |   0
 .../sound_sources/data/DFN/music_sound.dfn    |   0
 .../sound_sources/data/DFN/parameter_id.typ   |   0
 .../sound_sources/data/DFN/pattern_mode.typ   |   0
 .../sound/sound_sources/data/DFN/priority.typ |   0
 .../sound/sound_sources/data/DFN/rolloff.typ  |   0
 .../sound_sources/data/DFN/simple_sound.dfn   |   0
 .../sound/sound_sources/data/DFN/sound.dfn    |   0
 .../sound_sources/data/DFN/sound_group.dfn    |   0
 .../data/DFN/sound_group_item.dfn             |   0
 .../sound_sources/data/DFN/soundbank.dfn      |   0
 .../sound_sources/data/DFN/transposition.typ  |   0
 .../data/DFN/user_var_binding.dfn             |   0
 .../sound_sources/data/animations/readme.txt  |   0
 .../data/animations/test_anim.sound_anim      |   0
 .../background_sound.primitive                |   0
 .../data/background_sounds/readme.txt         |   0
 .../data/cluster_sound/readme.txt             |   0
 .../cluster_sound/test_clusters.sound_group   |   0
 .../sound_sources/data/default.mixer_config   |   0
 .../data/samplebank/base_samples/beep.wav     | Bin
 .../data/samplebank/base_samples/tuut.wav     | Bin
 .../sound_sources/data/soundbank/beep.sound   |   0
 .../sound_sources/data/soundbank/tuut.sound   |   0
 .../data/world_editor_classes.xml             |   0
 .../samples/sound/sound_sources/main.cpp      |   0
 .../samples/sound/stream_file/CMakeLists.txt  |   0
 .../stream_file/base_samples.sample_bank      | Bin
 .../stream_file/data/DFN/basics/_typ.dfn      |   0
 .../stream_file/data/DFN/basics/_type.typ     |   0
 .../stream_file/data/DFN/basics/boolean.typ   |   0
 .../stream_file/data/DFN/basics/filename.typ  |   0
 .../stream_file/data/DFN/basics/float.typ     |   0
 .../stream_file/data/DFN/basics/iboolean.typ  |   0
 .../sound/stream_file/data/DFN/basics/int.typ |   0
 .../stream_file/data/DFN/basics/sint16.typ    |   0
 .../stream_file/data/DFN/basics/sint32.typ    |   0
 .../stream_file/data/DFN/basics/sint64.typ    |   0
 .../stream_file/data/DFN/basics/sint8.typ     |   0
 .../stream_file/data/DFN/basics/string.typ    |   0
 .../sound/stream_file/data/DFN/basics/typ.dfn |   0
 .../stream_file/data/DFN/basics/uint16.typ    |   0
 .../stream_file/data/DFN/basics/uint32.typ    |   0
 .../stream_file/data/DFN/basics/uint64.typ    |   0
 .../stream_file/data/DFN/basics/uint8.typ     |   0
 .../stream_file/data/DFN/sound/alpha.typ      |   0
 .../stream_file/data/DFN/sound/angle.typ      |   0
 .../data/DFN/sound/backgound_sound_item.dfn   |   0
 .../data/DFN/sound/background_flag_config.dfn |   0
 .../data/DFN/sound/background_sound.dfn       |   0
 .../data/DFN/sound/complex_sound.dfn          |   0
 .../data/DFN/sound/context_sound.dfn          |   0
 .../stream_file/data/DFN/sound/direction.dfn  |   0
 .../stream_file/data/DFN/sound/distance.typ   |   0
 .../stream_file/data/DFN/sound/doppler.typ    |   0
 .../sound/stream_file/data/DFN/sound/gain.typ |   0
 .../stream_file/data/DFN/sound/listener.dfn   |   0
 .../data/DFN/sound/mixer_config.dfn           |   0
 .../data/DFN/sound/music_sound.dfn            |   0
 .../data/DFN/sound/parameter_id.typ           |   0
 .../data/DFN/sound/pattern_mode.typ           |   0
 .../stream_file/data/DFN/sound/priority.typ   |   0
 .../stream_file/data/DFN/sound/rolloff.typ    |   0
 .../data/DFN/sound/simple_sound.dfn           |   0
 .../stream_file/data/DFN/sound/sound.dfn      |   0
 .../data/DFN/sound/sound_group.dfn            |   0
 .../data/DFN/sound/sound_group_item.dfn       |   0
 .../stream_file/data/DFN/sound/soundbank.dfn  |   0
 .../data/DFN/sound/stream_file_sound.dfn      |   0
 .../data/DFN/sound/stream_sound.dfn           |   0
 .../data/DFN/sound/transposition.typ          |   0
 .../data/DFN/sound/user_var_binding.dfn       |   0
 .../stream_file/data/animations/readme.txt    |   0
 .../data/animations/test_anim.sound_anim      |   0
 .../background_sound.primitive                |   0
 .../data/background_sounds/readme.txt         |   0
 .../stream_file/data/cluster_sound/readme.txt |   0
 .../cluster_sound/test_clusters.sound_group   |   0
 .../stream_file/data/default.mixer_config     |   0
 .../data/samplebank/base_samples/beep.wav     | Bin
 .../data/samplebank/base_samples/tuut.wav     | Bin
 .../stream_file/data/soundbank/beep.sound     |   0
 .../data/soundbank/default_stream.sound       |   0
 .../data/soundbank/stream_file.sound          |   0
 .../stream_file/data/soundbank/tuut.sound     |   0
 .../stream_file/data/world_editor_classes.xml |   0
 .../samples/sound/stream_file/stream_file.cpp |   0
 .../sound/stream_ogg_vorbis/CMakeLists.txt    |   0
 .../database/build/sheet_id/sheet_id.bin      | Bin
 .../database/build/sheet_id/sheets.txt        |   0
 .../base_samples.sample_bank                  | Bin
 .../build/sound_sheets/sounds.packed_sheets   | Bin
 .../user_var_binding.packed_sheets            | Bin
 .../database/leveldesign/dfn/basics/_typ.dfn  |   0
 .../database/leveldesign/dfn/basics/_type.typ |   0
 .../leveldesign/dfn/basics/boolean.typ        |   0
 .../leveldesign/dfn/basics/filename.typ       |   0
 .../database/leveldesign/dfn/basics/float.typ |   0
 .../leveldesign/dfn/basics/iboolean.typ       |   0
 .../database/leveldesign/dfn/basics/int.typ   |   0
 .../leveldesign/dfn/basics/sint16.typ         |   0
 .../leveldesign/dfn/basics/sint32.typ         |   0
 .../leveldesign/dfn/basics/sint64.typ         |   0
 .../database/leveldesign/dfn/basics/sint8.typ |   0
 .../leveldesign/dfn/basics/string.typ         |   0
 .../database/leveldesign/dfn/basics/typ.dfn   |   0
 .../leveldesign/dfn/basics/uint16.typ         |   0
 .../leveldesign/dfn/basics/uint32.typ         |   0
 .../leveldesign/dfn/basics/uint64.typ         |   0
 .../database/leveldesign/dfn/basics/uint8.typ |   0
 .../database/leveldesign/dfn/sound/alpha.typ  |   0
 .../database/leveldesign/dfn/sound/angle.typ  |   0
 .../dfn/sound/backgound_sound_item.dfn        |   0
 .../dfn/sound/background_flag_config.dfn      |   0
 .../dfn/sound/background_sound.dfn            |   0
 .../leveldesign/dfn/sound/complex_sound.dfn   |   0
 .../leveldesign/dfn/sound/context_sound.dfn   |   0
 .../leveldesign/dfn/sound/direction.dfn       |   0
 .../leveldesign/dfn/sound/distance.typ        |   0
 .../leveldesign/dfn/sound/doppler.typ         |   0
 .../database/leveldesign/dfn/sound/gain.typ   |   0
 .../leveldesign/dfn/sound/listener.dfn        |   0
 .../leveldesign/dfn/sound/mixer_config.dfn    |   0
 .../leveldesign/dfn/sound/music_sound.dfn     |   0
 .../leveldesign/dfn/sound/parameter_id.typ    |   0
 .../leveldesign/dfn/sound/pattern_mode.typ    |   0
 .../leveldesign/dfn/sound/priority.typ        |   0
 .../leveldesign/dfn/sound/rolloff.typ         |   0
 .../leveldesign/dfn/sound/simple_sound.dfn    |   0
 .../database/leveldesign/dfn/sound/sound.dfn  |   0
 .../leveldesign/dfn/sound/sound_group.dfn     |   0
 .../dfn/sound/sound_group_item.dfn            |   0
 .../leveldesign/dfn/sound/soundbank.dfn       |   0
 .../leveldesign/dfn/sound/stream_sound.dfn    |   0
 .../leveldesign/dfn/sound/transposition.typ   |   0
 .../dfn/sound/user_var_binding.dfn            |   0
 .../leveldesign/sound/animations/readme.txt   |   0
 .../sound/background_sounds/readme.txt        |   0
 .../sound/cluster_sounds/readme.txt           |   0
 .../leveldesign/sound/default.mixer_config    |   0
 .../leveldesign/sound/soundbanks/beep.sound   |   0
 .../sound/soundbanks/default_stream.sound     |   0
 .../leveldesign/sound/soundbanks/tuut.sound   |   0
 .../sound/test_var_binding.user_var_binding   |   0
 .../sound/samplebanks/base_samples/beep.wav   | Bin
 .../sound/samplebanks/base_samples/tuut.wav   | Bin
 .../stream_ogg_vorbis/stream_ogg_vorbis.cpp   |   0
 {code/nel => nel}/src/3d/CMakeLists.txt       |   0
 {code/nel => nel}/src/3d/anim_detail_trav.cpp |   0
 {code/nel => nel}/src/3d/animatable.cpp       |   0
 .../nel => nel}/src/3d/animated_lightmap.cpp  |   0
 .../nel => nel}/src/3d/animated_material.cpp  |   0
 {code/nel => nel}/src/3d/animated_morph.cpp   |   0
 {code/nel => nel}/src/3d/animation.cpp        |   0
 .../src/3d/animation_optimizer.cpp            |   0
 .../nel => nel}/src/3d/animation_playlist.cpp |   0
 {code/nel => nel}/src/3d/animation_set.cpp    |   0
 .../nel => nel}/src/3d/animation_set_user.cpp |   0
 .../src/3d/async_file_manager_3d.cpp          |   0
 .../src/3d/async_texture_manager.cpp          |   0
 {code/nel => nel}/src/3d/bezier_patch.cpp     |   0
 {code/nel => nel}/src/3d/bloom_effect.cpp     |   0
 {code/nel => nel}/src/3d/bone.cpp             |   0
 {code/nel => nel}/src/3d/camera.cpp           |   0
 {code/nel => nel}/src/3d/camera_col.cpp       |   0
 {code/nel => nel}/src/3d/channel_mixer.cpp    |   0
 {code/nel => nel}/src/3d/clip_trav.cpp        |   0
 {code/nel => nel}/src/3d/cloud.cpp            |   0
 {code/nel => nel}/src/3d/cloud_scape.cpp      |   0
 {code/nel => nel}/src/3d/cloud_scape_user.cpp |   0
 {code/nel => nel}/src/3d/cluster.cpp          |   0
 .../nel => nel}/src/3d/coarse_mesh_build.cpp  |   0
 .../src/3d/coarse_mesh_manager.cpp            |   0
 {code/nel => nel}/src/3d/computed_string.cpp  |   0
 {code/nel => nel}/src/3d/cube_map_builder.cpp |   0
 {code/nel => nel}/src/3d/debug_vb.cpp         |   0
 {code/nel => nel}/src/3d/deform_2d.cpp        |   0
 {code/nel => nel}/src/3d/driver.cpp           |   0
 .../nel => nel}/src/3d/driver/CMakeLists.txt  |   0
 .../src/3d/driver/direct3d/CMakeLists.txt     |   0
 .../3d/driver/direct3d/driver_direct3d.cpp    |   0
 .../3d/driver/direct3d/driver_direct3d.def    |   0
 .../src/3d/driver/direct3d/driver_direct3d.h  |   0
 .../driver/direct3d/driver_direct3d_index.cpp |   0
 .../direct3d/driver_direct3d_inputs.cpp       |   0
 .../driver/direct3d/driver_direct3d_light.cpp |   0
 .../direct3d/driver_direct3d_material.cpp     |   0
 .../direct3d/driver_direct3d_matrix.cpp       |   0
 .../driver_direct3d_pixel_program.cpp         |   0
 .../direct3d/driver_direct3d_profile.cpp      |   0
 .../direct3d/driver_direct3d_render.cpp       |   0
 .../direct3d/driver_direct3d_shader.cpp       |   0
 .../direct3d/driver_direct3d_texture.cpp      |   0
 .../direct3d/driver_direct3d_uniform.cpp      |   0
 .../direct3d/driver_direct3d_vertex.cpp       |   0
 .../driver_direct3d_vertex_program.cpp        |   0
 .../src/3d/driver/direct3d/resources.rc       |   0
 .../src/3d/driver/direct3d/stddirect3d.cpp    |   0
 .../src/3d/driver/direct3d/stddirect3d.h      |   0
 .../src/3d/driver/opengl/CMakeLists.txt       |   0
 .../src/3d/driver/opengl/EGL/egl.h            |   0
 .../src/3d/driver/opengl/EGL/eglext.h         |   0
 .../src/3d/driver/opengl/EGL/eglplatform.h    |   0
 .../src/3d/driver/opengl/GL/glext.h           |   0
 .../src/3d/driver/opengl/GL/glxext.h          |   0
 .../src/3d/driver/opengl/GL/wglext.h          |   0
 .../src/3d/driver/opengl/GLES/egl.h           |   0
 .../src/3d/driver/opengl/GLES/gl.h            |   0
 .../src/3d/driver/opengl/GLES/glext.h         |   0
 .../src/3d/driver/opengl/GLES/glplatform.h    |   0
 .../src/3d/driver/opengl/KHR/khrplatform.h    |   0
 .../src/3d/driver/opengl/driver_opengl.cpp    |   0
 .../src/3d/driver/opengl/driver_opengl.def    |   0
 .../src/3d/driver/opengl/driver_opengl.h      |   0
 .../driver/opengl/driver_opengl_extension.cpp |   0
 .../driver/opengl/driver_opengl_extension.h   |   0
 .../opengl/driver_opengl_extension_def.h      |   0
 .../3d/driver/opengl/driver_opengl_inputs.cpp |   0
 .../3d/driver/opengl/driver_opengl_light.cpp  |   0
 .../driver/opengl/driver_opengl_material.cpp  |   0
 .../3d/driver/opengl/driver_opengl_matrix.cpp |   0
 .../opengl/driver_opengl_pixel_program.cpp    |   0
 .../3d/driver/opengl/driver_opengl_states.cpp |   0
 .../3d/driver/opengl/driver_opengl_states.h   |   0
 .../driver/opengl/driver_opengl_texture.cpp   |   0
 .../driver/opengl/driver_opengl_uniform.cpp   |   0
 .../3d/driver/opengl/driver_opengl_vertex.cpp |   0
 .../driver_opengl_vertex_buffer_hard.cpp      |   0
 .../opengl/driver_opengl_vertex_buffer_hard.h |   0
 .../opengl/driver_opengl_vertex_program.cpp   |   0
 .../3d/driver/opengl/driver_opengl_window.cpp |   0
 .../opengl/mac/cocoa_application_delegate.h   |   0
 .../opengl/mac/cocoa_application_delegate.mm  |   0
 .../driver/opengl/mac/cocoa_event_emitter.cpp |   0
 .../driver/opengl/mac/cocoa_event_emitter.h   |   0
 .../3d/driver/opengl/mac/cocoa_opengl_view.h  |   0
 .../3d/driver/opengl/mac/cocoa_opengl_view.mm |   0
 .../driver/opengl/mac/cocoa_window_delegate.h |   0
 .../opengl/mac/cocoa_window_delegate.mm       |   0
 .../src/3d/driver/opengl/nel-driverogl.pc     |   0
 .../src/3d/driver/opengl/nel-driverogl.pc.in  |   0
 .../src/3d/driver/opengl/resources.rc         |   0
 .../src/3d/driver/opengl/stdopengl.cpp        |   0
 .../src/3d/driver/opengl/stdopengl.h          |   0
 .../3d/driver/opengl/unix_event_emitter.cpp   |   0
 .../src/3d/driver/opengl/unix_event_emitter.h |   0
 .../src/3d/driver/opengles/CMakeLists.txt     |   0
 .../src/3d/driver/opengles/resources.rc       |   0
 {code/nel => nel}/src/3d/driver_user.cpp      |   0
 {code/nel => nel}/src/3d/driver_user2.cpp     |   0
 {code/nel => nel}/src/3d/dru.cpp              |   0
 .../src/3d/event_mouse_listener.cpp           |   0
 {code/nel => nel}/src/3d/fast_ptr_list.cpp    |   0
 {code/nel => nel}/src/3d/fasthls_modifier.cpp |   0
 {code/nel => nel}/src/3d/flare_model.cpp      |   0
 {code/nel => nel}/src/3d/flare_shape.cpp      |   0
 {code/nel => nel}/src/3d/font_generator.cpp   |   0
 {code/nel => nel}/src/3d/font_manager.cpp     |   0
 {code/nel => nel}/src/3d/frustum.cpp          |   0
 {code/nel => nel}/src/3d/fxaa.cpp             |   0
 {code/nel => nel}/src/3d/fxaa_program.h       |   0
 {code/nel => nel}/src/3d/geometry_program.cpp |   0
 .../nel => nel}/src/3d/gpu_program_params.cpp |   0
 {code/nel => nel}/src/3d/heat_haze.cpp        |   0
 {code/nel => nel}/src/3d/height_map.cpp       |   0
 .../nel => nel}/src/3d/hls_color_texture.cpp  |   0
 {code/nel => nel}/src/3d/hls_texture_bank.cpp |   0
 .../src/3d/hls_texture_manager.cpp            |   0
 {code/nel => nel}/src/3d/hrc_trav.cpp         |   0
 {code/nel => nel}/src/3d/ig_surface_light.cpp |   0
 .../src/3d/ig_surface_light_build.cpp         |   0
 {code/nel => nel}/src/3d/index_buffer.cpp     |   0
 {code/nel => nel}/src/3d/init_3d.cpp          |   0
 .../src/3d/instance_group_user.cpp            |   0
 {code/nel => nel}/src/3d/instance_lighter.cpp |   0
 {code/nel => nel}/src/3d/key.cpp              |   0
 {code/nel => nel}/src/3d/landscape.cpp        |   0
 .../src/3d/landscape_collision_grid.cpp       |   0
 {code/nel => nel}/src/3d/landscape_def.cpp    |   0
 .../src/3d/landscape_face_vector_manager.cpp  |   0
 {code/nel => nel}/src/3d/landscape_model.cpp  |   0
 .../nel => nel}/src/3d/landscape_profile.cpp  |   0
 {code/nel => nel}/src/3d/landscape_user.cpp   |   0
 .../src/3d/landscape_vegetable_block.cpp      |   0
 .../src/3d/landscapeig_manager.cpp            |   0
 .../src/3d/landscapevb_allocator.cpp          |   0
 {code/nel => nel}/src/3d/landscapevb_info.cpp |   0
 {code/nel => nel}/src/3d/light.cpp            |   0
 .../nel => nel}/src/3d/light_contribution.cpp |   0
 .../src/3d/light_influence_interpolator.cpp   |   0
 {code/nel => nel}/src/3d/light_trav.cpp       |   0
 {code/nel => nel}/src/3d/light_user.cpp       |   0
 {code/nel => nel}/src/3d/lighting_manager.cpp |   0
 .../src/3d/load_balancing_trav.cpp            |   0
 .../src/3d/lod_character_builder.cpp          |   0
 .../src/3d/lod_character_instance.cpp         |   0
 .../src/3d/lod_character_manager.cpp          |   0
 .../src/3d/lod_character_shape.cpp            |   0
 .../src/3d/lod_character_shape_bank.cpp       |   0
 .../src/3d/lod_character_texture.cpp          |   0
 {code/nel => nel}/src/3d/logic_info.cpp       |   0
 {code/nel => nel}/src/3d/material.cpp         |   0
 {code/nel => nel}/src/3d/mesh.cpp             |   0
 {code/nel => nel}/src/3d/mesh_base.cpp        |   0
 .../nel => nel}/src/3d/mesh_base_instance.cpp |   0
 {code/nel => nel}/src/3d/mesh_blender.cpp     |   0
 .../nel => nel}/src/3d/mesh_block_manager.cpp |   0
 {code/nel => nel}/src/3d/mesh_geom.cpp        |   0
 {code/nel => nel}/src/3d/mesh_instance.cpp    |   0
 {code/nel => nel}/src/3d/mesh_morpher.cpp     |   0
 {code/nel => nel}/src/3d/mesh_mrm.cpp         |   0
 .../nel => nel}/src/3d/mesh_mrm_instance.cpp  |   0
 {code/nel => nel}/src/3d/mesh_mrm_skin.cpp    |   0
 .../src/3d/mesh_mrm_skin_template.cpp         |   0
 {code/nel => nel}/src/3d/mesh_mrm_skinned.cpp |   0
 .../src/3d/mesh_mrm_skinned_instance.cpp      |   0
 .../src/3d/mesh_mrm_skinned_template.cpp      |   0
 {code/nel => nel}/src/3d/mesh_multi_lod.cpp   |   0
 .../src/3d/mesh_multi_lod_instance.cpp        |   0
 .../src/3d/meshvp_per_pixel_light.cpp         |   0
 {code/nel => nel}/src/3d/meshvp_wind_tree.cpp |   0
 {code/nel => nel}/src/3d/mini_col.cpp         |   0
 {code/nel => nel}/src/3d/motion_blur.cpp      |   0
 {code/nel => nel}/src/3d/mrm_builder.cpp      |   0
 {code/nel => nel}/src/3d/mrm_internal.cpp     |   0
 {code/nel => nel}/src/3d/mrm_level_detail.cpp |   0
 {code/nel => nel}/src/3d/mrm_mesh.cpp         |   0
 {code/nel => nel}/src/3d/nel-3d.pc            |   0
 {code/nel => nel}/src/3d/nel-3d.pc.in         |   0
 {code/nel => nel}/src/3d/nelu.cpp             |   0
 {code/nel => nel}/src/3d/noise_3d.cpp         |   0
 {code/nel => nel}/src/3d/packed_world.cpp     |   0
 {code/nel => nel}/src/3d/packed_zone.cpp      |   0
 {code/nel => nel}/src/3d/particle_system.cpp  |   0
 .../src/3d/particle_system_manager.cpp        |   0
 .../src/3d/particle_system_model.cpp          |   0
 .../src/3d/particle_system_process.cpp        |   0
 .../src/3d/particle_system_shape.cpp          |   0
 .../src/3d/particle_system_sound_user.cpp     |   0
 {code/nel => nel}/src/3d/patch.cpp            |   0
 {code/nel => nel}/src/3d/patch_lightmap.cpp   |   0
 {code/nel => nel}/src/3d/patch_noise.cpp      |   0
 {code/nel => nel}/src/3d/patch_rdr_pass.cpp   |   0
 {code/nel => nel}/src/3d/patch_render.cpp     |   0
 {code/nel => nel}/src/3d/patch_vegetable.cpp  |   0
 {code/nel => nel}/src/3d/patchdlm_context.cpp |   0
 {code/nel => nel}/src/3d/patchuv_locator.cpp  |   0
 {code/nel => nel}/src/3d/pixel_program.cpp    |   0
 .../nel => nel}/src/3d/play_list_manager.cpp  |   0
 .../src/3d/play_list_manager_user.cpp         |   0
 {code/nel => nel}/src/3d/play_list_user.cpp   |   0
 {code/nel => nel}/src/3d/point_light.cpp      |   0
 .../nel => nel}/src/3d/point_light_model.cpp  |   0
 .../nel => nel}/src/3d/point_light_named.cpp  |   0
 .../src/3d/point_light_named_array.cpp        |   0
 {code/nel => nel}/src/3d/portal.cpp           |   0
 .../nel => nel}/src/3d/primitive_profile.cpp  |   0
 {code/nel => nel}/src/3d/program.cpp          |   0
 {code/nel => nel}/src/3d/ps_allocator.cpp     |   0
 .../src/3d/ps_attrib_maker_bin_op.cpp         |   0
 .../src/3d/ps_attrib_maker_helper.cpp         |   0
 .../src/3d/ps_attrib_maker_template.cpp       |   0
 {code/nel => nel}/src/3d/ps_color.cpp         |   0
 {code/nel => nel}/src/3d/ps_dot.cpp           |   0
 {code/nel => nel}/src/3d/ps_emitter.cpp       |   0
 {code/nel => nel}/src/3d/ps_face.cpp          |   0
 {code/nel => nel}/src/3d/ps_face_look_at.cpp  |   0
 {code/nel => nel}/src/3d/ps_fan_light.cpp     |   0
 {code/nel => nel}/src/3d/ps_float.cpp         |   0
 {code/nel => nel}/src/3d/ps_force.cpp         |   0
 {code/nel => nel}/src/3d/ps_int.cpp           |   0
 {code/nel => nel}/src/3d/ps_light.cpp         |   0
 {code/nel => nel}/src/3d/ps_located.cpp       |   0
 {code/nel => nel}/src/3d/ps_mesh.cpp          |   0
 .../nel => nel}/src/3d/ps_particle_basic.cpp  |   0
 .../src/3d/ps_plane_basis_maker.cpp           |   0
 {code/nel => nel}/src/3d/ps_quad.cpp          |   0
 .../src/3d/ps_register_attribs.cpp            |   0
 .../src/3d/ps_register_emitters.cpp           |   0
 .../nel => nel}/src/3d/ps_register_forces.cpp |   0
 .../src/3d/ps_register_particles.cpp          |   0
 .../nel => nel}/src/3d/ps_register_zones.cpp  |   0
 {code/nel => nel}/src/3d/ps_ribbon.cpp        |   0
 {code/nel => nel}/src/3d/ps_ribbon_base.cpp   |   0
 .../nel => nel}/src/3d/ps_ribbon_look_at.cpp  |   0
 {code/nel => nel}/src/3d/ps_shockwave.cpp     |   0
 {code/nel => nel}/src/3d/ps_sound.cpp         |   0
 {code/nel => nel}/src/3d/ps_tail_dot.cpp      |   0
 {code/nel => nel}/src/3d/ps_util.cpp          |   0
 {code/nel => nel}/src/3d/ps_zone.cpp          |   0
 {code/nel => nel}/src/3d/quad_effect.cpp      |   0
 {code/nel => nel}/src/3d/quad_grid.cpp        |   0
 .../src/3d/quad_grid_clip_cluster.cpp         |   0
 .../src/3d/quad_grid_clip_manager.cpp         |   0
 {code/nel => nel}/src/3d/raw_skin.cpp         |   0
 {code/nel => nel}/src/3d/raw_skinned.cpp      |   0
 {code/nel => nel}/src/3d/ray_mesh.cpp         |   0
 {code/nel => nel}/src/3d/register_3d.cpp      |   0
 .../src/3d/render_target_manager.cpp          |   0
 {code/nel => nel}/src/3d/render_trav.cpp      |   0
 {code/nel => nel}/src/3d/root_model.cpp       |   0
 {code/nel => nel}/src/3d/scene.cpp            |   0
 {code/nel => nel}/src/3d/scene_group.cpp      |   0
 {code/nel => nel}/src/3d/scene_user.cpp       |   0
 {code/nel => nel}/src/3d/seg_remanence.cpp    |   0
 .../src/3d/seg_remanence_shape.cpp            |   0
 {code/nel => nel}/src/3d/shaders/compile.bat  |   0
 {code/nel => nel}/src/3d/shaders/fxaa3_11.h   |   0
 {code/nel => nel}/src/3d/shaders/fxaa_pp.cg   |   0
 .../src/3d/shaders/fxaa_pp_arbfp1.txt         |   0
 .../src/3d/shaders/fxaa_pp_ps_2_0.txt         |   0
 {code/nel => nel}/src/3d/shaders/fxaa_vp.cg   |   0
 .../src/3d/shaders/fxaa_vp_arbvp1.txt         |   0
 {code/nel => nel}/src/3d/shaders/readme.txt   |   0
 {code/nel => nel}/src/3d/shadow_map.cpp       |   0
 .../nel => nel}/src/3d/shadow_map_manager.cpp |   0
 .../src/3d/shadow_poly_receiver.cpp           |   0
 {code/nel => nel}/src/3d/shadow_skin.cpp      |   0
 {code/nel => nel}/src/3d/shape.cpp            |   0
 {code/nel => nel}/src/3d/shape_bank.cpp       |   0
 {code/nel => nel}/src/3d/shape_bank_user.cpp  |   0
 {code/nel => nel}/src/3d/shape_info.cpp       |   0
 .../src/3d/shifted_triangle_cache.cpp         |   0
 {code/nel => nel}/src/3d/skeleton_model.cpp   |   0
 {code/nel => nel}/src/3d/skeleton_shape.cpp   |   0
 .../src/3d/skeleton_spawn_script.cpp          |   0
 {code/nel => nel}/src/3d/skeleton_weight.cpp  |   0
 {code/nel => nel}/src/3d/std3d.cpp            |   0
 {code/nel => nel}/src/3d/std3d.h              |   0
 {code/nel => nel}/src/3d/stereo_debugger.cpp  |   0
 {code/nel => nel}/src/3d/stereo_display.cpp   |   0
 {code/nel => nel}/src/3d/stereo_hmd.cpp       |   0
 {code/nel => nel}/src/3d/stereo_libvr.cpp     |   0
 {code/nel => nel}/src/3d/stereo_ovr.cpp       |   0
 {code/nel => nel}/src/3d/stereo_ovr_04.cpp    |   0
 .../src/3d/stereo_ovr_04_program.h            |   0
 {code/nel => nel}/src/3d/stereo_ovr_fp.cpp    |   0
 {code/nel => nel}/src/3d/stripifier.cpp       |   0
 .../nel => nel}/src/3d/surface_light_grid.cpp |   0
 .../src/3d/tangent_space_build.cpp            |   0
 {code/nel => nel}/src/3d/target_anim_ctrl.cpp |   0
 {code/nel => nel}/src/3d/tess_block.cpp       |   0
 .../src/3d/tess_face_priority_list.cpp        |   0
 {code/nel => nel}/src/3d/tessellation.cpp     |   0
 {code/nel => nel}/src/3d/text_context.cpp     |   0
 .../nel => nel}/src/3d/text_context_user.cpp  |   0
 {code/nel => nel}/src/3d/texture.cpp          |   0
 {code/nel => nel}/src/3d/texture_blank.cpp    |   0
 {code/nel => nel}/src/3d/texture_blend.cpp    |   0
 {code/nel => nel}/src/3d/texture_bump.cpp     |   0
 {code/nel => nel}/src/3d/texture_cube.cpp     |   0
 {code/nel => nel}/src/3d/texture_dlm.cpp      |   0
 {code/nel => nel}/src/3d/texture_emboss.cpp   |   0
 {code/nel => nel}/src/3d/texture_far.cpp      |   0
 {code/nel => nel}/src/3d/texture_file.cpp     |   0
 {code/nel => nel}/src/3d/texture_font.cpp     |   0
 {code/nel => nel}/src/3d/texture_grouped.cpp  |   0
 {code/nel => nel}/src/3d/texture_mem.cpp      |   0
 .../nel => nel}/src/3d/texture_multi_file.cpp |   0
 {code/nel => nel}/src/3d/texture_near.cpp     |   0
 {code/nel => nel}/src/3d/tile_bank.cpp        |   0
 {code/nel => nel}/src/3d/tile_element.cpp     |   0
 {code/nel => nel}/src/3d/tile_far_bank.cpp    |   0
 .../src/3d/tile_light_influence.cpp           |   0
 {code/nel => nel}/src/3d/tile_lumel.cpp       |   0
 {code/nel => nel}/src/3d/tile_noise_map.cpp   |   0
 .../src/3d/tile_vegetable_desc.cpp            |   0
 {code/nel => nel}/src/3d/track.cpp            |   0
 {code/nel => nel}/src/3d/track_keyframer.cpp  |   0
 .../src/3d/track_sampled_common.cpp           |   0
 .../nel => nel}/src/3d/track_sampled_quat.cpp |   0
 .../3d/track_sampled_quat_small_header.cpp    |   0
 .../src/3d/track_sampled_vector.cpp           |   0
 {code/nel => nel}/src/3d/transform.cpp        |   0
 {code/nel => nel}/src/3d/transform_shape.cpp  |   0
 {code/nel => nel}/src/3d/transformable.cpp    |   0
 {code/nel => nel}/src/3d/u_bone.cpp           |   0
 {code/nel => nel}/src/3d/u_camera.cpp         |   0
 {code/nel => nel}/src/3d/u_instance.cpp       |   0
 .../src/3d/u_instance_material.cpp            |   0
 {code/nel => nel}/src/3d/u_material.cpp       |   0
 .../src/3d/u_particle_system_instance.cpp     |   0
 {code/nel => nel}/src/3d/u_point_light.cpp    |   0
 {code/nel => nel}/src/3d/u_shape.cpp          |   0
 {code/nel => nel}/src/3d/u_skeleton.cpp       |   0
 {code/nel => nel}/src/3d/u_transform.cpp      |   0
 {code/nel => nel}/src/3d/u_transformable.cpp  |   0
 .../src/3d/u_visual_collision_mesh.cpp        |   0
 {code/nel => nel}/src/3d/u_water.cpp          |   0
 {code/nel => nel}/src/3d/vegetable.cpp        |   0
 .../src/3d/vegetable_blend_layer_model.cpp    |   0
 .../src/3d/vegetable_clip_block.cpp           |   0
 .../src/3d/vegetable_instance_group.cpp       |   0
 .../nel => nel}/src/3d/vegetable_light_ex.cpp |   0
 .../nel => nel}/src/3d/vegetable_manager.cpp  |   0
 .../nel => nel}/src/3d/vegetable_quadrant.cpp |   0
 {code/nel => nel}/src/3d/vegetable_shape.cpp  |   0
 .../src/3d/vegetable_sort_block.cpp           |   0
 .../src/3d/vegetablevb_allocator.cpp          |   0
 {code/nel => nel}/src/3d/vertex_buffer.cpp    |   0
 .../nel => nel}/src/3d/vertex_buffer_heap.cpp |   0
 {code/nel => nel}/src/3d/vertex_program.cpp   |   0
 .../src/3d/vertex_program_parse.cpp           |   0
 .../src/3d/vertex_stream_manager.cpp          |   0
 {code/nel => nel}/src/3d/viewport.cpp         |   0
 .../src/3d/visual_collision_entity.cpp        |   0
 .../src/3d/visual_collision_entity_user.cpp   |   0
 .../src/3d/visual_collision_manager.cpp       |   0
 .../src/3d/visual_collision_manager_user.cpp  |   0
 .../src/3d/visual_collision_mesh.cpp          |   0
 {code/nel => nel}/src/3d/water_env_map.cpp    |   0
 .../nel => nel}/src/3d/water_env_map_user.cpp |   0
 {code/nel => nel}/src/3d/water_height_map.cpp |   0
 {code/nel => nel}/src/3d/water_model.cpp      |   0
 .../nel => nel}/src/3d/water_pool_manager.cpp |   0
 {code/nel => nel}/src/3d/water_shape.cpp      |   0
 {code/nel => nel}/src/3d/zone.cpp             |   0
 .../src/3d/zone_corner_smoother.cpp           |   0
 {code/nel => nel}/src/3d/zone_lighter.cpp     |   0
 {code/nel => nel}/src/3d/zone_manager.cpp     |   0
 {code/nel => nel}/src/3d/zone_search.cpp      |   0
 {code/nel => nel}/src/3d/zone_smoother.cpp    |   0
 .../src/3d/zone_symmetrisation.cpp            |   0
 .../nel => nel}/src/3d/zone_tgt_smoother.cpp  |   0
 {code/nel => nel}/src/CMakeLists.txt          |   0
 {code/nel => nel}/src/cegui/CMakeLists.txt    |   0
 .../src/cegui/nelceguirenderer.def            |   0
 {code/nel => nel}/src/cegui/nellogger.cpp     |   0
 {code/nel => nel}/src/cegui/nelrenderer.cpp   |   0
 .../src/cegui/nelresourceprovider.cpp         |   0
 {code/nel => nel}/src/cegui/neltexture.cpp    |   0
 {code/nel => nel}/src/georges/CMakeLists.txt  |   0
 {code/nel => nel}/src/georges/form.cpp        |   0
 {code/nel => nel}/src/georges/form_dfn.cpp    |   0
 {code/nel => nel}/src/georges/form_elm.cpp    |   0
 {code/nel => nel}/src/georges/form_loader.cpp |   0
 .../src/georges/georges_file_format.txt       |   0
 {code/nel => nel}/src/georges/header.cpp      |   0
 .../nel => nel}/src/georges/nel-georges.pc.in |   0
 {code/nel => nel}/src/georges/stdgeorges.cpp  |   0
 {code/nel => nel}/src/georges/stdgeorges.h    |   0
 {code/nel => nel}/src/georges/type.cpp        |   0
 {code/nel => nel}/src/gui/CMakeLists.txt      |   0
 {code/nel => nel}/src/gui/action_handler.cpp  |   0
 .../src/gui/css_border_renderer.cpp           |   0
 {code/nel => nel}/src/gui/css_parser.cpp      |   0
 {code/nel => nel}/src/gui/css_selector.cpp    |   0
 {code/nel => nel}/src/gui/css_style.cpp       |   0
 {code/nel => nel}/src/gui/ctrl_base.cpp       |   0
 .../nel => nel}/src/gui/ctrl_base_button.cpp  |   0
 {code/nel => nel}/src/gui/ctrl_button.cpp     |   0
 {code/nel => nel}/src/gui/ctrl_col_pick.cpp   |   0
 {code/nel => nel}/src/gui/ctrl_draggable.cpp  |   0
 {code/nel => nel}/src/gui/ctrl_polygon.cpp    |   0
 {code/nel => nel}/src/gui/ctrl_quad.cpp       |   0
 {code/nel => nel}/src/gui/ctrl_scroll.cpp     |   0
 .../nel => nel}/src/gui/ctrl_scroll_base.cpp  |   0
 .../src/gui/ctrl_sheet_selection.cpp          |   0
 .../nel => nel}/src/gui/ctrl_text_button.cpp  |   0
 {code/nel => nel}/src/gui/ctrl_tooltip.cpp    |   0
 {code/nel => nel}/src/gui/db_manager.cpp      |   0
 .../nel => nel}/src/gui/dbgroup_combo_box.cpp |   0
 .../src/gui/dbgroup_select_number.cpp         |   0
 {code/nel => nel}/src/gui/dbview_bar.cpp      |   0
 {code/nel => nel}/src/gui/dbview_bar3.cpp     |   0
 {code/nel => nel}/src/gui/dbview_digit.cpp    |   0
 {code/nel => nel}/src/gui/dbview_number.cpp   |   0
 {code/nel => nel}/src/gui/dbview_quantity.cpp |   0
 .../nel => nel}/src/gui/event_descriptor.cpp  |   0
 {code/nel => nel}/src/gui/event_listener.cpp  |   0
 {code/nel => nel}/src/gui/group_container.cpp |   0
 .../src/gui/group_container_base.cpp          |   0
 {code/nel => nel}/src/gui/group_editbox.cpp   |   0
 .../src/gui/group_editbox_base.cpp            |   0
 .../src/gui/group_editbox_decor.cpp           |   0
 {code/nel => nel}/src/gui/group_frame.cpp     |   0
 {code/nel => nel}/src/gui/group_header.cpp    |   0
 {code/nel => nel}/src/gui/group_html.cpp      |   0
 {code/nel => nel}/src/gui/group_list.cpp      |   0
 {code/nel => nel}/src/gui/group_menu.cpp      |   0
 {code/nel => nel}/src/gui/group_modal.cpp     |   0
 {code/nel => nel}/src/gui/group_paragraph.cpp |   0
 .../nel => nel}/src/gui/group_scrolltext.cpp  |   0
 .../src/gui/group_submenu_base.cpp            |   0
 {code/nel => nel}/src/gui/group_tab.cpp       |   0
 {code/nel => nel}/src/gui/group_table.cpp     |   0
 {code/nel => nel}/src/gui/group_tree.cpp      |   0
 {code/nel => nel}/src/gui/group_wheel.cpp     |   0
 {code/nel => nel}/src/gui/html_element.cpp    |   0
 {code/nel => nel}/src/gui/html_parser.cpp     |   0
 {code/nel => nel}/src/gui/http_cache.cpp      |   0
 {code/nel => nel}/src/gui/http_hsts.cpp       |   0
 {code/nel => nel}/src/gui/input_handler.cpp   |   0
 {code/nel => nel}/src/gui/interface_anim.cpp  |   0
 .../nel => nel}/src/gui/interface_element.cpp |   0
 {code/nel => nel}/src/gui/interface_expr.cpp  |   0
 .../src/gui/interface_expr_node.cpp           |   0
 .../src/gui/interface_expr_user_fct.cpp       |   0
 .../nel => nel}/src/gui/interface_factory.cpp |   0
 {code/nel => nel}/src/gui/interface_group.cpp |   0
 {code/nel => nel}/src/gui/interface_link.cpp  |   0
 .../nel => nel}/src/gui/interface_options.cpp |   0
 .../nel => nel}/src/gui/interface_parser.cpp  |   0
 .../src/gui/interface_property.cpp            |   0
 {code/nel => nel}/src/gui/libwww.cpp          |   0
 {code/nel => nel}/src/gui/link_hack.cpp       |   0
 {code/nel => nel}/src/gui/lua_helper.cpp      |   0
 {code/nel => nel}/src/gui/lua_ihm.cpp         |   0
 {code/nel => nel}/src/gui/lua_loadlib.c       |   0
 {code/nel => nel}/src/gui/lua_manager.cpp     |   0
 {code/nel => nel}/src/gui/lua_object.cpp      |   0
 {code/nel => nel}/src/gui/parser.cpp          |   0
 {code/nel => nel}/src/gui/proc.cpp            |   0
 {code/nel => nel}/src/gui/reflect.cpp         |   0
 .../nel => nel}/src/gui/reflect_register.cpp  |   0
 {code/nel => nel}/src/gui/root_group.cpp      |   0
 {code/nel => nel}/src/gui/stdpch.cpp          |   0
 {code/nel => nel}/src/gui/stdpch.h            |   0
 {code/nel => nel}/src/gui/string_case.cpp     |   0
 {code/nel => nel}/src/gui/url_parser.cpp      |   0
 {code/nel => nel}/src/gui/view_base.cpp       |   0
 {code/nel => nel}/src/gui/view_bitmap.cpp     |   0
 .../nel => nel}/src/gui/view_bitmap_combo.cpp |   0
 {code/nel => nel}/src/gui/view_link.cpp       |   0
 {code/nel => nel}/src/gui/view_pointer.cpp    |   0
 .../nel => nel}/src/gui/view_pointer_base.cpp |   0
 {code/nel => nel}/src/gui/view_polygon.cpp    |   0
 {code/nel => nel}/src/gui/view_quad.cpp       |   0
 {code/nel => nel}/src/gui/view_renderer.cpp   |   0
 {code/nel => nel}/src/gui/view_text.cpp       |   0
 .../src/gui/view_text_formated.cpp            |   0
 {code/nel => nel}/src/gui/view_text_id.cpp    |   0
 .../src/gui/view_text_id_formated.cpp         |   0
 {code/nel => nel}/src/gui/widget_manager.cpp  |   0
 {code/nel => nel}/src/ligo/CMakeLists.txt     |   0
 {code/nel => nel}/src/ligo/ligo_config.cpp    |   0
 {code/nel => nel}/src/ligo/ligo_error.cpp     |   0
 {code/nel => nel}/src/ligo/ligo_material.cpp  |   0
 {code/nel => nel}/src/ligo/nel-ligo.pc.in     |   0
 {code/nel => nel}/src/ligo/primitive.cpp      |   0
 .../nel => nel}/src/ligo/primitive_class.cpp  |   0
 .../src/ligo/primitive_configuration.cpp      |   0
 .../nel => nel}/src/ligo/primitive_utils.cpp  |   0
 {code/nel => nel}/src/ligo/stdligo.cpp        |   0
 {code/nel => nel}/src/ligo/stdligo.h          |   0
 {code/nel => nel}/src/ligo/transition.cpp     |   0
 {code/nel => nel}/src/ligo/zone_bank.cpp      |   0
 {code/nel => nel}/src/ligo/zone_edge.cpp      |   0
 {code/nel => nel}/src/ligo/zone_region.cpp    |   0
 {code/nel => nel}/src/ligo/zone_template.cpp  |   0
 {code/nel => nel}/src/logic/CMakeLists.txt    |   0
 .../nel => nel}/src/logic/logic_condition.cpp |   0
 {code/nel => nel}/src/logic/logic_event.cpp   |   0
 {code/nel => nel}/src/logic/logic_state.cpp   |   0
 .../src/logic/logic_state_machine.cpp         |   0
 .../nel => nel}/src/logic/logic_variable.cpp  |   0
 {code/nel => nel}/src/logic/stdlogic.cpp      |   0
 {code/nel => nel}/src/logic/stdlogic.h        |   0
 {code/nel => nel}/src/misc/CMakeLists.txt     |   0
 {code/nel => nel}/src/misc/aabbox.cpp         |   0
 {code/nel => nel}/src/misc/algo.cpp           |   0
 {code/nel => nel}/src/misc/app_context.cpp    |   0
 .../src/misc/async_file_manager.cpp           |   0
 {code/nel => nel}/src/misc/big_file.cpp       |   0
 {code/nel => nel}/src/misc/bit_mem_stream.cpp |   0
 {code/nel => nel}/src/misc/bit_set.cpp        |   0
 {code/nel => nel}/src/misc/bitmap.cpp         |   0
 {code/nel => nel}/src/misc/bitmap_gif.cpp     |   0
 {code/nel => nel}/src/misc/bitmap_jpeg.cpp    |   0
 {code/nel => nel}/src/misc/bitmap_png.cpp     |   0
 {code/nel => nel}/src/misc/block_memory.cpp   |   0
 {code/nel => nel}/src/misc/bsphere.cpp        |   0
 {code/nel => nel}/src/misc/buf_fifo.cpp       |   0
 {code/nel => nel}/src/misc/cdb.cpp            |   0
 .../nel => nel}/src/misc/cdb_bank_handler.cpp |   0
 {code/nel => nel}/src/misc/cdb_branch.cpp     |   0
 .../src/misc/cdb_branch_observing_handler.cpp |   0
 {code/nel => nel}/src/misc/cdb_check_sum.cpp  |   0
 {code/nel => nel}/src/misc/cdb_leaf.cpp       |   0
 {code/nel => nel}/src/misc/cdb_manager.cpp    |   0
 {code/nel => nel}/src/misc/check_fpu.cpp      |   0
 {code/nel => nel}/src/misc/class_id.cpp       |   0
 {code/nel => nel}/src/misc/class_registry.cpp |   0
 {code/nel => nel}/src/misc/cmd_args.cpp       |   0
 {code/nel => nel}/src/misc/co_task.cpp        |   0
 {code/nel => nel}/src/misc/command.cpp        |   0
 {code/nel => nel}/src/misc/common.cpp         |   0
 .../src/misc/config_file/cf_bison.simple      |   0
 .../src/misc/config_file/cf_flex.skl          |   0
 .../src/misc/config_file/cf_gramatical.cpp    |   0
 .../src/misc/config_file/cf_gramatical.h      |   0
 .../src/misc/config_file/cf_gramatical.ypp    |   0
 .../src/misc/config_file/cf_lexical.cpp       |   0
 .../src/misc/config_file/cf_lexical.lpp       |   0
 .../src/misc/config_file/config_file.cpp      |   0
 {code/nel => nel}/src/misc/config_file/do.bat |   0
 .../src/misc/contiguous_block_allocator.cpp   |   0
 {code/nel => nel}/src/misc/cpu_time_stat.cpp  |   0
 {code/nel => nel}/src/misc/debug.cpp          |   0
 {code/nel => nel}/src/misc/diff_tool.cpp      |   0
 {code/nel => nel}/src/misc/displayer.cpp      |   0
 {code/nel => nel}/src/misc/dummy_window.cpp   |   0
 {code/nel => nel}/src/misc/dynloadlib.cpp     |   0
 {code/nel => nel}/src/misc/eid_translator.cpp |   0
 {code/nel => nel}/src/misc/entity_id.cpp      |   0
 {code/nel => nel}/src/misc/eval_num_expr.cpp  |   0
 .../src/misc/event_emitter_multi.cpp          |   0
 {code/nel => nel}/src/misc/event_listener.cpp |   0
 {code/nel => nel}/src/misc/event_server.cpp   |   0
 {code/nel => nel}/src/misc/events.cpp         |   0
 {code/nel => nel}/src/misc/fast_floor.cpp     |   0
 {code/nel => nel}/src/misc/fast_mem.cpp       |   0
 {code/nel => nel}/src/misc/file.cpp           |   0
 .../src/misc/fixed_size_allocator.cpp         |   0
 {code/nel => nel}/src/misc/grid_traversal.cpp |   0
 {code/nel => nel}/src/misc/gtk_displayer.cpp  |   0
 {code/nel => nel}/src/misc/heap_memory.cpp    |   0
 .../src/misc/hierarchical_timer.cpp           |   0
 {code/nel => nel}/src/misc/i18n.cpp           |   0
 .../src/misc/i_streamed_package_provider.cpp  |   0
 {code/nel => nel}/src/misc/i_xml.cpp          |   0
 .../src/misc/inter_window_msg_queue.cpp       |   0
 {code/nel => nel}/src/misc/line.cpp           |   0
 {code/nel => nel}/src/misc/log.cpp            |   0
 {code/nel => nel}/src/misc/matrix.cpp         |   0
 {code/nel => nel}/src/misc/md5.cpp            |   0
 {code/nel => nel}/src/misc/mem_displayer.cpp  |   0
 {code/nel => nel}/src/misc/mem_stream.cpp     |   0
 {code/nel => nel}/src/misc/mouse_smoother.cpp |   0
 {code/nel => nel}/src/misc/mutex.cpp          |   0
 {code/nel => nel}/src/misc/nel-misc.pc        |   0
 {code/nel => nel}/src/misc/nel-misc.pc.in     |   0
 {code/nel => nel}/src/misc/noise_value.cpp    |   0
 {code/nel => nel}/src/misc/o_xml.cpp          |   0
 .../src/misc/object_arena_allocator.cpp       |   0
 {code/nel => nel}/src/misc/p_thread.cpp       |   0
 {code/nel => nel}/src/misc/path.cpp           |   0
 {code/nel => nel}/src/misc/plane.cpp          |   0
 {code/nel => nel}/src/misc/polygon.cpp        |   0
 .../src/misc/progress_callback.cpp            |   0
 {code/nel => nel}/src/misc/quat.cpp           |   0
 {code/nel => nel}/src/misc/reader_writer.cpp  |   0
 {code/nel => nel}/src/misc/rect.cpp           |   0
 {code/nel => nel}/src/misc/report.cpp         |   0
 {code/nel => nel}/src/misc/rgba.cpp           |   0
 {code/nel => nel}/src/misc/seven_zip.cpp      |   0
 {code/nel => nel}/src/misc/sha1.cpp           |   0
 {code/nel => nel}/src/misc/shared_memory.cpp  |   0
 {code/nel => nel}/src/misc/sheet_id.cpp       |   0
 {code/nel => nel}/src/misc/smart_ptr.cpp      |   0
 {code/nel => nel}/src/misc/sstring.cpp        |   0
 {code/nel => nel}/src/misc/stdmisc.cpp        |   0
 {code/nel => nel}/src/misc/stdmisc.h          |   0
 {code/nel => nel}/src/misc/stop_watch.cpp     |   0
 {code/nel => nel}/src/misc/stream.cpp         |   0
 .../nel => nel}/src/misc/streamed_package.cpp |   0
 .../src/misc/streamed_package_manager.cpp     |   0
 {code/nel => nel}/src/misc/string_common.cpp  |   0
 {code/nel => nel}/src/misc/string_mapper.cpp  |   0
 {code/nel => nel}/src/misc/system_info.cpp    |   0
 {code/nel => nel}/src/misc/system_utils.cpp   |   0
 {code/nel => nel}/src/misc/task_manager.cpp   |   0
 {code/nel => nel}/src/misc/tds.cpp            |   0
 {code/nel => nel}/src/misc/time_nl.cpp        |   0
 {code/nel => nel}/src/misc/triangle.cpp       |   0
 {code/nel => nel}/src/misc/unicode.cpp        |   0
 {code/nel => nel}/src/misc/variable.cpp       |   0
 {code/nel => nel}/src/misc/vector.cpp         |   0
 {code/nel => nel}/src/misc/vector_2f.cpp      |   0
 {code/nel => nel}/src/misc/vectord.cpp        |   0
 {code/nel => nel}/src/misc/win32_util.cpp     |   0
 {code/nel => nel}/src/misc/win_displayer.cpp  |   0
 .../src/misc/win_event_emitter.cpp            |   0
 {code/nel => nel}/src/misc/win_thread.cpp     |   0
 .../nel => nel}/src/misc/window_displayer.cpp |   0
 .../nel => nel}/src/misc/words_dictionary.cpp |   0
 {code/nel => nel}/src/misc/xml_auto_ptr.cpp   |   0
 {code/nel => nel}/src/misc/xml_pack.cpp       |   0
 {code/nel => nel}/src/net/CMakeLists.txt      |   0
 {code/nel => nel}/src/net/admin.cpp           |   0
 {code/nel => nel}/src/net/buf_client.cpp      |   0
 {code/nel => nel}/src/net/buf_net_base.cpp    |   0
 {code/nel => nel}/src/net/buf_server.cpp      |   0
 {code/nel => nel}/src/net/buf_sock.cpp        |   0
 {code/nel => nel}/src/net/callback_client.cpp |   0
 .../nel => nel}/src/net/callback_net_base.cpp |   0
 {code/nel => nel}/src/net/callback_server.cpp |   0
 {code/nel => nel}/src/net/dummy_tcp_sock.cpp  |   0
 {code/nel => nel}/src/net/email.cpp           |   0
 {code/nel => nel}/src/net/inet_address.cpp    |   0
 {code/nel => nel}/src/net/listen_sock.cpp     |   0
 {code/nel => nel}/src/net/login_client.cpp    |   0
 {code/nel => nel}/src/net/login_cookie.cpp    |   0
 {code/nel => nel}/src/net/login_server.cpp    |   0
 {code/nel => nel}/src/net/message.cpp         |   0
 .../nel => nel}/src/net/message_recorder.cpp  |   0
 {code/nel => nel}/src/net/module.cpp          |   0
 {code/nel => nel}/src/net/module_common.cpp   |   0
 {code/nel => nel}/src/net/module_gateway.cpp  |   0
 .../src/net/module_gateway_transport.cpp      |   0
 .../src/net/module_l5_transport.cpp           |   0
 .../src/net/module_local_gateway.cpp          |   0
 {code/nel => nel}/src/net/module_manager.cpp  |   0
 {code/nel => nel}/src/net/module_message.cpp  |   0
 {code/nel => nel}/src/net/module_socket.cpp   |   0
 {code/nel => nel}/src/net/naming_client.cpp   |   0
 {code/nel => nel}/src/net/nel-net.pc.in       |   0
 {code/nel => nel}/src/net/net_displayer.cpp   |   0
 {code/nel => nel}/src/net/net_log.cpp         |   0
 {code/nel => nel}/src/net/net_manager.cpp     |   0
 {code/nel => nel}/src/net/service.cpp         |   0
 {code/nel => nel}/src/net/sock.cpp            |   0
 .../src/net/stdin_monitor_thread.cpp          |   0
 .../src/net/stdin_monitor_thread.h            |   0
 {code/nel => nel}/src/net/stdnet.cpp          |   0
 {code/nel => nel}/src/net/stdnet.h            |   0
 {code/nel => nel}/src/net/tcp_sock.cpp        |   0
 {code/nel => nel}/src/net/transport_class.cpp |   0
 {code/nel => nel}/src/net/udp_sim_sock.cpp    |   0
 {code/nel => nel}/src/net/udp_sock.cpp        |   0
 {code/nel => nel}/src/net/unified_network.cpp |   0
 {code/nel => nel}/src/net/unitime.cpp         |   0
 {code/nel => nel}/src/net/varpath.cpp         |   0
 {code/nel => nel}/src/pacs/CMakeLists.txt     |   0
 {code/nel => nel}/src/pacs/build_indoor.cpp   |   0
 {code/nel => nel}/src/pacs/chain.cpp          |   0
 {code/nel => nel}/src/pacs/chain_quad.cpp     |   0
 .../src/pacs/collision_callback.cpp           |   0
 {code/nel => nel}/src/pacs/collision_desc.cpp |   0
 {code/nel => nel}/src/pacs/collision_ot.cpp   |   0
 .../src/pacs/collision_surface_temp.cpp       |   0
 {code/nel => nel}/src/pacs/edge_collide.cpp   |   0
 {code/nel => nel}/src/pacs/edge_quad.cpp      |   0
 {code/nel => nel}/src/pacs/exterior_mesh.cpp  |   0
 .../nel => nel}/src/pacs/global_retriever.cpp |   0
 .../nel => nel}/src/pacs/local_retriever.cpp  |   0
 {code/nel => nel}/src/pacs/move_cell.cpp      |   0
 {code/nel => nel}/src/pacs/move_container.cpp |   0
 {code/nel => nel}/src/pacs/move_element.cpp   |   0
 {code/nel => nel}/src/pacs/move_primitive.cpp |   0
 {code/nel => nel}/src/pacs/nel-pacs.pc.in     |   0
 .../src/pacs/primitive_block_pacs.cpp         |   0
 .../src/pacs/primitive_world_image.cpp        |   0
 .../src/pacs/retrievable_surface.cpp          |   0
 {code/nel => nel}/src/pacs/retriever_bank.cpp |   0
 .../src/pacs/retriever_instance.cpp           |   0
 {code/nel => nel}/src/pacs/stdpacs.cpp        |   0
 {code/nel => nel}/src/pacs/stdpacs.h          |   0
 {code/nel => nel}/src/pacs/surface_quad.cpp   |   0
 {code/nel => nel}/src/pacs/vector_2s.cpp      |   0
 {code/nel => nel}/src/pipeline/CMakeLists.txt |   0
 .../src/pipeline/database_config.cpp          |   0
 .../src/pipeline/project_config.cpp           |   0
 .../nel => nel}/src/pipeline/tool_logger.cpp  |   0
 {code/nel => nel}/src/sound/CMakeLists.txt    |   0
 .../src/sound/async_file_manager_sound.cpp    |   0
 {code/nel => nel}/src/sound/audio_decoder.cpp |   0
 .../src/sound/audio_decoder_ffmpeg.cpp        |   0
 .../src/sound/audio_decoder_mp3.cpp           |   0
 .../src/sound/audio_decoder_vorbis.cpp        |   0
 .../src/sound/audio_mixer_user.cpp            |   0
 .../src/sound/background_sound.cpp            |   0
 .../src/sound/background_sound_manager.cpp    |   0
 .../src/sound/background_source.cpp           |   0
 .../nel => nel}/src/sound/clustered_sound.cpp |   0
 {code/nel => nel}/src/sound/complex_sound.cpp |   0
 .../nel => nel}/src/sound/complex_source.cpp  |   0
 {code/nel => nel}/src/sound/context_sound.cpp |   0
 .../src/sound/driver/CMakeLists.txt           |   0
 {code/nel => nel}/src/sound/driver/buffer.cpp |   0
 .../src/sound/driver/dsound/CMakeLists.txt    |   0
 .../src/sound/driver/dsound/buffer_dsound.cpp |   0
 .../src/sound/driver/dsound/buffer_dsound.h   |   0
 .../src/sound/driver/dsound/driver_dsound.def |   0
 .../sound/driver/dsound/listener_dsound.cpp   |   0
 .../src/sound/driver/dsound/listener_dsound.h |   0
 .../src/sound/driver/dsound/resources.rc      |   0
 .../driver/dsound/sound_driver_dsound.cpp     |   0
 .../sound/driver/dsound/sound_driver_dsound.h |   0
 .../src/sound/driver/dsound/source_dsound.cpp |   0
 .../src/sound/driver/dsound/source_dsound.h   |   0
 .../src/sound/driver/dsound/stddsound.cpp     |   0
 .../src/sound/driver/dsound/stddsound.h       |   0
 {code/nel => nel}/src/sound/driver/effect.cpp |   0
 .../src/sound/driver/fmod/CMakeLists.txt      |   0
 .../src/sound/driver/fmod/buffer_fmod.cpp     |   0
 .../src/sound/driver/fmod/buffer_fmod.h       |   0
 .../src/sound/driver/fmod/driver_fmod.def     |   0
 .../src/sound/driver/fmod/listener_fmod.cpp   |   0
 .../src/sound/driver/fmod/listener_fmod.h     |   0
 .../sound/driver/fmod/music_channel_fmod.cpp  |   0
 .../sound/driver/fmod/music_channel_fmod.h    |   0
 .../src/sound/driver/fmod/resources.rc        |   0
 .../sound/driver/fmod/sound_driver_fmod.cpp   |   0
 .../src/sound/driver/fmod/sound_driver_fmod.h |   0
 .../src/sound/driver/fmod/source_fmod.cpp     |   0
 .../src/sound/driver/fmod/source_fmod.h       |   0
 .../src/sound/driver/fmod/stdfmod.cpp         |   0
 .../src/sound/driver/fmod/stdfmod.h           |   0
 .../nel => nel}/src/sound/driver/listener.cpp |   0
 .../src/sound/driver/music_channel.cpp        |   0
 .../src/sound/driver/openal/CMakeLists.txt    |   0
 .../src/sound/driver/openal/buffer_al.cpp     |   0
 .../src/sound/driver/openal/buffer_al.h       |   0
 .../src/sound/driver/openal/driver_openal.def |   0
 .../src/sound/driver/openal/effect_al.cpp     |   0
 .../src/sound/driver/openal/effect_al.h       |   0
 .../src/sound/driver/openal/ext_al.cpp        |   0
 .../src/sound/driver/openal/ext_al.h          |   0
 .../src/sound/driver/openal/listener_al.cpp   |   0
 .../src/sound/driver/openal/listener_al.h     |   0
 .../src/sound/driver/openal/resources.rc      |   0
 .../sound/driver/openal/sound_driver_al.cpp   |   0
 .../src/sound/driver/openal/sound_driver_al.h |   0
 .../src/sound/driver/openal/source_al.cpp     |   0
 .../src/sound/driver/openal/source_al.h       |   0
 .../src/sound/driver/openal/stdopenal.cpp     |   0
 .../src/sound/driver/openal/stdopenal.h       |   0
 .../src/sound/driver/sound_driver.cpp         |   0
 {code/nel => nel}/src/sound/driver/source.cpp |   0
 .../src/sound/driver/stdsound_lowlevel.cpp    |   0
 .../src/sound/driver/stdsound_lowlevel.h      |   0
 .../src/sound/driver/xaudio2/CMakeLists.txt   |   0
 .../sound/driver/xaudio2/adpcm_xaudio2.cpp    |   0
 .../src/sound/driver/xaudio2/adpcm_xaudio2.h  |   0
 .../sound/driver/xaudio2/buffer_xaudio2.cpp   |   0
 .../src/sound/driver/xaudio2/buffer_xaudio2.h |   0
 .../sound/driver/xaudio2/driver_xaudio2.def   |   0
 .../sound/driver/xaudio2/effect_xaudio2.cpp   |   0
 .../src/sound/driver/xaudio2/effect_xaudio2.h |   0
 .../sound/driver/xaudio2/listener_xaudio2.cpp |   0
 .../sound/driver/xaudio2/listener_xaudio2.h   |   0
 .../src/sound/driver/xaudio2/resources.rc     |   0
 .../driver/xaudio2/sound_driver_xaudio2.cpp   |   0
 .../driver/xaudio2/sound_driver_xaudio2.h     |   0
 .../sound/driver/xaudio2/source_xaudio2.cpp   |   0
 .../src/sound/driver/xaudio2/source_xaudio2.h |   0
 .../src/sound/driver/xaudio2/stdxaudio2.cpp   |   0
 .../src/sound/driver/xaudio2/stdxaudio2.h     |   0
 .../src/sound/group_controller.cpp            |   0
 .../src/sound/group_controller_root.cpp       |   0
 {code/nel => nel}/src/sound/listener_user.cpp |   0
 {code/nel => nel}/src/sound/mixing_track.cpp  |   0
 .../src/sound/music_channel_fader.cpp         |   0
 {code/nel => nel}/src/sound/music_sound.cpp   |   0
 .../src/sound/music_sound_manager.cpp         |   0
 {code/nel => nel}/src/sound/music_source.cpp  |   0
 {code/nel => nel}/src/sound/nel-sound.pc.in   |   0
 {code/nel => nel}/src/sound/sample_bank.cpp   |   0
 .../src/sound/sample_bank_manager.cpp         |   0
 {code/nel => nel}/src/sound/simple_sound.cpp  |   0
 {code/nel => nel}/src/sound/simple_source.cpp |   0
 {code/nel => nel}/src/sound/sound.cpp         |   0
 .../src/sound/sound_anim_manager.cpp          |   0
 .../src/sound/sound_anim_marker.cpp           |   0
 .../nel => nel}/src/sound/sound_animation.cpp |   0
 {code/nel => nel}/src/sound/sound_bank.cpp    |   0
 {code/nel => nel}/src/sound/source_common.cpp |   0
 .../src/sound/source_music_channel.cpp        |   0
 {code/nel => nel}/src/sound/stdsound.cpp      |   0
 {code/nel => nel}/src/sound/stdsound.h        |   0
 .../src/sound/stream_file_sound.cpp           |   0
 .../src/sound/stream_file_source.cpp          |   0
 {code/nel => nel}/src/sound/stream_sound.cpp  |   0
 {code/nel => nel}/src/sound/stream_source.cpp |   0
 {code/nel => nel}/src/web/CMakeLists.txt      |   0
 .../nel => nel}/src/web/curl_certificates.cpp |   0
 .../nel => nel}/src/web/http_client_curl.cpp  |   0
 .../src/web/http_package_provider.cpp         |   0
 {code/nel => nel}/src/web/nel-web.pc.in       |   0
 {code/nel => nel}/src/web/stdweb.cpp          |   0
 {code/nel => nel}/src/web/stdweb.h            |   0
 {code/nel => nel}/tools/3d/CMakeLists.txt     |   0
 .../tools/3d/anim_builder/CMakeLists.txt      |   0
 .../tools/3d/anim_builder/anim_builder.cpp    |   0
 .../tools/3d/anim_builder/anim_builder.h      |   0
 .../tools/3d/anim_builder/blue_pill.ico       | Bin
 .../nel => nel}/tools/3d/anim_builder/main.rc |   0
 .../3d/animation_set_builder/CMakeLists.txt   |   0
 .../3d/animation_set_builder/anim_utility.cpp |   0
 .../3d/animation_set_builder/anim_utility.h   |   0
 .../animation_set_builder.cpp                 |   0
 .../3d/animation_set_builder/gold_pill.ico    | Bin
 .../tools/3d/animation_set_builder/main.rc    |   0
 .../tools/3d/build_clod_bank/CMakeLists.txt   |   0
 .../tools/3d/build_clod_bank/blue_pill.ico    | Bin
 .../3d/build_clod_bank/build_clod_bank.cpp    |   0
 .../3d/build_clod_bank/config_example.cfg     |   0
 .../tools/3d/build_clod_bank/main.rc          |   0
 .../build_clod_bank/path_config_example.cfg   |   0
 .../tools/3d/build_clodtex/CMakeLists.txt     |   0
 .../tools/3d/build_clodtex/blue_pill.ico      | Bin
 .../3d/build_clodtex/lod_texture_builder.cpp  |   0
 .../3d/build_clodtex/lod_texture_builder.h    |   0
 .../tools/3d/build_clodtex/main.cpp           |   0
 .../tools/3d/build_clodtex/main.rc            |   0
 .../tools/3d/build_coarse_mesh/CMakeLists.txt |   0
 .../tools/3d/build_coarse_mesh/blue_pill.ico  | Bin
 .../tools/3d/build_coarse_mesh/build.cfg      |   0
 .../build_coarse_mesh/build_coarse_mesh.cpp   |   0
 .../tools/3d/build_coarse_mesh/main.rc        |   0
 .../tools/3d/build_far_bank/CMakeLists.txt    |   0
 .../tools/3d/build_far_bank/blue_pill.ico     | Bin
 .../3d/build_far_bank/build_far_bank.cpp      |   0
 .../tools/3d/build_far_bank/main.rc           |   0
 .../tools/3d/build_gamedata/0_setup.bat       |   0
 .../tools/3d/build_gamedata/1_clean.bat       |   0
 .../tools/3d/build_gamedata/2_export.bat      |   0
 .../tools/3d/build_gamedata/3_build.bat       |   0
 .../tools/3d/build_gamedata/4_install.bat     |   0
 .../tools/3d/build_gamedata/Howto export.txt  |   0
 .../tools/3d/build_gamedata/_idle.bat         |   0
 .../tools/3d/build_gamedata/cfg/config.cfg    |   0
 .../3d/build_gamedata/cfg/directories.cfg     |   0
 .../tools/3d/build_gamedata/cfg/panoply.cfg   |   0
 .../build_gamedata/cfg/properties_draft.cfg   |   0
 .../build_gamedata/cfg/properties_final.cfg   |   0
 .../tools/3d/build_gamedata/cfg/site.cfg      |   0
 .../tools/3d/build_gamedata/client_clean.bat  |   0
 .../tools/3d/build_gamedata/client_setup.bat  |   0
 .../build_gamedata/export_build_all_data.bat  |   0
 .../3d/build_gamedata/export_build_data.bat   |   0
 .../build_gamedata/processes/anim/0_setup.bat |   0
 .../build_gamedata/processes/anim/1_clean.bat |   0
 .../processes/anim/2_export.bat               |   0
 .../build_gamedata/processes/anim/3_build.bat |   0
 .../processes/anim/4_install.bat              |   0
 .../processes/anim/export_build_all_data.bat  |   0
 .../processes/anim/export_build_data.bat      |   0
 .../processes/anim/maxscript/anim_export.ms   |   0
 .../build_gamedata/processes/anim/sh/build.sh |   0
 .../processes/anim/sh/export.sh               |   0
 .../processes/anim/sh/install.sh              |   0
 .../processes/clodbank/0_setup.bat            |   0
 .../processes/clodbank/1_clean.bat            |   0
 .../processes/clodbank/2_export.bat           |   0
 .../processes/clodbank/3_build.bat            |   0
 .../processes/clodbank/4_install.bat          |   0
 .../processes/clodbank/cfg/local_path.cfg     |   0
 .../clodbank/export_build_all_data.bat        |   0
 .../processes/clodbank/export_build_data.bat  |   0
 .../clodbank/maxscript/clod_export.ms         |   0
 .../processes/clodbank/process_doc.txt        |   0
 .../processes/clodbank/sh/build.sh            |   0
 .../processes/clodbank/sh/export.sh           |   0
 .../processes/clodbank/sh/install.sh          |   0
 .../processes/displace/0_setup.bat            |   0
 .../processes/displace/1_clean.bat            |   0
 .../processes/displace/2_export.bat           |   0
 .../processes/displace/3_build.bat            |   0
 .../processes/displace/4_install.bat          |   0
 .../displace/export_build_all_data.bat        |   0
 .../processes/displace/export_build_data.bat  |   0
 .../processes/displace/sh/export.sh           |   0
 .../processes/displace/sh/install.sh          |   0
 .../processes/farbank/0_setup.bat             |   0
 .../processes/farbank/1_clean.bat             |   0
 .../processes/farbank/2_export.bat            |   0
 .../processes/farbank/3_build.bat             |   0
 .../processes/farbank/4_install.bat           |   0
 .../farbank/export_build_all_data.bat         |   0
 .../processes/farbank/export_build_data.bat   |   0
 .../processes/farbank/sh/build.sh             |   0
 .../processes/farbank/sh/install.sh           |   0
 .../build_gamedata/processes/font/0_setup.bat |   0
 .../build_gamedata/processes/font/1_clean.bat |   0
 .../processes/font/2_export.bat               |   0
 .../build_gamedata/processes/font/3_build.bat |   0
 .../processes/font/4_install.bat              |   0
 .../processes/font/export_build_all_data.bat  |   0
 .../processes/font/export_build_data.bat      |   0
 .../processes/font/sh/export.sh               |   0
 .../processes/font/sh/install.sh              |   0
 .../build_gamedata/processes/ig/0_setup.bat   |   0
 .../build_gamedata/processes/ig/1_clean.bat   |   0
 .../build_gamedata/processes/ig/2_export.bat  |   0
 .../build_gamedata/processes/ig/3_build.bat   |   0
 .../build_gamedata/processes/ig/4_install.bat |   0
 .../processes/ig/export_build_all_data.bat    |   0
 .../processes/ig/export_build_data.bat        |   0
 .../processes/ig/maxscript/ig_export.ms       |   0
 .../build_gamedata/processes/ig/sh/build.sh   |   0
 .../build_gamedata/processes/ig/sh/export.sh  |   0
 .../build_gamedata/processes/ig/sh/install.sh |   0
 .../processes/ig_light/0_setup.bat            |   0
 .../processes/ig_light/1_clean.bat            |   0
 .../processes/ig_light/2_export.bat           |   0
 .../processes/ig_light/3_build.bat            |   0
 .../processes/ig_light/4_install.bat          |   0
 .../ig_light/export_build_all_data.bat        |   0
 .../processes/ig_light/export_build_data.bat  |   0
 .../processes/ig_light/sh/install.sh          |   0
 .../processes/interface/0_setup.bat           |   0
 .../processes/interface/1_clean.bat           |   0
 .../processes/interface/2_export.bat          |   0
 .../processes/interface/3_build.bat           |   0
 .../processes/interface/4_install.bat         |   0
 .../interface/export_build_all_data.bat       |   0
 .../processes/interface/export_build_data.bat |   0
 .../processes/interface/sh/build.sh           |   0
 .../processes/interface/sh/export.sh          |   0
 .../processes/interface/sh/install.sh         |   0
 .../build_gamedata/processes/ligo/0_setup.bat |   0
 .../build_gamedata/processes/ligo/1_clean.bat |   0
 .../processes/ligo/2_export.bat               |   0
 .../build_gamedata/processes/ligo/3_build.bat |   0
 .../processes/ligo/4_install.bat              |   0
 .../processes/ligo/export_build_all_data.bat  |   0
 .../processes/ligo/export_build_data.bat      |   0
 .../ligo/maxscript/nel_ligo_export.ms         |   0
 .../build_gamedata/processes/ligo/sh/build.sh |   0
 .../processes/ligo/sh/export.sh               |   0
 .../processes/ligo/sh/renametozone.bat        |   0
 .../build_gamedata/processes/map/0_setup.bat  |   0
 .../build_gamedata/processes/map/1_clean.bat  |   0
 .../build_gamedata/processes/map/2_export.bat |   0
 .../build_gamedata/processes/map/3_build.bat  |   0
 .../processes/map/4_install.bat               |   0
 .../processes/map/export_build_all_data.bat   |   0
 .../processes/map/export_build_data.bat       |   0
 .../build_gamedata/processes/map/sh/build.sh  |   0
 .../build_gamedata/processes/map/sh/export.sh |   0
 .../processes/map/sh/install.sh               |   0
 .../processes/pacs_prim/0_setup.bat           |   0
 .../processes/pacs_prim/1_clean.bat           |   0
 .../processes/pacs_prim/2_export.bat          |   0
 .../processes/pacs_prim/3_build.bat           |   0
 .../processes/pacs_prim/4_install.bat         |   0
 .../pacs_prim/export_build_all_data.bat       |   0
 .../processes/pacs_prim/export_build_data.bat |   0
 .../pacs_prim/maxscript/pacs_prim_export.ms   |   0
 .../processes/pacs_prim/sh/export.sh          |   0
 .../processes/pacs_prim/sh/install.sh         |   0
 .../build_gamedata/processes/ps/0_setup.bat   |   0
 .../build_gamedata/processes/ps/1_clean.bat   |   0
 .../build_gamedata/processes/ps/2_export.bat  |   0
 .../build_gamedata/processes/ps/3_build.bat   |   0
 .../build_gamedata/processes/ps/4_install.bat |   0
 .../processes/ps/export_build_all_data.bat    |   0
 .../processes/ps/export_build_data.bat        |   0
 .../build_gamedata/processes/ps/sh/export.sh  |   0
 .../build_gamedata/processes/ps/sh/install.sh |   0
 .../processes/rbank/0_setup.bat               |   0
 .../processes/rbank/1_clean.bat               |   0
 .../processes/rbank/2_export.bat              |   0
 .../processes/rbank/3_build.bat               |   0
 .../processes/rbank/4_install.bat             |   0
 .../processes/rbank/cfg/ai_build_wmap.cfg     |   0
 .../processes/rbank/cfg/template_draft.cfg    |   0
 .../processes/rbank/cfg/template_final.cfg    |   0
 .../processes/rbank/export_build_all_data.bat |   0
 .../processes/rbank/export_build_data.bat     |   0
 .../processes/rbank/maxscript/rbank_export.ms |   0
 .../processes/rbank/sh/build.sh               |   0
 .../processes/rbank/sh/clean.sh               |   0
 .../processes/rbank/sh/export.sh              |   0
 .../processes/rbank/sh/install.sh             |   0
 .../processes/shape/0_setup.bat               |   0
 .../processes/shape/1_clean.bat               |   0
 .../processes/shape/2_export.bat              |   0
 .../processes/shape/3_build.bat               |   0
 .../processes/shape/4_install.bat             |   0
 .../processes/shape/cfg/config_header.cfg     |   0
 .../processes/shape/export_build_all_data.bat |   0
 .../processes/shape/export_build_data.bat     |   0
 .../processes/shape/maxscript/shape_export.ms |   0
 .../processes/shape/sh/build.sh               |   0
 .../processes/shape/sh/export.sh              |   0
 .../processes/shape/sh/install.sh             |   0
 .../shape/sh/transfert_lightmap_optimize.bat  |   0
 .../shape/sh/transfert_shape_optimize.bat     |   0
 .../build_gamedata/processes/skel/0_setup.bat |   0
 .../build_gamedata/processes/skel/1_clean.bat |   0
 .../processes/skel/2_export.bat               |   0
 .../build_gamedata/processes/skel/3_build.bat |   0
 .../processes/skel/4_install.bat              |   0
 .../processes/skel/export_build_all_data.bat  |   0
 .../processes/skel/export_build_data.bat      |   0
 .../processes/skel/maxscript/skel_export.ms   |   0
 .../processes/skel/sh/export.sh               |   0
 .../processes/skel/sh/install.sh              |   0
 .../processes/smallbank/0_setup.bat           |   0
 .../processes/smallbank/1_clean.bat           |   0
 .../processes/smallbank/2_export.bat          |   0
 .../processes/smallbank/3_build.bat           |   0
 .../processes/smallbank/4_install.bat         |   0
 .../smallbank/export_build_all_data.bat       |   0
 .../processes/smallbank/export_build_data.bat |   0
 .../processes/smallbank/sh/export.sh          |   0
 .../processes/smallbank/sh/install.sh         |   0
 .../build_gamedata/processes/swt/0_setup.bat  |   0
 .../build_gamedata/processes/swt/1_clean.bat  |   0
 .../build_gamedata/processes/swt/2_export.bat |   0
 .../build_gamedata/processes/swt/3_build.bat  |   0
 .../processes/swt/4_install.bat               |   0
 .../processes/swt/export_build_all_data.bat   |   0
 .../processes/swt/export_build_data.bat       |   0
 .../processes/swt/maxscript/swt_export.ms     |   0
 .../build_gamedata/processes/swt/sh/export.sh |   0
 .../processes/swt/sh/install.sh               |   0
 .../processes/tiles/0_setup.bat               |   0
 .../processes/tiles/1_clean.bat               |   0
 .../processes/tiles/2_export.bat              |   0
 .../processes/tiles/3_build.bat               |   0
 .../processes/tiles/4_install.bat             |   0
 .../processes/tiles/export_build_all_data.bat |   0
 .../processes/tiles/export_build_data.bat     |   0
 .../processes/tiles/sh/build.sh               |   0
 .../processes/tiles/sh/export.sh              |   0
 .../processes/tiles/sh/install.sh             |   0
 .../processes/veget/0_setup.bat               |   0
 .../processes/veget/1_clean.bat               |   0
 .../processes/veget/2_export.bat              |   0
 .../processes/veget/3_build.bat               |   0
 .../processes/veget/4_install.bat             |   0
 .../processes/veget/export_build_all_data.bat |   0
 .../processes/veget/export_build_data.bat     |   0
 .../processes/veget/maxscript/veget_export.ms |   0
 .../processes/veget/sh/export.sh              |   0
 .../processes/veget/sh/install.sh             |   0
 .../processes/vegetset/0_setup.bat            |   0
 .../processes/vegetset/1_clean.bat            |   0
 .../processes/vegetset/2_export.bat           |   0
 .../processes/vegetset/3_build.bat            |   0
 .../processes/vegetset/4_install.bat          |   0
 .../vegetset/export_build_all_data.bat        |   0
 .../processes/vegetset/export_build_data.bat  |   0
 .../processes/vegetset/sh/export.sh           |   0
 .../processes/vegetset/sh/install.sh          |   0
 .../build_gamedata/processes/zone/0_setup.bat |   0
 .../build_gamedata/processes/zone/1_clean.bat |   0
 .../processes/zone/2_export.bat               |   0
 .../build_gamedata/processes/zone/3_build.bat |   0
 .../processes/zone/4_install.bat              |   0
 .../processes/zone/export_build_all_data.bat  |   0
 .../processes/zone/export_build_data.bat      |   0
 .../processes/zone/maxscript/zone_export.ms   |   0
 .../build_gamedata/processes/zone/sh/build.sh |   0
 .../processes/zone/sh/export.sh               |   0
 .../processes/zone_light/0_setup.bat          |   0
 .../processes/zone_light/1_clean.bat          |   0
 .../processes/zone_light/2_export.bat         |   0
 .../processes/zone_light/3_build.bat          |   0
 .../processes/zone_light/4_install.bat        |   0
 .../zone_light/export_build_all_data.bat      |   0
 .../zone_light/export_build_data.bat          |   0
 .../processes/zone_light/patch_tile_water.bat |   0
 .../processes/zone_light/sh/build.sh          |   0
 .../processes/zone_light/sh/export.sh         |   0
 .../processes/zone_light/sh/install.sh        |   0
 .../zone_light/sh/patch_tile_water.sh         |   0
 .../tools/3d/build_gamedata/set_title.bat     |   0
 .../tools/3d/build_gamedata/sh/build.sh       |   0
 .../tools/3d/build_gamedata/sh/clean.sh       |   0
 .../3d/build_gamedata/sh/client_clean.sh      |   0
 .../3d/build_gamedata/sh/client_setup.sh      |   0
 .../tools/3d/build_gamedata/sh/export.sh      |   0
 .../tools/3d/build_gamedata/sh/install.sh     |   0
 .../tools/3d/build_gamedata/sh/setup.sh       |   0
 .../3d/build_gamedata/update_local_tools.bat  |   0
 .../tools/3d/build_gamedata/update_tools.bat  |   0
 .../tools/3d/build_interface/CMakeLists.txt   |   0
 .../tools/3d/build_interface/blue_pill.ico    | Bin
 .../tools/3d/build_interface/main.cpp         |   0
 .../tools/3d/build_interface/main.rc          |   0
 .../tools/3d/build_shadow_skin/CMakeLists.txt |   0
 .../tools/3d/build_shadow_skin/blue_pill.ico  | Bin
 .../tools/3d/build_shadow_skin/main.cpp       |   0
 .../tools/3d/build_shadow_skin/main.rc        |   0
 .../tools/3d/build_smallbank/CMakeLists.txt   |   0
 .../tools/3d/build_smallbank/blue_pill.ico    | Bin
 .../3d/build_smallbank/build_smallbank.cpp    |   0
 .../tools/3d/build_smallbank/main.rc          |   0
 .../tools/3d/cluster_viewer/CMakeLists.txt    |   0
 .../tools/3d/cluster_viewer/main.rc           |   0
 .../tools/3d/cluster_viewer/red_pill.ico      | Bin
 .../tools/3d/cluster_viewer/view_cs.cpp       |   0
 .../tools/3d/cluster_viewer/view_cs.txt       |   0
 .../tools/3d/crash_log_analyser/main.cpp      |   0
 .../tools/3d/file_info/CMakeLists.txt         |   0
 {code/nel => nel}/tools/3d/file_info/main.cpp |   0
 .../tools/3d/get_neighbors/CMakeLists.txt     |   0
 .../tools/3d/get_neighbors/blue_pill.ico      | Bin
 .../tools/3d/get_neighbors/main.cpp           |   0
 .../tools/3d/get_neighbors/main.rc            |   0
 .../tools/3d/hls_bank_maker/CMakeLists.txt    |   0
 .../tools/3d/hls_bank_maker/blue_pill.ico     | Bin
 .../3d/hls_bank_maker/hls_bank_maker.cpp      |   0
 .../tools/3d/hls_bank_maker/hls_bank_maker.h  |   0
 .../tools/3d/hls_bank_maker/main.rc           |   0
 .../tools/3d/ig_add/CMakeLists.txt            |   0
 .../nel => nel}/tools/3d/ig_add/blue_pill.ico | Bin
 {code/nel => nel}/tools/3d/ig_add/main.cpp    |   0
 {code/nel => nel}/tools/3d/ig_add/main.rc     |   0
 .../tools/3d/ig_elevation/CMakeLists.txt      |   0
 .../tools/3d/ig_elevation/blue_pill.ico       | Bin
 .../tools/3d/ig_elevation/main.cpp            |   0
 .../nel => nel}/tools/3d/ig_elevation/main.rc |   0
 .../tools/3d/ig_info/CMakeLists.txt           |   0
 .../nel => nel}/tools/3d/ig_info/ig_info.cpp  |   0
 .../tools/3d/ig_lighter/CMakeLists.txt        |   0
 .../tools/3d/ig_lighter/blue_pill.ico         | Bin
 .../tools/3d/ig_lighter/config.cfg            |   0
 .../tools/3d/ig_lighter/ig_lighter.cpp        |   0
 {code/nel => nel}/tools/3d/ig_lighter/main.rc |   0
 .../3d/ig_lighter_lib/ig_lighter_lib.cpp      |   0
 .../tools/3d/ig_lighter_lib/ig_lighter_lib.h  |   0
 .../3d/lightmap_optimizer/CMakeLists.txt      |   0
 .../tools/3d/lightmap_optimizer/blue_pill.ico | Bin
 .../tools/3d/lightmap_optimizer/main.cpp      |   0
 .../tools/3d/lightmap_optimizer/main.rc       |   0
 .../nel => nel}/tools/3d/ligo/CMakeLists.txt  |   0
 {code/nel => nel}/tools/3d/ligo/ligoscape.cfg |   0
 {code/nel => nel}/tools/3d/ligo/ligoscape.txt |   0
 .../tools/3d/ligo/plugin_max/CMakeLists.txt   |   0
 .../tools/3d/ligo/plugin_max/DllEntry.cpp     |   0
 .../3d/ligo/plugin_max/ligoscape_utility.def  |   0
 .../3d/ligo/plugin_max/ligoscape_utility.h    |   0
 .../3d/ligo/plugin_max/ligoscape_utility.rc   |   0
 .../tools/3d/ligo/plugin_max/ligoscript.txt   |   0
 .../plugin_max/macroscripts/nel_ligoscape.mcr |   0
 .../tools/3d/ligo/plugin_max/max_to_ligo.cpp  |   0
 .../tools/3d/ligo/plugin_max/max_to_ligo.h    |   0
 .../tools/3d/ligo/plugin_max/resource.h       |   0
 .../tools/3d/ligo/plugin_max/script.cpp       |   0
 .../ligo/plugin_max/scripts/nel_ligoscape.ms  |   0
 .../tools/3d/ligo/plugin_max/version.rc2      |   0
 .../tools/3d/mesh_export/CMakeLists.txt       |   0
 .../tools/3d/mesh_export/blue_pill.ico        | Bin
 .../nel => nel}/tools/3d/mesh_export/main.cpp |   0
 .../nel => nel}/tools/3d/mesh_export/main.rc  |   0
 .../tools/3d/mesh_utils/CMakeLists.txt        |   0
 .../tools/3d/mesh_utils/assimp_material.cpp   |   0
 .../tools/3d/mesh_utils/assimp_material.h     |   0
 .../tools/3d/mesh_utils/assimp_shape.cpp      |   0
 .../tools/3d/mesh_utils/assimp_shape.h        |   0
 .../tools/3d/mesh_utils/mesh_utils.cpp        |   0
 .../tools/3d/mesh_utils/mesh_utils.h          |   0
 .../tools/3d/mesh_utils/scene_context.cpp     |   0
 .../tools/3d/mesh_utils/scene_context.h       |   0
 .../tools/3d/mesh_utils/scene_meta.cpp        |   0
 .../tools/3d/mesh_utils/scene_meta.h          |   0
 .../tools/3d/object_viewer/CMakeLists.txt     |   0
 .../tools/3d/object_viewer/about_dialog.cpp   |   0
 .../tools/3d/object_viewer/about_dialog.h     |   0
 .../tools/3d/object_viewer/animation_dlg.cpp  |   0
 .../tools/3d/object_viewer/animation_dlg.h    |   0
 .../3d/object_viewer/animation_set_dlg.cpp    |   0
 .../3d/object_viewer/animation_set_dlg.h      |   0
 .../tools/3d/object_viewer/attrib_dlg.cpp     |   0
 .../tools/3d/object_viewer/attrib_dlg.h       |   0
 .../3d/object_viewer/attrib_list_box.cpp      |   0
 .../tools/3d/object_viewer/attrib_list_box.h  |   0
 .../tools/3d/object_viewer/auto_lod_dlg.cpp   |   0
 .../tools/3d/object_viewer/auto_lod_dlg.h     |   0
 .../tools/3d/object_viewer/ball.tga           | Bin
 .../tools/3d/object_viewer/basis_edit.cpp     |   0
 .../tools/3d/object_viewer/basis_edit.h       |   0
 .../tools/3d/object_viewer/bin_op_dlg.cpp     |   0
 .../tools/3d/object_viewer/bin_op_dlg.h       |   0
 .../tools/3d/object_viewer/bitmap1.bmp        | Bin
 .../tools/3d/object_viewer/bitmap2.bmp        | Bin
 .../tools/3d/object_viewer/bitmap3.bmp        | Bin
 .../tools/3d/object_viewer/bitmap4.bmp        | Bin
 .../tools/3d/object_viewer/blend_wnd.cpp      |   0
 .../tools/3d/object_viewer/blend_wnd.h        |   0
 .../tools/3d/object_viewer/bmp00001.bmp       | Bin
 .../tools/3d/object_viewer/bmp00002.bmp       | Bin
 .../tools/3d/object_viewer/bmp00003.bmp       | Bin
 .../tools/3d/object_viewer/bmp00004.bmp       | Bin
 .../tools/3d/object_viewer/bmp00005.bmp       | Bin
 .../tools/3d/object_viewer/bmp00006.bmp       | Bin
 .../tools/3d/object_viewer/bmp00007.bmp       | Bin
 .../tools/3d/object_viewer/bmp00008.bmp       | Bin
 .../tools/3d/object_viewer/bmp00009.bmp       | Bin
 .../tools/3d/object_viewer/bmp00010.bmp       | Bin
 .../tools/3d/object_viewer/bmp00011.bmp       | Bin
 .../tools/3d/object_viewer/bmp00012.bmp       | Bin
 .../tools/3d/object_viewer/bmp00013.bmp       | Bin
 .../tools/3d/object_viewer/bmp00014.bmp       | Bin
 .../tools/3d/object_viewer/bmp00015.bmp       | Bin
 .../tools/3d/object_viewer/bmp00016.bmp       | Bin
 .../tools/3d/object_viewer/bmp00017.bmp       | Bin
 .../tools/3d/object_viewer/bmp00018.bmp       | Bin
 .../tools/3d/object_viewer/bmp00019.bmp       | Bin
 .../tools/3d/object_viewer/bmp00020.bmp       | Bin
 .../tools/3d/object_viewer/bmp00021.bmp       | Bin
 .../tools/3d/object_viewer/bmp00022.bmp       | Bin
 .../tools/3d/object_viewer/bmp00023.bmp       | Bin
 .../tools/3d/object_viewer/bmp00024.bmp       | Bin
 .../tools/3d/object_viewer/bmp00025.bmp       | Bin
 .../tools/3d/object_viewer/bmp00026.bmp       | Bin
 .../tools/3d/object_viewer/bmp00027.bmp       | Bin
 .../tools/3d/object_viewer/bound_checker.h    |   0
 .../3d/object_viewer/choose_bg_color_dlg.cpp  |   0
 .../3d/object_viewer/choose_bg_color_dlg.h    |   0
 .../3d/object_viewer/choose_frame_delay.cpp   |   0
 .../3d/object_viewer/choose_frame_delay.h     |   0
 .../tools/3d/object_viewer/choose_name.cpp    |   0
 .../tools/3d/object_viewer/choose_name.h      |   0
 .../tools/3d/object_viewer/choose_pool_id.cpp |   0
 .../tools/3d/object_viewer/choose_pool_id.h   |   0
 .../3d/object_viewer/choose_sun_color_dlg.cpp |   0
 .../3d/object_viewer/choose_sun_color_dlg.h   |   0
 .../3d/object_viewer/collision_zone_dlg.cpp   |   0
 .../3d/object_viewer/collision_zone_dlg.h     |   0
 .../tools/3d/object_viewer/color_button.cpp   |   0
 .../tools/3d/object_viewer/color_button.h     |   0
 .../tools/3d/object_viewer/color_edit.cpp     |   0
 .../tools/3d/object_viewer/color_edit.h       |   0
 .../tools/3d/object_viewer/color_static.cpp   |   0
 .../tools/3d/object_viewer/color_static.h     |   0
 .../3d/object_viewer/constraint_mesh_dlg.cpp  |   0
 .../3d/object_viewer/constraint_mesh_dlg.h    |   0
 .../constraint_mesh_global_tex_anim_dlg.cpp   |   0
 .../constraint_mesh_global_tex_anim_dlg.h     |   0
 .../object_viewer/constraint_mesh_tex_dlg.cpp |   0
 .../object_viewer/constraint_mesh_tex_dlg.h   |   0
 .../3d/object_viewer/create_file_dlg.cpp      |   0
 .../tools/3d/object_viewer/create_file_dlg.h  |   0
 .../tools/3d/object_viewer/curve_edit.cpp     |   0
 .../tools/3d/object_viewer/curve_edit.h       |   0
 .../tools/3d/object_viewer/day_night_dlg.cpp  |   0
 .../tools/3d/object_viewer/day_night_dlg.h    |   0
 .../3d/object_viewer/dialog_progress.cpp      |   0
 .../tools/3d/object_viewer/dialog_progress.h  |   0
 .../tools/3d/object_viewer/dialog_stack.h     |   0
 .../tools/3d/object_viewer/direction_attr.cpp |   0
 .../tools/3d/object_viewer/direction_attr.h   |   0
 .../tools/3d/object_viewer/direction_edit.cpp |   0
 .../tools/3d/object_viewer/direction_edit.h   |   0
 .../tools/3d/object_viewer/dup_ps.cpp         |   0
 .../tools/3d/object_viewer/dup_ps.h           |   0
 .../tools/3d/object_viewer/edit_attrib_dlg.h  |   0
 .../tools/3d/object_viewer/edit_ex.cpp        |   0
 .../tools/3d/object_viewer/edit_ex.h          |   0
 .../3d/object_viewer/edit_follow_path.cpp     |   0
 .../tools/3d/object_viewer/edit_follow_path.h |   0
 .../3d/object_viewer/edit_morph_mesh_dlg.cpp  |   0
 .../3d/object_viewer/edit_morph_mesh_dlg.h    |   0
 .../tools/3d/object_viewer/edit_ps_light.cpp  |   0
 .../tools/3d/object_viewer/edit_ps_light.h    |   0
 .../tools/3d/object_viewer/edit_ps_sound.cpp  |   0
 .../tools/3d/object_viewer/edit_ps_sound.h    |   0
 .../tools/3d/object_viewer/edit_spinner.cpp   |   0
 .../tools/3d/object_viewer/edit_spinner.h     |   0
 .../3d/object_viewer/edit_user_param.cpp      |   0
 .../tools/3d/object_viewer/edit_user_param.h  |   0
 .../tools/3d/object_viewer/editable_range.cpp |   0
 .../tools/3d/object_viewer/editable_range.h   |   0
 .../tools/3d/object_viewer/emitter_dlg.cpp    |   0
 .../tools/3d/object_viewer/emitter_dlg.h      |   0
 .../tools/3d/object_viewer/fire.tga           | Bin
 .../tools/3d/object_viewer/fog_dlg.cpp        |   0
 .../tools/3d/object_viewer/fog_dlg.h          |   0
 .../3d/object_viewer/global_wind_dlg.cpp      |   0
 .../tools/3d/object_viewer/global_wind_dlg.h  |   0
 .../tools/3d/object_viewer/graph.cpp          |   0
 .../tools/3d/object_viewer/graph.h            |   0
 .../tools/3d/object_viewer/halo.tga           | Bin
 .../nel => nel}/tools/3d/object_viewer/i1.tga | Bin
 .../nel => nel}/tools/3d/object_viewer/i2.tga | Bin
 .../nel => nel}/tools/3d/object_viewer/i3.tga | Bin
 .../3d/object_viewer/lb_extern_id_dlg.cpp     |   0
 .../tools/3d/object_viewer/lb_extern_id_dlg.h |   0
 .../tools/3d/object_viewer/light_at.bmp       | Bin
 .../3d/object_viewer/light_group_factor.cpp   |   0
 .../3d/object_viewer/light_group_factor.h     |   0
 .../object_viewer/located_bindable_dialog.cpp |   0
 .../object_viewer/located_bindable_dialog.h   |   0
 .../3d/object_viewer/located_properties.cpp   |   0
 .../3d/object_viewer/located_properties.h     |   0
 .../3d/object_viewer/located_target_dlg.cpp   |   0
 .../3d/object_viewer/located_target_dlg.h     |   0
 .../tools/3d/object_viewer/main_dlg.cpp       |   0
 .../tools/3d/object_viewer/main_dlg.h         |   0
 .../tools/3d/object_viewer/main_frame.cpp     |   0
 .../tools/3d/object_viewer/main_frame.h       |   0
 .../tools/3d/object_viewer/mesh_dlg.cpp       |   0
 .../tools/3d/object_viewer/mesh_dlg.h         |   0
 .../tools/3d/object_viewer/multi_tex_dlg.cpp  |   0
 .../tools/3d/object_viewer/multi_tex_dlg.h    |   0
 .../tools/3d/object_viewer/nevraxpill.ico     | Bin
 .../tools/3d/object_viewer/object_viewer.cfg  |   0
 .../tools/3d/object_viewer/object_viewer.cpp  |   0
 .../tools/3d/object_viewer/object_viewer.def  |   0
 .../tools/3d/object_viewer/object_viewer.h    |   0
 .../tools/3d/object_viewer/object_viewer.rc   |   0
 .../3d/object_viewer/object_viewer_debug.def  |   0
 .../object_viewer/object_viewer_interface.h   |   0
 .../tools/3d/object_viewer/particle.bmp       | Bin
 .../tools/3d/object_viewer/particle_dlg.cpp   |   0
 .../tools/3d/object_viewer/particle_dlg.h     |   0
 .../3d/object_viewer/particle_system_edit.cpp |   0
 .../3d/object_viewer/particle_system_edit.h   |   0
 .../3d/object_viewer/particle_tree_ctrl.cpp   |   0
 .../3d/object_viewer/particle_tree_ctrl.h     |   0
 .../3d/object_viewer/particle_workspace.cpp   |   0
 .../3d/object_viewer/particle_workspace.h     |   0
 .../tools/3d/object_viewer/pick_sound.cpp     |   0
 .../tools/3d/object_viewer/pick_sound.h       |   0
 .../tools/3d/object_viewer/pingoo_back.tga    | Bin
 .../tools/3d/object_viewer/pingoo_beak.tga    | Bin
 .../tools/3d/object_viewer/pingoo_face.tga    | Bin
 .../tools/3d/object_viewer/pingoo_foot.tga    | Bin
 .../tools/3d/object_viewer/pingoo_snow.tga    | Bin
 .../tools/3d/object_viewer/pingoo_stick.tga   | Bin
 .../tools/3d/object_viewer/popup_notify.h     |   0
 .../precomputed_rotations_dlg.cpp             |   0
 .../object_viewer/precomputed_rotations_dlg.h |   0
 .../3d/object_viewer/ps_global_color_dlg.cpp  |   0
 .../3d/object_viewer/ps_global_color_dlg.h    |   0
 .../tools/3d/object_viewer/ps_initial_pos.cpp |   0
 .../tools/3d/object_viewer/ps_initial_pos.h   |   0
 .../tools/3d/object_viewer/ps_mover_dlg.cpp   |   0
 .../tools/3d/object_viewer/ps_mover_dlg.h     |   0
 .../tools/3d/object_viewer/ps_wrapper.h       |   0
 .../tools/3d/object_viewer/range_manager.cpp  |   0
 .../tools/3d/object_viewer/range_manager.h    |   0
 .../tools/3d/object_viewer/range_selector.cpp |   0
 .../tools/3d/object_viewer/range_selector.h   |   0
 .../3d/object_viewer/res/object_viewer.rc2    |   0
 .../tools/3d/object_viewer/resource.h         |   0
 .../tools/3d/object_viewer/ribbon.tga         | Bin
 .../tools/3d/object_viewer/ribbon_dlg.cpp     |   0
 .../tools/3d/object_viewer/ribbon_dlg.h       |   0
 .../3d/object_viewer/save_options_dlg.cpp     |   0
 .../tools/3d/object_viewer/save_options_dlg.h |   0
 .../tools/3d/object_viewer/scene_rot_dlg.cpp  |   0
 .../tools/3d/object_viewer/scene_rot_dlg.h    |   0
 .../3d/object_viewer/scheme_bank_dlg.cpp      |   0
 .../tools/3d/object_viewer/scheme_bank_dlg.h  |   0
 .../tools/3d/object_viewer/scheme_manager.cpp |   0
 .../tools/3d/object_viewer/scheme_manager.h   |   0
 .../3d/object_viewer/select_movie_size.cpp    |   0
 .../3d/object_viewer/select_movie_size.h      |   0
 .../tools/3d/object_viewer/select_string.cpp  |   0
 .../tools/3d/object_viewer/select_string.h    |   0
 .../tools/3d/object_viewer/set_value_dlg.cpp  |   0
 .../tools/3d/object_viewer/set_value_dlg.h    |   0
 .../tools/3d/object_viewer/shock.tga          | Bin
 .../3d/object_viewer/skeleton_scale_dlg.cpp   |   0
 .../3d/object_viewer/skeleton_scale_dlg.h     |   0
 .../object_viewer/skippable_message_box.cpp   |   0
 .../3d/object_viewer/skippable_message_box.h  |   0
 .../tools/3d/object_viewer/slot_dlg.cpp       |   0
 .../tools/3d/object_viewer/slot_dlg.h         |   0
 .../tools/3d/object_viewer/smiley.tga         | Bin
 .../3d/object_viewer/snapshot_tool_dlg.cpp    |   0
 .../3d/object_viewer/snapshot_tool_dlg.h      |   0
 .../tools/3d/object_viewer/snow.tga           | Bin
 .../tools/3d/object_viewer/sound_anim_dlg.cpp |   0
 .../tools/3d/object_viewer/sound_anim_dlg.h   |   0
 .../3d/object_viewer/sound_anim_view.cpp      |   0
 .../tools/3d/object_viewer/sound_anim_view.h  |   0
 .../tools/3d/object_viewer/sound_system.cpp   |   0
 .../tools/3d/object_viewer/sound_system.h     |   0
 .../start_stop_particle_system.cpp            |   0
 .../start_stop_particle_system.h              |   0
 .../tools/3d/object_viewer/std_afx.cpp        |   0
 .../tools/3d/object_viewer/std_afx.h          |   0
 .../3d/object_viewer/tail_particle_dlg.cpp    |   0
 .../3d/object_viewer/tail_particle_dlg.h      |   0
 .../3d/object_viewer/texture_anim_dlg.cpp     |   0
 .../tools/3d/object_viewer/texture_anim_dlg.h |   0
 .../3d/object_viewer/texture_chooser.cpp      |   0
 .../tools/3d/object_viewer/texture_chooser.h  |   0
 .../tools/3d/object_viewer/toolbar1.bmp       | Bin
 .../tools/3d/object_viewer/tune_mrm_dlg.cpp   |   0
 .../tools/3d/object_viewer/tune_mrm_dlg.h     |   0
 .../3d/object_viewer/value_blender_dlg.cpp    |   0
 .../3d/object_viewer/value_blender_dlg.h      |   0
 .../object_viewer/value_from_emitter_dlg.cpp  |   0
 .../3d/object_viewer/value_from_emitter_dlg.h |   0
 .../3d/object_viewer/value_gradient_dlg.cpp   |   0
 .../3d/object_viewer/value_gradient_dlg.h     |   0
 .../vegetable_apperance_page.cpp              |   0
 .../object_viewer/vegetable_apperance_page.h  |   0
 .../3d/object_viewer/vegetable_copy_dlg.cpp   |   0
 .../3d/object_viewer/vegetable_copy_dlg.h     |   0
 .../object_viewer/vegetable_density_page.cpp  |   0
 .../3d/object_viewer/vegetable_density_page.h |   0
 .../tools/3d/object_viewer/vegetable_dlg.cpp  |   0
 .../tools/3d/object_viewer/vegetable_dlg.h    |   0
 .../3d/object_viewer/vegetable_edit_tools.cpp |   0
 .../3d/object_viewer/vegetable_edit_tools.h   |   0
 .../3d/object_viewer/vegetable_list_box.cpp   |   0
 .../3d/object_viewer/vegetable_list_box.h     |   0
 .../3d/object_viewer/vegetable_list_color.cpp |   0
 .../3d/object_viewer/vegetable_list_color.h   |   0
 .../vegetable_noise_value_dlg.cpp             |   0
 .../object_viewer/vegetable_noise_value_dlg.h |   0
 .../3d/object_viewer/vegetable_refresh.cpp    |   0
 .../3d/object_viewer/vegetable_refresh.h      |   0
 .../object_viewer/vegetable_rotate_page.cpp   |   0
 .../3d/object_viewer/vegetable_rotate_page.h  |   0
 .../3d/object_viewer/vegetable_scale_page.cpp |   0
 .../3d/object_viewer/vegetable_scale_page.h   |   0
 .../3d/object_viewer/vegetable_select_dlg.cpp |   0
 .../3d/object_viewer/vegetable_select_dlg.h   |   0
 .../3d/object_viewer/vegetable_wind_dlg.cpp   |   0
 .../3d/object_viewer/vegetable_wind_dlg.h     |   0
 .../tools/3d/object_viewer/version.rc2        |   0
 .../tools/3d/object_viewer/version.ver        |   0
 .../3d/object_viewer/water_pool_editor.cpp    |   0
 .../3d/object_viewer/water_pool_editor.h      |   0
 .../tools/3d/object_viewer/workspace.bmp      | Bin
 .../tools/3d/object_viewer_exe/CMakeLists.txt |   0
 .../tools/3d/object_viewer_exe/nevraxpill.ico | Bin
 .../object_viewer_exe/object_viewer_exe.cpp   |   0
 .../3d/object_viewer_exe/object_viewer_exe.rc |   0
 .../tools/3d/object_viewer_exe/resource.h     |   0
 .../tools/3d/object_viewer_exe/std_afx.cpp    |   0
 .../tools/3d/object_viewer_exe/std_afx.h      |   0
 .../tools/3d/object_viewer_exe/version.rc2    |   0
 .../3d/object_viewer_widget/CMakeLists.txt    |   0
 .../object_viewer_widget/src/CMakeLists.txt   |   0
 .../3d/object_viewer_widget/src/entity.cpp    |   0
 .../3d/object_viewer_widget/src/entity.h      |   0
 .../3d/object_viewer_widget/src/interfaces.h  |   0
 .../src/object_viewer_widget.cpp              |   0
 .../src/object_viewer_widget.h                |   0
 .../3d/object_viewer_widget/src/stdpch.cpp    |   0
 .../3d/object_viewer_widget/src/stdpch.h      |   0
 .../tools/3d/panoply_maker/CMakeLists.txt     |   0
 .../tools/3d/panoply_maker/blue_pill.ico      | Bin
 .../tools/3d/panoply_maker/color_mask.h       |   0
 .../tools/3d/panoply_maker/color_modifier.cpp |   0
 .../tools/3d/panoply_maker/color_modifier.h   |   0
 .../panoply_maker/hls_bank_texture_info.cpp   |   0
 .../3d/panoply_maker/hls_bank_texture_info.h  |   0
 .../tools/3d/panoply_maker/main.rc            |   0
 .../tools/3d/panoply_maker/panoply.cfg        |   0
 .../tools/3d/panoply_maker/panoply_maker.cpp  |   0
 .../tools/3d/panoply_preview/CMakeLists.txt   |   0
 .../tools/3d/panoply_preview/green_pill.ico   | Bin
 .../tools/3d/panoply_preview/main.rc          |   0
 .../tools/3d/panoply_preview/main_window.cpp  |   0
 .../tools/3d/panoply_preview/main_window.h    |   0
 .../3d/panoply_preview/panoply_preview.cpp    |   0
 .../3d/panoply_preview/panoply_preview.h      |   0
 .../tools/3d/panoply_preview/tool_config.h    |   0
 .../tools/3d/panoply_preview/tool_main.cpp    |   0
 .../tools/3d/panoply_preview/tool_main.h      |   0
 .../tools/3d/pipeline_max/CMakeLists.txt      |   0
 .../3d/pipeline_max/builtin/animatable.cpp    |   0
 .../3d/pipeline_max/builtin/animatable.h      |   0
 .../3d/pipeline_max/builtin/base_object.cpp   |   0
 .../3d/pipeline_max/builtin/base_object.h     |   0
 .../3d/pipeline_max/builtin/bitmap_tex.cpp    |   0
 .../3d/pipeline_max/builtin/bitmap_tex.h      |   0
 .../tools/3d/pipeline_max/builtin/builtin.cpp |   0
 .../tools/3d/pipeline_max/builtin/builtin.h   |   0
 .../pipeline_max/builtin/editable_patch.cpp   |   0
 .../3d/pipeline_max/builtin/editable_patch.h  |   0
 .../3d/pipeline_max/builtin/geom_object.cpp   |   0
 .../3d/pipeline_max/builtin/geom_object.h     |   0
 .../tools/3d/pipeline_max/builtin/i_node.cpp  |   0
 .../tools/3d/pipeline_max/builtin/i_node.h    |   0
 .../3d/pipeline_max/builtin/modifier.cpp      |   0
 .../tools/3d/pipeline_max/builtin/modifier.h  |   0
 .../tools/3d/pipeline_max/builtin/mtl.cpp     |   0
 .../tools/3d/pipeline_max/builtin/mtl.h       |   0
 .../3d/pipeline_max/builtin/mtl_base.cpp      |   0
 .../tools/3d/pipeline_max/builtin/mtl_base.h  |   0
 .../3d/pipeline_max/builtin/multi_mtl.cpp     |   0
 .../tools/3d/pipeline_max/builtin/multi_mtl.h |   0
 .../3d/pipeline_max/builtin/node_impl.cpp     |   0
 .../tools/3d/pipeline_max/builtin/node_impl.h |   0
 .../tools/3d/pipeline_max/builtin/object.cpp  |   0
 .../tools/3d/pipeline_max/builtin/object.h    |   0
 .../3d/pipeline_max/builtin/param_block.cpp   |   0
 .../3d/pipeline_max/builtin/param_block.h     |   0
 .../3d/pipeline_max/builtin/param_block_2.cpp |   0
 .../3d/pipeline_max/builtin/param_block_2.h   |   0
 .../3d/pipeline_max/builtin/patch_object.cpp  |   0
 .../3d/pipeline_max/builtin/patch_object.h    |   0
 .../3d/pipeline_max/builtin/poly_object.cpp   |   0
 .../3d/pipeline_max/builtin/poly_object.h     |   0
 .../pipeline_max/builtin/reference_maker.cpp  |   0
 .../3d/pipeline_max/builtin/reference_maker.h |   0
 .../pipeline_max/builtin/reference_target.cpp |   0
 .../pipeline_max/builtin/reference_target.h   |   0
 .../3d/pipeline_max/builtin/root_node.cpp     |   0
 .../tools/3d/pipeline_max/builtin/root_node.h |   0
 .../3d/pipeline_max/builtin/scene_impl.cpp    |   0
 .../3d/pipeline_max/builtin/scene_impl.h      |   0
 .../tools/3d/pipeline_max/builtin/std_mat.cpp |   0
 .../tools/3d/pipeline_max/builtin/std_mat.h   |   0
 .../3d/pipeline_max/builtin/std_mat_2.cpp     |   0
 .../tools/3d/pipeline_max/builtin/std_mat_2.h |   0
 .../pipeline_max/builtin/storage/app_data.cpp |   0
 .../pipeline_max/builtin/storage/app_data.h   |   0
 .../builtin/storage/geom_buffers.cpp          |   0
 .../builtin/storage/geom_buffers.h            |   0
 .../builtin/super_class_unknown.cpp           |   0
 .../builtin/super_class_unknown.h             |   0
 .../tools/3d/pipeline_max/builtin/texmap.cpp  |   0
 .../tools/3d/pipeline_max/builtin/texmap.h    |   0
 .../pipeline_max/builtin/track_view_node.cpp  |   0
 .../3d/pipeline_max/builtin/track_view_node.h |   0
 .../3d/pipeline_max/builtin/tri_object.cpp    |   0
 .../3d/pipeline_max/builtin/tri_object.h      |   0
 .../tools/3d/pipeline_max/class_data.cpp      |   0
 .../tools/3d/pipeline_max/class_data.h        |   0
 .../3d/pipeline_max/class_directory_3.cpp     |   0
 .../tools/3d/pipeline_max/class_directory_3.h |   0
 .../tools/3d/pipeline_max/config.cpp          |   0
 .../tools/3d/pipeline_max/config.h            |   0
 .../tools/3d/pipeline_max/derived_object.cpp  |   0
 .../tools/3d/pipeline_max/derived_object.h    |   0
 .../tools/3d/pipeline_max/dll_directory.cpp   |   0
 .../tools/3d/pipeline_max/dll_directory.h     |   0
 .../tools/3d/pipeline_max/dll_plugin_desc.cpp |   0
 .../tools/3d/pipeline_max/dll_plugin_desc.h   |   0
 .../3d/pipeline_max/epoly/editable_poly.cpp   |   0
 .../3d/pipeline_max/epoly/editable_poly.h     |   0
 .../tools/3d/pipeline_max/epoly/epoly.cpp     |   0
 .../tools/3d/pipeline_max/epoly/epoly.h       |   0
 .../tools/3d/pipeline_max/scene.cpp           |   0
 .../nel => nel}/tools/3d/pipeline_max/scene.h |   0
 .../tools/3d/pipeline_max/scene_class.cpp     |   0
 .../tools/3d/pipeline_max/scene_class.h       |   0
 .../3d/pipeline_max/scene_class_registry.cpp  |   0
 .../3d/pipeline_max/scene_class_registry.h    |   0
 .../3d/pipeline_max/scene_class_unknown.cpp   |   0
 .../3d/pipeline_max/scene_class_unknown.h     |   0
 .../tools/3d/pipeline_max/storage_array.cpp   |   0
 .../tools/3d/pipeline_max/storage_array.h     |   0
 .../tools/3d/pipeline_max/storage_chunks.cpp  |   0
 .../tools/3d/pipeline_max/storage_chunks.h    |   0
 .../tools/3d/pipeline_max/storage_file.cpp    |   0
 .../tools/3d/pipeline_max/storage_file.h      |   0
 .../tools/3d/pipeline_max/storage_object.cpp  |   0
 .../tools/3d/pipeline_max/storage_object.h    |   0
 .../tools/3d/pipeline_max/storage_stream.cpp  |   0
 .../tools/3d/pipeline_max/storage_stream.h    |   0
 .../tools/3d/pipeline_max/storage_value.cpp   |   0
 .../tools/3d/pipeline_max/storage_value.h     |   0
 .../3d/pipeline_max/super_class_desc.cpp      |   0
 .../tools/3d/pipeline_max/super_class_desc.h  |   0
 .../tools/3d/pipeline_max/typedefs.cpp        |   0
 .../tools/3d/pipeline_max/typedefs.h          |   0
 .../3d/pipeline_max/update1/editable_mesh.cpp |   0
 .../3d/pipeline_max/update1/editable_mesh.h   |   0
 .../tools/3d/pipeline_max/update1/update1.cpp |   0
 .../tools/3d/pipeline_max/update1/update1.h   |   0
 .../3d/pipeline_max/wsm_derived_object.cpp    |   0
 .../3d/pipeline_max/wsm_derived_object.h      |   0
 .../tools/3d/pipeline_max_dump/CMakeLists.txt |   0
 .../class_directory_3_2010.c                  |   0
 .../pipeline_max_dump/class_directory_3_3.c   |   0
 .../tools/3d/pipeline_max_dump/config_2010.c  |   0
 .../3d/pipeline_max_dump/config_2010.txt      |   0
 .../tools/3d/pipeline_max_dump/config_3.c     |   0
 .../tools/3d/pipeline_max_dump/info.txt       |   0
 .../tools/3d/pipeline_max_dump/main.cpp       |   0
 .../tools/3d/pipeline_max_dump/scene_2010.c   |   0
 .../3d/pipeline_max_dump/scene_graph_5.txt    |   0
 .../CMakeLists.txt                            |   0
 .../3d/pipeline_max_rewrite_assets/main.cpp   |   0
 .../tools/3d/plugin_max/CMakeLists.txt        |   0
 .../tools/3d/plugin_max/compilation_notes.txt |   0
 .../3d/plugin_max/compilation_notes_vc7.txt   |   0
 .../3d/plugin_max/install_plugin_max.txt      |   0
 .../macroscripts/nel_mirror_weights.mcr       |   0
 .../macroscripts/nel_node_properties.mcr      |   0
 .../macroscripts/nel_xref_building.mcr        |   0
 .../3d/plugin_max/max_animation_support.txt   |   0
 .../tools/3d/plugin_max/max_light_support.txt |   0
 .../3d/plugin_max/max_lightmap_support.txt    |   0
 .../3d/plugin_max/max_material_support.txt    |   0
 .../3d/plugin_max/max_skinning_support.txt    |   0
 .../nel_3dsmax_shared/CMakeLists.txt          |   0
 .../plugin_max/nel_3dsmax_shared/StdAfx.cpp   |   0
 .../3d/plugin_max/nel_3dsmax_shared/StdAfx.h  |   0
 .../nel_3dsmax_shared/nel_3dsmax_shared.cpp   |   0
 .../nel_3dsmax_shared/nel_3dsmax_shared.h     |   0
 .../nel_3dsmax_shared/nel_3dsmax_shared.rc    | Bin
 .../plugin_max/nel_3dsmax_shared/resource.h   |   0
 .../nel_3dsmax_shared/string_common.h         |   0
 .../plugin_max/nel_3dsmax_shared/version.rc2  |   0
 .../3d/plugin_max/nel_export/CMakeLists.txt   |   0
 .../3d/plugin_max/nel_export/DllEntry.cpp     |   0
 .../plugin_max/nel_export/last_lightmap.cpp   |   0
 .../3d/plugin_max/nel_export/nel_export.cpp   |   0
 .../3d/plugin_max/nel_export/nel_export.def   |   0
 .../3d/plugin_max/nel_export/nel_export.h     |   0
 .../3d/plugin_max/nel_export/nel_export.rc    |   0
 .../nel_export/nel_export_collision.cpp       |   0
 .../nel_export/nel_export_export.cpp          |   0
 .../nel_export/nel_export_filetools.cpp       |   0
 .../nel_export/nel_export_lightmap_v1.cpp     |   0
 .../nel_export/nel_export_lightmap_v2.cpp     |   0
 .../nel_export/nel_export_node_properties.cpp |   0
 .../nel_export/nel_export_scene.cpp           |   0
 .../plugin_max/nel_export/nel_export_scene.h  |   0
 .../nel_export/nel_export_script.cpp          |   0
 .../plugin_max/nel_export/nel_export_swt.cpp  |   0
 .../plugin_max/nel_export/nel_export_view.cpp |   0
 .../plugin_max/nel_export/nel_export_zone.cpp |   0
 .../3d/plugin_max/nel_export/progress.cpp     |   0
 .../tools/3d/plugin_max/nel_export/progress.h |   0
 .../tools/3d/plugin_max/nel_export/resource.h |   0
 .../3d/plugin_max/nel_export/std_afx.cpp      |   0
 .../tools/3d/plugin_max/nel_export/std_afx.h  |   0
 .../3d/plugin_max/nel_export/version.rc2      |   0
 .../3d/plugin_max/nel_export/version.ver      |   0
 .../3d/plugin_max/nel_mesh_lib/CMakeLists.txt |   0
 .../3d/plugin_max/nel_mesh_lib/StdAfx.cpp     |   0
 .../tools/3d/plugin_max/nel_mesh_lib/StdAfx.h |   0
 .../3d/plugin_max/nel_mesh_lib/calc_lm.cpp    |   0
 .../3d/plugin_max/nel_mesh_lib/calc_lm.h      |   0
 .../plugin_max/nel_mesh_lib/calc_lm_plane.cpp |   0
 .../plugin_max/nel_mesh_lib/calc_lm_plane.h   |   0
 .../plugin_max/nel_mesh_lib/calc_lm_rad.cpp   |   0
 .../3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp |   0
 .../3d/plugin_max/nel_mesh_lib/calc_lm_rt.h   |   0
 .../plugin_max/nel_mesh_lib/export_anim.cpp   |   0
 .../plugin_max/nel_mesh_lib/export_appdata.h  |   0
 .../nel_mesh_lib/export_collision.cpp         |   0
 .../plugin_max/nel_mesh_lib/export_flare.cpp  |   0
 .../plugin_max/nel_mesh_lib/export_light.cpp  |   0
 .../nel_mesh_lib/export_lod_character.cpp     |   0
 .../nel_mesh_lib/export_material.cpp          |   0
 .../plugin_max/nel_mesh_lib/export_mesh.cpp   |   0
 .../nel_mesh_lib/export_mesh_interface.cpp    |   0
 .../plugin_max/nel_mesh_lib/export_misc.cpp   |   0
 .../3d/plugin_max/nel_mesh_lib/export_nel.h   |   0
 .../nel_mesh_lib/export_particle_system.cpp   |   0
 .../nel_mesh_lib/export_radial_normal.cpp     |   0
 .../nel_mesh_lib/export_radial_normal.h       |   0
 .../nel_mesh_lib/export_remanence.cpp         |   0
 .../plugin_max/nel_mesh_lib/export_scene.cpp  |   0
 .../plugin_max/nel_mesh_lib/export_script.cpp |   0
 .../nel_mesh_lib/export_skinning.cpp          |   0
 .../nel_mesh_lib/export_vegetable.cpp         |   0
 .../nel_patch_converter/CMakeLists.txt        |   0
 .../nel_patch_converter/DllEntry.cpp          |   0
 .../plugin_max/nel_patch_converter/PO2RPO.h   |   0
 .../nel_patch_converter.cpp                   |   0
 .../nel_patch_converter.def                   |   0
 .../nel_patch_converter/nel_patch_converter.h |   0
 .../nel_patch_converter.rc                    |   0
 .../plugin_max/nel_patch_converter/resource.h |   0
 .../nel_patch_converter/rykolscript.txt       |   0
 .../plugin_max/nel_patch_converter/script.cpp |   0
 .../nel_patch_converter/version.rc2           |   0
 .../nel_patch_converter/version.ver           |   0
 .../plugin_max/nel_patch_edit/CMakeLists.txt  |   0
 .../3d/plugin_max/nel_patch_edit/addvertc.cur | Bin
 .../3d/plugin_max/nel_patch_edit/attach.cur   | Bin
 .../3d/plugin_max/nel_patch_edit/bevel.cur    | Bin
 .../3d/plugin_max/nel_patch_edit/bin00001.tga | Bin
 .../3d/plugin_max/nel_patch_edit/bmp00001.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/bmp00002.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/bmp00003.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/booleant.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/boolinte.cur | Bin
 .../3d/plugin_max/nel_patch_edit/boolsubt.cur | Bin
 .../3d/plugin_max/nel_patch_edit/boolunio.cur | Bin
 .../3d/plugin_max/nel_patch_edit/bulbmask.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/bulbs.bmp    | Bin
 .../3d/plugin_max/nel_patch_edit/chamfer.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/crosshr.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/crossins.cur | Bin
 .../3d/plugin_max/nel_patch_edit/cur00001.cur | Bin
 .../3d/plugin_max/nel_patch_edit/cur00002.cur | Bin
 .../3d/plugin_max/nel_patch_edit/cursor1.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/echamfer.cur | Bin
 .../3d/plugin_max/nel_patch_edit/editpat.h    |   0
 .../3d/plugin_max/nel_patch_edit/extrudec.cur | Bin
 .../3d/plugin_max/nel_patch_edit/faceselt.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/fillet.cur   | Bin
 .../3d/plugin_max/nel_patch_edit/icon1.ico    | Bin
 .../3d/plugin_max/nel_patch_edit/icon2.ico    | Bin
 .../3d/plugin_max/nel_patch_edit/icon3.ico    | Bin
 .../3d/plugin_max/nel_patch_edit/large.cpp    |   0
 .../3d/plugin_max/nel_patch_edit/large.tga    | Bin
 .../3d/plugin_max/nel_patch_edit/light.cpp    |   0
 .../3d/plugin_max/nel_patch_edit/light.tga    | Bin
 .../3d/plugin_max/nel_patch_edit/magnify.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/mask_boo.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/mask_fac.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/mask_unw.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/medium.cpp   |   0
 .../3d/plugin_max/nel_patch_edit/medium.tga   | Bin
 .../tools/3d/plugin_max/nel_patch_edit/mods.h |   0
 .../3d/plugin_max/nel_patch_edit/mods.rc      |   0
 .../3d/plugin_max/nel_patch_edit/modsres.h    |   0
 .../3d/plugin_max/nel_patch_edit/move_x.cur   | Bin
 .../3d/plugin_max/nel_patch_edit/move_y.cur   | Bin
 .../nel_patch_edit/nel_patch_edit.def         |   0
 .../tools/3d/plugin_max/nel_patch_edit/np.cpp |   0
 .../nel_patch_edit/np_edit_patch_data.cpp     |   0
 .../nel_patch_edit/np_edit_patch_mod.cpp      |   0
 .../plugin_max/nel_patch_edit/np_editpops.cpp |   0
 .../nel_patch_edit/np_ep_vert_mapper.cpp      |   0
 .../nel_patch_edit/np_epm_add_patches.cpp     |   0
 .../nel_patch_edit/np_epm_attach.cpp          |   0
 .../nel_patch_edit/np_epm_bevel.cpp           |   0
 .../plugin_max/nel_patch_edit/np_epm_del.cpp  |   0
 .../nel_patch_edit/np_epm_detach.cpp          |   0
 .../nel_patch_edit/np_epm_extrude.cpp         |   0
 .../plugin_max/nel_patch_edit/np_epm_file.cpp |   0
 .../plugin_max/nel_patch_edit/np_epm_gui.cpp  |   0
 .../plugin_max/nel_patch_edit/np_epm_hide.cpp |   0
 .../plugin_max/nel_patch_edit/np_epm_hook.cpp |   0
 .../nel_patch_edit/np_epm_material.cpp        |   0
 .../nel_patch_edit/np_epm_remember.cpp        |   0
 .../nel_patch_edit/np_epm_selection.cpp       |   0
 .../nel_patch_edit/np_epm_subdivide.cpp       |   0
 .../nel_patch_edit/np_epm_surface.cpp         |   0
 .../plugin_max/nel_patch_edit/np_epm_tess.cpp |   0
 .../plugin_max/nel_patch_edit/np_gui_bind.cpp |   0
 .../3d/plugin_max/nel_patch_edit/np_main.cpp  |   0
 .../3d/plugin_max/nel_patch_edit/np_mods.cpp  |   0
 .../nel_patch_edit/np_patch_point_tab.cpp     |   0
 .../nel_patch_edit/np_patch_restore.cpp       |   0
 .../nel_patch_edit/np_patch_sel_restore.cpp   |   0
 .../nel_patch_edit/np_patch_vertex_delta.cpp  |   0
 .../nel_patch_edit/np_pick_patch_attach.cpp   |   0
 .../plugin_max/nel_patch_edit/np_record.cpp   |   0
 .../plugin_max/nel_patch_edit/np_rollup.cpp   |   0
 .../3d/plugin_max/nel_patch_edit/outline.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/panhand.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/patselm.bmp  | Bin
 .../3d/plugin_max/nel_patch_edit/patselt.bmp  | Bin
 .../plugin_max/nel_patch_edit/pick_color.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/region.cur   | Bin
 .../3d/plugin_max/nel_patch_edit/scale_x.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/scale_y.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/segbreak.cur | Bin
 .../3d/plugin_max/nel_patch_edit/segrefin.cur | Bin
 .../3d/plugin_max/nel_patch_edit/selmask.bmp  | Bin
 .../3d/plugin_max/nel_patch_edit/splinese.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/splselm.bmp  | Bin
 .../3d/plugin_max/nel_patch_edit/stdafx.cpp   |   0
 .../3d/plugin_max/nel_patch_edit/stdafx.h     |   0
 .../3d/plugin_max/nel_patch_edit/thselcur.cur | Bin
 .../3d/plugin_max/nel_patch_edit/trim.cur     | Bin
 .../nel_patch_edit/unwrap_option.bmp          | Bin
 .../nel_patch_edit/unwrap_option_mask.bmp     | Bin
 .../nel_patch_edit/unwrap_transform.bmp       | Bin
 .../nel_patch_edit/unwrap_transform_mask.bmp  | Bin
 .../nel_patch_edit/unwrap_verts.bmp           | Bin
 .../nel_patch_edit/unwrap_verts_mask.bmp      | Bin
 .../plugin_max/nel_patch_edit/unwrap_view.bmp | Bin
 .../nel_patch_edit/unwrap_view_mask.bmp       | Bin
 .../3d/plugin_max/nel_patch_edit/unwrapto.bmp | Bin
 .../3d/plugin_max/nel_patch_edit/vchamfer.cur | Bin
 .../3d/plugin_max/nel_patch_edit/version.rc2  |   0
 .../3d/plugin_max/nel_patch_edit/vertconn.cur | Bin
 .../3d/plugin_max/nel_patch_edit/vinsert.cur  | Bin
 .../3d/plugin_max/nel_patch_edit/weld.cur     | Bin
 .../plugin_max/nel_patch_lib/CMakeLists.txt   |   0
 .../nel_patch_lib/nel_patch_mesh.cpp          |   0
 .../plugin_max/nel_patch_lib/nel_patch_mesh.h |   0
 .../nel_patch_lib/path_mesh_alloc.cpp         |   0
 .../nel_patch_lib/path_mesh_alloc.h           |   0
 .../tools/3d/plugin_max/nel_patch_lib/rpo.cpp |   0
 .../tools/3d/plugin_max/nel_patch_lib/rpo.h   |   0
 .../3d/plugin_max/nel_patch_lib/rpo2nel.cpp   |   0
 .../3d/plugin_max/nel_patch_lib/stdafx.cpp    |   0
 .../3d/plugin_max/nel_patch_lib/stdafx.h      |   0
 .../nel_patch_lib/vertex_neighborhood.cpp     |   0
 .../nel_patch_lib/vertex_neighborhood.h       |   0
 .../plugin_max/nel_patch_paint/CMakeLists.txt |   0
 .../plugin_max/nel_patch_paint/DllEntry.cpp   |   0
 .../3d/plugin_max/nel_patch_paint/DllEntry.h  |   0
 .../3d/plugin_max/nel_patch_paint/_0.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_0.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_1.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_1.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_10.cpp     |   0
 .../3d/plugin_max/nel_patch_paint/_10.tga     | Bin
 .../3d/plugin_max/nel_patch_paint/_11.cpp     |   0
 .../3d/plugin_max/nel_patch_paint/_11.tga     | Bin
 .../3d/plugin_max/nel_patch_paint/_128.cpp    |   0
 .../3d/plugin_max/nel_patch_paint/_128.tga    | Bin
 .../3d/plugin_max/nel_patch_paint/_2.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_2.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_256.cpp    |   0
 .../3d/plugin_max/nel_patch_paint/_256.tga    | Bin
 .../3d/plugin_max/nel_patch_paint/_3.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_3.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_4.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_4.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_5.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_5.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_6.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_6.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_7.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_7.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_8.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_8.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_9.cpp      |   0
 .../3d/plugin_max/nel_patch_paint/_9.tga      | Bin
 .../3d/plugin_max/nel_patch_paint/_small.cpp  |   0
 .../3d/plugin_max/nel_patch_paint/_small.tga  | Bin
 .../3d/plugin_max/nel_patch_paint/all.cpp     |   0
 .../3d/plugin_max/nel_patch_paint/all.tga     | Bin
 .../plugin_max/nel_patch_paint/cur00001.cur   | Bin
 .../3d/plugin_max/nel_patch_paint/cursor1.cur | Bin
 .../3d/plugin_max/nel_patch_paint/goofy.cpp   |   0
 .../3d/plugin_max/nel_patch_paint/goofy.tga   | Bin
 .../3d/plugin_max/nel_patch_paint/keys.cfg    |   0
 .../3d/plugin_max/nel_patch_paint/large.cpp   |   0
 .../3d/plugin_max/nel_patch_paint/large.tga   | Bin
 .../3d/plugin_max/nel_patch_paint/light.cpp   |   0
 .../3d/plugin_max/nel_patch_paint/light.tga   | Bin
 .../3d/plugin_max/nel_patch_paint/lock.cpp    |   0
 .../3d/plugin_max/nel_patch_paint/lock.tga    | Bin
 .../3d/plugin_max/nel_patch_paint/medium.cpp  |   0
 .../3d/plugin_max/nel_patch_paint/medium.tga  | Bin
 .../plugin_max/nel_patch_paint/nel_paint.cpp  |   0
 .../nel_patch_paint/nel_patch_paint.cpp       |   0
 .../nel_patch_paint/nel_patch_paint.def       |   0
 .../nel_patch_paint/nel_patch_paint.h         |   0
 .../nel_patch_paint/nel_patch_paint.rc        |   0
 .../3d/plugin_max/nel_patch_paint/nothing.cpp |   0
 .../3d/plugin_max/nel_patch_paint/nothing.tga | Bin
 .../plugin_max/nel_patch_paint/oriented.cpp   |   0
 .../plugin_max/nel_patch_paint/oriented.tga   | Bin
 .../3d/plugin_max/nel_patch_paint/paint.cpp   |   0
 .../plugin_max/nel_patch_paint/paint_data.cpp |   0
 .../plugin_max/nel_patch_paint/paint_file.cpp |   0
 .../plugin_max/nel_patch_paint/paint_fill.cpp |   0
 .../plugin_max/nel_patch_paint/paint_fill.h   |   0
 .../nel_patch_paint/paint_light.cpp           |   0
 .../plugin_max/nel_patch_paint/paint_light.h  |   0
 .../plugin_max/nel_patch_paint/paint_main.cpp |   0
 .../plugin_max/nel_patch_paint/paint_mod.cpp  |   0
 .../plugin_max/nel_patch_paint/paint_pops.cpp |   0
 .../nel_patch_paint/paint_record.cpp          |   0
 .../nel_patch_paint/paint_restore.cpp         |   0
 .../nel_patch_paint/paint_rollup.cpp          |   0
 .../nel_patch_paint/paint_tileset.cpp         |   0
 .../nel_patch_paint/paint_tileset.h           |   0
 .../nel_patch_paint/paint_to_nel.cpp          |   0
 .../plugin_max/nel_patch_paint/paint_to_nel.h |   0
 .../plugin_max/nel_patch_paint/paint_ui.cpp   |   0
 .../3d/plugin_max/nel_patch_paint/paint_ui.h  |   0
 .../plugin_max/nel_patch_paint/paint_undo.cpp |   0
 .../plugin_max/nel_patch_paint/paint_undo.h   |   0
 .../nel_patch_paint/paint_vcolor.cpp          |   0
 .../plugin_max/nel_patch_paint/paint_vcolor.h |   0
 .../plugin_max/nel_patch_paint/pick_col.cur   | Bin
 .../plugin_max/nel_patch_paint/pick_color.cur | Bin
 .../3d/plugin_max/nel_patch_paint/regular.cpp |   0
 .../3d/plugin_max/nel_patch_paint/regular.tga | Bin
 .../3d/plugin_max/nel_patch_paint/resource.h  |   0
 .../3d/plugin_max/nel_patch_paint/stdafx.cpp  |   0
 .../3d/plugin_max/nel_patch_paint/stdafx.h    |   0
 .../plugin_max/nel_patch_paint/user_guide.txt |   0
 .../3d/plugin_max/nel_patch_paint/version.rc2 |   0
 .../3d/plugin_max/nel_patch_paint/version.ver |   0
 .../nel_vertex_tree_paint/Buttons.bmp         | Bin
 .../nel_vertex_tree_paint/CMakeLists.txt      |   0
 .../nel_vertex_tree_paint/Paint.cpp           |   0
 .../nel_vertex_tree_paint/buttonmask.bmp      | Bin
 .../nel_vertex_tree_paint/dllmain.cpp         |   0
 .../nel_vertex_tree_paint/dropcurs.cur        | Bin
 .../nel_vertex_tree_paint/paintcur.cur        | Bin
 .../nel_vertex_tree_paint/resource.h          |   0
 .../nel_vertex_tree_paint/version.rc2         |   0
 .../vertex_tree_paint.cpp                     |   0
 .../vertex_tree_paint.def                     |   0
 .../nel_vertex_tree_paint/vertex_tree_paint.h |   0
 .../vertex_tree_paint.rc                      |   0
 .../3d/plugin_max/nel_water_material.txt      |   0
 .../tools/3d/plugin_max/resolve_troubles.txt  |   0
 .../tools/3d/plugin_max/scripts/db_cleaner.ms |   0
 .../3d/plugin_max/scripts/db_erase_mesh.ms    |   0
 .../tools/3d/plugin_max/scripts/db_shooter.ms |   0
 .../3d/plugin_max/scripts/extrude_water.ms    |   0
 .../scripts/nel_add_name_ref_scale.ms         |   0
 .../scripts/nel_assets_dump_timings.ms        |   0
 .../3d/plugin_max/scripts/nel_assets_png.ms   |   0
 .../scripts/nel_assets_png_batched.ms         |   0
 .../scripts/nel_assets_png_database.ms        |   0
 .../scripts/nel_assets_ps_batched.ms          |   0
 .../plugin_max/scripts/nel_assets_resave.ms   |   0
 .../scripts/nel_assets_resave_hard.ms         |   0
 .../scripts/nel_batched_mergesave.ms          |   0
 .../plugin_max/scripts/nel_batched_script.ms  |   0
 .../scripts/nel_copy_biped_figure_mode.ms     |   0
 .../plugin_max/scripts/nel_create_matrix.ms   |   0
 .../plugin_max/scripts/nel_mat_converter.ms   |   0
 .../plugin_max/scripts/nel_mirror_weights.ms  |   0
 .../plugin_max/scripts/nel_move_animation.ms  |   0
 .../plugin_max/scripts/nel_node_properties.ms |   0
 .../scripts/nel_old_zone_to_ligo.ms           |   0
 .../3d/plugin_max/scripts/nel_orient_zones.ms |   0
 .../tools/3d/plugin_max/scripts/nel_rename.ms |   0
 .../3d/plugin_max/scripts/nel_repair_xref.ms  |   0
 .../tools/3d/plugin_max/scripts/nel_select.ms |   0
 .../3d/plugin_max/scripts/nel_select_ig.ms    |   0
 .../3d/plugin_max/scripts/nel_utility.ms      |   0
 .../plugin_max/scripts/nel_xref_building.ms   |   0
 .../3d/plugin_max/scripts/nel_zone_namer.ms   |   0
 .../plugin_max/scripts/nel_zone_snapshot.ms   |   0
 .../3d/plugin_max/scripts/reload_textures.ms  |   0
 .../plugin_max/scripts/startup/nel_flare.ms   |   0
 .../plugin_max/scripts/startup/nel_light.ms   |   0
 .../scripts/startup/nel_material.ms           |   0
 .../scripts/startup/nel_material.ms.v1        |   0
 .../scripts/startup/nel_material.ms.v11       |   0
 .../scripts/startup/nel_material.ms.v2        |   0
 .../scripts/startup/nel_material.ms.v3        |   0
 .../scripts/startup/nel_material.ms.v5        |   0
 .../scripts/startup/nel_multi_set.ms          |   0
 .../scripts/startup/nel_pacs_box.ms           |   0
 .../scripts/startup/nel_pacs_cylinder.ms      |   0
 .../3d/plugin_max/scripts/startup/nel_ps.ms   |   0
 .../3d/plugin_max/scripts/startup/nel_swt.ms  |   0
 .../scripts/startup/nel_wave_maker.ms         |   0
 .../3d/plugin_max/tile_utility/CMakeLists.txt |   0
 .../3d/plugin_max/tile_utility/DllEntry.cpp   |   0
 .../3d/plugin_max/tile_utility/resource.h     |   0
 .../3d/plugin_max/tile_utility/rgbadd.cpp     |   0
 .../plugin_max/tile_utility/tile_utility.cpp  |   0
 .../plugin_max/tile_utility/tile_utility.def  |   0
 .../3d/plugin_max/tile_utility/tile_utility.h |   0
 .../plugin_max/tile_utility/tile_utility.rc   |   0
 .../3d/plugin_max/tile_utility/version.rc2    |   0
 .../3d/plugin_max/tile_utility/version.ver    |   0
 .../3d/s3tc_compressor_lib/CMakeLists.txt     |   0
 .../s3tc_compressor_lib/s3tc_compressor.cpp   |   0
 .../3d/s3tc_compressor_lib/s3tc_compressor.h  |   0
 .../tools/3d/shape2obj/CMakeLists.txt         |   0
 {code/nel => nel}/tools/3d/shape2obj/main.cpp |   0
 .../tools/3d/shapes_exporter/CMakeLists.txt   |   0
 .../tools/3d/shapes_exporter/gold_pill.ico    | Bin
 .../tools/3d/shapes_exporter/main.cpp         |   0
 .../tools/3d/shapes_exporter/main.rc          |   0
 .../3d/shapes_exporter/shapes_exporter.cfg    |   0
 .../3d/shapes_exporter/shapes_exporter.cpp    |   0
 .../3d/shapes_exporter/shapes_exporter.h      |   0
 .../tools/3d/shared_widgets/CMakeLists.txt    |   0
 .../tools/3d/shared_widgets/command_log.cpp   |   0
 .../tools/3d/shared_widgets/command_log.h     |   0
 .../tools/3d/shared_widgets/common.h          |   0
 .../3d/textures_optimizer/CMakeLists.txt      |   0
 .../tools/3d/textures_optimizer/main.cpp      |   0
 .../tools/3d/textures_tool/CMakeLists.txt     |   0
 .../tools/3d/textures_tool/main.cpp           |   0
 .../tools/3d/tga_2_dds/CMakeLists.txt         |   0
 .../tools/3d/tga_2_dds/blue_pill.ico          | Bin
 {code/nel => nel}/tools/3d/tga_2_dds/main.rc  |   0
 .../tools/3d/tga_2_dds/tga2dds.cpp            |   0
 .../tools/3d/tga_cut/CMakeLists.txt           |   0
 .../tools/3d/tga_cut/blue_pill.ico            | Bin
 {code/nel => nel}/tools/3d/tga_cut/main.rc    |   0
 .../nel => nel}/tools/3d/tga_cut/tga_cut.cpp  |   0
 .../tools/3d/tga_resize/CMakeLists.txt        |   0
 .../nel => nel}/tools/3d/tga_resize/main.cpp  |   0
 .../nel => nel}/tools/3d/tile_edit/Browse.cpp |   0
 {code/nel => nel}/tools/3d/tile_edit/Browse.h |   0
 .../tools/3d/tile_edit/CMakeLists.txt         |   0
 .../tools/3d/tile_edit/DialogEditList.cpp     |   0
 .../tools/3d/tile_edit/DialogEditList.h       |   0
 .../tools/3d/tile_edit/DllEntry.cpp           |   0
 .../nel => nel}/tools/3d/tile_edit/GetVal.cpp |   0
 {code/nel => nel}/tools/3d/tile_edit/GetVal.h |   0
 .../nel => nel}/tools/3d/tile_edit/Popup.cpp  |   0
 {code/nel => nel}/tools/3d/tile_edit/Popup.h  |   0
 .../nel => nel}/tools/3d/tile_edit/ReadMe.txt |   0
 .../3d/tile_edit/SelectionTerritoire.cpp      |   0
 .../tools/3d/tile_edit/SelectionTerritoire.h  |   0
 .../tools/3d/tile_edit/TileCtrl.cpp           |   0
 .../nel => nel}/tools/3d/tile_edit/TileCtrl.h |   0
 .../tools/3d/tile_edit/TileList.cpp           |   0
 .../nel => nel}/tools/3d/tile_edit/TileList.h |   0
 .../tools/3d/tile_edit/TileView.cpp           |   0
 .../nel => nel}/tools/3d/tile_edit/TileView.h |   0
 {code/nel => nel}/tools/3d/tile_edit/View.cpp |   0
 {code/nel => nel}/tools/3d/tile_edit/View.h   |   0
 .../tools/3d/tile_edit/ViewColumn.cpp         |   0
 .../tools/3d/tile_edit/ViewColumn.h           |   0
 .../tools/3d/tile_edit/choose_veget_set.cpp   |   0
 .../tools/3d/tile_edit/choose_veget_set.h     |   0
 {code/nel => nel}/tools/3d/tile_edit/cpu.cpp  |   0
 .../tools/3d/tile_edit/cursor1.cur            | Bin
 .../nel => nel}/tools/3d/tile_edit/custom.cpp |   0
 {code/nel => nel}/tools/3d/tile_edit/custom.h |   0
 .../tools/3d/tile_edit/nevraxpill.ico         | Bin
 .../nel => nel}/tools/3d/tile_edit/resource.h |   0
 {code/nel => nel}/tools/3d/tile_edit/rot0.bmp | Bin
 {code/nel => nel}/tools/3d/tile_edit/rot1.bmp | Bin
 {code/nel => nel}/tools/3d/tile_edit/rot2.bmp | Bin
 {code/nel => nel}/tools/3d/tile_edit/rot3.bmp | Bin
 .../tools/3d/tile_edit/select_rotation.cpp    |   0
 .../tools/3d/tile_edit/select_rotation.h      |   0
 .../nel => nel}/tools/3d/tile_edit/stdafx.cpp |   0
 {code/nel => nel}/tools/3d/tile_edit/stdafx.h |   0
 {code/nel => nel}/tools/3d/tile_edit/thread.h |   0
 .../tools/3d/tile_edit/thread_win32.cpp       |   0
 .../tools/3d/tile_edit/thread_win32.h         |   0
 .../tools/3d/tile_edit/tile32_32.bmp          | Bin
 .../tools/3d/tile_edit/tile_edit_exe.cpp      |   0
 .../tools/3d/tile_edit/tile_edit_exe.h        |   0
 .../tools/3d/tile_edit/tile_edit_exe.rc       |   0
 .../tools/3d/tile_edit/version.rc2            |   0
 .../tools/3d/tile_edit_qt/CMakeLists.txt      |   0
 .../tools/3d/tile_edit_qt/add_tile.png        | Bin
 .../tools/3d/tile_edit_qt/browser_model.cpp   |   0
 .../tools/3d/tile_edit_qt/browser_model.h     |   0
 .../tools/3d/tile_edit_qt/common.cpp          |   0
 .../tools/3d/tile_edit_qt/common.h            |   0
 .../tools/3d/tile_edit_qt/delete_image.png    | Bin
 .../tools/3d/tile_edit_qt/delete_tile.png     | Bin
 .../tools/3d/tile_edit_qt/down.png            | Bin
 .../tools/3d/tile_edit_qt/empty_image.png     | Bin
 .../tools/3d/tile_edit_qt/items_edit_dlg.cpp  |   0
 .../tools/3d/tile_edit_qt/items_edit_dlg.h    |   0
 .../tools/3d/tile_edit_qt/items_edit_qt.ui    |   0
 .../tools/3d/tile_edit_qt/left.png            | Bin
 .../tools/3d/tile_edit_qt/main.cpp            |   0
 .../nel => nel}/tools/3d/tile_edit_qt/nel.png | Bin
 .../tools/3d/tile_edit_qt/replace_image.png   | Bin
 .../tools/3d/tile_edit_qt/reset.png           | Bin
 .../tools/3d/tile_edit_qt/right.png           | Bin
 .../tools/3d/tile_edit_qt/rotation0.png       | Bin
 .../tools/3d/tile_edit_qt/rotation180.png     | Bin
 .../tools/3d/tile_edit_qt/rotation270.png     | Bin
 .../tools/3d/tile_edit_qt/rotation90.png      | Bin
 .../3d/tile_edit_qt/tile_browser_dlg.cpp      |   0
 .../tools/3d/tile_edit_qt/tile_browser_dlg.h  |   0
 .../tools/3d/tile_edit_qt/tile_browser_qt.ui  |   0
 .../tools/3d/tile_edit_qt/tile_edit_dlg.cpp   |   0
 .../tools/3d/tile_edit_qt/tile_edit_dlg.h     |   0
 .../tools/3d/tile_edit_qt/tile_edit_qt.qrc    |   0
 .../tools/3d/tile_edit_qt/tile_edit_qt.ui     |   0
 .../3d/tile_edit_qt/tile_listwidgetitem.cpp   |   0
 .../3d/tile_edit_qt/tile_listwidgetitem.h     |   0
 .../3d/tile_edit_qt/tile_rotation_dlg.cpp     |   0
 .../tools/3d/tile_edit_qt/tile_rotation_dlg.h |   0
 .../tools/3d/tile_edit_qt/tile_rotation_qt.ui |   0
 .../tools/3d/tile_edit_qt/tile_widget.cpp     |   0
 .../tools/3d/tile_edit_qt/tile_widget.h       |   0
 .../tools/3d/tile_edit_qt/tile_widget_qt.ui   |   0
 .../tools/3d/tile_edit_qt/tiles_model.cpp     |   0
 .../tools/3d/tile_edit_qt/tiles_model.h       |   0
 .../nel => nel}/tools/3d/tile_edit_qt/up.png  | Bin
 .../tools/3d/unbuild_interface/CMakeLists.txt |   0
 .../tools/3d/unbuild_interface/gold_pill.ico  | Bin
 .../tools/3d/unbuild_interface/main.rc        |   0
 .../unbuild_interface/unbuild_interface.cpp   |   0
 .../tools/3d/zone_check_bind/CMakeLists.txt   |   0
 .../3d/zone_check_bind/zone_check_bind.cpp    |   0
 .../tools/3d/zone_check_bind/zone_utility.cpp |   0
 .../tools/3d/zone_check_bind/zone_utility.h   |   0
 .../tools/3d/zone_dependencies/CMakeLists.txt |   0
 .../tools/3d/zone_dependencies/blue_pill.ico  | Bin
 .../tools/3d/zone_dependencies/main.rc        |   0
 .../zone_dependencies/zone_dependencies.cpp   |   0
 .../tools/3d/zone_dump/CMakeLists.txt         |   0
 .../tools/3d/zone_dump/zone_dump.cpp          |   0
 .../tools/3d/zone_elevation/CMakeLists.txt    |   0
 .../tools/3d/zone_elevation/blue_pill.ico     | Bin
 .../tools/3d/zone_elevation/main.rc           |   0
 .../3d/zone_elevation/zone_elevation.cpp      |   0
 .../tools/3d/zone_ig_lighter/CMakeLists.txt   |   0
 .../tools/3d/zone_ig_lighter/blue_pill.ico    | Bin
 .../tools/3d/zone_ig_lighter/main.rc          |   0
 .../3d/zone_ig_lighter/zone_ig_lighter.cpp    |   0
 .../tools/3d/zone_lib/zone_utility.cpp        |   0
 .../tools/3d/zone_lib/zone_utility.h          |   0
 .../tools/3d/zone_lighter/CMakeLists.txt      |   0
 .../tools/3d/zone_lighter/blue_pill.ico       | Bin
 .../nel => nel}/tools/3d/zone_lighter/main.rc |   0
 .../tools/3d/zone_lighter/zone_lighter.cfg    |   0
 .../tools/3d/zone_lighter/zone_lighter.cpp    |   0
 .../tools/3d/zone_welder/CMakeLists.txt       |   0
 .../tools/3d/zone_welder/blue_pill.ico        | Bin
 .../tools/3d/zone_welder/internal_weld.cpp    |   0
 .../nel => nel}/tools/3d/zone_welder/main.rc  |   0
 .../tools/3d/zone_welder/zone_welder.cpp      |   0
 .../tools/3d/zone_welder/zwelder.cfg          |   0
 .../tools/3d/zviewer/CMakeLists.txt           |   0
 .../tools/3d/zviewer/heightmap.tga            | Bin
 .../tools/3d/zviewer/move_listener.cpp        |   0
 .../tools/3d/zviewer/move_listener.h          |   0
 .../tools/3d/zviewer/nevraxpill.ico           | Bin
 {code/nel => nel}/tools/3d/zviewer/readme.txt |   0
 {code/nel => nel}/tools/3d/zviewer/resource.h |   0
 .../nel => nel}/tools/3d/zviewer/zviewer.cfg  |   0
 .../nel => nel}/tools/3d/zviewer/zviewer.cpp  |   0
 {code/nel => nel}/tools/3d/zviewer/zviewer.rc |   0
 {code/nel => nel}/tools/CMakeLists.txt        |   0
 .../tools/build_gamedata/0_setup.py           |   0
 .../tools/build_gamedata/1_export.py          |   0
 .../tools/build_gamedata/2_build.py           |   0
 .../tools/build_gamedata/3_install.py         |   0
 .../tools/build_gamedata/9_upload.py          |   0
 .../tools/build_gamedata/a1_worldedit_data.py |   0
 .../tools/build_gamedata/all_dev.bat          |   0
 .../tools/build_gamedata/all_install_dev.bat  |   0
 .../tools/build_gamedata/b1_client_dev.py     |   0
 .../tools/build_gamedata/b2_shard_data.py     |   0
 .../tools/build_gamedata/c1_shard_patch.py    |   0
 .../tools/build_gamedata/characters_dev.bat   |   0
 .../build_gamedata/configuration/scripts.py   |   0
 .../build_gamedata/configuration/tools.py     |   0
 .../tools/build_gamedata/d1_client_patch.py   |   0
 .../tools/build_gamedata/d2_client_install.py |   0
 .../tools/build_gamedata/executables_dev.bat  |   0
 .../build_gamedata/export_build_install.py    |   0
 .../ecosystem_project_template/directories.py |   0
 .../ecosystem_project_template/process.py     |   0
 .../build_gamedata/generators/generate_all.py |   0
 .../generators/generate_ecosystem_projects.py |   0
 .../generate_simple_max_exporters.py          |   0
 .../generate_tagged_max_exporters.py          |   0
 .../generators/max_exporter_scripts/anim.ms   |   0
 .../generators/max_exporter_scripts/anim.py   |   0
 .../generators/max_exporter_scripts/clod.ms   |   0
 .../generators/max_exporter_scripts/clod.py   |   0
 .../generators/max_exporter_scripts/cmb.ms    |   0
 .../generators/max_exporter_scripts/cmb.py    |   0
 .../generators/max_exporter_scripts/ig.ms     |   0
 .../max_exporter_scripts/pacs_prim.ms         |   0
 .../max_exporter_scripts/pacs_prim.py         |   0
 .../generators/max_exporter_scripts/shape.ms  |   0
 .../generators/max_exporter_scripts/skel.ms   |   0
 .../generators/max_exporter_scripts/skel.py   |   0
 .../generators/max_exporter_scripts/swt.ms    |   0
 .../generators/max_exporter_scripts/swt.py    |   0
 .../generators/max_exporter_scripts/veget.ms  |   0
 .../generators/max_exporter_scripts/veget.py  |   0
 .../generators/max_exporter_scripts/zone.ms   |   0
 .../generators/max_exporter_scripts/zone.py   |   0
 .../simple_max_exporter_template/0_setup.py   |   0
 .../1_export_footer.py                        |   0
 .../1_export_header.py                        |   0
 .../simple_max_exporter_template/2_build.py   |   0
 .../simple_max_exporter_template/3_install.py |   0
 .../export_footer.ms                          |   0
 .../export_header.ms                          |   0
 .../tagged_max_exporter_template/0_setup.py   |   0
 .../1_export_footer.py                        |   0
 .../1_export_header.py                        |   0
 .../tagged_max_exporter_template/2_build.py   |   0
 .../tagged_max_exporter_template/3_install.py |   0
 .../export_footer.ms                          |   0
 .../export_header.ms                          |   0
 .../tools/build_gamedata/interface_dev.bat    |   0
 .../tools/build_gamedata/leveldesign_dev.bat  |   0
 .../tools/build_gamedata/panoply_dev.bat      |   0
 .../tools/build_gamedata/processes/0_setup.py |   0
 .../build_gamedata/processes/1_export.py      |   0
 .../tools/build_gamedata/processes/2_build.py |   0
 .../build_gamedata/processes/3_install.py     |   0
 .../processes/_dummy/0_setup.py               |   0
 .../processes/_dummy/1_export.py              |   0
 .../processes/_dummy/2_build.py               |   0
 .../processes/_dummy/3_install.py             |   0
 .../processes/ai_wmap/0_setup.py              |   0
 .../processes/ai_wmap/1_export.py             |   0
 .../processes/ai_wmap/2_build.py              |   0
 .../processes/ai_wmap/3_install.py            |   0
 .../build_gamedata/processes/anim/0_setup.py  |   0
 .../build_gamedata/processes/anim/1_export.py |   0
 .../build_gamedata/processes/anim/2_build.py  |   0
 .../processes/anim/3_install.py               |   0
 .../processes/anim/maxscript/anim_export.ms   |   0
 .../processes/cartographer/0_setup.py         |   0
 .../processes/cartographer/1_export.py        |   0
 .../processes/cartographer/2_build.py         |   0
 .../processes/cartographer/3_install.py       |   0
 .../build_gamedata/processes/cegui/0_setup.py |   0
 .../processes/cegui/1_export.py               |   0
 .../build_gamedata/processes/cegui/2_build.py |   0
 .../processes/cegui/3_install.py              |   0
 .../processes/clodbank/0_setup.py             |   0
 .../processes/clodbank/1_export.py            |   0
 .../processes/clodbank/2_build.py             |   0
 .../processes/clodbank/3_install.py           |   0
 .../clodbank/maxscript/clod_export.ms         |   0
 .../build_gamedata/processes/copy/0_setup.py  |   0
 .../build_gamedata/processes/copy/1_export.py |   0
 .../build_gamedata/processes/copy/2_build.py  |   0
 .../processes/copy/3_install.py               |   0
 .../processes/displace/0_setup.py             |   0
 .../processes/displace/1_export.py            |   0
 .../processes/displace/2_build.py             |   0
 .../processes/displace/3_install.py           |   0
 .../processes/farbank/0_setup.py              |   0
 .../processes/farbank/1_export.py             |   0
 .../processes/farbank/2_build.py              |   0
 .../processes/farbank/3_install.py            |   0
 .../build_gamedata/processes/font/0_setup.py  |   0
 .../build_gamedata/processes/font/1_export.py |   0
 .../build_gamedata/processes/font/2_build.py  |   0
 .../processes/font/3_install.py               |   0
 .../build_gamedata/processes/ig/0_setup.py    |   0
 .../build_gamedata/processes/ig/1_export.py   |   0
 .../build_gamedata/processes/ig/2_build.py    |   0
 .../build_gamedata/processes/ig/3_install.py  |   0
 .../processes/ig/maxscript/ig_export.ms       |   0
 .../processes/ig_light/0_setup.py             |   0
 .../processes/ig_light/1_export.py            |   0
 .../processes/ig_light/2_build.py             |   0
 .../processes/ig_light/3_install.py           |   0
 .../processes/interface/0_setup.py            |   0
 .../processes/interface/1_export.py           |   0
 .../processes/interface/2_build.py            |   0
 .../processes/interface/3_install.py          |   0
 .../build_gamedata/processes/ligo/0_setup.py  |   0
 .../build_gamedata/processes/ligo/1_export.py |   0
 .../build_gamedata/processes/ligo/2_build.py  |   0
 .../processes/ligo/3_install.py               |   0
 .../ligo/maxscript/nel_ligo_export.ms         |   0
 .../build_gamedata/processes/map/0_setup.py   |   0
 .../build_gamedata/processes/map/1_export.py  |   0
 .../build_gamedata/processes/map/2_build.py   |   0
 .../build_gamedata/processes/map/3_install.py |   0
 .../processes/pacs_prim/0_setup.py            |   0
 .../processes/pacs_prim/1_export.py           |   0
 .../processes/pacs_prim/2_build.py            |   0
 .../processes/pacs_prim/3_install.py          |   0
 .../pacs_prim/maxscript/pacs_prim_export.ms   |   0
 .../processes/pacs_prim_list/0_setup.py       |   0
 .../processes/pacs_prim_list/1_export.py      |   0
 .../processes/pacs_prim_list/2_build.py       |   0
 .../processes/pacs_prim_list/3_install.py     |   0
 .../processes/properties/0_setup.py           |   0
 .../processes/properties/1_export.py          |   0
 .../processes/properties/2_build.py           |   0
 .../processes/properties/3_install.py         |   0
 .../build_gamedata/processes/ps/0_setup.py    |   0
 .../build_gamedata/processes/ps/1_export.py   |   0
 .../build_gamedata/processes/ps/2_build.py    |   0
 .../build_gamedata/processes/ps/3_install.py  |   0
 .../build_gamedata/processes/pz/0_setup.py    |   0
 .../build_gamedata/processes/pz/1_export.py   |   0
 .../build_gamedata/processes/pz/2_build.py    |   0
 .../build_gamedata/processes/pz/3_install.py  |   0
 .../build_gamedata/processes/rbank/0_setup.py |   0
 .../processes/rbank/1_export.py               |   0
 .../build_gamedata/processes/rbank/2_build.py |   0
 .../processes/rbank/3_install.py              |   0
 .../processes/rbank/maxscript/cmb_export.ms   |   0
 .../processes/samplebank/0_setup.py           |   0
 .../processes/samplebank/1_export.py          |   0
 .../processes/samplebank/2_build.py           |   0
 .../processes/samplebank/3_install.py         |   0
 .../build_gamedata/processes/shape/0_setup.py |   0
 .../processes/shape/1_export.py               |   0
 .../build_gamedata/processes/shape/2_build.py |   0
 .../processes/shape/3_install.py              |   0
 .../processes/shape/maxscript/shape_export.ms |   0
 .../processes/sheet_id/0_setup.py             |   0
 .../processes/sheet_id/1_export.py            |   0
 .../processes/sheet_id/2_build.py             |   0
 .../processes/sheet_id/3_install.py           |   0
 .../processes/sheets/0_setup.py               |   0
 .../processes/sheets/1_export.py              |   0
 .../processes/sheets/2_build.py               |   0
 .../processes/sheets/3_install.py             |   0
 .../processes/sheets_shard/0_setup.py         |   0
 .../processes/sheets_shard/1_export.py        |   0
 .../processes/sheets_shard/2_build.py         |   0
 .../processes/sheets_shard/3_install.py       |   0
 .../build_gamedata/processes/sign/0_setup.py  |   0
 .../build_gamedata/processes/sign/1_export.py |   0
 .../build_gamedata/processes/sign/2_build.py  |   0
 .../processes/sign/3_install.py               |   0
 .../build_gamedata/processes/skel/0_setup.py  |   0
 .../build_gamedata/processes/skel/1_export.py |   0
 .../build_gamedata/processes/skel/2_build.py  |   0
 .../processes/skel/3_install.py               |   0
 .../processes/skel/maxscript/skel_export.ms   |   0
 .../processes/smallbank/0_setup.py            |   0
 .../processes/smallbank/1_export.py           |   0
 .../processes/smallbank/2_build.py            |   0
 .../processes/smallbank/3_install.py          |   0
 .../build_gamedata/processes/sound/0_setup.py |   0
 .../processes/sound/1_export.py               |   0
 .../build_gamedata/processes/sound/2_build.py |   0
 .../processes/sound/3_install.py              |   0
 .../processes/soundbank/0_setup.py            |   0
 .../processes/soundbank/1_export.py           |   0
 .../processes/soundbank/2_build.py            |   0
 .../processes/soundbank/3_install.py          |   0
 .../build_gamedata/processes/swt/0_setup.py   |   0
 .../build_gamedata/processes/swt/1_export.py  |   0
 .../build_gamedata/processes/swt/2_build.py   |   0
 .../build_gamedata/processes/swt/3_install.py |   0
 .../processes/swt/maxscript/swt_export.ms     |   0
 .../build_gamedata/processes/tiles/0_setup.py |   0
 .../processes/tiles/1_export.py               |   0
 .../build_gamedata/processes/tiles/2_build.py |   0
 .../processes/tiles/3_install.py              |   0
 .../build_gamedata/processes/veget/0_setup.py |   0
 .../processes/veget/1_export.py               |   0
 .../build_gamedata/processes/veget/2_build.py |   0
 .../processes/veget/3_install.py              |   0
 .../processes/veget/maxscript/veget_export.ms |   0
 .../processes/vegetset/0_setup.py             |   0
 .../processes/vegetset/1_export.py            |   0
 .../processes/vegetset/2_build.py             |   0
 .../processes/vegetset/3_install.py           |   0
 .../build_gamedata/processes/zone/0_setup.py  |   0
 .../build_gamedata/processes/zone/1_export.py |   0
 .../build_gamedata/processes/zone/2_build.py  |   0
 .../processes/zone/3_install.py               |   0
 .../processes/zone/maxscript/zone_export.ms   |   0
 .../processes/zone/todo_build_dependencies    |   0
 .../processes/zone/todo_export_maxscript      |   0
 .../processes/zone_light/0_setup.py           |   0
 .../processes/zone_light/1_export.py          |   0
 .../processes/zone_light/2_build.py           |   0
 .../processes/zone_light/3_install.py         |   0
 .../zone_light/todo_patch_tile_water          |   0
 .../tools/build_gamedata/sky_dev.bat          |   0
 .../build_gamedata/translation/README.md      |   0
 .../translation/a1_make_phrase_diff.py        |   0
 .../translation/a2_merge_phrase_diff.py       |   0
 .../translation/a3_make_clause_diff.py        |   0
 .../translation/a4_merge_clause_diff.py       |   0
 .../translation/b1_make_words_diff.py         |   0
 .../translation/b2_merge_words_diff.py        |   0
 .../translation/c1_make_string_diff.py        |   0
 .../translation/c2_merge_string_diff.py       |   0
 .../translation/d1_make_botnames_diff.py      |   0
 .../translation/d2_merge_botnames_diff.py     |   0
 .../translation/e1_clean_string_diff.py       |   0
 .../translation/e2_clean_words_diff.py        |   0
 .../translation/e3_clean_clause_diff.py       |   0
 .../translation/e4_clean_phrase_diff.py       |   0
 .../translation/make_merge_all.py             |   0
 .../translation/make_merge_wk.py              |   0
 .../nel => nel}/tools/georges/CMakeLists.txt  |   0
 .../tools/georges/georges2csv/CMakeLists.txt  |   0
 .../tools/georges/georges2csv/georges2csv.cpp |   0
 .../tools/georges/georges2csv/test.script     |   0
 {code/nel => nel}/tools/ligo/CMakeLists.txt   |   0
 .../tools/ligo/unbuild_land/CMakeLists.txt    |   0
 .../tools/ligo/unbuild_land/gold_pill.ico     | Bin
 .../tools/ligo/unbuild_land/main.rc           |   0
 .../tools/ligo/unbuild_land/unbuild_land.cpp  |   0
 {code/nel => nel}/tools/logic/CMakeLists.txt  |   0
 .../logic/logic_editor_dll/CMakeLists.txt     |   0
 .../tools/logic/logic_editor_dll/ChildFrm.cpp |   0
 .../tools/logic/logic_editor_dll/ChildFrm.h   |   0
 .../logic/logic_editor_dll/Condition.cpp      |   0
 .../tools/logic/logic_editor_dll/Condition.h  |   0
 .../logic/logic_editor_dll/ConditionPage.cpp  |   0
 .../logic/logic_editor_dll/ConditionPage.h    |   0
 .../logic/logic_editor_dll/ConditionsView.cpp |   0
 .../logic/logic_editor_dll/ConditionsView.h   |   0
 .../tools/logic/logic_editor_dll/Counter.cpp  |   0
 .../tools/logic/logic_editor_dll/Counter.h    |   0
 .../logic/logic_editor_dll/CounterPage.cpp    |   0
 .../logic/logic_editor_dll/CounterPage.h      |   0
 .../logic/logic_editor_dll/EditorFormView.cpp |   0
 .../logic/logic_editor_dll/EditorFormView.h   |   0
 .../logic_editor_dll/EditorPropertySheet.cpp  |   0
 .../logic_editor_dll/EditorPropertySheet.h    |   0
 .../logic/logic_editor_dll/LogicTreeView.cpp  |   0
 .../logic/logic_editor_dll/LogicTreeView.h    |   0
 .../tools/logic/logic_editor_dll/MainFrm.cpp  |   0
 .../tools/logic/logic_editor_dll/MainFrm.h    |   0
 .../tools/logic/logic_editor_dll/NumEdit.cpp  |   0
 .../tools/logic/logic_editor_dll/NumEdit.h    |   0
 .../logic/logic_editor_dll/ResizablePage.cpp  |   0
 .../logic/logic_editor_dll/ResizablePage.h    |   0
 .../logic/logic_editor_dll/ResizableSheet.cpp |   0
 .../logic/logic_editor_dll/ResizableSheet.h   |   0
 .../tools/logic/logic_editor_dll/State.cpp    |   0
 .../tools/logic/logic_editor_dll/State.h      |   0
 .../logic/logic_editor_dll/StatePage.cpp      |   0
 .../tools/logic/logic_editor_dll/StatePage.h  |   0
 .../logic/logic_editor_dll/StatesView.cpp     |   0
 .../tools/logic/logic_editor_dll/StatesView.h |   0
 .../tools/logic/logic_editor_dll/StdAfx.cpp   |   0
 .../tools/logic/logic_editor_dll/StdAfx.h     |   0
 .../tools/logic/logic_editor_dll/TMenu.cpp    |   0
 .../tools/logic/logic_editor_dll/TMenu.h      |   0
 .../logic/logic_editor_dll/VariablePage.cpp   |   0
 .../logic/logic_editor_dll/VariablePage.h     |   0
 .../logic/logic_editor_dll/logic_editor.cpp   |   0
 .../logic/logic_editor_dll/logic_editor.h     |   0
 .../logic/logic_editor_dll/logic_editor.rc    |   0
 .../logic_editor_dll/logic_editorDoc.cpp      |   0
 .../logic/logic_editor_dll/logic_editorDoc.h  |   0
 .../logic_editor_dll/logic_editorView.cpp     |   0
 .../logic/logic_editor_dll/logic_editorView.h |   0
 .../logic_editor_dll/logic_editor_debug.def   |   0
 .../logic_editor_debug_fast.def               |   0
 .../logic_editor_dll/logic_editor_interface.h |   0
 .../logic_editor_dll/logic_editor_release.def |   0
 .../logic_editor_release_debug.def            |   0
 .../logic/logic_editor_dll/res/Toolbar.bmp    | Bin
 .../logic_editor_dll/res/logic_editor.ico     | Bin
 .../logic_editor_dll/res/logic_editor.rc2     |   0
 .../logic_editor_dll/res/logic_editorDoc.ico  | Bin
 .../tools/logic/logic_editor_dll/resource.h   |   0
 .../logic/logic_editor_exe/CMakeLists.txt     |   0
 .../tools/logic/logic_editor_exe/StdAfx.cpp   |   0
 .../tools/logic/logic_editor_exe/StdAfx.h     |   0
 .../logic_editor_exe/logic_editor_exe.cpp     |   0
 .../tools/logic/logic_editor_exe/main.rc      |   0
 .../tools/logic/logic_editor_exe/red_pill.ico | Bin
 {code/nel => nel}/tools/memory/CMakeLists.txt |   0
 .../tools/memory/memlog/CMakeLists.txt        |   0
 .../tools/memory/memlog/memlog.cpp            |   0
 {code/nel => nel}/tools/misc/CMakeLists.txt   |   0
 .../tools/misc/bnp_make/CMakeLists.txt        |   0
 .../tools/misc/bnp_make/blue_pill.ico         | Bin
 .../nel => nel}/tools/misc/bnp_make/main.cpp  |   0
 {code/nel => nel}/tools/misc/bnp_make/main.rc |   0
 .../tools/misc/bnp_make_qt/main.cpp           |   0
 .../nel => nel}/tools/misc/bnp_make_qt/main.h |   0
 .../tools/misc/bnp_make_qt/mainwindow.cpp     |   0
 .../tools/misc/bnp_make_qt/mainwindow.h       |   0
 .../tools/misc/bnp_make_qt/mainwindow.ui      |   0
 .../tools/misc/branch_patcher/CMakeLists.txt  |   0
 .../tools/misc/branch_patcher/StdAfx.cpp      |   0
 .../tools/misc/branch_patcher/StdAfx.h        |   0
 .../misc/branch_patcher/branch_patcher.cpp    |   0
 .../misc/branch_patcher/branch_patcher.h      |   0
 .../misc/branch_patcher/branch_patcher.rc     |   0
 .../misc/branch_patcher/branch_patcherDlg.cpp |   0
 .../misc/branch_patcher/branch_patcherDlg.h   |   0
 .../branch_patcher/branch_patcher_install.reg |   0
 .../branch_patcher/res/branch_patcher.rc2     |   0
 .../res/nevrax_pill_3d_rgba.ico               | Bin
 .../tools/misc/branch_patcher/resource.h      |   0
 .../tools/misc/branch_patcher/version.rc2     |   0
 .../tools/misc/crash_report/CMakeLists.txt    |   0
 .../tools/misc/crash_report/crash_report.cpp  |   0
 .../tools/misc/crash_report/crash_report.rc   |   0
 .../misc/crash_report/crash_report_data.h     |   0
 .../misc/crash_report/crash_report_socket.cpp |   0
 .../misc/crash_report/crash_report_socket.h   |   0
 .../misc/crash_report/crash_report_widget.cpp |   0
 .../misc/crash_report/crash_report_widget.h   |   0
 .../misc/crash_report/crash_report_widget.ui  |   0
 .../tools/misc/crash_report/nevraxpill.ico    | Bin
 .../tools/misc/crash_report/resources.qrc     |   0
 .../tools/misc/data_mirror/CMakeLists.txt     |   0
 .../tools/misc/data_mirror/Resource.h         |   0
 .../tools/misc/data_mirror/StdAfx.cpp         |   0
 .../tools/misc/data_mirror/StdAfx.h           |   0
 .../tools/misc/data_mirror/config.cfg         |   0
 .../tools/misc/data_mirror/data_mirror.cpp    |   0
 .../tools/misc/data_mirror/data_mirror.h      |   0
 .../tools/misc/data_mirror/data_mirror.rc     |   0
 .../tools/misc/data_mirror/data_mirrorDlg.cpp |   0
 .../tools/misc/data_mirror/data_mirrorDlg.h   |   0
 .../tools/misc/data_mirror/my_list_ctrl.cpp   |   0
 .../tools/misc/data_mirror/my_list_ctrl.h     |   0
 .../misc/data_mirror/progress_dialog.cpp      |   0
 .../tools/misc/data_mirror/progress_dialog.h  |   0
 .../misc/data_mirror/res/data_mirror.ico      | Bin
 .../misc/data_mirror/res/data_mirror.rc2      |   0
 .../tools/misc/data_mirror/version.rc2        |   0
 .../tools/misc/disp_sheet_id/CMakeLists.txt   |   0
 .../tools/misc/disp_sheet_id/main.cpp         |   0
 .../tools/misc/exec_timeout/CMakeLists.txt    |   0
 .../tools/misc/exec_timeout/exec_timeout.cpp  |   0
 .../tools/misc/exec_timeout/main.rc           |   0
 .../tools/misc/exec_timeout/yellow_pill.ico   | Bin
 .../misc/extract_filename/CMakeLists.txt      |   0
 .../extract_filename/extract_filename.cpp     |   0
 .../tools/misc/lock/CMakeLists.txt            |   0
 {code/nel => nel}/tools/misc/lock/lock.cpp    |   0
 .../tools/misc/log_analyser/CMakeLists.txt    |   0
 .../tools/misc/log_analyser/FilterDialog.cpp  |   0
 .../tools/misc/log_analyser/FilterDialog.h    |   0
 .../tools/misc/log_analyser/LogSessions.cpp   |   0
 .../tools/misc/log_analyser/LogSessions.h     |   0
 .../misc/log_analyser/PlugInSelector.cpp      |   0
 .../tools/misc/log_analyser/PlugInSelector.h  |   0
 .../tools/misc/log_analyser/StdAfx.cpp        |   0
 .../tools/misc/log_analyser/StdAfx.h          |   0
 .../tools/misc/log_analyser/ViewDialog.cpp    |   0
 .../tools/misc/log_analyser/ViewDialog.h      |   0
 .../tools/misc/log_analyser/log_analyser.cpp  |   0
 .../tools/misc/log_analyser/log_analyser.h    |   0
 .../tools/misc/log_analyser/log_analyser.rc   |   0
 .../misc/log_analyser/log_analyserDlg.cpp     |   0
 .../tools/misc/log_analyser/log_analyserDlg.h |   0
 .../misc/log_analyser/res/log_analyser.ico    | Bin
 .../misc/log_analyser/res/log_analyser.rc2    |   0
 .../tools/misc/log_analyser/resource.h        |   0
 .../tools/misc/log_analyser/version.rc2       |   0
 .../misc/log_analyser_plug_ins/CMakeLists.txt |   0
 .../extract_warnings/CMakeLists.txt           |   0
 .../extract_warnings/extract_warnings.cpp     |   0
 .../extract_warnings/extract_warnings.def     |   0
 .../extract_warnings/extract_warnings.h       |   0
 .../tools/misc/make_sheet_id/CMakeLists.txt   |   0
 .../tools/misc/make_sheet_id/blue_pill.ico    | Bin
 .../tools/misc/make_sheet_id/main.rc          |   0
 .../misc/make_sheet_id/make_sheet_id.cfg      |   0
 .../misc/make_sheet_id/make_sheet_id.cpp      |   0
 .../tools/misc/message_box/CMakeLists.txt     |   0
 .../tools/misc/message_box/main.rc            |   0
 .../tools/misc/message_box/message_box.cpp    |   0
 .../tools/misc/message_box/message_box.h      |   0
 .../tools/misc/message_box/yellow_pill.ico    | Bin
 .../tools/misc/message_box_qt/CMakeLists.txt  |   0
 .../tools/misc/message_box_qt/main.cpp        |   0
 .../tools/misc/message_box_qt/main.rc         |   0
 .../tools/misc/message_box_qt/yellow_pill.ico | Bin
 .../misc/multi_cd_setup_fix/CMakeLists.txt    |   0
 .../multi_cd_setup_fix/multi_cd_setup_fix.cpp |   0
 .../multi_cd_setup_fix/multi_cd_setup_fix.rc  |   0
 .../tools/misc/multi_cd_setup_fix/resource.h  |   0
 .../tools/misc/multi_cd_setup_fix/setup.ico   | Bin
 .../tools/misc/multi_cd_setup_fix/version.rc2 |   0
 .../tools/misc/probe_timers/CMakeLists.txt    |   0
 .../tools/misc/probe_timers/gold_pill.ico     | Bin
 .../tools/misc/probe_timers/main.cpp          |   0
 .../tools/misc/probe_timers/main.rc           |   0
 .../tools/misc/snp_make/CMakeLists.txt        |   0
 .../nel => nel}/tools/misc/snp_make/main.cpp  |   0
 .../tools/misc/words_dic/CMakeLists.txt       |   0
 .../tools/misc/words_dic/DicSplashScreen.cpp  |   0
 .../tools/misc/words_dic/DicSplashScreen.h    |   0
 .../tools/misc/words_dic/StdAfx.cpp           |   0
 .../nel => nel}/tools/misc/words_dic/StdAfx.h |   0
 .../tools/misc/words_dic/res/words_dic.ico    | Bin
 .../tools/misc/words_dic/res/words_dic.rc2    |   0
 .../tools/misc/words_dic/resource.h           |   0
 .../tools/misc/words_dic/version.rc2          |   0
 .../tools/misc/words_dic/words_dic.cfg        |   0
 .../tools/misc/words_dic/words_dic.cpp        |   0
 .../tools/misc/words_dic/words_dic.h          |   0
 .../tools/misc/words_dic/words_dic.rc         |   0
 .../tools/misc/words_dic/words_dicDlg.cpp     |   0
 .../tools/misc/words_dic/words_dicDlg.h       |   0
 .../tools/misc/words_dic_qt/CMakeLists.txt    |   0
 .../tools/misc/words_dic_qt/main.cpp          |   0
 .../tools/misc/words_dic_qt/nel.png           | Bin
 .../tools/misc/words_dic_qt/resource.h        |   0
 .../tools/misc/words_dic_qt/words_dic.cfg     |   0
 .../tools/misc/words_dic_qt/words_dic.ico     | Bin
 .../tools/misc/words_dic_qt/words_dic.rc      |   0
 .../tools/misc/words_dic_qt/words_dicDlg.cpp  |   0
 .../tools/misc/words_dic_qt/words_dicDlg.h    |   0
 .../tools/misc/words_dic_qt/words_dic_Qt.qrc  |   0
 .../tools/misc/words_dic_qt/words_dic_Qt.ui   |   0
 .../tools/misc/xml_packer/CMakeLists.txt      |   0
 .../tools/misc/xml_packer/xml_packer.cpp      |   0
 .../tools/nel_unit_test/CMakeLists.txt        |   0
 .../tools/nel_unit_test/nel_unit_test.cpp     |   0
 .../tools/nel_unit_test/run_test.bat          |   0
 .../nel => nel}/tools/nel_unit_test/ut_ligo.h |   0
 .../tools/nel_unit_test/ut_ligo_primitive.h   |   0
 .../nel => nel}/tools/nel_unit_test/ut_misc.h |   0
 .../tools/nel_unit_test/ut_misc_base64.h      |   0
 .../tools/nel_unit_test/ut_misc_co_task.h     |   0
 .../tools/nel_unit_test/ut_misc_command.h     |   0
 .../tools/nel_unit_test/ut_misc_common.h      |   0
 .../tools/nel_unit_test/ut_misc_config_file.h |   0
 .../tools/nel_unit_test/ut_misc_debug.h       |   0
 .../tools/nel_unit_test/ut_misc_dynlibload.h  |   0
 .../tools/nel_unit_test/ut_misc_file.h        |   0
 .../ut_misc_files/cfg_with_bad_test.cfg       |   0
 .../ut_misc_files/cfg_with_define.cfg         |   0
 .../ut_misc_files/cfg_with_error.cfg          |   0
 .../ut_misc_files/cfg_with_error_main.cfg     |   0
 .../ut_misc_files/cfg_with_include.cfg        |   0
 .../cfg_with_include_and_optional.cfg         |   0
 .../ut_misc_files/cfg_with_optional.cfg       |   0
 .../ut_misc_files/file1_in_bnp.txt            |   0
 .../ut_misc_files/file2_in_bnp.txt            |   0
 .../nel_unit_test/ut_misc_files/files.bnp     | Bin
 .../ut_misc_files/files.xml_pack              |   0
 .../same_subfolder_1/samename/.xml_pack_index |   0
 .../samename/file1_in_sub_1.xml               |   0
 .../samename/file2_in_sub_1.xml               |   0
 .../samename/samename.xml_pack                |   0
 .../same_subfolder_2/samename/.xml_pack_index |   0
 .../samename/file1_in_sub_2.xml               |   0
 .../samename/file2_in_sub_2.xml               |   0
 .../samename/samename.xml_pack                |   0
 .../ut_misc_files/included_cfg.cfg            |   0
 .../xml_files/file1_in_xml_pack.xml           |   0
 .../xml_files/file2_in_xml_pack.xml           |   0
 .../samename/samename.xml_pack                |   0
 .../samename/samename.xml_pack                |   0
 .../xml_files/xml_files.xml_pack              |   0
 .../tools/nel_unit_test/ut_misc_pack_file.h   |   0
 .../tools/nel_unit_test/ut_misc_singleton.h   |   0
 .../tools/nel_unit_test/ut_misc_sstring.h     |   0
 .../tools/nel_unit_test/ut_misc_stream.h      |   0
 .../nel_unit_test/ut_misc_string_common.h     |   0
 .../tools/nel_unit_test/ut_misc_types.h       |   0
 .../tools/nel_unit_test/ut_misc_variable.h    |   0
 .../nel => nel}/tools/nel_unit_test/ut_net.h  |   0
 .../tools/nel_unit_test/ut_net_layer3.h       |   0
 .../tools/nel_unit_test/ut_net_message.h      |   0
 .../tools/nel_unit_test/ut_net_module.h       |   0
 {code/nel => nel}/tools/pacs/CMakeLists.txt   |   0
 .../tools/pacs/build_ig_boxes/CMakeLists.txt  |   0
 .../tools/pacs/build_ig_boxes/blue_pill.ico   | Bin
 .../pacs/build_ig_boxes/build_ig_boxes.cfg    |   0
 .../tools/pacs/build_ig_boxes/main.cpp        |   0
 .../tools/pacs/build_ig_boxes/main.rc         |   0
 .../pacs/build_indoor_rbank/CMakeLists.txt    |   0
 .../pacs/build_indoor_rbank/blue_pill.ico     | Bin
 .../build_indoor_rbank/build_indoor_rbank.cfg |   0
 .../build_indoor_rbank/build_surfaces.cpp     |   0
 .../pacs/build_indoor_rbank/build_surfaces.h  |   0
 .../tools/pacs/build_indoor_rbank/main.cpp    |   0
 .../tools/pacs/build_indoor_rbank/main.rc     |   0
 .../tools/pacs/build_indoor_rbank/mouline.cpp |   0
 .../tools/pacs/build_indoor_rbank/mouline.h   |   0
 .../tools/pacs/build_rbank/CMakeLists.txt     |   0
 .../tools/pacs/build_rbank/blue_pill.ico      | Bin
 .../tools/pacs/build_rbank/build_rbank.cfg    |   0
 .../tools/pacs/build_rbank/build_rbank.cpp    |   0
 .../tools/pacs/build_rbank/build_rbank.h      |   0
 .../tools/pacs/build_rbank/build_surf.cpp     |   0
 .../tools/pacs/build_rbank/build_surf.h       |   0
 .../tools/pacs/build_rbank/main.cpp           |   0
 .../tools/pacs/build_rbank/main.rc            |   0
 .../tools/pacs/build_rbank/prim_checker.cpp   |   0
 .../tools/pacs/build_rbank/prim_checker.h     |   0
 .../pacs/build_rbank/surface_splitter.cpp     |   0
 .../tools/pacs/build_rbank/surface_splitter.h |   0
 {code/nel => nel}/tools/sound/CMakeLists.txt  |   0
 .../sound/build_samplebank/CMakeLists.txt     |   0
 .../sound/build_samplebank/blue_pill.ico      | Bin
 .../build_samplebank/build_samplebank.cpp     |   0
 .../build_samplebank_readme.txt               |   0
 .../build_samplebank_script.bat               |   0
 .../tools/sound/build_samplebank/main.rc      |   0
 .../tools/sound/build_sound/CMakeLists.txt    |   0
 .../tools/sound/build_sound/blue_pill.ico     | Bin
 .../tools/sound/build_sound/build_sound.cpp   |   0
 .../sound/build_sound/build_sound_readme.txt  |   0
 .../sound/build_sound/build_sound_script.bat  |   0
 .../tools/sound/build_sound/main.rc           |   0
 .../sound/build_soundbank/CMakeLists.txt      |   0
 .../tools/sound/build_soundbank/blue_pill.ico | Bin
 .../sound/build_soundbank/build_soundbank.cpp |   0
 .../build_soundbank_readme.txt                |   0
 .../build_soundbank_script.bat                |   0
 .../tools/sound/build_soundbank/main.rc       |   0
 .../sound/source_sounds_builder/SoundPage.cpp |   0
 .../sound/source_sounds_builder/SoundPage.h   |   0
 .../sound/source_sounds_builder/StdAfx.cpp    |   0
 .../sound/source_sounds_builder/StdAfx.h      |   0
 .../source_sounds_builder/file_dialog.cpp     |   0
 .../sound/source_sounds_builder/file_dialog.h |   0
 .../sound/source_sounds_builder/resource.h    |   0
 .../source_sounds_builder.cpp                 |   0
 .../source_sounds_builder.h                   |   0
 .../source_sounds_builder.rc                  |   0
 .../source_sounds_builderDlg.cpp              |   0
 .../source_sounds_builderDlg.h                |   0
 code/nelDashBuild.cmd => nelDashBuild.cmd     |   0
 code/nelDashBuild.sh => nelDashBuild.sh       |   0
 {code/nelns => nelns}/AUTHORS                 |   0
 {code/nelns => nelns}/CMakeLists.txt          |   0
 {code/nelns => nelns}/CMakePackaging.txt      |   0
 {code/nelns => nelns}/COPYING                 |   0
 {code/nelns => nelns}/ChangeLog               |   0
 {code/nelns => nelns}/INSTALL                 |   0
 {code/nelns => nelns}/NEWS                    |   0
 {code/nelns => nelns}/README                  |   0
 {code/nelns => nelns}/admin/config.php        |   0
 .../admin/public_html/admin.php               |   0
 .../admin/public_html/authenticate.php        |   0
 .../admin/public_html/backup_interface.php    |   0
 .../admin/public_html/commands.php            |   0
 .../admin/public_html/custom_view.php         |   0
 .../admin/public_html/disp_vars.php           |   0
 .../admin/public_html/display_view.php        |   0
 .../nelns => nelns}/admin/public_html/foo.php |   0
 .../admin/public_html/help.php                |   0
 .../admin/public_html/html_headers.php        |   0
 .../admin/public_html/index.php               |   0
 .../admin/public_html/init.php                |   0
 .../admin/public_html/las_connection.php      |   0
 .../admin/public_html/las_interface.php       |   0
 .../admin/public_html/login_form.php          |   0
 .../nelns => nelns}/admin/public_html/nel.gif | Bin
 .../admin/public_html/player_locator.php      |   0
 .../admin/public_html/prefs.php               |   0
 .../admin/public_html/request_interface.php   |   0
 .../admin/public_html/session_auth.php        |   0
 .../admin/public_html/sql_connection.php      |   0
 .../admin/public_html/update_daily.php        |   0
 .../admin_executor_service/CMakeLists.txt     |   0
 .../admin_executor_service.cfg                |   0
 .../admin_executor_service.cpp                |   0
 .../admin_executor_service/common.cfg         |   0
 .../admin_executor_service/log_report.cpp     |   0
 .../admin_executor_service/log_report.h       |   0
 .../admin_service/CMakeLists.txt              |   0
 .../admin_service/admin_service.cfg           |   0
 .../admin_service/admin_service.cpp           |   0
 .../admin_service/admin_service.h             |   0
 .../nelns => nelns}/admin_service/common.cfg  |   0
 .../admin_service/connection_web.cpp          |   0
 .../admin_service/connection_web.h            |   0
 .../login_service/CMakeLists.txt              |   0
 .../nelns => nelns}/login_service/common.cfg  |   0
 .../login_service/connection_client.cpp       |   0
 .../login_service/connection_client.h         |   0
 .../login_service/connection_web.cpp          |   0
 .../login_service/connection_web.h            |   0
 .../login_service/connection_ws.cpp           |   0
 .../login_service/connection_ws.h             |   0
 .../login_service/login_service.cfg           |   0
 .../login_service/login_service.cpp           |   0
 .../login_service/login_service.h             |   0
 .../login_service/mysql_helper.cpp            |   0
 .../login_service/mysql_helper.h              |   0
 .../login_system/CMakeLists.txt               |   0
 .../nel_launcher_qt/CMakeLists.txt            |   0
 .../nel_launcher_qt/connection.cpp            |   0
 .../login_system/nel_launcher_qt/connection.h |   0
 .../login_system/nel_launcher_qt/main.cpp     |   0
 .../nel_launcher_qt/nel_launcher.cfg          |   0
 .../nel_launcher_qt/nel_launcher_dlg.cpp      |   0
 .../nel_launcher_qt/nel_launcher_dlg.h        |   0
 .../nel_launcher_qt/nel_launcher_dlg.ui       |   0
 .../login_system/nel_launcher_qt/shard.h      |   0
 .../nel_launcher_windows/StdAfx.cpp           |   0
 .../nel_launcher_windows/StdAfx.h             |   0
 .../nel_launcher_windows/nel_launcher.cfg     |   0
 .../nel_launcher_windows/nel_launcher.clw     |   0
 .../nel_launcher_windows/nel_launcher.cpp     |   0
 .../nel_launcher_windows/nel_launcher.h       |   0
 .../nel_launcher_windows/nel_launcher.rc      |   0
 .../nel_launcher_windows/nel_launcherDlg.cpp  |   0
 .../nel_launcher_windows/nel_launcherDlg.h    |   0
 .../nel_launcher_windows/patch.cpp            |   0
 .../login_system/nel_launcher_windows/patch.h |   0
 .../nel_launcher_windows/pleasewait.html      |   0
 .../nel_launcher_windows/res/nel_launcher.ico | Bin
 .../nel_launcher_windows/res/nel_launcher.rc2 |   0
 .../nel_launcher_windows/resource.h           |   0
 .../nel_launcher_windows/webbrowser2.cpp      |   0
 .../nel_launcher_windows/webbrowser2.h        |   0
 .../nel_launcher_windows_ext/BarTabsWnd.cpp   |   0
 .../nel_launcher_windows_ext/BarTabsWnd.h     |   0
 .../nel_launcher_windows_ext/BarWnd.cpp       |   0
 .../nel_launcher_windows_ext/BarWnd.h         |   0
 .../Configuration.cpp                         |   0
 .../nel_launcher_windows_ext/Configuration.h  |   0
 .../LoadingPageDlg.cpp                        |   0
 .../nel_launcher_windows_ext/LoadingPageDlg.h |   0
 .../nel_launcher_windows_ext/LoginDlg.cpp     |   0
 .../nel_launcher_windows_ext/LoginDlg.h       |   0
 .../nel_launcher_windows_ext/Md5.cpp          |   0
 .../nel_launcher_windows_ext/Md5.h            |   0
 .../nel_launcher_windows_ext/MsgDlg.cpp       |   0
 .../nel_launcher_windows_ext/MsgDlg.h         |   0
 .../nel_launcher_windows_ext/PictureHlp.cpp   |   0
 .../nel_launcher_windows_ext/PictureHlp.h     |   0
 .../nel_launcher_windows_ext/ProgressDlg.cpp  |   0
 .../nel_launcher_windows_ext/ProgressDlg.h    |   0
 .../nel_launcher_windows_ext/StdAfx.cpp       |   0
 .../nel_launcher_windows_ext/StdAfx.h         |   0
 .../nel_launcher_windows_ext/WebDlg.cpp       |   0
 .../nel_launcher_windows_ext/WebDlg.h         |   0
 .../nel_launcher_windows_ext/nel_launcher.cfg |   0
 .../nel_launcher_windows_ext/nel_launcher.clw |   0
 .../nel_launcher_windows_ext/nel_launcher.cpp |   0
 .../nel_launcher_windows_ext/nel_launcher.h   |   0
 .../nel_launcher_windows_ext/nel_launcher.rc  |   0
 .../nel_launcherDlg.cpp                       |   0
 .../nel_launcherDlg.h                         |   0
 .../nel_launcher_windows_ext/patch.cpp        |   0
 .../nel_launcher_windows_ext/patch.h          |   0
 .../res/background.jpg                        | Bin
 .../res/barre_top.bmp                         | Bin
 .../nel_launcher_windows_ext/res/bg_login.jpg | Bin
 .../nel_launcher_windows_ext/res/bitmap1.bmp  | Bin
 .../nel_launcher_windows_ext/res/bitmap2.bmp  | Bin
 .../nel_launcher_windows_ext/res/bitmap3.bmp  | Bin
 .../nel_launcher_windows_ext/res/bmp00001.bmp | Bin
 .../nel_launcher_windows_ext/res/bmp00002.bmp | Bin
 .../nel_launcher_windows_ext/res/bmp00003.bmp | Bin
 .../res/btn_login_down.bmp                    | Bin
 .../res/btn_login_up.bmp                      | Bin
 .../res/btn_quit_down.bmp                     | Bin
 .../res/btn_quit_up.bmp                       | Bin
 .../nel_launcher_windows_ext/res/cursor1.cur  | Bin
 .../res/nel_launcher.rc2                      |   0
 .../nel_launcher_windows_ext/res/progress.jpg | Bin
 .../nel_launcher_windows_ext/res/ryzom.ico    | Bin
 .../nel_launcher_windows_ext/res/tab_news.jpg | Bin
 .../res/tab_news_focus.jpg                    | Bin
 .../nel_launcher_windows_ext/res/tab_rn.jpg   | Bin
 .../res/tab_rn_focus.jpg                      | Bin
 .../res/tab_servers.jpg                       | Bin
 .../res/tab_servers_focus.jpg                 | Bin
 .../nel_launcher_windows_ext/resource.h       |   0
 .../nel_launcher_windows_ext/webbrowser2.cpp  |   0
 .../nel_launcher_windows_ext/webbrowser2.h    |   0
 .../nel_launcher_windows_ext2/CMakeLists.txt  |   0
 .../nel_launcher_windows_ext2/connection.cpp  |   0
 .../nel_launcher_windows_ext2/connection.h    |   0
 .../nel_launcher.cfg                          |   0
 .../nel_launcher.cpp                          |   0
 .../nel_launcher_windows_ext2/nel_launcher.h  |   0
 .../nel_launcher_windows_ext2/nel_launcher.rc |   0
 .../nel_launcher_dlg.cpp                      |   0
 .../nel_launcher_dlg.h                        |   0
 .../nel_launcher_windows_ext2/patch.cpp       |   0
 .../nel_launcher_windows_ext2/patch.h         |   0
 .../res/nel_launcher.ico                      | Bin
 .../res/nel_launcher.rc2                      |   0
 .../nel_launcher_windows_ext2/resource.h      |   0
 .../nel_launcher_windows_ext2/std_afx.cpp     |   0
 .../nel_launcher_windows_ext2/std_afx.h       |   0
 .../login_system/www/config.php               |   0
 .../login_system/www/public_html/index.php    |   0
 .../www/public_html/service_connection.php    |   0
 .../naming_service/CMakeLists.txt             |   0
 .../nelns => nelns}/naming_service/common.cfg |   0
 .../naming_service/naming_service.cfg         |   0
 .../naming_service/naming_service.cpp         |   0
 {code/nelns => nelns}/resources/custom.ini    |   0
 {code/nelns => nelns}/resources/nel.bmp       | Bin
 {code/nelns => nelns}/resources/nel.png       | Bin
 .../nelns => nelns}/resources/nevraxpill.ico  | Bin
 .../welcome_service/CMakeLists.txt            |   0
 .../welcome_service/common.cfg                |   0
 .../welcome_service/welcome_service.cfg       |   0
 .../welcome_service/welcome_service.cpp       |   0
 .../welcome_service/welcome_service.h         |   0
 .../welcome_service/welcome_service_itf.cpp   |   0
 .../welcome_service/welcome_service_itf.h     |   0
 {code/personal => personal}/README.md         |   0
 {code/ryzom => ryzom}/CMakeLists.txt          |   0
 {code/ryzom => ryzom}/COPYING                 |   0
 {code/ryzom => ryzom}/client/CMakeLists.txt   |   0
 .../ryzom => ryzom}/client/macosx/Info.plist  |   0
 {code/ryzom => ryzom}/client/macosx/PkgInfo   |   0
 .../client/macosx/ryzom.entitlements          |   0
 .../ryzom => ryzom}/client/macosx/ryzom.icns  | Bin
 {code/ryzom => ryzom}/client/src/3d_notes.cpp |   0
 {code/ryzom => ryzom}/client/src/3d_notes.h   |   0
 .../ryzom => ryzom}/client/src/CMakeLists.txt |   0
 {code/ryzom => ryzom}/client/src/actions.cpp  |   0
 {code/ryzom => ryzom}/client/src/actions.h    |   0
 .../client/src/actions_client.cpp             |   0
 .../client/src/actions_client.h               |   0
 .../client/src/animated_scene_object.cpp      |   0
 .../client/src/animated_scene_object.h        |   0
 .../ryzom => ryzom}/client/src/animation.cpp  |   0
 {code/ryzom => ryzom}/client/src/animation.h  |   0
 .../client/src/animation_fx.cpp               |   0
 .../ryzom => ryzom}/client/src/animation_fx.h |   0
 .../client/src/animation_fx_id_array.cpp      |   0
 .../client/src/animation_fx_id_array.h        |   0
 .../client/src/animation_fx_misc.cpp          |   0
 .../client/src/animation_fx_misc.h            |   0
 .../client/src/animation_fx_sheet.cpp         |   0
 .../client/src/animation_fx_sheet.h           |   0
 .../client/src/animation_misc.cpp             |   0
 .../client/src/animation_misc.h               |   0
 .../client/src/animation_set.cpp              |   0
 .../client/src/animation_set.h                |   0
 .../client/src/animation_state.cpp            |   0
 .../client/src/animation_state.h              |   0
 .../client/src/animation_type.h               |   0
 .../client/src/app_bundle_utils.cpp           |   0
 .../client/src/app_bundle_utils.h             |   0
 .../client/src/attached_fx.cpp                |   0
 .../ryzom => ryzom}/client/src/attached_fx.h  |   0
 {code/ryzom => ryzom}/client/src/attack.h     |   0
 .../ryzom => ryzom}/client/src/attack_info.h  |   0
 .../client/src/attack_list.cpp                |   0
 .../ryzom => ryzom}/client/src/attack_list.h  |   0
 .../ryzom => ryzom}/client/src/auto_anim.cpp  |   0
 {code/ryzom => ryzom}/client/src/auto_anim.h  |   0
 .../client/src/behaviour_context.cpp          |   0
 .../client/src/behaviour_context.h            |   0
 .../client/src/bg_downloader_access.cpp       |   0
 .../client/src/bg_downloader_access.h         |   0
 .../ryzom => ryzom}/client/src/browse_faq.cpp |   0
 {code/ryzom => ryzom}/client/src/browse_faq.h |   0
 .../client/src/bug_report/EmailDlg.cpp        |   0
 .../client/src/bug_report/EmailDlg.h          |   0
 .../client/src/bug_report/StdAfx.cpp          |   0
 .../client/src/bug_report/StdAfx.h            |   0
 .../client/src/bug_report/bug_report.cpp      |   0
 .../client/src/bug_report/bug_report.h        |   0
 .../client/src/bug_report/bug_report.rc       |   0
 .../client/src/bug_report/bug_reportDlg.cpp   |   0
 .../client/src/bug_report/bug_reportDlg.h     |   0
 .../client/src/bug_report/res/bug_report.ico  | Bin
 .../client/src/bug_report/res/bug_report.rc2  |   0
 .../client/src/bug_report/resource.h          |   0
 {code/ryzom => ryzom}/client/src/camera.cpp   |   0
 {code/ryzom => ryzom}/client/src/camera.h     |   0
 .../client/src/camera_recorder.cpp            |   0
 .../client/src/camera_recorder.h              |   0
 {code/ryzom => ryzom}/client/src/candidate.h  |   0
 .../client/src/cdb_synchronised.cpp           |   0
 .../client/src/cdb_synchronised.h             |   0
 .../client/src/character_cl.cpp               |   0
 .../ryzom => ryzom}/client/src/character_cl.h |   0
 {code/ryzom => ryzom}/client/src/client.cpp   |   0
 {code/ryzom => ryzom}/client/src/client.rc    |   0
 .../ryzom => ryzom}/client/src/client_cfg.cpp |   0
 {code/ryzom => ryzom}/client/src/client_cfg.h |   0
 .../client/src/client_chat_manager.cpp        |   0
 .../client/src/client_chat_manager.h          |   0
 .../client/src/client_sheets/CMakeLists.txt   |   0
 .../client_sheets/animation_fx_set_sheet.cpp  |   0
 .../client_sheets/animation_fx_set_sheet.h    |   0
 .../src/client_sheets/animation_fx_sheet.cpp  |   0
 .../src/client_sheets/animation_fx_sheet.h    |   0
 .../animation_set_list_sheet.cpp              |   0
 .../client_sheets/animation_set_list_sheet.h  |   0
 .../src/client_sheets/attack_id_sheet.cpp     |   0
 .../src/client_sheets/attack_id_sheet.h       |   0
 .../src/client_sheets/attack_list_sheet.cpp   |   0
 .../src/client_sheets/attack_list_sheet.h     |   0
 .../client/src/client_sheets/attack_sheet.cpp |   0
 .../client/src/client_sheets/attack_sheet.h   |   0
 .../client_sheets/automaton_list_sheet.cpp    |   0
 .../src/client_sheets/automaton_list_sheet.h  |   0
 .../src/client_sheets/body_to_bone_sheet.cpp  |   0
 .../src/client_sheets/body_to_bone_sheet.h    |   0
 .../src/client_sheets/building_sheet.cpp      |   0
 .../client/src/client_sheets/building_sheet.h |   0
 .../src/client_sheets/character_sheet.cpp     |   0
 .../src/client_sheets/character_sheet.h       |   0
 .../src/client_sheets/client_sheets.cpp       |   0
 .../client/src/client_sheets/client_sheets.h  |   0
 .../src/client_sheets/continent_sheet.cpp     |   0
 .../src/client_sheets/continent_sheet.h       |   0
 .../src/client_sheets/emot_list_sheet.cpp     |   0
 .../src/client_sheets/emot_list_sheet.h       |   0
 .../client/src/client_sheets/entity_sheet.cpp |   0
 .../client/src/client_sheets/entity_sheet.h   |   0
 .../src/client_sheets/faction_sheet.cpp       |   0
 .../client/src/client_sheets/faction_sheet.h  |   0
 .../client/src/client_sheets/flora_sheet.cpp  |   0
 .../client/src/client_sheets/flora_sheet.h    |   0
 .../src/client_sheets/forage_source_sheet.cpp |   0
 .../src/client_sheets/forage_source_sheet.h   |   0
 .../client/src/client_sheets/fx_sheet.cpp     |   0
 .../client/src/client_sheets/fx_sheet.h       |   0
 .../src/client_sheets/fx_stick_mode.cpp       |   0
 .../client/src/client_sheets/fx_stick_mode.h  |   0
 .../src/client_sheets/ground_fx_sheet.cpp     |   0
 .../src/client_sheets/ground_fx_sheet.h       |   0
 .../src/client_sheets/id_to_string_array.cpp  |   0
 .../src/client_sheets/id_to_string_array.h    |   0
 .../src/client_sheets/item_fx_sheet.cpp       |   0
 .../client/src/client_sheets/item_fx_sheet.h  |   0
 .../client/src/client_sheets/item_sheet.cpp   |   0
 .../client/src/client_sheets/item_sheet.h     |   0
 .../src/client_sheets/light_cycle_sheet.cpp   |   0
 .../src/client_sheets/light_cycle_sheet.h     |   0
 .../src/client_sheets/mission_icon_sheet.cpp  |   0
 .../src/client_sheets/mission_icon_sheet.h    |   0
 .../src/client_sheets/mission_sheet.cpp       |   0
 .../client/src/client_sheets/mission_sheet.h  |   0
 .../client_sheets/outpost_building_sheet.cpp  |   0
 .../client_sheets/outpost_building_sheet.h    |   0
 .../src/client_sheets/outpost_sheet.cpp       |   0
 .../client/src/client_sheets/outpost_sheet.h  |   0
 .../src/client_sheets/outpost_squad_sheet.cpp |   0
 .../src/client_sheets/outpost_squad_sheet.h   |   0
 .../client/src/client_sheets/pact_sheet.cpp   |   0
 .../client/src/client_sheets/pact_sheet.h     |   0
 .../client/src/client_sheets/plant_sheet.cpp  |   0
 .../client/src/client_sheets/plant_sheet.h    |   0
 .../client/src/client_sheets/player_sheet.cpp |   0
 .../client/src/client_sheets/player_sheet.h   |   0
 .../src/client_sheets/race_stats_sheet.cpp    |   0
 .../src/client_sheets/race_stats_sheet.h      |   0
 .../client/src/client_sheets/sbrick_sheet.cpp |   0
 .../client/src/client_sheets/sbrick_sheet.h   |   0
 .../src/client_sheets/skills_tree_sheet.cpp   |   0
 .../src/client_sheets/skills_tree_sheet.h     |   0
 .../src/client_sheets/sky_object_sheet.cpp    |   0
 .../src/client_sheets/sky_object_sheet.h      |   0
 .../client/src/client_sheets/sky_sheet.cpp    |   0
 .../client/src/client_sheets/sky_sheet.h      |   0
 .../src/client_sheets/sphrase_sheet.cpp       |   0
 .../client/src/client_sheets/sphrase_sheet.h  |   0
 .../client/src/client_sheets/stdpch.cpp       |   0
 .../client/src/client_sheets/stdpch.h         |   0
 .../src/client_sheets/success_table_sheet.cpp |   0
 .../src/client_sheets/success_table_sheet.h   |   0
 .../client_sheets/text_emot_list_sheet.cpp    |   0
 .../src/client_sheets/text_emot_list_sheet.h  |   0
 .../client_sheets/unblock_titles_sheet.cpp    |   0
 .../src/client_sheets/unblock_titles_sheet.h  |   0
 .../src/client_sheets/village_sheet.cpp       |   0
 .../client/src/client_sheets/village_sheet.h  |   0
 .../weather_function_params_sheet.cpp         |   0
 .../weather_function_params_sheet.h           |   0
 .../src/client_sheets/weather_setup_sheet.cpp |   0
 .../src/client_sheets/weather_setup_sheet.h   |   0
 .../client/src/client_sheets/world_sheet.cpp  |   0
 .../client/src/client_sheets/world_sheet.h    |   0
 .../client/src/color_slot_manager.cpp         |   0
 .../client/src/color_slot_manager.h           |   0
 {code/ryzom => ryzom}/client/src/commands.cpp |   0
 {code/ryzom => ryzom}/client/src/commands.h   |   0
 .../ryzom => ryzom}/client/src/connection.cpp |   0
 {code/ryzom => ryzom}/client/src/connection.h |   0
 .../client/src/contextual_cursor.cpp          |   0
 .../client/src/contextual_cursor.h            |   0
 .../ryzom => ryzom}/client/src/continent.cpp  |   0
 {code/ryzom => ryzom}/client/src/continent.h  |   0
 .../client/src/continent_manager.cpp          |   0
 .../client/src/continent_manager.h            |   0
 .../client/src/continent_manager_build.cpp    |   0
 .../client/src/continent_manager_build.h      |   0
 .../client/src/cursor_functions.cpp           |   0
 .../client/src/cursor_functions.h             |   0
 .../client/src/custom_matrix.cpp              |   0
 .../client/src/custom_matrix.h                |   0
 .../client/src/debug_client.cpp               |   0
 .../ryzom => ryzom}/client/src/debug_client.h |   0
 {code/ryzom => ryzom}/client/src/decal.cpp    |   0
 {code/ryzom => ryzom}/client/src/decal.h      |   0
 .../ryzom => ryzom}/client/src/decal_anim.cpp |   0
 {code/ryzom => ryzom}/client/src/decal_anim.h |   0
 {code/ryzom => ryzom}/client/src/demo.cpp     |   0
 {code/ryzom => ryzom}/client/src/demo.h       |   0
 .../client/src/door_manager.cpp               |   0
 .../ryzom => ryzom}/client/src/door_manager.h |   0
 .../client/src/dummy_progress.h               |   0
 {code/ryzom => ryzom}/client/src/entities.cpp |   0
 {code/ryzom => ryzom}/client/src/entities.h   |   0
 .../client/src/entity_animation_manager.cpp   |   0
 .../client/src/entity_animation_manager.h     |   0
 .../ryzom => ryzom}/client/src/entity_cl.cpp  |   0
 {code/ryzom => ryzom}/client/src/entity_cl.h  |   0
 .../ryzom => ryzom}/client/src/entity_fx.cpp  |   0
 {code/ryzom => ryzom}/client/src/entity_fx.h  |   0
 .../ryzom => ryzom}/client/src/error_logo.bmp | Bin
 .../client/src/events_listener.cpp            |   0
 .../client/src/events_listener.h              |   0
 .../client/src/faction_war_manager.cpp        |   0
 .../client/src/faction_war_manager.h          |   0
 {code/ryzom => ryzom}/client/src/far_tp.cpp   |   0
 {code/ryzom => ryzom}/client/src/far_tp.h     |   0
 .../client/src/fix_season_data.cpp            |   0
 .../client/src/fix_season_data.h              |   0
 {code/ryzom => ryzom}/client/src/fog_map.cpp  |   0
 {code/ryzom => ryzom}/client/src/fog_map.h    |   0
 .../client/src/forage_source_cl.cpp           |   0
 .../client/src/forage_source_cl.h             |   0
 {code/ryzom => ryzom}/client/src/fx_cl.cpp    |   0
 {code/ryzom => ryzom}/client/src/fx_cl.h      |   0
 .../ryzom => ryzom}/client/src/fx_manager.cpp |   0
 {code/ryzom => ryzom}/client/src/fx_manager.h |   0
 {code/ryzom => ryzom}/client/src/gabarit.cpp  |   0
 {code/ryzom => ryzom}/client/src/gabarit.h    |   0
 .../client/src/game_context_menu.cpp          |   0
 .../client/src/game_context_menu.h            |   0
 .../client/src/gateway_fec_transport.cpp      |   0
 {code/ryzom => ryzom}/client/src/global.cpp   |   0
 {code/ryzom => ryzom}/client/src/global.h     |   0
 {code/ryzom => ryzom}/client/src/graph.cpp    |   0
 {code/ryzom => ryzom}/client/src/graph.h      |   0
 {code/ryzom => ryzom}/client/src/graphic.cpp  |   0
 {code/ryzom => ryzom}/client/src/graphic.h    |   0
 .../client/src/ground_fx_manager.cpp          |   0
 .../client/src/ground_fx_manager.h            |   0
 {code/ryzom => ryzom}/client/src/hair_set.cpp |   0
 {code/ryzom => ryzom}/client/src/hair_set.h   |   0
 .../client/src/ig_callback.cpp                |   0
 .../ryzom => ryzom}/client/src/ig_callback.h  |   0
 .../ryzom => ryzom}/client/src/ig_client.cpp  |   0
 {code/ryzom => ryzom}/client/src/ig_client.h  |   0
 {code/ryzom => ryzom}/client/src/ig_enum.cpp  |   0
 {code/ryzom => ryzom}/client/src/ig_enum.h    |   0
 .../client/src/ig_season_callback.cpp         |   0
 .../client/src/ig_season_callback.h           |   0
 .../client/src/impulse_decoder.cpp            |   0
 .../client/src/impulse_decoder.h              |   0
 .../client/src/ingame_database_manager.cpp    |   0
 .../client/src/ingame_database_manager.h      |   0
 {code/ryzom => ryzom}/client/src/init.cpp     |   0
 {code/ryzom => ryzom}/client/src/init.h       |   0
 .../client/src/init_main_loop.cpp             |   0
 .../client/src/init_main_loop.h               |   0
 {code/ryzom => ryzom}/client/src/input.cpp    |   0
 {code/ryzom => ryzom}/client/src/input.h      |   0
 .../src/interface_v3/action_handler_base.cpp  |   0
 .../src/interface_v3/action_handler_base.h    |   0
 .../src/interface_v3/action_handler_debug.cpp |   0
 .../src/interface_v3/action_handler_edit.cpp  |   0
 .../src/interface_v3/action_handler_game.cpp  |   0
 .../src/interface_v3/action_handler_help.cpp  |   0
 .../src/interface_v3/action_handler_help.h    |   0
 .../src/interface_v3/action_handler_item.cpp  |   0
 .../src/interface_v3/action_handler_item.h    |   0
 .../src/interface_v3/action_handler_misc.cpp  |   0
 .../src/interface_v3/action_handler_misc.h    |   0
 .../src/interface_v3/action_handler_move.cpp  |   0
 .../interface_v3/action_handler_outpost.cpp   |   0
 .../interface_v3/action_handler_phrase.cpp    |   0
 .../src/interface_v3/action_handler_tools.cpp |   0
 .../src/interface_v3/action_handler_tools.h   |   0
 .../src/interface_v3/action_handler_ui.cpp    |   0
 .../src/interface_v3/action_phrase_faber.cpp  |   0
 .../src/interface_v3/action_phrase_faber.h    |   0
 .../src/interface_v3/add_on_manager.cpp       |   0
 .../client/src/interface_v3/add_on_manager.h  |   0
 .../interface_v3/animal_position_state.cpp    |   0
 .../src/interface_v3/animal_position_state.h  |   0
 .../client/src/interface_v3/bar_manager.cpp   |   0
 .../client/src/interface_v3/bar_manager.h     |   0
 .../client/src/interface_v3/bonus_malus.cpp   |   0
 .../client/src/interface_v3/bonus_malus.h     |   0
 .../src/interface_v3/bot_chat_manager.cpp     |   0
 .../src/interface_v3/bot_chat_manager.h       |   0
 .../client/src/interface_v3/bot_chat_page.cpp |   0
 .../client/src/interface_v3/bot_chat_page.h   |   0
 .../src/interface_v3/bot_chat_page_all.cpp    |   0
 .../src/interface_v3/bot_chat_page_all.h      |   0
 .../bot_chat_page_create_guild.cpp            |   0
 .../interface_v3/bot_chat_page_create_guild.h |   0
 .../bot_chat_page_dynamic_mission.cpp         |   0
 .../bot_chat_page_dynamic_mission.h           |   0
 .../interface_v3/bot_chat_page_mission.cpp    |   0
 .../src/interface_v3/bot_chat_page_mission.h  |   0
 .../bot_chat_page_mission_end.cpp             |   0
 .../interface_v3/bot_chat_page_mission_end.h  |   0
 .../src/interface_v3/bot_chat_page_news.cpp   |   0
 .../src/interface_v3/bot_chat_page_news.h     |   0
 .../bot_chat_page_player_gift.cpp             |   0
 .../interface_v3/bot_chat_page_player_gift.h  |   0
 .../bot_chat_page_ring_sessions.cpp           |   0
 .../bot_chat_page_ring_sessions.h             |   0
 .../src/interface_v3/bot_chat_page_trade.cpp  |   0
 .../src/interface_v3/bot_chat_page_trade.h    |   0
 .../interface_v3/brick_learned_callback.cpp   |   0
 .../src/interface_v3/brick_learned_callback.h |   0
 .../client/src/interface_v3/character_3d.cpp  |   0
 .../client/src/interface_v3/character_3d.h    |   0
 .../src/interface_v3/chat_displayer.cpp       |   0
 .../client/src/interface_v3/chat_displayer.h  |   0
 .../client/src/interface_v3/chat_filter.cpp   |   0
 .../client/src/interface_v3/chat_filter.h     |   0
 .../src/interface_v3/chat_text_manager.cpp    |   0
 .../src/interface_v3/chat_text_manager.h      |   0
 .../client/src/interface_v3/chat_window.cpp   |   0
 .../client/src/interface_v3/chat_window.h     |   0
 .../client/src/interface_v3/dbctrl_sheet.cpp  |   0
 .../client/src/interface_v3/dbctrl_sheet.h    |   0
 .../src/interface_v3/dbgroup_build_phrase.cpp |   0
 .../src/interface_v3/dbgroup_build_phrase.h   |   0
 .../src/interface_v3/dbgroup_list_sheet.cpp   |   0
 .../src/interface_v3/dbgroup_list_sheet.h     |   0
 .../dbgroup_list_sheet_bonus_malus.cpp        |   0
 .../dbgroup_list_sheet_bonus_malus.h          |   0
 .../dbgroup_list_sheet_icon_phrase.cpp        |   0
 .../dbgroup_list_sheet_icon_phrase.h          |   0
 .../dbgroup_list_sheet_mission.cpp            |   0
 .../interface_v3/dbgroup_list_sheet_mission.h |   0
 .../interface_v3/dbgroup_list_sheet_text.cpp  |   0
 .../interface_v3/dbgroup_list_sheet_text.h    |   0
 ...roup_list_sheet_text_brick_composition.cpp |   0
 ...bgroup_list_sheet_text_brick_composition.h |   0
 .../dbgroup_list_sheet_text_phrase.cpp        |   0
 .../dbgroup_list_sheet_text_phrase.h          |   0
 .../dbgroup_list_sheet_text_phrase_id.cpp     |   0
 .../dbgroup_list_sheet_text_phrase_id.h       |   0
 .../dbgroup_list_sheet_text_share.cpp         |   0
 .../dbgroup_list_sheet_text_share.h           |   0
 .../interface_v3/dbgroup_list_sheet_trade.cpp |   0
 .../interface_v3/dbgroup_list_sheet_trade.h   |   0
 .../src/interface_v3/encyclopedia_manager.cpp |   0
 .../src/interface_v3/encyclopedia_manager.h   |   0
 .../interface_v3/filtered_chat_summary.cpp    |   0
 .../src/interface_v3/filtered_chat_summary.h  |   0
 .../src/interface_v3/flying_text_manager.cpp  |   0
 .../src/interface_v3/flying_text_manager.h    |   0
 .../client/src/interface_v3/group_career.cpp  |   0
 .../client/src/interface_v3/group_career.h    |   0
 .../client/src/interface_v3/group_compas.cpp  |   0
 .../client/src/interface_v3/group_compas.h    |   0
 .../client/src/interface_v3/group_html_cs.cpp |   0
 .../client/src/interface_v3/group_html_cs.h   |   0
 .../src/interface_v3/group_html_forum.cpp     |   0
 .../src/interface_v3/group_html_forum.h       |   0
 .../src/interface_v3/group_html_mail.cpp      |   0
 .../client/src/interface_v3/group_html_mail.h |   0
 .../src/interface_v3/group_html_qcm.cpp       |   0
 .../client/src/interface_v3/group_html_qcm.h  |   0
 .../src/interface_v3/group_html_webig.cpp     |   0
 .../src/interface_v3/group_html_webig.h       |   0
 .../src/interface_v3/group_in_scene.cpp       |   0
 .../client/src/interface_v3/group_in_scene.h  |   0
 .../interface_v3/group_in_scene_bubble.cpp    |   0
 .../src/interface_v3/group_in_scene_bubble.h  |   0
 .../interface_v3/group_in_scene_user_info.cpp |   0
 .../interface_v3/group_in_scene_user_info.h   |   0
 .../client/src/interface_v3/group_map.cpp     |   0
 .../client/src/interface_v3/group_map.h       |   0
 .../src/interface_v3/group_modal_get_key.cpp  |   0
 .../src/interface_v3/group_modal_get_key.h    |   0
 .../group_phrase_skill_filter.cpp             |   0
 .../interface_v3/group_phrase_skill_filter.h  |   0
 .../src/interface_v3/group_quick_help.cpp     |   0
 .../src/interface_v3/group_quick_help.h       |   0
 .../client/src/interface_v3/group_skills.cpp  |   0
 .../client/src/interface_v3/group_skills.h    |   0
 .../client/src/interface_v3/guild_manager.cpp |   0
 .../client/src/interface_v3/guild_manager.h   |   0
 .../interface_v3/input_handler_manager.cpp    |   0
 .../src/interface_v3/input_handler_manager.h  |   0
 .../src/interface_v3/interface_3d_scene.cpp   |   0
 .../src/interface_v3/interface_3d_scene.h     |   0
 .../src/interface_v3/interface_config.cpp     |   0
 .../src/interface_v3/interface_config.h       |   0
 .../client/src/interface_v3/interface_ddx.cpp |   0
 .../client/src/interface_v3/interface_ddx.h   |   0
 .../interface_expr_user_fct_game.cpp          |   0
 .../interface_expr_user_fct_items.cpp         |   0
 .../src/interface_v3/interface_manager.cpp    |   0
 .../src/interface_v3/interface_manager.h      |   0
 .../src/interface_v3/interface_observer.cpp   |   0
 .../src/interface_v3/interface_observer.h     |   0
 .../interface_v3/interface_options_ryzom.cpp  |   0
 .../interface_v3/interface_options_ryzom.h    |   0
 .../src/interface_v3/interface_pointer.h      |   0
 .../src/interface_v3/inventory_manager.cpp    |   0
 .../src/interface_v3/inventory_manager.h      |   0
 .../interface_v3/item_consumable_effect.cpp   |   0
 .../src/interface_v3/item_consumable_effect.h |   0
 .../src/interface_v3/item_info_waiter.h       |   0
 .../src/interface_v3/item_special_effect.cpp  |   0
 .../src/interface_v3/item_special_effect.h    |   0
 .../src/interface_v3/list_sheet_base.cpp      |   0
 .../client/src/interface_v3/list_sheet_base.h |   0
 .../client/src/interface_v3/lua_dll.cpp       |   0
 .../client/src/interface_v3/lua_dll.h         |   0
 .../client/src/interface_v3/lua_ihm_ryzom.cpp |   0
 .../client/src/interface_v3/lua_ihm_ryzom.h   |   0
 .../client/src/interface_v3/macrocmd_key.cpp  |   0
 .../client/src/interface_v3/macrocmd_key.h    |   0
 .../src/interface_v3/macrocmd_manager.cpp     |   0
 .../src/interface_v3/macrocmd_manager.h       |   0
 .../client/src/interface_v3/music_player.cpp  |   0
 .../client/src/interface_v3/music_player.h    |   0
 .../client/src/interface_v3/obs_huge_list.cpp |   0
 .../client/src/interface_v3/obs_huge_list.h   |   0
 .../src/interface_v3/parser_modules.cpp       |   0
 .../client/src/interface_v3/parser_modules.h  |   0
 .../src/interface_v3/people_interraction.cpp  |   0
 .../src/interface_v3/people_interraction.h    |   0
 .../client/src/interface_v3/people_list.cpp   |   0
 .../client/src/interface_v3/people_list.h     |   0
 .../client/src/interface_v3/player_trade.cpp  |   0
 .../client/src/interface_v3/player_trade.h    |   0
 .../register_interface_elements.cpp           |   0
 .../register_interface_elements.h             |   0
 .../src/interface_v3/req_skill_formula.cpp    |   0
 .../src/interface_v3/req_skill_formula.h      |   0
 .../src/interface_v3/sbrick_manager.cpp       |   0
 .../client/src/interface_v3/sbrick_manager.h  |   0
 .../interface_v3/skill_change_callback.cpp    |   0
 .../src/interface_v3/skill_change_callback.h  |   0
 .../client/src/interface_v3/skill_manager.cpp |   0
 .../client/src/interface_v3/skill_manager.h   |   0
 .../src/interface_v3/sphrase_manager.cpp      |   0
 .../client/src/interface_v3/sphrase_manager.h |   0
 .../src/interface_v3/task_bar_manager.cpp     |   0
 .../src/interface_v3/task_bar_manager.h       |   0
 .../client/src/interface_v3/trade_common.cpp  |   0
 .../client/src/interface_v3/trade_common.h    |   0
 .../src/interface_v3/view_bitmap_faber_mp.cpp |   0
 .../src/interface_v3/view_bitmap_faber_mp.h   |   0
 .../src/interface_v3/view_bitmap_progress.cpp |   0
 .../src/interface_v3/view_bitmap_progress.h   |   0
 .../src/interface_v3/view_pointer_ryzom.cpp   |   0
 .../src/interface_v3/view_pointer_ryzom.h     |   0
 .../client/src/interface_v3/view_radar.cpp    |   0
 .../client/src/interface_v3/view_radar.h      |   0
 .../client/src/interfaces_manager/bitmap.cpp  |   0
 .../client/src/interfaces_manager/bitmap.h    |   0
 .../src/interfaces_manager/bitmap_base.cpp    |   0
 .../src/interfaces_manager/bitmap_base.h      |   0
 .../src/interfaces_manager/brick_control.cpp  |   0
 .../src/interfaces_manager/brick_control.h    |   0
 .../interfaces_manager/brick_receptacle.cpp   |   0
 .../src/interfaces_manager/brick_receptacle.h |   0
 .../client/src/interfaces_manager/button.cpp  |   0
 .../client/src/interfaces_manager/button.h    |   0
 .../src/interfaces_manager/button_base.cpp    |   0
 .../src/interfaces_manager/button_base.h      |   0
 .../src/interfaces_manager/candidate_list.cpp |   0
 .../src/interfaces_manager/candidate_list.h   |   0
 .../client/src/interfaces_manager/capture.cpp |   0
 .../client/src/interfaces_manager/capture.h   |   0
 .../src/interfaces_manager/casting_bar.cpp    |   0
 .../src/interfaces_manager/casting_bar.h      |   0
 .../src/interfaces_manager/chat_control.cpp   |   0
 .../src/interfaces_manager/chat_control.h     |   0
 .../src/interfaces_manager/chat_input.cpp     |   0
 .../src/interfaces_manager/chat_input.h       |   0
 .../src/interfaces_manager/choice_list.cpp    |   0
 .../src/interfaces_manager/choice_list.h      |   0
 .../client/src/interfaces_manager/control.cpp |   0
 .../client/src/interfaces_manager/control.h   |   0
 .../src/interfaces_manager/control_list.cpp   |   0
 .../src/interfaces_manager/control_list.h     |   0
 .../interfaces_manager/horizontal_list.cpp    |   0
 .../src/interfaces_manager/horizontal_list.h  |   0
 .../src/interfaces_manager/interf_list.cpp    |   0
 .../src/interfaces_manager/interf_list.h      |   0
 .../src/interfaces_manager/interf_script.cpp  |   0
 .../src/interfaces_manager/interf_script.h    |   0
 .../interfaces_manager/interfaces_manager.cpp |   0
 .../interfaces_manager/interfaces_manager.h   |   0
 .../src/interfaces_manager/multi_list.cpp     |   0
 .../src/interfaces_manager/multi_list.h       |   0
 .../client/src/interfaces_manager/osd.cpp     |   0
 .../client/src/interfaces_manager/osd.h       |   0
 .../src/interfaces_manager/osd_base.cpp       |   0
 .../client/src/interfaces_manager/osd_base.h  |   0
 .../client/src/interfaces_manager/pen.cpp     |   0
 .../client/src/interfaces_manager/pen.h       |   0
 .../src/interfaces_manager/progress_bar.cpp   |   0
 .../src/interfaces_manager/progress_bar.h     |   0
 .../src/interfaces_manager/radio_button.cpp   |   0
 .../src/interfaces_manager/radio_button.h     |   0
 .../interfaces_manager/radio_controller.cpp   |   0
 .../src/interfaces_manager/radio_controller.h |   0
 .../src/interfaces_manager/scroll_bar.cpp     |   0
 .../src/interfaces_manager/scroll_bar.h       |   0
 .../interfaces_manager/scrollable_control.cpp |   0
 .../interfaces_manager/scrollable_control.h   |   0
 .../src/interfaces_manager/spell_control.cpp  |   0
 .../src/interfaces_manager/spell_control.h    |   0
 .../src/interfaces_manager/spell_list.cpp     |   0
 .../src/interfaces_manager/spell_list.h       |   0
 .../client/src/interfaces_manager/text.cpp    |   0
 .../client/src/interfaces_manager/text.h      |   0
 {code/ryzom => ryzom}/client/src/item_cl.cpp  |   0
 {code/ryzom => ryzom}/client/src/item_cl.h    |   0
 .../client/src/item_group_manager.cpp         |   0
 .../client/src/item_group_manager.h           |   0
 .../client/src/landscape_poly_drawer.cpp      |   0
 .../client/src/landscape_poly_drawer.h        |   0
 .../client/src/light_cycle_manager.cpp        |   0
 .../client/src/light_cycle_manager.h          |   0
 .../client/src/lod_character_user_manager.cpp |   0
 .../client/src/lod_character_user_manager.h   |   0
 {code/ryzom => ryzom}/client/src/login.cpp    |   0
 {code/ryzom => ryzom}/client/src/login.h      |   0
 .../client/src/login_patch.cpp                |   0
 .../ryzom => ryzom}/client/src/login_patch.h  |   0
 .../client/src/login_progress_post_thread.cpp |   0
 .../client/src/login_progress_post_thread.h   |   0
 .../client/src/login_xdelta.cpp               |   0
 .../ryzom => ryzom}/client/src/login_xdelta.h |   0
 .../lua_ide_dll_nevrax/include/cj60/CJ60Lib.h |   0
 .../include/cj60/CJCaption.h                  |   0
 .../include/cj60/CJControlBar.h               |   0
 .../include/cj60/CJDockBar.h                  |   0
 .../include/cj60/CJDockContext.h              |   0
 .../include/cj60/CJExplorerBar.h              |   0
 .../include/cj60/CJFlatButton.h               |   0
 .../include/cj60/CJFlatComboBox.h             |   0
 .../include/cj60/CJFlatHeaderCtrl.h           |   0
 .../include/cj60/CJFrameWnd.h                 |   0
 .../include/cj60/CJListCtrl.h                 |   0
 .../include/cj60/CJListView.h                 |   0
 .../include/cj60/CJMDIFrameWnd.h              |   0
 .../include/cj60/CJMiniDockFrameWnd.h         |   0
 .../include/cj60/CJOutlookBar.h               |   0
 .../include/cj60/CJPagerCtrl.h                |   0
 .../include/cj60/CJSearchEdit.h               |   0
 .../include/cj60/CJSizeDockBar.h              |   0
 .../include/cj60/CJTabCtrlBar.h               |   0
 .../include/cj60/CJToolBar.h                  |   0
 .../lua_ide_dll_nevrax/include/cj60/CoolBar.h |   0
 .../include/cj60/CoolMenu.h                   |   0
 .../lua_ide_dll_nevrax/include/cj60/FixTB.h   |   0
 .../lua_ide_dll_nevrax/include/cj60/FlatBar.h |   0
 .../lua_ide_dll_nevrax/include/cj60/MenuBar.h |   0
 .../include/cj60/ModulVer.h                   |   0
 .../include/cj60/SHFileInfo.h                 |   0
 .../include/cj60/ShellPidl.h                  |   0
 .../include/cj60/ShellTree.h                  |   0
 .../include/cj60/Subclass.h                   |   0
 .../include/cj60/hyperlink.h                  |   0
 .../include/lua_ide_dll/ide_interface.h       |   0
 .../include/scintilla/Accessor.h              |   0
 .../include/scintilla/KeyWords.h              |   0
 .../include/scintilla/Platform.h              |   0
 .../include/scintilla/PropSet.h               |   0
 .../include/scintilla/SString.h               |   0
 .../include/scintilla/SciLexer.h              |   0
 .../include/scintilla/Scintilla.h             |   0
 .../include/scintilla/ScintillaWidget.h       |   0
 .../include/scintilla/WindowAccessor.h        |   0
 .../source/CJ60Lib/CJ60Lib.rc                 |   0
 .../source/CJ60Lib/CJ60lib.cpp                |   0
 .../source/CJ60Lib/CJ60lib.def                |   0
 .../source/CJ60Lib/CJCaption.cpp              |   0
 .../source/CJ60Lib/CJControlBar.cpp           |   0
 .../source/CJ60Lib/CJDockBar.cpp              |   0
 .../source/CJ60Lib/CJDockContext.cpp          |   0
 .../source/CJ60Lib/CJExplorerBar.cpp          |   0
 .../source/CJ60Lib/CJFlatButton.cpp           |   0
 .../source/CJ60Lib/CJFlatComboBox.cpp         |   0
 .../source/CJ60Lib/CJFlatHeaderCtrl.cpp       |   0
 .../source/CJ60Lib/CJFrameWnd.cpp             |   0
 .../source/CJ60Lib/CJListCtrl.cpp             |   0
 .../source/CJ60Lib/CJListView.cpp             |   0
 .../source/CJ60Lib/CJMDIFrameWnd.cpp          |   0
 .../source/CJ60Lib/CJMiniDockFrameWnd.cpp     |   0
 .../source/CJ60Lib/CJOutlookBar.cpp           |   0
 .../source/CJ60Lib/CJPagerCtrl.cpp            |   0
 .../source/CJ60Lib/CJSearchEdit.cpp           |   0
 .../source/CJ60Lib/CJSizeDockBar.cpp          |   0
 .../source/CJ60Lib/CJTabctrlBar.cpp           |   0
 .../source/CJ60Lib/CJToolBar.cpp              |   0
 .../source/CJ60Lib/CoolBar.cpp                |   0
 .../source/CJ60Lib/CoolMenu.cpp               |   0
 .../source/CJ60Lib/FixTB.cpp                  |   0
 .../source/CJ60Lib/FlatBar.cpp                |   0
 .../source/CJ60Lib/Globals.cpp                |   0
 .../source/CJ60Lib/Globals.h                  |   0
 .../source/CJ60Lib/MenuBar.cpp                |   0
 .../source/CJ60Lib/ModulVer.cpp               |   0
 .../source/CJ60Lib/SHFileInfo.cpp             |   0
 .../source/CJ60Lib/ShellPidl.cpp              |   0
 .../source/CJ60Lib/ShellTree.cpp              |   0
 .../source/CJ60Lib/Subclass.cpp               |   0
 .../source/CJ60Lib/hyperlink.cpp              |   0
 .../source/CJ60Lib/readme.txt                 |   0
 .../source/CJ60Lib/res/btn_arro.bmp           | Bin
 .../source/CJ60Lib/res/btn_explorer.bmp       | Bin
 .../source/CJ60Lib/res/button_images.bmp      | Bin
 .../source/CJ60Lib/res/cj60lib.rc2            |   0
 .../source/CJ60Lib/res/cj_logo.bmp            | Bin
 .../source/CJ60Lib/res/hsplitba.cur           | Bin
 .../source/CJ60Lib/res/vsplitba.cur           | Bin
 .../source/CJ60Lib/resource.h                 |   0
 .../source/CJ60Lib/stdafx.cpp                 |   0
 .../source/CJ60Lib/stdafx.h                   |   0
 .../source/Ide2/BreakPointCondition.cpp       |   0
 .../source/Ide2/BreakPointCondition.h         |   0
 .../source/Ide2/BreakPointWnd.cpp             |   0
 .../source/Ide2/BreakPointWnd.h               |   0
 .../source/Ide2/CallStack.cpp                 |   0
 .../source/Ide2/CallStack.h                   |   0
 .../source/Ide2/ColumnTreeCtrl.cpp            |   0
 .../source/Ide2/ColumnTreeWnd.cpp             |   0
 .../source/Ide2/ColumnTreeWnd.h               |   0
 .../source/Ide2/Debugger.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/Debugger.h |   0
 .../source/Ide2/DebuggerMessages.h            |   0
 .../source/Ide2/Executor.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/Executor.h |   0
 .../source/Ide2/FindText.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/FindText.h |   0
 .../source/Ide2/GotoLine.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/GotoLine.h |   0
 .../source/Ide2/HelloWorld.lua                |   0
 .../lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp |   0
 .../lua_ide_dll_nevrax/source/Ide2/LuaDoc.h   |   0
 .../source/Ide2/LuaEditor.cpp                 |   0
 .../source/Ide2/LuaEditor.h                   |   0
 .../source/Ide2/LuaFrame.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/LuaFrame.h |   0
 .../source/Ide2/LuaHelper.cpp                 |   0
 .../source/Ide2/LuaHelper.h                   |   0
 .../source/Ide2/LuaView.cpp                   |   0
 .../lua_ide_dll_nevrax/source/Ide2/LuaView.h  |   0
 .../source/Ide2/MDIClientWnd.cpp              |   0
 .../source/Ide2/MDIClientWnd.h                |   0
 .../source/Ide2/MainFrame.cpp                 |   0
 .../source/Ide2/MainFrame.h                   |   0
 .../source/Ide2/OutputWnd.cpp                 |   0
 .../source/Ide2/OutputWnd.h                   |   0
 .../source/Ide2/Project.cpp                   |   0
 .../lua_ide_dll_nevrax/source/Ide2/Project.h  |   0
 .../source/Ide2/ProjectFile.cpp               |   0
 .../source/Ide2/ProjectFile.h                 |   0
 .../source/Ide2/ProjectNew.cpp                |   0
 .../source/Ide2/ProjectNew.h                  |   0
 .../source/Ide2/ProjectProperties.cpp         |   0
 .../source/Ide2/ProjectProperties.h           |   0
 .../lua_ide_dll_nevrax/source/Ide2/ReadMe.txt |   0
 .../source/Ide2/ScintillaBar.cpp              |   0
 .../source/Ide2/ScintillaBar.h                |   0
 .../source/Ide2/ScintillaView.cpp             |   0
 .../source/Ide2/ScintillaView.h               |   0
 .../lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp |   0
 .../lua_ide_dll_nevrax/source/Ide2/StdAfx.h   |   0
 .../source/Ide2/TreeViewFiles.cpp             |   0
 .../source/Ide2/TreeViewFiles.h               |   0
 .../source/Ide2/VariablesBar.cpp              |   0
 .../source/Ide2/VariablesBar.h                |   0
 .../source/Ide2/WatchBar.cpp                  |   0
 .../lua_ide_dll_nevrax/source/Ide2/WatchBar.h |   0
 .../source/Ide2/WatchList.cpp                 |   0
 .../source/Ide2/WatchList.h                   |   0
 .../source/Ide2/WatchList_old.cpp             |   0
 .../source/Ide2/WatchList_old.h               |   0
 .../source/Ide2/WorkspaceWnd.cpp              |   0
 .../source/Ide2/WorkspaceWnd.h                |   0
 .../source/Ide2/columntreectrl.h              |   0
 .../lua_ide_dll_nevrax/source/Ide2/ide2.cpp   |   0
 .../src/lua_ide_dll_nevrax/source/Ide2/ide2.h |   0
 .../lua_ide_dll_nevrax/source/Ide2/ide2.rc    |   0
 .../source/Ide2/res/HelloWorld.lua            |   0
 .../source/Ide2/res/LuaDoc.ico                | Bin
 .../source/Ide2/res/Toolbar.bmp               | Bin
 .../source/Ide2/res/ide2.ico                  | Bin
 .../source/Ide2/res/ide2.rc2                  |   0
 .../source/Ide2/res/il_file.bmp               | Bin
 .../source/Ide2/res/il_tab.bmp                | Bin
 .../lua_ide_dll_nevrax/source/Ide2/resource.h |   0
 .../lua_ide_dll_nevrax/source/Ide2/test.lpr   | Bin
 .../source/ide2_dll/ide2_dll.def              |   0
 .../source/ide2_dll/ide_interface.cpp         |   0
 .../source/libapi/Readme.txt                  |   0
 .../source/libapi/StdAfx.cpp                  |   0
 .../lua_ide_dll_nevrax/source/libapi/StdAfx.h |   0
 .../lua_ide_dll_nevrax/source/libapi/libapi.c |   0
 .../source/libapi/libapi.cpp                  |   0
 .../lua_ide_dll_nevrax/source/libapi/libapi.h |   0
 .../source/scintilla/AutoComplete.cxx         |   0
 .../source/scintilla/AutoComplete.h           |   0
 .../source/scintilla/CallTip.cxx              |   0
 .../source/scintilla/CallTip.h                |   0
 .../source/scintilla/CellBuffer.cxx           |   0
 .../source/scintilla/CellBuffer.h             |   0
 .../source/scintilla/ContractionState.cxx     |   0
 .../source/scintilla/ContractionState.h       |   0
 .../source/scintilla/Document.cxx             |   0
 .../source/scintilla/Document.h               |   0
 .../source/scintilla/DocumentAccessor.cxx     |   0
 .../source/scintilla/DocumentAccessor.h       |   0
 .../source/scintilla/Editor.cxx               |   0
 .../source/scintilla/Editor.h                 |   0
 .../source/scintilla/Indicator.cxx            |   0
 .../source/scintilla/Indicator.h              |   0
 .../source/scintilla/KeyMap.cxx               |   0
 .../source/scintilla/KeyMap.h                 |   0
 .../source/scintilla/KeyWords.cxx             |   0
 .../source/scintilla/LexAVE.cxx               |   0
 .../source/scintilla/LexAda.cxx               |   0
 .../source/scintilla/LexBaan.cxx              |   0
 .../source/scintilla/LexBullant.cxx           |   0
 .../source/scintilla/LexCPP.cxx               |   0
 .../source/scintilla/LexConf.cxx              |   0
 .../source/scintilla/LexCrontab.cxx           |   0
 .../source/scintilla/LexEiffel.cxx            |   0
 .../source/scintilla/LexHTML.cxx              |   0
 .../source/scintilla/LexLisp.cxx              |   0
 .../source/scintilla/LexLua.cxx               |   0
 .../source/scintilla/LexMatlab.cxx            |   0
 .../source/scintilla/LexOthers.cxx            |   0
 .../source/scintilla/LexPascal.cxx            |   0
 .../source/scintilla/LexPerl.cxx              |   0
 .../source/scintilla/LexPython.cxx            |   0
 .../source/scintilla/LexRuby.cxx              |   0
 .../source/scintilla/LexSQL.cxx               |   0
 .../source/scintilla/LexVB.cxx                |   0
 .../source/scintilla/LineMarker.cxx           |   0
 .../source/scintilla/LineMarker.h             |   0
 .../source/scintilla/Margin.cur               | Bin
 .../source/scintilla/PropSet.cxx              |   0
 .../source/scintilla/RESearch.cxx             |   0
 .../source/scintilla/RESearch.h               |   0
 .../source/scintilla/SVector.h                |   0
 .../source/scintilla/ScintRes.rc              |   0
 .../source/scintilla/ScintillaBase.cxx        |   0
 .../source/scintilla/ScintillaBase.h          |   0
 .../source/scintilla/Style.cxx                |   0
 .../source/scintilla/Style.h                  |   0
 .../source/scintilla/StyleContext.cxx         |   0
 .../source/scintilla/StyleContext.h           |   0
 .../source/scintilla/UniConversion.cxx        |   0
 .../source/scintilla/UniConversion.h          |   0
 .../source/scintilla/ViewStyle.cxx            |   0
 .../source/scintilla/ViewStyle.h              |   0
 .../source/scintilla/WindowAccessor.cxx       |   0
 .../source/scintilla/win32/ExternalLexer.cxx  |   0
 .../source/scintilla/win32/ExternalLexer.h    |   0
 .../source/scintilla/win32/Margin.cur         | Bin
 .../source/scintilla/win32/PlatWin.cxx        |   0
 .../source/scintilla/win32/PlatformRes.h      |   0
 .../source/scintilla/win32/ScintRes.rc        |   0
 .../source/scintilla/win32/ScintillaWin.cxx   |   0
 .../source/standard/lauxlib.c                 |   0
 .../source/standard/lbaselib.c                |   0
 .../source/standard/ldblib.c                  |   0
 .../source/standard/liolib.c                  |   0
 .../source/standard/lmathlib.c                |   0
 .../source/standard/loadlib.c                 |   0
 .../source/standard/lstrlib.c                 |   0
 .../source/standard/ltablib.c                 |   0
 .../source/stdlib/ReadMe.txt                  |   0
 .../source/stdlib/StdAfx.cpp                  |   0
 .../lua_ide_dll_nevrax/source/stdlib/StdAfx.h |   0
 .../source/stdlib/stdlib.cpp                  |   0
 .../lua_ide_dll_nevrax/source/stdlib/stdlib.h |   0
 .../client/src/lua_ide_dll_nevrax/test.lua    |   0
 .../client/src/lua_ide_dll_nevrax/test2.lua   |   0
 .../test_ide_dll_2/ReadMe.txt                 |   0
 .../test_ide_dll_2/StdAfx.cpp                 |   0
 .../test_ide_dll_2/StdAfx.h                   |   0
 .../test_ide_dll_2/resource.h                 |   0
 .../test_ide_dll_2/small.ico                  | Bin
 .../test_ide_dll_2/test_ide_dll_2.cpp         |   0
 .../test_ide_dll_2/test_ide_dll_2.h           |   0
 .../test_ide_dll_2/test_ide_dll_2.ico         | Bin
 .../test_ide_dll_2/test_ide_dll_2.rc          |   0
 .../ryzom => ryzom}/client/src/main_loop.cpp  |   0
 {code/ryzom => ryzom}/client/src/main_loop.h  |   0
 .../client/src/main_loop_debug.cpp            |   0
 .../client/src/main_loop_debug.h              |   0
 .../client/src/main_loop_temp.cpp             |   0
 .../client/src/main_loop_temp.h               |   0
 .../client/src/main_loop_utilities.cpp        |   0
 .../client/src/main_loop_utilities.h          |   0
 .../client/src/mesh_camera_col_manager.cpp    |   0
 .../client/src/mesh_camera_col_manager.h      |   0
 .../client/src/micro_life_manager.cpp         |   0
 .../client/src/micro_life_manager.h           |   0
 {code/ryzom => ryzom}/client/src/misc.cpp     |   0
 {code/ryzom => ryzom}/client/src/misc.h       |   0
 .../client/src/motion/modes/ai_mode.cpp       |   0
 .../client/src/motion/modes/death_mode.cpp    |   0
 .../client/src/motion/modes/free_head.cpp     |   0
 .../src/motion/modes/interface_mode.cpp       |   0
 .../client/src/motion/modes/mount_mode.cpp    |   0
 .../client/src/motion/modes/third_mode.cpp    |   0
 .../client/src/motion/user_controls.cpp       |   0
 .../client/src/motion/user_controls.h         |   0
 .../client/src/movie_shooter.cpp              |   0
 .../client/src/movie_shooter.h                |   0
 .../client/src/net_manager.cpp                |   0
 .../ryzom => ryzom}/client/src/net_manager.h  |   0
 .../client/src/network_connection.cpp         |   0
 .../client/src/network_connection.h           |   0
 {code/ryzom => ryzom}/client/src/npc_icon.cpp |   0
 {code/ryzom => ryzom}/client/src/npc_icon.h   |   0
 {code/ryzom => ryzom}/client/src/outpost.cpp  |   0
 {code/ryzom => ryzom}/client/src/outpost.h    |   0
 .../client/src/outpost_manager.cpp            |   0
 .../client/src/outpost_manager.h              |   0
 .../client/src/pacs_client.cpp                |   0
 .../ryzom => ryzom}/client/src/pacs_client.h  |   0
 .../client/src/permanent_ban.cpp              |   0
 .../client/src/permanent_ban.h                |   0
 {code/ryzom => ryzom}/client/src/ping.cpp     |   0
 {code/ryzom => ryzom}/client/src/ping.h       |   0
 .../ryzom => ryzom}/client/src/player_cl.cpp  |   0
 {code/ryzom => ryzom}/client/src/player_cl.h  |   0
 .../client/src/player_r2_cl.cpp               |   0
 .../ryzom => ryzom}/client/src/player_r2_cl.h |   0
 .../client/src/precipitation.cpp              |   0
 .../client/src/precipitation.h                |   0
 .../client/src/precipitation_clip_grid.cpp    |   0
 .../client/src/precipitation_clip_grid.h      |   0
 .../ryzom => ryzom}/client/src/prim_file.cpp  |   0
 {code/ryzom => ryzom}/client/src/prim_file.h  |   0
 .../ryzom => ryzom}/client/src/profiling.cpp  |   0
 {code/ryzom => ryzom}/client/src/profiling.h  |   0
 {code/ryzom => ryzom}/client/src/progress.cpp |   0
 {code/ryzom => ryzom}/client/src/progress.h   |   0
 .../client/src/projectile_desc.h              |   0
 .../client/src/projectile_manager.cpp         |   0
 .../client/src/projectile_manager.h           |   0
 .../client/src/property_decoder.cpp           |   0
 .../client/src/property_decoder.h             |   0
 .../client/src/r2/auto_group.cpp              |   0
 .../client/src/r2/auto_group.h                |   0
 .../client/src/r2/config_var.cpp              |   0
 .../client/src/r2/config_var.h                |   0
 .../client/src/r2/displayer_base.cpp          |   0
 .../client/src/r2/displayer_base.h            |   0
 .../client/src/r2/displayer_lua.cpp           |   0
 .../client/src/r2/displayer_lua.h             |   0
 .../client/src/r2/displayer_property.h        |   0
 .../client/src/r2/displayer_visual.cpp        |   0
 .../client/src/r2/displayer_visual.h          |   0
 .../r2/displayer_visual_activity_sequence.cpp |   0
 .../r2/displayer_visual_activity_sequence.h   |   0
 .../client/src/r2/displayer_visual_entity.cpp |   0
 .../client/src/r2/displayer_visual_entity.h   |   0
 .../client/src/r2/displayer_visual_group.cpp  |   0
 .../client/src/r2/displayer_visual_group.h    |   0
 .../client/src/r2/displayer_visual_road.cpp   |   0
 .../client/src/r2/displayer_visual_road.h     |   0
 .../client/src/r2/displayer_visual_shape.cpp  |   0
 .../client/src/r2/displayer_visual_shape.h    |   0
 .../client/src/r2/dmc/action_historic.cpp     |   0
 .../client/src/r2/dmc/action_historic.h       |   0
 .../src/r2/dmc/client_edition_module.cpp      |   0
 .../client/src/r2/dmc/client_edition_module.h |   0
 .../client/src/r2/dmc/com_lua_module.cpp      |   0
 .../client/src/r2/dmc/com_lua_module.h        |   0
 .../ryzom => ryzom}/client/src/r2/dmc/dmc.cpp |   0
 {code/ryzom => ryzom}/client/src/r2/dmc/dmc.h |   0
 .../ryzom => ryzom}/client/src/r2/dmc/idmc.h  |   0
 .../client/src/r2/dmc/palette.cpp             |   0
 .../client/src/r2/dmc/palette.h               |   0
 .../client/src/r2/dmc/property_accessor.cpp   |   0
 .../client/src/r2/dmc/property_accessor.h     |   0
 .../client/src/r2/ed_command.h                |   0
 .../ryzom => ryzom}/client/src/r2/editor.cpp  |   0
 {code/ryzom => ryzom}/client/src/r2/editor.h  |   0
 .../src/r2/entity_custom_select_box.cpp       |   0
 .../client/src/r2/entity_custom_select_box.h  |   0
 .../client/src/r2/entity_sorter.cpp           |   0
 .../client/src/r2/entity_sorter.h             |   0
 .../client/src/r2/instance.cpp                |   0
 .../ryzom => ryzom}/client/src/r2/instance.h  |   0
 .../client/src/r2/instance_map_deco.cpp       |   0
 .../client/src/r2/instance_map_deco.h         |   0
 .../client/src/r2/island_collision.cpp        |   0
 .../client/src/r2/island_collision.h          |   0
 .../client/src/r2/lua_event_forwarder.cpp     |   0
 .../client/src/r2/lua_event_forwarder.h       |   0
 .../client/src/r2/mesh_array.cpp              |   0
 .../client/src/r2/mesh_array.h                |   0
 .../client/src/r2/npc_editor.cpp              |   0
 .../client/src/r2/npc_editor.h                |   0
 .../client/src/r2/object_factory_client.cpp   |   0
 .../client/src/r2/object_factory_client.h     |   0
 .../client/src/r2/palette_node.cpp            |   0
 .../client/src/r2/palette_node.h              |   0
 .../client/src/r2/prim_render.cpp             |   0
 .../client/src/r2/prim_render.h               |   0
 .../client/src/r2/r2_config.cpp               |   0
 .../ryzom => ryzom}/client/src/r2/r2_config.h |   0
 .../ryzom => ryzom}/client/src/r2/r2_lua.cpp  |   0
 {code/ryzom => ryzom}/client/src/r2/r2_lua.h  |   0
 {code/ryzom => ryzom}/client/src/r2/tool.cpp  |   0
 {code/ryzom => ryzom}/client/src/r2/tool.h    |   0
 .../client/src/r2/tool_choose_pos.cpp         |   0
 .../client/src/r2/tool_choose_pos.h           |   0
 .../client/src/r2/tool_choose_pos_lua.cpp     |   0
 .../client/src/r2/tool_choose_pos_lua.h       |   0
 .../client/src/r2/tool_create_entity.cpp      |   0
 .../client/src/r2/tool_create_entity.h        |   0
 .../client/src/r2/tool_draw_prim.cpp          |   0
 .../client/src/r2/tool_draw_prim.h            |   0
 .../client/src/r2/tool_draw_road.cpp          |   0
 .../client/src/r2/tool_draw_road.h            |   0
 .../client/src/r2/tool_maintained_action.cpp  |   0
 .../client/src/r2/tool_maintained_action.h    |   0
 .../client/src/r2/tool_new_vertex.cpp         |   0
 .../client/src/r2/tool_new_vertex.h           |   0
 .../client/src/r2/tool_pick.cpp               |   0
 .../ryzom => ryzom}/client/src/r2/tool_pick.h |   0
 .../client/src/r2/tool_select_move.cpp        |   0
 .../client/src/r2/tool_select_move.h          |   0
 .../client/src/r2/tool_select_rotate.cpp      |   0
 .../client/src/r2/tool_select_rotate.h        |   0
 .../client/src/r2/verbose_clock.cpp           |   0
 .../client/src/r2/verbose_clock.h             |   0
 {code/ryzom => ryzom}/client/src/release.cpp  |   0
 {code/ryzom => ryzom}/client/src/release.h    |   0
 {code/ryzom => ryzom}/client/src/resource.h   |   0
 {code/ryzom => ryzom}/client/src/rosace.cpp   |   0
 {code/ryzom => ryzom}/client/src/rosace.h     |   0
 .../client/src/rosace_functions.cpp           |   0
 .../client/src/rosace_functions.h             |   0
 {code/ryzom => ryzom}/client/src/ryzom.ico    | Bin
 .../client/src/ryzom_small.ico                | Bin
 .../client/src/scalable_time.cpp              |   0
 .../client/src/scalable_time.h                |   0
 .../client/src/scene_parser.cpp               |   0
 .../ryzom => ryzom}/client/src/scene_parser.h |   0
 .../client/src/session_browser.cpp            |   0
 .../client/src/session_browser.h              |   0
 .../client/src/session_browser_impl.cpp       |   0
 .../client/src/session_browser_impl.h         |   0
 .../client/src/sheet_manager.cpp              |   0
 .../client/src/sheet_manager.h                |   0
 {code/ryzom => ryzom}/client/src/sky.cpp      |   0
 {code/ryzom => ryzom}/client/src/sky.h        |   0
 .../client/src/sky_material_setup.cpp         |   0
 .../client/src/sky_material_setup.h           |   0
 .../ryzom => ryzom}/client/src/sky_object.cpp |   0
 {code/ryzom => ryzom}/client/src/sky_object.h |   0
 .../ryzom => ryzom}/client/src/sky_render.cpp |   0
 {code/ryzom => ryzom}/client/src/sky_render.h |   0
 .../client/src/sound_manager.cpp              |   0
 .../client/src/sound_manager.h                |   0
 .../client/src/splash_screen.bmp              | Bin
 {code/ryzom => ryzom}/client/src/stage.cpp    |   0
 {code/ryzom => ryzom}/client/src/stage.h      |   0
 .../client/src/starting_roles.cpp             |   0
 .../client/src/starting_roles.h               |   0
 {code/ryzom => ryzom}/client/src/stdpch.cpp   |   0
 {code/ryzom => ryzom}/client/src/stdpch.h     |   0
 .../client/src/steam_client.cpp               |   0
 .../ryzom => ryzom}/client/src/steam_client.h |   0
 .../client/src/streamable_entity.cpp          |   0
 .../client/src/streamable_entity.h            |   0
 .../src/streamable_entity_composite.cpp       |   0
 .../client/src/streamable_entity_composite.h  |   0
 .../client/src/streamable_ig.cpp              |   0
 .../client/src/streamable_ig.h                |   0
 .../client/src/stremable_ig.cpp               |   0
 .../client/src/string_manager_client.cpp      |   0
 .../client/src/string_manager_client.h        |   0
 {code/ryzom => ryzom}/client/src/teleport.cpp |   0
 {code/ryzom => ryzom}/client/src/teleport.h   |   0
 .../client/src/text_manager.cpp               |   0
 .../ryzom => ryzom}/client/src/text_manager.h |   0
 .../client/src/time_client.cpp                |   0
 .../ryzom => ryzom}/client/src/time_client.h  |   0
 .../client/src/timed_fx_manager.cpp           |   0
 .../client/src/timed_fx_manager.h             |   0
 .../ryzom => ryzom}/client/src/user_agent.cpp |   0
 {code/ryzom => ryzom}/client/src/user_agent.h |   0
 .../client/src/user_entity.cpp                |   0
 .../ryzom => ryzom}/client/src/user_entity.h  |   0
 {code/ryzom => ryzom}/client/src/view.cpp     |   0
 {code/ryzom => ryzom}/client/src/view.h       |   0
 {code/ryzom => ryzom}/client/src/village.cpp  |   0
 {code/ryzom => ryzom}/client/src/village.h    |   0
 .../client/src/water_env_map_rdr.cpp          |   0
 .../client/src/water_env_map_rdr.h            |   0
 .../ryzom => ryzom}/client/src/water_map.cpp  |   0
 {code/ryzom => ryzom}/client/src/water_map.h  |   0
 {code/ryzom => ryzom}/client/src/weather.cpp  |   0
 {code/ryzom => ryzom}/client/src/weather.h    |   0
 .../client/src/weather_manager_client.cpp     |   0
 .../client/src/weather_manager_client.h       |   0
 .../client/src/weather_setup_client.cpp       |   0
 .../client/src/weather_setup_client.h         |   0
 .../client/src/world_database_manager.cpp     |   0
 .../client/src/world_database_manager.h       |   0
 .../ryzom => ryzom}/client/src/zone_util.cpp  |   0
 {code/ryzom => ryzom}/client/src/zone_util.h  |   0
 .../client/unix/CMakeLists.txt                |   0
 .../client/unix/ryzom_128x128.png             | Bin
 .../client/unix/ryzom_16x16.png               | Bin
 .../client/unix/ryzom_22x22.png               | Bin
 .../client/unix/ryzom_24x24.png               | Bin
 .../client/unix/ryzom_256x256.png             | Bin
 .../client/unix/ryzom_32x32.png               | Bin
 .../client/unix/ryzom_48x48.png               | Bin
 .../client/unix/ryzom_64x64.png               | Bin
 .../client/unix/ryzom_client.desktop.in       |   0
 .../client/unix/ryzom_client.png              | Bin
 .../client/unix/ryzom_client.xpm              |   0
 {code/ryzom => ryzom}/common/CMakeLists.txt   |   0
 .../class_doc/add_compass.html                |   0
 .../class_doc/ai_event.html                   |   0
 .../class_doc/bot_chat.html                   |   0
 .../world_editor_files/class_doc/buy.html     |   0
 .../world_editor_files/class_doc/cast.html    |   0
 .../world_editor_files/class_doc/craft.html   |   0
 .../class_doc/custom_loot_set.html            |   0
 .../class_doc/custom_loot_table.html          |   0
 .../class_doc/depositzone.html                |   0
 .../class_doc/destroy_item.html               |   0
 .../class_doc/do_mission.html                 |   0
 .../class_doc/dyn_answer.html                 |   0
 .../world_editor_files/class_doc/escort.html  |   0
 .../world_editor_files/class_doc/fail.html    |   0
 .../world_editor_files/class_doc/forage.html  |   0
 .../class_doc/give_item.html                  |   0
 .../class_doc/give_money.html                 |   0
 .../class_doc/group_fauna.html                |   0
 .../class_doc/item_guidelines.html            |   0
 .../world_editor_files/class_doc/jump_to.html |   0
 .../class_doc/keywords.html                   |   0
 .../world_editor_files/class_doc/kill.html    |   0
 .../class_doc/learn_action.html               |   0
 .../class_doc/linear_dyn_chat_continue.html   |   0
 .../class_doc/linear_dyn_chat_fail.html       |   0
 .../class_doc/linear_dyn_chat_retry.html      |   0
 .../world_editor_files/class_doc/loot.html    |   0
 .../class_doc/mission_tree.html               |   0
 .../class_doc/no_answer.html                  |   0
 .../world_editor_files/class_doc/npc_bot.html |   0
 .../class_doc/npc_event_handler_action.html   |   0
 .../class_doc/npc_group.html                  |   0
 .../class_doc/npc_group_parameters.html       |   0
 .../world_editor_files/class_doc/people.html  |   0
 .../class_doc/population.html                 |   0
 .../class_doc/popup_msg.html                  |   0
 .../class_doc/pre_requisite.html              |   0
 .../class_doc/recv_faction_point.html         |   0
 .../class_doc/recv_fame.html                  |   0
 .../class_doc/recv_item.html                  |   0
 .../class_doc/recv_money.html                 |   0
 .../world_editor_files/class_doc/recv_xp.html |   0
 .../rite_nomenclature_guidelines.html         |   0
 .../class_doc/script_guidelines.html          |   0
 .../world_editor_files/class_doc/sell.html    |   0
 .../class_doc/set_constrains.html             |   0
 .../world_editor_files/class_doc/skill.html   |   0
 .../class_doc/spawn_mission.html              |   0
 .../world_editor_files/class_doc/step.html    |   0
 .../class_doc/step_any.html                   |   0
 .../class_doc/step_dyn_chat.html              |   0
 .../class_doc/step_failure.html               |   0
 .../world_editor_files/class_doc/step_if.html |   0
 .../class_doc/step_ooo.html                   |   0
 .../class_doc/system_msg.html                 |   0
 .../world_editor_files/class_doc/talk_to.html |   0
 .../world_editor_files/class_doc/target.html  |   0
 .../class_doc/teleport.html                   |   0
 .../class_doc/teleport_destination.html       |   0
 .../class_doc/teleport_spawn_zone.html        |   0
 .../class_doc/teleport_trigger.html           |   0
 .../class_doc/text_guidelines.html            |   0
 .../class_doc/user_model.html                 |   0
 .../class_doc/var_creature.html               |   0
 .../class_doc/var_faction.html                |   0
 .../class_doc/var_group.html                  |   0
 .../class_doc/var_item.html                   |   0
 .../world_editor_files/class_doc/var_npc.html |   0
 .../class_doc/var_place.html                  |   0
 .../class_doc/var_quality.html                |   0
 .../class_doc/var_quantity.html               |   0
 .../class_doc/var_text.html                   |   0
 .../world_editor_files/class_doc/visit.html   |   0
 .../world_editor_files/continents/fyros.html  |   0
 .../world_editor_files/continents/matis.html  |   0
 .../world_editor_files/continents/nexus.html  |   0
 .../continents/prime_root.html                |   0
 .../world_editor_files/continents/tryker.html |   0
 .../world_editor_files/continents/zorai.html  |   0
 .../world_editor_files/families/bandit.html   |   0
 .../world_editor_files/families/civil.html    |   0
 .../world_editor_files/families/degen.html    |   0
 .../world_editor_files/families/fauna.html    |   0
 .../families/fauna_carnivore.html             |   0
 .../families/fauna_herbivore.html             |   0
 .../world_editor_files/families/flora.html    |   0
 .../world_editor_files/families/goo.html      |   0
 .../world_editor_files/families/kami.html     |   0
 .../world_editor_files/families/karavan.html  |   0
 .../world_editor_files/families/kitin.html    |   0
 .../families/kitin_invasion.html              |   0
 .../world_editor_files/families/mp.html       |   0
 .../families/tribe_ancient_dryads.html        |   0
 .../families/tribe_antikamis.html             |   0
 .../families/tribe_barkers.html               |   0
 .../families/tribe_beachcombers.html          |   0
 .../families/tribe_black_circle.html          |   0
 .../families/tribe_cholorogoos.html           |   0
 .../families/tribe_cockroaches.html           |   0
 .../tribe_company_of_the_eternal_tree.html    |   0
 .../families/tribe_corsair.html               |   0
 .../families/tribe_cute.html                  |   0
 .../families/tribe_darkening_sap.html         |   0
 .../families/tribe_dune_riders.html           |   0
 .../families/tribe_ecowarriors.html           |   0
 .../families/tribe_firebrands.html            |   0
 .../families/tribe_first_deserter.html        |   0
 .../families/tribe_frahar.html                |   0
 .../families/tribe_frahar_hunters.html        |   0
 .../families/tribe_gibbay.html                |   0
 .../families/tribe_goo_heads.html             |   0
 .../families/tribe_green_seed.html            |   0
 .../tribe_hamazans_of_the_dead_seed.html      |   0
 .../families/tribe_icon_workshipers.html      |   0
 .../families/tribe_keepers.html               |   0
 .../families/tribe_kitin_gatheres.html        |   0
 .../families/tribe_lagoon_brothers.html       |   0
 .../families/tribe_lawless.html               |   0
 .../families/tribe_leviers.html               |   0
 .../families/tribe_master_of_the_goo.html     |   0
 .../tribe_matisian_border_guards.html         |   0
 .../families/tribe_night_turners.html         |   0
 .../families/tribe_oasis_diggers.html         |   0
 .../families/tribe_pyromancers.html           |   0
 .../families/tribe_recoverers.html            |   0
 .../families/tribe_renegades.html             |   0
 .../families/tribe_restorers.html             |   0
 .../families/tribe_root_tappers.html          |   0
 .../families/tribe_sacred_sap.html            |   0
 .../families/tribe_sap_gleaners.html          |   0
 .../families/tribe_sap_slaves.html            |   0
 .../families/tribe_scorchers.html             |   0
 .../families/tribe_shadow_runners.html        |   0
 .../families/tribe_siblings_of_the_weeds.html |   0
 .../families/tribe_silt_sculptors.html        |   0
 .../families/tribe_slavers.html               |   0
 .../families/tribe_smuglers.html              |   0
 .../families/tribe_the_arid_matis.html        |   0
 .../families/tribe_the_kuilde.html            |   0
 .../families/tribe_the_slash_and_burn.html    |   0
 .../families/tribe_tutors.html                |   0
 .../families/tribe_water_breakers.html        |   0
 .../families/tribe_woven_bridles.html         |   0
 .../activity_food_carn.zone                   |   0
 .../activity_food_cute_invasion.zone          |   0
 .../activity_food_degen.zone                  |   0
 .../activity_food_frahar_invasion.zone        |   0
 .../activity_food_gibbai_invasion.zone        |   0
 .../activity_food_goo_invasion.zone           |   0
 .../activity_food_herb.zone                   |   0
 .../activity_food_kitin.zone                  |   0
 .../activity_food_kitin_invasion.zone         |   0
 .../fauna_zone_properties/activity_plant.zone |   0
 .../activity_rest_carn.zone                   |   0
 .../activity_rest_cute_invasion.zone          |   0
 .../activity_rest_degen.zone                  |   0
 .../activity_rest_frahar_invasion.zone        |   0
 .../activity_rest_gibbai_invasion.zone        |   0
 .../activity_rest_goo_invasion.zone           |   0
 .../activity_rest_herb.zone                   |   0
 .../activity_rest_kitin.zone                  |   0
 .../activity_rest_kitin_invasion.zone         |   0
 .../fauna_zone_properties/activity_spawn.zone |   0
 .../npc/action_type/begin_state.html          |   0
 .../npc/action_type/code.html                 |   0
 .../npc/action_type/condition_if.html         |   0
 .../npc/action_type/condition_if_else.html    |   0
 .../npc/action_type/despawn.html              |   0
 .../npc/action_type/doxygen.css               |   0
 .../npc/action_type/emot.html                 |   0
 .../npc/action_type/modify_variable.html      |   0
 .../npc/action_type/multi_actions.html        |   0
 .../npc/action_type/null_action.html          |   0
 .../npc/action_type/outpost_giver_ready.html  |   0
 .../npc/action_type/punctual_state.html       |   0
 .../npc/action_type/punctual_state_end.html   |   0
 .../npc/action_type/random_select.html        |   0
 .../npc/action_type/random_select_state.html  |   0
 .../npc/action_type/say.html                  |   0
 .../npc/action_type/send_message.html         |   0
 .../npc/action_type/set_fauna_activity.html   |   0
 .../action_type/set_flags_on_dyn_zones.html   |   0
 .../npc/action_type/set_state_timeout.html    |   0
 .../npc/action_type/set_timer_t0.html         |   0
 .../npc/action_type/set_timer_t1.html         |   0
 .../npc/action_type/set_timer_t2.html         |   0
 .../npc/action_type/set_timer_t3.html         |   0
 .../npc/action_type/sit_down.html             |   0
 .../npc/action_type/spawn.html                |   0
 .../npc/action_type/stand_up.html             |   0
 .../npc/action_type/trigger_event_0.html      |   0
 .../npc/action_type/trigger_event_1.html      |   0
 .../npc/action_type/trigger_event_2.html      |   0
 .../npc/action_type/trigger_event_3.html      |   0
 .../npc/action_type/trigger_event_4.html      |   0
 .../npc/action_type/trigger_event_5.html      |   0
 .../npc/action_type/trigger_event_6.html      |   0
 .../npc/action_type/trigger_event_7.html      |   0
 .../npc/action_type/trigger_event_8.html      |   0
 .../npc/action_type/trigger_event_9.html      |   0
 .../npc/ai_activity/bandit.html               |   0
 .../npc/ai_activity/escorted.html             |   0
 .../npc/ai_activity/guard.html                |   0
 .../npc/ai_activity/guard_escorted.html       |   0
 .../npc/ai_activity/no_change.html            |   0
 .../npc/ai_activity/normal.html               |   0
 .../npc/ai_movement/follow_route.html         |   0
 .../npc/ai_movement/idle.html                 |   0
 .../npc/ai_movement/stand_on_start_point.html |   0
 .../npc/ai_movement/stand_on_vertices.html    |   0
 .../npc/ai_movement/wait.html                 |   0
 .../npc/ai_movement/wander.html               |   0
 .../npc/ai_profile/follow_leader.html         |   0
 .../npc/ai_profile/follow_route_escorted.html |   0
 .../ai_profile/follow_route_with_team.html    |   0
 .../npc/ai_profile/guard_place.html           |   0
 .../npc/ai_profile/guard_team.html            |   0
 .../npc/ai_profile/unspawned.html             |   0
 .../all_pets_arrived_from_stable.html         |   0
 .../event_type/all_pets_gone_to_stable.html   |   0
 .../npc/event_type/all_team_npcs_present.html |   0
 .../event_type/all_team_players_present.html  |   0
 .../npc/event_type/bot_begin_fight.html       |   0
 .../npc/event_type/bot_killed.html            |   0
 .../npc/event_type/bot_target_killed.html     |   0
 .../npc/event_type/destination_reached.html   |   0
 .../event_type/destination_reached_all.html   |   0
 .../event_type/destination_reached_first.html |   0
 .../npc/event_type/egs_up.html                |   0
 .../npc/event_type/end_of_state.html          |   0
 .../npc/event_type/escort_away.html           |   0
 .../npc/event_type/escort_back.html           |   0
 .../npc/event_type/group_attack_end.html      |   0
 .../npc/event_type/group_despawned.html       |   0
 .../npc/event_type/group_eliminated.html      |   0
 .../npc/event_type/group_under_attack.html    |   0
 .../event_type/other_team_enters_view.html    |   0
 .../npc/event_type/other_team_meets_team.html |   0
 .../event_type/outpost_attacker_changed.html  |   0
 .../outpost_guild_ownership_begin.html        |   0
 .../outpost_guild_ownership_end.html          |   0
 .../npc/event_type/outpost_owner_changed.html |   0
 .../event_type/outpost_peace_state_begin.html |   0
 .../event_type/outpost_peace_state_end.html   |   0
 .../npc/event_type/outpost_state_changed.html |   0
 .../outpost_tribe_ownership_begin.html        |   0
 .../outpost_tribe_ownership_end.html          |   0
 .../npc/event_type/player_follow_npc.html     |   0
 .../npc/event_type/player_request_pause.html  |   0
 .../event_type/player_request_pause_end.html  |   0
 .../npc/event_type/player_target_npc.html     |   0
 .../event_type/punctual_state_timeout.html    |   0
 .../npc/event_type/route_blocked.html         |   0
 .../npc/event_type/route_blocked_end.html     |   0
 .../event_type/set_flags_on_dyn_zones.html    |   0
 .../npc/event_type/start_of_state.html        |   0
 .../npc/event_type/state_timeout.html         |   0
 .../npc/event_type/team_attacked.html         |   0
 .../npc/event_type/team_attacked_end.html     |   0
 .../npc/event_type/team_member_LD.html        |   0
 .../event_type/team_member_badly_hurt.html    |   0
 .../npc/event_type/team_member_killed.html    |   0
 .../npc/event_type/team_member_logout.html    |   0
 .../npc/event_type/team_pack_animal_hurt.html |   0
 .../event_type/team_pack_animal_killed.html   |   0
 .../npc/event_type/timer_t0_triggered.html    |   0
 .../npc/event_type/timer_t1_triggered.html    |   0
 .../npc/event_type/timer_t2_triggered.html    |   0
 .../npc/event_type/timer_t3_triggered.html    |   0
 .../npc/event_type/user_event_0.html          |   0
 .../npc/event_type/user_event_1.html          |   0
 .../npc/event_type/user_event_2.html          |   0
 .../npc/event_type/user_event_3.html          |   0
 .../npc/event_type/user_event_4.html          |   0
 .../npc/event_type/user_event_5.html          |   0
 .../npc/event_type/user_event_6.html          |   0
 .../npc/event_type/user_event_7.html          |   0
 .../npc/event_type/user_event_8.html          |   0
 .../npc/event_type/user_event_9.html          |   0
 .../npc/event_type/variable_changed.html      |   0
 .../npc_zone_properties/activity_ambush.zone  |   0
 .../npc_zone_properties/activity_harvest.zone |   0
 .../activity_kami_wander.zone                 |   0
 .../npc_zone_properties/activity_outpost.zone |   0
 .../activity_outpost_attack.zone              |   0
 .../activity_outpost_def.zone                 |   0
 .../npc_zone_properties/activity_rest.zone    |   0
 .../npc_zone_properties/activity_spawn.zone   |   0
 .../world_editor_classes.xml                  |   0
 .../world_editor_primitive_configuration.xml  |   0
 .../ryzom => ryzom}/common/src/CMakeLists.txt |   0
 .../common/src/game_share/CMakeLists.txt      |   0
 ..._backup_service_interface_implementation.h |   0
 .../_backup_service_interface_non_module.cpp  |   0
 .../_backup_service_interface_singleton.cpp   |   0
 .../_backup_service_interface_singleton.h     |   0
 .../common/src/game_share/action.cpp          |   0
 .../common/src/game_share/action.h            |   0
 .../src/game_share/action_association.h       |   0
 .../common/src/game_share/action_block.cpp    |   0
 .../common/src/game_share/action_block.h      |   0
 .../src/game_share/action_disconnection.h     |   0
 .../common/src/game_share/action_dummy.h      |   0
 .../common/src/game_share/action_factory.cpp  |   0
 .../common/src/game_share/action_factory.h    |   0
 .../common/src/game_share/action_generic.cpp  |   0
 .../common/src/game_share/action_generic.h    |   0
 .../game_share/action_generic_multi_part.h    |   0
 .../common/src/game_share/action_login.h      |   0
 .../common/src/game_share/action_nature.cpp   |   0
 .../common/src/game_share/action_nature.h     |   0
 .../common/src/game_share/action_position.cpp |   0
 .../common/src/game_share/action_position.h   |   0
 .../common/src/game_share/action_sint64.cpp   |   0
 .../common/src/game_share/action_sint64.h     |   0
 .../common/src/game_share/action_sync.cpp     |   0
 .../common/src/game_share/action_sync.h       |   0
 .../src/game_share/action_target_slot.h       |   0
 .../common/src/game_share/ai_wrapper.h        |   0
 .../common/src/game_share/animal_status.cpp   |   0
 .../common/src/game_share/animal_status.h     |   0
 .../common/src/game_share/animal_type.h       |   0
 .../common/src/game_share/animals_orders.cpp  |   0
 .../common/src/game_share/animals_orders.h    |   0
 .../common/src/game_share/armor_types.cpp     |   0
 .../common/src/game_share/armor_types.h       |   0
 .../game_share/backup_service_interface.cpp   |   0
 .../src/game_share/backup_service_interface.h |   0
 .../src/game_share/backup_service_messages.h  |   0
 .../common/src/game_share/base_types.h        |   0
 .../src/game_share/bg_downloader_msg.cpp      |   0
 .../common/src/game_share/bg_downloader_msg.h |   0
 .../common/src/game_share/bmp4image.h         |   0
 .../common/src/game_share/bnp_patch.cpp       |   0
 .../common/src/game_share/bnp_patch.h         |   0
 .../common/src/game_share/body.cpp            |   0
 .../common/src/game_share/body.h              |   0
 .../common/src/game_share/bot_chat_types.cpp  |   0
 .../common/src/game_share/bot_chat_types.h    |   0
 .../common/src/game_share/brick_families.cpp  |   0
 .../common/src/game_share/brick_families.h    |   0
 .../common/src/game_share/brick_flags.cpp     |   0
 .../common/src/game_share/brick_flags.h       |   0
 .../common/src/game_share/brick_types.cpp     |   0
 .../common/src/game_share/brick_types.h       |   0
 .../common/src/game_share/callback_adaptor.h  |   0
 .../src/game_share/change_tracker_base.cpp    |   0
 .../src/game_share/change_tracker_base.h      |   0
 .../src/game_share/change_tracker_client.cpp  |   0
 .../src/game_share/change_tracker_client.h    |   0
 .../common/src/game_share/characs_build.cpp   |   0
 .../common/src/game_share/characs_build.h     |   0
 .../src/game_share/character_summary.cpp      |   0
 .../common/src/game_share/character_summary.h |   0
 .../src/game_share/character_sync_itf.cpp     |   0
 .../src/game_share/character_sync_itf.h       |   0
 .../src/game_share/character_sync_itf.xml     |   0
 .../common/src/game_share/character_title.cpp |   0
 .../common/src/game_share/character_title.h   |   0
 .../common/src/game_share/characteristics.cpp |   0
 .../common/src/game_share/characteristics.h   |   0
 .../common/src/game_share/chat_group.cpp      |   0
 .../common/src/game_share/chat_group.h        |   0
 .../src/game_share/client_action_type.cpp     |   0
 .../src/game_share/client_action_type.h       |   0
 .../src/game_share/combat_flying_text.h       |   0
 .../common/src/game_share/constants.h         |   0
 .../common/src/game_share/continent.cpp       |   0
 .../common/src/game_share/continent.h         |   0
 .../src/game_share/continuous_action.cpp      |   0
 .../common/src/game_share/continuous_action.h |   0
 .../src/game_share/crafting_tool_type.cpp     |   0
 .../src/game_share/crafting_tool_type.h       |   0
 .../common/src/game_share/crypt.cpp           |   0
 .../common/src/game_share/crypt.h             |   0
 .../common/src/game_share/crypt_sha512.cpp    |   0
 .../common/src/game_share/cst_loader.cpp      |   0
 .../common/src/game_share/cst_loader.h        |   0
 .../common/src/game_share/damage_types.cpp    |   0
 .../common/src/game_share/damage_types.h      |   0
 .../common/src/game_share/data_set_base.cpp   |   0
 .../common/src/game_share/data_set_base.h     |   0
 .../game_share/deployment_configuration.cpp   |   0
 .../src/game_share/deployment_configuration.h |   0
 .../common/src/game_share/dir_light_setup.cpp |   0
 .../common/src/game_share/dir_light_setup.h   |   0
 .../common/src/game_share/dms.cpp             |   0
 .../common/src/game_share/dms.h               |   0
 .../common/src/game_share/dyn_chat.cpp        |   0
 .../common/src/game_share/dyn_chat.h          |   0
 .../common/src/game_share/ecosystem.cpp       |   0
 .../common/src/game_share/ecosystem.h         |   0
 .../common/src/game_share/effect_families.cpp |   0
 .../common/src/game_share/effect_families.h   |   0
 .../src/game_share/emote_list_parser.cpp      |   0
 .../common/src/game_share/emote_list_parser.h |   0
 .../common/src/game_share/entity_types.h      |   0
 .../common/src/game_share/enum_generator.lua  |   0
 .../enum_generator_template_cpp.lua           |   0
 .../game_share/enum_generator_template_h.lua  |   0
 .../common/src/game_share/enum_template.cpp   |   0
 .../common/src/game_share/enum_template.h     |   0
 .../common/src/game_share/enum_template.txt   |   0
 .../common/src/game_share/fame.cpp            |   0
 .../common/src/game_share/fame.h              |   0
 .../common/src/game_share/far_position.cpp    |   0
 .../common/src/game_share/far_position.h      |   0
 .../game_share/file_description_container.cpp |   0
 .../game_share/file_description_container.h   |   0
 .../common/src/game_share/fog_map_build.cpp   |   0
 .../common/src/game_share/fog_map_build.h     |   0
 .../common/src/game_share/fog_of_war.cpp      |   0
 .../common/src/game_share/fog_of_war.h        |   0
 .../common/src/game_share/fog_type.h          |   0
 .../common/src/game_share/gender.h            |   0
 .../src/game_share/generate_client_db.xslt    |   0
 .../common/src/game_share/generate_logs.tmpl  |   0
 .../game_share/generate_module_interface.xslt |   0
 .../generate_module_interface_doc.txt         |   0
 .../src/game_share/generic_xml_msg_mngr.cpp   |   0
 .../src/game_share/generic_xml_msg_mngr.h     |   0
 .../common/src/game_share/georges_helper.cpp  |   0
 .../common/src/game_share/georges_helper.h    |   0
 .../common/src/game_share/guild_grade.cpp     |   0
 .../common/src/game_share/guild_grade.h       |   0
 .../src/game_share/guild_grade_inline.h       |   0
 .../common/src/game_share/hit_type.h          |   0
 .../common/src/game_share/http_client.cpp     |   0
 .../common/src/game_share/http_client.h       |   0
 .../common/src/game_share/intensity_types.cpp |   0
 .../common/src/game_share/intensity_types.h   |   0
 .../common/src/game_share/interface_flags.cpp |   0
 .../common/src/game_share/interface_flags.h   |   0
 .../common/src/game_share/inventories.cpp     |   0
 .../common/src/game_share/inventories.h       |   0
 .../common/src/game_share/ios_interface.h     |   0
 .../common/src/game_share/item_family.cpp     |   0
 .../common/src/game_share/item_family.h       |   0
 .../common/src/game_share/item_infos.cpp      |   0
 .../common/src/game_share/item_infos.h        |   0
 .../common/src/game_share/item_origin.cpp     |   0
 .../common/src/game_share/item_origin.h       |   0
 .../src/game_share/item_special_effect.cpp    |   0
 .../src/game_share/item_special_effect.h      |   0
 .../src/game_share/item_special_effect.lua    |   0
 .../common/src/game_share/item_type.cpp       |   0
 .../common/src/game_share/item_type.h         |   0
 .../common/src/game_share/lift_icons.cpp      |   0
 .../common/src/game_share/lift_icons.h        |   0
 .../common/src/game_share/light_cycle.cpp     |   0
 .../common/src/game_share/light_cycle.h       |   0
 .../common/src/game_share/login_registry.cpp  |   0
 .../common/src/game_share/login_registry.h    |   0
 .../src/game_share/loot_harvest_state.cpp     |   0
 .../src/game_share/loot_harvest_state.h       |   0
 .../common/src/game_share/magic_fx.cpp        |   0
 .../common/src/game_share/magic_fx.h          |   0
 .../common/src/game_share/mainland_summary.h  |   0
 .../src/game_share/memorization_set_types.cpp |   0
 .../src/game_share/memorization_set_types.h   |   0
 .../common/src/game_share/mirror.cpp          |   0
 .../common/src/game_share/mirror.h            |   0
 .../common/src/game_share/mirror_misc_types.h |   0
 .../src/game_share/mirror_prop_value.cpp      |   0
 .../common/src/game_share/mirror_prop_value.h |   0
 .../src/game_share/mirror_prop_value_inline.h |   0
 .../src/game_share/mirrored_data_set.cpp      |   0
 .../common/src/game_share/mirrored_data_set.h |   0
 .../src/game_share/mirrored_data_set_inline.h |   0
 .../src/game_share/mirrored_data_set_types.h  |   0
 .../common/src/game_share/misc_const.h        |   0
 .../common/src/game_share/mission_desc.cpp    |   0
 .../common/src/game_share/mission_desc.h      |   0
 .../src/game_share/mode_and_behaviour.cpp     |   0
 .../src/game_share/mode_and_behaviour.h       |   0
 .../common/src/game_share/module_security.h   |   0
 .../common/src/game_share/mount_people.cpp    |   0
 .../common/src/game_share/mount_people.h      |   0
 .../common/src/game_share/mp_category.cpp     |   0
 .../common/src/game_share/mp_category.h       |   0
 .../common/src/game_share/msg_ais_egs_gen.h   |   0
 .../common/src/game_share/msg_ais_egs_gen.xml |   0
 .../common/src/game_share/msg_client_server.h |   0
 .../common/src/game_share/msg_encyclopedia.h  |   0
 .../common/src/game_share/multi_target.cpp    |   0
 .../common/src/game_share/multi_target.h      |   0
 .../common/src/game_share/object.cpp          |   0
 .../common/src/game_share/object.h            |   0
 .../common/src/game_share/outpost.cpp         |   0
 .../common/src/game_share/outpost.h           |   0
 .../common/src/game_share/pact.cpp            |   0
 .../common/src/game_share/pact.h              |   0
 .../common/src/game_share/people.cpp          |   0
 .../common/src/game_share/people.h            |   0
 .../common/src/game_share/people_pd.cpp       |   0
 .../common/src/game_share/people_pd.h         |   0
 .../common/src/game_share/people_pd_inline.h  |   0
 .../game_share/permanent_ban_magic_number.h   |   0
 .../common/src/game_share/persistent_data.cpp |   0
 .../common/src/game_share/persistent_data.h   |   0
 .../src/game_share/persistent_data_inline.h   |   0
 .../src/game_share/persistent_data_template.h |   0
 .../src/game_share/persistent_data_tree.cpp   |   0
 .../src/game_share/persistent_data_tree.h     |   0
 .../src/game_share/player_vision_delta.h      |   0
 .../game_share/player_visual_properties.cpp   |   0
 .../src/game_share/player_visual_properties.h |   0
 .../common/src/game_share/power_types.cpp     |   0
 .../common/src/game_share/power_types.h       |   0
 .../common/src/game_share/prerequisit_infos.h |   0
 .../common/src/game_share/properties.h        |   0
 .../src/game_share/property_allocator.cpp     |   0
 .../src/game_share/property_allocator.h       |   0
 .../game_share/property_allocator_client.cpp  |   0
 .../game_share/property_allocator_client.h    |   0
 .../common/src/game_share/protection_type.cpp |   0
 .../common/src/game_share/protection_type.h   |   0
 .../common/src/game_share/pvp_clan.cpp        |   0
 .../common/src/game_share/pvp_clan.h          |   0
 .../common/src/game_share/pvp_mode.cpp        |   0
 .../common/src/game_share/pvp_mode.h          |   0
 .../common/src/game_share/r2_basic_types.h    |   0
 .../common/src/game_share/r2_ligo_config.cpp  |   0
 .../common/src/game_share/r2_ligo_config.h    |   0
 .../common/src/game_share/r2_messages.h       |   0
 .../common/src/game_share/r2_modules_itf.cpp  |   0
 .../common/src/game_share/r2_modules_itf.h    |   0
 .../common/src/game_share/r2_modules_itf.xml  |   0
 .../common/src/game_share/r2_share_itf.cpp    |   0
 .../common/src/game_share/r2_share_itf.h      |   0
 .../common/src/game_share/r2_share_itf.xml    |   0
 .../common/src/game_share/r2_types.h          |   0
 .../src/game_share/range_weapon_type.cpp      |   0
 .../common/src/game_share/range_weapon_type.h |   0
 .../common/src/game_share/resistance_type.cpp |   0
 .../common/src/game_share/resistance_type.h   |   0
 .../common/src/game_share/ring_access.cpp     |   0
 .../common/src/game_share/ring_access.h       |   0
 .../game_share/ring_session_manager_itf.cpp   |   0
 .../src/game_share/ring_session_manager_itf.h |   0
 .../game_share/ring_session_manager_itf.php   |   0
 .../game_share/ring_session_manager_itf.xml   |   0
 .../common/src/game_share/rm_family.cpp       |   0
 .../common/src/game_share/rm_family.h         |   0
 .../src/game_share/rolemaster_flags.cpp       |   0
 .../common/src/game_share/rolemaster_flags.h  |   0
 .../common/src/game_share/roles.cpp           |   0
 .../common/src/game_share/roles.h             |   0
 .../src/game_share/ryzom_database_banks.cpp   |   0
 .../src/game_share/ryzom_database_banks.h     |   0
 .../common/src/game_share/ryzom_entity_id.cpp |   0
 .../common/src/game_share/ryzom_entity_id.h   |   0
 .../game_share/ryzom_mirror_properties.cpp    |   0
 .../src/game_share/ryzom_mirror_properties.h  |   0
 .../common/src/game_share/ryzom_version.h     |   0
 .../common/src/game_share/sabrina_com.cpp     |   0
 .../common/src/game_share/sabrina_com.h       |   0
 .../common/src/game_share/sadge_tests.h       |   0
 .../common/src/game_share/scenario.cpp        |   0
 .../common/src/game_share/scenario.h          |   0
 .../src/game_share/scenario_entry_points.cpp  |   0
 .../src/game_share/scenario_entry_points.h    |   0
 .../common/src/game_share/scores.cpp          |   0
 .../common/src/game_share/scores.h            |   0
 .../common/src/game_share/season.cpp          |   0
 .../common/src/game_share/season.h            |   0
 .../common/src/game_share/season_file_ext.h   |   0
 .../common/src/game_share/season_inline.h     |   0
 .../common/src/game_share/security_check.cpp  |   0
 .../common/src/game_share/security_check.h    |   0
 .../common/src/game_share/seeds.cpp           |   0
 .../common/src/game_share/seeds.h             |   0
 .../common/src/game_share/send_chat.cpp       |   0
 .../common/src/game_share/send_chat.h         |   0
 .../src/game_share/sentence_appraisal.cpp     |   0
 .../src/game_share/sentence_appraisal.h       |   0
 .../src/game_share/server_admin_module.cpp    |   0
 .../src/game_share/server_admin_module.h      |   0
 .../game_share/server_animation_module.cpp    |   0
 .../src/game_share/server_animation_module.h  |   0
 .../src/game_share/server_edition_module.cpp  |   0
 .../src/game_share/server_edition_module.h    |   0
 .../common/src/game_share/shard_names.cpp     |   0
 .../common/src/game_share/shard_names.h       |   0
 .../common/src/game_share/shield_types.cpp    |   0
 .../common/src/game_share/shield_types.h      |   0
 .../common/src/game_share/simlag.cpp          |   0
 .../common/src/game_share/simlag.h            |   0
 .../src/game_share/singleton_registry.h       |   0
 .../common/src/game_share/skills.cpp          |   0
 .../common/src/game_share/skills.h            |   0
 .../common/src/game_share/skills_build.cpp    |   0
 .../common/src/game_share/skills_build.h      |   0
 .../common/src/game_share/slot_equipment.cpp  |   0
 .../common/src/game_share/slot_equipment.h    |   0
 .../common/src/game_share/slot_types.cpp      |   0
 .../common/src/game_share/slot_types.h        |   0
 .../src/game_share/small_string_manager.cpp   |   0
 .../src/game_share/small_string_manager.h     |   0
 .../common/src/game_share/sp_type.cpp         |   0
 .../common/src/game_share/sp_type.h           |   0
 .../common/src/game_share/sp_type_inline.h    |   0
 .../common/src/game_share/sphrase_com.cpp     |   0
 .../common/src/game_share/sphrase_com.h       |   0
 .../common/src/game_share/starting_point.cpp  |   0
 .../common/src/game_share/starting_point.h    |   0
 .../common/src/game_share/stdpch.cpp          |   0
 .../common/src/game_share/stdpch.h            |   0
 .../src/game_share/string_manager_sender.cpp  |   0
 .../src/game_share/string_manager_sender.h    |   0
 .../src/game_share/string_mgr_module.cpp      |   0
 .../common/src/game_share/string_mgr_module.h |   0
 .../src/game_share/synchronised_message.h     |   0
 .../common/src/game_share/system_message.h    |   0
 .../common/src/game_share/task_list.h         |   0
 .../common/src/game_share/teleport_types.cpp  |   0
 .../common/src/game_share/teleport_types.h    |   0
 .../src/game_share/temp_inventory_mode.cpp    |   0
 .../src/game_share/temp_inventory_mode.h      |   0
 .../src/game_share/tick_event_handler.cpp     |   0
 .../src/game_share/tick_event_handler.h       |   0
 .../src/game_share/tick_proxy_time_measure.h  |   0
 .../static_light_cycle.cpp                    |   0
 .../time_weather_season/static_light_cycle.h  |   0
 .../time_weather_season/time_and_season.cpp   |   0
 .../time_weather_season/time_and_season.h     |   0
 .../time_date_season_manager.cpp              |   0
 .../time_date_season_manager.h                |   0
 .../time_weather_season/weather_function.cpp  |   0
 .../time_weather_season/weather_function.h    |   0
 .../weather_function_params_sheet_base.cpp    |   0
 .../weather_function_params_sheet_base.h      |   0
 .../weather_function_sheet.cpp                |   0
 .../weather_function_sheet.h                  |   0
 .../time_weather_season/weather_manager.cpp   |   0
 .../time_weather_season/weather_manager.h     |   0
 .../time_weather_season/weather_predict.cpp   |   0
 .../time_weather_season/weather_predict.h     |   0
 .../time_weather_season/weather_setup.cpp     |   0
 .../time_weather_season/weather_setup.h       |   0
 .../weather_setup_sheet_base.cpp              |   0
 .../weather_setup_sheet_base.h                |   0
 .../common/src/game_share/timer.cpp           |   0
 .../common/src/game_share/timer.h             |   0
 .../common/src/game_share/trade_slot_type.h   |   0
 .../common/src/game_share/txt_command.h       |   0
 .../common/src/game_share/type_skill_mod.cpp  |   0
 .../common/src/game_share/type_skill_mod.h    |   0
 .../src/game_share/user_connection_mgr.h      |   0
 .../common/src/game_share/utils.cpp           |   0
 .../common/src/game_share/utils.h             |   0
 .../common/src/game_share/visual_fx.h         |   0
 .../src/game_share/visual_slot_manager.cpp    |   0
 .../src/game_share/visual_slot_manager.h      |   0
 .../common/src/game_share/weapon_types.cpp    |   0
 .../common/src/game_share/weapon_types.h      |   0
 .../src/game_share/welcome_service_itf.cpp    |   0
 .../src/game_share/welcome_service_itf.h      |   0
 .../common/src/game_share/zc_shard_common.cpp |   0
 .../common/src/game_share/zc_shard_common.h   |   0
 {code/ryzom => ryzom}/server/CMakeLists.txt   |   0
 .../egs/client_commands_privileges.txt        |   0
 .../server/data_shard/egs/shop_category.cfg   |   0
 .../data_shard/mirror_sheets/fame.dataset     |   0
 .../data_shard/mirror_sheets/fe_temp.dataset  |   0
 .../server/patchman_cfg/README.md             |   0
 .../patchman_cfg/admin_install/bin/admin      |   0
 .../admin_install/bin/admin.screen.rc         |   0
 .../admin_install/bin/ps_services             |   0
 .../admin_install/bin/run_forever             |   0
 .../bin/ryzom_domain_screen_wrapper.sh        |   0
 .../patchman_cfg/admin_install/bin/shard      |   0
 .../patchman_cfg/admin_install/bin/startup    |   0
 .../admin_install/bin/sync_rrd_graphs.sh      |   0
 .../admin_executor_service_default.mini01.cfg |   0
 .../admin_executor_service_default.std01.cfg  |   0
 .../admin_install/patchman/dont_keep_cores    |   0
 .../admin_install/patchman/loop_aes.sh        |   0
 .../admin_install/patchman/loop_patchman.sh   |   0
 .../patchman/loop_patchman_once.sh            |   0
 .../patchman/loop_special_patchman.sh         |   0
 .../admin_install/patchman/make_next_live.sh  |   0
 .../admin_install/patchman/patchman_list      |   0
 .../patchman/patchman_service.default.cfg     |   0
 .../patchman/patchman_service.mini01.cfg      |   0
 .../patchman_service.mini01_bridge.cfg        |   0
 .../patchman/patchman_service.mini01_spm.cfg  |   0
 .../patchman/patchman_service.std01.cfg       |   0
 .../patchman/patchman_service.std01_spm.cfg   |   0
 .../patchman/patchman_service_base.cfg        |   0
 .../patchman/patchman_service_base_linux.cfg  |   0
 .../admin_install/patchman/screen.rc.default  |   0
 .../patchman/service_launcher.sh              |   0
 .../patchman/special_patchman_list            |   0
 .../admin_install/patchman_service_local.cfg  |   0
 .../server/patchman_cfg/cfg/00_base.cfg       |   0
 .../patchman_cfg/cfg/01_domain_mini01.cfg     |   0
 .../patchman_cfg/cfg/01_domain_std01.cfg      |   0
 .../cfg/02_shard_type_mini_mainland.cfg       |   0
 .../cfg/02_shard_type_mini_ring.cfg           |   0
 .../cfg/02_shard_type_mini_unifier.cfg        |   0
 .../cfg/02_shard_type_std_mainland.cfg        |   0
 .../cfg/02_shard_type_std_ring.cfg            |   0
 .../cfg/02_shard_type_std_unifier.cfg         |   0
 .../patchman_cfg/default/ai_service.cfg       |   0
 .../patchman_cfg/default/backup_service.cfg   |   0
 .../default/dynamic_scenario_service.cfg      |   0
 .../default/entities_game_service.cfg         |   0
 .../patchman_cfg/default/frontend_service.cfg |   0
 .../patchman_cfg/default/gpm_service.cfg      |   0
 .../default/input_output_service.cfg          |   0
 .../default/log_analyser_service.cfg          |   0
 .../patchman_cfg/default/logger_service.cfg   |   0
 .../default/mail_forum_service.cfg            |   0
 .../patchman_cfg/default/mirror_service.cfg   |   0
 .../patchman_cfg/default/naming_service.cfg   |   0
 .../server/patchman_cfg/default/ryzom_as.cfg  |   0
 .../default/shard_unifier_service.cfg         |   0
 .../patchman_cfg/default/tick_service.cfg     |   0
 .../patchman_cfg/default/welcome_service.cfg  |   0
 .../patchman_cfg/shard_ctrl_definitions.txt   |   0
 .../server/patchman_cfg/shard_ctrl_mini01.txt |   0
 .../server/patchman_cfg/shard_ctrl_std01.txt  |   0
 .../terminal_mini01/patchman_service.cfg      |   0
 .../terminal_mini01/server_park_database.txt  |   0
 .../terminal_mini01/terminal_mini01.bat       |   0
 .../terminal_std01/patchman_service.cfg       |   0
 .../terminal_std01/server_park_database.txt   |   0
 .../terminal_std01/terminal_std01.bat         |   0
 {code/ryzom => ryzom}/server/shard_start.bat  |   0
 .../server/shard_start_cmake.bat              |   0
 {code/ryzom => ryzom}/server/shard_stop.bat   |   0
 .../server/shard_stop_cmake.bat               |   0
 {code/ryzom => ryzom}/tools/CMakeLists.txt    |   0
 .../tools/assoc_mem/CMakeLists.txt            |   0
 .../tools/assoc_mem/att_tree.h                |   0
 .../tools/assoc_mem/attribute.cpp             |   0
 .../tools/assoc_mem/attribute.h               |   0
 .../ryzom => ryzom}/tools/assoc_mem/brain.cpp |   0
 {code/ryzom => ryzom}/tools/assoc_mem/brain.h |   0
 .../tools/assoc_mem/cond_node.cpp             |   0
 .../tools/assoc_mem/cond_node.h               |   0
 .../ryzom => ryzom}/tools/assoc_mem/field.cpp |   0
 {code/ryzom => ryzom}/tools/assoc_mem/field.h |   0
 .../ryzom => ryzom}/tools/assoc_mem/mode7.txt |   0
 .../ryzom => ryzom}/tools/assoc_mem/mood.cpp  |   0
 {code/ryzom => ryzom}/tools/assoc_mem/mood.h  |   0
 .../ryzom => ryzom}/tools/assoc_mem/node.cpp  |   0
 {code/ryzom => ryzom}/tools/assoc_mem/node.h  |   0
 .../tools/assoc_mem/record.cpp                |   0
 .../ryzom => ryzom}/tools/assoc_mem/record.h  |   0
 .../tools/assoc_mem/result_node.cpp           |   0
 .../tools/assoc_mem/result_node.h             |   0
 .../ryzom => ryzom}/tools/assoc_mem/test.cpp  |   0
 .../ryzom => ryzom}/tools/assoc_mem/tree.cpp  |   0
 {code/ryzom => ryzom}/tools/assoc_mem/tree.h  |   0
 .../tools/assoc_mem/val_nodes.h               |   0
 {code/ryzom => ryzom}/tools/assoc_mem/value.h |   0
 .../tools/client/CMakeLists.txt               |   0
 .../tools/client/client_config/StdAfx.cpp     |   0
 .../tools/client/client_config/StdAfx.h       |   0
 .../tools/client/client_config/bar.cpp        |   0
 .../tools/client/client_config/bar.h          |   0
 .../client/client_config/base_dialog.cpp      |   0
 .../tools/client/client_config/base_dialog.h  |   0
 .../tools/client/client_config/cfg_file.cpp   |   0
 .../tools/client/client_config/cfg_file.h     |   0
 .../client/client_config/client_config.cpp    |   0
 .../client/client_config/client_config.h      |   0
 .../client/client_config/client_config.rc     |   0
 .../client/client_config/client_configDlg.cpp |   0
 .../client/client_config/client_configDlg.h   |   0
 .../tools/client/client_config/database.cpp   |   0
 .../tools/client/client_config/database.h     |   0
 .../client_config/display_advanced_dlg.cpp    |   0
 .../client_config/display_advanced_dlg.h      |   0
 .../client_config/display_details_dlg.cpp     |   0
 .../client_config/display_details_dlg.h       |   0
 .../client/client_config/display_dlg.cpp      |   0
 .../tools/client/client_config/display_dlg.h  |   0
 .../display_information_d3d_dlg.cpp           |   0
 .../display_information_d3d_dlg.h             |   0
 .../display_information_gl_dlg.cpp            |   0
 .../display_information_gl_dlg.h              |   0
 .../client/client_config/general_dlg.cpp      |   0
 .../tools/client/client_config/general_dlg.h  |   0
 .../tools/client/client_config/preset_dlg.cpp |   0
 .../tools/client/client_config/preset_dlg.h   |   0
 .../client/client_config/res/card_icon.bmp    | Bin
 .../client_config/res/client_config.ico       | Bin
 .../client_config/res/client_config.rc2       |   0
 .../client_config/res/display_config_icon.bmp | Bin
 .../client/client_config/res/display_icon.bmp | Bin
 .../res/display_properties_icon.bmp           | Bin
 .../client/client_config/res/general_icon.bmp | Bin
 .../client_config/res/left_bitmap_0.bmp       | Bin
 .../client/client_config/res/network_icon.bmp | Bin
 .../client/client_config/res/sound_icon.bmp   | Bin
 .../client_config/res/splash_screen.bmp       | Bin
 .../client/client_config/res/top_right.bmp    | Bin
 .../client/client_config/res/update_icon.bmp  | Bin
 .../client/client_config/res/welcome_icon.bmp | Bin
 .../tools/client/client_config/resource.h     |   0
 .../tools/client/client_config/sound_dlg.cpp  |   0
 .../tools/client/client_config/sound_dlg.h    |   0
 .../client_config/system_information_dlg.cpp  |   0
 .../client_config/system_information_dlg.h    |   0
 .../client/client_config_qt/CMakeLists.txt    |   0
 .../client_config_qt/resources/card_icon.png  | Bin
 .../resources/client_config.ico               | Bin
 .../resources/client_config_qt.rc             |   0
 .../resources/display_config_icon.png         | Bin
 .../resources/display_icon.png                | Bin
 .../resources/display_properties_icon.png     | Bin
 .../resources/general_icon.png                | Bin
 .../resources/left_bitmap_0.png               | Bin
 .../resources/network_icon.png                | Bin
 .../client_config_qt/resources/resources.qrc  |   0
 .../client_config_qt/resources/sound_icon.png | Bin
 .../resources/splash_screen.png               | Bin
 .../client_config_qt/resources/top_right.png  | Bin
 .../resources/update_icon.png                 | Bin
 .../resources/welcome_icon.png                | Bin
 .../src/client_config_dialog.cpp              |   0
 .../src/client_config_dialog.h                |   0
 .../client/client_config_qt/src/config.cpp    |   0
 .../client/client_config_qt/src/config.h      |   0
 .../src/display_settings_advanced_widget.cpp  |   0
 .../src/display_settings_advanced_widget.h    |   0
 .../src/display_settings_details_widget.cpp   |   0
 .../src/display_settings_details_widget.h     |   0
 .../src/display_settings_widget.cpp           |   0
 .../src/display_settings_widget.h             |   0
 .../src/general_settings_widget.cpp           |   0
 .../src/general_settings_widget.h             |   0
 .../client/client_config_qt/src/main.cpp      |   0
 .../src/sound_settings_widget.cpp             |   0
 .../src/sound_settings_widget.h               |   0
 .../client/client_config_qt/src/stdpch.cpp    |   0
 .../client/client_config_qt/src/stdpch.h      |   0
 .../src/sys_info_d3d_widget.cpp               |   0
 .../src/sys_info_d3d_widget.h                 |   0
 .../src/sys_info_opengl_widget.cpp            |   0
 .../src/sys_info_opengl_widget.h              |   0
 .../client_config_qt/src/sys_info_widget.cpp  |   0
 .../client_config_qt/src/sys_info_widget.h    |   0
 .../client/client_config_qt/src/system.cpp    |   0
 .../client/client_config_qt/src/system.h      |   0
 .../client/client_config_qt/src/widget_base.h |   0
 .../translations/qtbase_de.ts                 |   0
 .../translations/qtbase_es.ts                 |   0
 .../translations/qtbase_fr.ts                 |   0
 .../translations/qtbase_ru.ts                 |   0
 .../translations/ryzom_configuration_de.ts    |   0
 .../translations/ryzom_configuration_es.ts    |   0
 .../translations/ryzom_configuration_fr.ts    |   0
 .../translations/ryzom_configuration_hu.ts    |   0
 .../translations/ryzom_configuration_ru.ts    |   0
 .../translations/translations.qrc             |   0
 .../ui/client_config_dialog.ui                |   0
 .../ui/display_settings_advanced_widget.ui    |   0
 .../ui/display_settings_details_widget.ui     |   0
 .../ui/display_settings_widget.ui             |   0
 .../ui/general_settings_widget.ui             |   0
 .../ui/sound_settings_widget.ui               |   0
 .../ui/sys_info_d3d_widget.ui                 |   0
 .../ui/sys_info_opengl_widget.ui              |   0
 .../client_config_qt/ui/sys_info_widget.ui    |   0
 .../tools/client/client_data_check/StdAfx.cpp |   0
 .../tools/client/client_data_check/StdAfx.h   |   0
 .../client_data_check/client_data_check.cpp   |   0
 .../client_data_check/client_data_check.h     |   0
 .../client_data_check/client_data_check.rc    |   0
 .../client_data_checkDlg.cpp                  |   0
 .../client_data_check/client_data_checkDlg.h  |   0
 .../client/client_data_check/data_scan.cpp    |   0
 .../client/client_data_check/data_scan.h      |   0
 .../res/client_data_check.ico                 | Bin
 .../res/client_data_check.rc2                 |   0
 .../tools/client/client_data_check/resource.h |   0
 .../client/client_patcher/CMakeLists.txt      |   0
 .../tools/client/client_patcher/main.cpp      |   0
 .../client/r2_islands_textures/CMakeLists.txt |   0
 .../client/r2_islands_textures/blue_pill.ico  | Bin
 .../tools/client/r2_islands_textures/main.cpp |   0
 .../tools/client/r2_islands_textures/main.rc  |   0
 .../screenshot_islands.cpp                    |   0
 .../r2_islands_textures/screenshot_islands.h  |   0
 .../client/ryzom_installer/CMakeLists.txt     |   0
 .../client/ryzom_installer/res/Info.plist     |   0
 .../tools/client/ryzom_installer/res/PkgInfo  |   0
 .../client/ryzom_installer/res/background.png | Bin
 .../client/ryzom_installer/res/resources.qrc  |   0
 .../client/ryzom_installer/res/resources.rc   |   0
 .../client/ryzom_installer/res/ryzom.icns     | Bin
 .../client/ryzom_installer/res/ryzom.ico      | Bin
 .../client/ryzom_installer/res/ryzom.png      | Bin
 .../ryzom_installer/res/ryzom_installer.ini   |   0
 .../client/ryzom_installer/res/shortcut.sh    |   0
 .../ryzom_installer/res/template.desktop      |   0
 .../client/ryzom_installer/src/configfile.cpp |   0
 .../client/ryzom_installer/src/configfile.h   |   0
 .../client/ryzom_installer/src/downloader.cpp |   0
 .../client/ryzom_installer/src/downloader.h   |   0
 .../ryzom_installer/src/filescleaner.cpp      |   0
 .../client/ryzom_installer/src/filescleaner.h |   0
 .../ryzom_installer/src/filescopier.cpp       |   0
 .../client/ryzom_installer/src/filescopier.h  |   0
 .../ryzom_installer/src/filesextractor.cpp    |   0
 .../ryzom_installer/src/filesextractor.h      |   0
 .../ryzom_installer/src/installdialog.cpp     |   0
 .../ryzom_installer/src/installdialog.h       |   0
 .../tools/client/ryzom_installer/src/main.cpp |   0
 .../client/ryzom_installer/src/mainwindow.cpp |   0
 .../client/ryzom_installer/src/mainwindow.h   |   0
 .../ryzom_installer/src/migratedialog.cpp     |   0
 .../ryzom_installer/src/migratedialog.h       |   0
 .../client/ryzom_installer/src/operation.cpp  |   0
 .../client/ryzom_installer/src/operation.h    |   0
 .../ryzom_installer/src/operationdialog.cpp   |   0
 .../ryzom_installer/src/operationdialog.h     |   0
 .../client/ryzom_installer/src/profile.cpp    |   0
 .../client/ryzom_installer/src/profile.h      |   0
 .../ryzom_installer/src/profilesdialog.cpp    |   0
 .../ryzom_installer/src/profilesdialog.h      |   0
 .../ryzom_installer/src/profilesmodel.cpp     |   0
 .../ryzom_installer/src/profilesmodel.h       |   0
 .../tools/client/ryzom_installer/src/qzip.cpp |   0
 .../client/ryzom_installer/src/qzipreader.h   |   0
 .../client/ryzom_installer/src/qzipwriter.h   |   0
 .../client/ryzom_installer/src/server.cpp     |   0
 .../tools/client/ryzom_installer/src/server.h |   0
 .../ryzom_installer/src/serversmodel.cpp      |   0
 .../client/ryzom_installer/src/serversmodel.h |   0
 .../ryzom_installer/src/settingsdialog.cpp    |   0
 .../ryzom_installer/src/settingsdialog.h      |   0
 .../client/ryzom_installer/src/stdpch.cpp     |   0
 .../tools/client/ryzom_installer/src/stdpch.h |   0
 .../ryzom_installer/src/uninstalldialog.cpp   |   0
 .../ryzom_installer/src/uninstalldialog.h     |   0
 .../client/ryzom_installer/src/utils.cpp      |   0
 .../tools/client/ryzom_installer/src/utils.h  |   0
 .../ryzom_installer/translations/qtbase_de.ts |   0
 .../ryzom_installer/translations/qtbase_es.ts |   0
 .../ryzom_installer/translations/qtbase_fr.ts |   0
 .../ryzom_installer/translations/qtbase_ru.ts |   0
 .../translations/ryzom_installer_de.ts        |   0
 .../translations/ryzom_installer_es.ts        |   0
 .../translations/ryzom_installer_fr.ts        |   0
 .../translations/ryzom_installer_ru.ts        |   0
 .../translations/translations.qrc             |   0
 .../ryzom_installer/ui/installdialog.ui       |   0
 .../client/ryzom_installer/ui/mainwindow.ui   |   0
 .../ryzom_installer/ui/migratedialog.ui       |   0
 .../ryzom_installer/ui/operationdialog.ui     |   0
 .../ryzom_installer/ui/profilesdialog.ui      |   0
 .../ryzom_installer/ui/settingsdialog.ui      |   0
 .../ryzom_installer/ui/uninstalldialog.ui     |   0
 .../tools/connection_stats/StdAfx.cpp         |   0
 .../tools/connection_stats/StdAfx.h           |   0
 .../connection_stats/connection_stats.cpp     |   0
 .../connection_stats/connection_stats.def     |   0
 .../tools/connection_stats/connection_stats.h |   0
 .../tools/leveldesign/CMakeLists.txt          |   0
 .../alias_synchronizer/CMakeLists.txt         |   0
 .../alias_synchronizer/alias_synchronizer.cfg |   0
 .../alias_synchronizer/alias_synchronizer.cpp |   0
 .../leveldesign/csv_transform/CMakeLists.txt  |   0
 .../csv_transform/csv_transform.cpp           |   0
 .../sadge_lib/include/text_input.h            |   0
 .../sadge_lib/include/text_output.h           |   0
 .../tools/leveldesign/csv_transform/test.scr  |   0
 .../tools/leveldesign/csv_transform/test1.scr |   0
 .../tools/leveldesign/csv_transform/test2.scr |   0
 .../tools/leveldesign/export/CMakeLists.txt   |   0
 .../tools/leveldesign/export/export.cpp       |   0
 .../tools/leveldesign/export/export.h         |   0
 .../tools/leveldesign/export/formFlora.cpp    |   0
 .../tools/leveldesign/export/formFlora.h      |   0
 .../tools/leveldesign/export/formPlant.cpp    |   0
 .../tools/leveldesign/export/formPlant.h      |   0
 .../tools/leveldesign/export/tools.cpp        |   0
 .../tools/leveldesign/export/tools.h          |   0
 .../leveldesign/georges_convert/common.h      |   0
 .../leveldesign/georges_convert/form.cpp      |   0
 .../tools/leveldesign/georges_convert/form.h  |   0
 .../georges_convert/form_body_elt.cpp         |   0
 .../georges_convert/form_body_elt.h           |   0
 .../georges_convert/form_body_elt_atom.cpp    |   0
 .../georges_convert/form_body_elt_atom.h      |   0
 .../georges_convert/form_body_elt_list.cpp    |   0
 .../georges_convert/form_body_elt_list.h      |   0
 .../georges_convert/form_body_elt_struct.cpp  |   0
 .../georges_convert/form_body_elt_struct.h    |   0
 .../leveldesign/georges_convert/form_file.cpp |   0
 .../leveldesign/georges_convert/form_file.h   |   0
 .../leveldesign/georges_convert/form_head.cpp |   0
 .../leveldesign/georges_convert/form_head.h   |   0
 .../georges_convert/form_loader.cpp           |   0
 .../leveldesign/georges_convert/form_loader.h |   0
 .../georges_convert/georges_convert.cpp       |   0
 .../georges_convert/georges_loader.cpp        |   0
 .../georges_convert/georges_loader.h          |   0
 .../leveldesign/georges_convert/item.cpp      |   0
 .../tools/leveldesign/georges_convert/item.h  |   0
 .../leveldesign/georges_convert/item_elt.cpp  |   0
 .../leveldesign/georges_convert/item_elt.h    |   0
 .../georges_convert/item_elt_atom.cpp         |   0
 .../georges_convert/item_elt_atom.h           |   0
 .../georges_convert/item_elt_list.cpp         |   0
 .../georges_convert/item_elt_list.h           |   0
 .../georges_convert/item_elt_struct.cpp       |   0
 .../georges_convert/item_elt_struct.h         |   0
 .../georges_convert/item_loader.cpp           |   0
 .../leveldesign/georges_convert/item_loader.h |   0
 .../leveldesign/georges_convert/mold_elt.cpp  |   0
 .../leveldesign/georges_convert/mold_elt.h    |   0
 .../georges_convert/mold_elt_define.cpp       |   0
 .../georges_convert/mold_elt_define.h         |   0
 .../georges_convert/mold_elt_define_list.cpp  |   0
 .../georges_convert/mold_elt_define_list.h    |   0
 .../georges_convert/mold_elt_type.cpp         |   0
 .../georges_convert/mold_elt_type.h           |   0
 .../georges_convert/mold_elt_type_list.cpp    |   0
 .../georges_convert/mold_elt_type_list.h      |   0
 .../georges_convert/mold_loader.cpp           |   0
 .../leveldesign/georges_convert/mold_loader.h |   0
 .../georges_convert/stdgeorgesconvert.cpp     |   0
 .../georges_convert/stdgeorgesconvert.h       |   0
 .../leveldesign/georges_convert/string_ex.cpp |   0
 .../leveldesign/georges_convert/string_ex.h   |   0
 .../leveldesign/georges_convert/type_unit.cpp |   0
 .../leveldesign/georges_convert/type_unit.h   |   0
 .../georges_convert/type_unit_double.cpp      |   0
 .../georges_convert/type_unit_double.h        |   0
 .../georges_convert/type_unit_file_name.cpp   |   0
 .../georges_convert/type_unit_file_name.h     |   0
 .../georges_convert/type_unit_int_signed.cpp  |   0
 .../georges_convert/type_unit_int_signed.h    |   0
 .../type_unit_int_unsigned.cpp                |   0
 .../georges_convert/type_unit_int_unsigned.h  |   0
 .../georges_convert/type_unit_string.cpp      |   0
 .../georges_convert/type_unit_string.h        |   0
 .../leveldesign/georges_dll/CMakeLists.txt    |   0
 .../tools/leveldesign/georges_dll/Resource.h  |   0
 .../tools/leveldesign/georges_dll/action.cpp  |   0
 .../tools/leveldesign/georges_dll/action.h    |   0
 .../leveldesign/georges_dll/base_dialog.cpp   |   0
 .../leveldesign/georges_dll/base_dialog.h     |   0
 .../leveldesign/georges_dll/child_frm.cpp     |   0
 .../tools/leveldesign/georges_dll/child_frm.h |   0
 .../leveldesign/georges_dll/color_wnd.cpp     |   0
 .../tools/leveldesign/georges_dll/color_wnd.h |   0
 .../georges_dll/cool_dialog_bar.cpp           |   0
 .../leveldesign/georges_dll/cool_dialog_bar.h |   0
 .../leveldesign/georges_dll/dfn_dialog.cpp    |   0
 .../leveldesign/georges_dll/dfn_dialog.h      |   0
 .../leveldesign/georges_dll/displayer.cpp     |   0
 .../tools/leveldesign/georges_dll/displayer.h |   0
 .../georges_dll/edit_list_ctrl.cpp            |   0
 .../leveldesign/georges_dll/edit_list_ctrl.h  |   0
 .../georges_dll/file_browser_dialog.cpp       |   0
 .../georges_dll/file_browser_dialog.h         |   0
 .../georges_dll/file_tree_view.cpp            |   0
 .../leveldesign/georges_dll/file_tree_view.h  |   0
 .../leveldesign/georges_dll/form_dialog.cpp   |   0
 .../leveldesign/georges_dll/form_dialog.h     |   0
 .../leveldesign/georges_dll/georges_debug.def |   0
 .../leveldesign/georges_dll/georges_dll_d.exp | Bin
 .../leveldesign/georges_dll/georges_dll_r.exp | Bin
 .../leveldesign/georges_dll/georges_edit.cpp  |   0
 .../leveldesign/georges_dll/georges_edit.h    |   0
 .../leveldesign/georges_dll/georges_edit.html |   0
 .../leveldesign/georges_dll/georges_edit.rc   |   0
 .../georges_dll/georges_edit_dll.def          |   0
 .../georges_dll/georges_edit_doc.cpp          |   0
 .../georges_dll/georges_edit_doc.h            |   0
 .../georges_dll/georges_edit_view.cpp         |   0
 .../georges_dll/georges_edit_view.h           |   0
 .../georges_dll/georges_implementation.cpp    |   0
 .../georges_dll/georges_interface.h           |   0
 .../georges_dll/georges_release.def           |   0
 .../leveldesign/georges_dll/header_dialog.cpp |   0
 .../leveldesign/georges_dll/header_dialog.h   |   0
 .../leveldesign/georges_dll/icon_wnd.cpp      |   0
 .../tools/leveldesign/georges_dll/icon_wnd.h  |   0
 .../leveldesign/georges_dll/imagelist_ex.cpp  |   0
 .../leveldesign/georges_dll/imagelist_ex.h    |   0
 .../leveldesign/georges_dll/left_view.cpp     |   0
 .../tools/leveldesign/georges_dll/left_view.h |   0
 .../leveldesign/georges_dll/main_frm.cpp      |   0
 .../tools/leveldesign/georges_dll/main_frm.h  |   0
 .../georges_dll/memory_combo_box.cpp          |   0
 .../georges_dll/memory_combo_box.h            |   0
 .../georges_dll/output_console_dlg.cpp        |   0
 .../georges_dll/output_console_dlg.h          |   0
 .../georges_dll/plugin_interface.h            |   0
 .../leveldesign/georges_dll/reg_shell_ext.cpp |   0
 .../leveldesign/georges_dll/reg_shell_ext.h   |   0
 .../leveldesign/georges_dll/res/Toolbar.bmp   | Bin
 .../leveldesign/georges_dll/res/array.ico     | Bin
 .../georges_dll/res/georges_edit.rc2          |   0
 .../leveldesign/georges_dll/res/header.ico    | Bin
 .../leveldesign/georges_dll/res/hold.ico      | Bin
 .../leveldesign/georges_dll/res/root.ico      | Bin
 .../leveldesign/georges_dll/res/struct.ico    | Bin
 .../leveldesign/georges_dll/res/vstruct.ico   | Bin
 .../georges_dll/res/worldbuilder.ico          | Bin
 .../tools/leveldesign/georges_dll/res/zen.ico | Bin
 .../leveldesign/georges_dll/res/zfee51.ico    | Bin
 .../georges_dll/settings_dialog.cpp           |   0
 .../leveldesign/georges_dll/settings_dialog.h |   0
 .../leveldesign/georges_dll/splash_screen.cpp |   0
 .../leveldesign/georges_dll/splash_screen.h   |   0
 .../tools/leveldesign/georges_dll/stdafx.cpp  |   0
 .../tools/leveldesign/georges_dll/stdafx.h    |   0
 .../leveldesign/georges_dll/type_dialog.cpp   |   0
 .../leveldesign/georges_dll/type_dialog.h     |   0
 .../tools/leveldesign/georges_dll/version.rc2 |   0
 .../georges_editor_qt/CMakeLists.txt          |   0
 .../georges_editor_qt/data/georges_editor.cfg |   0
 .../data/georges_editor_default.cfg           |   0
 .../georges_editor_qt/geqt_config.h.cmake     |   0
 .../georges_editor_qt/src/CMakeLists.txt      |   0
 .../src/completer_line_edit.cpp               |   0
 .../src/completer_line_edit.h                 |   0
 .../georges_editor_qt/src/configuration.cpp   |   0
 .../georges_editor_qt/src/configuration.h     |   0
 .../georges_editor_qt/src/entity.cpp          |   0
 .../georges_editor_qt/src/entity.h            |   0
 .../src/filesystem_model.cpp                  |   0
 .../georges_editor_qt/src/filesystem_model.h  |   0
 .../georges_editor_qt/src/formdelegate.cpp    |   0
 .../georges_editor_qt/src/formdelegate.h      |   0
 .../georges_editor_qt/src/formitem.cpp        |   0
 .../georges_editor_qt/src/formitem.h          |   0
 .../georges_editor_qt/src/georges.cpp         |   0
 .../georges_editor_qt/src/georges.h           |   0
 .../src/georges_dirtree_dialog.cpp            |   0
 .../src/georges_dirtree_dialog.h              |   0
 .../src/georges_dirtree_form.ui               |   0
 .../src/georges_editor_qt.qrc                 |   0
 .../georges_editor_qt/src/georges_splash.cpp  |   0
 .../georges_editor_qt/src/georges_splash.h    |   0
 .../src/georges_treeview_dialog.cpp           |   0
 .../src/georges_treeview_dialog.h             |   0
 .../src/georges_treeview_form.ui              |   0
 .../src/georgesform_model.cpp                 |   0
 .../georges_editor_qt/src/georgesform_model.h |   0
 .../src/georgesform_proxy_model.cpp           |   0
 .../src/georgesform_proxy_model.h             |   0
 .../georges_editor_qt/src/images/.directory   |   0
 .../src/images/georges_logo.icns              | Bin
 .../src/images/georges_logo.png               | Bin
 .../georges_editor_qt/src/images/go-down.png  | Bin
 .../georges_editor_qt/src/images/go-up.png    | Bin
 .../georges_editor_qt/src/images/khead.png    | Bin
 .../georges_editor_qt/src/images/list-add.png | Bin
 .../src/images/list-remove.png                | Bin
 .../src/images/mp_generic.png                 | Bin
 .../georges_editor_qt/src/images/nel.png      | Bin
 .../src/images/open-file.png                  | Bin
 .../src/images/pqrticles.png                  | Bin
 .../src/images/preferences.png                | Bin
 .../georges_editor_qt/src/log_dialog.cpp      |   0
 .../georges_editor_qt/src/log_dialog.h        |   0
 .../georges_editor_qt/src/log_form.ui         |   0
 .../georges_editor_qt/src/main.cpp            |   0
 .../georges_editor_qt/src/main_window.cpp     |   0
 .../georges_editor_qt/src/main_window.h       |   0
 .../georges_editor_qt/src/modules.cpp         |   0
 .../georges_editor_qt/src/modules.h           |   0
 .../georges_editor_qt/src/new_dialog.cpp      |   0
 .../georges_editor_qt/src/new_dialog.h        |   0
 .../georges_editor_qt/src/new_form.ui         |   0
 .../src/objectviewer_dialog.cpp               |   0
 .../src/objectviewer_dialog.h                 |   0
 .../src/objectviewer_form.ui                  |   0
 .../georges_editor_qt/src/progress_dialog.cpp |   0
 .../georges_editor_qt/src/progress_dialog.h   |   0
 .../georges_editor_qt/src/qt_displayer.cpp    |   0
 .../georges_editor_qt/src/qt_displayer.h      |   0
 .../georges_editor_qt/src/settings_dialog.cpp |   0
 .../georges_editor_qt/src/settings_dialog.h   |   0
 .../georges_editor_qt/src/settings_form.ui    |   0
 .../georges_editor_qt/src/splash.ui           |   0
 .../georges_editor_qt/src/stdpch.cpp          |   0
 .../georges_editor_qt/src/stdpch.h            |   0
 .../leveldesign/georges_exe/CMakeLists.txt    |   0
 .../leveldesign/georges_exe/dfn/_typ.dfn      |   0
 .../leveldesign/georges_exe/dfn/_type.typ     |   0
 .../leveldesign/georges_exe/dfn/boolean.typ   |   0
 .../leveldesign/georges_exe/dfn/filename.typ  |   0
 .../leveldesign/georges_exe/dfn/float.typ     |   0
 .../leveldesign/georges_exe/dfn/sint16.typ    |   0
 .../leveldesign/georges_exe/dfn/sint32.typ    |   0
 .../leveldesign/georges_exe/dfn/sint64.typ    |   0
 .../leveldesign/georges_exe/dfn/sint8.typ     |   0
 .../leveldesign/georges_exe/dfn/string.typ    |   0
 .../tools/leveldesign/georges_exe/dfn/typ.dfn |   0
 .../leveldesign/georges_exe/dfn/uint16.typ    |   0
 .../leveldesign/georges_exe/dfn/uint32.typ    |   0
 .../leveldesign/georges_exe/dfn/uint64.typ    |   0
 .../leveldesign/georges_exe/dfn/uint8.typ     |   0
 .../leveldesign/georges_exe/georges_exe.cpp   |   0
 .../leveldesign/georges_exe/georges_exe.rc    |   0
 .../tools/leveldesign/georges_exe/resource.h  |   0
 .../tools/leveldesign/georges_exe/version.rc2 |   0
 .../georges_plugin_sound/CMakeLists.txt       |   0
 .../georges_plugin_sound/PageBase.cpp         |   0
 .../georges_plugin_sound/PageBase.h           |   0
 .../georges_plugin_sound/PageBgFades.cpp      |   0
 .../georges_plugin_sound/PageBgFades.h        |   0
 .../georges_plugin_sound/PageBgFlags.cpp      |   0
 .../georges_plugin_sound/PageBgFlags.h        |   0
 .../georges_plugin_sound/PageComplex.cpp      |   0
 .../georges_plugin_sound/PageComplex.h        |   0
 .../georges_plugin_sound/PageComtext.cpp      |   0
 .../georges_plugin_sound/PageComtext.h        |   0
 .../georges_plugin_sound/PagePosition.cpp     |   0
 .../georges_plugin_sound/PagePosition.h       |   0
 .../georges_plugin_sound/PageSimple.cpp       |   0
 .../georges_plugin_sound/PageSimple.h         |   0
 .../georges_plugin_sound/bitmap1.bmp          | Bin
 .../georges_plugin_sound/bmp00001.bmp         | Bin
 .../georges_plugin_sound.clw                  |   0
 .../georges_plugin_sound.cpp                  |   0
 .../georges_plugin_sound.def                  |   0
 .../georges_plugin_sound.h                    |   0
 .../georges_plugin_sound.rc                   |   0
 .../georges_plugin_sound/listener_view.cpp    |   0
 .../georges_plugin_sound/listener_view.h      |   0
 .../georges_plugin_sound/loading_dialog.cpp   |   0
 .../georges_plugin_sound/loading_dialog.h     |   0
 .../res/georges_plugin_sound.rc2              |   0
 .../georges_plugin_sound/resource.h           |   0
 .../georges_plugin_sound/resource.hm          |   0
 .../georges_plugin_sound/sound_dialog.cpp     |   0
 .../georges_plugin_sound/sound_dialog.h       |   0
 .../sound_document_plugin.cpp                 |   0
 .../sound_document_plugin.h                   |   0
 .../georges_plugin_sound/sound_plugin.cpp     |   0
 .../georges_plugin_sound/sound_plugin.h       |   0
 .../georges_plugin_sound/start.bmp            | Bin
 .../georges_plugin_sound/std_sound_plugin.h   |   0
 .../leveldesign/georges_plugin_sound/stop.bmp | Bin
 .../georges_plugin_test/Resource.h            |   0
 .../georges_plugin_test/StdAfx.cpp            |   0
 .../leveldesign/georges_plugin_test/StdAfx.h  |   0
 .../georges_plugin_test.cpp                   |   0
 .../georges_plugin_test.def                   |   0
 .../georges_plugin_test/georges_plugin_test.h |   0
 .../georges_plugin_test.rc                    |   0
 .../res/georges_plugin_test.rc2               |   0
 .../test_global_dialog.cpp                    |   0
 .../georges_plugin_test/test_global_dialog.h  |   0
 .../georges_plugin_test/test_local_dialog.cpp |   0
 .../georges_plugin_test/test_local_dialog.h   |   0
 .../leveldesign/icon_search/CMakeLists.txt    |   0
 .../leveldesign/icon_search/icon_search.cpp   |   0
 .../icon_search/icon_search_default.cfg       |   0
 .../install/create_levedesign_archive.bat     |   0
 .../create_levedesign_data_archive.bat        |   0
 .../tools/leveldesign/install/georges.cfg     |   0
 .../tools/leveldesign/install/history.txt     |   0
 .../tools/leveldesign/install/ligoscape.cfg   |   0
 .../leveldesign/install/mission_compiler.cfg  |   0
 .../tools/leveldesign/install/mount_l.bat     |   0
 .../tools/leveldesign/install/ui/actions.ico  | Bin
 .../tools/leveldesign/install/ui/alias.ico    | Bin
 .../tools/leveldesign/install/ui/audio.ico    | Bin
 .../leveldesign/install/ui/audio_hiden.ico    | Bin
 .../install/ui/bot_template_npc.ico           | Bin
 .../install/ui/bot_template_npc_ml.ico        | Bin
 .../install/ui/bot_template_outpost.ico       | Bin
 .../install/ui/bot_template_outpost_ml.ico    | Bin
 .../install/ui/building_destination.ico       | Bin
 .../install/ui/building_instance.ico          | Bin
 .../install/ui/building_template.ico          | Bin
 .../install/ui/building_trigger.ico           | Bin
 .../tools/leveldesign/install/ui/cell.ico     | Bin
 .../leveldesign/install/ui/cell_zone.ico      | Bin
 .../leveldesign/install/ui/cell_zones.ico     | Bin
 .../leveldesign/install/ui/continent.ico      | Bin
 .../tools/leveldesign/install/ui/deposit.ico  | Bin
 .../leveldesign/install/ui/depositzone.ico    | Bin
 .../leveldesign/install/ui/dyn_answer.ico     | Bin
 .../leveldesign/install/ui/dyn_fauna_zone.ico | Bin
 .../leveldesign/install/ui/dyn_npc_zone.ico   | Bin
 .../tools/leveldesign/install/ui/dyn_road.ico | Bin
 .../leveldesign/install/ui/dynamic_region.ico | Bin
 .../leveldesign/install/ui/dynamic_system.ico | Bin
 .../tools/leveldesign/install/ui/emissary.ico | Bin
 .../tools/leveldesign/install/ui/env_fx.ico   | Bin
 .../leveldesign/install/ui/env_fx_zone.ico    | Bin
 .../tools/leveldesign/install/ui/event.ico    | Bin
 .../leveldesign/install/ui/event_action.ico   | Bin
 .../leveldesign/install/ui/event_handler.ico  | Bin
 .../install/ui/event_handler_action.ico       | Bin
 .../tools/leveldesign/install/ui/exclude.ico  | Bin
 .../tools/leveldesign/install/ui/fauna.ico    | Bin
 .../install/ui/fauna_event_handler.ico        | Bin
 .../install/ui/fauna_event_handler_action.ico | Bin
 .../install/ui/fauna_generic_place.ico        | Bin
 .../leveldesign/install/ui/fauna_state.ico    | Bin
 .../install/ui/fauna_state_event_handler.ico  | Bin
 .../install/ui/flat_dyn_chat_continue.ico     | Bin
 .../install/ui/flat_dyn_chat_fail.ico         | Bin
 .../install/ui/flat_dyn_chat_retry.ico        | Bin
 .../install/ui/flat_dyn_chat_skippable.ico    | Bin
 .../tools/leveldesign/install/ui/flora.ico    | Bin
 .../leveldesign/install/ui/flora_exclude.ico  | Bin
 .../leveldesign/install/ui/flora_path.ico     | Bin
 .../leveldesign/install/ui/flora_zone.ico     | Bin
 .../tools/leveldesign/install/ui/food.ico     | Bin
 .../tools/leveldesign/install/ui/gear.ico     | Bin
 .../leveldesign/install/ui/geom_items.ico     | Bin
 .../tools/leveldesign/install/ui/group.ico    | Bin
 .../install/ui/group_descriptions.ico         | Bin
 .../leveldesign/install/ui/group_fauna.ico    | Bin
 .../leveldesign/install/ui/group_fauna_ex.ico | Bin
 .../leveldesign/install/ui/group_template.ico | Bin
 .../install/ui/group_template_fauna.ico       | Bin
 .../install/ui/group_template_npc.ico         | Bin
 .../install/ui/group_template_npc_ml.ico      | Bin
 .../install/ui/group_template_outpost.ico     | Bin
 .../install/ui/group_template_outpost_ml.ico  | Bin
 .../tools/leveldesign/install/ui/handon.ico   | Bin
 .../tools/leveldesign/install/ui/jump_to.ico  | Bin
 .../leveldesign/install/ui/kami_base.ico      | Bin
 .../leveldesign/install/ui/kami_deposit.ico   | Bin
 .../leveldesign/install/ui/kami_group.ico     | Bin
 .../leveldesign/install/ui/kami_guardian.ico  | Bin
 .../leveldesign/install/ui/kami_manager.ico   | Bin
 .../leveldesign/install/ui/kami_preacher.ico  | Bin
 .../leveldesign/install/ui/karavan_base.ico   | Bin
 .../install/ui/karavan_emissary.ico           | Bin
 .../leveldesign/install/ui/karavan_group.ico  | Bin
 .../leveldesign/install/ui/karavan_guard.ico  | Bin
 .../install/ui/karavan_manager.ico            | Bin
 .../install/ui/linear_dyn_chat_continue.ico   | Bin
 .../install/ui/linear_dyn_chat_fail.ico       | Bin
 .../install/ui/linear_dyn_chat_retry.ico      | Bin
 .../install/ui/linear_dyn_chat_skippable.ico  | Bin
 .../tools/leveldesign/install/ui/manager.ico  | Bin
 .../tools/leveldesign/install/ui/mission.ico  | Bin
 .../install/ui/mission_bot_chat_step.ico      | Bin
 .../install/ui/mission_objectives.ico         | Bin
 .../leveldesign/install/ui/mission_reward.ico | Bin
 .../install/ui/mission_reward_group.ico       | Bin
 .../leveldesign/install/ui/mission_step.ico   | Bin
 .../leveldesign/install/ui/mission_tree.ico   | Bin
 .../install/ui/missions_editor.ico            | Bin
 .../leveldesign/install/ui/no_answer.ico      | Bin
 .../tools/leveldesign/install/ui/no_go.ico    | Bin
 .../tools/leveldesign/install/ui/npc.ico      | Bin
 .../tools/leveldesign/install/ui/npc_bot.ico  | Bin
 .../install/ui/npc_event_handler.ico          | Bin
 .../install/ui/npc_event_handler_action.ico   | Bin
 .../leveldesign/install/ui/npc_folder.ico     | Bin
 .../leveldesign/install/ui/npc_group.ico      | Bin
 .../install/ui/npc_group_event_handler.ico    | Bin
 .../leveldesign/install/ui/npc_manager.ico    | Bin
 .../install/ui/npc_punctual_state.ico         | Bin
 .../leveldesign/install/ui/npc_route.ico      | Bin
 .../leveldesign/install/ui/npc_state_chat.ico | Bin
 .../install/ui/npc_state_event_handler.ico    | Bin
 .../install/ui/npc_state_profile.ico          | Bin
 .../tools/leveldesign/install/ui/npc_zone.ico | Bin
 .../tools/leveldesign/install/ui/outpost.ico  | Bin
 .../install/ui/outpost_manager.ico            | Bin
 .../install/ui/outpost_spawn_zone.ico         | Bin
 .../tools/leveldesign/install/ui/path.ico     | Bin
 .../tools/leveldesign/install/ui/people.ico   | Bin
 .../tools/leveldesign/install/ui/place.ico    | Bin
 .../tools/leveldesign/install/ui/point.ico    | Bin
 .../leveldesign/install/ui/population.ico     | Bin
 .../tools/leveldesign/install/ui/preacher.ico | Bin
 .../install/ui/raw_material_flora.ico         | Bin
 .../install/ui/raw_material_ground.ico        | Bin
 .../install/ui/raw_material_season.ico        | Bin
 .../tools/leveldesign/install/ui/region.ico   | Bin
 .../leveldesign/install/ui/respawn_point.ico  | Bin
 .../leveldesign/install/ui/respawn_points.ico | Bin
 .../tools/leveldesign/install/ui/rest.ico     | Bin
 .../leveldesign/install/ui/result_no.ico      | Bin
 .../leveldesign/install/ui/result_yes.ico     | Bin
 .../install/ui/room_destination.ico           | Bin
 .../leveldesign/install/ui/room_template.ico  | Bin
 .../install/ui/sample_bank_zone.ico           | Bin
 .../leveldesign/install/ui/sample_banks.ico   | Bin
 .../tools/leveldesign/install/ui/shield.ico   | Bin
 .../leveldesign/install/ui/sound_path.ico     | Bin
 .../leveldesign/install/ui/sound_point.ico    | Bin
 .../leveldesign/install/ui/sound_zone.ico     | Bin
 .../tools/leveldesign/install/ui/sounds.ico   | Bin
 .../tools/leveldesign/install/ui/spawn.ico    | Bin
 .../leveldesign/install/ui/spawn_base.ico     | Bin
 .../tools/leveldesign/install/ui/stable.ico   | Bin
 .../leveldesign/install/ui/stable_entry.ico   | Bin
 .../tools/leveldesign/install/ui/stables.ico  | Bin
 .../tools/leveldesign/install/ui/state.ico    | Bin
 .../install/ui/state_event_handler.ico        | Bin
 .../leveldesign/install/ui/state_machine.ico  | Bin
 .../install/ui/state_machine_list.ico         | Bin
 .../tools/leveldesign/install/ui/step.ico     | Bin
 .../tools/leveldesign/install/ui/step_any.ico | Bin
 .../leveldesign/install/ui/step_dyn_chat.ico  | Bin
 .../leveldesign/install/ui/step_failure.ico   | Bin
 .../tools/leveldesign/install/ui/step_if.ico  | Bin
 .../tools/leveldesign/install/ui/step_ooo.ico | Bin
 .../leveldesign/install/ui/teleport_dest.ico  | Bin
 .../install/ui/teleport_destination.ico       | Bin
 .../leveldesign/install/ui/teleport_dests.ico | Bin
 .../install/ui/teleport_spawn_zone.ico        | Bin
 .../install/ui/teleport_trigger.ico           | Bin
 .../tools/leveldesign/install/ui/temp.ico     | Bin
 .../tools/leveldesign/install/ui/time.ico     | Bin
 .../leveldesign/install/ui/var_creature.ico   | Bin
 .../leveldesign/install/ui/var_faction.ico    | Bin
 .../tools/leveldesign/install/ui/var_item.ico | Bin
 .../tools/leveldesign/install/ui/var_npc.ico  | Bin
 .../leveldesign/install/ui/var_place.ico      | Bin
 .../leveldesign/install/ui/var_quality.ico    | Bin
 .../leveldesign/install/ui/var_quantity.ico   | Bin
 .../tools/leveldesign/install/ui/var_text.ico | Bin
 .../tools/leveldesign/install/ui/zone.ico     | Bin
 .../leveldesign/install/world_editor.html     |   0
 .../install/world_editor_plugin.cfg           |   0
 .../install/world_editor_script.xml           |   0
 .../tools/leveldesign/ld_0_clean.bat          |   0
 .../tools/leveldesign/ld_1_get.bat            |   0
 .../tools/leveldesign/ld_2_build.bat          |   0
 .../tools/leveldesign/ld_3_make_distrib.bat   |   0
 .../tools/leveldesign/master/ChooseDir.cpp    |   0
 .../tools/leveldesign/master/ChooseDir.h      |   0
 .../tools/leveldesign/master/ChooseTag.cpp    |   0
 .../tools/leveldesign/master/ChooseTag.h      |   0
 .../tools/leveldesign/master/ContinentCfg.cpp |   0
 .../tools/leveldesign/master/ContinentCfg.h   |   0
 .../master/ContinentPropertiesDlg.cpp         |   0
 .../master/ContinentPropertiesDlg.h           |   0
 .../tools/leveldesign/master/ExportCBDlg.cpp  |   0
 .../tools/leveldesign/master/ExportCBDlg.h    |   0
 .../tools/leveldesign/master/ExportDlg.cpp    |   0
 .../tools/leveldesign/master/ExportDlg.h      |   0
 .../tools/leveldesign/master/MainFrm.cpp      |   0
 .../tools/leveldesign/master/MainFrm.h        |   0
 .../tools/leveldesign/master/MasterTree.cpp   |   0
 .../tools/leveldesign/master/MasterTree.h     |   0
 .../tools/leveldesign/master/NameEditDlg.cpp  |   0
 .../tools/leveldesign/master/NameEditDlg.h    |   0
 .../tools/leveldesign/master/ReadMe.txt       |   0
 .../tools/leveldesign/master/StdAfx.cpp       |   0
 .../tools/leveldesign/master/StdAfx.h         |   0
 .../tools/leveldesign/master/easy_cfg.cpp     |   0
 .../tools/leveldesign/master/easy_cfg.h       |   0
 .../tools/leveldesign/master/master.cpp       |   0
 .../tools/leveldesign/master/master.h         |   0
 .../tools/leveldesign/master/master.rc        |   0
 .../tools/leveldesign/master/n019003l.pfb     | Bin
 .../tools/leveldesign/master/res/backup.ico   | Bin
 .../leveldesign/master/res/continents.ico     | Bin
 .../tools/leveldesign/master/res/file.ico     | Bin
 .../tools/leveldesign/master/res/folder.ico   | Bin
 .../tools/leveldesign/master/res/master.ico   | Bin
 .../tools/leveldesign/master/res/master.rc2   |   0
 .../leveldesign/master/res/masterDoc.ico      | Bin
 .../tools/leveldesign/master/res/regions.ico  | Bin
 .../tools/leveldesign/master/res/trash.ico    | Bin
 .../tools/leveldesign/master/resource.h       |   0
 .../mission_compiler_fe/AddPathDlg.cpp        |   0
 .../mission_compiler_fe/AddPathDlg.h          |   0
 .../mission_compiler_fe/CMakeLists.txt        |   0
 .../mission_compiler_fe/CompilDialog.cpp      |   0
 .../mission_compiler_fe/CompilDialog.h        |   0
 .../mission_compiler_fe/Resource.h            |   0
 .../mission_compiler_fe/StdAfx.cpp            |   0
 .../leveldesign/mission_compiler_fe/StdAfx.h  |   0
 .../mission_compiler_fe/dialog_mode.cpp       |   0
 .../mission_compiler_fe/dialog_mode.h         |   0
 .../mission_compiler_fe.cpp                   |   0
 .../mission_compiler_fe/mission_compiler_fe.h |   0
 .../mission_compiler_fe.rc                    |   0
 .../mission_compiler_feDlg.cpp                |   0
 .../mission_compiler_feDlg.h                  |   0
 .../mission_compiler_fe/res/icon1.ico         | Bin
 .../mission_compiler_fe/res/icon_fil.ico      | Bin
 .../res/mission_compiler_fe.rc2               |   0
 .../mission_compiler_fe/res/red_pill.ico      | Bin
 .../test_compilateur.primitive                |   0
 .../test_compilateur.script                   |   0
 .../test_compilateur_gn.primitive             |   0
 .../mission_compiler_fe/version.rc2           |   0
 .../mission_compiler_lib/CMakeLists.txt       |   0
 .../leveldesign/mission_compiler_lib/main.cpp |   0
 .../mission_compiler_lib/mission_compiler.cpp |   0
 .../mission_compiler_lib/mission_compiler.h   |   0
 .../leveldesign/mission_compiler_lib/step.h   |   0
 .../mission_compiler_lib/step_content.cpp     |   0
 .../mission_compiler_lib/steps.cpp            |   0
 .../mission_compiler_lib/variables.cpp        |   0
 .../leveldesign/mp_generator/CMakeLists.txt   |   0
 .../mp_generator/creature_models.csv          |   0
 .../tools/leveldesign/mp_generator/main.cpp   |   0
 .../leveldesign/mp_generator/moulinette.h     |   0
 .../leveldesign/mp_generator/mp_generator.doc | Bin
 .../mp_generator/raw_material_generation.cfg  |   0
 .../leveldesign/mp_generator/rm_fam_prop.csv  |   0
 .../mp_generator/rm_item_parts.csv            |   0
 .../tools/leveldesign/mp_generator/utils.h    |   0
 .../mp_generator/v4_source_tables2.xls        | Bin
 .../named_items_2_csv/CMakeLists.txt          |   0
 .../make_named_items_csv.bat                  |   0
 .../make_named_items_txt.bat                  |   0
 .../named_items_2_csv/named_items.csv         |   0
 .../named_items_2_csv/named_items.script      |   0
 .../named_items_2_csv/named_items_2_csv.cpp   |   0
 .../leveldesign/prim_export/CMakeLists.txt    |   0
 .../leveldesign/prim_export/blue_pill.ico     | Bin
 .../tools/leveldesign/prim_export/main.cpp    |   0
 .../tools/leveldesign/prim_export/main.rc     |   0
 .../leveldesign/prim_export/prim_export.cfg   |   0
 .../primitive_id_assignator.cfg               |   0
 .../primitive_id_assignator.cpp               |   0
 .../test_root/ZoneBitmaps/_UNUSED_.TGA        | Bin
 .../leveldesign/test_root/common/dfn/_typ.dfn |   0
 .../test_root/common/dfn/_type.typ            |   0
 .../test_root/common/dfn/boolean.typ          |   0
 .../test_root/common/dfn/filename.typ         |   0
 .../test_root/common/dfn/float.typ            |   0
 .../test_root/common/dfn/plant.dfn            |   0
 .../test_root/common/dfn/plant_instance.dfn   |   0
 .../test_root/common/dfn/sint16.typ           |   0
 .../test_root/common/dfn/sint32.typ           |   0
 .../test_root/common/dfn/sint64.typ           |   0
 .../test_root/common/dfn/sint8.typ            |   0
 .../test_root/common/dfn/string.typ           |   0
 .../leveldesign/test_root/common/dfn/typ.dfn  |   0
 .../test_root/common/dfn/uint16.typ           |   0
 .../test_root/common/dfn/uint32.typ           |   0
 .../test_root/common/dfn/uint64.typ           |   0
 .../test_root/common/dfn/uint8.typ            |   0
 .../test_root/common/dfn/vegetable.dfn        |   0
 .../tools/leveldesign/test_root/ligoscape.cfg |   0
 .../tools/leveldesign/uni_conv/CMakeLists.txt |   0
 .../tools/leveldesign/uni_conv/uni_conv.cpp   |   0
 .../tools/leveldesign/update_tools.bat        |   0
 .../leveldesign/variable_parser/ReadMe.txt    |   0
 .../leveldesign/variable_parser/StdAfx.cpp    |   0
 .../leveldesign/variable_parser/StdAfx.h      |   0
 .../variable_parser/lua_helper.cpp            |   0
 .../leveldesign/variable_parser/lua_helper.h  |   0
 .../variable_parser/lua_helper_inline.h       |   0
 .../variable_parser/res/variable_parser.ico   | Bin
 .../variable_parser/res/variable_parser.rc2   |   0
 .../leveldesign/variable_parser/resource.h    |   0
 .../variable_parser/variable_parser.cpp       |   0
 .../variable_parser/variable_parser.h         |   0
 .../variable_parser/variable_parser.rc        |   0
 .../variable_parser/variable_parserDlg.cpp    |   0
 .../variable_parser/variable_parserDlg.h      |   0
 .../leveldesign/world_editor/CMakeLists.txt   |   0
 .../world_editor/land_export/CMakeLists.txt   |   0
 .../world_editor/land_export/blue_pill.ico    | Bin
 .../world_editor/land_export/land_export.cfg  |   0
 .../world_editor/land_export/main.cpp         |   0
 .../world_editor/land_export/main.rc          |   0
 .../land_export_lib/CMakeLists.txt            |   0
 .../world_editor/land_export_lib/export.cpp   |   0
 .../world_editor/land_export_lib/export.h     |   0
 .../leveldesign/world_editor/ligoscape.cfg    |   0
 .../leveldesign/world_editor/ligoscape.txt    |   0
 .../world_editor/world_editor/CMakeLists.txt  |   0
 .../world_editor/world_editor/action.cpp      |   0
 .../world_editor/world_editor/action.h        |   0
 .../world_editor/builder_logic.cpp            |   0
 .../world_editor/world_editor/builder_logic.h |   0
 .../world_editor/builder_zone.cpp             |   0
 .../world_editor/world_editor/builder_zone.h  |   0
 .../world_editor/builder_zone_region.cpp      |   0
 .../world_editor/builder_zone_region.h        |   0
 .../world_editor/color_button.cpp             |   0
 .../world_editor/world_editor/color_button.h  |   0
 .../world_editor/custom_snapshot.cpp          |   0
 .../world_editor/custom_snapshot.h            |   0
 .../world_editor/dialog_properties.cpp        |   0
 .../world_editor/dialog_properties.h          |   0
 .../world_editor/world_editor/display.cpp     |   0
 .../world_editor/world_editor/display.h       |   0
 .../world_editor/editor_primitive.cpp         |   0
 .../world_editor/editor_primitive.h           |   0
 .../world_editor/export_cb_dlg.cpp            |   0
 .../world_editor/world_editor/export_cb_dlg.h |   0
 .../world_editor/world_editor/export_dlg.cpp  |   0
 .../world_editor/world_editor/export_dlg.h    |   0
 .../world_editor/external_editor.cpp          |   0
 .../world_editor/external_editor.h            |   0
 .../world_editor/file_dialog_ex.cpp           |   0
 .../world_editor/file_dialog_ex.h             |   0
 .../world_editor/find_primitive_dlg.cpp       |   0
 .../world_editor/find_primitive_dlg.h         |   0
 .../world_editor/generate_dlg.cpp             |   0
 .../world_editor/world_editor/generate_dlg.h  |   0
 .../world_editor/generate_primitive.cpp       |   0
 .../world_editor/generate_primitive.h         |   0
 .../world_editor/world_editor/goto_dialog.cpp |   0
 .../world_editor/world_editor/goto_dialog.h   |   0
 .../world_editor/imagelist_ex.cpp             |   0
 .../world_editor/world_editor/imagelist_ex.h  |   0
 .../world_editor/world_editor/main_frm.cpp    |   0
 .../world_editor/world_editor/main_frm.h      |   0
 .../world_editor/world_editor/move_dlg.cpp    |   0
 .../world_editor/world_editor/move_dlg.h      |   0
 .../world_editor/world_editor/my_list_box.cpp |   0
 .../world_editor/world_editor/my_list_box.h   |   0
 .../world_editor/world_editor/name_dlg.cpp    |   0
 .../world_editor/world_editor/name_dlg.h      |   0
 .../world_editor/world_editor/pacs.cpp        |   0
 .../world_editor/world_editor/pacs.h          |   0
 .../world_editor/plugin_interface.h           |   0
 .../primitive_configuration_dlg.cpp           |   0
 .../primitive_configuration_dlg.h             |   0
 .../world_editor/primitive_view.cpp           |   0
 .../world_editor/primitive_view.h             |   0
 .../world_editor/project_settings.cpp         |   0
 .../world_editor/project_settings.h           |   0
 .../world_editor/world_editor/res/Toolbar.bmp | Bin
 .../world_editor/res/WorldEditor.ico          | Bin
 .../world_editor/res/_Legoscape edit.ico      | Bin
 .../world_editor/res/_Selecteur de Zone.ico   | Bin
 .../world_editor/world_editor/res/_icon1.ico  | Bin
 .../world_editor/res/_patatoid edit.ico       | Bin
 .../world_editor/res/add_point.cur            | Bin
 .../world_editor/world_editor/res/copy.cur    | Bin
 .../world_editor/world_editor/res/erro.ico    | Bin
 .../world_editor/res/folder_closed.ico        | Bin
 .../world_editor/res/folder_h.ico             | Bin
 .../world_editor/res/folder_hidden.ico        | Bin
 .../world_editor/res/folder_opened.ico        | Bin
 .../world_editor/world_editor/res/hand.cur    | Bin
 .../world_editor/res/insert_point.cur         | Bin
 .../world_editor/res/line_closed.ico          | Bin
 .../world_editor/res/line_hidden.ico          | Bin
 .../world_editor/res/line_opened.ico          | Bin
 .../world_editor/world_editor/res/move.cur    | Bin
 .../world_editor/res/point_closed.ico         | Bin
 .../world_editor/res/point_hidden.ico         | Bin
 .../world_editor/res/point_opened.ico         | Bin
 .../world_editor/res/property.ico             | Bin
 .../world_editor/res/property_closed.ico      | Bin
 .../world_editor/res/property_hidden.ico      | Bin
 .../world_editor/res/property_opened.ico      | Bin
 .../world_editor/world_editor/res/radius.cur  | Bin
 .../world_editor/world_editor/res/root.ico    | Bin
 .../world_editor/res/root_closed.ico          | Bin
 .../world_editor/res/root_hidden.ico          | Bin
 .../world_editor/res/root_opened.ico          | Bin
 .../world_editor/world_editor/res/rotate.cur  | Bin
 .../world_editor/world_editor/res/scale.cur   | Bin
 .../world_editor/world_editor/res/select.cur  | Bin
 .../world_editor/res/select_copy.cur          | Bin
 .../world_editor/world_editor/res/turn.cur    | Bin
 .../world_editor/res/world_editor.ico         | Bin
 .../world_editor/res/world_editor.rc2         |   0
 .../world_editor/res/world_editor_doc.ico     | Bin
 .../world_editor/res/zone_closed.ico          | Bin
 .../world_editor/res/zone_hidden.ico          | Bin
 .../world_editor/res/zone_opened.ico          | Bin
 .../world_editor/world_editor/res/zoom.cur    | Bin
 .../world_editor/world_editor/resource.h      |   0
 .../world_editor/select_by_location.cpp       |   0
 .../world_editor/select_by_location.h         |   0
 .../world_editor/splash_screen.cpp            |   0
 .../world_editor/world_editor/splash_screen.h |   0
 .../world_editor/world_editor/stdafx.cpp      |   0
 .../world_editor/world_editor/stdafx.h        |   0
 .../world_editor/world_editor/tools_logic.cpp |   0
 .../world_editor/world_editor/tools_logic.h   |   0
 .../world_editor/world_editor/tools_zone.cpp  |   0
 .../world_editor/world_editor/tools_zone.h    |   0
 .../world_editor/world_editor/type_dlg.cpp    |   0
 .../world_editor/world_editor/type_dlg.h      |   0
 .../world_editor/type_manager_dlg.cpp         |   0
 .../world_editor/type_manager_dlg.h           |   0
 .../world_editor/type_sel_dlg.cpp             |   0
 .../world_editor/world_editor/type_sel_dlg.h  |   0
 .../world_editor/update_continents.bat        |   0
 .../world_editor/world_editor/version.rc2     |   0
 .../world_editor/world_editor.cpp             |   0
 .../world_editor/world_editor/world_editor.h  |   0
 .../world_editor/world_editor/world_editor.rc |   0
 .../world_editor/world_editor_doc.cpp         |   0
 .../world_editor/world_editor_doc.h           |   0
 .../world_editor/world_editor_georges.cfg     |   0
 .../world_editor/world_editor_view.cpp        |   0
 .../world_editor/world_editor_view.h          |   0
 .../CMakeLists.txt                            |   0
 .../DialogFlags.cpp                           |   0
 .../DialogFlags.h                             |   0
 .../ReadMe.txt                                |   0
 .../Resource.h                                |   0
 .../StdAfx.cpp                                |   0
 .../world_editor_fauna_graph_plugin/StdAfx.h  |   0
 .../fauna_flags.tga                           | Bin
 .../plugin.cpp                                |   0
 .../world_editor_fauna_graph_plugin/plugin.h  |   0
 .../res/world_editor_fauna_graph_plugin.rc2   |   0
 .../world_editor_fauna_graph_plugin.cpp       |   0
 .../world_editor_fauna_graph_plugin.h         |   0
 .../world_editor_fauna_graph_plugin.rc        |   0
 .../world_editor_graph_plugin/CMakeLists.txt  |   0
 .../world_editor_graph_plugin/StdAfx.cpp      |   0
 .../world_editor_graph_plugin/StdAfx.h        |   0
 .../graph_plugin.cpp                          |   0
 .../world_editor_graph_plugin/graph_plugin.h  |   0
 .../res/world_editor_graph_plugin.rc2         |   0
 .../world_editor_graph_plugin/resource.h      |   0
 .../world_editor_graph_plugin.cpp             |   0
 .../world_editor_graph_plugin.h               |   0
 .../world_editor_graph_plugin.rc              |   0
 .../world_editor_graph_plugin_dlg.cpp         |   0
 .../world_editor_graph_plugin_dlg.h           |   0
 .../world_editor_plugin/CMakeLists.txt        |   0
 .../world_editor_plugin/DialogFlags.cpp       |   0
 .../world_editor_plugin/DialogFlags.h         |   0
 .../world_editor_plugin/LoadDialog.cpp        |   0
 .../world_editor_plugin/LoadDialog.h          |   0
 .../world_editor_plugin/StdAfx.cpp            |   0
 .../world_editor/world_editor_plugin/StdAfx.h |   0
 .../world_editor_plugin/WorldEditorPlugin.cfg |   0
 .../world_editor_plugin/plugin.cpp            |   0
 .../world_editor/world_editor_plugin/plugin.h |   0
 .../world_editor_plugin/resource.h            |   0
 .../world_editor_plugin.rc                    |   0
 .../world_editor_scriptPLAYER.xml             |   0
 .../CMakeLists.txt                            |   0
 .../primitive_plugin.cpp                      |   0
 .../primitive_plugin.h                        |   0
 .../CMakeLists.txt                            |   0
 .../DialogFlags.cpp                           |   0
 .../DialogFlags.h                             |   0
 .../DialogLogin.cpp                           |   0
 .../DialogLogin.h                             |   0
 .../StdAfx.cpp                                |   0
 .../StdAfx.h                                  |   0
 .../entity_display_info.h                     |   0
 .../entity_icons.tga                          | Bin
 .../list_box_color.cpp                        |   0
 .../list_box_color.h                          |   0
 .../memory_combo_box.cpp                      |   0
 .../memory_combo_box.h                        |   0
 .../plugin.cpp                                |   0
 .../plugin.h                                  |   0
 .../resource.h                                |   0
 .../world_editor_shard_monitor_plugin.rc      |   0
 .../world_editor_shard_monitor_plugin.xml     |   0
 .../world_editor_sound_plugin/CMakeLists.txt  |   0
 .../world_editor_sound_plugin/DialogFlags.cpp |   0
 .../world_editor_sound_plugin/DialogFlags.h   |   0
 .../world_editor_sound_plugin/LoadDialog.cpp  |   0
 .../world_editor_sound_plugin/LoadDialog.h    |   0
 .../world_editor_sound_plugin/StdAfx.cpp      |   0
 .../world_editor_sound_plugin/StdAfx.h        |   0
 .../world_editor_sound_plugin/res/bitmap1.bmp | Bin
 .../res/bmp00001.bmp                          | Bin
 .../res/bmp00002.bmp                          | Bin
 .../res/bmp00003.bmp                          | Bin
 .../res/toolbar1.bmp                          | Bin
 .../world_editor_sound_plugin/resource.h      |   0
 .../sound_plugin.cpp                          |   0
 .../world_editor_sound_plugin/sound_plugin.h  |   0
 .../world_editor_sound_plugin.rc              |   0
 .../tools/make_alias_file/CMakeLists.txt      |   0
 .../tools/make_alias_file/make_alias_file.cfg |   0
 .../tools/make_alias_file/make_alias_file.cpp |   0
 .../tools/make_anim_by_race/CMakeLists.txt    |   0
 .../tools/make_anim_by_race/main.cpp          |   0
 .../make_anim_melee_impact/CMakeLists.txt     |   0
 .../tools/make_anim_melee_impact/anim.txt     |   0
 .../tools/make_anim_melee_impact/main.cpp     |   0
 .../tools/occ2huff/CMakeLists.txt             |   0
 .../tools/occ2huff/occ2huff.cpp               |   0
 .../tools/patch_gen/CMakeLists.txt            |   0
 .../tools/patch_gen/blue_pill.ico             | Bin
 .../tools/patch_gen/patch_gen.rc              |   0
 .../tools/patch_gen/patch_gen_common.cpp      |   0
 .../tools/patch_gen/patch_gen_main.cpp        |   0
 .../tools/patch_gen/patch_gen_main.h          |   0
 .../tools/patch_gen/patch_gen_service.cpp     |   0
 .../tools/patch_gen/patch_gen_service.h       |   0
 .../tools/patch_gen/patch_gen_service.rc      |   0
 .../tools/patch_gen/red_pill.ico              | Bin
 .../tools/pd_parser/CMakeLists.txt            |   0
 .../tools/pd_parser/cpp_output.h              |   0
 .../ryzom => ryzom}/tools/pd_parser/main.cpp  |   0
 .../tools/pd_parser/parse_node.h              |   0
 .../tools/pd_parser/parser.cpp                |   0
 .../ryzom => ryzom}/tools/pd_parser/parser.h  |   0
 .../tools/pd_parser/parser_rules.cpp          |   0
 .../tools/pd_parser/parser_rules.h            |   0
 .../tools/pd_parser/templatizer.cpp           |   0
 .../tools/pd_parser/templatizer.h             |   0
 .../tools/pd_parser/tokenizer.h               |   0
 .../tools/pdr_util/CMakeLists.txt             |   0
 .../tools/pdr_util/pdr_util.cpp               |   0
 .../tools/phrase_generator/CMakeLists.txt     |   0
 .../tools/phrase_generator/StdAfx.cpp         |   0
 .../tools/phrase_generator/StdAfx.h           |   0
 .../phrase_generator/phrase_generator.cpp     |   0
 .../tools/phrase_generator/skill_tree.cpp     |   0
 .../tools/phrase_generator/skill_tree.h       |   0
 .../tools/phrase_generator/sstring.h          |   0
 .../tools/reynolds/reynolds_manager.cpp       |   0
 .../tools/reynolds/reynolds_manager.h         |   0
 .../ryzom => ryzom}/tools/reynolds/stdpch.cpp |   0
 {code/ryzom => ryzom}/tools/reynolds/stdpch.h |   0
 .../ryzom => ryzom}/tools/reynolds/track.cpp  |   0
 {code/ryzom => ryzom}/tools/reynolds/track.h  |   0
 .../ryzom => ryzom}/tools/scripts/linux/build |   0
 .../tools/scripts/linux/buildmode             |   0
 .../tools/scripts/linux/clean_log.sh          |   0
 .../scripts/linux/generate_packed_sheets.sh   |   0
 .../tools/scripts/linux/loop_aes.sh           |   0
 .../tools/scripts/linux/make_all              |   0
 .../linux/ryzom_domain_screen_wrapper.sh      |   0
 .../tools/scripts/linux/service_launcher.sh   |   0
 .../ryzom => ryzom}/tools/scripts/linux/shard |   0
 .../tools/scripts/linux/utilities             |   0
 .../windows/tools/replace_vista_icon.exe      | Bin
 .../tools/server/CMakeLists.txt               |   0
 .../tools/server/ai_build_wmap/CMakeLists.txt |   0
 .../tools/server/ai_build_wmap/blue_pill.ico  | Bin
 .../ai_build_wmap/build_proximity_maps.cpp    |   0
 .../tools/server/ai_build_wmap/main.cpp       |   0
 .../tools/server/ai_build_wmap/main.rc        |   0
 .../brick_param_extractor.cpp                 |   0
 .../build_spell_sheet/build_spell_sheet.cpp   |   0
 .../server/build_spell_sheet/build_spells.cfg |   0
 .../build_world_packed_col/CMakeLists.txt     |   0
 .../build_world_packed_col/blue_pill.ico      | Bin
 .../build_world_packed_col.cfg                |   0
 .../build_world_packed_col.cpp                |   0
 .../build_world_packed_col/builder_config.cpp |   0
 .../build_world_packed_col/builder_config.h   |   0
 .../server/build_world_packed_col/main.rc     |   0
 .../packed_world_builder.cpp                  |   0
 .../packed_world_builder.h                    |   0
 .../build_world_packed_col/std_header.cpp     |   0
 .../build_world_packed_col/std_header.h       |   0
 .../build_world_packed_col/test_col_world.cpp |   0
 .../server/build_world_packed_col/village.cpp |   0
 .../server/build_world_packed_col/village.h   |   0
 .../build_world_packed_col/zone_util.cpp      |   0
 .../server/build_world_packed_col/zone_util.h |   0
 .../server/ryzom_ams/android_app/.classpath   |   0
 .../server/ryzom_ams/android_app/.project     |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../ryzom_ams/android_app/AndroidManifest.xml |   0
 .../gen/com/mkyong/android/BuildConfig.java   |   0
 .../android_app/gen/com/mkyong/android/R.java |   0
 .../server/ryzom_ams/android_app/info.txt     |   0
 .../server/ryzom_ams/android_app/proguard.cfg |   0
 .../ryzom_ams/android_app/project.properties  |   0
 .../res/drawable-hdpi/ic_launcher.png         | Bin
 .../res/drawable-ldpi/ic_launcher.png         | Bin
 .../android_app/res/drawable/ic_launcher.png  | Bin
 .../ryzom_ams/android_app/res/layout/main.xml |   0
 .../android_app/res/values/strings.xml        |   0
 .../src/com/mkyong/android/MainActivity.java  |   0
 .../tools/server/ryzom_ams/credits.txt        |   0
 .../tools/server/ryzom_ams/doc.txt            |   0
 .../drupal_module/oldmodule/ryzommanage.info  |   0
 .../oldmodule/ryzommanage.install             |   0
 .../oldmodule/ryzommanage.module              |   0
 .../oldmodule/templates/ingame_register.phtml |   0
 .../ams_lib/ingame_templates/settings.tpl     |   0
 .../ryzommanage/autoload/webusers.php         |   0
 .../ryzommanage/config.default.php            |   0
 .../drupal_module/ryzommanage/inc/logout.php  |   0
 .../ryzommanage/inc/settings.php              |   0
 .../ryzommanage/inc/show_user.php             |   0
 .../ryzommanage/ryzommanage.info              |   0
 .../ryzommanage/ryzommanage.install           |   0
 .../ryzommanage/ryzommanage.module            |   0
 .../ryzommanage/templates/createticket.tpl    |   0
 .../ryzommanage/templates/dashboard.tpl       |   0
 .../templates/ingame_register.phtml           |   0
 .../ryzommanage/templates/layout.tpl          |   0
 .../ryzommanage/templates/layout_admin.tpl    |   0
 .../ryzommanage/templates/layout_mod.tpl      |   0
 .../ryzommanage/templates/layout_user.tpl     |   0
 .../ryzommanage/templates/sgroup_list.tpl     |   0
 .../ryzommanage/templates/show_queue.tpl      |   0
 .../ryzommanage/templates/show_reply.tpl      |   0
 .../ryzommanage/templates/show_sgroup.tpl     |   0
 .../ryzommanage/templates/show_ticket.tpl     |   0
 .../templates/show_ticket_info.tpl            |   0
 .../ryzommanage/templates/show_ticket_log.tpl |   0
 .../ryzommanage/templates/show_user.tpl       |   0
 .../ryzommanage/templates/userlist.tpl        |   0
 .../tools/server/ryzom_ams/todo.txt           |   0
 .../tools/server/ryzom_ams/www/config.php     |   0
 .../tools/server/ryzom_ams/www/is_installed   |   0
 .../sheet_random_generator/CMakeLists.txt     |   0
 .../tools/sheet_random_generator/StdAfx.cpp   |   0
 .../tools/sheet_random_generator/StdAfx.h     |   0
 .../raw_material_generation.cfg               |   0
 .../sheet_random_generator.cpp                |   0
 .../sheet_random_generator/srg_utilities.cpp  |   0
 .../sheet_random_generator/srg_utilities.h    |   0
 .../tools/sheets_packer/CMakeLists.txt        |   0
 .../tools/sheets_packer/blue_pill.ico         | Bin
 .../tools/sheets_packer/main.rc               |   0
 .../tools/sheets_packer/sheets_packer.cfg     |   0
 .../tools/sheets_packer/sheets_packer.cpp     |   0
 .../tools/sheets_packer/sheets_packer_cfg.cpp |   0
 .../tools/sheets_packer/sheets_packer_cfg.h   |   0
 .../tools/sheets_packer/stdpch.cpp            |   0
 .../tools/sheets_packer/stdpch.h              |   0
 .../tools/sheets_packer_shard/CMakeLists.txt  |   0
 .../tools/sheets_packer_shard/blue_pill.ico   | Bin
 .../tools/sheets_packer_shard/main.rc         |   0
 .../sheets_packer_shard.cpp                   |   0
 .../tools/skill_extractor/CMakeLists.txt      |   0
 .../tools/skill_extractor/skill_extractor.cpp |   0
 .../tools/stats_scan/CMakeLists.txt           |   0
 .../tools/stats_scan/char_commands.cpp        |   0
 .../tools/stats_scan/char_filter_factory.cpp  |   0
 .../tools/stats_scan/char_filter_factory.h    |   0
 .../char_info_extractor_factory.cpp           |   0
 .../stats_scan/char_info_extractor_factory.h  |   0
 .../tools/stats_scan/char_scan_script.cpp     |   0
 .../tools/stats_scan/char_scan_script.h       |   0
 .../tools/stats_scan/character.cpp            |   0
 .../tools/stats_scan/character.h              |   0
 .../tools/stats_scan/character_scan_job.cpp   |   0
 .../tools/stats_scan/character_scan_job.h     |   0
 .../tools/stats_scan/job_manager.cpp          |   0
 .../tools/stats_scan/job_manager.h            |   0
 .../tools/stats_scan/service_main.cpp         |   0
 .../tools/stats_scan/user_char_filters.cpp    |   0
 .../stats_scan/user_char_info_extractors.cpp  |   0
 .../tools/translation/5_make_words_diff.bat   |   0
 .../tools/translation/6_merge_words_diff.bat  |   0
 .../translation/7_install_translation.bat     |   0
 .../translation/AA_clean_string_diff.bat      |   0
 .../tools/translation/A_make_string_diff.bat  |   0
 .../tools/translation/B_merge_string_diff.bat |   0
 .../bin/put_translation_tools_here.tag        |   0
 .../tools/translation/diff/do_not_remove.tag  |   0
 .../history/do_not_remove_this_file.txt       |   0
 .../tools/translation/languages.txt           |   0
 .../tools/translation/readme.txt              |   0
 .../translated/bodypart_words_de.txt          |   0
 .../translated/bodypart_words_en.txt          |   0
 .../translated/bodypart_words_es.txt          |   0
 .../translated/bodypart_words_fr.txt          |   0
 .../translated/bodypart_words_ru.txt          |   0
 .../translated/bodypart_words_wk.txt          |   0
 .../translated/career_words_de.txt            |   0
 .../translated/career_words_en.txt            |   0
 .../translated/career_words_es.txt            |   0
 .../translated/career_words_fr.txt            |   0
 .../translated/career_words_ru.txt            |   0
 .../translated/career_words_wk.txt            |   0
 .../translated/characteristic_words_de.txt    |   0
 .../translated/characteristic_words_en.txt    |   0
 .../translated/characteristic_words_es.txt    |   0
 .../translated/characteristic_words_fr.txt    |   0
 .../translated/characteristic_words_ru.txt    |   0
 .../translated/characteristic_words_wk.txt    |   0
 .../classificationtype_words_de.txt           |   0
 .../classificationtype_words_en.txt           |   0
 .../classificationtype_words_es.txt           |   0
 .../classificationtype_words_fr.txt           |   0
 .../classificationtype_words_ru.txt           |   0
 .../classificationtype_words_wk.txt           |   0
 .../translated/creature_words_de.txt          |   0
 .../translated/creature_words_en.txt          |   0
 .../translated/creature_words_es.txt          |   0
 .../translated/creature_words_fr.txt          |   0
 .../translated/creature_words_ru.txt          |   0
 .../translated/creature_words_wk.txt          |   0
 .../translated/damage_words_de.txt            |   0
 .../translated/damage_words_en.txt            |   0
 .../translated/damage_words_fr.txt            |   0
 .../translated/damage_words_ru.txt            |   0
 .../translated/damagetype_words_de.txt        |   0
 .../translated/damagetype_words_en.txt        |   0
 .../translated/damagetype_words_es.txt        |   0
 .../translated/damagetype_words_fr.txt        |   0
 .../translated/damagetype_words_ru.txt        |   0
 .../translated/damagetype_words_wk.txt        |   0
 .../tools/translation/translated/de.uxt       |   0
 .../translated/ecosystem_words_de.txt         |   0
 .../translated/ecosystem_words_en.txt         |   0
 .../translated/ecosystem_words_es.txt         |   0
 .../translated/ecosystem_words_fr.txt         |   0
 .../translated/ecosystem_words_ru.txt         |   0
 .../translated/ecosystem_words_wk.txt         |   0
 .../tools/translation/translated/en.uxt       |   0
 .../tools/translation/translated/es.uxt       |   0
 .../translated/faction_words_de.txt           |   0
 .../translated/faction_words_en.txt           |   0
 .../translated/faction_words_es.txt           |   0
 .../translated/faction_words_fr.txt           |   0
 .../translated/faction_words_ru.txt           |   0
 .../translated/faction_words_wk.txt           |   0
 .../tools/translation/translated/fr.uxt       |   0
 .../translation/translated/item_words_de.txt  |   0
 .../translation/translated/item_words_en.txt  |   0
 .../translation/translated/item_words_es.txt  |   0
 .../translation/translated/item_words_fr.txt  |   0
 .../translation/translated/item_words_ru.txt  |   0
 .../translation/translated/item_words_wk.txt  |   0
 .../translation/translated/job_words_de.txt   |   0
 .../translation/translated/job_words_en.txt   |   0
 .../translation/translated/job_words_es.txt   |   0
 .../translation/translated/job_words_fr.txt   |   0
 .../translation/translated/job_words_ru.txt   |   0
 .../translation/translated/job_words_wk.txt   |   0
 .../translated/outpost_words_de.txt           |   0
 .../translated/outpost_words_en.txt           |   0
 .../translated/outpost_words_es.txt           |   0
 .../translated/outpost_words_fr.txt           |   0
 .../translated/outpost_words_ru.txt           |   0
 .../translated/outpost_words_wk.txt           |   0
 .../translation/translated/place_words_de.txt |   0
 .../translation/translated/place_words_en.txt |   0
 .../translation/translated/place_words_es.txt |   0
 .../translation/translated/place_words_fr.txt |   0
 .../translation/translated/place_words_ru.txt |   0
 .../translation/translated/place_words_wk.txt |   0
 .../translated/powertype_words_de.txt         |   0
 .../translated/powertype_words_en.txt         |   0
 .../translated/powertype_words_es.txt         |   0
 .../translated/powertype_words_fr.txt         |   0
 .../translated/powertype_words_ru.txt         |   0
 .../translated/powertype_words_wk.txt         |   0
 .../tools/translation/translated/r2_de.uxt    |   0
 .../tools/translation/translated/r2_en.uxt    |   0
 .../tools/translation/translated/r2_es.uxt    |   0
 .../tools/translation/translated/r2_fr.uxt    |   0
 .../tools/translation/translated/r2_ru.uxt    |   0
 .../translation/translated/race_words_de.txt  |   0
 .../translation/translated/race_words_en.txt  |   0
 .../translation/translated/race_words_es.txt  |   0
 .../translation/translated/race_words_fr.txt  |   0
 .../translation/translated/race_words_ru.txt  |   0
 .../translation/translated/race_words_wk.txt  |   0
 .../tools/translation/translated/ru.uxt       |   0
 .../translated/sbrick_words_de.txt            |   0
 .../translated/sbrick_words_en.txt            |   0
 .../translated/sbrick_words_es.txt            |   0
 .../translated/sbrick_words_fr.txt            |   0
 .../translated/sbrick_words_ru.txt            |   0
 .../translated/sbrick_words_wk.txt            |   0
 .../translation/translated/score_words_de.txt |   0
 .../translation/translated/score_words_en.txt |   0
 .../translation/translated/score_words_es.txt |   0
 .../translation/translated/score_words_fr.txt |   0
 .../translation/translated/score_words_ru.txt |   0
 .../translation/translated/score_words_wk.txt |   0
 .../translation/translated/skill_words_de.txt |   0
 .../translation/translated/skill_words_en.txt |   0
 .../translation/translated/skill_words_es.txt |   0
 .../translation/translated/skill_words_fr.txt |   0
 .../translation/translated/skill_words_ru.txt |   0
 .../translation/translated/skill_words_wk.txt |   0
 .../translated/sphrase_words_de.txt           |   0
 .../translated/sphrase_words_en.txt           |   0
 .../translated/sphrase_words_es.txt           |   0
 .../translated/sphrase_words_fr.txt           |   0
 .../translated/sphrase_words_ru.txt           |   0
 .../translated/sphrase_words_wk.txt           |   0
 .../translation/translated/title_words_de.txt |   0
 .../translation/translated/title_words_en.txt |   0
 .../translation/translated/title_words_es.txt |   0
 .../translation/translated/title_words_fr.txt |   0
 .../translation/translated/title_words_ru.txt |   0
 .../translation/translated/title_words_wk.txt |   0
 .../tools/translation/translated/wk.uxt       |   0
 .../translation/work/bodypart_words_wk.txt    |   0
 .../translation/work/career_words_wk.txt      |   0
 .../work/characteristic_words_wk.txt          |   0
 .../work/classificationtype_words_wk.txt      |   0
 .../translation/work/creature_words_wk.txt    |   0
 .../translation/work/damagetype_words_wk.txt  |   0
 .../translation/work/ecosystem_words_wk.txt   |   0
 .../translation/work/faction_words_wk.txt     |   0
 .../tools/translation/work/item_words_wk.txt  |   0
 .../tools/translation/work/job_words_wk.txt   |   0
 .../translation/work/outpost_words_wk.txt     |   0
 .../tools/translation/work/place_words_wk.txt |   0
 .../translation/work/powertype_words_wk.txt   |   0
 .../tools/translation/work/race_words_wk.txt  |   0
 .../translation/work/sbrick_words_wk.txt      |   0
 .../tools/translation/work/score_words_wk.txt |   0
 .../tools/translation/work/skill_words_wk.txt |   0
 .../translation/work/sphrase_words_wk.txt     |   0
 .../tools/translation/work/title_words_wk.txt |   0
 .../tools/translation/work/wk.uxt             |   0
 .../tools/translation_tools/CMakeLists.txt    |   0
 .../tools/translation_tools/blue_pill.ico     | Bin
 .../translation_tools/extract_bot_names.cpp   |   0
 .../extract_new_sheet_names.cpp               |   0
 .../tools/translation_tools/main.cpp          |   0
 .../tools/translation_tools/main.rc           |   0
 .../translation_tools/translation_tools.cfg   |   0
 .../tools/xml_packer/xml_packer.cpp           |   0
 {code/snowballs2 => snowballs2}/AUTHORS       |   0
 .../snowballs2 => snowballs2}/CMakeLists.txt  |   0
 .../CMakePackaging.txt                        |   0
 {code/snowballs2 => snowballs2}/COPYING       |   0
 {code/snowballs2 => snowballs2}/ChangeLog     |   0
 {code/snowballs2 => snowballs2}/INSTALL       |   0
 {code/snowballs2 => snowballs2}/NEWS          |   0
 {code/snowballs2 => snowballs2}/README        |   0
 {code/snowballs2 => snowballs2}/THANKS        |   0
 .../bin/chat_service.cfg                      |   0
 .../bin/collision_service.cfg                 |   0
 .../snowballs2 => snowballs2}/bin/common.cfg  |   0
 .../bin/copy_nel_d.bat                        |   0
 .../bin/copy_nel_r.bat                        |   0
 .../bin/empty_service.cfg                     |   0
 .../bin/frontend_service.cfg                  |   0
 .../bin/init_r_00_naming_service.bat          |   0
 .../bin/init_r_01_login_service.bat           |   0
 .../bin/init_r_10_welcome_service.bat         |   0
 .../bin/init_r_11_position_service.bat        |   0
 .../bin/init_r_12_chat_service.bat            |   0
 .../bin/init_r_13_collision_service.bat       |   0
 .../bin/init_r_20_frontend_service.bat        |   0
 .../bin/init_r_90_snowballs_client.bat        |   0
 .../bin/position_service.cfg                  |   0
 .../bin/pp_oculus_vr.cg                       |   0
 .../bin/pp_stereo_debug.cg                    |   0
 .../snowballs2 => snowballs2}/bin/pp_test.cg  |   0
 .../bin/snowballs_client.cfg                  |   0
 .../bin/snowballs_client_default.cfg          |   0
 .../client/CMakeLists.txt                     |   0
 .../client/client.cfg.in                      |   0
 .../client/src/CMakeLists.txt                 |   0
 .../client/src/animation.cpp                  |   0
 .../client/src/animation.h                    |   0
 .../client/src/camera.cpp                     |   0
 .../client/src/camera.h                       |   0
 .../client/src/commands.cpp                   |   0
 .../client/src/commands.h                     |   0
 .../client/src/compass.cpp                    |   0
 .../client/src/compass.h                      |   0
 .../client/src/configuration.cpp              |   0
 .../client/src/configuration.h                |   0
 .../client/src/entities.cpp                   |   0
 .../client/src/entities.h                     |   0
 .../client/src/game_time.cpp                  |   0
 .../client/src/game_time.h                    |   0
 .../client/src/graph.cpp                      |   0
 .../client/src/graph.h                        |   0
 .../client/src/interface.cpp                  |   0
 .../client/src/interface.h                    |   0
 .../client/src/internationalization.cpp       |   0
 .../client/src/internationalization.h         |   0
 .../client/src/landscape.cpp                  |   0
 .../client/src/landscape.h                    |   0
 .../client/src/lens_flare.cpp                 |   0
 .../client/src/lens_flare.h                   |   0
 .../client/src/mouse_listener.cpp             |   0
 .../client/src/mouse_listener.h               |   0
 .../client/src/network.cpp                    |   0
 .../client/src/network.h                      |   0
 .../client/src/pacs.cpp                       |   0
 .../client/src/pacs.h                         |   0
 .../client/src/physics.cpp                    |   0
 .../client/src/physics.h                      |   0
 .../client/src/radar.cpp                      |   0
 .../client/src/radar.h                        |   0
 .../client/src/snowballs_client.cpp           |   0
 .../client/src/snowballs_client.h             |   0
 .../client/src/snowballs_config.h             |   0
 .../client/src/sound.cpp                      |   0
 .../client/src/sound.h                        |   0
 .../resources/custom.ini                      |   0
 .../resources/nel.bmp                         | Bin
 .../resources/nel.png                         | Bin
 .../resources/nevraxpill.ico                  | Bin
 .../server/CMakeLists.txt                     |   0
 .../server/chat/CMakeLists.txt                |   0
 .../server/chat/chat_service.cfg              |   0
 .../server/chat/src/CMakeLists.txt            |   0
 .../server/chat/src/main.cpp                  |   0
 .../server/collision/CMakeLists.txt           |   0
 .../server/collision/collision_service.cfg    |   0
 .../server/collision/src/CMakeLists.txt       |   0
 .../collision/src/collision_service.cpp       |   0
 .../server/collision/src/collision_service.h  |   0
 .../server/common.cfg                         |   0
 .../server/empty/empty_service.cfg            |   0
 .../server/empty/src/empty_service.cpp        |   0
 .../server/empty/src/empty_service.h          |   0
 .../server/frontend/CMakeLists.txt            |   0
 .../server/frontend/frontend_service.cfg      |   0
 .../server/frontend/src/CMakeLists.txt        |   0
 .../server/frontend/src/main.cpp              |   0
 .../server/position/CMakeLists.txt            |   0
 .../server/position/position_service.cfg      |   0
 .../server/position/src/CMakeLists.txt        |   0
 .../server/position/src/main.cpp              |   0
 .../server/position/src/physics.cpp           |   0
 .../server/position/src/physics.h             |   0
 {code/studio => studio}/CMakeLists.txt        |   0
 {code/studio => studio}/data/andbasr.ttf      | Bin
 .../doc/html/cdirection_widget.png            | Bin
 .../doc/html/cedit_color_widget.png           | Bin
 .../doc/html/cedit_range_float_widget.png     | Bin
 .../doc/html/cedit_range_int_widget.png       | Bin
 .../studio => studio}/doc/html/gui_struct.png | Bin
 .../doc/html/object_viewer_qt_window.png      | Bin
 {code/studio => studio}/doc/make_ovqt_dox.bat |   0
 {code/studio => studio}/doc/make_ovqt_dox.sh  |   0
 {code/studio => studio}/doc/ovqt.dox          |   0
 {code/studio => studio}/ovqt_config.h.cmake   |   0
 .../src/3rdparty/CMakeLists.txt               |   0
 .../3rdparty/qtpropertybrowser/CMakeLists.txt |   0
 .../qtpropertybrowser/LGPL_EXCEPTION.txt      |   0
 .../3rdparty/qtpropertybrowser/LICENSE.GPL3   |   0
 .../3rdparty/qtpropertybrowser/LICENSE.LGPL   |   0
 .../QtAbstractEditorFactoryBase               |   0
 .../QtAbstractPropertyBrowser                 |   0
 .../QtAbstractPropertyManager                 |   0
 .../qtpropertybrowser/QtBoolPropertyManager   |   0
 .../3rdparty/qtpropertybrowser/QtBrowserItem  |   0
 .../qtpropertybrowser/QtButtonPropertyBrowser |   0
 .../qtpropertybrowser/QtCharEditorFactory     |   0
 .../qtpropertybrowser/QtCharPropertyManager   |   0
 .../qtpropertybrowser/QtCheckBoxFactory       |   0
 .../qtpropertybrowser/QtColorEditorFactory    |   0
 .../qtpropertybrowser/QtColorPropertyManager  |   0
 .../qtpropertybrowser/QtCursorEditorFactory   |   0
 .../qtpropertybrowser/QtCursorPropertyManager |   0
 .../qtpropertybrowser/QtDateEditFactory       |   0
 .../qtpropertybrowser/QtDatePropertyManager   |   0
 .../qtpropertybrowser/QtDateTimeEditFactory   |   0
 .../QtDateTimePropertyManager                 |   0
 .../qtpropertybrowser/QtDoublePropertyManager |   0
 .../qtpropertybrowser/QtDoubleSpinBoxFactory  |   0
 .../qtpropertybrowser/QtEnumEditorFactory     |   0
 .../qtpropertybrowser/QtEnumPropertyManager   |   0
 .../qtpropertybrowser/QtFlagPropertyManager   |   0
 .../qtpropertybrowser/QtFontEditorFactory     |   0
 .../qtpropertybrowser/QtFontPropertyManager   |   0
 .../QtGroupBoxPropertyBrowser                 |   0
 .../qtpropertybrowser/QtGroupPropertyManager  |   0
 .../qtpropertybrowser/QtIntPropertyManager    |   0
 .../QtKeySequenceEditorFactory                |   0
 .../QtKeySequencePropertyManager              |   0
 .../qtpropertybrowser/QtLineEditFactory       |   0
 .../qtpropertybrowser/QtLocalePropertyManager |   0
 .../qtpropertybrowser/QtPointFPropertyManager |   0
 .../qtpropertybrowser/QtPointPropertyManager  |   0
 .../src/3rdparty/qtpropertybrowser/QtProperty |   0
 .../qtpropertybrowser/QtRectFPropertyManager  |   0
 .../qtpropertybrowser/QtRectPropertyManager   |   0
 .../qtpropertybrowser/QtScrollBarFactory      |   0
 .../qtpropertybrowser/QtSizeFPropertyManager  |   0
 .../QtSizePolicyPropertyManager               |   0
 .../qtpropertybrowser/QtSizePropertyManager   |   0
 .../qtpropertybrowser/QtSliderFactory         |   0
 .../qtpropertybrowser/QtSpinBoxFactory        |   0
 .../qtpropertybrowser/QtStringPropertyManager |   0
 .../qtpropertybrowser/QtTimeEditFactory       |   0
 .../qtpropertybrowser/QtTimePropertyManager   |   0
 .../qtpropertybrowser/QtTreePropertyBrowser   |   0
 .../qtpropertybrowser/QtVariantEditorFactory  |   0
 .../qtpropertybrowser/QtVariantProperty       |   0
 .../QtVariantPropertyManager                  |   0
 .../src/3rdparty/qtpropertybrowser/README.TXT |   0
 .../qtpropertybrowser/images/cursor-arrow.png | Bin
 .../qtpropertybrowser/images/cursor-busy.png  | Bin
 .../images/cursor-closedhand.png              | Bin
 .../qtpropertybrowser/images/cursor-cross.png | Bin
 .../images/cursor-forbidden.png               | Bin
 .../qtpropertybrowser/images/cursor-hand.png  | Bin
 .../images/cursor-hsplit.png                  | Bin
 .../qtpropertybrowser/images/cursor-ibeam.png | Bin
 .../images/cursor-openhand.png                | Bin
 .../images/cursor-sizeall.png                 | Bin
 .../qtpropertybrowser/images/cursor-sizeb.png | Bin
 .../qtpropertybrowser/images/cursor-sizef.png | Bin
 .../qtpropertybrowser/images/cursor-sizeh.png | Bin
 .../qtpropertybrowser/images/cursor-sizev.png | Bin
 .../images/cursor-uparrow.png                 | Bin
 .../images/cursor-vsplit.png                  | Bin
 .../qtpropertybrowser/images/cursor-wait.png  | Bin
 .../images/cursor-whatsthis.png               | Bin
 .../images/resetproperty.png                  | Bin
 .../qtbuttonpropertybrowser.cpp               |   0
 .../qtbuttonpropertybrowser.h                 |   0
 .../qtpropertybrowser/qteditorfactory.cpp     |   0
 .../qtpropertybrowser/qteditorfactory.h       |   0
 .../qtgroupboxpropertybrowser.cpp             |   0
 .../qtgroupboxpropertybrowser.h               |   0
 .../qtpropertybrowser/qtpropertybrowser.cpp   |   0
 .../qtpropertybrowser/qtpropertybrowser.h     |   0
 .../qtpropertybrowser/qtpropertybrowser.pri   |   0
 .../qtpropertybrowser/qtpropertybrowser.qrc   |   0
 .../qtpropertybrowserutils.cpp                |   0
 .../qtpropertybrowserutils_p.h                |   0
 .../qtpropertybrowser/qtpropertymanager.cpp   |   0
 .../qtpropertybrowser/qtpropertymanager.h     |   0
 .../qttreepropertybrowser.cpp                 |   0
 .../qtpropertybrowser/qttreepropertybrowser.h |   0
 .../qtpropertybrowser/qtvariantproperty.cpp   |   0
 .../qtpropertybrowser/qtvariantproperty.h     |   0
 {code/studio => studio}/src/CMakeLists.txt    |   0
 {code/studio => studio}/src/description.h     |   0
 .../src/extension_system/iplugin.h            |   0
 .../src/extension_system/iplugin_manager.h    |   0
 .../src/extension_system/iplugin_spec.h       |   0
 .../src/extension_system/plugin_manager.cpp   |   0
 .../src/extension_system/plugin_manager.h     |   0
 .../src/extension_system/plugin_spec.cpp      |   0
 .../src/extension_system/plugin_spec.h        |   0
 .../src/images/studio_splash.png              | Bin
 {code/studio => studio}/src/main.cpp          |   0
 .../src/plugins/CMakeLists.txt                |   0
 .../src/plugins/bnp_manager/CMakeLists.txt    |   0
 .../bnp_manager/bnp_dirtree_dialog.cpp        |   0
 .../plugins/bnp_manager/bnp_dirtree_dialog.h  |   0
 .../plugins/bnp_manager/bnp_dirtree_form.ui   |   0
 .../src/plugins/bnp_manager/bnp_file.cpp      |   0
 .../src/plugins/bnp_manager/bnp_file.h        |   0
 .../bnp_manager/bnp_filelist_dialog.cpp       |   0
 .../plugins/bnp_manager/bnp_filelist_dialog.h |   0
 .../bnp_manager/bnp_filelist_dialog.ui        |   0
 .../bnp_manager/bnp_filesystem_model.cpp      |   0
 .../bnp_manager/bnp_filesystem_model.h        |   0
 .../src/plugins/bnp_manager/bnp_manager.qrc   |   0
 .../bnp_manager/bnp_manager_constants.h       |   0
 .../bnp_manager/bnp_manager_plugin.cpp        |   0
 .../plugins/bnp_manager/bnp_manager_plugin.h  |   0
 .../bnp_manager/bnp_manager_window.cpp        |   0
 .../plugins/bnp_manager/bnp_manager_window.h  |   0
 .../plugins/bnp_manager/bnp_manager_window.ui |   0
 .../plugins/bnp_manager/bnp_proxy_model.cpp   |   0
 .../src/plugins/bnp_manager/bnp_proxy_model.h |   0
 .../bnp_manager/images/ic_nel_add_item.png    | Bin
 .../bnp_manager/images/ic_nel_bnp_make.png    | Bin
 .../bnp_manager/images/ic_nel_delete_item.png | Bin
 .../bnp_manager/images/ic_nel_export.png      | Bin
 .../plugins/bnp_manager/images/ic_nel_new.png | Bin
 .../bnp_manager/images/ic_nel_reset_all.png   | Bin
 .../bnp_manager/studio_plugin_bnp_manager.xml |   0
 .../src/plugins/core/CMakeLists.txt           |   0
 .../plugins/core/Nel3DWidget/nel3d_widget.cpp |   0
 .../plugins/core/Nel3DWidget/nel3d_widget.h   |   0
 .../src/plugins/core/context_manager.cpp      |   0
 .../src/plugins/core/context_manager.h        |   0
 .../src/plugins/core/core.cpp                 |   0
 .../studio => studio}/src/plugins/core/core.h |   0
 .../src/plugins/core/core.qrc                 |   0
 .../src/plugins/core/core_config.h.cmake      |   0
 .../src/plugins/core/core_constants.h         |   0
 .../src/plugins/core/core_global.h            |   0
 .../src/plugins/core/core_plugin.cpp          |   0
 .../src/plugins/core/core_plugin.h            |   0
 .../plugins/core/general_settings_page.cpp    |   0
 .../src/plugins/core/general_settings_page.h  |   0
 .../src/plugins/core/general_settings_page.ui |   0
 .../plugins/core/icons/ic_nel_add_item.png    | Bin
 .../src/plugins/core/icons/ic_nel_crash.png   | Bin
 .../plugins/core/icons/ic_nel_delete_item.png | Bin
 .../plugins/core/icons/ic_nel_down_item.png   | Bin
 .../core/icons/ic_nel_generic_settings.png    | Bin
 .../src/plugins/core/icons/ic_nel_new.png     | Bin
 .../src/plugins/core/icons/ic_nel_open.png    | Bin
 .../core/icons/ic_nel_path_settings.png       | Bin
 .../src/plugins/core/icons/ic_nel_pill.png    | Bin
 .../src/plugins/core/icons/ic_nel_redo.png    | Bin
 .../plugins/core/icons/ic_nel_reset_all.png   | Bin
 .../src/plugins/core/icons/ic_nel_save.png    | Bin
 .../src/plugins/core/icons/ic_nel_save_as.png | Bin
 .../src/plugins/core/icons/ic_nel_undo.png    | Bin
 .../src/plugins/core/icons/ic_nel_up_item.png | Bin
 .../src/plugins/core/icontext.h               |   0
 .../src/plugins/core/icore.h                  |   0
 .../src/plugins/core/icore_listener.h         |   0
 .../src/plugins/core/images/nel.png           | Bin
 .../src/plugins/core/images/preferences.png   | Bin
 .../src/plugins/core/ioptions_page.h          |   0
 .../src/plugins/core/main_window.cpp          |   0
 .../src/plugins/core/main_window.h            |   0
 .../src/plugins/core/menu_manager.cpp         |   0
 .../src/plugins/core/menu_manager.h           |   0
 .../src/plugins/core/plugin_view_dialog.cpp   |   0
 .../src/plugins/core/plugin_view_dialog.h     |   0
 .../src/plugins/core/plugin_view_dialog.ui    |   0
 .../src/plugins/core/qtwin.cpp                |   0
 .../src/plugins/core/qtwin.h                  |   0
 .../core/search_paths_settings_page.cpp       |   0
 .../plugins/core/search_paths_settings_page.h |   0
 .../core/search_paths_settings_page.ui        |   0
 .../src/plugins/core/settings_dialog.cpp      |   0
 .../src/plugins/core/settings_dialog.h        |   0
 .../src/plugins/core/settings_dialog.ui       |   0
 .../src/plugins/core/studio_plugin_core.xml   |   0
 .../src/plugins/disp_sheet_id/CMakeLists.txt  |   0
 .../disp_sheet_id/disp_sheet_id_plugin.cpp    |   0
 .../disp_sheet_id/disp_sheet_id_plugin.h      |   0
 .../plugins/disp_sheet_id/sheet_id_view.cpp   |   0
 .../src/plugins/disp_sheet_id/sheet_id_view.h |   0
 .../plugins/disp_sheet_id/sheet_id_view.ui    |   0
 .../studio_plugin_disp_sheet_id.xml           |   0
 .../src/plugins/example/CMakeLists.txt        |   0
 .../src/plugins/example/example_plugin.cpp    |   0
 .../src/plugins/example/example_plugin.h      |   0
 .../plugins/example/example_settings_page.cpp |   0
 .../plugins/example/example_settings_page.h   |   0
 .../plugins/example/example_settings_page.ui  |   0
 .../src/plugins/example/qnel_widget.cpp       |   0
 .../src/plugins/example/qnel_widget.h         |   0
 .../src/plugins/example/simple_viewer.cpp     |   0
 .../src/plugins/example/simple_viewer.h       |   0
 .../plugins/example/studio_plugin_example.xml |   0
 .../src/plugins/georges_editor/CMakeLists.txt |   0
 .../src/plugins/georges_editor/actions.cpp    |   0
 .../src/plugins/georges_editor/actions.h      |   0
 .../plugins/georges_editor/browser_ctrl.cpp   |   0
 .../src/plugins/georges_editor/browser_ctrl.h |   0
 .../georges_editor/browser_ctrl_pvt.cpp       |   0
 .../plugins/georges_editor/browser_ctrl_pvt.h |   0
 .../georges_editor/dfn_browser_ctrl.cpp       |   0
 .../plugins/georges_editor/dfn_browser_ctrl.h |   0
 .../georges_editor/expandable_headerview.cpp  |   0
 .../georges_editor/expandable_headerview.h    |   0
 .../filepath_property_manager.cpp             |   0
 .../filepath_property_manager.h               |   0
 .../plugins/georges_editor/formdelegate.cpp   |   0
 .../src/plugins/georges_editor/formdelegate.h |   0
 .../src/plugins/georges_editor/formitem.cpp   |   0
 .../src/plugins/georges_editor/formitem.h     |   0
 .../src/plugins/georges_editor/georges.cpp    |   0
 .../src/plugins/georges_editor/georges.h      |   0
 .../georges_editor/georges_dfn_dialog.cpp     |   0
 .../georges_editor/georges_dfn_dialog.h       |   0
 .../georges_editor/georges_dfn_dialog.ui      |   0
 .../georges_editor/georges_dirtree_dialog.cpp |   0
 .../georges_editor/georges_dirtree_dialog.h   |   0
 .../georges_editor/georges_dirtree_form.ui    |   0
 .../georges_editor/georges_dock_widget.cpp    |   0
 .../georges_editor/georges_dock_widget.h      |   0
 .../plugins/georges_editor/georges_editor.qrc |   0
 .../georges_editor/georges_editor_constants.h |   0
 .../georges_editor/georges_editor_form.cpp    |   0
 .../georges_editor/georges_editor_form.h      |   0
 .../georges_editor/georges_editor_form.ui     |   0
 .../georges_editor/georges_editor_plugin.cpp  |   0
 .../georges_editor/georges_editor_plugin.h    |   0
 .../georges_filesystem_model.cpp              |   0
 .../georges_editor/georges_filesystem_model.h |   0
 .../georges_treeview_dialog.cpp               |   0
 .../georges_editor/georges_treeview_dialog.h  |   0
 .../georges_editor/georges_treeview_form.ui   |   0
 .../georges_editor/georges_typ_dialog.cpp     |   0
 .../georges_editor/georges_typ_dialog.h       |   0
 .../georges_editor/georges_typ_dialog.ui      |   0
 .../georges_editor/georgesform_model.cpp      |   0
 .../georges_editor/georgesform_model.h        |   0
 .../georgesform_proxy_model.cpp               |   0
 .../georges_editor/georgesform_proxy_model.h  |   0
 .../plugins/georges_editor/images/array.ico   | Bin
 .../plugins/georges_editor/images/header.ico  | Bin
 .../plugins/georges_editor/images/hold.ico    | Bin
 .../images/ic_nel_georges_editor.png          | Bin
 .../plugins/georges_editor/images/root.ico    | Bin
 .../plugins/georges_editor/images/struct.ico  | Bin
 .../plugins/georges_editor/images/vstruct.ico | Bin
 .../plugins/georges_editor/images/zfee51.ico  | Bin
 .../src/plugins/georges_editor/stdpch.cpp     |   0
 .../src/plugins/georges_editor/stdpch.h       |   0
 .../studio_plugin_georges_editor.xml          |   0
 .../georges_editor/typ_browser_ctrl.cpp       |   0
 .../plugins/georges_editor/typ_browser_ctrl.h |   0
 .../src/plugins/gui_editor/CMakeLists.txt     |   0
 .../src/plugins/gui_editor/action_editor.cpp  |   0
 .../src/plugins/gui_editor/action_editor.h    |   0
 .../src/plugins/gui_editor/action_editor.ui   |   0
 .../src/plugins/gui_editor/action_list.cpp    |   0
 .../src/plugins/gui_editor/action_list.h      |   0
 .../src/plugins/gui_editor/action_list.ui     |   0
 .../gui_editor/action_property_manager.cpp    |   0
 .../gui_editor/action_property_manager.h      |   0
 .../plugins/gui_editor/add_widget_widget.cpp  |   0
 .../plugins/gui_editor/add_widget_widget.h    |   0
 .../plugins/gui_editor/add_widget_widget.ui   |   0
 .../gui_editor/editor_message_processor.cpp   |   0
 .../gui_editor/editor_message_processor.h     |   0
 .../gui_editor/editor_selection_watcher.cpp   |   0
 .../gui_editor/editor_selection_watcher.h     |   0
 .../src/plugins/gui_editor/expr_link_dlg.cpp  |   0
 .../src/plugins/gui_editor/expr_link_dlg.h    |   0
 .../src/plugins/gui_editor/expr_link_dlg.ui   |   0
 .../src/plugins/gui_editor/expr_slot_info.h   |   0
 .../plugins/gui_editor/expression_editor.cpp  |   0
 .../plugins/gui_editor/expression_editor.h    |   0
 .../plugins/gui_editor/expression_editor.ui   |   0
 .../src/plugins/gui_editor/expression_info.h  |   0
 .../plugins/gui_editor/expression_link.cpp    |   0
 .../src/plugins/gui_editor/expression_link.h  |   0
 .../plugins/gui_editor/expression_loader.cpp  |   0
 .../plugins/gui_editor/expression_loader.h    |   0
 .../plugins/gui_editor/expression_node.cpp    |   0
 .../src/plugins/gui_editor/expression_node.h  |   0
 .../plugins/gui_editor/expression_store.cpp   |   0
 .../src/plugins/gui_editor/expression_store.h |   0
 .../plugins/gui_editor/expressions/abs.xml    |   0
 .../plugins/gui_editor/expressions/add.xml    |   0
 .../plugins/gui_editor/expressions/and.xml    |   0
 .../plugins/gui_editor/expressions/band.xml   |   0
 .../plugins/gui_editor/expressions/bnot.xml   |   0
 .../plugins/gui_editor/expressions/bor.xml    |   0
 .../plugins/gui_editor/expressions/bxor.xml   |   0
 .../gui_editor/expressions/dbcount.xml        |   0
 .../gui_editor/expressions/depends.xml        |   0
 .../plugins/gui_editor/expressions/div.xml    |   0
 .../src/plugins/gui_editor/expressions/eq.xml |   0
 .../gui_editor/expressions/extSign11To64.xml  |   0
 .../gui_editor/expressions/extSign8To64.xml   |   0
 .../gui_editor/expressions/getAlpha.xml       |   0
 .../gui_editor/expressions/getBlue.xml        |   0
 .../gui_editor/expressions/getGreen.xml       |   0
 .../plugins/gui_editor/expressions/getRed.xml |   0
 .../plugins/gui_editor/expressions/getbit.xml |   0
 .../gui_editor/expressions/getprop.xml        |   0
 .../gui_editor/expressions/identity.xml       |   0
 .../gui_editor/expressions/ifthenelse.xml     |   0
 .../gui_editor/expressions/ilinear.xml        |   0
 .../plugins/gui_editor/expressions/int.xml    |   0
 .../gui_editor/expressions/intToColor.xml     |   0
 .../gui_editor/expressions/isFinalVersion.xml |   0
 .../gui_editor/expressions/localize.xml       |   0
 .../gui_editor/expressions/makeRGB.xml        |   0
 .../plugins/gui_editor/expressions/max.xml    |   0
 .../plugins/gui_editor/expressions/min.xml    |   0
 .../plugins/gui_editor/expressions/mod.xml    |   0
 .../plugins/gui_editor/expressions/mul.xml    |   0
 .../src/plugins/gui_editor/expressions/ne.xml |   0
 .../plugins/gui_editor/expressions/not.xml    |   0
 .../gui_editor/expressions/oldvalue.xml       |   0
 .../src/plugins/gui_editor/expressions/or.xml |   0
 .../plugins/gui_editor/expressions/rand.xml   |   0
 .../plugins/gui_editor/expressions/sal.xml    |   0
 .../plugins/gui_editor/expressions/sar.xml    |   0
 .../expressions/secondsToTimeString.xml       |   0
 .../expressions/secondsToTimeStringShort.xml  |   0
 .../plugins/gui_editor/expressions/shl.xml    |   0
 .../plugins/gui_editor/expressions/shr.xml    |   0
 .../plugins/gui_editor/expressions/str.xml    |   0
 .../plugins/gui_editor/expressions/sub.xml    |   0
 .../plugins/gui_editor/expressions/switch.xml |   0
 .../plugins/gui_editor/expressions/value.xml  |   0
 .../src/plugins/gui_editor/fonts/ryzom.ttf    | Bin
 .../gui_editor/gui_editor_config.h.cmake      |   0
 .../plugins/gui_editor/gui_editor_constants.h |   0
 .../plugins/gui_editor/gui_editor_context.cpp |   0
 .../plugins/gui_editor/gui_editor_context.h   |   0
 .../gui_editor/gui_editor_core_listener.cpp   |   0
 .../gui_editor/gui_editor_core_listener.h     |   0
 .../plugins/gui_editor/gui_editor_global.h    |   0
 .../plugins/gui_editor/gui_editor_plugin.cpp  |   0
 .../plugins/gui_editor/gui_editor_plugin.h    |   0
 .../plugins/gui_editor/gui_editor_window.cpp  |   0
 .../plugins/gui_editor/gui_editor_window.h    |   0
 .../plugins/gui_editor/gui_editor_window.ui   |   0
 .../src/plugins/gui_editor/link_editor.cpp    |   0
 .../src/plugins/gui_editor/link_editor.h      |   0
 .../src/plugins/gui_editor/link_editor.ui     |   0
 .../src/plugins/gui_editor/link_list.cpp      |   0
 .../src/plugins/gui_editor/link_list.h        |   0
 .../src/plugins/gui_editor/link_list.ui       |   0
 .../src/plugins/gui_editor/nelgui_ctrl.cpp    |   0
 .../src/plugins/gui_editor/nelgui_ctrl.h      |   0
 .../src/plugins/gui_editor/new_gui_dlg.cpp    |   0
 .../src/plugins/gui_editor/new_gui_dlg.h      |   0
 .../src/plugins/gui_editor/new_gui_dlg.ui     |   0
 .../gui_editor/new_property_widget.cpp        |   0
 .../plugins/gui_editor/new_property_widget.h  |   0
 .../plugins/gui_editor/new_property_widget.ui |   0
 .../plugins/gui_editor/new_widget_widget.cpp  |   0
 .../plugins/gui_editor/new_widget_widget.h    |   0
 .../plugins/gui_editor/new_widget_widget.ui   |   0
 .../src/plugins/gui_editor/proc_editor.cpp    |   0
 .../src/plugins/gui_editor/proc_editor.h      |   0
 .../src/plugins/gui_editor/proc_editor.ui     |   0
 .../src/plugins/gui_editor/proc_list.cpp      |   0
 .../src/plugins/gui_editor/proc_list.h        |   0
 .../src/plugins/gui_editor/proc_list.ui       |   0
 .../gui_editor/project_file_parser.cpp        |   0
 .../plugins/gui_editor/project_file_parser.h  |   0
 .../gui_editor/project_file_serializer.cpp    |   0
 .../gui_editor/project_file_serializer.h      |   0
 .../src/plugins/gui_editor/project_files.h    |   0
 .../gui_editor/project_files/login.xml        |   0
 .../src/plugins/gui_editor/project_window.cpp |   0
 .../src/plugins/gui_editor/project_window.h   |   0
 .../src/plugins/gui_editor/project_window.ui  |   0
 .../gui_editor/property_browser_ctrl.cpp      |   0
 .../gui_editor/property_browser_ctrl.h        |   0
 .../gui_editor/studio_plugin_gui_editor.xml   |   0
 .../plugins/gui_editor/texture_chooser.cpp    |   0
 .../src/plugins/gui_editor/texture_chooser.h  |   0
 .../src/plugins/gui_editor/texture_chooser.ui |   0
 .../gui_editor/texture_property_manager.cpp   |   0
 .../gui_editor/texture_property_manager.h     |   0
 .../plugins/gui_editor/widget_hierarchy.cpp   |   0
 .../src/plugins/gui_editor/widget_hierarchy.h |   0
 .../plugins/gui_editor/widget_hierarchy.ui    |   0
 .../src/plugins/gui_editor/widget_info.h      |   0
 .../gui_editor/widget_info_serializer.cpp     |   0
 .../gui_editor/widget_info_serializer.h       |   0
 .../src/plugins/gui_editor/widget_info_tree.h |   0
 .../gui_editor/widget_info_tree_node.h        |   0
 .../gui_editor/widget_info_tree_visitor.h     |   0
 .../plugins/gui_editor/widget_properties.cpp  |   0
 .../plugins/gui_editor/widget_properties.h    |   0
 .../plugins/gui_editor/widget_properties.ui   |   0
 .../gui_editor/widget_properties_parser.cpp   |   0
 .../gui_editor/widget_properties_parser.h     |   0
 .../plugins/gui_editor/widget_serializer.cpp  |   0
 .../plugins/gui_editor/widget_serializer.h    |   0
 .../plugins/gui_editor/widgets/CtrlBase.xml   |   0
 .../gui_editor/widgets/CtrlBaseButton.xml     |   0
 .../plugins/gui_editor/widgets/CtrlButton.xml |   0
 .../gui_editor/widgets/CtrlColPick.xml        |   0
 .../plugins/gui_editor/widgets/CtrlScroll.xml |   0
 .../gui_editor/widgets/CtrlTabButton.xml      |   0
 .../gui_editor/widgets/CtrlTextButton.xml     |   0
 .../widgets/DBGroupSelectNumber.xml           |   0
 .../plugins/gui_editor/widgets/DBViewBar.xml  |   0
 .../plugins/gui_editor/widgets/DBViewBar3.xml |   0
 .../gui_editor/widgets/DBViewDigit.xml        |   0
 .../gui_editor/widgets/DBViewNumber.xml       |   0
 .../gui_editor/widgets/DBViewQuantity.xml     |   0
 .../plugins/gui_editor/widgets/GroupCell.xml  |   0
 .../gui_editor/widgets/GroupContainer.xml     |   0
 .../gui_editor/widgets/GroupEditBox.xml       |   0
 .../gui_editor/widgets/GroupEditBoxDecor.xml  |   0
 .../plugins/gui_editor/widgets/GroupFrame.xml |   0
 .../plugins/gui_editor/widgets/GroupHTML.xml  |   0
 .../gui_editor/widgets/GroupHeader.xml        |   0
 .../plugins/gui_editor/widgets/GroupList.xml  |   0
 .../plugins/gui_editor/widgets/GroupMenu.xml  |   0
 .../plugins/gui_editor/widgets/GroupModal.xml |   0
 .../gui_editor/widgets/GroupParagraph.xml     |   0
 .../gui_editor/widgets/GroupScrollText.xml    |   0
 .../plugins/gui_editor/widgets/GroupTab.xml   |   0
 .../plugins/gui_editor/widgets/GroupTable.xml |   0
 .../plugins/gui_editor/widgets/GroupTree.xml  |   0
 .../gui_editor/widgets/InterfaceElement.xml   |   0
 .../gui_editor/widgets/InterfaceGroup.xml     |   0
 .../widgets/InterfaceGroupWheel.xml           |   0
 .../plugins/gui_editor/widgets/RootGroup.xml  |   0
 .../plugins/gui_editor/widgets/ViewBitmap.xml |   0
 .../gui_editor/widgets/ViewBitmapCombo.xml    |   0
 .../plugins/gui_editor/widgets/ViewText.xml   |   0
 .../gui_editor/widgets/ViewTextFormated.xml   |   0
 .../plugins/gui_editor/widgets/ViewTextID.xml |   0
 .../gui_editor/widgets/ViewTextIDFormated.xml |   0
 .../plugins/landscape_editor/CMakeLists.txt   |   0
 .../plugins/landscape_editor/builder_zone.cpp |   0
 .../plugins/landscape_editor/builder_zone.h   |   0
 .../landscape_editor/builder_zone_base.cpp    |   0
 .../landscape_editor/builder_zone_base.h      |   0
 .../landscape_editor/builder_zone_region.cpp  |   0
 .../landscape_editor/builder_zone_region.h    |   0
 .../landscape_editor/icons/ic_grid.png        | Bin
 .../icons/ic_nel_landscape_item.png           | Bin
 .../icons/ic_nel_landscape_settings.png       | Bin
 .../icons/ic_nel_transition_land.png          | Bin
 .../icons/ic_nel_world_editor.png             | Bin
 .../landscape_editor/icons/ic_nel_zone.png    | Bin
 .../landscape_editor/icons/ic_nel_zonel.png   | Bin
 .../landscape_editor/icons/ic_nel_zones.png   | Bin
 .../landscape_editor/icons/ic_snapshot.png    | Bin
 .../landscape_editor/landscape_actions.cpp    |   0
 .../landscape_editor/landscape_actions.h      |   0
 .../landscape_editor/landscape_editor.qrc     |   0
 .../landscape_editor_constants.h              |   0
 .../landscape_editor_global.h                 |   0
 .../landscape_editor_plugin.cpp               |   0
 .../landscape_editor_plugin.h                 |   0
 .../landscape_editor_window.cpp               |   0
 .../landscape_editor_window.h                 |   0
 .../landscape_editor_window.ui                |   0
 .../landscape_editor/landscape_scene.cpp      |   0
 .../landscape_editor/landscape_scene.h        |   0
 .../landscape_editor/landscape_scene_base.cpp |   0
 .../landscape_editor/landscape_scene_base.h   |   0
 .../landscape_editor/landscape_view.cpp       |   0
 .../plugins/landscape_editor/landscape_view.h |   0
 .../landscape_editor/list_zones_model.cpp     |   0
 .../landscape_editor/list_zones_model.h       |   0
 .../landscape_editor/list_zones_widget.cpp    |   0
 .../landscape_editor/list_zones_widget.h      |   0
 .../landscape_editor/list_zones_widget.ui     |   0
 .../landscape_editor/pixmap_database.cpp      |   0
 .../landscape_editor/pixmap_database.h        |   0
 .../project_settings_dialog.cpp               |   0
 .../project_settings_dialog.h                 |   0
 .../project_settings_dialog.ui                |   0
 .../landscape_editor/shapshot_dialog.ui       |   0
 .../landscape_editor/snapshot_dialog.cpp      |   0
 .../landscape_editor/snapshot_dialog.h        |   0
 .../studio_plugin_landscape_editor.xml        |   0
 .../landscape_editor/zone_region_editor.cpp   |   0
 .../landscape_editor/zone_region_editor.h     |   0
 .../src/plugins/log/CMakeLists.txt            |   0
 .../src/plugins/log/log_form.ui               |   0
 .../src/plugins/log/log_plugin.cpp            |   0
 .../src/plugins/log/log_plugin.h              |   0
 .../src/plugins/log/log_settings_page.cpp     |   0
 .../src/plugins/log/log_settings_page.h       |   0
 .../src/plugins/log/log_settings_page.ui      |   0
 .../src/plugins/log/qt_displayer.cpp          |   0
 .../src/plugins/log/qt_displayer.h            |   0
 .../src/plugins/log/studio_plugin_log.xml     |   0
 .../plugins/mission_compiler/CMakeLists.txt   |   0
 .../mission_compiler/images/arrow-left-2.png  | Bin
 .../images/arrow-left-double-2.png            | Bin
 .../mission_compiler/images/arrow-right-2.png | Bin
 .../images/arrow-right-double-2.png           | Bin
 .../images/document-export-4.png              | Bin
 .../images/ic_nel_add_item.png                | Bin
 .../images/ic_nel_delete_item.png             | Bin
 .../images/ic_nel_down_item.png               | Bin
 .../images/ic_nel_generic_settings.png        | Bin
 .../images/ic_nel_reset_all.png               | Bin
 .../images/ic_nel_up_item.png                 | Bin
 .../images/news-subscribe-2.png               | Bin
 .../mission_compiler/images/run-build-2.png   | Bin
 .../mission_compiler/mission_compiler.qrc     |   0
 .../mission_compiler_main_window.cpp          |   0
 .../mission_compiler_main_window.h            |   0
 .../mission_compiler_main_window.ui           |   0
 .../mission_compiler_plugin.cpp               |   0
 .../mission_compiler_plugin.h                 |   0
 .../mission_compiler_plugin_constants.h       |   0
 .../mission_compiler_settings_page.cpp        |   0
 .../mission_compiler_settings_page.h          |   0
 .../mission_compiler_settings_page.ui         |   0
 .../mission_compiler/server_entry_dialog.cpp  |   0
 .../mission_compiler/server_entry_dialog.h    |   0
 .../mission_compiler/server_entry_dialog.ui   |   0
 .../studio_plugin_mission_compiler.xml        |   0
 .../mission_compiler/validation_file.cpp      |   0
 .../mission_compiler/validation_file.h        |   0
 .../src/plugins/object_viewer/CMakeLists.txt  |   0
 .../object_viewer/graphics_settings_page.cpp  |   0
 .../object_viewer/graphics_settings_page.h    |   0
 .../object_viewer/graphics_settings_page.ui   |   0
 .../object_viewer/graphics_viewport.cpp       |   0
 .../plugins/object_viewer/graphics_viewport.h |   0
 .../object_viewer/icons/ic_nel_add_item.png   | Bin
 .../object_viewer/icons/ic_nel_anim.png       | Bin
 .../object_viewer/icons/ic_nel_animset.png    | Bin
 .../icons/ic_nel_append_item.png              | Bin
 .../object_viewer/icons/ic_nel_bgcolor.png    | Bin
 .../icons/ic_nel_camera_3dedit.png            | Bin
 .../object_viewer/icons/ic_nel_camera_add.png | Bin
 .../object_viewer/icons/ic_nel_camera_del.png | Bin
 .../object_viewer/icons/ic_nel_camera_fps.png | Bin
 .../object_viewer/icons/ic_nel_daynight.png   | Bin
 .../icons/ic_nel_delete_item.png              | Bin
 .../object_viewer/icons/ic_nel_down_item.png  | Bin
 .../object_viewer/icons/ic_nel_framedelay.png | Bin
 .../icons/ic_nel_insert_item.png              | Bin
 .../object_viewer/icons/ic_nel_mixer.png      | Bin
 .../object_viewer/icons/ic_nel_mrm_mesh.png   | Bin
 .../object_viewer/icons/ic_nel_new.png        | Bin
 .../object_viewer/icons/ic_nel_open.png       | Bin
 .../icons/ic_nel_particle_system.png          | Bin
 .../icons/ic_nel_particle_system_close.png    | Bin
 .../object_viewer/icons/ic_nel_particles.png  | Bin
 .../object_viewer/icons/ic_nel_pill.png       | Bin
 .../object_viewer/icons/ic_nel_reset_all.png  | Bin
 .../icons/ic_nel_reset_camera.png             | Bin
 .../object_viewer/icons/ic_nel_save.png       | Bin
 .../object_viewer/icons/ic_nel_save_as.png    | Bin
 .../object_viewer/icons/ic_nel_skelscale.png  | Bin
 .../object_viewer/icons/ic_nel_sound.png      | Bin
 .../object_viewer/icons/ic_nel_up_item.png    | Bin
 .../object_viewer/icons/ic_nel_veget.png      | Bin
 .../object_viewer/icons/ic_nel_vegetset.png   | Bin
 .../object_viewer/icons/ic_nel_water.png      | Bin
 .../object_viewer/icons/ic_nel_wind.png       | Bin
 .../icons/ic_nel_workspace_item.png           | Bin
 .../ic_nel_collision_zone_item_24.png         | Bin
 .../ic_nel_emitter_item_24.png                | Bin
 .../ic_nel_force_item_24.png                  | Bin
 .../ic_nel_instance_item_24.png               | Bin
 .../ic_nel_light_item_24.png                  | Bin
 .../ic_nel_located_item_24.png                | Bin
 .../ic_nel_particle_item_24.png               | Bin
 .../ic_nel_particle_system_24.png             | Bin
 .../ic_nel_particle_system_close_24.png       | Bin
 .../ic_nel_sound_item_24.png                  | Bin
 .../ic_nel_workspace_item_24.png              | Bin
 .../plugins/object_viewer/images/dqynight.png | Bin
 .../object_viewer/images/ico_mrm_mesh.png     | Bin
 .../plugins/object_viewer/images/mixer.png    | Bin
 .../src/plugins/object_viewer/images/nel.png  | Bin
 .../plugins/object_viewer/images/pause.png    | Bin
 .../src/plugins/object_viewer/images/play.png | Bin
 .../plugins/object_viewer/images/polymode.png | Bin
 .../object_viewer/images/pqrticles.png        | Bin
 .../plugins/object_viewer/images/refresh.png  | Bin
 .../plugins/object_viewer/images/rmfill.png   | Bin
 .../plugins/object_viewer/images/rmline.png   | Bin
 .../plugins/object_viewer/images/rmpoints.png | Bin
 .../object_viewer/images/seek-backward.png    | Bin
 .../object_viewer/images/seek-forward.png     | Bin
 .../object_viewer/images/skip-backward.png    | Bin
 .../object_viewer/images/skip-forward.png     | Bin
 .../plugins/object_viewer/images/sound.png    | Bin
 .../src/plugins/object_viewer/images/stop.png | Bin
 .../plugins/object_viewer/images/water.png    | Bin
 .../src/plugins/object_viewer/images/wind.png | Bin
 .../src/plugins/object_viewer/main_window.cpp |   0
 .../src/plugins/object_viewer/main_window.h   |   0
 .../src/plugins/object_viewer/modules.cpp     |   0
 .../src/plugins/object_viewer/modules.h       |   0
 .../plugins/object_viewer/object_viewer.cpp   |   0
 .../src/plugins/object_viewer/object_viewer.h |   0
 .../plugins/object_viewer/object_viewer.qrc   |   0
 .../object_viewer/object_viewer_constants.h   |   0
 .../object_viewer/object_viewer_plugin.cpp    |   0
 .../object_viewer/object_viewer_plugin.h      |   0
 .../particle_system/attrib_form.ui            |   0
 .../particle_system/attrib_widget.cpp         |   0
 .../particle_system/attrib_widget.h           |   0
 .../particle_system/auto_lod_dialog.cpp       |   0
 .../particle_system/auto_lod_dialog.h         |   0
 .../particle_system/auto_lod_form.ui          |   0
 .../particle_system/basic_edit_form.ui        |   0
 .../particle_system/basic_edit_widget.cpp     |   0
 .../particle_system/basic_edit_widget.h       |   0
 .../particle_system/bin_op_dialog.cpp         |   0
 .../particle_system/bin_op_dialog.h           |   0
 .../particle_system/constraint_mesh_form.ui   |   0
 .../constraint_mesh_widget.cpp                |   0
 .../particle_system/constraint_mesh_widget.h  |   0
 .../particle_system/curve_dialog.cpp          |   0
 .../particle_system/curve_dialog.h            |   0
 .../particle_system/curve_form.ui             |   0
 .../particle_system/direction_form.ui         |   0
 .../particle_system/direction_widget.cpp      |   0
 .../particle_system/direction_widget.h        |   0
 .../object_viewer/particle_system/dup_ps.cpp  |   0
 .../object_viewer/particle_system/dup_ps.h    |   0
 .../particle_system/emitter_form.ui           |   0
 .../particle_system/emitter_page.cpp          |   0
 .../particle_system/emitter_page.h            |   0
 .../particle_system/follow_path_dialog.cpp    |   0
 .../particle_system/follow_path_dialog.h      |   0
 .../particle_system/located_bindable_form.ui  |   0
 .../particle_system/located_bindable_page.cpp |   0
 .../particle_system/located_bindable_page.h   |   0
 .../particle_system/located_form.ui           |   0
 .../particle_system/located_page.cpp          |   0
 .../particle_system/located_page.h            |   0
 .../particle_system/mesh_form.ui              |   0
 .../particle_system/mesh_widget.cpp           |   0
 .../particle_system/mesh_widget.h             |   0
 .../particle_system/morph_mesh_dialog.cpp     |   0
 .../particle_system/morph_mesh_dialog.h       |   0
 .../particle_system/morph_mesh_form.ui        |   0
 .../particle_system/multi_tex_dialog.cpp      |   0
 .../particle_system/multi_tex_dialog.h        |   0
 .../particle_system/multi_tex_form.ui         |   0
 .../particle_control_dialog.cpp               |   0
 .../particle_system/particle_control_dialog.h |   0
 .../particle_system/particle_control_form.ui  |   0
 .../particle_system/particle_editor.cpp       |   0
 .../particle_system/particle_editor.h         |   0
 .../particle_system/particle_force_form.ui    |   0
 .../particle_system/particle_force_page.cpp   |   0
 .../particle_system/particle_force_page.h     |   0
 .../particle_system/particle_light_form.ui    |   0
 .../particle_system/particle_light_page.cpp   |   0
 .../particle_system/particle_light_page.h     |   0
 .../particle_link_skeleton_dialog.cpp         |   0
 .../particle_link_skeleton_dialog.h           |   0
 .../particle_link_skeleton_form.ui            |   0
 .../particle_system/particle_node.cpp         |   0
 .../particle_system/particle_node.h           |   0
 .../particle_property_dialog.cpp              |   0
 .../particle_property_dialog.h                |   0
 .../particle_system/particle_sound_form.ui    |   0
 .../particle_system/particle_sound_page.cpp   |   0
 .../particle_system/particle_sound_page.h     |   0
 .../particle_system/particle_system_form.ui   |   0
 .../particle_system/particle_system_page.cpp  |   0
 .../particle_system/particle_system_page.h    |   0
 .../particle_texture_anim_form.ui             |   0
 .../particle_texture_anim_widget.cpp          |   0
 .../particle_texture_anim_widget.h            |   0
 .../particle_system/particle_texture_form.ui  |   0
 .../particle_texture_widget.cpp               |   0
 .../particle_system/particle_texture_widget.h |   0
 .../particle_system/particle_tree_model.cpp   |   0
 .../particle_system/particle_tree_model.h     |   0
 .../particle_workspace_dialog.cpp             |   0
 .../particle_workspace_dialog.h               |   0
 .../particle_workspace_form.ui                |   0
 .../particle_workspace_page.cpp               |   0
 .../particle_system/particle_workspace_page.h |   0
 .../particle_system/particle_zone_form.ui     |   0
 .../particle_system/particle_zone_page.cpp    |   0
 .../particle_system/particle_zone_page.h      |   0
 .../particle_system/ps_initial_pos.cpp        |   0
 .../particle_system/ps_initial_pos.h          |   0
 .../particle_system/ps_mover_form.ui          |   0
 .../particle_system/ps_mover_page.cpp         |   0
 .../particle_system/ps_mover_page.h           |   0
 .../particle_system/ps_wrapper.h              |   0
 .../particle_system/scheme_bank_dialog.cpp    |   0
 .../particle_system/scheme_bank_dialog.h      |   0
 .../particle_system/scheme_bank_form.ui       |   0
 .../particle_system/scheme_manager.cpp        |   0
 .../particle_system/scheme_manager.h          |   0
 .../particle_system/spinner_dialog.cpp        |   0
 .../particle_system/spinner_dialog.h          |   0
 .../particle_system/tail_form.ui              |   0
 .../particle_system/tail_particle_widget.cpp  |   0
 .../particle_system/tail_particle_widget.h    |   0
 .../particle_system/value_blender_dialog.cpp  |   0
 .../particle_system/value_blender_dialog.h    |   0
 .../value_from_emitter_dialog.cpp             |   0
 .../value_from_emitter_dialog.h               |   0
 .../particle_system/value_gradient_dialog.cpp |   0
 .../particle_system/value_gradient_dialog.h   |   0
 .../particle_system/value_gradient_form.ui    |   0
 .../particle_system/workspace_form.ui         |   0
 .../object_viewer/scene/animation_dialog.cpp  |   0
 .../object_viewer/scene/animation_dialog.h    |   0
 .../object_viewer/scene/animation_form.ui     |   0
 .../scene/animation_set_dialog.cpp            |   0
 .../scene/animation_set_dialog.h              |   0
 .../object_viewer/scene/animation_set_form.ui |   0
 .../object_viewer/scene/camera_control.cpp    |   0
 .../object_viewer/scene/camera_control.h      |   0
 .../object_viewer/scene/day_night_dialog.cpp  |   0
 .../object_viewer/scene/day_night_dialog.h    |   0
 .../object_viewer/scene/day_night_form.ui     |   0
 .../plugins/object_viewer/scene/entity.cpp    |   0
 .../src/plugins/object_viewer/scene/entity.h  |   0
 .../scene/global_wind_dialog.cpp              |   0
 .../object_viewer/scene/global_wind_dialog.h  |   0
 .../object_viewer/scene/global_wind_form.ui   |   0
 .../object_viewer/scene/setup_fog_dialog.cpp  |   0
 .../object_viewer/scene/setup_fog_dialog.h    |   0
 .../object_viewer/scene/setup_fog_form.ui     |   0
 .../scene/skeleton_scale_dialog.cpp           |   0
 .../scene/skeleton_scale_dialog.h             |   0
 .../scene/skeleton_scale_form.ui              |   0
 .../scene/skeleton_tree_model.cpp             |   0
 .../object_viewer/scene/skeleton_tree_model.h |   0
 .../plugins/object_viewer/scene/slot_form.ui  |   0
 .../scene/slot_manager_dialog.cpp             |   0
 .../object_viewer/scene/slot_manager_dialog.h |   0
 .../object_viewer/scene/sun_color_dialog.cpp  |   0
 .../object_viewer/scene/sun_color_dialog.h    |   0
 .../object_viewer/scene/sun_color_form.ui     |   0
 .../object_viewer/scene/tune_mrm_dialog.cpp   |   0
 .../object_viewer/scene/tune_mrm_dialog.h     |   0
 .../object_viewer/scene/tune_mrm_form.ui      |   0
 .../object_viewer/scene/tune_timer_dialog.cpp |   0
 .../object_viewer/scene/tune_timer_dialog.h   |   0
 .../object_viewer/scene/tune_timer_form.ui    |   0
 .../object_viewer/scene/water_pool_dialog.cpp |   0
 .../object_viewer/scene/water_pool_dialog.h   |   0
 .../object_viewer/scene/water_pool_form.ui    |   0
 .../object_viewer/sound_settings_page.cpp     |   0
 .../object_viewer/sound_settings_page.h       |   0
 .../object_viewer/sound_settings_page.ui      |   0
 .../plugins/object_viewer/sound_system.cpp    |   0
 .../src/plugins/object_viewer/sound_system.h  |   0
 .../src/plugins/object_viewer/stdpch.cpp      |   0
 .../src/plugins/object_viewer/stdpch.h        |   0
 .../studio_plugin_object_viewer.xml           |   0
 .../vegetable/vegetable_appearance_page.cpp   |   0
 .../vegetable/vegetable_appearance_page.h     |   0
 .../vegetable/vegetable_apperance_form.ui     |   0
 .../vegetable/vegetable_density_form.ui       |   0
 .../vegetable/vegetable_density_page.cpp      |   0
 .../vegetable/vegetable_density_page.h        |   0
 .../vegetable/vegetable_dialog.cpp            |   0
 .../vegetable/vegetable_dialog.h              |   0
 .../vegetable/vegetable_dialog_form.ui        |   0
 .../vegetable/vegetable_editor.cpp            |   0
 .../vegetable/vegetable_editor.h              |   0
 .../vegetable/vegetable_landscape_form.ui     |   0
 .../vegetable/vegetable_landscape_page.cpp    |   0
 .../vegetable/vegetable_landscape_page.h      |   0
 .../vegetable/vegetable_node.cpp              |   0
 .../object_viewer/vegetable/vegetable_node.h  |   0
 .../vegetable/vegetable_noise_value_form.ui   |   0
 .../vegetable_noise_value_widget.cpp          |   0
 .../vegetable/vegetable_noise_value_widget.h  |   0
 .../vegetable/vegetable_rotate_form.ui        |   0
 .../vegetable/vegetable_rotate_page.cpp       |   0
 .../vegetable/vegetable_rotate_page.h         |   0
 .../vegetable/vegetable_scale_form.ui         |   0
 .../vegetable/vegetable_scale_page.cpp        |   0
 .../vegetable/vegetable_scale_page.h          |   0
 .../object_viewer/vegetable_settings_page.cpp |   0
 .../object_viewer/vegetable_settings_page.h   |   0
 .../object_viewer/vegetable_settings_page.ui  |   0
 .../object_viewer/widgets/color_edit_form.ui  |   0
 .../widgets/color_edit_widget.cpp             |   0
 .../object_viewer/widgets/color_edit_widget.h |   0
 .../widgets/edit_range_float_form.ui          |   0
 .../widgets/edit_range_uint_form.ui           |   0
 .../widgets/edit_range_widget.cpp             |   0
 .../object_viewer/widgets/edit_range_widget.h |   0
 .../object_viewer/widgets/hoverpoints.cpp     |   0
 .../object_viewer/widgets/hoverpoints.h       |   0
 .../plugins/ovqt_sheet_builder/CMakeLists.txt |   0
 .../ovqt_sheet_builder/ovqt_sheet_builder.cpp |   0
 .../ovqt_sheet_builder/ovqt_sheet_builder.h   |   0
 .../ovqt_sheet_builder/ovqt_sheet_builder.pro |   0
 .../plugins/ovqt_sheet_builder/sheetbuilder.h |   0
 .../sheetbuilderconfgdialog.cpp               |   0
 .../sheetbuilderconfgdialog.h                 |   0
 .../ovqt_sheet_builder/sheetbuilderdialog.cpp |   0
 .../ovqt_sheet_builder/sheetbuilderdialog.h   |   0
 .../studio_plugin_sheet_builder.xml           |   0
 .../src/plugins/tile_editor/CMakeLists.txt    |   0
 .../plugins/tile_editor/images/add_tile.png   | Bin
 .../tile_editor/images/delete_image.png       | Bin
 .../tile_editor/images/delete_tile.png        | Bin
 .../src/plugins/tile_editor/images/down.png   | Bin
 .../tile_editor/images/empty_image.png        | Bin
 .../tile_editor/images/ic_nel_add_item.png    | Bin
 .../tile_editor/images/ic_nel_delete_item.png | Bin
 .../plugins/tile_editor/images/ic_nel_new.png | Bin
 .../tile_editor/images/ic_nel_open.png        | Bin
 .../tile_editor/images/ic_nel_save.png        | Bin
 .../tile_editor/images/ic_nel_save_as.png     | Bin
 .../src/plugins/tile_editor/images/left.png   | Bin
 .../src/plugins/tile_editor/images/nel.png    | Bin
 .../tile_editor/images/replace_image.png      | Bin
 .../src/plugins/tile_editor/images/reset.png  | Bin
 .../src/plugins/tile_editor/images/right.png  | Bin
 .../plugins/tile_editor/images/rotation0.png  | Bin
 .../tile_editor/images/rotation180.png        | Bin
 .../tile_editor/images/rotation270.png        | Bin
 .../plugins/tile_editor/images/rotation90.png | Bin
 .../src/plugins/tile_editor/images/up.png     | Bin
 .../plugins/tile_editor/land_edit_dialog.cpp  |   0
 .../plugins/tile_editor/land_edit_dialog.h    |   0
 .../plugins/tile_editor/land_edit_dialog.ui   |   0
 .../tile_editor/studio_plugin_tile_editor.xml |   0
 .../src/plugins/tile_editor/tile_bank.cpp     |   0
 .../src/plugins/tile_editor/tile_bank.h       |   0
 .../src/plugins/tile_editor/tile_constants.h  |   0
 .../src/plugins/tile_editor/tile_editor.qrc   |   0
 .../tile_editor/tile_editor_main_window.cpp   |   0
 .../tile_editor/tile_editor_main_window.h     |   0
 .../tile_editor/tile_editor_main_window.ui    |   0
 .../tile_editor/tile_editor_plugin.cpp        |   0
 .../plugins/tile_editor/tile_editor_plugin.h  |   0
 .../src/plugins/tile_editor/tile_images.h     |   0
 .../src/plugins/tile_editor/tile_item.cpp     |   0
 .../src/plugins/tile_editor/tile_item.h       |   0
 .../tile_editor/tile_item_delegate.cpp        |   0
 .../plugins/tile_editor/tile_item_delegate.h  |   0
 .../src/plugins/tile_editor/tile_model.cpp    |   0
 .../src/plugins/tile_editor/tile_model.h      |   0
 .../plugins/tile_editor/tilebank_loader.cpp   |   0
 .../src/plugins/tile_editor/tilebank_loader.h |   0
 .../plugins/tile_editor/tilebank_saver.cpp    |   0
 .../src/plugins/tile_editor/tilebank_saver.h  |   0
 .../translation_manager/CMakeLists.txt        |   0
 .../src/plugins/translation_manager/README    |   0
 .../translation_manager/editor_phrase.cpp     |   0
 .../translation_manager/editor_phrase.h       |   0
 .../translation_manager/editor_worksheet.cpp  |   0
 .../translation_manager/editor_worksheet.h    |   0
 .../translation_manager/extract_bot_names.cpp |   0
 .../translation_manager/extract_bot_names.h   |   0
 .../extract_new_sheet_names.cpp               |   0
 .../extract_new_sheet_names.h                 |   0
 .../translation_manager/ftp_selection.cpp     |   0
 .../translation_manager/ftp_selection.h       |   0
 .../translation_manager/ftp_selection.qrc     |   0
 .../translation_manager/ftp_selection.ui      |   0
 .../translation_manager/images/cdtoparent.png | Bin
 .../translation_manager/images/dir.png        | Bin
 .../translation_manager/images/file.png       | Bin
 .../translation_manager/source_selection.cpp  |   0
 .../translation_manager/source_selection.h    |   0
 .../translation_manager/source_selection.ui   |   0
 .../studio_plugin_translation_manager.xml     |   0
 .../translation_manager_constants.h           |   0
 .../translation_manager_editor.h              |   0
 .../translation_manager_main_window.cpp       |   0
 .../translation_manager_main_window.h         |   0
 .../translation_manager_main_window.ui        |   0
 .../translation_manager_plugin.cpp            |   0
 .../translation_manager_plugin.h              |   0
 .../translation_manager_settings_page.cpp     |   0
 .../translation_manager_settings_page.h       |   0
 .../translation_manager_settings_page.ui      |   0
 .../translation_manager/uxt_editor.cpp        |   0
 .../plugins/translation_manager/uxt_editor.h  |   0
 .../src/plugins/world_editor/CMakeLists.txt   |   0
 .../const_string_array_editor.cpp             |   0
 .../world_editor/const_string_array_editor.h  |   0
 .../world_editor/const_string_array_editor.ui |   0
 .../const_string_array_property.cpp           |   0
 .../const_string_array_property.h             |   0
 .../world_editor/icons/ic_nel_move.png        | Bin
 .../world_editor/icons/ic_nel_rotate.png      | Bin
 .../world_editor/icons/ic_nel_scale.png       | Bin
 .../world_editor/icons/ic_nel_select.png      | Bin
 .../world_editor/icons/ic_nel_turn.png        | Bin
 .../icons/ic_nel_world_editor.png             | Bin
 .../plugins/world_editor/primitive_item.cpp   |   0
 .../src/plugins/world_editor/primitive_item.h |   0
 .../plugins/world_editor/primitives_model.cpp |   0
 .../plugins/world_editor/primitives_model.h   |   0
 .../plugins/world_editor/primitives_view.cpp  |   0
 .../plugins/world_editor/primitives_view.h    |   0
 .../world_editor/project_settings_dialog.cpp  |   0
 .../world_editor/project_settings_dialog.h    |   0
 .../world_editor/project_settings_dialog.ui   |   0
 .../world_editor/property_editor_widget.cpp   |   0
 .../world_editor/property_editor_widget.h     |   0
 .../world_editor/property_editor_widget.ui    |   0
 .../studio_plugin_world_editor.xml            |   0
 .../src/plugins/world_editor/world_editor.qrc |   0
 .../world_editor/world_editor_actions.cpp     |   0
 .../world_editor/world_editor_actions.h       |   0
 .../world_editor/world_editor_constants.h     |   0
 .../world_editor/world_editor_global.h        |   0
 .../world_editor/world_editor_misc.cpp        |   0
 .../plugins/world_editor/world_editor_misc.h  |   0
 .../world_editor/world_editor_plugin.cpp      |   0
 .../world_editor/world_editor_plugin.h        |   0
 .../world_editor/world_editor_scene.cpp       |   0
 .../plugins/world_editor/world_editor_scene.h |   0
 .../world_editor/world_editor_scene_item.cpp  |   0
 .../world_editor/world_editor_scene_item.h    |   0
 .../world_editor_settings_page.cpp            |   0
 .../world_editor/world_editor_settings_page.h |   0
 .../world_editor_settings_page.ui             |   0
 .../world_editor/world_editor_window.cpp      |   0
 .../world_editor/world_editor_window.h        |   0
 .../world_editor/world_editor_window.ui       |   0
 .../src/plugins/zone_painter/CMakeLists.txt   |   0
 .../zone_painter/images/color-fill.png        | Bin
 .../images/color-picker-black.png             | Bin
 .../plugins/zone_painter/images/colorize.png  | Bin
 .../zone_painter/images/draw-brush.png        | Bin
 .../plugins/zone_painter/images/go-down-7.png | Bin
 .../plugins/zone_painter/images/go-jump-4.png | Bin
 .../plugins/zone_painter/images/lock-6.png    | Bin
 .../zone_painter/images/lock-silver.png       | Bin
 .../zone_painter/painter_dock_widget.cpp      |   0
 .../zone_painter/painter_dock_widget.h        |   0
 .../zone_painter/painter_dock_widget.ui       |   0
 .../src/plugins/zone_painter/qnel_widget.cpp  |   0
 .../src/plugins/zone_painter/qnel_widget.h    |   0
 .../studio_plugin_zone_painter.xml            |   0
 .../src/plugins/zone_painter/zone_painter.qrc |   0
 .../zone_painter/zone_painter_main_window.cpp |   0
 .../zone_painter/zone_painter_main_window.h   |   0
 .../zone_painter/zone_painter_main_window.ui  |   0
 .../zone_painter/zone_painter_model.cpp       |   0
 .../plugins/zone_painter/zone_painter_model.h |   0
 .../zone_painter/zone_painter_plugin.cpp      |   0
 .../zone_painter/zone_painter_plugin.h        |   0
 .../zone_painter_settings_page.cpp            |   0
 .../zone_painter/zone_painter_settings_page.h |   0
 .../zone_painter_settings_page.ui             |   0
 {code/studio => studio}/src/pm_watcher.cpp    |   0
 {code/studio => studio}/src/pm_watcher.h      |   0
 {code/studio => studio}/src/splash_screen.cpp |   0
 {code/studio => studio}/src/splash_screen.h   |   0
 .../src/startup_settings_dlg.cpp              |   0
 .../src/startup_settings_dlg.h                |   0
 .../src/startup_settings_dlg.ui               |   0
 {code/studio => studio}/src/studio.ico        | Bin
 {code/studio => studio}/src/studio.qrc        |   0
 {code/studio => studio}/src/studio.rc         |   0
 .../src/translations/object_viewer_qt_de.ts   |   0
 .../src/translations/object_viewer_qt_en.ts   |   0
 .../src/translations/object_viewer_qt_fr.ts   |   0
 .../src/translations/object_viewer_qt_ru.ts   |   0
 .../src/translations/translations.qrc         |   0
 {code/tool => tool}/CMakeLists.txt            |   0
 {code/tool => tool}/attribution/annotate.py   |   0
 {code/tool => tool}/bin2c/CMakeLists.txt      |   0
 {code/tool => tool}/bin2c/bin2c.cpp           |   0
 {code/tool => tool}/build/build               |   0
 {code/tool => tool}/build/buildquiet          |   0
 {code/tool => tool}/crash/crash.cpp           |   0
 .../increment_version/increment_version.cpp   |   0
 .../increment_version/increment_version.py    |   0
 {code/tool => tool}/mkdir_date/mkdir_date.cpp |   0
 {code/tool => tool}/open_file/open_file.cpp   |   0
 .../path_content_diff/path_content_diff.cpp   |   0
 {code/tool => tool}/ren_date/ren_date.cpp     |   0
 {code/tool => tool}/resswap/ResSwap.cpp       |   0
 {code/tool => tool}/resswap/icon1.ico         | Bin
 .../visual_studio_macros/autoexp.dat          |   0
 .../visual_studio_macros/autoexp_vc10.dat     |   0
 .../visual_studio_macros/doxbar.chm           | Bin
 .../visual_studio_macros/nevrax_macros.dsm    |   0
 .../visual_studio_macros/nevrax_macros_98.dsm |   0
 .../nevrax_macros_howto.txt                   |   0
 .../nevrax_macros_ryzom.dsm                   |   0
 .../visual_studio_macros/usertype.dat         |   0
 .../visual studio paths.reg                   | Bin
 .../docs/admin/shard_restart/Filelist.xml     |   0
 .../docs/admin/shard_restart/H38.css          |   0
 .../docs/admin/shard_restart/H70_2.htm        |   0
 .../HOWTO_Restarting_Ryzom_Game_Shards.htm    |   0
 .../docs/admin/shard_restart/Hd36.xml         |   0
 .../docs/admin/shard_restart/Hf69.htm         |   0
 .../docs/admin/shard_restart/Hg39_1.gif       | Bin
 .../docs/admin/shard_restart/Hg39_1.htm       |   0
 .../docs/admin/shard_restart/Hg41_2.gif       | Bin
 .../docs/admin/shard_restart/Hg41_2.htm       |   0
 .../docs/admin/shard_restart/Hg43_3.gif       | Bin
 .../docs/admin/shard_restart/Hg43_3.htm       |   0
 .../docs/admin/shard_restart/Hg45_4.gif       | Bin
 .../docs/admin/shard_restart/Hg45_4.htm       |   0
 .../docs/admin/shard_restart/Hg47_5.gif       | Bin
 .../docs/admin/shard_restart/Hg47_5.htm       |   0
 .../docs/admin/shard_restart/Hg49_6.gif       | Bin
 .../docs/admin/shard_restart/Hg49_6.htm       |   0
 .../docs/admin/shard_restart/Hg51_7.gif       | Bin
 .../docs/admin/shard_restart/Hg51_7.htm       |   0
 .../docs/admin/shard_restart/Hg53_8.gif       | Bin
 .../docs/admin/shard_restart/Hg53_8.htm       |   0
 .../docs/admin/shard_restart/Hg55_9.gif       | Bin
 .../docs/admin/shard_restart/Hg55_9.htm       |   0
 .../docs/admin/shard_restart/Hg57_10.gif      | Bin
 .../docs/admin/shard_restart/Hg57_10.htm      |   0
 .../docs/admin/shard_restart/Hg59_11.gif      | Bin
 .../docs/admin/shard_restart/Hg59_11.htm      |   0
 .../docs/admin/shard_restart/Hg61_12.gif      | Bin
 .../docs/admin/shard_restart/Hg61_12.htm      |   0
 .../docs/admin/shard_restart/Hn68.htm         |   0
 .../docs/admin/shard_restart/Hu37.js          |   0
 .../docs/admin/shard_restart/Hz63.htm         |   0
 .../docs/admin/shard_restart/lt_off.gif       | Bin
 .../docs/admin/shard_restart/lt_over.gif      | Bin
 .../docs/admin/shard_restart/rt_off.gif       | Bin
 .../docs/admin/shard_restart/rt_over.gif      | Bin
 {code/web => web}/docs/ams/doxygen/Doxyfile   |   0
 {code/web => web}/docs/ams/doxygen/img/db.png | Bin
 .../web => web}/docs/ams/doxygen/img/info.jpg | Bin
 .../web => web}/docs/ams/doxygen/img/info.psd | Bin
 {code/web => web}/docs/ams/doxygen/info.php   |   0
 {code/web => web}/docs/ams/doxygen/logo.png   | Bin
 .../private_php/ams/autoload/assigned.php     |   0
 .../private_php/ams/autoload/dblayer.php      |   0
 .../private_php/ams/autoload/forwarded.php    |   0
 .../private_php/ams/autoload/gui_elements.php |   0
 .../private_php/ams/autoload/helpers.php      |   0
 .../ams/autoload/in_support_group.php         |   0
 .../private_php/ams/autoload/mail_handler.php |   0
 .../private_php/ams/autoload/mycrypt.php      |   0
 .../private_php/ams/autoload/pagination.php   |   0
 .../private_php/ams/autoload/plugincache.php  |   0
 .../private_php/ams/autoload/querycache.php   |   0
 .../private_php/ams/autoload/rest_api.php     |   0
 .../ams/autoload/support_group.php            |   0
 .../private_php/ams/autoload/sync.php         |   0
 .../private_php/ams/autoload/ticket.php       |   0
 .../ams/autoload/ticket_category.php          |   0
 .../ams/autoload/ticket_content.php           |   0
 .../private_php/ams/autoload/ticket_info.php  |   0
 .../private_php/ams/autoload/ticket_log.php   |   0
 .../private_php/ams/autoload/ticket_queue.php |   0
 .../ams/autoload/ticket_queue_handler.php     |   0
 .../private_php/ams/autoload/ticket_reply.php |   0
 .../private_php/ams/autoload/ticket_user.php  |   0
 .../private_php/ams/autoload/users.php        |   0
 .../private_php/ams/configs/ams_lib.conf      |   0
 .../private_php/ams/configs/ingame_layout.ini |   0
 .../private_php/ams/img/info/client.png       | Bin
 .../private_php/ams/img/info/connect.png      | Bin
 .../private_php/ams/img/info/cpuid.png        | Bin
 .../private_php/ams/img/info/ht.png           | Bin
 .../private_php/ams/img/info/local.png        | Bin
 .../private_php/ams/img/info/mask.png         | Bin
 .../private_php/ams/img/info/memory.png       | Bin
 .../private_php/ams/img/info/nel.png          | Bin
 .../private_php/ams/img/info/os.png           | Bin
 .../private_php/ams/img/info/patch.png        | Bin
 .../private_php/ams/img/info/position.png     | Bin
 .../private_php/ams/img/info/processor.png    | Bin
 .../private_php/ams/img/info/server.png       | Bin
 .../private_php/ams/img/info/shard.png        | Bin
 .../private_php/ams/img/info/user.png         | Bin
 .../private_php/ams/img/info/view.png         | Bin
 .../ams/ingame_templates/createticket.tpl     |   0
 .../ams/ingame_templates/dashboard.tpl        |   0
 .../ams/ingame_templates/index.tpl            |   0
 .../ams/ingame_templates/layout.tpl           |   0
 .../ams/ingame_templates/layout_admin.tpl     |   0
 .../ams/ingame_templates/layout_mod.tpl       |   0
 .../ams/ingame_templates/layout_user.tpl      |   0
 .../ams/ingame_templates/login.tpl            |   0
 .../ams/ingame_templates/register.tpl         |   0
 .../ams/ingame_templates/settings.tpl         |   0
 .../ams/ingame_templates/sgroup_list.tpl      |   0
 .../ams/ingame_templates/show_queue.tpl       |   0
 .../ams/ingame_templates/show_reply.tpl       |   0
 .../ams/ingame_templates/show_sgroup.tpl      |   0
 .../ams/ingame_templates/show_ticket.tpl      |   0
 .../ams/ingame_templates/show_ticket_info.tpl |   0
 .../ams/ingame_templates/show_ticket_log.tpl  |   0
 .../ams/ingame_templates/show_user.tpl        |   0
 .../ams/ingame_templates/userlist.tpl         |   0
 .../private_php/ams/libinclude.php            |   0
 .../private_php/ams/mail/placeholder          |   0
 .../ams/plugins/API_key_management/.info      |   0
 .../API_key_management/API_key_management.php |   0
 .../API_key_management/generate_key.php       |   0
 .../API_key_management/templates/gen_key.tpl  |   0
 .../API_key_management/templates/index.tpl    |   0
 .../ams/plugins/Achievements/.info            |   0
 .../ams/plugins/Achievements/Achievements.php |   0
 .../plugins/Achievements/templates/index.tpl  |   0
 .../ams/plugins/Domain_Management/.info       |   0
 .../Domain_Management/Domain_Management.php   |   0
 .../Domain_Management/templates/index.tpl     |   0
 .../ams/plugins/cacheresource.apc.php         |   0
 .../ams/plugins/cacheresource.memcache.php    |   0
 .../ams/plugins/cacheresource.mysql.php       |   0
 .../ams/plugins/doxygen_plugin_management.php |   0
 .../ams/plugins/resource.extendsall.php       |   0
 .../ams/plugins/resource.mysql.php            |   0
 .../ams/plugins/resource.mysqls.php           |   0
 .../web => web}/private_php/ams/smarty/README |   0
 .../ams/smarty/SMARTY_2_BC_NOTES.txt          |   0
 .../ams/smarty/SMARTY_3.0_BC_NOTES.txt        |   0
 .../ams/smarty/SMARTY_3.1_NOTES.txt           |   0
 .../private_php/ams/smarty/change_log.txt     |   0
 .../ams/smarty/libs/Smarty.class.php          |   0
 .../ams/smarty/libs/SmartyBC.class.php        |   0
 .../private_php/ams/smarty/libs/debug.tpl     |   0
 .../smarty/libs/plugins/block.textformat.php  |   0
 .../smarty/libs/plugins/function.counter.php  |   0
 .../smarty/libs/plugins/function.cycle.php    |   0
 .../smarty/libs/plugins/function.fetch.php    |   0
 .../libs/plugins/function.html_checkboxes.php |   0
 .../libs/plugins/function.html_image.php      |   0
 .../libs/plugins/function.html_options.php    |   0
 .../libs/plugins/function.html_radios.php     |   0
 .../plugins/function.html_select_date.php     |   0
 .../plugins/function.html_select_time.php     |   0
 .../libs/plugins/function.html_table.php      |   0
 .../smarty/libs/plugins/function.mailto.php   |   0
 .../ams/smarty/libs/plugins/function.math.php |   0
 .../libs/plugins/modifier.capitalize.php      |   0
 .../libs/plugins/modifier.date_format.php     |   0
 .../libs/plugins/modifier.debug_print_var.php |   0
 .../smarty/libs/plugins/modifier.escape.php   |   0
 .../libs/plugins/modifier.regex_replace.php   |   0
 .../smarty/libs/plugins/modifier.replace.php  |   0
 .../smarty/libs/plugins/modifier.spacify.php  |   0
 .../smarty/libs/plugins/modifier.truncate.php |   0
 .../libs/plugins/modifiercompiler.cat.php     |   0
 .../modifiercompiler.count_characters.php     |   0
 .../modifiercompiler.count_paragraphs.php     |   0
 .../modifiercompiler.count_sentences.php      |   0
 .../plugins/modifiercompiler.count_words.php  |   0
 .../libs/plugins/modifiercompiler.default.php |   0
 .../libs/plugins/modifiercompiler.escape.php  |   0
 .../plugins/modifiercompiler.from_charset.php |   0
 .../libs/plugins/modifiercompiler.indent.php  |   0
 .../libs/plugins/modifiercompiler.lower.php   |   0
 .../libs/plugins/modifiercompiler.noprint.php |   0
 .../modifiercompiler.string_format.php        |   0
 .../libs/plugins/modifiercompiler.strip.php   |   0
 .../plugins/modifiercompiler.strip_tags.php   |   0
 .../plugins/modifiercompiler.to_charset.php   |   0
 .../plugins/modifiercompiler.unescape.php     |   0
 .../libs/plugins/modifiercompiler.upper.php   |   0
 .../plugins/modifiercompiler.wordwrap.php     |   0
 .../plugins/outputfilter.trimwhitespace.php   |   0
 .../plugins/shared.escape_special_chars.php   |   0
 .../plugins/shared.literal_compiler_param.php |   0
 .../libs/plugins/shared.make_timestamp.php    |   0
 .../libs/plugins/shared.mb_str_replace.php    |   0
 .../smarty/libs/plugins/shared.mb_unicode.php |   0
 .../libs/plugins/shared.mb_wordwrap.php       |   0
 .../variablefilter.htmlspecialchars.php       |   0
 .../libs/sysplugins/smarty_cacheresource.php  |   0
 .../smarty_cacheresource_custom.php           |   0
 .../smarty_cacheresource_keyvaluestore.php    |   0
 .../libs/sysplugins/smarty_config_source.php  |   0
 .../smarty_internal_cacheresource_file.php    |   0
 .../smarty_internal_compile_append.php        |   0
 .../smarty_internal_compile_assign.php        |   0
 .../smarty_internal_compile_block.php         |   0
 .../smarty_internal_compile_break.php         |   0
 .../smarty_internal_compile_call.php          |   0
 .../smarty_internal_compile_capture.php       |   0
 .../smarty_internal_compile_config_load.php   |   0
 .../smarty_internal_compile_continue.php      |   0
 .../smarty_internal_compile_debug.php         |   0
 .../smarty_internal_compile_eval.php          |   0
 .../smarty_internal_compile_extends.php       |   0
 .../smarty_internal_compile_for.php           |   0
 .../smarty_internal_compile_foreach.php       |   0
 .../smarty_internal_compile_function.php      |   0
 .../sysplugins/smarty_internal_compile_if.php |   0
 .../smarty_internal_compile_include.php       |   0
 .../smarty_internal_compile_include_php.php   |   0
 .../smarty_internal_compile_insert.php        |   0
 .../smarty_internal_compile_ldelim.php        |   0
 .../smarty_internal_compile_nocache.php       |   0
 ..._internal_compile_private_block_plugin.php |   0
 ...ternal_compile_private_function_plugin.php |   0
 ...arty_internal_compile_private_modifier.php |   0
 ..._compile_private_object_block_function.php |   0
 ...ternal_compile_private_object_function.php |   0
 ...ernal_compile_private_print_expression.php |   0
 ...ernal_compile_private_registered_block.php |   0
 ...al_compile_private_registered_function.php |   0
 ...ernal_compile_private_special_variable.php |   0
 .../smarty_internal_compile_rdelim.php        |   0
 .../smarty_internal_compile_section.php       |   0
 .../smarty_internal_compile_setfilter.php     |   0
 .../smarty_internal_compile_while.php         |   0
 .../smarty_internal_compilebase.php           |   0
 .../sysplugins/smarty_internal_config.php     |   0
 .../smarty_internal_config_file_compiler.php  |   0
 .../smarty_internal_configfilelexer.php       |   0
 .../smarty_internal_configfileparser.php      |   0
 .../libs/sysplugins/smarty_internal_data.php  |   0
 .../libs/sysplugins/smarty_internal_debug.php |   0
 .../smarty_internal_filter_handler.php        |   0
 .../smarty_internal_function_call_handler.php |   0
 .../smarty_internal_get_include_path.php      |   0
 .../smarty_internal_nocache_insert.php        |   0
 .../sysplugins/smarty_internal_parsetree.php  |   0
 .../smarty_internal_resource_eval.php         |   0
 .../smarty_internal_resource_extends.php      |   0
 .../smarty_internal_resource_file.php         |   0
 .../smarty_internal_resource_php.php          |   0
 .../smarty_internal_resource_registered.php   |   0
 .../smarty_internal_resource_stream.php       |   0
 .../smarty_internal_resource_string.php       |   0
 ...smarty_internal_smartytemplatecompiler.php |   0
 .../sysplugins/smarty_internal_template.php   |   0
 .../smarty_internal_templatebase.php          |   0
 .../smarty_internal_templatecompilerbase.php  |   0
 .../smarty_internal_templatelexer.php         |   0
 .../smarty_internal_templateparser.php        |   0
 .../sysplugins/smarty_internal_utility.php    |   0
 .../sysplugins/smarty_internal_write_file.php |   0
 .../libs/sysplugins/smarty_resource.php       |   0
 .../sysplugins/smarty_resource_custom.php     |   0
 .../sysplugins/smarty_resource_recompiled.php |   0
 .../sysplugins/smarty_resource_uncompiled.php |   0
 .../libs/sysplugins/smarty_security.php       |   0
 .../private_php/ams/tmp/placeholder           |   0
 .../private_php/ams/translations/en.ini       |   0
 .../private_php/ams/translations/fr.ini       |   0
 .../private_php/setup/config/config.php       |   0
 .../private_php/setup/config/config_user.php  |   0
 .../private_php/setup/sql/nel_00001.sql       |   0
 .../private_php/setup/sql/nel_00002.sql       |   0
 .../private_php/setup/sql/nel_00003.sql       |   0
 .../private_php/setup/sql/nel_00004.sql       |   0
 .../private_php/setup/sql/nel_ams_00001.sql   |   0
 .../private_php/setup/sql/nel_ams_00002.sql   |   0
 .../setup/sql/nel_ams_lib_00001.sql           |   0
 .../setup/sql/nel_ams_lib_00002.sql           |   0
 .../setup/sql/nel_ams_lib_00003.sql           |   0
 .../setup/sql/nel_ams_lib_00004.sql           |   0
 .../setup/sql/nel_ams_lib_00005.sql           |   0
 .../setup/sql/nel_ams_lib_00006.sql           |   0
 .../setup/sql/nel_ams_lib_00007.sql           |   0
 .../private_php/setup/sql/nel_tool_00001.sql  |   0
 .../private_php/setup/sql/nel_tool_00002.sql  |   0
 .../setup/sql/ring_domain_00001.sql           |   0
 .../private_php/setup/sql/webig_00001.sql     |   0
 {code/web => web}/public_php/admin/common.php |   0
 {code/web => web}/public_php/admin/config.php |   0
 .../public_php/admin/crons/cron_harddisk.php  |   0
 .../public_php/admin/crons/cron_harddisk.sh   |   0
 .../public_php/admin/crons/index.html         |   0
 .../public_php/admin/functions_auth.php       |   0
 .../public_php/admin/functions_common.php     |   0
 .../public_php/admin/functions_mysqli.php     |   0
 .../admin/functions_tool_administration.php   |   0
 .../admin/functions_tool_applications.php     |   0
 .../admin/functions_tool_event_entities.php   |   0
 .../admin/functions_tool_graphs.php           |   0
 .../admin/functions_tool_guild_locator.php    |   0
 .../admin/functions_tool_log_analyser.php     |   0
 .../public_php/admin/functions_tool_main.php  |   0
 .../public_php/admin/functions_tool_mfs.php   |   0
 .../public_php/admin/functions_tool_notes.php |   0
 .../admin/functions_tool_player_locator.php   |   0
 .../admin/functions_tool_preferences.php      |   0
 .../admin/graphs_output/placeholder           |   0
 .../public_php/admin/imgs/bg_live.png         | Bin
 .../public_php/admin/imgs/getfirefox.png      | Bin
 .../public_php/admin/imgs/icon_admin.gif      | Bin
 .../public_php/admin/imgs/icon_entity.gif     | Bin
 .../public_php/admin/imgs/icon_graphs.gif     | Bin
 .../admin/imgs/icon_guild_locator.gif         | Bin
 .../admin/imgs/icon_log_analyser.gif          | Bin
 .../public_php/admin/imgs/icon_logout.gif     | Bin
 .../public_php/admin/imgs/icon_main.gif       | Bin
 .../public_php/admin/imgs/icon_notes.gif      | Bin
 .../admin/imgs/icon_player_locator.gif        | Bin
 .../admin/imgs/icon_preferences.gif           | Bin
 .../public_php/admin/imgs/icon_unknown.png    | Bin
 .../web => web}/public_php/admin/imgs/nel.gif | Bin
 {code/web => web}/public_php/admin/index.php  |   0
 .../public_php/admin/jpgraph/flags.dat        | Bin
 .../admin/jpgraph/flags_thumb100x100.dat      | Bin
 .../admin/jpgraph/flags_thumb35x35.dat        | Bin
 .../admin/jpgraph/flags_thumb60x60.dat        | Bin
 .../admin/jpgraph/imgdata_balls.inc           |   0
 .../admin/jpgraph/imgdata_bevels.inc          |   0
 .../admin/jpgraph/imgdata_diamonds.inc        |   0
 .../admin/jpgraph/imgdata_pushpins.inc        |   0
 .../admin/jpgraph/imgdata_squares.inc         |   0
 .../admin/jpgraph/imgdata_stars.inc           |   0
 .../public_php/admin/jpgraph/jpg-config.inc   |   0
 .../public_php/admin/jpgraph/jpgraph.php      |   0
 .../admin/jpgraph/jpgraph_antispam-digits.php |   0
 .../admin/jpgraph/jpgraph_antispam.php        |   0
 .../public_php/admin/jpgraph/jpgraph_bar.php  |   0
 .../admin/jpgraph/jpgraph_canvas.php          |   0
 .../admin/jpgraph/jpgraph_canvtools.php       |   0
 .../public_php/admin/jpgraph/jpgraph_date.php |   0
 .../admin/jpgraph/jpgraph_error.php           |   0
 .../admin/jpgraph/jpgraph_flags.php           |   0
 .../admin/jpgraph/jpgraph_gantt.php           |   0
 .../admin/jpgraph/jpgraph_gb2312.php          |   0
 .../admin/jpgraph/jpgraph_gradient.php        |   0
 .../admin/jpgraph/jpgraph_iconplot.php        |   0
 .../admin/jpgraph/jpgraph_imgtrans.php        |   0
 .../public_php/admin/jpgraph/jpgraph_line.php |   0
 .../public_php/admin/jpgraph/jpgraph_log.php  |   0
 .../public_php/admin/jpgraph/jpgraph_pie.php  |   0
 .../admin/jpgraph/jpgraph_pie3d.php           |   0
 .../admin/jpgraph/jpgraph_plotband.php        |   0
 .../admin/jpgraph/jpgraph_plotmark.inc        |   0
 .../admin/jpgraph/jpgraph_polar.php           |   0
 .../admin/jpgraph/jpgraph_radar.php           |   0
 .../admin/jpgraph/jpgraph_regstat.php         |   0
 .../admin/jpgraph/jpgraph_scatter.php         |   0
 .../admin/jpgraph/jpgraph_stock.php           |   0
 .../admin/jpgraph/jpgraph_utils.inc           |   0
 .../public_php/admin/jpgraph/lang/en.inc.php  |   0
 .../public_php/admin/logs/empty.txt           |   0
 .../admin/nel/admin_modules_itf.php           |   0
 .../public_php/admin/nel/nel_message.php      |   0
 .../web => web}/public_php/admin/neltool.css  |   0
 .../public_php/admin/overlib/handgrab.gif     | Bin
 .../public_php/admin/overlib/makemini.pl      |   0
 .../public_php/admin/overlib/overlib.js       |   0
 .../admin/overlib/overlib_anchor.js           |   0
 .../admin/overlib/overlib_anchor_mini.js      |   0
 .../admin/overlib/overlib_draggable.js        |   0
 .../admin/overlib/overlib_draggable_mini.js   |   0
 .../public_php/admin/overlib/overlib_mini.js  |   0
 .../public_php/admin/scripts/index.html       |   0
 .../admin/scripts/restart_sequence.php        |   0
 .../public_php/admin/scripts/run_script.sh    |   0
 .../admin/smarty/Config_File.class.php        |   0
 .../public_php/admin/smarty/Smarty.class.php  |   0
 .../admin/smarty/Smarty_Compiler.class.php    |   0
 .../public_php/admin/smarty/debug.tpl         |   0
 .../core.assemble_plugin_filepath.php         |   0
 .../core.assign_smarty_interface.php          |   0
 .../internals/core.create_dir_structure.php   |   0
 .../internals/core.display_debug_console.php  |   0
 .../internals/core.get_include_path.php       |   0
 .../smarty/internals/core.get_microtime.php   |   0
 .../internals/core.get_php_resource.php       |   0
 .../admin/smarty/internals/core.is_secure.php |   0
 .../smarty/internals/core.is_trusted.php      |   0
 .../smarty/internals/core.load_plugins.php    |   0
 .../internals/core.load_resource_plugin.php   |   0
 .../internals/core.process_cached_inserts.php |   0
 .../core.process_compiled_include.php         |   0
 .../smarty/internals/core.read_cache_file.php |   0
 .../admin/smarty/internals/core.rm_auto.php   |   0
 .../admin/smarty/internals/core.rmdir.php     |   0
 .../internals/core.run_insert_handler.php     |   0
 .../internals/core.smarty_include_php.php     |   0
 .../internals/core.write_cache_file.php       |   0
 .../internals/core.write_compiled_include.php |   0
 .../core.write_compiled_resource.php          |   0
 .../smarty/internals/core.write_file.php      |   0
 .../admin/smarty/plugins/block.textformat.php |   0
 .../admin/smarty/plugins/compiler.assign.php  |   0
 .../plugins/function.assign_debug_info.php    |   0
 .../smarty/plugins/function.config_load.php   |   0
 .../admin/smarty/plugins/function.counter.php |   0
 .../admin/smarty/plugins/function.cycle.php   |   0
 .../admin/smarty/plugins/function.debug.php   |   0
 .../admin/smarty/plugins/function.eval.php    |   0
 .../admin/smarty/plugins/function.fetch.php   |   0
 .../plugins/function.html_checkboxes.php      |   0
 .../smarty/plugins/function.html_image.php    |   0
 .../smarty/plugins/function.html_options.php  |   0
 .../smarty/plugins/function.html_radios.php   |   0
 .../plugins/function.html_select_date.php     |   0
 .../plugins/function.html_select_time.php     |   0
 .../smarty/plugins/function.html_table.php    |   0
 .../admin/smarty/plugins/function.mailto.php  |   0
 .../admin/smarty/plugins/function.math.php    |   0
 .../admin/smarty/plugins/function.popup.php   |   0
 .../smarty/plugins/function.popup_init.php    |   0
 .../admin/smarty/plugins/function.substr.php  |   0
 .../smarty/plugins/modifier.capitalize.php    |   0
 .../admin/smarty/plugins/modifier.cat.php     |   0
 .../plugins/modifier.count_characters.php     |   0
 .../plugins/modifier.count_paragraphs.php     |   0
 .../plugins/modifier.count_sentences.php      |   0
 .../smarty/plugins/modifier.count_words.php   |   0
 .../smarty/plugins/modifier.date_format.php   |   0
 .../plugins/modifier.debug_print_var.php      |   0
 .../admin/smarty/plugins/modifier.default.php |   0
 .../admin/smarty/plugins/modifier.escape.php  |   0
 .../admin/smarty/plugins/modifier.indent.php  |   0
 .../admin/smarty/plugins/modifier.lower.php   |   0
 .../admin/smarty/plugins/modifier.nl2br.php   |   0
 .../smarty/plugins/modifier.regex_replace.php |   0
 .../admin/smarty/plugins/modifier.replace.php |   0
 .../admin/smarty/plugins/modifier.spacify.php |   0
 .../smarty/plugins/modifier.string_format.php |   0
 .../admin/smarty/plugins/modifier.strip.php   |   0
 .../smarty/plugins/modifier.strip_tags.php    |   0
 .../smarty/plugins/modifier.truncate.php      |   0
 .../admin/smarty/plugins/modifier.upper.php   |   0
 .../smarty/plugins/modifier.wordwrap.php      |   0
 .../plugins/outputfilter.trimwhitespace.php   |   0
 .../plugins/shared.escape_special_chars.php   |   0
 .../smarty/plugins/shared.make_timestamp.php  |   0
 .../admin/templates/default/index.tpl         |   0
 .../admin/templates/default/index_login.tpl   |   0
 .../default/index_restart_sequence.tpl        |   0
 .../admin/templates/default/page_footer.tpl   |   0
 .../templates/default/page_footer_light.tpl   |   0
 .../admin/templates/default/page_header.tpl   |   0
 .../templates/default/page_header_light.tpl   |   0
 .../admin/templates/default/tool_actions.tpl  |   0
 .../templates/default/tool_administration.tpl |   0
 .../tool_administration_applications.tpl      |   0
 .../default/tool_administration_domains.tpl   |   0
 .../default/tool_administration_groups.tpl    |   0
 .../default/tool_administration_logs.tpl      |   0
 .../default/tool_administration_restarts.tpl  |   0
 .../default/tool_administration_shards.tpl    |   0
 .../default/tool_administration_users.tpl     |   0
 .../tool_administration_users.tpl.backup      |   0
 .../templates/default/tool_event_entities.tpl |   0
 .../admin/templates/default/tool_graphs.tpl   |   0
 .../templates/default/tool_graphs_ccu.tpl     |   0
 .../templates/default/tool_graphs_hires.tpl   |   0
 .../templates/default/tool_graphs_tech.tpl    |   0
 .../templates/default/tool_guild_locator.tpl  |   0
 .../templates/default/tool_log_analyser.tpl   |   0
 .../default/tool_log_analyser_file_view.tpl   |   0
 .../admin/templates/default/tool_mfs.tpl      |   0
 .../admin/templates/default/tool_notes.tpl    |   0
 .../templates/default/tool_player_locator.tpl |   0
 .../templates/default/tool_preferences.tpl    |   0
 .../admin/templates/default_c/placeholder     |   0
 .../public_php/admin/tool_actions.php         |   0
 .../public_php/admin/tool_administration.php  |   0
 .../public_php/admin/tool_event_entities.php  |   0
 .../public_php/admin/tool_graphs.php          |   0
 .../public_php/admin/tool_guild_locator.php   |   0
 .../public_php/admin/tool_log_analyser.php    |   0
 .../web => web}/public_php/admin/tool_mfs.php |   0
 .../public_php/admin/tool_notes.php           |   0
 .../public_php/admin/tool_player_locator.php  |   0
 .../public_php/admin/tool_preferences.php     |   0
 .../public_php/ams/autoload/webusers.php      |   0
 .../public_php/ams/cache/placeholder          |   0
 .../public_php/ams/configs/ams_lib.conf       |   0
 .../public_php/ams/cron/mail_cron.php         |   0
 .../public_php/ams/cron/sync_cron.php         |   0
 .../public_php/ams/css/animate.min.css        |   0
 .../public_php/ams/css/bootstrap-cerulean.css |   0
 .../ams/css/bootstrap-cerulean.min.css        |   0
 .../public_php/ams/css/bootstrap-classic.css  |   0
 .../ams/css/bootstrap-classic.min.css         |   0
 .../public_php/ams/css/bootstrap-cyborg.css   |   0
 .../ams/css/bootstrap-cyborg.min.css          |   0
 .../ams/css/bootstrap-darkly.min.css          |   0
 .../public_php/ams/css/bootstrap-journal.css  |   0
 .../ams/css/bootstrap-lumen.min.css           |   0
 .../public_php/ams/css/bootstrap-redy.css     |   0
 .../ams/css/bootstrap-responsive.css          |   0
 .../ams/css/bootstrap-responsive.min.css      |   0
 .../public_php/ams/css/bootstrap-simplex.css  |   0
 .../ams/css/bootstrap-simplex.min.css         |   0
 .../public_php/ams/css/bootstrap-slate.css    |   0
 .../ams/css/bootstrap-slate.min.css           |   0
 .../public_php/ams/css/bootstrap-spacelab.css |   0
 .../ams/css/bootstrap-spacelab.min.css        |   0
 .../public_php/ams/css/bootstrap-united.css   |   0
 .../ams/css/bootstrap-united.min.css          |   0
 .../public_php/ams/css/charisma-app.css       |   0
 .../web => web}/public_php/ams/css/chosen.css |   0
 .../public_php/ams/css/colorbox.css           |   0
 .../web => web}/public_php/ams/css/custom.css |   0
 .../public_php/ams/css/elfinder.min.css       |   0
 .../public_php/ams/css/elfinder.theme.css     |   0
 .../public_php/ams/css/fullcalendar.css       |   0
 .../public_php/ams/css/fullcalendar.print.css |   0
 .../ams/css/jquery-ui-1.8.21.custom.css       |   0
 .../public_php/ams/css/jquery.cleditor.css    |   0
 .../ams/css/jquery.iphone.toggle.css          |   0
 .../public_php/ams/css/jquery.noty.css        |   0
 .../public_php/ams/css/noty_theme_default.css |   0
 .../public_php/ams/css/opa-icons.css          |   0
 .../public_php/ams/css/uniform.default.css    |   0
 .../public_php/ams/css/uploadify.css          |   0
 .../ams/doc/assets/images/html_structure.png  | Bin
 .../ams/doc/assets/images/image_1.png         | Bin
 .../ams/doc/css/documenter_style.css          |   0
 .../public_php/ams/doc/css/img/info.png       | Bin
 .../public_php/ams/doc/css/img/pre_bg.png     | Bin
 .../public_php/ams/doc/css/img/warning.png    | Bin
 .../public_php/ams/doc/favicon.ico            | Bin
 .../web => web}/public_php/ams/doc/index.html |   0
 .../public_php/ams/doc/js/jquery.1.6.4.js     |   0
 .../public_php/ams/doc/js/jquery.easing.js    |   0
 .../ams/doc/js/jquery.scrollTo-1.4.2-min.js   |   0
 .../public_php/ams/doc/js/script.js           |   0
 .../public_php/ams/files/.htaccess            |   0
 .../public_php/ams/files/index.html           |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../public_php/ams/func/activate_plugin.php   |   0
 .../public_php/ams/func/add_sgroup.php        |   0
 .../public_php/ams/func/add_user.php          |   0
 .../ams/func/add_user_to_sgroup.php           |   0
 .../public_php/ams/func/change_info.php       |   0
 .../public_php/ams/func/change_mail.php       |   0
 .../public_php/ams/func/change_password.php   |   0
 .../ams/func/change_receivemail.php           |   0
 .../public_php/ams/func/create_ticket.php     |   0
 .../public_php/ams/func/deactivate_plugin.php |   0
 .../public_php/ams/func/delete_plugin.php     |   0
 .../public_php/ams/func/forgot_password.php   |   0
 .../public_php/ams/func/install_plugin.php    |   0
 .../web => web}/public_php/ams/func/login.php |   0
 .../ams/func/modify_email_of_sgroup.php       |   0
 .../public_php/ams/func/reply_on_ticket.php   |   0
 .../public_php/ams/func/reset_password.php    |   0
 .../public_php/ams/func/update_plugin.php     |   0
 .../public_php/ams/func/upload.php            |   0
 .../public_php/ams/func/userRegistration.php  |   0
 .../ams/img/ajax-loaders/ajax-loader-1.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-2.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-3.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-4.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-5.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-6.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-7.gif    | Bin
 .../ams/img/ajax-loaders/ajax-loader-8.gif    | Bin
 .../public_php/ams/img/arrows-active.png      | Bin
 .../public_php/ams/img/arrows-normal.png      | Bin
 .../public_php/ams/img/bg-input-focus.png     | Bin
 .../public_php/ams/img/bg-input.png           | Bin
 .../web => web}/public_php/ams/img/border.png | Bin
 .../public_php/ams/img/buttons.gif            | Bin
 .../public_php/ams/img/cancel-off.png         | Bin
 .../public_php/ams/img/cancel-on.png          | Bin
 .../public_php/ams/img/chosen-sprite.png      | Bin
 .../public_php/ams/img/controls.png           | Bin
 {code/web => web}/public_php/ams/img/crop.gif | Bin
 .../public_php/ams/img/dialogs.png            | Bin
 {code/web => web}/public_php/ams/img/en.png   | Bin
 .../public_php/ams/img/error_bg.png           | Bin
 .../public_php/ams/img/favicon.ico            | Bin
 {code/web => web}/public_php/ams/img/fr.png   | Bin
 .../ams/img/glyphicons-halflings-white.png    | Bin
 .../ams/img/glyphicons-halflings.png          | Bin
 .../public_php/ams/img/icons-big.png          | Bin
 .../public_php/ams/img/icons-small.png        | Bin
 .../public_php/ams/img/info/client.png        | Bin
 .../public_php/ams/img/info/connect.png       | Bin
 .../public_php/ams/img/info/cpuid.png         | Bin
 .../public_php/ams/img/info/ht.png            | Bin
 .../public_php/ams/img/info/local.png         | Bin
 .../public_php/ams/img/info/mask.png          | Bin
 .../public_php/ams/img/info/memory.png        | Bin
 .../public_php/ams/img/info/nel.png           | Bin
 .../public_php/ams/img/info/os.png            | Bin
 .../public_php/ams/img/info/patch.png         | Bin
 .../public_php/ams/img/info/position.png      | Bin
 .../public_php/ams/img/info/processor.png     | Bin
 .../public_php/ams/img/info/server.png        | Bin
 .../public_php/ams/img/info/shard.png         | Bin
 .../public_php/ams/img/info/user.png          | Bin
 .../public_php/ams/img/info/view.png          | Bin
 .../ams/img/iphone-style-checkboxes/off.png   | Bin
 .../ams/img/iphone-style-checkboxes/on.png    | Bin
 .../img/iphone-style-checkboxes/slider.png    | Bin
 .../iphone-style-checkboxes/slider_center.png | Bin
 .../iphone-style-checkboxes/slider_left.png   | Bin
 .../iphone-style-checkboxes/slider_right.png  | Bin
 .../public_php/ams/img/loading.gif            | Bin
 .../public_php/ams/img/loading_background.png | Bin
 {code/web => web}/public_php/ams/img/logo.png | Bin
 .../web => web}/public_php/ams/img/logo20.png | Bin
 .../public_php/ams/img/mainlogo.png           | Bin
 .../public_php/ams/img/opa-icons-black16.png  | Bin
 .../public_php/ams/img/opa-icons-black32.png  | Bin
 .../public_php/ams/img/opa-icons-blue16.png   | Bin
 .../public_php/ams/img/opa-icons-blue32.png   | Bin
 .../public_php/ams/img/opa-icons-color16.png  | Bin
 .../public_php/ams/img/opa-icons-color32.png  | Bin
 .../ams/img/opa-icons-darkgray16.png          | Bin
 .../ams/img/opa-icons-darkgray32.png          | Bin
 .../public_php/ams/img/opa-icons-gray16.png   | Bin
 .../public_php/ams/img/opa-icons-gray32.png   | Bin
 .../public_php/ams/img/opa-icons-green16.png  | Bin
 .../public_php/ams/img/opa-icons-green32.png  | Bin
 .../public_php/ams/img/opa-icons-orange16.png | Bin
 .../public_php/ams/img/opa-icons-orange32.png | Bin
 .../public_php/ams/img/opa-icons-red16.png    | Bin
 .../public_php/ams/img/opa-icons-red32.png    | Bin
 .../public_php/ams/img/opa-icons-white16.png  | Bin
 .../public_php/ams/img/opa-icons-white32.png  | Bin
 .../public_php/ams/img/progress.gif           | Bin
 .../web => web}/public_php/ams/img/qrcode.png | Bin
 .../public_php/ams/img/qrcode136.png          | Bin
 .../public_php/ams/img/quicklook-bg.png       | Bin
 .../public_php/ams/img/quicklook-icons.png    | Bin
 .../web => web}/public_php/ams/img/resize.png | Bin
 .../public_php/ams/img/ryzomcore.png          | Bin
 .../public_php/ams/img/ryzomcore_166_62.png   | Bin
 .../public_php/ams/img/ryzomlogo.psd          | Bin
 .../public_php/ams/img/ryzomtop.png           | Bin
 .../public_php/ams/img/spinner-mini.gif       | Bin
 .../web => web}/public_php/ams/img/sprite.png | Bin
 .../public_php/ams/img/star-half.png          | Bin
 .../public_php/ams/img/star-off.png           | Bin
 .../public_php/ams/img/star-on.png            | Bin
 .../web => web}/public_php/ams/img/thumb.png  | Bin
 .../public_php/ams/img/toolbar.gif            | Bin
 .../public_php/ams/img/toolbar.png            | Bin
 .../ams/img/ui-bg_flat_0_aaaaaa_40x100.png    | Bin
 .../ams/img/ui-bg_flat_75_ffffff_40x100.png   | Bin
 .../ams/img/ui-bg_glass_55_fbf9ee_1x400.png   | Bin
 .../ams/img/ui-bg_glass_65_ffffff_1x400.png   | Bin
 .../ams/img/ui-bg_glass_75_dadada_1x400.png   | Bin
 .../ams/img/ui-bg_glass_75_e6e6e6_1x400.png   | Bin
 .../ams/img/ui-bg_glass_95_fef1ec_1x400.png   | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../ams/img/ui-icons_222222_256x240.png       | Bin
 .../ams/img/ui-icons_2e83ff_256x240.png       | Bin
 .../ams/img/ui-icons_454545_256x240.png       | Bin
 .../ams/img/ui-icons_888888_256x240.png       | Bin
 .../ams/img/ui-icons_cd0a0a_256x240.png       | Bin
 .../public_php/ams/img/uploadify-cancel.png   | Bin
 .../public_php/ams/inc/change_permission.php  |   0
 .../public_php/ams/inc/createticket.php       |   0
 .../public_php/ams/inc/dashboard.php          |   0
 .../web => web}/public_php/ams/inc/error.php  |   0
 .../public_php/ams/inc/forgot_password.php    |   0
 .../web => web}/public_php/ams/inc/login.php  |   0
 .../web => web}/public_php/ams/inc/logout.php |   0
 .../public_php/ams/inc/plugins.php            |   0
 .../public_php/ams/inc/plugins_update.php     |   0
 .../public_php/ams/inc/register.php           |   0
 .../public_php/ams/inc/reset_password.php     |   0
 .../public_php/ams/inc/settings.php           |   0
 .../public_php/ams/inc/sgroup_list.php        |   0
 .../public_php/ams/inc/show_queue.php         |   0
 .../public_php/ams/inc/show_reply.php         |   0
 .../public_php/ams/inc/show_sgroup.php        |   0
 .../public_php/ams/inc/show_ticket.php        |   0
 .../public_php/ams/inc/show_ticket_info.php   |   0
 .../public_php/ams/inc/show_ticket_log.php    |   0
 .../public_php/ams/inc/show_user.php          |   0
 .../public_php/ams/inc/syncing.php            |   0
 .../public_php/ams/inc/userlist.php           |   0
 {code/web => web}/public_php/ams/index.php    |   0
 .../public_php/ams/js/bootstrap-alert.js      |   0
 .../public_php/ams/js/bootstrap-button.js     |   0
 .../public_php/ams/js/bootstrap-carousel.js   |   0
 .../public_php/ams/js/bootstrap-collapse.js   |   0
 .../public_php/ams/js/bootstrap-dropdown.js   |   0
 .../public_php/ams/js/bootstrap-modal.js      |   0
 .../public_php/ams/js/bootstrap-popover.js    |   0
 .../public_php/ams/js/bootstrap-scrollspy.js  |   0
 .../public_php/ams/js/bootstrap-tab.js        |   0
 .../public_php/ams/js/bootstrap-toggle.js     |   0
 .../public_php/ams/js/bootstrap-tooltip.js    |   0
 .../public_php/ams/js/bootstrap-tour.js       |   0
 .../public_php/ams/js/bootstrap-transition.js |   0
 .../public_php/ams/js/bootstrap-typeahead.js  |   0
 .../web => web}/public_php/ams/js/charisma.js |   0
 {code/web => web}/public_php/ams/js/custom.js |   0
 .../web => web}/public_php/ams/js/excanvas.js |   0
 .../public_php/ams/js/fullcalendar.min.js     |   0
 {code/web => web}/public_php/ams/js/help.js   |   0
 .../public_php/ams/js/init-chart.js           |   0
 .../public_php/ams/js/jquery-1.7.2.min.js     |   0
 .../ams/js/jquery-ui-1.8.21.custom.min.js     |   0
 .../ams/js/jquery.autogrow-textarea.js        |   0
 .../public_php/ams/js/jquery.chosen.min.js    |   0
 .../public_php/ams/js/jquery.cleditor.min.js  |   0
 .../public_php/ams/js/jquery.colorbox.min.js  |   0
 .../public_php/ams/js/jquery.cookie.js        |   0
 .../ams/js/jquery.dataTables.min.js           |   0
 .../public_php/ams/js/jquery.elfinder.min.js  |   0
 .../public_php/ams/js/jquery.flot.min.js      |   0
 .../public_php/ams/js/jquery.flot.pie.min.js  |   0
 .../ams/js/jquery.flot.resize.min.js          |   0
 .../public_php/ams/js/jquery.flot.stack.js    |   0
 .../public_php/ams/js/jquery.history.js       |   0
 .../public_php/ams/js/jquery.iphone.toggle.js |   0
 {code/web => web}/public_php/ams/js/jquery.js |   0
 .../public_php/ams/js/jquery.min.js           |   0
 .../public_php/ams/js/jquery.noty.js          |   0
 .../public_php/ams/js/jquery.raty.min.js      |   0
 .../public_php/ams/js/jquery.uniform.min.js   |   0
 .../public_php/ams/js/jquery.uploadify-3.1.js |   0
 .../ams/js/jquery.uploadify-3.1.min.js        |   0
 .../public_php/ams/js/masonry.pkgd.min.js     |   0
 .../public_php/ams/misc/check-exists.php      |   0
 .../misc/elfinder-connector/MySQLStorage.sql  |   0
 .../ams/misc/elfinder-connector/connector.php |   0
 .../elfinder-connector/elFinder.class.php     |   0
 .../elFinderConnector.class.php               |   0
 .../elFinderVolumeDriver.class.php            |   0
 .../elFinderVolumeLocalFileSystem.class.php   |   0
 .../elFinderVolumeMySQL.class.php             |   0
 .../ams/misc/elfinder-connector/mime.types    |   0
 .../public_php/ams/misc/uploadify.php         |   0
 .../public_php/ams/misc/uploadify.swf         | Bin
 .../public_php/ams/sql/DBScheme.png           | Bin
 {code/web => web}/public_php/ams/sql/db.sql   |   0
 .../public_php/ams/sql/importusers.php        |   0
 .../public_php/ams/sql/ticketsql.sql          |   0
 .../public_php/ams/sql/ticketsystemmodel.mwb  | Bin
 .../public_php/ams/templates/README.md        |   0
 .../public_php/ams/templates/createticket.tpl |   0
 .../public_php/ams/templates/dashboard.tpl    |   0
 .../public_php/ams/templates/error.tpl        |   0
 .../ams/templates/forgot_password.tpl         |   0
 .../public_php/ams/templates/homebackup.tpl   |   0
 .../public_php/ams/templates/install.tpl      |   0
 .../ams/templates/install_plugin.tpl          |   0
 .../public_php/ams/templates/layout.tpl       |   0
 .../public_php/ams/templates/layout_admin.tpl |   0
 .../public_php/ams/templates/layout_mod.tpl   |   0
 .../ams/templates/layout_plugin.tpl           |   0
 .../public_php/ams/templates/layout_user.tpl  |   0
 .../public_php/ams/templates/license.txt      |   0
 .../public_php/ams/templates/login.tpl        |   0
 .../public_php/ams/templates/logout.tpl       |   0
 .../public_php/ams/templates/plugins.tpl      |   0
 .../ams/templates/plugins_update.tpl          |   0
 .../public_php/ams/templates/register.tpl     |   0
 .../ams/templates/register_feedback.tpl       |   0
 .../ams/templates/reset_password.tpl          |   0
 .../ams/templates/reset_success.tpl           |   0
 .../public_php/ams/templates/settings.tpl     |   0
 .../public_php/ams/templates/sgroup_list.tpl  |   0
 .../public_php/ams/templates/show_queue.tpl   |   0
 .../public_php/ams/templates/show_reply.tpl   |   0
 .../public_php/ams/templates/show_sgroup.tpl  |   0
 .../public_php/ams/templates/show_ticket.tpl  |   0
 .../ams/templates/show_ticket_info.tpl        |   0
 .../ams/templates/show_ticket_log.tpl         |   0
 .../public_php/ams/templates/show_user.tpl    |   0
 .../public_php/ams/templates/syncing.tpl      |   0
 .../public_php/ams/templates/userlist.tpl     |   0
 .../public_php/ams/templates_c/placeholder    |   0
 .../public_php/api/client/auth.php            |   0
 .../public_php/api/client/config.php.default  |   0
 .../public_php/api/client/time.php            |   0
 .../public_php/api/client/user.php            |   0
 .../public_php/api/client/utils.php           |   0
 .../public_php/api/common/actionPage.php      |   0
 .../public_php/api/common/auth.php            |   0
 .../public_php/api/common/bbCode.php          |   0
 .../public_php/api/common/config.php.default  |   0
 .../public_php/api/common/db_defs.php         |   0
 .../public_php/api/common/db_lib.php          |   0
 .../web => web}/public_php/api/common/dfm.php |   0
 .../public_php/api/common/logger.php          |   0
 .../public_php/api/common/render.php          |   0
 .../public_php/api/common/ryform.php          |   0
 .../public_php/api/common/ryformBases.php     |   0
 .../public_php/api/common/time.php            |   0
 .../public_php/api/common/user.php            |   0
 .../public_php/api/common/utils.php           |   0
 .../public_php/api/common/xml_utils.php       |   0
 .../public_php/api/data/css/ryzom_iphone.css  |   0
 .../public_php/api/data/css/ryzom_ui.css      |   0
 .../public_php/api/data/css/skin_b.gif        | Bin
 .../public_php/api/data/css/skin_bl.gif       | Bin
 .../public_php/api/data/css/skin_blank.png    | Bin
 .../api/data/css/skin_blank_inner.png         | Bin
 .../public_php/api/data/css/skin_br.gif       | Bin
 .../public_php/api/data/css/skin_header_l.gif | Bin
 .../public_php/api/data/css/skin_header_m.gif | Bin
 .../public_php/api/data/css/skin_header_r.gif | Bin
 .../public_php/api/data/css/skin_l.gif        | Bin
 .../public_php/api/data/css/skin_r.gif        | Bin
 .../public_php/api/data/css/skin_t.gif        | Bin
 .../public_php/api/data/css/skin_tl.gif       | Bin
 .../public_php/api/data/css/skin_tr.gif       | Bin
 .../public_php/api/data/icons/add_app.png     | Bin
 .../public_php/api/data/icons/edit.png        | Bin
 .../public_php/api/data/icons/edit_16.png     | Bin
 .../public_php/api/data/icons/no_action.png   | Bin
 .../public_php/api/data/icons/spe_com.png     | Bin
 .../api/data/img/backgrounds/parchemin.png    | Bin
 .../public_php/api/data/img/bg.jpg            | Bin
 .../public_php/api/data/img/bordure.png       | Bin
 .../public_php/api/data/img/lang/de.png       | Bin
 .../public_php/api/data/img/lang/en.png       | Bin
 .../public_php/api/data/img/lang/es.png       | Bin
 .../public_php/api/data/img/lang/fr.png       | Bin
 .../public_php/api/data/img/lang/ru.png       | Bin
 .../public_php/api/data/img/logo.gif          | Bin
 .../public_php/api/data/js/combobox.js        |   0
 .../public_php/api/data/js/jquery-1.7.1.js    |   0
 .../web => web}/public_php/api/data/js/tab.js |   0
 .../api/data/ryzom/guild_png/.htaccess        |   0
 .../ryzom/guild_png/guild_back_b_00_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_00_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_01_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_01_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_02_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_02_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_03_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_03_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_04_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_04_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_05_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_05_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_06_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_06_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_07_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_07_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_08_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_08_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_09_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_09_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_10_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_10_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_11_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_11_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_12_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_12_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_13_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_13_2.png     | Bin
 .../ryzom/guild_png/guild_back_b_14_1.png     | Bin
 .../ryzom/guild_png/guild_back_b_14_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_00_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_00_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_01_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_01_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_02_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_02_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_03_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_03_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_04_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_04_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_05_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_05_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_06_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_06_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_07_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_07_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_08_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_08_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_09_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_09_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_10_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_10_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_11_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_11_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_12_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_12_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_13_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_13_2.png     | Bin
 .../ryzom/guild_png/guild_back_s_14_1.png     | Bin
 .../ryzom/guild_png/guild_back_s_14_2.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_00.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_01.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_02.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_03.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_04.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_05.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_06.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_07.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_08.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_09.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_10.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_11.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_12.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_13.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_14.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_15.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_16.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_17.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_18.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_19.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_20.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_21.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_22.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_23.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_24.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_25.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_26.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_27.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_28.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_29.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_30.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_31.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_32.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_33.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_34.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_35.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_36.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_37.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_38.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_39.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_40.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_41.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_42.png     | Bin
 .../ryzom/guild_png/guild_symbol_b_43.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_00.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_01.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_02.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_03.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_04.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_05.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_06.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_07.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_08.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_09.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_10.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_11.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_12.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_13.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_14.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_15.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_16.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_17.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_18.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_19.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_20.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_21.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_22.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_23.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_24.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_25.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_26.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_27.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_28.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_29.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_30.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_31.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_32.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_33.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_34.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_35.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_36.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_37.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_38.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_39.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_40.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_41.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_42.png     | Bin
 .../ryzom/guild_png/guild_symbol_s_43.png     | Bin
 .../api/data/ryzom/interface/1h_over.png      | Bin
 .../api/data/ryzom/interface/2h_over.png      | Bin
 .../api/data/ryzom/interface/am_logo.png      | Bin
 .../api/data/ryzom/interface/ar_armpad.png    | Bin
 .../data/ryzom/interface/ar_armpad_mask.png   | Bin
 .../api/data/ryzom/interface/ar_botte.png     | Bin
 .../data/ryzom/interface/ar_botte_mask.png    | Bin
 .../api/data/ryzom/interface/ar_gilet.png     | Bin
 .../data/ryzom/interface/ar_gilet_mask.png    | Bin
 .../api/data/ryzom/interface/ar_hand.png      | Bin
 .../api/data/ryzom/interface/ar_hand_mask.png | Bin
 .../api/data/ryzom/interface/ar_helmet.png    | Bin
 .../data/ryzom/interface/ar_helmet_mask.png   | Bin
 .../data/ryzom/interface/ar_pantabotte.png    | Bin
 .../ryzom/interface/ar_pantabotte_mask.png    | Bin
 .../api/data/ryzom/interface/asc_exit.png     | Bin
 .../ryzom/interface/asc_rolemastercraft.png   | Bin
 .../ryzom/interface/asc_rolemasterfight.png   | Bin
 .../ryzom/interface/asc_rolemasterharvest.png | Bin
 .../ryzom/interface/asc_rolemastermagic.png   | Bin
 .../api/data/ryzom/interface/asc_unknown.png  | Bin
 .../data/ryzom/interface/bg_downloader.png    | Bin
 .../api/data/ryzom/interface/bg_empty.png     | Bin
 .../api/data/ryzom/interface/bk_aura.png      | Bin
 .../api/data/ryzom/interface/bk_conso.png     | Bin
 .../data/ryzom/interface/bk_consommable.png   | Bin
 .../api/data/ryzom/interface/bk_fyros.png     | Bin
 .../data/ryzom/interface/bk_fyros_brick.png   | Bin
 .../api/data/ryzom/interface/bk_generic.png   | Bin
 .../data/ryzom/interface/bk_generic_brick.png | Bin
 .../api/data/ryzom/interface/bk_goo.png       | Bin
 .../api/data/ryzom/interface/bk_guild.png     | Bin
 .../api/data/ryzom/interface/bk_horde.png     | Bin
 .../api/data/ryzom/interface/bk_kami.png      | Bin
 .../api/data/ryzom/interface/bk_karavan.png   | Bin
 .../ryzom/interface/bk_magie_noire_brick.png  | Bin
 .../api/data/ryzom/interface/bk_matis.png     | Bin
 .../data/ryzom/interface/bk_matis_brick.png   | Bin
 .../api/data/ryzom/interface/bk_mission.png   | Bin
 .../api/data/ryzom/interface/bk_mission2.png  | Bin
 .../api/data/ryzom/interface/bk_outpost.png   | Bin
 .../data/ryzom/interface/bk_outpost_brick.png | Bin
 .../api/data/ryzom/interface/bk_power.png     | Bin
 .../api/data/ryzom/interface/bk_primes.png    | Bin
 .../api/data/ryzom/interface/bk_service.png   | Bin
 .../api/data/ryzom/interface/bk_training.png  | Bin
 .../api/data/ryzom/interface/bk_tryker.png    | Bin
 .../data/ryzom/interface/bk_tryker_brick.png  | Bin
 .../api/data/ryzom/interface/bk_zorai.png     | Bin
 .../data/ryzom/interface/bk_zorai_brick.png   | Bin
 .../data/ryzom/interface/brick_default.png    | Bin
 .../ryzom/interface/building_state_24x24.png  | Bin
 .../api/data/ryzom/interface/cb_main_nue.png  | Bin
 .../api/data/ryzom/interface/ch_back.png      | Bin
 .../api/data/ryzom/interface/charge.png       | Bin
 .../api/data/ryzom/interface/clef.png         | Bin
 .../data/ryzom/interface/conso_branche.png    | Bin
 .../ryzom/interface/conso_branche_mask.png    | Bin
 .../api/data/ryzom/interface/conso_fleur.png  | Bin
 .../data/ryzom/interface/conso_fleur_mask.png | Bin
 .../api/data/ryzom/interface/conso_grappe.png | Bin
 .../ryzom/interface/conso_grappe_mask.png     | Bin
 .../api/data/ryzom/interface/conso_nectar.png | Bin
 .../ryzom/interface/conso_nectar_mask.png     | Bin
 .../api/data/ryzom/interface/construction.png | Bin
 .../api/data/ryzom/interface/cp_back.png      | Bin
 .../data/ryzom/interface/cp_over_break.png    | Bin
 .../api/data/ryzom/interface/cp_over_less.png | Bin
 .../api/data/ryzom/interface/cp_over_more.png | Bin
 .../data/ryzom/interface/cp_over_opening.png  | Bin
 .../ryzom/interface/cp_over_opening_2.png     | Bin
 .../api/data/ryzom/interface/cristal_ammo.png | Bin
 .../data/ryzom/interface/cristal_generic.png  | Bin
 .../data/ryzom/interface/cristal_spell.png    | Bin
 .../api/data/ryzom/interface/ef_back.png      | Bin
 .../data/ryzom/interface/ef_over_break.png    | Bin
 .../api/data/ryzom/interface/ef_over_less.png | Bin
 .../api/data/ryzom/interface/ef_over_more.png | Bin
 .../api/data/ryzom/interface/fo_back.png      | Bin
 .../api/data/ryzom/interface/fo_over.png      | Bin
 .../api/data/ryzom/interface/fp_ammo.png      | Bin
 .../api/data/ryzom/interface/fp_armor.png     | Bin
 .../api/data/ryzom/interface/fp_building.png  | Bin
 .../api/data/ryzom/interface/fp_jewel.png     | Bin
 .../api/data/ryzom/interface/fp_melee.png     | Bin
 .../api/data/ryzom/interface/fp_over.png      | Bin
 .../api/data/ryzom/interface/fp_range.png     | Bin
 .../api/data/ryzom/interface/fp_shield.png    | Bin
 .../api/data/ryzom/interface/fp_tools.png     | Bin
 .../interface/ge_mission_outpost_townhall.png | Bin
 .../ryzom/interface/ico_absorb_damage.png     | Bin
 .../api/data/ryzom/interface/ico_accurate.png | Bin
 .../api/data/ryzom/interface/ico_acid.png     | Bin
 .../api/data/ryzom/interface/ico_aim.png      | Bin
 .../ryzom/interface/ico_aim_bird_wings.png    | Bin
 .../ico_aim_flying_kitin_abdomen.png          | Bin
 .../ryzom/interface/ico_aim_homin_arms.png    | Bin
 .../ryzom/interface/ico_aim_homin_chest.png   | Bin
 .../ryzom/interface/ico_aim_homin_feet.png    | Bin
 .../ryzom/interface/ico_aim_homin_feint.png   | Bin
 .../ryzom/interface/ico_aim_homin_hands.png   | Bin
 .../ryzom/interface/ico_aim_homin_head.png    | Bin
 .../ryzom/interface/ico_aim_homin_legs.png    | Bin
 .../ryzom/interface/ico_aim_kitin_head.png    | Bin
 .../api/data/ryzom/interface/ico_amande.png   | Bin
 .../data/ryzom/interface/ico_ammo_bullet.png  | Bin
 .../data/ryzom/interface/ico_ammo_jacket.png  | Bin
 .../api/data/ryzom/interface/ico_angle.png    | Bin
 .../ryzom/interface/ico_anti_magic_shield.png | Bin
 .../api/data/ryzom/interface/ico_armor.png    | Bin
 .../data/ryzom/interface/ico_armor_clip.png   | Bin
 .../data/ryzom/interface/ico_armor_heavy.png  | Bin
 .../data/ryzom/interface/ico_armor_kitin.png  | Bin
 .../data/ryzom/interface/ico_armor_light.png  | Bin
 .../data/ryzom/interface/ico_armor_medium.png | Bin
 .../ryzom/interface/ico_armor_penalty.png     | Bin
 .../data/ryzom/interface/ico_armor_shell.png  | Bin
 .../api/data/ryzom/interface/ico_atys.png     | Bin
 .../api/data/ryzom/interface/ico_atysian.png  | Bin
 .../data/ryzom/interface/ico_balance_hp.png   | Bin
 .../api/data/ryzom/interface/ico_barrel.png   | Bin
 .../api/data/ryzom/interface/ico_bash.png     | Bin
 .../api/data/ryzom/interface/ico_berserk.png  | Bin
 .../api/data/ryzom/interface/ico_blade.png    | Bin
 .../api/data/ryzom/interface/ico_bleeding.png | Bin
 .../api/data/ryzom/interface/ico_blind.png    | Bin
 .../api/data/ryzom/interface/ico_blunt.png    | Bin
 .../api/data/ryzom/interface/ico_bomb.png     | Bin
 .../ryzom/interface/ico_cataliseur_xp.png     | Bin
 .../data/ryzom/interface/ico_celestial.png    | Bin
 .../ryzom/interface/ico_circular_attack.png   | Bin
 .../api/data/ryzom/interface/ico_clothes.png  | Bin
 .../api/data/ryzom/interface/ico_cold.png     | Bin
 .../ryzom/interface/ico_concentration.png     | Bin
 .../ryzom/interface/ico_consommable_over.png  | Bin
 .../data/ryzom/interface/ico_constitution.png | Bin
 .../ryzom/interface/ico_counterweight.png     | Bin
 .../data/ryzom/interface/ico_craft_buff.png   | Bin
 .../ryzom/interface/ico_create_sapload.png    | Bin
 .../api/data/ryzom/interface/ico_curse.png    | Bin
 .../api/data/ryzom/interface/ico_debuff.png   | Bin
 .../ryzom/interface/ico_debuff_resist.png     | Bin
 .../data/ryzom/interface/ico_debuff_skill.png | Bin
 .../api/data/ryzom/interface/ico_desert.png   | Bin
 .../data/ryzom/interface/ico_dexterity.png    | Bin
 .../api/data/ryzom/interface/ico_disarm.png   | Bin
 .../api/data/ryzom/interface/ico_dodge.png    | Bin
 .../api/data/ryzom/interface/ico_dot.png      | Bin
 .../data/ryzom/interface/ico_durability.png   | Bin
 .../api/data/ryzom/interface/ico_electric.png | Bin
 .../api/data/ryzom/interface/ico_explosif.png | Bin
 .../data/ryzom/interface/ico_extracting.png   | Bin
 .../api/data/ryzom/interface/ico_fear.png     | Bin
 .../api/data/ryzom/interface/ico_feint.png    | Bin
 .../api/data/ryzom/interface/ico_fire.png     | Bin
 .../data/ryzom/interface/ico_firing_pin.png   | Bin
 .../ryzom/interface/ico_fleur_carac_1.png     | Bin
 .../interface/ico_fleur_carac_1_mask.png      | Bin
 .../ryzom/interface/ico_fleur_carac_2.png     | Bin
 .../interface/ico_fleur_carac_2_mask.png      | Bin
 .../ryzom/interface/ico_fleur_carac_3.png     | Bin
 .../interface/ico_fleur_carac_3_mask.png      | Bin
 .../api/data/ryzom/interface/ico_focus.png    | Bin
 .../data/ryzom/interface/ico_forage_buff.png  | Bin
 .../data/ryzom/interface/ico_forbid_item.png  | Bin
 .../api/data/ryzom/interface/ico_forest.png   | Bin
 .../api/data/ryzom/interface/ico_foreuse.png  | Bin
 .../data/ryzom/interface/ico_gardening.png    | Bin
 .../api/data/ryzom/interface/ico_gentle.png   | Bin
 .../api/data/ryzom/interface/ico_goo.png      | Bin
 .../api/data/ryzom/interface/ico_gripp.png    | Bin
 .../data/ryzom/interface/ico_haircolor.png    | Bin
 .../api/data/ryzom/interface/ico_haircut.png  | Bin
 .../api/data/ryzom/interface/ico_hammer.png   | Bin
 .../api/data/ryzom/interface/ico_harmful.png  | Bin
 .../api/data/ryzom/interface/ico_hatred.png   | Bin
 .../api/data/ryzom/interface/ico_heal.png     | Bin
 .../api/data/ryzom/interface/ico_hit_rate.png | Bin
 .../data/ryzom/interface/ico_incapacity.png   | Bin
 .../data/ryzom/interface/ico_intelligence.png | Bin
 .../data/ryzom/interface/ico_interrupt.png    | Bin
 .../ryzom/interface/ico_invulnerability.png   | Bin
 .../data/ryzom/interface/ico_jewel_stone.png  | Bin
 .../interface/ico_jewel_stone_support.png     | Bin
 .../api/data/ryzom/interface/ico_jungle.png   | Bin
 .../api/data/ryzom/interface/ico_lacustre.png | Bin
 .../ryzom/interface/ico_landmark_bonus.png    | Bin
 .../api/data/ryzom/interface/ico_level.png    | Bin
 .../api/data/ryzom/interface/ico_lining.png   | Bin
 .../api/data/ryzom/interface/ico_location.png | Bin
 .../api/data/ryzom/interface/ico_madness.png  | Bin
 .../api/data/ryzom/interface/ico_magic.png    | Bin
 .../ryzom/interface/ico_magic_action_buff.png | Bin
 .../data/ryzom/interface/ico_magic_focus.png  | Bin
 .../ryzom/interface/ico_magic_target_buff.png | Bin
 .../ryzom/interface/ico_melee_action_buff.png | Bin
 .../ryzom/interface/ico_melee_target_buff.png | Bin
 .../api/data/ryzom/interface/ico_mental.png   | Bin
 .../data/ryzom/interface/ico_metabolism.png   | Bin
 .../api/data/ryzom/interface/ico_mezz.png     | Bin
 .../data/ryzom/interface/ico_misfortune.png   | Bin
 .../ryzom/interface/ico_mission_art_fyros.png | Bin
 .../ryzom/interface/ico_mission_art_matis.png | Bin
 .../interface/ico_mission_art_tryker.png      | Bin
 .../ryzom/interface/ico_mission_art_zorai.png | Bin
 .../ryzom/interface/ico_mission_barrel.png    | Bin
 .../ryzom/interface/ico_mission_bottle.png    | Bin
 .../ryzom/interface/ico_mission_casket.png    | Bin
 .../ryzom/interface/ico_mission_medicine.png  | Bin
 .../ryzom/interface/ico_mission_message.png   | Bin
 .../ryzom/interface/ico_mission_package.png   | Bin
 .../data/ryzom/interface/ico_mission_pot.png  | Bin
 .../ryzom/interface/ico_mission_purse.png     | Bin
 .../api/data/ryzom/interface/ico_move.png     | Bin
 .../data/ryzom/interface/ico_multi_fight.png  | Bin
 .../ryzom/interface/ico_multiple_spots.png    | Bin
 .../api/data/ryzom/interface/ico_noix.png     | Bin
 .../data/ryzom/interface/ico_opening_hit.png  | Bin
 .../data/ryzom/interface/ico_over_autumn.png  | Bin
 .../ryzom/interface/ico_over_degenerated.png  | Bin
 .../data/ryzom/interface/ico_over_fauna.png   | Bin
 .../data/ryzom/interface/ico_over_flora.png   | Bin
 .../ryzom/interface/ico_over_hit_arms.png     | Bin
 .../ryzom/interface/ico_over_hit_chest.png    | Bin
 .../ryzom/interface/ico_over_hit_feet.png     | Bin
 .../interface/ico_over_hit_feet_hands.png     | Bin
 .../interface/ico_over_hit_feet_head.png      | Bin
 .../ryzom/interface/ico_over_hit_feet_x2.png  | Bin
 .../ryzom/interface/ico_over_hit_feint_x3.png | Bin
 .../ryzom/interface/ico_over_hit_hands.png    | Bin
 .../interface/ico_over_hit_hands_chest.png    | Bin
 .../interface/ico_over_hit_hands_head.png     | Bin
 .../ryzom/interface/ico_over_hit_head.png     | Bin
 .../ryzom/interface/ico_over_hit_head_x3.png  | Bin
 .../ryzom/interface/ico_over_hit_legs.png     | Bin
 .../data/ryzom/interface/ico_over_homin.png   | Bin
 .../data/ryzom/interface/ico_over_kitin.png   | Bin
 .../data/ryzom/interface/ico_over_magic.png   | Bin
 .../data/ryzom/interface/ico_over_melee.png   | Bin
 .../data/ryzom/interface/ico_over_racial.png  | Bin
 .../data/ryzom/interface/ico_over_range.png   | Bin
 .../data/ryzom/interface/ico_over_special.png | Bin
 .../data/ryzom/interface/ico_over_spring.png  | Bin
 .../data/ryzom/interface/ico_over_summer.png  | Bin
 .../data/ryzom/interface/ico_over_winter.png  | Bin
 .../api/data/ryzom/interface/ico_parry.png    | Bin
 .../api/data/ryzom/interface/ico_piercing.png | Bin
 .../api/data/ryzom/interface/ico_pointe.png   | Bin
 .../api/data/ryzom/interface/ico_poison.png   | Bin
 .../api/data/ryzom/interface/ico_power.png    | Bin
 .../data/ryzom/interface/ico_preservation.png | Bin
 .../api/data/ryzom/interface/ico_primal.png   | Bin
 .../data/ryzom/interface/ico_prime_roots.png  | Bin
 .../api/data/ryzom/interface/ico_private.png  | Bin
 .../data/ryzom/interface/ico_prospecting.png  | Bin
 .../api/data/ryzom/interface/ico_quality.png  | Bin
 .../api/data/ryzom/interface/ico_racine.png   | Bin
 .../api/data/ryzom/interface/ico_range.png    | Bin
 .../ryzom/interface/ico_range_action_buff.png | Bin
 .../ryzom/interface/ico_range_target_buff.png | Bin
 .../api/data/ryzom/interface/ico_ricochet.png | Bin
 .../api/data/ryzom/interface/ico_root.png     | Bin
 .../api/data/ryzom/interface/ico_rot.png      | Bin
 .../api/data/ryzom/interface/ico_safe.png     | Bin
 .../api/data/ryzom/interface/ico_sap.png      | Bin
 .../data/ryzom/interface/ico_self_damage.png  | Bin
 .../api/data/ryzom/interface/ico_shaft.png    | Bin
 .../data/ryzom/interface/ico_shield_buff.png  | Bin
 .../data/ryzom/interface/ico_shield_up.png    | Bin
 .../data/ryzom/interface/ico_shielding.png    | Bin
 .../data/ryzom/interface/ico_shockwave.png    | Bin
 .../api/data/ryzom/interface/ico_sickness.png | Bin
 .../api/data/ryzom/interface/ico_slashing.png | Bin
 .../api/data/ryzom/interface/ico_slow.png     | Bin
 .../data/ryzom/interface/ico_soft_spot.png    | Bin
 .../ryzom/interface/ico_source_knowledge.png  | Bin
 .../data/ryzom/interface/ico_source_time.png  | Bin
 .../api/data/ryzom/interface/ico_speed.png    | Bin
 .../data/ryzom/interface/ico_speeding_up.png  | Bin
 .../data/ryzom/interface/ico_spell_break.png  | Bin
 .../api/data/ryzom/interface/ico_spores.png   | Bin
 .../api/data/ryzom/interface/ico_spray.png    | Bin
 .../api/data/ryzom/interface/ico_spying.png   | Bin
 .../api/data/ryzom/interface/ico_stamina.png  | Bin
 .../api/data/ryzom/interface/ico_strength.png | Bin
 .../api/data/ryzom/interface/ico_stuffing.png | Bin
 .../api/data/ryzom/interface/ico_stunn.png    | Bin
 .../data/ryzom/interface/ico_task_craft.png   | Bin
 .../data/ryzom/interface/ico_task_done.png    | Bin
 .../data/ryzom/interface/ico_task_failed.png  | Bin
 .../data/ryzom/interface/ico_task_fight.png   | Bin
 .../data/ryzom/interface/ico_task_forage.png  | Bin
 .../data/ryzom/interface/ico_task_generic.png | Bin
 .../interface/ico_task_generic_quart.png      | Bin
 .../data/ryzom/interface/ico_task_guild.png   | Bin
 .../data/ryzom/interface/ico_task_rite.png    | Bin
 .../data/ryzom/interface/ico_task_travel.png  | Bin
 .../api/data/ryzom/interface/ico_tatoo.png    | Bin
 .../api/data/ryzom/interface/ico_taunt.png    | Bin
 .../api/data/ryzom/interface/ico_time.png     | Bin
 .../data/ryzom/interface/ico_time_bonus.png   | Bin
 .../api/data/ryzom/interface/ico_tourbe.png   | Bin
 .../api/data/ryzom/interface/ico_trigger.png  | Bin
 .../api/data/ryzom/interface/ico_umbrella.png | Bin
 .../ryzom/interface/ico_use_enchantement.png  | Bin
 .../api/data/ryzom/interface/ico_vampire.png  | Bin
 .../data/ryzom/interface/ico_visibility.png   | Bin
 .../api/data/ryzom/interface/ico_war_cry.png  | Bin
 .../api/data/ryzom/interface/ico_weight.png   | Bin
 .../data/ryzom/interface/ico_wellbalanced.png | Bin
 .../api/data/ryzom/interface/ico_will.png     | Bin
 .../api/data/ryzom/interface/ico_windding.png | Bin
 .../api/data/ryzom/interface/ico_wisdom.png   | Bin
 .../data/ryzom/interface/improved_tool.png    | Bin
 .../api/data/ryzom/interface/item_default.png | Bin
 .../data/ryzom/interface/item_plan_over.png   | Bin
 .../api/data/ryzom/interface/lucky_flower.png | Bin
 .../api/data/ryzom/interface/mail.png         | Bin
 .../api/data/ryzom/interface/mektoub_pack.png | Bin
 .../data/ryzom/interface/mektoub_steed.png    | Bin
 .../api/data/ryzom/interface/mf_back.png      | Bin
 .../api/data/ryzom/interface/mf_over.png      | Bin
 .../api/data/ryzom/interface/mg_glove.png     | Bin
 .../data/ryzom/interface/mission_icon_0.png   | Bin
 .../data/ryzom/interface/mission_icon_1.png   | Bin
 .../data/ryzom/interface/mission_icon_2.png   | Bin
 .../data/ryzom/interface/mission_icon_3.png   | Bin
 .../api/data/ryzom/interface/mp3.png          | Bin
 .../api/data/ryzom/interface/mp_amber.png     | Bin
 .../data/ryzom/interface/mp_back_curative.png | Bin
 .../ryzom/interface/mp_back_offensive.png     | Bin
 .../data/ryzom/interface/mp_back_selfonly.png | Bin
 .../api/data/ryzom/interface/mp_bark.png      | Bin
 .../ryzom/interface/mp_batiment_brique.png    | Bin
 .../ryzom/interface/mp_batiment_colonne.png   | Bin
 .../interface/mp_batiment_colonne_justice.png | Bin
 .../ryzom/interface/mp_batiment_comble.png    | Bin
 .../interface/mp_batiment_noyau_maduk.png     | Bin
 .../ryzom/interface/mp_batiment_ornement.png  | Bin
 .../interface/mp_batiment_revetement.png      | Bin
 .../ryzom/interface/mp_batiment_socle.png     | Bin
 .../ryzom/interface/mp_batiment_statue.png    | Bin
 .../api/data/ryzom/interface/mp_beak.png      | Bin
 .../api/data/ryzom/interface/mp_blood.png     | Bin
 .../api/data/ryzom/interface/mp_bone.png      | Bin
 .../api/data/ryzom/interface/mp_bud.png       | Bin
 .../data/ryzom/interface/mp_buterfly_blue.png | Bin
 .../ryzom/interface/mp_buterfly_cocoon.png    | Bin
 .../api/data/ryzom/interface/mp_cereal.png    | Bin
 .../api/data/ryzom/interface/mp_claw.png      | Bin
 .../api/data/ryzom/interface/mp_dandelion.png | Bin
 .../api/data/ryzom/interface/mp_dry           | Bin
 .../api/data/ryzom/interface/mp_dry wood.png  | Bin
 .../api/data/ryzom/interface/mp_dry.png       | Bin
 .../api/data/ryzom/interface/mp_dry_wood.png  | Bin
 .../api/data/ryzom/interface/mp_dust.png      | Bin
 .../api/data/ryzom/interface/mp_egg.png       | Bin
 .../api/data/ryzom/interface/mp_eyes.png      | Bin
 .../api/data/ryzom/interface/mp_fang.png      | Bin
 .../api/data/ryzom/interface/mp_fiber.png     | Bin
 .../api/data/ryzom/interface/mp_filament.png  | Bin
 .../ryzom/interface/mp_firefly_abdomen.png    | Bin
 .../data/ryzom/interface/mp_fish_scale.png    | Bin
 .../api/data/ryzom/interface/mp_flowers.png   | Bin
 .../ryzom/interface/mp_fresh_loose_soil.png   | Bin
 .../api/data/ryzom/interface/mp_fruit.png     | Bin
 .../api/data/ryzom/interface/mp_generic.png   | Bin
 .../ryzom/interface/mp_generic_colorize.png   | Bin
 .../api/data/ryzom/interface/mp_gomme.png     | Bin
 .../data/ryzom/interface/mp_goo_residue.png   | Bin
 .../api/data/ryzom/interface/mp_hairs.png     | Bin
 .../api/data/ryzom/interface/mp_hoof.png      | Bin
 .../api/data/ryzom/interface/mp_horn.png      | Bin
 .../api/data/ryzom/interface/mp_horney.png    | Bin
 .../data/ryzom/interface/mp_insect_fossil.png | Bin
 .../data/ryzom/interface/mp_kitin_flesh.png   | Bin
 .../ryzom/interface/mp_kitin_secretion.png    | Bin
 .../data/ryzom/interface/mp_kitinshell.png    | Bin
 .../api/data/ryzom/interface/mp_larva.png     | Bin
 .../api/data/ryzom/interface/mp_leaf.png      | Bin
 .../api/data/ryzom/interface/mp_leather.png   | Bin
 .../api/data/ryzom/interface/mp_liane.png     | Bin
 .../api/data/ryzom/interface/mp_lichen.png    | Bin
 .../api/data/ryzom/interface/mp_ligament.png  | Bin
 .../api/data/ryzom/interface/mp_mandible.png  | Bin
 .../api/data/ryzom/interface/mp_meat.png      | Bin
 .../api/data/ryzom/interface/mp_moss.png      | Bin
 .../api/data/ryzom/interface/mp_mushroom.png  | Bin
 .../api/data/ryzom/interface/mp_nail.png      | Bin
 .../api/data/ryzom/interface/mp_oil.png       | Bin
 .../api/data/ryzom/interface/mp_over_link.png | Bin
 .../api/data/ryzom/interface/mp_parasite.png  | Bin
 .../api/data/ryzom/interface/mp_pearl.png     | Bin
 .../api/data/ryzom/interface/mp_pelvis.png    | Bin
 .../api/data/ryzom/interface/mp_pigment.png   | Bin
 .../api/data/ryzom/interface/mp_pistil.png    | Bin
 .../data/ryzom/interface/mp_plant_fossil.png  | Bin
 .../api/data/ryzom/interface/mp_pollen.png    | Bin
 .../api/data/ryzom/interface/mp_resin.png     | Bin
 .../api/data/ryzom/interface/mp_ronce.png     | Bin
 .../api/data/ryzom/interface/mp_rostrum.png   | Bin
 .../api/data/ryzom/interface/mp_sap.png       | Bin
 .../api/data/ryzom/interface/mp_sawdust.png   | Bin
 .../api/data/ryzom/interface/mp_seed.png      | Bin
 .../api/data/ryzom/interface/mp_shell.png     | Bin
 .../api/data/ryzom/interface/mp_silk_worm.png | Bin
 .../api/data/ryzom/interface/mp_skin.png      | Bin
 .../api/data/ryzom/interface/mp_skull.png     | Bin
 .../data/ryzom/interface/mp_spiders_web.png   | Bin
 .../api/data/ryzom/interface/mp_spine.png     | Bin
 .../api/data/ryzom/interface/mp_stem.png      | Bin
 .../api/data/ryzom/interface/mp_sting.png     | Bin
 .../api/data/ryzom/interface/mp_straw.png     | Bin
 .../api/data/ryzom/interface/mp_suc.png       | Bin
 .../api/data/ryzom/interface/mp_tail.png      | Bin
 .../api/data/ryzom/interface/mp_tooth.png     | Bin
 .../api/data/ryzom/interface/mp_trunk.png     | Bin
 .../api/data/ryzom/interface/mp_whiskers.png  | Bin
 .../api/data/ryzom/interface/mp_wing.png      | Bin
 .../api/data/ryzom/interface/mp_wood.png      | Bin
 .../api/data/ryzom/interface/mp_wood_node.png | Bin
 .../api/data/ryzom/interface/mw_2h_axe.png    | Bin
 .../api/data/ryzom/interface/mw_2h_lance.png  | Bin
 .../api/data/ryzom/interface/mw_2h_mace.png   | Bin
 .../api/data/ryzom/interface/mw_2h_sword.png  | Bin
 .../api/data/ryzom/interface/mw_axe.png       | Bin
 .../api/data/ryzom/interface/mw_dagger.png    | Bin
 .../api/data/ryzom/interface/mw_lance.png     | Bin
 .../api/data/ryzom/interface/mw_mace.png      | Bin
 .../api/data/ryzom/interface/mw_staff.png     | Bin
 .../api/data/ryzom/interface/mw_sword.png     | Bin
 .../api/data/ryzom/interface/no_action.png    | Bin
 .../api/data/ryzom/interface/num_slash.png    | Bin
 .../api/data/ryzom/interface/op_back.png      | Bin
 .../data/ryzom/interface/op_over_break.png    | Bin
 .../api/data/ryzom/interface/op_over_less.png | Bin
 .../api/data/ryzom/interface/op_over_more.png | Bin
 .../api/data/ryzom/interface/pa_anklet.png    | Bin
 .../api/data/ryzom/interface/pa_back.png      | Bin
 .../api/data/ryzom/interface/pa_bracelet.png  | Bin
 .../api/data/ryzom/interface/pa_diadem.png    | Bin
 .../api/data/ryzom/interface/pa_earring.png   | Bin
 .../data/ryzom/interface/pa_over_break.png    | Bin
 .../api/data/ryzom/interface/pa_over_less.png | Bin
 .../api/data/ryzom/interface/pa_over_more.png | Bin
 .../api/data/ryzom/interface/pa_pendant.png   | Bin
 .../api/data/ryzom/interface/pa_ring.png      | Bin
 .../api/data/ryzom/interface/profile.png      | Bin
 .../data/ryzom/interface/protect_amber.png    | Bin
 .../api/data/ryzom/interface/pvp_ally_0.png   | Bin
 .../api/data/ryzom/interface/pvp_ally_1.png   | Bin
 .../api/data/ryzom/interface/pvp_ally_2.png   | Bin
 .../api/data/ryzom/interface/pvp_ally_3.png   | Bin
 .../api/data/ryzom/interface/pvp_ally_4.png   | Bin
 .../api/data/ryzom/interface/pvp_ally_6.png   | Bin
 .../data/ryzom/interface/pvp_ally_primas.png  | Bin
 .../data/ryzom/interface/pvp_ally_ranger.png  | Bin
 .../api/data/ryzom/interface/pvp_aura.png     | Bin
 .../data/ryzom/interface/pvp_aura_mask.png    | Bin
 .../api/data/ryzom/interface/pvp_boost.png    | Bin
 .../data/ryzom/interface/pvp_boost_mask.png   | Bin
 .../api/data/ryzom/interface/pvp_enemy_0.png  | Bin
 .../api/data/ryzom/interface/pvp_enemy_1.png  | Bin
 .../api/data/ryzom/interface/pvp_enemy_2.png  | Bin
 .../api/data/ryzom/interface/pvp_enemy_3.png  | Bin
 .../api/data/ryzom/interface/pvp_enemy_4.png  | Bin
 .../api/data/ryzom/interface/pvp_enemy_6.png  | Bin
 .../ryzom/interface/pvp_enemy_marauder.png    | Bin
 .../ryzom/interface/pvp_enemy_trytonist.png   | Bin
 .../api/data/ryzom/interface/pw_4.png         | Bin
 .../api/data/ryzom/interface/pw_5.png         | Bin
 .../api/data/ryzom/interface/pw_6.png         | Bin
 .../api/data/ryzom/interface/pw_7.png         | Bin
 .../api/data/ryzom/interface/pw_heavy.png     | Bin
 .../api/data/ryzom/interface/pw_light.png     | Bin
 .../api/data/ryzom/interface/pw_medium.png    | Bin
 .../api/data/ryzom/interface/quest_coeur.png  | Bin
 .../api/data/ryzom/interface/quest_foie.png   | Bin
 .../api/data/ryzom/interface/quest_jeton.png  | Bin
 .../api/data/ryzom/interface/quest_langue.png | Bin
 .../api/data/ryzom/interface/quest_louche.png | Bin
 .../data/ryzom/interface/quest_oreille.png    | Bin
 .../api/data/ryzom/interface/quest_patte.png  | Bin
 .../api/data/ryzom/interface/quest_poils.png  | Bin
 .../api/data/ryzom/interface/quest_queue.png  | Bin
 .../api/data/ryzom/interface/quest_ticket.png | Bin
 .../api/data/ryzom/interface/r2_live.png      | Bin
 .../api/data/ryzom/interface/r2_live_over.png | Bin
 .../data/ryzom/interface/r2_live_pushed.png   | Bin
 .../ryzom/interface/r2_palette_entities.png   | Bin
 .../api/data/ryzom/interface/requirement.png  | Bin
 .../api/data/ryzom/interface/rm_f.png         | Bin
 .../api/data/ryzom/interface/rm_f_upgrade.png | Bin
 .../api/data/ryzom/interface/rm_h.png         | Bin
 .../api/data/ryzom/interface/rm_h_upgrade.png | Bin
 .../api/data/ryzom/interface/rm_m.png         | Bin
 .../api/data/ryzom/interface/rm_m_upgrade.png | Bin
 .../api/data/ryzom/interface/rm_r.png         | Bin
 .../api/data/ryzom/interface/rm_r_upgrade.png | Bin
 .../api/data/ryzom/interface/rpjob_200.png    | Bin
 .../api/data/ryzom/interface/rpjob_201.png    | Bin
 .../api/data/ryzom/interface/rpjob_202.png    | Bin
 .../api/data/ryzom/interface/rpjob_203.png    | Bin
 .../api/data/ryzom/interface/rpjob_204.png    | Bin
 .../api/data/ryzom/interface/rpjob_205.png    | Bin
 .../api/data/ryzom/interface/rpjob_206.png    | Bin
 .../api/data/ryzom/interface/rpjob_207.png    | Bin
 .../data/ryzom/interface/rpjob_advanced.png   | Bin
 .../data/ryzom/interface/rpjob_elementary.png | Bin
 .../data/ryzom/interface/rpjob_roleplay.png   | Bin
 .../api/data/ryzom/interface/rpjob_task.png   | Bin
 .../interface/rpjob_task_certificats.png      | Bin
 .../ryzom/interface/rpjob_task_convert.png    | Bin
 .../ryzom/interface/rpjob_task_elementary.png | Bin
 .../ryzom/interface/rpjob_task_generic.png    | Bin
 .../ryzom/interface/rpjob_task_upgrade.png    | Bin
 .../data/ryzom/interface/rpjobitem_200_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_200_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_200_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_201_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_201_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_201_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_202_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_202_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_202_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_203_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_203_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_203_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_204_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_204_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_204_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_205_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_205_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_205_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_206_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_206_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_206_c.png  | Bin
 .../data/ryzom/interface/rpjobitem_207_a.png  | Bin
 .../data/ryzom/interface/rpjobitem_207_b.png  | Bin
 .../data/ryzom/interface/rpjobitem_207_c.png  | Bin
 .../interface/rpjobitem_certifications.png    | Bin
 .../data/ryzom/interface/rw_autolaunch.png    | Bin
 .../api/data/ryzom/interface/rw_bowgun.png    | Bin
 .../api/data/ryzom/interface/rw_grenade.png   | Bin
 .../data/ryzom/interface/rw_harpoongun.png    | Bin
 .../api/data/ryzom/interface/rw_launcher.png  | Bin
 .../api/data/ryzom/interface/rw_pistol.png    | Bin
 .../api/data/ryzom/interface/rw_pistolarc.png | Bin
 .../api/data/ryzom/interface/rw_rifle.png     | Bin
 .../api/data/ryzom/interface/sapload.png      | Bin
 .../api/data/ryzom/interface/sh_buckler.png   | Bin
 .../data/ryzom/interface/sh_large_shield.png  | Bin
 .../data/ryzom/interface/small_task_craft.png | Bin
 .../data/ryzom/interface/small_task_done.png  | Bin
 .../ryzom/interface/small_task_failed.png     | Bin
 .../data/ryzom/interface/small_task_fight.png | Bin
 .../ryzom/interface/small_task_forage.png     | Bin
 .../ryzom/interface/small_task_generic.png    | Bin
 .../data/ryzom/interface/small_task_guild.png | Bin
 .../data/ryzom/interface/small_task_rite.png  | Bin
 .../ryzom/interface/small_task_travel.png     | Bin
 .../api/data/ryzom/interface/spe_beast.png    | Bin
 .../api/data/ryzom/interface/spe_com.png      | Bin
 .../data/ryzom/interface/spe_inventory.png    | Bin
 .../api/data/ryzom/interface/spe_labs.png     | Bin
 .../api/data/ryzom/interface/spe_memory.png   | Bin
 .../api/data/ryzom/interface/spe_options.png  | Bin
 .../api/data/ryzom/interface/spe_status.png   | Bin
 .../ryzom/interface/stimulating_water.png     | Bin
 .../data/ryzom/interface/tb_action_attack.png | Bin
 .../data/ryzom/interface/tb_action_config.png | Bin
 .../ryzom/interface/tb_action_disband.png     | Bin
 .../ryzom/interface/tb_action_disengage.png   | Bin
 .../ryzom/interface/tb_action_extract.png     | Bin
 .../data/ryzom/interface/tb_action_invite.png | Bin
 .../data/ryzom/interface/tb_action_kick.png   | Bin
 .../data/ryzom/interface/tb_action_move.png   | Bin
 .../data/ryzom/interface/tb_action_run.png    | Bin
 .../data/ryzom/interface/tb_action_sit.png    | Bin
 .../data/ryzom/interface/tb_action_stand.png  | Bin
 .../data/ryzom/interface/tb_action_stop.png   | Bin
 .../data/ryzom/interface/tb_action_talk.png   | Bin
 .../data/ryzom/interface/tb_action_walk.png   | Bin
 .../api/data/ryzom/interface/tb_animals.png   | Bin
 .../api/data/ryzom/interface/tb_config.png    | Bin
 .../data/ryzom/interface/tb_connection.png    | Bin
 .../api/data/ryzom/interface/tb_contacts.png  | Bin
 .../api/data/ryzom/interface/tb_desk_1.png    | Bin
 .../api/data/ryzom/interface/tb_desk_2.png    | Bin
 .../api/data/ryzom/interface/tb_desk_3.png    | Bin
 .../api/data/ryzom/interface/tb_desk_4.png    | Bin
 .../api/data/ryzom/interface/tb_faction.png   | Bin
 .../api/data/ryzom/interface/tb_forum.png     | Bin
 .../api/data/ryzom/interface/tb_guild.png     | Bin
 .../api/data/ryzom/interface/tb_help2.png     | Bin
 .../api/data/ryzom/interface/tb_keys.png      | Bin
 .../api/data/ryzom/interface/tb_macros.png    | Bin
 .../api/data/ryzom/interface/tb_mail.png      | Bin
 .../api/data/ryzom/interface/tb_mode.png      | Bin
 .../data/ryzom/interface/tb_mode_dodge.png    | Bin
 .../data/ryzom/interface/tb_mode_parry.png    | Bin
 .../api/data/ryzom/interface/tb_over.png      | Bin
 .../api/data/ryzom/interface/tb_support.png   | Bin
 .../api/data/ryzom/interface/tb_team.png      | Bin
 .../api/data/ryzom/interface/tb_windows.png   | Bin
 .../api/data/ryzom/interface/tetekitin.png    | Bin
 .../api/data/ryzom/interface/to_ammo.png      | Bin
 .../api/data/ryzom/interface/to_armor.png     | Bin
 .../data/ryzom/interface/to_cooking_pot.png   | Bin
 .../data/ryzom/interface/to_fishing_rod.png   | Bin
 .../api/data/ryzom/interface/to_forage.png    | Bin
 .../api/data/ryzom/interface/to_hammer.png    | Bin
 .../ryzom/interface/to_jewelry_hammer.png     | Bin
 .../api/data/ryzom/interface/to_jewels.png    | Bin
 .../data/ryzom/interface/to_leathercutter.png | Bin
 .../api/data/ryzom/interface/to_melee.png     | Bin
 .../api/data/ryzom/interface/to_needle.png    | Bin
 .../api/data/ryzom/interface/to_pestle.png    | Bin
 .../api/data/ryzom/interface/to_range.png     | Bin
 .../api/data/ryzom/interface/to_searake.png   | Bin
 .../api/data/ryzom/interface/to_spade.png     | Bin
 .../api/data/ryzom/interface/to_stick.png     | Bin
 .../ryzom/interface/to_tunneling_knife.png    | Bin
 .../api/data/ryzom/interface/to_whip.png      | Bin
 .../api/data/ryzom/interface/to_wrench.png    | Bin
 .../api/data/ryzom/interface/tp_caravane.png  | Bin
 .../api/data/ryzom/interface/tp_kami.png      | Bin
 .../api/data/ryzom/interface/us_back_0.png    | Bin
 .../api/data/ryzom/interface/us_back_1.png    | Bin
 .../api/data/ryzom/interface/us_back_2.png    | Bin
 .../api/data/ryzom/interface/us_back_3.png    | Bin
 .../api/data/ryzom/interface/us_back_4.png    | Bin
 .../api/data/ryzom/interface/us_back_5.png    | Bin
 .../api/data/ryzom/interface/us_back_6.png    | Bin
 .../api/data/ryzom/interface/us_back_7.png    | Bin
 .../api/data/ryzom/interface/us_back_8.png    | Bin
 .../api/data/ryzom/interface/us_back_9.png    | Bin
 .../api/data/ryzom/interface/us_ico_0.png     | Bin
 .../api/data/ryzom/interface/us_ico_1.png     | Bin
 .../api/data/ryzom/interface/us_ico_2.png     | Bin
 .../api/data/ryzom/interface/us_ico_3.png     | Bin
 .../api/data/ryzom/interface/us_ico_4.png     | Bin
 .../api/data/ryzom/interface/us_ico_5.png     | Bin
 .../api/data/ryzom/interface/us_ico_6.png     | Bin
 .../api/data/ryzom/interface/us_ico_7.png     | Bin
 .../api/data/ryzom/interface/us_ico_8.png     | Bin
 .../api/data/ryzom/interface/us_ico_9.png     | Bin
 .../api/data/ryzom/interface/us_over_0.png    | Bin
 .../api/data/ryzom/interface/us_over_1.png    | Bin
 .../api/data/ryzom/interface/us_over_2.png    | Bin
 .../api/data/ryzom/interface/us_over_3.png    | Bin
 .../api/data/ryzom/interface/us_over_4.png    | Bin
 .../api/data/ryzom/interface/w_am_logo.png    | Bin
 .../api/data/ryzom/interface/w_leader.png     | Bin
 .../api/data/ryzom/interface/w_major.png      | Bin
 .../api/data/ryzom/interface/w_pa_anklet.png  | Bin
 .../data/ryzom/interface/w_pa_bracelet.png    | Bin
 .../api/data/ryzom/interface/w_pa_diadem.png  | Bin
 .../api/data/ryzom/interface/w_pa_earring.png | Bin
 .../api/data/ryzom/interface/w_pa_pendant.png | Bin
 .../api/data/ryzom/interface/w_pa_ring.png    | Bin
 .../ryzom/interface/w_slot_shortcut_id0.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id1.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id2.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id3.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id4.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id5.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id6.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id7.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id8.png   | Bin
 .../ryzom/interface/w_slot_shortcut_id9.png   | Bin
 .../interface/w_slot_shortcut_shift_id0.png   | Bin
 .../interface/w_slot_shortcut_shift_id1.png   | Bin
 .../interface/w_slot_shortcut_shift_id2.png   | Bin
 .../interface/w_slot_shortcut_shift_id3.png   | Bin
 .../interface/w_slot_shortcut_shift_id4.png   | Bin
 .../interface/w_slot_shortcut_shift_id5.png   | Bin
 .../interface/w_slot_shortcut_shift_id6.png   | Bin
 .../interface/w_slot_shortcut_shift_id7.png   | Bin
 .../interface/w_slot_shortcut_shift_id8.png   | Bin
 .../interface/w_slot_shortcut_shift_id9.png   | Bin
 .../api/data/ryzom/interface/xp_cat_green.png | Bin
 .../public_php/api/data/ryzom/items_db.php    |   0
 .../public_php/api/data/ryzom/ryShapesPs.php  |   0
 .../public_php/api/data/ryzom/sbrick_db.php   |   0
 {code/web => web}/public_php/api/index.php    |   0
 .../public_php/api/player_auth.php            |   0
 .../web => web}/public_php/api/ryzom_api.php  |   0
 .../public_php/api/server/auth.php            |   0
 .../public_php/api/server/config.php.default  |   0
 .../public_php/api/server/guilds.php          |   0
 .../public_php/api/server/hmagic.php          |   0
 .../public_php/api/server/item_icon.php       |   0
 .../achievement_script/AchWebParser.php       |   0
 .../achievement_script/_test/char_346.xml     |   0
 .../achievement_script/_test/diff_class.php   |   0
 .../achievement_script/_test/diff_test.php    |   0
 .../achievement_script/_test/old_char_346.xml |   0
 .../achievement_script/class/Atom_class.php   |   0
 .../class/Callback_class.php                  |   0
 .../class/DataDispatcher_class.php            |   0
 .../class/DataSourceHandler_class.php         |   0
 .../class/Entity_abstract.php                 |   0
 .../class/Logfile_class.php                   |   0
 .../class/SourceDriver_abstract.php           |   0
 .../achievement_script/class/Stats_class.php  |   0
 .../class/ValueCache_class.php                |   0
 .../class/XMLfile_class.php                   |   0
 .../class/XMLgenerator_class.php              |   0
 .../class/XMLnode_class.php                   |   0
 .../achievement_script/class/mySQL_class.php  |   0
 .../scripts/achievement_script/conf.php       |   0
 .../include/functions_inc.php                 |   0
 .../launch_parse_new_xml.sh                   |   0
 .../achievement_script/log/_logDefaultDir_    |   0
 .../log/xml_tmp/_xml_tmp_dir                  |   0
 .../achievement_script/parse_new_xml.sh       |   0
 .../achievement_script/script/_scriptDir      |   0
 .../script/item_grade_script.php              |   0
 .../script/places/continents.php              |   0
 .../script/places/global.php                  |   0
 .../achievement_script/script/statsdb.php     |   0
 .../BillingSummary/BillingSummary_class.php   |   0
 .../PDRtoXMLdriver/PDRtoXMLdriver_class.php   |   0
 .../entity/DeathPenalty_entity.php            |   0
 .../entity/FactionPoints_entity.php           |   0
 .../PDRtoXMLdriver/entity/Fame_entity.php     |   0
 .../PDRtoXMLdriver/entity/FriendOf_entity.php |   0
 .../PDRtoXMLdriver/entity/Friend_entity.php   |   0
 .../entity/Friendlist_entity.php              |   0
 .../PDRtoXMLdriver/entity/Gear_entity.php     |   0
 .../PDRtoXMLdriver/entity/Item_entity.php     |   0
 .../entity/LastLogStats_entity.php            |   0
 .../entity/MissionList_entity.php             |   0
 .../PDRtoXMLdriver/entity/Mission_entity.php  |   0
 .../entity/PermanentMod_entity.php            |   0
 .../PDRtoXMLdriver/entity/Pet_entity.php      |   0
 .../entity/PhysCharacs_entity.php             |   0
 .../entity/PhysScores_entity.php              |   0
 .../PDRtoXMLdriver/entity/Position_entity.php |   0
 .../entity/RespawnPoints_entity.php           |   0
 .../entity/SkillList_entity.php               |   0
 .../entity/SkillPoints_entity.php             |   0
 .../PDRtoXMLdriver/entity/Skill_entity.php    |   0
 .../entity/SpentSkillPoints_entity.php        |   0
 .../PDRtoXMLdriver/entity/TPlist_entity.php   |   0
 .../PDRtoXMLdriver/entity/Title_entity.php    |   0
 .../achievement_script/xmldef/debug.php       |   0
 .../achievement_script/xmldef/faction.php     |   0
 .../achievement_script/xmldef/fame.php        |   0
 .../achievement_script/xmldef/inventory.php   |   0
 .../achievement_script/xmldef/knowledge.php   |   0
 .../achievement_script/xmldef/logs.php        |   0
 .../achievement_script/xmldef/missions.php    |   0
 .../achievement_script/xmldef/public.php      |   0
 .../achievement_script/xmldef/shop.php        |   0
 .../achievement_script/xmldef/skills.php      |   0
 .../achievement_script/xmldef/social.php      |   0
 .../achievement_script/xmldef/stats.php       |   0
 .../api/server/scripts/create_guilds_xml.php  |   0
 .../api/server/scripts/generate_guild_icon.sh |   0
 .../api/server/scripts/get_guilds_xml.sh      |   0
 .../public_php/api/server/time.php            |   0
 .../public_php/api/server/user.php            |   0
 .../public_php/api/server/utils.php           |   0
 {code/web => web}/public_php/api/time.php     |   0
 .../app_achievements/_API/ach_progress.php    |   0
 .../app/app_achievements/_API/ach_struct.php  |   0
 .../_API/class/mySQL_class.php                |   0
 .../app/app_achievements/_API/conf.php        |   0
 .../app_achievements/_doc/Class_scheme.dia    | Bin
 .../app_achievements/_doc/Class_scheme.png    | Bin
 .../_doc/ER & Class Schema.pdf                | Bin
 .../app/app_achievements/_doc/ER_scheme.dia   | Bin
 .../app/app_achievements/_doc/ER_scheme.png   | Bin
 .../_doc/Ryzom Player Achievements.pdf        | Bin
 .../app/app_achievements/_doc/devshot_001.jpg | Bin
 .../app/app_achievements/_doc/devshot_002.jpg | Bin
 .../app/app_achievements/_doc/devshot_003.jpg | Bin
 .../app/app_achievements/_doc/devshot_004.jpg | Bin
 .../_doc/structure_app_achievements.sql       |   0
 .../app_achievements/class/AVLTree_class.php  |   0
 .../class/AchAchievement_class.php            |   0
 .../class/AchCategory_class.php               |   0
 .../class/AchList_abstract.php                |   0
 .../class/AchMenuNode_class.php               |   0
 .../app_achievements/class/AchMenu_class.php  |   0
 .../class/AchObjective_class.php              |   0
 .../class/AchSummary_class.php                |   0
 .../app_achievements/class/AchTask_class.php  |   0
 .../app/app_achievements/class/DLL_class.php  |   0
 .../app_achievements/class/InDev_trait.php    |   0
 .../class/NodeIterator_class.php              |   0
 .../app_achievements/class/Node_abstract.php  |   0
 .../class/Parentum_abstract.php               |   0
 .../class/RyzomUser_class.php                 |   0
 .../app_achievements/class/Tieable_inter.php  |   0
 .../public_php/app/app_achievements/conf.php  |   0
 .../app/app_achievements/favicon.ico          | Bin
 .../app/app_achievements/favicon.png          | Bin
 .../app/app_achievements/fb/base_facebook.php |   0
 .../app/app_achievements/fb/facebook.php      |   0
 .../fb/fb_ca_chain_bundle.crt                 |   0
 .../include/ach_render_common.php             |   0
 .../include/ach_render_ig.php                 |   0
 .../include/ach_render_web.php                |   0
 .../public_php/app/app_achievements/index.php |   0
 .../public_php/app/app_achievements/lang.php  |   0
 .../app/app_achievements/pic/ach_news.png     | Bin
 .../app/app_achievements/pic/bar_done_b.png   | Bin
 .../app/app_achievements/pic/bar_done_bg.png  | Bin
 .../app/app_achievements/pic/bar_done_bl.png  | Bin
 .../app/app_achievements/pic/bar_done_br.png  | Bin
 .../app/app_achievements/pic/bar_done_l.png   | Bin
 .../app/app_achievements/pic/bar_done_r.png   | Bin
 .../app/app_achievements/pic/bar_done_u.png   | Bin
 .../app/app_achievements/pic/bar_done_ul.png  | Bin
 .../app/app_achievements/pic/bar_done_ur.png  | Bin
 .../app_achievements/pic/bar_pending_b.png    | Bin
 .../app_achievements/pic/bar_pending_bl.png   | Bin
 .../app_achievements/pic/bar_pending_br.png   | Bin
 .../app_achievements/pic/bar_pending_l.png    | Bin
 .../app_achievements/pic/bar_pending_r.png    | Bin
 .../app_achievements/pic/bar_pending_u.png    | Bin
 .../app_achievements/pic/bar_pending_ul.png   | Bin
 .../app_achievements/pic/bar_pending_ur.png   | Bin
 .../app/app_achievements/pic/check.png        | Bin
 .../app/app_achievements/pic/f-connect.png    | Bin
 .../app_achievements/pic/facebook-logo.png    | Bin
 .../pic/icon/grey/small/test.png              | Bin
 .../app_achievements/pic/icon/grey/test.png   | Bin
 .../app_achievements/pic/icon/small/test.png  | Bin
 .../app/app_achievements/pic/icon/test.png    | Bin
 .../app_achievements/pic/menu/ig_summary.png  | Bin
 .../app/app_achievements/pic/menu/ig_test.png | Bin
 .../app/app_achievements/pic/menu/summary.png | Bin
 .../app/app_achievements/pic/menu/test.png    | Bin
 .../app/app_achievements/pic/menu_space.png   | Bin
 .../app/app_achievements/pic/pending.png      | Bin
 .../app/app_achievements/pic/star_done.png    | Bin
 .../app/app_achievements/pic/yubo_done.png    | Bin
 .../app_achievements/pic/yubo_done_small.png  | Bin
 .../app/app_achievements/pic/yubo_pending.png | Bin
 .../_doc/ADM_scheme.dia                       | Bin
 .../_doc/ADM_scheme.png                       | Bin
 .../class/ADM_inter.php                       |   0
 .../class/AdmAchievement_class.php            |   0
 .../class/AdmAtom_class.php                   |   0
 .../class/AdmCategory_class.php               |   0
 .../class/AdmDispatcher_trait.php             |   0
 .../class/AdmMenuNode_class.php               |   0
 .../class/AdmMenu_class.php                   |   0
 .../class/AdmObjective_class.php              |   0
 .../class/AdmTask_class.php                   |   0
 .../class/CSRAchievement_class.php            |   0
 .../class/CSRAtom_class.php                   |   0
 .../class/CSRCategory_class.php               |   0
 .../class/CSRDispatcher_trait.php             |   0
 .../class/CSRObjective_class.php              |   0
 .../class/CSRTask_class.php                   |   0
 .../class/CSR_inter.php                       |   0
 .../class/RyzomAdmin_class.php                |   0
 .../class/mySQL_class.php                     |   0
 .../app/app_achievements_admin/conf.php       |   0
 .../app/app_achievements_admin/favicon.png    | Bin
 .../include/adm_render_ach.php                |   0
 .../include/adm_render_atom.php               |   0
 .../include/adm_render_csr.php                |   0
 .../include/adm_render_lang.php               |   0
 .../include/adm_render_menu.php               |   0
 .../include/adm_render_stats.php              |   0
 .../app/app_achievements_admin/index.php      |   0
 .../app/app_achievements_admin/lang.php       |   0
 .../app/app_achievements_admin/pic/b_drop.png | Bin
 .../app_achievements_admin/pic/b_insrow.png   | Bin
 .../app_achievements_admin/pic/b_tblops.png   | Bin
 .../app/app_achievements_admin/pic/green.gif  | Bin
 .../app_achievements_admin/pic/icon_edit.gif  | Bin
 .../app/app_achievements_admin/pic/red.gif    | Bin
 .../public_php/app/app_test/create.sql        |   0
 .../public_php/app/app_test/favicon.png       | Bin
 .../public_php/app/app_test/index.php         |   0
 .../public_php/app/app_test/lang.php          |   0
 .../public_php/app/config.php.default         |   0
 {code/web => web}/public_php/app/index.php    |   0
 {code/web => web}/public_php/app/lang.php     |   0
 .../public_php/crash_report/config.inc.php    |   0
 .../public_php/crash_report/log.inc.php       |   0
 .../public_php/crash_report/submit.php        |   0
 {code/web => web}/public_php/index.php        |   0
 .../public_php/login/client_install.php       |   0
 {code/web => web}/public_php/login/config.php |   0
 .../public_php/login/email/RFC822.php         |   0
 .../public_php/login/email/htmlMimeMail.php   |   0
 .../public_php/login/email/mimePart.php       |   0
 .../public_php/login/email/smtp.php           |   0
 .../public_php/login/login_service_itf.php    |   0
 .../public_php/login/login_translations.php   |   0
 .../web => web}/public_php/login/r2_login.php |   0
 .../public_php/ring/anim_session.php          |   0
 .../public_php/ring/cancel_session.php        |   0
 .../public_php/ring/close_session.php         |   0
 .../public_php/ring/edit_session.php          |   0
 .../public_php/ring/invite_pioneer.php        |   0
 .../public_php/ring/join_session.php          |   0
 .../public_php/ring/join_shard.php            |   0
 .../public_php/ring/mail_forum_itf.php        |   0
 .../public_php/ring/plan_edit_session.php     |   0
 .../ring/ring_session_manager_itf.php         |   0
 .../ring/send_plan_edit_session.php           |   0
 .../public_php/ring/session_tools.php         |   0
 .../public_php/ring/start_session.php         |   0
 .../public_php/ring/welcome_service_itf.php   |   0
 {code/web => web}/public_php/setup/auth.php   |   0
 .../public_php/setup/css/bootstrap-theme.css  |   0
 .../setup/css/bootstrap-theme.css.map         |   0
 .../setup/css/bootstrap-theme.min.css         |   0
 .../public_php/setup/css/bootstrap.css        |   0
 .../public_php/setup/css/bootstrap.css.map    |   0
 .../public_php/setup/css/bootstrap.min.css    |   0
 .../web => web}/public_php/setup/database.php |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 {code/web => web}/public_php/setup/footer.php |   0
 {code/web => web}/public_php/setup/header.php |   0
 .../public_php/setup/img/agplv3-88x31.png     | Bin
 {code/web => web}/public_php/setup/index.php  |   0
 .../web => web}/public_php/setup/install.php  |   0
 .../public_php/setup/js/bootstrap.js          |   0
 .../public_php/setup/js/bootstrap.min.js      |   0
 .../web => web}/public_php/setup/template.htm |   0
 .../web => web}/public_php/setup/upgrade.php  |   0
 .../web => web}/public_php/setup/version.php  |   0
 .../public_php/tools/domain_info.php          |   0
 .../public_php/tools/nel_message.php          |   0
 .../public_php/tools/validate_cookie.php      |   0
 {code/web => web}/public_php/webtt/.gitignore |   0
 {code/web => web}/public_php/webtt/.htaccess  |   0
 .../public_php/webtt/CakePHP_README           |   0
 .../public_php/webtt/app/.htaccess            |   0
 .../public_php/webtt/app/config/acl.ini.php   |   0
 .../public_php/webtt/app/config/bootstrap.php |   0
 .../public_php/webtt/app/config/core.php      |   0
 .../public_php/webtt/app/config/database.php  |   0
 .../webtt/app/config/database.php.default     |   0
 .../public_php/webtt/app/config/routes.php    |   0
 .../webtt/app/config/schema/db_acl.php        |   0
 .../webtt/app/config/schema/i18n.php          |   0
 .../webtt/app/config/schema/sessions.php      |   0
 .../webtt/app/controllers/app_controller.php  |   0
 .../app/controllers/comments_controller.php   |   0
 .../webtt/app/controllers/components/empty    |   0
 .../controllers/components/path_resolver.php  |   0
 .../file_identifiers_controller.php           |   0
 .../identifier_columns_controller.php         |   0
 .../controllers/identifiers_controller.php    |   0
 .../imported_translation_files_controller.php |   0
 .../app/controllers/languages_controller.php  |   0
 .../app/controllers/pages_controller.php      |   0
 .../app/controllers/raw_files_controller.php  |   0
 .../translation_files_controller.php          |   0
 .../controllers/translations_controller.php   |   0
 .../app/controllers/users_controller.php      |   0
 .../app/controllers/votes_controller.php      |   0
 .../public_php/webtt/app/index.php            |   0
 .../public_php/webtt/app/libs/empty           |   0
 .../webtt/app/locale/eng/LC_MESSAGES/empty    |   0
 .../public_php/webtt/app/models/app_model.php |   0
 .../webtt/app/models/behaviors/empty          |   0
 .../webtt/app/models/behaviors/null.php       |   0
 .../public_php/webtt/app/models/comment.php   |   0
 .../webtt/app/models/datasources/empty        |   0
 .../models/datasources/raw_files_source.php   |   0
 .../webtt/app/models/file_identifier.php      |   0
 .../webtt/app/models/identifier.php           |   0
 .../webtt/app/models/identifier_column.php    |   0
 .../app/models/imported_translation_file.php  |   0
 .../public_php/webtt/app/models/language.php  |   0
 .../public_php/webtt/app/models/raw_file.php  |   0
 .../webtt/app/models/translation.php          |   0
 .../webtt/app/models/translation_file.php     |   0
 .../public_php/webtt/app/models/user.php      |   0
 .../public_php/webtt/app/models/vote.php      |   0
 .../public_php/webtt/app/plugins/empty        |   0
 .../webtt/app/tests/cases/behaviors/empty     |   0
 .../webtt/app/tests/cases/components/empty    |   0
 .../webtt/app/tests/cases/controllers/empty   |   0
 .../webtt/app/tests/cases/helpers/empty       |   0
 .../webtt/app/tests/cases/models/empty        |   0
 .../public_php/webtt/app/tests/fixtures/empty |   0
 .../public_php/webtt/app/tests/groups/empty   |   0
 .../webtt/app/tmp/cache/models/empty          |   0
 .../webtt/app/tmp/cache/persistent/empty      |   0
 .../webtt/app/tmp/cache/views/empty           |   0
 .../public_php/webtt/app/tmp/logs/empty       |   0
 .../public_php/webtt/app/tmp/sessions/empty   |   0
 .../public_php/webtt/app/tmp/tests/empty      |   0
 .../webtt/app/vendors/PhraseParser.php        |   0
 .../webtt/app/vendors/SheetParser.php         |   0
 .../webtt/app/vendors/StringParser.php        |   0
 .../webtt/app/vendors/shells/tasks/empty      |   0
 .../shells/templates/960grid/views/form.ctp   |   0
 .../shells/templates/960grid/views/home.ctp   |   0
 .../shells/templates/960grid/views/index.ctp  |   0
 .../shells/templates/960grid/views/view.ctp   |   0
 .../webtt/app/vendors/shells/templates/empty  |   0
 .../shells/templates/webtt/views/form.ctp     |   0
 .../shells/templates/webtt/views/home.ctp     |   0
 .../shells/templates/webtt/views/index.ctp    |   0
 .../shells/templates/webtt/views/view.ctp     |   0
 .../webtt/app/views/comments/add.ctp          |   0
 .../webtt/app/views/comments/admin_add.ctp    |   0
 .../webtt/app/views/comments/admin_edit.ctp   |   0
 .../webtt/app/views/comments/admin_index.ctp  |   0
 .../webtt/app/views/comments/admin_view.ctp   |   0
 .../webtt/app/views/comments/edit.ctp         |   0
 .../webtt/app/views/comments/index.ctp        |   0
 .../webtt/app/views/comments/view.ctp         |   0
 .../webtt/app/views/elements/email/html/empty |   0
 .../elements/email/html/registration.ctp      |   0
 .../webtt/app/views/elements/email/text/empty |   0
 .../elements/email/text/registration.ctp      |   0
 .../public_php/webtt/app/views/elements/empty |   0
 .../webtt/app/views/elements/neighbours.ctp   |   0
 .../public_php/webtt/app/views/errors/empty   |   0
 .../webtt/app/views/file_identifiers/add.ctp  |   0
 .../app/views/file_identifiers/admin_add.ctp  |   0
 .../app/views/file_identifiers/admin_edit.ctp |   0
 .../views/file_identifiers/admin_index.ctp    |   0
 .../app/views/file_identifiers/admin_view.ctp |   0
 .../webtt/app/views/file_identifiers/edit.ctp |   0
 .../app/views/file_identifiers/index.ctp      |   0
 .../webtt/app/views/file_identifiers/view.ctp |   0
 .../public_php/webtt/app/views/helpers/empty  |   0
 .../views/identifier_columns/admin_index.ctp  |   0
 .../views/identifier_columns/admin_view.ctp   |   0
 .../app/views/identifier_columns/index.ctp    |   0
 .../app/views/identifier_columns/view.ctp     |   0
 .../webtt/app/views/identifiers/add.ctp       |   0
 .../webtt/app/views/identifiers/admin_add.ctp |   0
 .../app/views/identifiers/admin_edit.ctp      |   0
 .../app/views/identifiers/admin_index.ctp     |   0
 .../app/views/identifiers/admin_view.ctp      |   0
 .../webtt/app/views/identifiers/edit.ctp      |   0
 .../webtt/app/views/identifiers/index.ctp     |   0
 .../webtt/app/views/identifiers/view.ctp      |   0
 .../imported_translation_files/admin_add.ctp  |   0
 .../imported_translation_files/admin_edit.ctp |   0
 .../admin_index.ctp                           |   0
 .../imported_translation_files/admin_view.ctp |   0
 .../imported_translation_files/index.ctp      |   0
 .../views/imported_translation_files/view.ctp |   0
 .../webtt/app/views/languages/add.ctp         |   0
 .../webtt/app/views/languages/admin_add.ctp   |   0
 .../webtt/app/views/languages/admin_edit.ctp  |   0
 .../webtt/app/views/languages/admin_index.ctp |   0
 .../webtt/app/views/languages/admin_view.ctp  |   0
 .../webtt/app/views/languages/edit.ctp        |   0
 .../webtt/app/views/languages/index.ctp       |   0
 .../webtt/app/views/languages/view.ctp        |   0
 .../webtt/app/views/layouts/admin.ctp         |   0
 .../webtt/app/views/layouts/default.ctp       |   0
 .../webtt/app/views/layouts/default_debug.ctp |   0
 .../app/views/layouts/email/html/default.ctp  |   0
 .../app/views/layouts/email/text/default.ctp  |   0
 .../webtt/app/views/layouts/js/empty          |   0
 .../webtt/app/views/layouts/new.ctp           |   0
 .../webtt/app/views/layouts/rss/empty         |   0
 .../webtt/app/views/layouts/xml/empty         |   0
 .../webtt/app/views/pages/admin/home.ctp      |   0
 .../public_php/webtt/app/views/pages/home.ctp |   0
 .../webtt/app/views/raw_files/admin_index.ctp |   0
 .../webtt/app/views/raw_files/admin_view.ctp  |   0
 .../webtt/app/views/raw_files/index.ctp       |   0
 .../webtt/app/views/raw_files/listdir.ctp     |   0
 .../webtt/app/views/raw_files/view.ctp        |   0
 .../webtt/app/views/scaffolds/edit.ctp        |   0
 .../webtt/app/views/scaffolds/empty           |   0
 .../webtt/app/views/scaffolds/index.ctp       |   0
 .../webtt/app/views/scaffolds/view.ctp        |   0
 .../views/translation_files/admin_index.ctp   |   0
 .../views/translation_files/admin_view.ctp    |   0
 .../app/views/translation_files/index.ctp     |   0
 .../app/views/translation_files/view.ctp      |   0
 .../webtt/app/views/translations/add.ctp      |   0
 .../app/views/translations/admin_add.ctp      |   0
 .../app/views/translations/admin_edit.ctp     |   0
 .../app/views/translations/admin_index.ctp    |   0
 .../app/views/translations/admin_view.ctp     |   0
 .../webtt/app/views/translations/edit.ctp     |   0
 .../webtt/app/views/translations/index.ctp    |   0
 .../webtt/app/views/translations/view.ctp     |   0
 .../webtt/app/views/users/admin_add.ctp       |   0
 .../webtt/app/views/users/admin_edit.ctp      |   0
 .../webtt/app/views/users/admin_index.ctp     |   0
 .../webtt/app/views/users/admin_view.ctp      |   0
 .../webtt/app/views/users/index.ctp           |   0
 .../webtt/app/views/users/login.ctp           |   0
 .../webtt/app/views/users/register.ctp        |   0
 .../public_php/webtt/app/views/users/view.ctp |   0
 .../public_php/webtt/app/views/votes/add.ctp  |   0
 .../webtt/app/views/votes/admin_add.ctp       |   0
 .../webtt/app/views/votes/admin_edit.ctp      |   0
 .../webtt/app/views/votes/admin_index.ctp     |   0
 .../webtt/app/views/votes/admin_view.ctp      |   0
 .../public_php/webtt/app/views/votes/edit.ctp |   0
 .../webtt/app/views/votes/index.ctp           |   0
 .../public_php/webtt/app/views/votes/view.ctp |   0
 .../public_php/webtt/app/webroot/.htaccess    |   0
 .../public_php/webtt/app/webroot/css.php      |   0
 .../public_php/webtt/app/webroot/css/960.css  |   0
 .../webtt/app/webroot/css/cake.generic.css    |   0
 .../public_php/webtt/app/webroot/css/grid.css |   0
 .../public_php/webtt/app/webroot/css/ie.css   |   0
 .../public_php/webtt/app/webroot/css/ie6.css  |   0
 .../webtt/app/webroot/css/labelWidth.css      |   0
 .../webtt/app/webroot/css/layout.css          |   0
 .../public_php/webtt/app/webroot/css/nav.css  |   0
 .../webtt/app/webroot/css/reset.css           |   0
 .../public_php/webtt/app/webroot/css/text.css |   0
 .../public_php/webtt/app/webroot/favicon.ico  | Bin
 .../public_php/webtt/app/webroot/files/empty  |   0
 .../webtt/app/webroot/img/cake.icon.png       | Bin
 .../webtt/app/webroot/img/cake.power.gif      | Bin
 .../webtt/app/webroot/img/switch_minus.gif    | Bin
 .../webtt/app/webroot/img/switch_plus.gif     | Bin
 .../public_php/webtt/app/webroot/index.php    |   0
 .../public_php/webtt/app/webroot/js/empty     |   0
 .../webtt/app/webroot/js/jquery-1.3.2.min.js  |   0
 .../webtt/app/webroot/js/jquery-fluid16.js    |   0
 .../webtt/app/webroot/js/jquery-ui.js         |   0
 .../public_php/webtt/app/webroot/test.php     |   0
 .../app/webroot/testfiles/raw_testfile.csv    |   0
 .../testfiles/testdir/ugatestindir.csv        |   0
 .../webtt/app/webroot/testfiles/ugabla.csv    |   0
 .../public_php/webtt/cake/LICENSE.txt         |   0
 .../public_php/webtt/cake/VERSION.txt         |   0
 .../public_php/webtt/cake/basics.php          |   0
 .../public_php/webtt/cake/bootstrap.php       |   0
 .../public_php/webtt/cake/config/config.php   |   0
 .../public_php/webtt/cake/config/paths.php    |   0
 .../config/unicode/casefolding/0080_00ff.php  |   0
 .../config/unicode/casefolding/0100_017f.php  |   0
 .../config/unicode/casefolding/0180_024F.php  |   0
 .../config/unicode/casefolding/0250_02af.php  |   0
 .../config/unicode/casefolding/0370_03ff.php  |   0
 .../config/unicode/casefolding/0400_04ff.php  |   0
 .../config/unicode/casefolding/0500_052f.php  |   0
 .../config/unicode/casefolding/0530_058f.php  |   0
 .../config/unicode/casefolding/1e00_1eff.php  |   0
 .../config/unicode/casefolding/1f00_1fff.php  |   0
 .../config/unicode/casefolding/2100_214f.php  |   0
 .../config/unicode/casefolding/2150_218f.php  |   0
 .../config/unicode/casefolding/2460_24ff.php  |   0
 .../config/unicode/casefolding/2c00_2c5f.php  |   0
 .../config/unicode/casefolding/2c60_2c7f.php  |   0
 .../config/unicode/casefolding/2c80_2cff.php  |   0
 .../config/unicode/casefolding/ff00_ffef.php  |   0
 .../public_php/webtt/cake/console/cake        |   0
 .../public_php/webtt/cake/console/cake.bat    |   0
 .../public_php/webtt/cake/console/cake.php    |   0
 .../public_php/webtt/cake/console/error.php   |   0
 .../webtt/cake/console/libs/acl.php           |   0
 .../webtt/cake/console/libs/api.php           |   0
 .../webtt/cake/console/libs/bake.php          |   0
 .../webtt/cake/console/libs/console.php       |   0
 .../webtt/cake/console/libs/i18n.php          |   0
 .../webtt/cake/console/libs/schema.php        |   0
 .../webtt/cake/console/libs/shell.php         |   0
 .../webtt/cake/console/libs/tasks/bake.php    |   0
 .../cake/console/libs/tasks/controller.php    |   0
 .../cake/console/libs/tasks/db_config.php     |   0
 .../webtt/cake/console/libs/tasks/extract.php |   0
 .../webtt/cake/console/libs/tasks/fixture.php |   0
 .../webtt/cake/console/libs/tasks/model.php   |   0
 .../webtt/cake/console/libs/tasks/plugin.php  |   0
 .../webtt/cake/console/libs/tasks/project.php |   0
 .../cake/console/libs/tasks/template.php      |   0
 .../webtt/cake/console/libs/tasks/test.php    |   0
 .../webtt/cake/console/libs/tasks/view.php    |   0
 .../webtt/cake/console/libs/testsuite.php     |   0
 .../default/actions/controller_actions.ctp    |   0
 .../templates/default/classes/controller.ctp  |   0
 .../templates/default/classes/fixture.ctp     |   0
 .../templates/default/classes/model.ctp       |   0
 .../templates/default/classes/test.ctp        |   0
 .../console/templates/default/views/form.ctp  |   0
 .../console/templates/default/views/home.ctp  |   0
 .../console/templates/default/views/index.ctp |   0
 .../console/templates/default/views/view.ctp  |   0
 .../cake/console/templates/skel/.htaccess     |   0
 .../console/templates/skel/app_controller.php |   0
 .../console/templates/skel/app_helper.php     |   0
 .../cake/console/templates/skel/app_model.php |   0
 .../console/templates/skel/config/acl.ini.php |   0
 .../templates/skel/config/bootstrap.php       |   0
 .../console/templates/skel/config/core.php    |   0
 .../skel/config/database.php.default          |   0
 .../console/templates/skel/config/routes.php  |   0
 .../templates/skel/config/schema/db_acl.php   |   0
 .../templates/skel/config/schema/db_acl.sql   |   0
 .../templates/skel/config/schema/i18n.php     |   0
 .../templates/skel/config/schema/i18n.sql     |   0
 .../templates/skel/config/schema/sessions.php |   0
 .../templates/skel/config/schema/sessions.sql |   0
 .../skel/controllers/components/empty         |   0
 .../skel/controllers/pages_controller.php     |   0
 .../cake/console/templates/skel/index.php     |   0
 .../cake/console/templates/skel/libs/empty    |   0
 .../skel/locale/eng/LC_MESSAGES/empty         |   0
 .../templates/skel/models/behaviors/empty     |   0
 .../templates/skel/models/datasources/empty   |   0
 .../cake/console/templates/skel/plugins/empty |   0
 .../skel/tests/cases/behaviors/empty          |   0
 .../skel/tests/cases/components/empty         |   0
 .../skel/tests/cases/controllers/empty        |   0
 .../skel/tests/cases/datasources/empty        |   0
 .../templates/skel/tests/cases/helpers/empty  |   0
 .../templates/skel/tests/cases/models/empty   |   0
 .../templates/skel/tests/cases/shells/empty   |   0
 .../templates/skel/tests/fixtures/empty       |   0
 .../console/templates/skel/tests/groups/empty |   0
 .../templates/skel/tmp/cache/models/empty     |   0
 .../templates/skel/tmp/cache/persistent/empty |   0
 .../templates/skel/tmp/cache/views/empty      |   0
 .../console/templates/skel/tmp/logs/empty     |   0
 .../console/templates/skel/tmp/sessions/empty |   0
 .../console/templates/skel/tmp/tests/empty    |   0
 .../templates/skel/vendors/shells/tasks/empty |   0
 .../views/elements/email/html/default.ctp     |   0
 .../views/elements/email/text/default.ctp     |   0
 .../templates/skel/views/elements/empty       |   0
 .../console/templates/skel/views/errors/empty |   0
 .../templates/skel/views/helpers/empty        |   0
 .../templates/skel/views/layouts/ajax.ctp     |   0
 .../templates/skel/views/layouts/default.ctp  |   0
 .../skel/views/layouts/email/html/default.ctp |   0
 .../skel/views/layouts/email/text/default.ctp |   0
 .../templates/skel/views/layouts/flash.ctp    |   0
 .../skel/views/layouts/js/default.ctp         |   0
 .../skel/views/layouts/rss/default.ctp        |   0
 .../skel/views/layouts/xml/default.ctp        |   0
 .../console/templates/skel/views/pages/empty  |   0
 .../templates/skel/views/scaffolds/empty      |   0
 .../console/templates/skel/webroot/.htaccess  |   0
 .../console/templates/skel/webroot/css.php    |   0
 .../skel/webroot/css/cake.generic.css         |   0
 .../templates/skel/webroot/favicon.ico        | Bin
 .../templates/skel/webroot/img/cake.icon.png  | Bin
 .../templates/skel/webroot/img/cake.power.gif | Bin
 .../console/templates/skel/webroot/index.php  |   0
 .../console/templates/skel/webroot/js/empty   |   0
 .../console/templates/skel/webroot/test.php   |   0
 .../public_php/webtt/cake/dispatcher.php      |   0
 .../public_php/webtt/cake/libs/cache.php      |   0
 .../public_php/webtt/cake/libs/cache/apc.php  |   0
 .../public_php/webtt/cake/libs/cache/file.php |   0
 .../webtt/cake/libs/cache/memcache.php        |   0
 .../webtt/cake/libs/cache/xcache.php          |   0
 .../public_php/webtt/cake/libs/cake_log.php   |   0
 .../webtt/cake/libs/cake_session.php          |   0
 .../webtt/cake/libs/cake_socket.php           |   0
 .../webtt/cake/libs/class_registry.php        |   0
 .../public_php/webtt/cake/libs/configure.php  |   0
 .../cake/libs/controller/app_controller.php   |   0
 .../webtt/cake/libs/controller/component.php  |   0
 .../cake/libs/controller/components/acl.php   |   0
 .../cake/libs/controller/components/auth.php  |   0
 .../libs/controller/components/cookie.php     |   0
 .../cake/libs/controller/components/email.php |   0
 .../controller/components/request_handler.php |   0
 .../libs/controller/components/security.php   |   0
 .../libs/controller/components/session.php    |   0
 .../webtt/cake/libs/controller/controller.php |   0
 .../cake/libs/controller/pages_controller.php |   0
 .../webtt/cake/libs/controller/scaffold.php   |   0
 .../public_php/webtt/cake/libs/debugger.php   |   0
 .../public_php/webtt/cake/libs/error.php      |   0
 .../public_php/webtt/cake/libs/file.php       |   0
 .../public_php/webtt/cake/libs/folder.php     |   0
 .../webtt/cake/libs/http_socket.php           |   0
 .../public_php/webtt/cake/libs/i18n.php       |   0
 .../public_php/webtt/cake/libs/inflector.php  |   0
 .../public_php/webtt/cake/libs/l10n.php       |   0
 .../webtt/cake/libs/log/file_log.php          |   0
 .../public_php/webtt/cake/libs/magic_db.php   |   0
 .../webtt/cake/libs/model/app_model.php       |   0
 .../webtt/cake/libs/model/behaviors/acl.php   |   0
 .../cake/libs/model/behaviors/containable.php |   0
 .../cake/libs/model/behaviors/translate.php   |   0
 .../webtt/cake/libs/model/behaviors/tree.php  |   0
 .../webtt/cake/libs/model/cake_schema.php     |   0
 .../cake/libs/model/connection_manager.php    |   0
 .../libs/model/datasources/datasource.php     |   0
 .../libs/model/datasources/dbo/dbo_mssql.php  |   0
 .../libs/model/datasources/dbo/dbo_mysql.php  |   0
 .../libs/model/datasources/dbo/dbo_mysqli.php |   0
 .../libs/model/datasources/dbo/dbo_oracle.php |   0
 .../model/datasources/dbo/dbo_postgres.php    |   0
 .../libs/model/datasources/dbo/dbo_sqlite.php |   0
 .../libs/model/datasources/dbo_source.php     |   0
 .../webtt/cake/libs/model/db_acl.php          |   0
 .../webtt/cake/libs/model/model.php           |   0
 .../webtt/cake/libs/model/model_behavior.php  |   0
 .../public_php/webtt/cake/libs/multibyte.php  |   0
 .../public_php/webtt/cake/libs/object.php     |   0
 .../webtt/cake/libs/overloadable.php          |   0
 .../webtt/cake/libs/overloadable_php4.php     |   0
 .../webtt/cake/libs/overloadable_php5.php     |   0
 .../public_php/webtt/cake/libs/router.php     |   0
 .../public_php/webtt/cake/libs/sanitize.php   |   0
 .../public_php/webtt/cake/libs/security.php   |   0
 .../public_php/webtt/cake/libs/set.php        |   0
 .../public_php/webtt/cake/libs/string.php     |   0
 .../public_php/webtt/cake/libs/validation.php |   0
 .../libs/view/elements/email/html/default.ctp |   0
 .../libs/view/elements/email/text/default.ctp |   0
 .../cake/libs/view/elements/sql_dump.ctp      |   0
 .../webtt/cake/libs/view/errors/error404.ctp  |   0
 .../webtt/cake/libs/view/errors/error500.ctp  |   0
 .../cake/libs/view/errors/missing_action.ctp  |   0
 .../view/errors/missing_behavior_class.ctp    |   0
 .../view/errors/missing_behavior_file.ctp     |   0
 .../view/errors/missing_component_class.ctp   |   0
 .../view/errors/missing_component_file.ctp    |   0
 .../libs/view/errors/missing_connection.ctp   |   0
 .../libs/view/errors/missing_controller.ctp   |   0
 .../libs/view/errors/missing_helper_class.ctp |   0
 .../libs/view/errors/missing_helper_file.ctp  |   0
 .../cake/libs/view/errors/missing_layout.ctp  |   0
 .../cake/libs/view/errors/missing_model.ctp   |   0
 .../libs/view/errors/missing_scaffolddb.ctp   |   0
 .../cake/libs/view/errors/missing_table.ctp   |   0
 .../cake/libs/view/errors/missing_view.ctp    |   0
 .../cake/libs/view/errors/private_action.ctp  |   0
 .../cake/libs/view/errors/scaffold_error.ctp  |   0
 .../webtt/cake/libs/view/helper.php           |   0
 .../webtt/cake/libs/view/helpers/ajax.php     |   0
 .../cake/libs/view/helpers/app_helper.php     |   0
 .../webtt/cake/libs/view/helpers/cache.php    |   0
 .../webtt/cake/libs/view/helpers/form.php     |   0
 .../webtt/cake/libs/view/helpers/html.php     |   0
 .../cake/libs/view/helpers/javascript.php     |   0
 .../cake/libs/view/helpers/jquery_engine.php  |   0
 .../webtt/cake/libs/view/helpers/js.php       |   0
 .../libs/view/helpers/mootools_engine.php     |   0
 .../webtt/cake/libs/view/helpers/number.php   |   0
 .../cake/libs/view/helpers/paginator.php      |   0
 .../libs/view/helpers/prototype_engine.php    |   0
 .../webtt/cake/libs/view/helpers/rss.php      |   0
 .../webtt/cake/libs/view/helpers/session.php  |   0
 .../webtt/cake/libs/view/helpers/text.php     |   0
 .../webtt/cake/libs/view/helpers/time.php     |   0
 .../webtt/cake/libs/view/helpers/xml.php      |   0
 .../webtt/cake/libs/view/layouts/ajax.ctp     |   0
 .../webtt/cake/libs/view/layouts/default.ctp  |   0
 .../libs/view/layouts/email/html/default.ctp  |   0
 .../libs/view/layouts/email/text/default.ctp  |   0
 .../webtt/cake/libs/view/layouts/flash.ctp    |   0
 .../cake/libs/view/layouts/js/default.ctp     |   0
 .../cake/libs/view/layouts/rss/default.ctp    |   0
 .../cake/libs/view/layouts/xml/default.ctp    |   0
 .../public_php/webtt/cake/libs/view/media.php |   0
 .../webtt/cake/libs/view/pages/home.ctp       |   0
 .../webtt/cake/libs/view/scaffolds/edit.ctp   |   0
 .../webtt/cake/libs/view/scaffolds/index.ctp  |   0
 .../webtt/cake/libs/view/scaffolds/view.ctp   |   0
 .../public_php/webtt/cake/libs/view/theme.php |   0
 .../public_php/webtt/cake/libs/view/view.php  |   0
 .../public_php/webtt/cake/libs/xml.php        |   0
 .../webtt/cake/tests/cases/basics.test.php    |   0
 .../cake/tests/cases/console/cake.test.php    |   0
 .../tests/cases/console/libs/acl.test.php     |   0
 .../tests/cases/console/libs/api.test.php     |   0
 .../tests/cases/console/libs/bake.test.php    |   0
 .../tests/cases/console/libs/schema.test.php  |   0
 .../tests/cases/console/libs/shell.test.php   |   0
 .../console/libs/tasks/controller.test.php    |   0
 .../console/libs/tasks/db_config.test.php     |   0
 .../cases/console/libs/tasks/extract.test.php |   0
 .../cases/console/libs/tasks/fixture.test.php |   0
 .../cases/console/libs/tasks/model.test.php   |   0
 .../cases/console/libs/tasks/plugin.test.php  |   0
 .../cases/console/libs/tasks/project.test.php |   0
 .../console/libs/tasks/template.test.php      |   0
 .../cases/console/libs/tasks/test.test.php    |   0
 .../cases/console/libs/tasks/view.test.php    |   0
 .../cake/tests/cases/dispatcher.test.php      |   0
 .../cake/tests/cases/libs/cache.test.php      |   0
 .../cake/tests/cases/libs/cache/apc.test.php  |   0
 .../cake/tests/cases/libs/cache/file.test.php |   0
 .../tests/cases/libs/cache/memcache.test.php  |   0
 .../tests/cases/libs/cache/xcache.test.php    |   0
 .../cake/tests/cases/libs/cake_log.test.php   |   0
 .../tests/cases/libs/cake_session.test.php    |   0
 .../tests/cases/libs/cake_socket.test.php     |   0
 .../tests/cases/libs/cake_test_case.test.php  |   0
 .../cases/libs/cake_test_fixture.test.php     |   0
 .../tests/cases/libs/class_registry.test.php  |   0
 .../cases/libs/code_coverage_manager.test.php |   0
 .../cake/tests/cases/libs/configure.test.php  |   0
 .../cases/libs/controller/component.test.php  |   0
 .../libs/controller/components/acl.test.php   |   0
 .../libs/controller/components/auth.test.php  |   0
 .../controller/components/cookie.test.php     |   0
 .../libs/controller/components/email.test.php |   0
 .../components/request_handler.test.php       |   0
 .../controller/components/security.test.php   |   0
 .../controller/components/session.test.php    |   0
 .../cases/libs/controller/controller.test.php |   0
 .../controller/controller_merge_vars.test.php |   0
 .../libs/controller/pages_controller.test.php |   0
 .../cases/libs/controller/scaffold.test.php   |   0
 .../cake/tests/cases/libs/debugger.test.php   |   0
 .../cake/tests/cases/libs/error.test.php      |   0
 .../webtt/cake/tests/cases/libs/file.test.php |   0
 .../cake/tests/cases/libs/folder.test.php     |   0
 .../tests/cases/libs/http_socket.test.php     |   0
 .../webtt/cake/tests/cases/libs/i18n.test.php |   0
 .../cake/tests/cases/libs/inflector.test.php  |   0
 .../webtt/cake/tests/cases/libs/l10n.test.php |   0
 .../tests/cases/libs/log/file_log.test.php    |   0
 .../cake/tests/cases/libs/magic_db.test.php   |   0
 .../cases/libs/model/behaviors/acl.test.php   |   0
 .../libs/model/behaviors/containable.test.php |   0
 .../libs/model/behaviors/translate.test.php   |   0
 .../cases/libs/model/behaviors/tree.test.php  |   0
 .../cases/libs/model/cake_schema.test.php     |   0
 .../libs/model/connection_manager.test.php    |   0
 .../model/datasources/dbo/dbo_mssql.test.php  |   0
 .../model/datasources/dbo/dbo_mysql.test.php  |   0
 .../model/datasources/dbo/dbo_mysqli.test.php |   0
 .../model/datasources/dbo/dbo_oracle.test.php |   0
 .../datasources/dbo/dbo_postgres.test.php     |   0
 .../model/datasources/dbo/dbo_sqlite.test.php |   0
 .../model/datasources/dbo_source.test.php     |   0
 .../tests/cases/libs/model/db_acl.test.php    |   0
 .../tests/cases/libs/model/model.test.php     |   0
 .../cases/libs/model/model_behavior.test.php  |   0
 .../cases/libs/model/model_delete.test.php    |   0
 .../libs/model/model_integration.test.php     |   0
 .../cases/libs/model/model_read.test.php      |   0
 .../libs/model/model_validation.test.php      |   0
 .../cases/libs/model/model_write.test.php     |   0
 .../cake/tests/cases/libs/model/models.php    |   0
 .../cake/tests/cases/libs/multibyte.test.php  |   0
 .../cake/tests/cases/libs/object.test.php     |   0
 .../tests/cases/libs/overloadable.test.php    |   0
 .../cake/tests/cases/libs/router.test.php     |   0
 .../cake/tests/cases/libs/sanitize.test.php   |   0
 .../cake/tests/cases/libs/security.test.php   |   0
 .../webtt/cake/tests/cases/libs/set.test.php  |   0
 .../cake/tests/cases/libs/string.test.php     |   0
 .../tests/cases/libs/test_manager.test.php    |   0
 .../cake/tests/cases/libs/validation.test.php |   0
 .../tests/cases/libs/view/helper.test.php     |   0
 .../cases/libs/view/helpers/ajax.test.php     |   0
 .../cases/libs/view/helpers/cache.test.php    |   0
 .../cases/libs/view/helpers/form.test.php     |   0
 .../cases/libs/view/helpers/html.test.php     |   0
 .../libs/view/helpers/javascript.test.php     |   0
 .../libs/view/helpers/jquery_engine.test.php  |   0
 .../tests/cases/libs/view/helpers/js.test.php |   0
 .../view/helpers/mootools_engine.test.php     |   0
 .../cases/libs/view/helpers/number.test.php   |   0
 .../libs/view/helpers/paginator.test.php      |   0
 .../view/helpers/prototype_engine.test.php    |   0
 .../cases/libs/view/helpers/rss.test.php      |   0
 .../cases/libs/view/helpers/session.test.php  |   0
 .../cases/libs/view/helpers/text.test.php     |   0
 .../cases/libs/view/helpers/time.test.php     |   0
 .../cases/libs/view/helpers/xml.test.php      |   0
 .../cake/tests/cases/libs/view/media.test.php |   0
 .../cake/tests/cases/libs/view/theme.test.php |   0
 .../cake/tests/cases/libs/view/view.test.php  |   0
 .../webtt/cake/tests/cases/libs/xml.test.php  |   0
 .../cake/tests/fixtures/account_fixture.php   |   0
 .../tests/fixtures/aco_action_fixture.php     |   0
 .../webtt/cake/tests/fixtures/aco_fixture.php |   0
 .../cake/tests/fixtures/aco_two_fixture.php   |   0
 .../webtt/cake/tests/fixtures/ad_fixture.php  |   0
 .../tests/fixtures/advertisement_fixture.php  |   0
 .../tests/fixtures/after_tree_fixture.php     |   0
 .../fixtures/another_article_fixture.php      |   0
 .../cake/tests/fixtures/apple_fixture.php     |   0
 .../webtt/cake/tests/fixtures/aro_fixture.php |   0
 .../cake/tests/fixtures/aro_two_fixture.php   |   0
 .../cake/tests/fixtures/aros_aco_fixture.php  |   0
 .../tests/fixtures/aros_aco_two_fixture.php   |   0
 .../fixtures/article_featured_fixture.php     |   0
 .../article_featureds_tags_fixture.php        |   0
 .../cake/tests/fixtures/article_fixture.php   |   0
 .../tests/fixtures/articles_tag_fixture.php   |   0
 .../tests/fixtures/attachment_fixture.php     |   0
 .../auth_user_custom_field_fixture.php        |   0
 .../cake/tests/fixtures/auth_user_fixture.php |   0
 .../cake/tests/fixtures/author_fixture.php    |   0
 .../cake/tests/fixtures/basket_fixture.php    |   0
 .../webtt/cake/tests/fixtures/bid_fixture.php |   0
 .../tests/fixtures/binary_test_fixture.php    |   0
 .../cake/tests/fixtures/book_fixture.php      |   0
 .../fixtures/cache_test_model_fixture.php     |   0
 .../cake/tests/fixtures/callback_fixture.php  |   0
 .../cake/tests/fixtures/campaign_fixture.php  |   0
 .../cake/tests/fixtures/category_fixture.php  |   0
 .../fixtures/category_thread_fixture.php      |   0
 .../webtt/cake/tests/fixtures/cd_fixture.php  |   0
 .../cake/tests/fixtures/comment_fixture.php   |   0
 .../fixtures/content_account_fixture.php      |   0
 .../cake/tests/fixtures/content_fixture.php   |   0
 .../fixtures/counter_cache_post_fixture.php   |   0
 ...e_post_nonstandard_primary_key_fixture.php |   0
 .../fixtures/counter_cache_user_fixture.php   |   0
 ...e_user_nonstandard_primary_key_fixture.php |   0
 .../cake/tests/fixtures/data_test_fixture.php |   0
 .../cake/tests/fixtures/datatype_fixture.php  |   0
 .../tests/fixtures/dependency_fixture.php     |   0
 .../cake/tests/fixtures/device_fixture.php    |   0
 .../fixtures/device_type_category_fixture.php |   0
 .../tests/fixtures/device_type_fixture.php    |   0
 .../fixtures/document_directory_fixture.php   |   0
 .../cake/tests/fixtures/document_fixture.php  |   0
 .../exterior_type_category_fixture.php        |   0
 .../tests/fixtures/feature_set_fixture.php    |   0
 .../cake/tests/fixtures/featured_fixture.php  |   0
 .../cake/tests/fixtures/film_file_fixture.php |   0
 .../cake/tests/fixtures/flag_tree_fixture.php |   0
 .../cake/tests/fixtures/fruit_fixture.php     |   0
 .../fixtures/fruits_uuid_tag_fixture.php      |   0
 .../fixtures/group_update_all_fixture.php     |   0
 .../cake/tests/fixtures/home_fixture.php      |   0
 .../cake/tests/fixtures/image_fixture.php     |   0
 .../cake/tests/fixtures/item_fixture.php      |   0
 .../fixtures/items_portfolio_fixture.php      |   0
 .../cake/tests/fixtures/join_a_b_fixture.php  |   0
 .../cake/tests/fixtures/join_a_c_fixture.php  |   0
 .../cake/tests/fixtures/join_a_fixture.php    |   0
 .../cake/tests/fixtures/join_b_fixture.php    |   0
 .../cake/tests/fixtures/join_c_fixture.php    |   0
 .../tests/fixtures/join_thing_fixture.php     |   0
 .../cake/tests/fixtures/message_fixture.php   |   0
 .../my_categories_my_products_fixture.php     |   0
 .../my_categories_my_users_fixture.php        |   0
 .../tests/fixtures/my_category_fixture.php    |   0
 .../tests/fixtures/my_product_fixture.php     |   0
 .../cake/tests/fixtures/my_user_fixture.php   |   0
 .../cake/tests/fixtures/node_fixture.php      |   0
 .../tests/fixtures/number_tree_fixture.php    |   0
 .../fixtures/number_tree_two_fixture.php      |   0
 .../fixtures/numeric_article_fixture.php      |   0
 .../fixtures/overall_favorite_fixture.php     |   0
 .../cake/tests/fixtures/person_fixture.php    |   0
 .../cake/tests/fixtures/portfolio_fixture.php |   0
 .../cake/tests/fixtures/post_fixture.php      |   0
 .../cake/tests/fixtures/posts_tag_fixture.php |   0
 .../tests/fixtures/primary_model_fixture.php  |   0
 .../cake/tests/fixtures/product_fixture.php   |   0
 .../fixtures/product_update_all_fixture.php   |   0
 .../cake/tests/fixtures/project_fixture.php   |   0
 .../cake/tests/fixtures/sample_fixture.php    |   0
 .../fixtures/secondary_model_fixture.php      |   0
 .../cake/tests/fixtures/session_fixture.php   |   0
 .../tests/fixtures/something_else_fixture.php |   0
 .../cake/tests/fixtures/something_fixture.php |   0
 .../tests/fixtures/stories_tag_fixture.php    |   0
 .../cake/tests/fixtures/story_fixture.php     |   0
 .../cake/tests/fixtures/syfile_fixture.php    |   0
 .../webtt/cake/tests/fixtures/tag_fixture.php |   0
 .../fixtures/test_plugin_article_fixture.php  |   0
 .../fixtures/test_plugin_comment_fixture.php  |   0
 .../fixtures/the_paper_monkies_fixture.php    |   0
 .../cake/tests/fixtures/thread_fixture.php    |   0
 .../fixtures/translate_article_fixture.php    |   0
 .../cake/tests/fixtures/translate_fixture.php |   0
 .../fixtures/translate_table_fixture.php      |   0
 .../translate_with_prefix_fixture.php         |   0
 .../fixtures/translated_article_fixture.php   |   0
 .../fixtures/translated_item_fixture.php      |   0
 .../fixtures/unconventional_tree_fixture.php  |   0
 .../fixtures/underscore_field_fixture.php     |   0
 .../cake/tests/fixtures/user_fixture.php      |   0
 .../cake/tests/fixtures/uuid_fixture.php      |   0
 .../cake/tests/fixtures/uuid_tag_fixture.php  |   0
 .../cake/tests/fixtures/uuid_tree_fixture.php |   0
 .../cake/tests/fixtures/uuiditem_fixture.php  |   0
 .../uuiditems_uuidportfolio_fixture.php       |   0
 ...ditems_uuidportfolio_numericid_fixture.php |   0
 .../tests/fixtures/uuidportfolio_fixture.php  |   0
 .../webtt/cake/tests/groups/acl.group.php     |   0
 .../webtt/cake/tests/groups/bake.group.php    |   0
 .../cake/tests/groups/behaviors.group.php     |   0
 .../webtt/cake/tests/groups/cache.group.php   |   0
 .../cake/tests/groups/components.group.php    |   0
 .../cake/tests/groups/configure.group.php     |   0
 .../webtt/cake/tests/groups/console.group.php |   0
 .../cake/tests/groups/controller.group.php    |   0
 .../cake/tests/groups/database.group.php      |   0
 .../webtt/cake/tests/groups/helpers.group.php |   0
 .../webtt/cake/tests/groups/i18n.group.php    |   0
 .../cake/tests/groups/javascript.group.php    |   0
 .../webtt/cake/tests/groups/lib.group.php     |   0
 .../webtt/cake/tests/groups/model.group.php   |   0
 .../groups/no_cross_contamination.group.php   |   0
 .../tests/groups/routing_system.group.php     |   0
 .../webtt/cake/tests/groups/socket.group.php  |   0
 .../cake/tests/groups/test_suite.group.php    |   0
 .../webtt/cake/tests/groups/view.group.php    |   0
 .../webtt/cake/tests/groups/xml.group.php     |   0
 .../webtt/cake/tests/lib/cake_test_case.php   |   0
 .../cake/tests/lib/cake_test_fixture.php      |   0
 .../webtt/cake/tests/lib/cake_test_model.php  |   0
 .../tests/lib/cake_test_suite_dispatcher.php  |   0
 .../cake/tests/lib/cake_web_test_case.php     |   0
 .../cake/tests/lib/code_coverage_manager.php  |   0
 .../tests/lib/reporter/cake_base_reporter.php |   0
 .../tests/lib/reporter/cake_cli_reporter.php  |   0
 .../tests/lib/reporter/cake_html_reporter.php |   0
 .../tests/lib/reporter/cake_text_reporter.php |   0
 .../webtt/cake/tests/lib/templates/footer.php |   0
 .../webtt/cake/tests/lib/templates/header.php |   0
 .../webtt/cake/tests/lib/templates/menu.php   |   0
 .../cake/tests/lib/templates/simpletest.php   |   0
 .../webtt/cake/tests/lib/templates/xdebug.php |   0
 .../webtt/cake/tests/lib/test_manager.php     |   0
 .../cake/tests/test_app/config/acl.ini.php    |   0
 .../test_app/controllers/components/empty     |   0
 .../controllers/tests_apps_controller.php     |   0
 .../tests_apps_posts_controller.php           |   0
 .../test_app/libs/cache/test_app_cache.php    |   0
 .../cake/tests/test_app/libs/library.php      |   0
 .../tests/test_app/libs/log/test_app_log.php  |   0
 .../cache_test_po/LC_MESSAGES/default.po      |   0
 .../locale/cache_test_po/LC_MESSAGES/dom1.po  |   0
 .../locale/cache_test_po/LC_MESSAGES/dom2.po  |   0
 .../cake/tests/test_app/locale/ja_jp/LC_TIME  |   0
 .../test_app/locale/po/LC_MESSAGES/default.po |   0
 .../test_app/locale/po/LC_MONETARY/default.po |   0
 .../cake/tests/test_app/locale/po/LC_TIME     |   0
 .../locale/rule_0_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_0_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_0_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_0_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_10_mo/LC_MESSAGES/core.mo     | Bin
 .../locale/rule_10_mo/LC_MESSAGES/default.mo  | Bin
 .../locale/rule_10_po/LC_MESSAGES/core.po     |   0
 .../locale/rule_10_po/LC_MESSAGES/default.po  |   0
 .../locale/rule_11_mo/LC_MESSAGES/core.mo     | Bin
 .../locale/rule_11_mo/LC_MESSAGES/default.mo  | Bin
 .../locale/rule_11_po/LC_MESSAGES/core.po     |   0
 .../locale/rule_11_po/LC_MESSAGES/default.po  |   0
 .../locale/rule_12_mo/LC_MESSAGES/core.mo     | Bin
 .../locale/rule_12_mo/LC_MESSAGES/default.mo  | Bin
 .../locale/rule_12_po/LC_MESSAGES/core.po     |   0
 .../locale/rule_12_po/LC_MESSAGES/default.po  |   0
 .../locale/rule_13_mo/LC_MESSAGES/core.mo     | Bin
 .../locale/rule_13_mo/LC_MESSAGES/default.mo  | Bin
 .../locale/rule_13_po/LC_MESSAGES/core.po     |   0
 .../locale/rule_13_po/LC_MESSAGES/default.po  |   0
 .../locale/rule_14_mo/LC_MESSAGES/core.mo     | Bin
 .../locale/rule_14_mo/LC_MESSAGES/default.mo  | Bin
 .../locale/rule_14_po/LC_MESSAGES/core.po     |   0
 .../locale/rule_14_po/LC_MESSAGES/default.po  |   0
 .../locale/rule_1_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_1_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_1_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_1_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_2_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_2_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_2_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_2_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_3_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_3_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_3_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_3_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_4_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_4_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_4_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_4_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_5_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_5_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_5_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_5_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_6_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_6_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_6_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_6_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_7_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_7_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_7_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_7_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_8_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_8_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_8_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_8_po/LC_MESSAGES/default.po   |   0
 .../locale/rule_9_mo/LC_MESSAGES/core.mo      | Bin
 .../locale/rule_9_mo/LC_MESSAGES/default.mo   | Bin
 .../locale/rule_9_po/LC_MESSAGES/core.po      |   0
 .../locale/rule_9_po/LC_MESSAGES/default.po   |   0
 .../tests/test_app/locale/time_test/LC_TIME   |   0
 .../tests/test_app/models/behaviors/empty     |   0
 .../behaviors/persister_one_behavior.php      |   0
 .../behaviors/persister_two_behavior.php      |   0
 .../cake/tests/test_app/models/comment.php    |   0
 .../models/datasources/test2_other_source.php |   0
 .../models/datasources/test2_source.php       |   0
 .../tests/test_app/models/persister_one.php   |   0
 .../tests/test_app/models/persister_two.php   |   0
 .../webtt/cake/tests/test_app/models/post.php |   0
 .../plugin_js/webroot/js/one/plugin_one.js    |   0
 .../plugins/plugin_js/webroot/js/plugin_js.js |   0
 .../plugins/test_plugin/config/load.php       |   0
 .../plugins/test_plugin/config/more.load.php  |   0
 .../test_plugin/config/schema/schema.php      |   0
 .../components/other_component.php            |   0
 .../components/plugins_component.php          |   0
 .../components/test_plugin_component.php      |   0
 .../test_plugin_other_component.php           |   0
 .../controllers/test_plugin_controller.php    |   0
 .../controllers/tests_controller.php          |   0
 .../libs/cache/test_plugin_cache.php          |   0
 .../test_plugin/libs/log/test_plugin_log.php  |   0
 .../test_plugin/libs/test_plugin_library.php  |   0
 .../locale/po/LC_MESSAGES/test_plugin.po      |   0
 .../locale/po/LC_MONETARY/test_plugin.po      |   0
 .../behaviors/test_plugin_persister_one.php   |   0
 .../behaviors/test_plugin_persister_two.php   |   0
 .../models/datasources/dbo/dbo_dummy.php      |   0
 .../models/datasources/test_other_source.php  |   0
 .../models/datasources/test_source.php        |   0
 .../models/test_plugin_auth_user.php          |   0
 .../models/test_plugin_authors.php            |   0
 .../models/test_plugin_comment.php            |   0
 .../test_plugin/models/test_plugin_post.php   |   0
 .../test_plugin_app_controller.php            |   0
 .../test_plugin/test_plugin_app_model.php     |   0
 .../vendors/sample/sample_plugin.php          |   0
 .../test_plugin/vendors/shells/example.php    |   0
 .../test_plugin/vendors/shells/tasks/empty    |   0
 .../vendors/shells/templates/empty            |   0
 .../plugins/test_plugin/vendors/welcome.php   |   0
 .../views/elements/plugin_element.ctp         |   0
 .../views/elements/test_plugin_element.ctp    |   0
 .../views/helpers/other_helper.php            |   0
 .../views/helpers/plugged_helper.php          |   0
 .../views/helpers/test_plugin_app.php         |   0
 .../test_plugin/views/layouts/default.ctp     |   0
 .../plugins/test_plugin/views/tests/index.ctp |   0
 .../test_plugin/views/tests/scaffold.edit.ctp |   0
 .../webroot/css/test_plugin_asset.css         |   0
 .../test_plugin/webroot/css/theme_one.htc     |   0
 .../test_plugin/webroot/css/unknown.extension |   0
 .../test_plugin/webroot/flash/plugin_test.swf |   0
 .../test_plugin/webroot/img/cake.icon.gif     | Bin
 .../webroot/js/test_plugin/test.js            |   0
 .../test_plugin/webroot/pdfs/plugin_test.pdf  |   0
 .../plugins/test_plugin/webroot/root.js       |   0
 .../vendors/shells/example.php                |   0
 .../vendors/shells/tasks/empty                |   0
 .../vendors/shells/templates/empty            |   0
 .../vendors/shells/welcome.php                |   0
 .../webtt/cake/tests/test_app/tmp/dir_map     |   0
 .../tests/test_app/vendors/Test/MyTest.php    |   0
 .../tests/test_app/vendors/Test/hello.php     |   0
 .../tests/test_app/vendors/css/test_asset.css |   0
 .../cake/tests/test_app/vendors/img/test.jpg  | Bin
 .../sample/configure_test_vendor_sample.php   |   0
 .../tests/test_app/vendors/shells/sample.php  |   0
 .../tests/test_app/vendors/shells/tasks/empty |   0
 .../test_app/vendors/somename/some.name.php   |   0
 .../cake/tests/test_app/vendors/welcome.php   |   0
 .../views/elements/email/html/custom.ctp      |   0
 .../views/elements/email/html/default.ctp     |   0
 .../elements/email/html/nested_element.ctp    |   0
 .../views/elements/email/text/custom.ctp      |   0
 .../views/elements/email/text/default.ctp     |   0
 .../views/elements/email/text/wide.ctp        |   0
 .../cake/tests/test_app/views/elements/empty  |   0
 .../test_app/views/elements/html_call.ctp     |   0
 .../elements/nocache/contains_nocache.ctp     |   0
 .../test_app/views/elements/nocache/plain.ctp |   0
 .../test_app/views/elements/nocache/sub1.ctp  |   0
 .../test_app/views/elements/nocache/sub2.ctp  |   0
 .../views/elements/session_helper.ctp         |   0
 .../test_app/views/elements/test_element.ctp  |   0
 .../test_app/views/elements/type_check.ctp    |   0
 .../cake/tests/test_app/views/errors/empty    |   0
 .../tests/test_app/views/helpers/banana.php   |   0
 .../cake/tests/test_app/views/helpers/empty   |   0
 .../tests/test_app/views/layouts/ajax.ctp     |   0
 .../tests/test_app/views/layouts/ajax2.ctp    |   0
 .../views/layouts/cache_empty_sections.ctp    |   0
 .../test_app/views/layouts/cache_layout.ctp   |   0
 .../tests/test_app/views/layouts/default.ctp  |   0
 .../views/layouts/email/html/default.ctp      |   0
 .../views/layouts/email/html/thin.ctp         |   0
 .../views/layouts/email/text/default.ctp      |   0
 .../tests/test_app/views/layouts/flash.ctp    |   0
 .../test_app/views/layouts/js/default.ctp     |   0
 .../test_app/views/layouts/multi_cache.ctp    |   0
 .../test_app/views/layouts/rss/default.ctp    |   0
 .../test_app/views/layouts/xml/default.ctp    |   0
 .../cake/tests/test_app/views/pages/empty     |   0
 .../tests/test_app/views/pages/extract.ctp    |   0
 .../cake/tests/test_app/views/pages/home.ctp  |   0
 .../views/posts/cache_empty_sections.ctp      |   0
 .../tests/test_app/views/posts/cache_form.ctp |   0
 .../test_app/views/posts/helper_overwrite.ctp |   0
 .../cake/tests/test_app/views/posts/index.ctp |   0
 .../test_app/views/posts/multiple_nocache.ctp |   0
 .../views/posts/nocache_multiple_element.ctp  |   0
 .../test_app/views/posts/scaffold.edit.ctp    |   0
 .../views/posts/sequencial_nocache.ctp        |   0
 .../views/posts/test_nocache_tags.ctp         |   0
 .../cake/tests/test_app/views/scaffolds/empty |   0
 .../tests/test_app/views/tests_apps/index.ctp |   0
 .../test_theme/elements/test_element.ctp      |   0
 .../themed/test_theme/layouts/default.ctp     |   0
 .../test_plugin/layouts/plugin_default.ctp    |   0
 .../plugins/test_plugin/tests/index.ctp       |   0
 .../views/themed/test_theme/posts/index.ctp   |   0
 .../test_theme/posts/scaffold.index.ctp       |   0
 .../test_theme/webroot/css/test_asset.css     |   0
 .../test_theme/webroot/css/theme_webroot.css  |   0
 .../test_theme/webroot/flash/theme_test.swf   |   0
 .../test_theme/webroot/img/cake.power.gif     | Bin
 .../themed/test_theme/webroot/img/test.jpg    | Bin
 .../test_theme/webroot/js/one/theme_one.js    |   0
 .../themed/test_theme/webroot/js/theme.js     |   0
 .../test_theme/webroot/pdfs/theme_test.pdf    |   0
 .../theme/test_theme/css/theme_webroot.css    |   0
 .../theme/test_theme/css/webroot_test.css     |   0
 .../theme/test_theme/img/cake.power.gif       | Bin
 .../webroot/theme/test_theme/img/test.jpg     | Bin
 .../web => web}/public_php/webtt/docs/INSTALL |   0
 .../webtt/docs/db/CakePHP_Associations        |   0
 .../public_php/webtt/docs/db/erd.png          | Bin
 .../public_php/webtt/docs/db/webtt2.db        |   0
 {code/web => web}/public_php/webtt/index.php  |   0
 .../webtt/plugins/debug_kit/.gitignore        |   0
 .../webtt/plugins/debug_kit/README.mdown      |   0
 .../webtt/plugins/debug_kit/build.py          |   0
 .../controllers/components/toolbar.php        |   0
 .../controllers/toolbar_access_controller.php |   0
 .../debug_kit/debug_kit_app_controller.php    |   0
 .../plugins/debug_kit/debug_kit_app_model.php |   0
 .../plugins/debug_kit/locale/debug_kit.pot    |   0
 .../locale/eng/LC_MESSAGES/debug_kit.po       |   0
 .../locale/spa/LC_MESSAGES/debug_kit.po       |   0
 .../debug_kit/models/behaviors/timed.php      |   0
 .../debug_kit/models/toolbar_access.php       |   0
 .../tests/cases/behaviors/timed.test.php      |   0
 .../controllers/components/toolbar.test.php   |   0
 .../cases/models/toolbar_access.test.php      |   0
 .../debug_kit/tests/cases/test_objects.php    |   0
 .../cases/vendors/debug_kit_debugger.test.php |   0
 .../tests/cases/vendors/fire_cake.test.php    |   0
 .../tests/cases/views/debug.test.php          |   0
 .../views/helpers/fire_php_toolbar.test.php   |   0
 .../cases/views/helpers/html_toolbar.test.php |   0
 .../cases/views/helpers/toolbar.test.php      |   0
 .../tests/groups/view_group.group.php         |   0
 .../controllers/debug_kit_test_controller.php |   0
 .../tests/test_app/vendors/test_panel.php     |   0
 .../debug_kit_test/request_action_render.ctp  |   0
 .../debug_kit/vendors/debug_kit_debugger.php  |   0
 .../plugins/debug_kit/vendors/fire_cake.php   |   0
 .../debug_kit/vendors/shells/benchmark.php    |   0
 .../debug_kit/vendors/shells/whitespace.php   |   0
 .../webtt/plugins/debug_kit/views/debug.php   |   0
 .../views/elements/debug_toolbar.ctp          |   0
 .../views/elements/history_panel.ctp          |   0
 .../debug_kit/views/elements/log_panel.ctp    |   0
 .../views/elements/request_panel.ctp          |   0
 .../views/elements/session_panel.ctp          |   0
 .../views/elements/sql_log_panel.ctp          |   0
 .../debug_kit/views/elements/timer_panel.ctp  |   0
 .../views/elements/variables_panel.ctp        |   0
 .../views/helpers/fire_php_toolbar.php        |   0
 .../debug_kit/views/helpers/html_toolbar.php  |   0
 .../debug_kit/views/helpers/simple_graph.php  |   0
 .../debug_kit/views/helpers/toolbar.php       |   0
 .../views/toolbar_access/history_state.ctp    |   0
 .../views/toolbar_access/sql_explain.ctp      |   0
 .../debug_kit/webroot/css/debug_toolbar.css   |   0
 .../debug_kit/webroot/img/cake.icon.png       | Bin
 .../debug_kit/webroot/js/js_debug_toolbar.js  |   0
 .../public_php/webtt/plugins/empty            |   0
 .../webtt/vendors/shells/tasks/empty          |   0
 .../webtt/vendors/shells/templates/empty      |   0
 .../HELP_MY_TESTS_DONT_WORK_ANYMORE           |   0
 .../webtt/vendors/simpletest/LICENSE          |   0
 .../webtt/vendors/simpletest/README           |   0
 .../webtt/vendors/simpletest/VERSION          |   0
 .../vendors/simpletest/authentication.php     |   0
 .../webtt/vendors/simpletest/autorun.php      |   0
 .../webtt/vendors/simpletest/browser.php      |   0
 .../webtt/vendors/simpletest/collector.php    |   0
 .../vendors/simpletest/compatibility.php      |   0
 .../webtt/vendors/simpletest/cookies.php      |   0
 .../vendors/simpletest/default_reporter.php   |   0
 .../webtt/vendors/simpletest/detached.php     |   0
 .../docs/en/authentication_documentation.html |   0
 .../docs/en/browser_documentation.html        |   0
 .../webtt/vendors/simpletest/docs/en/docs.css |   0
 .../docs/en/expectation_documentation.html    |   0
 .../docs/en/form_testing_documentation.html   |   0
 .../docs/en/group_test_documentation.html     |   0
 .../vendors/simpletest/docs/en/index.html     |   0
 .../docs/en/mock_objects_documentation.html   |   0
 .../vendors/simpletest/docs/en/overview.html  |   0
 .../docs/en/partial_mocks_documentation.html  |   0
 .../docs/en/reporter_documentation.html       |   0
 .../docs/en/unit_test_documentation.html      |   0
 .../docs/en/web_tester_documentation.html     |   0
 .../docs/fr/authentication_documentation.html |   0
 .../docs/fr/browser_documentation.html        |   0
 .../webtt/vendors/simpletest/docs/fr/docs.css |   0
 .../docs/fr/expectation_documentation.html    |   0
 .../docs/fr/form_testing_documentation.html   |   0
 .../docs/fr/group_test_documentation.html     |   0
 .../vendors/simpletest/docs/fr/index.html     |   0
 .../docs/fr/mock_objects_documentation.html   |   0
 .../vendors/simpletest/docs/fr/overview.html  |   0
 .../docs/fr/partial_mocks_documentation.html  |   0
 .../docs/fr/reporter_documentation.html       |   0
 .../docs/fr/unit_test_documentation.html      |   0
 .../docs/fr/web_tester_documentation.html     |   0
 .../webtt/vendors/simpletest/dumper.php       |   0
 .../webtt/vendors/simpletest/eclipse.php      |   0
 .../webtt/vendors/simpletest/encoding.php     |   0
 .../webtt/vendors/simpletest/errors.php       |   0
 .../webtt/vendors/simpletest/exceptions.php   |   0
 .../webtt/vendors/simpletest/expectation.php  |   0
 .../simpletest/extensions/pear_test_case.php  |   0
 .../vendors/simpletest/extensions/testdox.php |   0
 .../simpletest/extensions/testdox/test.php    |   0
 .../webtt/vendors/simpletest/form.php         |   0
 .../webtt/vendors/simpletest/frames.php       |   0
 .../webtt/vendors/simpletest/http.php         |   0
 .../webtt/vendors/simpletest/invoker.php      |   0
 .../webtt/vendors/simpletest/mock_objects.php |   0
 .../webtt/vendors/simpletest/page.php         |   0
 .../webtt/vendors/simpletest/php_parser.php   |   0
 .../vendors/simpletest/reflection_php4.php    |   0
 .../vendors/simpletest/reflection_php5.php    |   0
 .../webtt/vendors/simpletest/remote.php       |   0
 .../webtt/vendors/simpletest/reporter.php     |   0
 .../webtt/vendors/simpletest/scorer.php       |   0
 .../webtt/vendors/simpletest/selector.php     |   0
 .../webtt/vendors/simpletest/shell_tester.php |   0
 .../webtt/vendors/simpletest/simpletest.php   |   0
 .../webtt/vendors/simpletest/socket.php       |   0
 .../webtt/vendors/simpletest/tag.php          |   0
 .../webtt/vendors/simpletest/test_case.php    |   0
 .../webtt/vendors/simpletest/tidy_parser.php  |   0
 .../webtt/vendors/simpletest/unit_tester.php  |   0
 .../webtt/vendors/simpletest/url.php          |   0
 .../webtt/vendors/simpletest/user_agent.php   |   0
 .../webtt/vendors/simpletest/web_tester.php   |   0
 .../webtt/vendors/simpletest/xml.php          |   0
 11388 files changed, 23 deletions(-)
 rename code/.clang-format => .clang-format (100%)
 rename code/CMakeLists.txt => CMakeLists.txt (100%)
 rename {code/CMakeModules => CMakeModules}/AndroidToolChain.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/CheckDepends.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/ConfigureChecks.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/Find3dsMaxSDK.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindCEGUI.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindCppTest.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindCustomMFC.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindDSound.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindDirectXSDK.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindEFXUtil.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindExternal.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindFFmpeg.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindFMOD.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindFreeType.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindGLIB2.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindGOBJECT2.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindGTK2.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindHelpers.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindIconv.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindJpeg.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLIBGSF.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLibOVR.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLibVR.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLua52.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLua53.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindLuabind.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindMSVC.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindMercurial.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindMySQL.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindNeL.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindOgg.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindOpenGLES.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindRyzomGameShare.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindSTLport.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindSquish.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindSteam.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindVorbis.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindWindowsSDK.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/FindXF86VidMode.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/Findassimp.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/GetRevision.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/OSXToolChain.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/PCHSupport.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/iOSToolChain.cmake (100%)
 rename {code/CMakeModules => CMakeModules}/nel.cmake (100%)
 rename code/CMakePackaging.txt => CMakePackaging.txt (100%)
 rename code/COPYING => COPYING (100%)
 rename code/CTestConfig.cmake => CTestConfig.cmake (100%)
 rename code/README => README (100%)
 rename code/changelog.template => changelog.template (100%)
 delete mode 100644 code/.editorconfig
 rename code/config.h.cmake => config.h.cmake (100%)
 rename {code/nel => nel}/3rdparty/CMakeLists.txt (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7z.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zAlloc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zAlloc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zArcIn.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zBuf.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zBuf.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zBuf2.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zCrc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zCrc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zCrcOpt.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zDec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zFile.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zFile.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zStream.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zTypes.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zVersion.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/7zVersion.rc (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Aes.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Aes.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/AesOpt.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Alloc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Alloc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bcj2.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bcj2.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bcj2Enc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bra.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bra.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Bra86.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/BraIA64.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/CMakeLists.txt (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Compiler.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/CpuArch.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/CpuArch.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Delta.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Delta.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/DllSecur.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/DllSecur.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzFind.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzFind.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzHash.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2Dec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2Dec.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2DecMt.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2DecMt.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2Enc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma2Enc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma86.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma86Dec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Lzma86Enc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaDec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaDec.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaEnc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaEnc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaLib.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaLib.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/LzmaUtil.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Ppmd.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Ppmd7.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Ppmd7.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Ppmd7Dec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Ppmd7Enc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Precomp.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/RotateDefs.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Sha256.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Sha256.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Sort.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Sort.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Xz.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/Xz.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzCrc64.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzCrc64.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzCrc64Opt.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzDec.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzEnc.c (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzEnc.h (100%)
 rename {code/nel => nel}/3rdparty/seven_zip/XzIn.c (100%)
 rename {code/nel => nel}/AUTHORS (100%)
 rename {code/nel => nel}/CMakeLists.txt (100%)
 rename {code/nel => nel}/COPYING (100%)
 rename {code/nel => nel}/ChangeLog (100%)
 rename {code/nel => nel}/INSTALL (100%)
 rename {code/nel => nel}/NEWS (100%)
 rename {code/nel => nel}/README (100%)
 rename {code/nel => nel}/doc/Doxyfile.cmake.in (100%)
 rename {code/nel => nel}/doc/html/index.html (100%)
 rename {code/nel => nel}/doc/make_all_dox.sh (100%)
 rename {code/nel => nel}/doc/make_nel_dox.bat (100%)
 rename {code/nel => nel}/doc/make_nel_dox.sh (100%)
 rename {code/nel => nel}/doc/make_nelns_dox.bat (100%)
 rename {code/nel => nel}/doc/make_nelns_dox.sh (100%)
 rename {code/nel => nel}/doc/make_neltools_dox.bat (100%)
 rename {code/nel => nel}/doc/make_neltools_dox.sh (100%)
 rename {code/nel => nel}/doc/make_packages_doc.bat (100%)
 rename {code/nel => nel}/doc/make_packages_doc.sh (100%)
 rename {code/nel => nel}/doc/misc/event_callback.vsd (100%)
 rename {code/nel => nel}/doc/misc/event_listener.vsd (100%)
 rename {code/nel => nel}/doc/misc/event_pump.vsd (100%)
 rename {code/nel => nel}/doc/nel.dox (100%)
 rename {code/nel => nel}/doc/nel.hhp (100%)
 rename {code/nel => nel}/doc/nelns.dox (100%)
 rename {code/nel => nel}/doc/nelns.hhp (100%)
 rename {code/nel => nel}/doc/neltools.dox (100%)
 rename {code/nel => nel}/doc/neltools.hhp (100%)
 rename {code/nel => nel}/doc/net/login_system.vsd (100%)
 rename {code/nel => nel}/doc/net/nelnet-layer1-server-obj.png (100%)
 rename {code/nel => nel}/doc/net/net.dxt (100%)
 rename {code/nel => nel}/include/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/3d/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/3d/anim_ctrl.h (100%)
 rename {code/nel => nel}/include/nel/3d/anim_detail_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/animatable.h (100%)
 rename {code/nel => nel}/include/nel/3d/animated_lightmap.h (100%)
 rename {code/nel => nel}/include/nel/3d/animated_material.h (100%)
 rename {code/nel => nel}/include/nel/3d/animated_morph.h (100%)
 rename {code/nel => nel}/include/nel/3d/animated_value.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation_optimizer.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation_playlist.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation_set.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation_set_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/animation_time.h (100%)
 rename {code/nel => nel}/include/nel/3d/async_file_manager_3d.h (100%)
 rename {code/nel => nel}/include/nel/3d/async_texture_block.h (100%)
 rename {code/nel => nel}/include/nel/3d/async_texture_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/bezier_patch.h (100%)
 rename {code/nel => nel}/include/nel/3d/bloom_effect.h (100%)
 rename {code/nel => nel}/include/nel/3d/bone.h (100%)
 rename {code/nel => nel}/include/nel/3d/bsp_tree.h (100%)
 rename {code/nel => nel}/include/nel/3d/camera.h (100%)
 rename {code/nel => nel}/include/nel/3d/camera_col.h (100%)
 rename {code/nel => nel}/include/nel/3d/channel_mixer.h (100%)
 rename {code/nel => nel}/include/nel/3d/clip_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/cloud.h (100%)
 rename {code/nel => nel}/include/nel/3d/cloud_scape.h (100%)
 rename {code/nel => nel}/include/nel/3d/cloud_scape_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/cluster.h (100%)
 rename {code/nel => nel}/include/nel/3d/coarse_mesh_build.h (100%)
 rename {code/nel => nel}/include/nel/3d/coarse_mesh_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/computed_string.h (100%)
 rename {code/nel => nel}/include/nel/3d/cube_grid.h (100%)
 rename {code/nel => nel}/include/nel/3d/cube_map_builder.h (100%)
 rename {code/nel => nel}/include/nel/3d/debug_vb.h (100%)
 rename {code/nel => nel}/include/nel/3d/deform_2d.h (100%)
 rename {code/nel => nel}/include/nel/3d/driver.h (100%)
 rename {code/nel => nel}/include/nel/3d/driver_material_inline.h (100%)
 rename {code/nel => nel}/include/nel/3d/driver_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/dru.h (100%)
 rename {code/nel => nel}/include/nel/3d/event_mouse_listener.h (100%)
 rename {code/nel => nel}/include/nel/3d/fast_ptr_list.h (100%)
 rename {code/nel => nel}/include/nel/3d/fasthls_modifier.h (100%)
 rename {code/nel => nel}/include/nel/3d/flare_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/flare_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/font_generator.h (100%)
 rename {code/nel => nel}/include/nel/3d/font_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/frustum.h (100%)
 rename {code/nel => nel}/include/nel/3d/fxaa.h (100%)
 rename {code/nel => nel}/include/nel/3d/geometry_program.h (100%)
 rename {code/nel => nel}/include/nel/3d/gpu_program_params.h (100%)
 rename {code/nel => nel}/include/nel/3d/heat_haze.h (100%)
 rename {code/nel => nel}/include/nel/3d/height_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/hls_color_texture.h (100%)
 rename {code/nel => nel}/include/nel/3d/hls_texture_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/hls_texture_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/hrc_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/ig_surface_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/ig_surface_light_build.h (100%)
 rename {code/nel => nel}/include/nel/3d/index_buffer.h (100%)
 rename {code/nel => nel}/include/nel/3d/init_3d.h (100%)
 rename {code/nel => nel}/include/nel/3d/instance_group_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/instance_lighter.h (100%)
 rename {code/nel => nel}/include/nel/3d/key.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_collision_grid.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_def.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_face_vector_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_profile.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscape_vegetable_block.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscapeig_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscapevb_allocator.h (100%)
 rename {code/nel => nel}/include/nel/3d/landscapevb_info.h (100%)
 rename {code/nel => nel}/include/nel/3d/layered_ordering_table.h (100%)
 rename {code/nel => nel}/include/nel/3d/light.h (100%)
 rename {code/nel => nel}/include/nel/3d/light_contribution.h (100%)
 rename {code/nel => nel}/include/nel/3d/light_influence_interpolator.h (100%)
 rename {code/nel => nel}/include/nel/3d/light_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/light_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/lighting_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/load_balancing_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_builder.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_shape_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/lod_character_texture.h (100%)
 rename {code/nel => nel}/include/nel/3d/logic_info.h (100%)
 rename {code/nel => nel}/include/nel/3d/material.h (100%)
 rename {code/nel => nel}/include/nel/3d/matrix_3x4.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_base.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_base_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_blender.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_block_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_geom.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_morpher.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_mrm.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_mrm_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_mrm_skinned.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_mrm_skinned_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_multi_lod.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_multi_lod_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/mesh_vertex_program.h (100%)
 rename {code/nel => nel}/include/nel/3d/meshvp_per_pixel_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/meshvp_wind_tree.h (100%)
 rename {code/nel => nel}/include/nel/3d/mini_col.h (100%)
 rename {code/nel => nel}/include/nel/3d/motion_blur.h (100%)
 rename {code/nel => nel}/include/nel/3d/mrm_builder.h (100%)
 rename {code/nel => nel}/include/nel/3d/mrm_internal.h (100%)
 rename {code/nel => nel}/include/nel/3d/mrm_level_detail.h (100%)
 rename {code/nel => nel}/include/nel/3d/mrm_mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/mrm_parameters.h (100%)
 rename {code/nel => nel}/include/nel/3d/nelu.h (100%)
 rename {code/nel => nel}/include/nel/3d/noise_3d.h (100%)
 rename {code/nel => nel}/include/nel/3d/occlusion_query.h (100%)
 rename {code/nel => nel}/include/nel/3d/ordering_table.h (100%)
 rename {code/nel => nel}/include/nel/3d/packed_world.h (100%)
 rename {code/nel => nel}/include/nel/3d/packed_zone.h (100%)
 rename {code/nel => nel}/include/nel/3d/particle_system.h (100%)
 rename {code/nel => nel}/include/nel/3d/particle_system_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/particle_system_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/particle_system_process.h (100%)
 rename {code/nel => nel}/include/nel/3d/particle_system_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/patch.h (100%)
 rename {code/nel => nel}/include/nel/3d/patch_rdr_pass.h (100%)
 rename {code/nel => nel}/include/nel/3d/patchdlm_context.h (100%)
 rename {code/nel => nel}/include/nel/3d/patchuv_locator.h (100%)
 rename {code/nel => nel}/include/nel/3d/pixel_program.h (100%)
 rename {code/nel => nel}/include/nel/3d/play_list_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/play_list_manager_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/play_list_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/point_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/point_light_influence.h (100%)
 rename {code/nel => nel}/include/nel/3d/point_light_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/point_light_named.h (100%)
 rename {code/nel => nel}/include/nel/3d/point_light_named_array.h (100%)
 rename {code/nel => nel}/include/nel/3d/portal.h (100%)
 rename {code/nel => nel}/include/nel/3d/primitive_profile.h (100%)
 rename {code/nel => nel}/include/nel/3d/program.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_allocator.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker_bin_op.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker_bin_op_inline.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker_helper.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker_iterators.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_attrib_maker_template.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_color.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_direction.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_dot.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_edit.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_emitter.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_face.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_face_look_at.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_fan_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_float.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_force.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_int.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_iterator.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_located.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_lod.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_macro.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_misc.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_particle.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_particle2.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_particle_basic.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_plane_basis.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_plane_basis_maker.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_quad.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_register_color_attribs.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_register_float_attribs.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_register_int_attribs.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_register_plane_basis_attribs.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_ribbon.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_ribbon_base.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_ribbon_look_at.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_shockwave.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_sound.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_spawn_info.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_tail_dot.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_util.h (100%)
 rename {code/nel => nel}/include/nel/3d/ps_zone.h (100%)
 rename {code/nel => nel}/include/nel/3d/ptr_set.h (100%)
 rename {code/nel => nel}/include/nel/3d/quad_effect.h (100%)
 rename {code/nel => nel}/include/nel/3d/quad_grid.h (100%)
 rename {code/nel => nel}/include/nel/3d/quad_grid_clip_cluster.h (100%)
 rename {code/nel => nel}/include/nel/3d/quad_grid_clip_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/quad_tree.h (100%)
 rename {code/nel => nel}/include/nel/3d/radix_sort.h (100%)
 rename {code/nel => nel}/include/nel/3d/raw_skin.h (100%)
 rename {code/nel => nel}/include/nel/3d/raw_skinned.h (100%)
 rename {code/nel => nel}/include/nel/3d/ray_mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/register_3d.h (100%)
 rename {code/nel => nel}/include/nel/3d/render_target_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/render_trav.h (100%)
 rename {code/nel => nel}/include/nel/3d/root_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/scene.h (100%)
 rename {code/nel => nel}/include/nel/3d/scene_group.h (100%)
 rename {code/nel => nel}/include/nel/3d/scene_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/scissor.h (100%)
 rename {code/nel => nel}/include/nel/3d/seg_remanence.h (100%)
 rename {code/nel => nel}/include/nel/3d/seg_remanence_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/shadow_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/shadow_map_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/shadow_poly_receiver.h (100%)
 rename {code/nel => nel}/include/nel/3d/shadow_skin.h (100%)
 rename {code/nel => nel}/include/nel/3d/shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/shape_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/shape_bank_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/shape_info.h (100%)
 rename {code/nel => nel}/include/nel/3d/shifted_triangle_cache.h (100%)
 rename {code/nel => nel}/include/nel/3d/skeleton_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/skeleton_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/skeleton_spawn_script.h (100%)
 rename {code/nel => nel}/include/nel/3d/skeleton_weight.h (100%)
 rename {code/nel => nel}/include/nel/3d/static_quad_grid.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_debugger.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_display.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_hmd.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_libvr.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_ovr.h (100%)
 rename {code/nel => nel}/include/nel/3d/stereo_ovr_04.h (100%)
 rename {code/nel => nel}/include/nel/3d/stripifier.h (100%)
 rename {code/nel => nel}/include/nel/3d/surface_light_grid.h (100%)
 rename {code/nel => nel}/include/nel/3d/tangent_space_build.h (100%)
 rename {code/nel => nel}/include/nel/3d/target_anim_ctrl.h (100%)
 rename {code/nel => nel}/include/nel/3d/tess_block.h (100%)
 rename {code/nel => nel}/include/nel/3d/tess_face_priority_list.h (100%)
 rename {code/nel => nel}/include/nel/3d/tess_list.h (100%)
 rename {code/nel => nel}/include/nel/3d/tessellation.h (100%)
 rename {code/nel => nel}/include/nel/3d/text_context.h (100%)
 rename {code/nel => nel}/include/nel/3d/text_context_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_blank.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_blend.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_bloom.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_bump.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_cube.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_dlm.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_emboss.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_far.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_file.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_font.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_grouped.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_mem.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_multi_file.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_near.h (100%)
 rename {code/nel => nel}/include/nel/3d/texture_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_color.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_element.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_far_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_light_influence.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_lumel.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_noise_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/tile_vegetable_desc.h (100%)
 rename {code/nel => nel}/include/nel/3d/track.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_bezier.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_keyframer.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_sampled_common.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_sampled_quat.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_sampled_quat_small_header.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_sampled_vector.h (100%)
 rename {code/nel => nel}/include/nel/3d/track_tcb.h (100%)
 rename {code/nel => nel}/include/nel/3d/transform.h (100%)
 rename {code/nel => nel}/include/nel/3d/transform_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/transformable.h (100%)
 rename {code/nel => nel}/include/nel/3d/trav_scene.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_3d_mouse_listener.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_animation.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_animation_set.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_bone.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_camera.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_cloud_scape.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_driver.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_instance_group.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_instance_material.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_landscape.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_material.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_particle_system_instance.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_particle_system_sound.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_play_list.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_play_list_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_point_light.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_ps_sound_impl.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_ps_sound_interface.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_scene.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_shape_bank.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_skeleton.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_text_context.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_texture.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_track.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_transform.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_transformable.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_visual_collision_entity.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_visual_collision_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_visual_collision_mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_water.h (100%)
 rename {code/nel => nel}/include/nel/3d/u_water_env_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_blend_layer_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_clip_block.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_def.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_instance_group.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_light_ex.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_quadrant.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_sort_block.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetable_uv8.h (100%)
 rename {code/nel => nel}/include/nel/3d/vegetablevb_allocator.h (100%)
 rename {code/nel => nel}/include/nel/3d/vertex_buffer.h (100%)
 rename {code/nel => nel}/include/nel/3d/vertex_buffer_heap.h (100%)
 rename {code/nel => nel}/include/nel/3d/vertex_program.h (100%)
 rename {code/nel => nel}/include/nel/3d/vertex_program_parse.h (100%)
 rename {code/nel => nel}/include/nel/3d/vertex_stream_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/viewport.h (100%)
 rename {code/nel => nel}/include/nel/3d/visual_collision_entity.h (100%)
 rename {code/nel => nel}/include/nel/3d/visual_collision_entity_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/visual_collision_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/visual_collision_manager_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/visual_collision_mesh.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_env_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_env_map_user.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_height_map.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_model.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_pool_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/water_shape.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_corner_smoother.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_lighter.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_manager.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_search.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_smoother.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_symmetrisation.h (100%)
 rename {code/nel => nel}/include/nel/3d/zone_tgt_smoother.h (100%)
 rename {code/nel => nel}/include/nel/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/cegui/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/cegui/inellibrary.h (100%)
 rename {code/nel => nel}/include/nel/cegui/nellogger.h (100%)
 rename {code/nel => nel}/include/nel/cegui/nelrenderer.h (100%)
 rename {code/nel => nel}/include/nel/cegui/nelresourceprovider.h (100%)
 rename {code/nel => nel}/include/nel/cegui/neltexture.h (100%)
 rename {code/nel => nel}/include/nel/georges/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/georges/form.h (100%)
 rename {code/nel => nel}/include/nel/georges/form_dfn.h (100%)
 rename {code/nel => nel}/include/nel/georges/form_elm.h (100%)
 rename {code/nel => nel}/include/nel/georges/form_loader.h (100%)
 rename {code/nel => nel}/include/nel/georges/header.h (100%)
 rename {code/nel => nel}/include/nel/georges/load_form.h (100%)
 rename {code/nel => nel}/include/nel/georges/type.h (100%)
 rename {code/nel => nel}/include/nel/georges/u_form.h (100%)
 rename {code/nel => nel}/include/nel/georges/u_form_dfn.h (100%)
 rename {code/nel => nel}/include/nel/georges/u_form_elm.h (100%)
 rename {code/nel => nel}/include/nel/georges/u_form_loader.h (100%)
 rename {code/nel => nel}/include/nel/georges/u_type.h (100%)
 rename {code/nel => nel}/include/nel/gui/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/gui/action_handler.h (100%)
 rename {code/nel => nel}/include/nel/gui/css_border_renderer.h (100%)
 rename {code/nel => nel}/include/nel/gui/css_parser.h (100%)
 rename {code/nel => nel}/include/nel/gui/css_selector.h (100%)
 rename {code/nel => nel}/include/nel/gui/css_style.h (100%)
 rename {code/nel => nel}/include/nel/gui/css_types.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_base_button.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_button.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_col_pick.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_draggable.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_polygon.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_quad.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_scroll.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_scroll_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_sheet_selection.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_text_button.h (100%)
 rename {code/nel => nel}/include/nel/gui/ctrl_tooltip.h (100%)
 rename {code/nel => nel}/include/nel/gui/db_manager.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbgroup_combo_box.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbgroup_select_number.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbview_bar.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbview_bar3.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbview_digit.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbview_number.h (100%)
 rename {code/nel => nel}/include/nel/gui/dbview_quantity.h (100%)
 rename {code/nel => nel}/include/nel/gui/editor_selection_watcher.h (100%)
 rename {code/nel => nel}/include/nel/gui/event_descriptor.h (100%)
 rename {code/nel => nel}/include/nel/gui/event_listener.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_container.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_container_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_editbox.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_editbox_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_editbox_decor.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_frame.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_header.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_html.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_list.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_menu.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_modal.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_paragraph.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_scrolltext.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_submenu_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_tab.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_table.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_tree.h (100%)
 rename {code/nel => nel}/include/nel/gui/group_wheel.h (100%)
 rename {code/nel => nel}/include/nel/gui/html_element.h (100%)
 rename {code/nel => nel}/include/nel/gui/html_parser.h (100%)
 rename {code/nel => nel}/include/nel/gui/http_cache.h (100%)
 rename {code/nel => nel}/include/nel/gui/http_hsts.h (100%)
 rename {code/nel => nel}/include/nel/gui/input_event_listener.h (100%)
 rename {code/nel => nel}/include/nel/gui/input_handler.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_anim.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_common.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_element.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_expr.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_expr_node.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_factory.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_group.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_link.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_options.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_parser.h (100%)
 rename {code/nel => nel}/include/nel/gui/interface_property.h (100%)
 rename {code/nel => nel}/include/nel/gui/libwww.h (100%)
 rename {code/nel => nel}/include/nel/gui/link_data.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_helper.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_helper_inline.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_ihm.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_loadlib.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_manager.h (100%)
 rename {code/nel => nel}/include/nel/gui/lua_object.h (100%)
 rename {code/nel => nel}/include/nel/gui/parser.h (100%)
 rename {code/nel => nel}/include/nel/gui/proc.h (100%)
 rename {code/nel => nel}/include/nel/gui/reflect.h (100%)
 rename {code/nel => nel}/include/nel/gui/reflect_register.h (100%)
 rename {code/nel => nel}/include/nel/gui/root_group.h (100%)
 rename {code/nel => nel}/include/nel/gui/string_case.h (100%)
 rename {code/nel => nel}/include/nel/gui/url_parser.h (100%)
 rename {code/nel => nel}/include/nel/gui/variable_data.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_bitmap.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_bitmap_combo.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_link.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_pointer.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_pointer_base.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_polygon.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_quad.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_renderer.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_text.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_text_formated.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_text_id.h (100%)
 rename {code/nel => nel}/include/nel/gui/view_text_id_formated.h (100%)
 rename {code/nel => nel}/include/nel/gui/widget_manager.h (100%)
 rename {code/nel => nel}/include/nel/ligo/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/ligo/ligo_config.h (100%)
 rename {code/nel => nel}/include/nel/ligo/ligo_error.h (100%)
 rename {code/nel => nel}/include/nel/ligo/ligo_material.h (100%)
 rename {code/nel => nel}/include/nel/ligo/primitive.h (100%)
 rename {code/nel => nel}/include/nel/ligo/primitive_class.h (100%)
 rename {code/nel => nel}/include/nel/ligo/primitive_configuration.h (100%)
 rename {code/nel => nel}/include/nel/ligo/primitive_utils.h (100%)
 rename {code/nel => nel}/include/nel/ligo/transition.h (100%)
 rename {code/nel => nel}/include/nel/ligo/zone_bank.h (100%)
 rename {code/nel => nel}/include/nel/ligo/zone_edge.h (100%)
 rename {code/nel => nel}/include/nel/ligo/zone_region.h (100%)
 rename {code/nel => nel}/include/nel/ligo/zone_template.h (100%)
 rename {code/nel => nel}/include/nel/logic/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/logic/logic_condition.h (100%)
 rename {code/nel => nel}/include/nel/logic/logic_event.h (100%)
 rename {code/nel => nel}/include/nel/logic/logic_state.h (100%)
 rename {code/nel => nel}/include/nel/logic/logic_state_machine.h (100%)
 rename {code/nel => nel}/include/nel/logic/logic_variable.h (100%)
 rename {code/nel => nel}/include/nel/misc/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/misc/aabbox.h (100%)
 rename {code/nel => nel}/include/nel/misc/algo.h (100%)
 rename {code/nel => nel}/include/nel/misc/app_context.h (100%)
 rename {code/nel => nel}/include/nel/misc/array_2d.h (100%)
 rename {code/nel => nel}/include/nel/misc/async_file_manager.h (100%)
 rename {code/nel => nel}/include/nel/misc/base64.h (100%)
 rename {code/nel => nel}/include/nel/misc/big_file.h (100%)
 rename {code/nel => nel}/include/nel/misc/bit_mem_stream.h (100%)
 rename {code/nel => nel}/include/nel/misc/bit_set.h (100%)
 rename {code/nel => nel}/include/nel/misc/bitmap.h (100%)
 rename {code/nel => nel}/include/nel/misc/block_memory.h (100%)
 rename {code/nel => nel}/include/nel/misc/bsphere.h (100%)
 rename {code/nel => nel}/include/nel/misc/buf_fifo.h (100%)
 rename {code/nel => nel}/include/nel/misc/callback.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_bank_handler.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_branch.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_branch_observing_handler.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_check_sum.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_leaf.h (100%)
 rename {code/nel => nel}/include/nel/misc/cdb_manager.h (100%)
 rename {code/nel => nel}/include/nel/misc/check_fpu.h (100%)
 rename {code/nel => nel}/include/nel/misc/class_id.h (100%)
 rename {code/nel => nel}/include/nel/misc/class_registry.h (100%)
 rename {code/nel => nel}/include/nel/misc/cmd_args.h (100%)
 rename {code/nel => nel}/include/nel/misc/co_task.h (100%)
 rename {code/nel => nel}/include/nel/misc/command.h (100%)
 rename {code/nel => nel}/include/nel/misc/common.h (100%)
 rename {code/nel => nel}/include/nel/misc/config_file.h (100%)
 rename {code/nel => nel}/include/nel/misc/contiguous_block_allocator.h (100%)
 rename {code/nel => nel}/include/nel/misc/cpu_time_stat.h (100%)
 rename {code/nel => nel}/include/nel/misc/debug.h (100%)
 rename {code/nel => nel}/include/nel/misc/diff_tool.h (100%)
 rename {code/nel => nel}/include/nel/misc/displayer.h (100%)
 rename {code/nel => nel}/include/nel/misc/dummy_window.h (100%)
 rename {code/nel => nel}/include/nel/misc/dynloadlib.h (100%)
 rename {code/nel => nel}/include/nel/misc/eid_translator.h (100%)
 rename {code/nel => nel}/include/nel/misc/entity_id.h (100%)
 rename {code/nel => nel}/include/nel/misc/enum_bitset.h (100%)
 rename {code/nel => nel}/include/nel/misc/eval_num_expr.h (100%)
 rename {code/nel => nel}/include/nel/misc/event_emitter.h (100%)
 rename {code/nel => nel}/include/nel/misc/event_emitter_multi.h (100%)
 rename {code/nel => nel}/include/nel/misc/event_listener.h (100%)
 rename {code/nel => nel}/include/nel/misc/event_server.h (100%)
 rename {code/nel => nel}/include/nel/misc/events.h (100%)
 rename {code/nel => nel}/include/nel/misc/factory.h (100%)
 rename {code/nel => nel}/include/nel/misc/fast_floor.h (100%)
 rename {code/nel => nel}/include/nel/misc/fast_id_map.h (100%)
 rename {code/nel => nel}/include/nel/misc/fast_mem.h (100%)
 rename {code/nel => nel}/include/nel/misc/file.h (100%)
 rename {code/nel => nel}/include/nel/misc/fixed_size_allocator.h (100%)
 rename {code/nel => nel}/include/nel/misc/geom_ext.h (100%)
 rename {code/nel => nel}/include/nel/misc/grid_traversal.h (100%)
 rename {code/nel => nel}/include/nel/misc/gtk_displayer.h (100%)
 rename {code/nel => nel}/include/nel/misc/heap_memory.h (100%)
 rename {code/nel => nel}/include/nel/misc/hierarchical_timer.h (100%)
 rename {code/nel => nel}/include/nel/misc/historic.h (100%)
 rename {code/nel => nel}/include/nel/misc/i18n.h (100%)
 rename {code/nel => nel}/include/nel/misc/i_streamed_package_provider.h (100%)
 rename {code/nel => nel}/include/nel/misc/i_xml.h (100%)
 rename {code/nel => nel}/include/nel/misc/inter_window_msg_queue.h (100%)
 rename {code/nel => nel}/include/nel/misc/line.h (100%)
 rename {code/nel => nel}/include/nel/misc/log.h (100%)
 rename {code/nel => nel}/include/nel/misc/matrix.h (100%)
 rename {code/nel => nel}/include/nel/misc/md5.h (100%)
 rename {code/nel => nel}/include/nel/misc/mem_displayer.h (100%)
 rename {code/nel => nel}/include/nel/misc/mem_stream.h (100%)
 rename {code/nel => nel}/include/nel/misc/mouse_smoother.h (100%)
 rename {code/nel => nel}/include/nel/misc/mutable_container.h (100%)
 rename {code/nel => nel}/include/nel/misc/mutex.h (100%)
 rename {code/nel => nel}/include/nel/misc/noise_value.h (100%)
 rename {code/nel => nel}/include/nel/misc/o_xml.h (100%)
 rename {code/nel => nel}/include/nel/misc/object_arena_allocator.h (100%)
 rename {code/nel => nel}/include/nel/misc/object_vector.h (100%)
 rename {code/nel => nel}/include/nel/misc/p_thread.h (100%)
 rename {code/nel => nel}/include/nel/misc/path.h (100%)
 rename {code/nel => nel}/include/nel/misc/plane.h (100%)
 rename {code/nel => nel}/include/nel/misc/plane_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/polygon.h (100%)
 rename {code/nel => nel}/include/nel/misc/pool_memory.h (100%)
 rename {code/nel => nel}/include/nel/misc/progress_callback.h (100%)
 rename {code/nel => nel}/include/nel/misc/quad.h (100%)
 rename {code/nel => nel}/include/nel/misc/quat.h (100%)
 rename {code/nel => nel}/include/nel/misc/random.h (100%)
 rename {code/nel => nel}/include/nel/misc/reader_writer.h (100%)
 rename {code/nel => nel}/include/nel/misc/rect.h (100%)
 rename {code/nel => nel}/include/nel/misc/report.h (100%)
 rename {code/nel => nel}/include/nel/misc/resource_ptr.h (100%)
 rename {code/nel => nel}/include/nel/misc/resource_ptr_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/rgba.h (100%)
 rename {code/nel => nel}/include/nel/misc/seven_zip.h (100%)
 rename {code/nel => nel}/include/nel/misc/sha1.h (100%)
 rename {code/nel => nel}/include/nel/misc/shared_memory.h (100%)
 rename {code/nel => nel}/include/nel/misc/sheet_id.h (100%)
 rename {code/nel => nel}/include/nel/misc/singleton.h (100%)
 rename {code/nel => nel}/include/nel/misc/smart_ptr.h (100%)
 rename {code/nel => nel}/include/nel/misc/smart_ptr_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/speaker_listener.h (100%)
 rename {code/nel => nel}/include/nel/misc/sstring.h (100%)
 rename {code/nel => nel}/include/nel/misc/static_map.h (100%)
 rename {code/nel => nel}/include/nel/misc/stl_block_allocator.h (100%)
 rename {code/nel => nel}/include/nel/misc/stl_block_list.h (100%)
 rename {code/nel => nel}/include/nel/misc/stop_watch.h (100%)
 rename {code/nel => nel}/include/nel/misc/stream.h (100%)
 rename {code/nel => nel}/include/nel/misc/stream_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/streamed_package.h (100%)
 rename {code/nel => nel}/include/nel/misc/streamed_package_manager.h (100%)
 rename {code/nel => nel}/include/nel/misc/string_common.h (100%)
 rename {code/nel => nel}/include/nel/misc/string_conversion.h (100%)
 rename {code/nel => nel}/include/nel/misc/string_id_array.h (100%)
 rename {code/nel => nel}/include/nel/misc/string_mapper.h (100%)
 rename {code/nel => nel}/include/nel/misc/string_stream.h (100%)
 rename {code/nel => nel}/include/nel/misc/system_info.h (100%)
 rename {code/nel => nel}/include/nel/misc/system_utils.h (100%)
 rename {code/nel => nel}/include/nel/misc/task_manager.h (100%)
 rename {code/nel => nel}/include/nel/misc/tds.h (100%)
 rename {code/nel => nel}/include/nel/misc/thread.h (100%)
 rename {code/nel => nel}/include/nel/misc/time_nl.h (100%)
 rename {code/nel => nel}/include/nel/misc/timeout_assertion_thread.h (100%)
 rename {code/nel => nel}/include/nel/misc/traits_nl.h (100%)
 rename {code/nel => nel}/include/nel/misc/triangle.h (100%)
 rename {code/nel => nel}/include/nel/misc/twin_map.h (100%)
 rename {code/nel => nel}/include/nel/misc/types_nl.h (100%)
 rename {code/nel => nel}/include/nel/misc/ucstring.h (100%)
 rename {code/nel => nel}/include/nel/misc/uv.h (100%)
 rename {code/nel => nel}/include/nel/misc/value_smoother.h (100%)
 rename {code/nel => nel}/include/nel/misc/variable.h (100%)
 rename {code/nel => nel}/include/nel/misc/vector.h (100%)
 rename {code/nel => nel}/include/nel/misc/vector_2d.h (100%)
 rename {code/nel => nel}/include/nel/misc/vector_2f.h (100%)
 rename {code/nel => nel}/include/nel/misc/vector_h.h (100%)
 rename {code/nel => nel}/include/nel/misc/vector_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/vectord.h (100%)
 rename {code/nel => nel}/include/nel/misc/vectord_inline.h (100%)
 rename {code/nel => nel}/include/nel/misc/version_nl.cmake (100%)
 rename {code/nel => nel}/include/nel/misc/wang_hash.h (100%)
 rename {code/nel => nel}/include/nel/misc/win32_util.h (100%)
 rename {code/nel => nel}/include/nel/misc/win_displayer.h (100%)
 rename {code/nel => nel}/include/nel/misc/win_event_emitter.h (100%)
 rename {code/nel => nel}/include/nel/misc/win_thread.h (100%)
 rename {code/nel => nel}/include/nel/misc/window_displayer.h (100%)
 rename {code/nel => nel}/include/nel/misc/words_dictionary.h (100%)
 rename {code/nel => nel}/include/nel/misc/xml_auto_ptr.h (100%)
 rename {code/nel => nel}/include/nel/misc/xml_macros.h (100%)
 rename {code/nel => nel}/include/nel/misc/xml_pack.h (100%)
 rename {code/nel => nel}/include/nel/net/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/net/admin.h (100%)
 rename {code/nel => nel}/include/nel/net/buf_client.h (100%)
 rename {code/nel => nel}/include/nel/net/buf_net_base.h (100%)
 rename {code/nel => nel}/include/nel/net/buf_server.h (100%)
 rename {code/nel => nel}/include/nel/net/buf_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/callback_client.h (100%)
 rename {code/nel => nel}/include/nel/net/callback_net_base.h (100%)
 rename {code/nel => nel}/include/nel/net/callback_server.h (100%)
 rename {code/nel => nel}/include/nel/net/cvar_log_filter.h (100%)
 rename {code/nel => nel}/include/nel/net/dummy_tcp_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/email.h (100%)
 rename {code/nel => nel}/include/nel/net/inet_address.h (100%)
 rename {code/nel => nel}/include/nel/net/listen_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/login_client.h (100%)
 rename {code/nel => nel}/include/nel/net/login_cookie.h (100%)
 rename {code/nel => nel}/include/nel/net/login_server.h (100%)
 rename {code/nel => nel}/include/nel/net/message.h (100%)
 rename {code/nel => nel}/include/nel/net/message_recorder.h (100%)
 rename {code/nel => nel}/include/nel/net/module.h (100%)
 rename {code/nel => nel}/include/nel/net/module_builder_parts.h (100%)
 rename {code/nel => nel}/include/nel/net/module_common.h (100%)
 rename {code/nel => nel}/include/nel/net/module_gateway.h (100%)
 rename {code/nel => nel}/include/nel/net/module_manager.h (100%)
 rename {code/nel => nel}/include/nel/net/module_message.h (100%)
 rename {code/nel => nel}/include/nel/net/module_socket.h (100%)
 rename {code/nel => nel}/include/nel/net/naming_client.h (100%)
 rename {code/nel => nel}/include/nel/net/net_displayer.h (100%)
 rename {code/nel => nel}/include/nel/net/net_log.h (100%)
 rename {code/nel => nel}/include/nel/net/net_manager.h (100%)
 rename {code/nel => nel}/include/nel/net/pacs_client.h (100%)
 rename {code/nel => nel}/include/nel/net/service.h (100%)
 rename {code/nel => nel}/include/nel/net/sock.h (100%)
 rename {code/nel => nel}/include/nel/net/tcp_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/transport_class.h (100%)
 rename {code/nel => nel}/include/nel/net/udp_sim_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/udp_sock.h (100%)
 rename {code/nel => nel}/include/nel/net/unified_network.h (100%)
 rename {code/nel => nel}/include/nel/net/unitime.h (100%)
 rename {code/nel => nel}/include/nel/net/varpath.h (100%)
 rename {code/nel => nel}/include/nel/pacs/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/pacs/build_indoor.h (100%)
 rename {code/nel => nel}/include/nel/pacs/chain.h (100%)
 rename {code/nel => nel}/include/nel/pacs/chain_quad.h (100%)
 rename {code/nel => nel}/include/nel/pacs/collision_callback.h (100%)
 rename {code/nel => nel}/include/nel/pacs/collision_desc.h (100%)
 rename {code/nel => nel}/include/nel/pacs/collision_mesh_build.h (100%)
 rename {code/nel => nel}/include/nel/pacs/collision_ot.h (100%)
 rename {code/nel => nel}/include/nel/pacs/collision_surface_temp.h (100%)
 rename {code/nel => nel}/include/nel/pacs/edge_collide.h (100%)
 rename {code/nel => nel}/include/nel/pacs/edge_quad.h (100%)
 rename {code/nel => nel}/include/nel/pacs/exterior_mesh.h (100%)
 rename {code/nel => nel}/include/nel/pacs/face_grid.h (100%)
 rename {code/nel => nel}/include/nel/pacs/global_retriever.h (100%)
 rename {code/nel => nel}/include/nel/pacs/local_retriever.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_cell.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_container.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_container_inline.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_element.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_element_inline.h (100%)
 rename {code/nel => nel}/include/nel/pacs/move_primitive.h (100%)
 rename {code/nel => nel}/include/nel/pacs/primitive_block.h (100%)
 rename {code/nel => nel}/include/nel/pacs/primitive_world_image.h (100%)
 rename {code/nel => nel}/include/nel/pacs/quad_grid.h (100%)
 rename {code/nel => nel}/include/nel/pacs/retrievable_surface.h (100%)
 rename {code/nel => nel}/include/nel/pacs/retriever_bank.h (100%)
 rename {code/nel => nel}/include/nel/pacs/retriever_instance.h (100%)
 rename {code/nel => nel}/include/nel/pacs/surface_quad.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_collision_desc.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_global_position.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_global_retriever.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_move_container.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_move_primitive.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_primitive_block.h (100%)
 rename {code/nel => nel}/include/nel/pacs/u_retriever_bank.h (100%)
 rename {code/nel => nel}/include/nel/pacs/vector_2s.h (100%)
 rename {code/nel => nel}/include/nel/pipeline/database_config.h (100%)
 rename {code/nel => nel}/include/nel/pipeline/project_config.h (100%)
 rename {code/nel => nel}/include/nel/pipeline/tool_logger.h (100%)
 rename {code/nel => nel}/include/nel/sound/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/sound/async_file_manager_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/audio_decoder.h (100%)
 rename {code/nel => nel}/include/nel/sound/audio_decoder_ffmpeg.h (100%)
 rename {code/nel => nel}/include/nel/sound/audio_decoder_mp3.h (100%)
 rename {code/nel => nel}/include/nel/sound/audio_decoder_vorbis.h (100%)
 rename {code/nel => nel}/include/nel/sound/audio_mixer_user.h (100%)
 rename {code/nel => nel}/include/nel/sound/background_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/background_sound_manager.h (100%)
 rename {code/nel => nel}/include/nel/sound/background_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/clustered_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/complex_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/complex_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/containers.h (100%)
 rename {code/nel => nel}/include/nel/sound/context_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/decoder/dr_mp3.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/sound/driver/buffer.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/effect.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/listener.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/music_channel.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/sound_driver.h (100%)
 rename {code/nel => nel}/include/nel/sound/driver/source.h (100%)
 rename {code/nel => nel}/include/nel/sound/group_controller.h (100%)
 rename {code/nel => nel}/include/nel/sound/group_controller_root.h (100%)
 rename {code/nel => nel}/include/nel/sound/listener_user.h (100%)
 rename {code/nel => nel}/include/nel/sound/mixing_track.h (100%)
 rename {code/nel => nel}/include/nel/sound/music_channel_fader.h (100%)
 rename {code/nel => nel}/include/nel/sound/music_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/music_sound_manager.h (100%)
 rename {code/nel => nel}/include/nel/sound/music_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/sample_bank.h (100%)
 rename {code/nel => nel}/include/nel/sound/sample_bank_manager.h (100%)
 rename {code/nel => nel}/include/nel/sound/simple_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/simple_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound_anim_manager.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound_anim_marker.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound_animation.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound_bank.h (100%)
 rename {code/nel => nel}/include/nel/sound/sound_pattern.h (100%)
 rename {code/nel => nel}/include/nel/sound/source_common.h (100%)
 rename {code/nel => nel}/include/nel/sound/source_music_channel.h (100%)
 rename {code/nel => nel}/include/nel/sound/stream_file_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/stream_file_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/stream_sound.h (100%)
 rename {code/nel => nel}/include/nel/sound/stream_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/u_audio_mixer.h (100%)
 rename {code/nel => nel}/include/nel/sound/u_group_controller.h (100%)
 rename {code/nel => nel}/include/nel/sound/u_listener.h (100%)
 rename {code/nel => nel}/include/nel/sound/u_source.h (100%)
 rename {code/nel => nel}/include/nel/sound/u_stream_source.h (100%)
 rename {code/nel => nel}/include/nel/web/CMakeLists.txt (100%)
 rename {code/nel => nel}/include/nel/web/curl_certificates.h (100%)
 rename {code/nel => nel}/include/nel/web/http_client_curl.h (100%)
 rename {code/nel => nel}/include/nel/web/http_package_provider.h (100%)
 rename {code/nel => nel}/nel-config.in (100%)
 rename {code/nel => nel}/resources/nel.bmp (100%)
 rename {code/nel => nel}/resources/nel.png (100%)
 rename {code/nel => nel}/resources/nevraxpill.ico (100%)
 rename {code/nel => nel}/samples/3d/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/cegui/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/cegui/NeLDriver.cpp (100%)
 rename {code/nel => nel}/samples/3d/cegui/NeLDriver.h (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/Commonv2c.ttf (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/Commonwealth-10.font (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/Font.xsd (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/Legal.txt (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/README (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/common.txt (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/tahoma-12.font (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/fonts/tahoma.ttf (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/GPN-2000-001437.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/Imageset.xsd (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/ReadMe.txt (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/TaharezLook.imageset (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/TaharezLook.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/WerewolfLook.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/WindowsLook.imageset (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/WindowsLook.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/ogregui.imageset (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/ogregui.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/werewolfgui.imageset (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/imagesets/werewolfgui.tga (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/layouts/Demo7Windows.layout (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/layouts/GUILayout.xsd (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/looknfeel/Falagard.xsd (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/looknfeel/TaharezLook.looknfeel (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/looknfeel/Vanilla.looknfeel (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/looknfeel/WindowsLook.looknfeel (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/n019003l.pfb (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/GUIScheme.xsd (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/TaharezLook.scheme (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/TaharezLookWidgets.scheme (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/WindowsLook.scheme (100%)
 rename {code/nel => nel}/samples/3d/cegui/datafiles/schemes/WindowsLookWidgets.scheme (100%)
 rename {code/nel => nel}/samples/3d/cegui/demonel.rc (100%)
 rename {code/nel => nel}/samples/3d/cegui/globals.h (100%)
 rename {code/nel => nel}/samples/3d/cegui/icon1.ico (100%)
 rename {code/nel => nel}/samples/3d/cegui/main.cpp (100%)
 rename {code/nel => nel}/samples/3d/cegui/resource.h (100%)
 rename {code/nel => nel}/samples/3d/cegui/resource1.h (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/fonts/n019003l.pfb (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/groups/street.ig (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/main.cpp (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/main.cvs (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/max/street.max (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/readme.txt (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/box02.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere01.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere02.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere03.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere04.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere05.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere06.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere07.shape (100%)
 rename {code/nel => nel}/samples/3d/cluster_viewer/shapes/sphere08.shape (100%)
 rename {code/nel => nel}/samples/3d/font/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/font/beteckna.ttf (100%)
 rename {code/nel => nel}/samples/3d/font/main.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/callback.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/callback.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/command_log.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/command_log.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/configuration.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/configuration.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/data/andbasr.ttf (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/data/andbasr.txt (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/data/en.uxt (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/graphics_config.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/graphics_config.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/graphics_viewport.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/graphics_viewport.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/internationalization.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/internationalization.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/main_window.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/main_window.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/nel_qt.cfg (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/nel_qt.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/nel_qt.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/nel_qt_config.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/nel_qt_default.cfg (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/qtcolorpicker.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/qtcolorpicker_cpp.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/sound_utilities.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/sound_utilities.h (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/undo_redo_binders.cpp (100%)
 rename {code/nel => nel}/samples/3d/nel_qt/undo_redo_binders.h (100%)
 rename {code/nel => nel}/samples/3d/qtnel/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/qtnel/main.cpp (100%)
 rename {code/nel => nel}/samples/3d/qtnel/qnelwidget.cpp (100%)
 rename {code/nel => nel}/samples/3d/qtnel/qnelwidget.h (100%)
 rename {code/nel => nel}/samples/3d/qtnel/qnelwindow.cpp (100%)
 rename {code/nel => nel}/samples/3d/qtnel/qnelwindow.h (100%)
 rename {code/nel => nel}/samples/3d/shape_viewer/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/3d/shape_viewer/main.cpp (100%)
 rename {code/nel => nel}/samples/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/georges/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/georges/boolean.typ (100%)
 rename {code/nel => nel}/samples/georges/coolfilesinfo.dfn (100%)
 rename {code/nel => nel}/samples/georges/default.sample_config (100%)
 rename {code/nel => nel}/samples/georges/int.typ (100%)
 rename {code/nel => nel}/samples/georges/main.cpp (100%)
 rename {code/nel => nel}/samples/georges/positiondata.dfn (100%)
 rename {code/nel => nel}/samples/georges/sample_config.dfn (100%)
 rename {code/nel => nel}/samples/georges/sheet_id.bin (100%)
 rename {code/nel => nel}/samples/georges/string.typ (100%)
 rename {code/nel => nel}/samples/misc/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/callback/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/callback/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/command/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/command/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/configfile/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/configfile/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/configfile/simpletest.txt (100%)
 rename {code/nel => nel}/samples/misc/debug/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/debug/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/i18n/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/i18n/de.uxt (100%)
 rename {code/nel => nel}/samples/misc/i18n/en.uxt (100%)
 rename {code/nel => nel}/samples/misc/i18n/fr.uxt (100%)
 rename {code/nel => nel}/samples/misc/i18n/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/log/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/log/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/strings/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/strings/main.cpp (100%)
 rename {code/nel => nel}/samples/misc/types_check/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/misc/types_check/main.cpp (100%)
 rename {code/nel => nel}/samples/net/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/net/chat/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/net/chat/chat_service.cfg (100%)
 rename {code/nel => nel}/samples/net/chat/client.cfg (100%)
 rename {code/nel => nel}/samples/net/chat/client.cpp (100%)
 rename {code/nel => nel}/samples/net/chat/kbhit.cpp (100%)
 rename {code/nel => nel}/samples/net/chat/kbhit.h (100%)
 rename {code/nel => nel}/samples/net/chat/server.cpp (100%)
 rename {code/nel => nel}/samples/net/class_transport/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/net/class_transport/ai_service.cfg (100%)
 rename {code/nel => nel}/samples/net/class_transport/ai_service.cpp (100%)
 rename {code/nel => nel}/samples/net/class_transport/gd_service.cfg (100%)
 rename {code/nel => nel}/samples/net/class_transport/gd_service.cpp (100%)
 rename {code/nel => nel}/samples/net/login_system/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/net/login_system/client.cfg (100%)
 rename {code/nel => nel}/samples/net/login_system/client.cpp (100%)
 rename {code/nel => nel}/samples/net/login_system/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/login_system/frontend_service.cpp (100%)
 rename {code/nel => nel}/samples/net/multi_shards/client.cpp (100%)
 rename {code/nel => nel}/samples/net/multi_shards/frontend_service.cpp (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/01_admin_executor_service.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/02_login_service.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/03_naming_service_shard1.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/04_welcome_service_shard1.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/05_frontend_service_shard1.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/06_naming_service_shard2.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/07_welcome_service_shard2.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/08_frontend_service_shard2.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/09_naming_service_shard3.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/10_frontend_service_shard3.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/11_welcome_service_shard3.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/12_client.lnk (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/admin_executor_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/client.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/login_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/login_service_database.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard1_config/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard1_config/naming_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard1_config/welcome_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard2_config/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard2_config/naming_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard2_config/welcome_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard3_config/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard3_config/naming_service.cfg (100%)
 rename {code/nel => nel}/samples/net/multi_shards/shard_config/shard3_config/welcome_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer3/client.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer3/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer3/frontend_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer3/ping_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer3/ping_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer4/client.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer4/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer4/frontend_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer4/ping_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer4/ping_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer5/flood_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer5/flood_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer5/frontend_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer5/frontend_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer5/gpm_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer5/gpm_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer5/ping_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer5/ping_service.cpp (100%)
 rename {code/nel => nel}/samples/net/net_layer5/player_service.cfg (100%)
 rename {code/nel => nel}/samples/net/net_layer5/player_service.cpp (100%)
 rename {code/nel => nel}/samples/net/service/chat_service.cfg (100%)
 rename {code/nel => nel}/samples/net/service/chat_service.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/net/udp/bench_service.cfg (100%)
 rename {code/nel => nel}/samples/net/udp/bench_service.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/client.cfg (100%)
 rename {code/nel => nel}/samples/net/udp/client.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/graph.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/graph.h (100%)
 rename {code/nel => nel}/samples/net/udp/n019003l.pfb (100%)
 rename {code/nel => nel}/samples/net/udp/readme.txt (100%)
 rename {code/nel => nel}/samples/net/udp/receive_task.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/receive_task.h (100%)
 rename {code/nel => nel}/samples/net/udp/simlag.cpp (100%)
 rename {code/nel => nel}/samples/net/udp/simlag.h (100%)
 rename {code/nel => nel}/samples/net/udp_ping/client.cpp (100%)
 rename {code/nel => nel}/samples/net/udp_ping/udp_service.cfg (100%)
 rename {code/nel => nel}/samples/net/udp_ping/udp_service.cpp (100%)
 rename {code/nel => nel}/samples/pacs/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/pacs/main.cpp (100%)
 rename {code/nel => nel}/samples/pacs/object.cpp (100%)
 rename {code/nel => nel}/samples/pacs/object.h (100%)
 rename {code/nel => nel}/samples/pacs/readme.txt (100%)
 rename {code/nel => nel}/samples/pacs/shapes/arena.shape (100%)
 rename {code/nel => nel}/samples/pacs/shapes/cylinder.shape (100%)
 rename {code/nel => nel}/samples/pacs/shapes/rectangle.shape (100%)
 rename {code/nel => nel}/samples/sound/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/alpha.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/angle.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/background_flag_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/background_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/_typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/_type.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/boolean.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/filename.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/float.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/iboolean.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/int.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/string.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/basics/typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/complex_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/context_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/direction.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/distance.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/doppler.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/gain.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/listener.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/mixer_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/music_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/parameter_id.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/pattern_mode.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/priority.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/rolloff.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/simple_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/sound_group.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/sound_group_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/soundbank.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/transposition.typ (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/DFN/user_var_binding.dfn (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/animations/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/animations/test_anim.sound_anim (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/background_sounds/background_sound.primitive (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/background_sounds/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/cluster_sound/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/default.mixer_config (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/soundbank/beep.sound (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/soundbank/tuut.sound (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/data/world_editor_classes.xml (100%)
 rename {code/nel => nel}/samples/sound/sound_sources/main.cpp (100%)
 rename {code/nel => nel}/samples/sound/stream_file/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_file/base_samples.sample_bank (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/_typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/_type.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/boolean.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/filename.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/float.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/iboolean.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/int.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/sint16.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/sint32.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/sint64.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/sint8.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/string.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/uint16.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/uint32.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/uint64.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/basics/uint8.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/alpha.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/angle.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/background_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/context_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/direction.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/distance.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/doppler.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/gain.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/listener.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/music_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/parameter_id.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/priority.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/rolloff.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/sound_group.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/soundbank.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/transposition.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/animations/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/animations/test_anim.sound_anim (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/background_sounds/background_sound.primitive (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/background_sounds/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/cluster_sound/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/default.mixer_config (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/samplebank/base_samples/beep.wav (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/soundbank/beep.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/soundbank/default_stream.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/soundbank/stream_file.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/soundbank/tuut.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_file/data/world_editor_classes.xml (100%)
 rename {code/nel => nel}/samples/sound/stream_file/stream_file.cpp (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/CMakeLists.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheet_id.bin (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheets.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/build/sound_samplebanks/base_samples.sample_bank (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/sounds.packed_sheets (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/user_var_binding.packed_sheets (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_type.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/boolean.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/filename.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/float.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/iboolean.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/int.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint16.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint32.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint64.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint8.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/string.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/typ.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint16.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint32.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint64.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint8.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/alpha.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/angle.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/backgound_sound_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_flag_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/complex_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/context_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/direction.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/distance.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/doppler.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/gain.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/listener.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/mixer_config.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/music_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/parameter_id.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/pattern_mode.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/priority.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/rolloff.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/simple_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group_item.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/soundbank.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/stream_sound.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/transposition.typ (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/user_var_binding.dfn (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/animations/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/background_sounds/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/cluster_sounds/readme.txt (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/default.mixer_config (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/beep.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/default_stream.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/tuut.sound (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/test_var_binding.user_var_binding (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/beep.wav (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/tuut.wav (100%)
 rename {code/nel => nel}/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp (100%)
 rename {code/nel => nel}/src/3d/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/3d/anim_detail_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/animatable.cpp (100%)
 rename {code/nel => nel}/src/3d/animated_lightmap.cpp (100%)
 rename {code/nel => nel}/src/3d/animated_material.cpp (100%)
 rename {code/nel => nel}/src/3d/animated_morph.cpp (100%)
 rename {code/nel => nel}/src/3d/animation.cpp (100%)
 rename {code/nel => nel}/src/3d/animation_optimizer.cpp (100%)
 rename {code/nel => nel}/src/3d/animation_playlist.cpp (100%)
 rename {code/nel => nel}/src/3d/animation_set.cpp (100%)
 rename {code/nel => nel}/src/3d/animation_set_user.cpp (100%)
 rename {code/nel => nel}/src/3d/async_file_manager_3d.cpp (100%)
 rename {code/nel => nel}/src/3d/async_texture_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/bezier_patch.cpp (100%)
 rename {code/nel => nel}/src/3d/bloom_effect.cpp (100%)
 rename {code/nel => nel}/src/3d/bone.cpp (100%)
 rename {code/nel => nel}/src/3d/camera.cpp (100%)
 rename {code/nel => nel}/src/3d/camera_col.cpp (100%)
 rename {code/nel => nel}/src/3d/channel_mixer.cpp (100%)
 rename {code/nel => nel}/src/3d/clip_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/cloud.cpp (100%)
 rename {code/nel => nel}/src/3d/cloud_scape.cpp (100%)
 rename {code/nel => nel}/src/3d/cloud_scape_user.cpp (100%)
 rename {code/nel => nel}/src/3d/cluster.cpp (100%)
 rename {code/nel => nel}/src/3d/coarse_mesh_build.cpp (100%)
 rename {code/nel => nel}/src/3d/coarse_mesh_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/computed_string.cpp (100%)
 rename {code/nel => nel}/src/3d/cube_map_builder.cpp (100%)
 rename {code/nel => nel}/src/3d/debug_vb.cpp (100%)
 rename {code/nel => nel}/src/3d/deform_2d.cpp (100%)
 rename {code/nel => nel}/src/3d/driver.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d.def (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d.h (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_index.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_inputs.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_light.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_material.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_matrix.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_profile.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_render.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_shader.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_texture.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_uniform.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_vertex.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/resources.rc (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/stddirect3d.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/direct3d/stddirect3d.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/EGL/egl.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/EGL/eglext.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/EGL/eglplatform.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GL/glext.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GL/glxext.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GL/wglext.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GLES/egl.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GLES/gl.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GLES/glext.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/GLES/glplatform.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/KHR/khrplatform.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl.def (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_extension.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_extension.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_extension_def.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_inputs.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_light.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_material.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_matrix.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_pixel_program.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_states.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_states.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_texture.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_uniform.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_vertex.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_vertex_program.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/driver_opengl_window.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_application_delegate.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_application_delegate.mm (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_event_emitter.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_opengl_view.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_opengl_view.mm (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_window_delegate.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/mac/cocoa_window_delegate.mm (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/nel-driverogl.pc (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/nel-driverogl.pc.in (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/resources.rc (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/stdopengl.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/stdopengl.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/unix_event_emitter.cpp (100%)
 rename {code/nel => nel}/src/3d/driver/opengl/unix_event_emitter.h (100%)
 rename {code/nel => nel}/src/3d/driver/opengles/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/3d/driver/opengles/resources.rc (100%)
 rename {code/nel => nel}/src/3d/driver_user.cpp (100%)
 rename {code/nel => nel}/src/3d/driver_user2.cpp (100%)
 rename {code/nel => nel}/src/3d/dru.cpp (100%)
 rename {code/nel => nel}/src/3d/event_mouse_listener.cpp (100%)
 rename {code/nel => nel}/src/3d/fast_ptr_list.cpp (100%)
 rename {code/nel => nel}/src/3d/fasthls_modifier.cpp (100%)
 rename {code/nel => nel}/src/3d/flare_model.cpp (100%)
 rename {code/nel => nel}/src/3d/flare_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/font_generator.cpp (100%)
 rename {code/nel => nel}/src/3d/font_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/frustum.cpp (100%)
 rename {code/nel => nel}/src/3d/fxaa.cpp (100%)
 rename {code/nel => nel}/src/3d/fxaa_program.h (100%)
 rename {code/nel => nel}/src/3d/geometry_program.cpp (100%)
 rename {code/nel => nel}/src/3d/gpu_program_params.cpp (100%)
 rename {code/nel => nel}/src/3d/heat_haze.cpp (100%)
 rename {code/nel => nel}/src/3d/height_map.cpp (100%)
 rename {code/nel => nel}/src/3d/hls_color_texture.cpp (100%)
 rename {code/nel => nel}/src/3d/hls_texture_bank.cpp (100%)
 rename {code/nel => nel}/src/3d/hls_texture_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/hrc_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/ig_surface_light.cpp (100%)
 rename {code/nel => nel}/src/3d/ig_surface_light_build.cpp (100%)
 rename {code/nel => nel}/src/3d/index_buffer.cpp (100%)
 rename {code/nel => nel}/src/3d/init_3d.cpp (100%)
 rename {code/nel => nel}/src/3d/instance_group_user.cpp (100%)
 rename {code/nel => nel}/src/3d/instance_lighter.cpp (100%)
 rename {code/nel => nel}/src/3d/key.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_collision_grid.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_def.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_face_vector_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_model.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_profile.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_user.cpp (100%)
 rename {code/nel => nel}/src/3d/landscape_vegetable_block.cpp (100%)
 rename {code/nel => nel}/src/3d/landscapeig_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/landscapevb_allocator.cpp (100%)
 rename {code/nel => nel}/src/3d/landscapevb_info.cpp (100%)
 rename {code/nel => nel}/src/3d/light.cpp (100%)
 rename {code/nel => nel}/src/3d/light_contribution.cpp (100%)
 rename {code/nel => nel}/src/3d/light_influence_interpolator.cpp (100%)
 rename {code/nel => nel}/src/3d/light_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/light_user.cpp (100%)
 rename {code/nel => nel}/src/3d/lighting_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/load_balancing_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_builder.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_shape_bank.cpp (100%)
 rename {code/nel => nel}/src/3d/lod_character_texture.cpp (100%)
 rename {code/nel => nel}/src/3d/logic_info.cpp (100%)
 rename {code/nel => nel}/src/3d/material.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_base.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_base_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_blender.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_block_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_geom.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_morpher.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_skin.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_skin_template.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_skinned.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_skinned_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_mrm_skinned_template.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_multi_lod.cpp (100%)
 rename {code/nel => nel}/src/3d/mesh_multi_lod_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/meshvp_per_pixel_light.cpp (100%)
 rename {code/nel => nel}/src/3d/meshvp_wind_tree.cpp (100%)
 rename {code/nel => nel}/src/3d/mini_col.cpp (100%)
 rename {code/nel => nel}/src/3d/motion_blur.cpp (100%)
 rename {code/nel => nel}/src/3d/mrm_builder.cpp (100%)
 rename {code/nel => nel}/src/3d/mrm_internal.cpp (100%)
 rename {code/nel => nel}/src/3d/mrm_level_detail.cpp (100%)
 rename {code/nel => nel}/src/3d/mrm_mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/nel-3d.pc (100%)
 rename {code/nel => nel}/src/3d/nel-3d.pc.in (100%)
 rename {code/nel => nel}/src/3d/nelu.cpp (100%)
 rename {code/nel => nel}/src/3d/noise_3d.cpp (100%)
 rename {code/nel => nel}/src/3d/packed_world.cpp (100%)
 rename {code/nel => nel}/src/3d/packed_zone.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system_model.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system_process.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/particle_system_sound_user.cpp (100%)
 rename {code/nel => nel}/src/3d/patch.cpp (100%)
 rename {code/nel => nel}/src/3d/patch_lightmap.cpp (100%)
 rename {code/nel => nel}/src/3d/patch_noise.cpp (100%)
 rename {code/nel => nel}/src/3d/patch_rdr_pass.cpp (100%)
 rename {code/nel => nel}/src/3d/patch_render.cpp (100%)
 rename {code/nel => nel}/src/3d/patch_vegetable.cpp (100%)
 rename {code/nel => nel}/src/3d/patchdlm_context.cpp (100%)
 rename {code/nel => nel}/src/3d/patchuv_locator.cpp (100%)
 rename {code/nel => nel}/src/3d/pixel_program.cpp (100%)
 rename {code/nel => nel}/src/3d/play_list_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/play_list_manager_user.cpp (100%)
 rename {code/nel => nel}/src/3d/play_list_user.cpp (100%)
 rename {code/nel => nel}/src/3d/point_light.cpp (100%)
 rename {code/nel => nel}/src/3d/point_light_model.cpp (100%)
 rename {code/nel => nel}/src/3d/point_light_named.cpp (100%)
 rename {code/nel => nel}/src/3d/point_light_named_array.cpp (100%)
 rename {code/nel => nel}/src/3d/portal.cpp (100%)
 rename {code/nel => nel}/src/3d/primitive_profile.cpp (100%)
 rename {code/nel => nel}/src/3d/program.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_allocator.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_attrib_maker_bin_op.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_attrib_maker_helper.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_attrib_maker_template.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_color.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_dot.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_emitter.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_face.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_face_look_at.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_fan_light.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_float.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_force.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_int.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_light.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_located.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_particle_basic.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_plane_basis_maker.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_quad.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_register_attribs.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_register_emitters.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_register_forces.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_register_particles.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_register_zones.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_ribbon.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_ribbon_base.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_ribbon_look_at.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_shockwave.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_sound.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_tail_dot.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_util.cpp (100%)
 rename {code/nel => nel}/src/3d/ps_zone.cpp (100%)
 rename {code/nel => nel}/src/3d/quad_effect.cpp (100%)
 rename {code/nel => nel}/src/3d/quad_grid.cpp (100%)
 rename {code/nel => nel}/src/3d/quad_grid_clip_cluster.cpp (100%)
 rename {code/nel => nel}/src/3d/quad_grid_clip_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/raw_skin.cpp (100%)
 rename {code/nel => nel}/src/3d/raw_skinned.cpp (100%)
 rename {code/nel => nel}/src/3d/ray_mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/register_3d.cpp (100%)
 rename {code/nel => nel}/src/3d/render_target_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/render_trav.cpp (100%)
 rename {code/nel => nel}/src/3d/root_model.cpp (100%)
 rename {code/nel => nel}/src/3d/scene.cpp (100%)
 rename {code/nel => nel}/src/3d/scene_group.cpp (100%)
 rename {code/nel => nel}/src/3d/scene_user.cpp (100%)
 rename {code/nel => nel}/src/3d/seg_remanence.cpp (100%)
 rename {code/nel => nel}/src/3d/seg_remanence_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/shaders/compile.bat (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa3_11.h (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa_pp.cg (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa_pp_arbfp1.txt (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa_pp_ps_2_0.txt (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa_vp.cg (100%)
 rename {code/nel => nel}/src/3d/shaders/fxaa_vp_arbvp1.txt (100%)
 rename {code/nel => nel}/src/3d/shaders/readme.txt (100%)
 rename {code/nel => nel}/src/3d/shadow_map.cpp (100%)
 rename {code/nel => nel}/src/3d/shadow_map_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/shadow_poly_receiver.cpp (100%)
 rename {code/nel => nel}/src/3d/shadow_skin.cpp (100%)
 rename {code/nel => nel}/src/3d/shape.cpp (100%)
 rename {code/nel => nel}/src/3d/shape_bank.cpp (100%)
 rename {code/nel => nel}/src/3d/shape_bank_user.cpp (100%)
 rename {code/nel => nel}/src/3d/shape_info.cpp (100%)
 rename {code/nel => nel}/src/3d/shifted_triangle_cache.cpp (100%)
 rename {code/nel => nel}/src/3d/skeleton_model.cpp (100%)
 rename {code/nel => nel}/src/3d/skeleton_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/skeleton_spawn_script.cpp (100%)
 rename {code/nel => nel}/src/3d/skeleton_weight.cpp (100%)
 rename {code/nel => nel}/src/3d/std3d.cpp (100%)
 rename {code/nel => nel}/src/3d/std3d.h (100%)
 rename {code/nel => nel}/src/3d/stereo_debugger.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_display.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_hmd.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_libvr.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_ovr.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_ovr_04.cpp (100%)
 rename {code/nel => nel}/src/3d/stereo_ovr_04_program.h (100%)
 rename {code/nel => nel}/src/3d/stereo_ovr_fp.cpp (100%)
 rename {code/nel => nel}/src/3d/stripifier.cpp (100%)
 rename {code/nel => nel}/src/3d/surface_light_grid.cpp (100%)
 rename {code/nel => nel}/src/3d/tangent_space_build.cpp (100%)
 rename {code/nel => nel}/src/3d/target_anim_ctrl.cpp (100%)
 rename {code/nel => nel}/src/3d/tess_block.cpp (100%)
 rename {code/nel => nel}/src/3d/tess_face_priority_list.cpp (100%)
 rename {code/nel => nel}/src/3d/tessellation.cpp (100%)
 rename {code/nel => nel}/src/3d/text_context.cpp (100%)
 rename {code/nel => nel}/src/3d/text_context_user.cpp (100%)
 rename {code/nel => nel}/src/3d/texture.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_blank.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_blend.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_bump.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_cube.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_dlm.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_emboss.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_far.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_file.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_font.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_grouped.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_mem.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_multi_file.cpp (100%)
 rename {code/nel => nel}/src/3d/texture_near.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_bank.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_element.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_far_bank.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_light_influence.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_lumel.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_noise_map.cpp (100%)
 rename {code/nel => nel}/src/3d/tile_vegetable_desc.cpp (100%)
 rename {code/nel => nel}/src/3d/track.cpp (100%)
 rename {code/nel => nel}/src/3d/track_keyframer.cpp (100%)
 rename {code/nel => nel}/src/3d/track_sampled_common.cpp (100%)
 rename {code/nel => nel}/src/3d/track_sampled_quat.cpp (100%)
 rename {code/nel => nel}/src/3d/track_sampled_quat_small_header.cpp (100%)
 rename {code/nel => nel}/src/3d/track_sampled_vector.cpp (100%)
 rename {code/nel => nel}/src/3d/transform.cpp (100%)
 rename {code/nel => nel}/src/3d/transform_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/transformable.cpp (100%)
 rename {code/nel => nel}/src/3d/u_bone.cpp (100%)
 rename {code/nel => nel}/src/3d/u_camera.cpp (100%)
 rename {code/nel => nel}/src/3d/u_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/u_instance_material.cpp (100%)
 rename {code/nel => nel}/src/3d/u_material.cpp (100%)
 rename {code/nel => nel}/src/3d/u_particle_system_instance.cpp (100%)
 rename {code/nel => nel}/src/3d/u_point_light.cpp (100%)
 rename {code/nel => nel}/src/3d/u_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/u_skeleton.cpp (100%)
 rename {code/nel => nel}/src/3d/u_transform.cpp (100%)
 rename {code/nel => nel}/src/3d/u_transformable.cpp (100%)
 rename {code/nel => nel}/src/3d/u_visual_collision_mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/u_water.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_blend_layer_model.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_clip_block.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_instance_group.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_light_ex.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_quadrant.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetable_sort_block.cpp (100%)
 rename {code/nel => nel}/src/3d/vegetablevb_allocator.cpp (100%)
 rename {code/nel => nel}/src/3d/vertex_buffer.cpp (100%)
 rename {code/nel => nel}/src/3d/vertex_buffer_heap.cpp (100%)
 rename {code/nel => nel}/src/3d/vertex_program.cpp (100%)
 rename {code/nel => nel}/src/3d/vertex_program_parse.cpp (100%)
 rename {code/nel => nel}/src/3d/vertex_stream_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/viewport.cpp (100%)
 rename {code/nel => nel}/src/3d/visual_collision_entity.cpp (100%)
 rename {code/nel => nel}/src/3d/visual_collision_entity_user.cpp (100%)
 rename {code/nel => nel}/src/3d/visual_collision_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/visual_collision_manager_user.cpp (100%)
 rename {code/nel => nel}/src/3d/visual_collision_mesh.cpp (100%)
 rename {code/nel => nel}/src/3d/water_env_map.cpp (100%)
 rename {code/nel => nel}/src/3d/water_env_map_user.cpp (100%)
 rename {code/nel => nel}/src/3d/water_height_map.cpp (100%)
 rename {code/nel => nel}/src/3d/water_model.cpp (100%)
 rename {code/nel => nel}/src/3d/water_pool_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/water_shape.cpp (100%)
 rename {code/nel => nel}/src/3d/zone.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_corner_smoother.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_lighter.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_manager.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_search.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_smoother.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_symmetrisation.cpp (100%)
 rename {code/nel => nel}/src/3d/zone_tgt_smoother.cpp (100%)
 rename {code/nel => nel}/src/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/cegui/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/cegui/nelceguirenderer.def (100%)
 rename {code/nel => nel}/src/cegui/nellogger.cpp (100%)
 rename {code/nel => nel}/src/cegui/nelrenderer.cpp (100%)
 rename {code/nel => nel}/src/cegui/nelresourceprovider.cpp (100%)
 rename {code/nel => nel}/src/cegui/neltexture.cpp (100%)
 rename {code/nel => nel}/src/georges/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/georges/form.cpp (100%)
 rename {code/nel => nel}/src/georges/form_dfn.cpp (100%)
 rename {code/nel => nel}/src/georges/form_elm.cpp (100%)
 rename {code/nel => nel}/src/georges/form_loader.cpp (100%)
 rename {code/nel => nel}/src/georges/georges_file_format.txt (100%)
 rename {code/nel => nel}/src/georges/header.cpp (100%)
 rename {code/nel => nel}/src/georges/nel-georges.pc.in (100%)
 rename {code/nel => nel}/src/georges/stdgeorges.cpp (100%)
 rename {code/nel => nel}/src/georges/stdgeorges.h (100%)
 rename {code/nel => nel}/src/georges/type.cpp (100%)
 rename {code/nel => nel}/src/gui/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/gui/action_handler.cpp (100%)
 rename {code/nel => nel}/src/gui/css_border_renderer.cpp (100%)
 rename {code/nel => nel}/src/gui/css_parser.cpp (100%)
 rename {code/nel => nel}/src/gui/css_selector.cpp (100%)
 rename {code/nel => nel}/src/gui/css_style.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_base.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_base_button.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_button.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_col_pick.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_draggable.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_polygon.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_quad.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_scroll.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_scroll_base.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_sheet_selection.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_text_button.cpp (100%)
 rename {code/nel => nel}/src/gui/ctrl_tooltip.cpp (100%)
 rename {code/nel => nel}/src/gui/db_manager.cpp (100%)
 rename {code/nel => nel}/src/gui/dbgroup_combo_box.cpp (100%)
 rename {code/nel => nel}/src/gui/dbgroup_select_number.cpp (100%)
 rename {code/nel => nel}/src/gui/dbview_bar.cpp (100%)
 rename {code/nel => nel}/src/gui/dbview_bar3.cpp (100%)
 rename {code/nel => nel}/src/gui/dbview_digit.cpp (100%)
 rename {code/nel => nel}/src/gui/dbview_number.cpp (100%)
 rename {code/nel => nel}/src/gui/dbview_quantity.cpp (100%)
 rename {code/nel => nel}/src/gui/event_descriptor.cpp (100%)
 rename {code/nel => nel}/src/gui/event_listener.cpp (100%)
 rename {code/nel => nel}/src/gui/group_container.cpp (100%)
 rename {code/nel => nel}/src/gui/group_container_base.cpp (100%)
 rename {code/nel => nel}/src/gui/group_editbox.cpp (100%)
 rename {code/nel => nel}/src/gui/group_editbox_base.cpp (100%)
 rename {code/nel => nel}/src/gui/group_editbox_decor.cpp (100%)
 rename {code/nel => nel}/src/gui/group_frame.cpp (100%)
 rename {code/nel => nel}/src/gui/group_header.cpp (100%)
 rename {code/nel => nel}/src/gui/group_html.cpp (100%)
 rename {code/nel => nel}/src/gui/group_list.cpp (100%)
 rename {code/nel => nel}/src/gui/group_menu.cpp (100%)
 rename {code/nel => nel}/src/gui/group_modal.cpp (100%)
 rename {code/nel => nel}/src/gui/group_paragraph.cpp (100%)
 rename {code/nel => nel}/src/gui/group_scrolltext.cpp (100%)
 rename {code/nel => nel}/src/gui/group_submenu_base.cpp (100%)
 rename {code/nel => nel}/src/gui/group_tab.cpp (100%)
 rename {code/nel => nel}/src/gui/group_table.cpp (100%)
 rename {code/nel => nel}/src/gui/group_tree.cpp (100%)
 rename {code/nel => nel}/src/gui/group_wheel.cpp (100%)
 rename {code/nel => nel}/src/gui/html_element.cpp (100%)
 rename {code/nel => nel}/src/gui/html_parser.cpp (100%)
 rename {code/nel => nel}/src/gui/http_cache.cpp (100%)
 rename {code/nel => nel}/src/gui/http_hsts.cpp (100%)
 rename {code/nel => nel}/src/gui/input_handler.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_anim.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_element.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_expr.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_expr_node.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_expr_user_fct.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_factory.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_group.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_link.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_options.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_parser.cpp (100%)
 rename {code/nel => nel}/src/gui/interface_property.cpp (100%)
 rename {code/nel => nel}/src/gui/libwww.cpp (100%)
 rename {code/nel => nel}/src/gui/link_hack.cpp (100%)
 rename {code/nel => nel}/src/gui/lua_helper.cpp (100%)
 rename {code/nel => nel}/src/gui/lua_ihm.cpp (100%)
 rename {code/nel => nel}/src/gui/lua_loadlib.c (100%)
 rename {code/nel => nel}/src/gui/lua_manager.cpp (100%)
 rename {code/nel => nel}/src/gui/lua_object.cpp (100%)
 rename {code/nel => nel}/src/gui/parser.cpp (100%)
 rename {code/nel => nel}/src/gui/proc.cpp (100%)
 rename {code/nel => nel}/src/gui/reflect.cpp (100%)
 rename {code/nel => nel}/src/gui/reflect_register.cpp (100%)
 rename {code/nel => nel}/src/gui/root_group.cpp (100%)
 rename {code/nel => nel}/src/gui/stdpch.cpp (100%)
 rename {code/nel => nel}/src/gui/stdpch.h (100%)
 rename {code/nel => nel}/src/gui/string_case.cpp (100%)
 rename {code/nel => nel}/src/gui/url_parser.cpp (100%)
 rename {code/nel => nel}/src/gui/view_base.cpp (100%)
 rename {code/nel => nel}/src/gui/view_bitmap.cpp (100%)
 rename {code/nel => nel}/src/gui/view_bitmap_combo.cpp (100%)
 rename {code/nel => nel}/src/gui/view_link.cpp (100%)
 rename {code/nel => nel}/src/gui/view_pointer.cpp (100%)
 rename {code/nel => nel}/src/gui/view_pointer_base.cpp (100%)
 rename {code/nel => nel}/src/gui/view_polygon.cpp (100%)
 rename {code/nel => nel}/src/gui/view_quad.cpp (100%)
 rename {code/nel => nel}/src/gui/view_renderer.cpp (100%)
 rename {code/nel => nel}/src/gui/view_text.cpp (100%)
 rename {code/nel => nel}/src/gui/view_text_formated.cpp (100%)
 rename {code/nel => nel}/src/gui/view_text_id.cpp (100%)
 rename {code/nel => nel}/src/gui/view_text_id_formated.cpp (100%)
 rename {code/nel => nel}/src/gui/widget_manager.cpp (100%)
 rename {code/nel => nel}/src/ligo/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/ligo/ligo_config.cpp (100%)
 rename {code/nel => nel}/src/ligo/ligo_error.cpp (100%)
 rename {code/nel => nel}/src/ligo/ligo_material.cpp (100%)
 rename {code/nel => nel}/src/ligo/nel-ligo.pc.in (100%)
 rename {code/nel => nel}/src/ligo/primitive.cpp (100%)
 rename {code/nel => nel}/src/ligo/primitive_class.cpp (100%)
 rename {code/nel => nel}/src/ligo/primitive_configuration.cpp (100%)
 rename {code/nel => nel}/src/ligo/primitive_utils.cpp (100%)
 rename {code/nel => nel}/src/ligo/stdligo.cpp (100%)
 rename {code/nel => nel}/src/ligo/stdligo.h (100%)
 rename {code/nel => nel}/src/ligo/transition.cpp (100%)
 rename {code/nel => nel}/src/ligo/zone_bank.cpp (100%)
 rename {code/nel => nel}/src/ligo/zone_edge.cpp (100%)
 rename {code/nel => nel}/src/ligo/zone_region.cpp (100%)
 rename {code/nel => nel}/src/ligo/zone_template.cpp (100%)
 rename {code/nel => nel}/src/logic/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/logic/logic_condition.cpp (100%)
 rename {code/nel => nel}/src/logic/logic_event.cpp (100%)
 rename {code/nel => nel}/src/logic/logic_state.cpp (100%)
 rename {code/nel => nel}/src/logic/logic_state_machine.cpp (100%)
 rename {code/nel => nel}/src/logic/logic_variable.cpp (100%)
 rename {code/nel => nel}/src/logic/stdlogic.cpp (100%)
 rename {code/nel => nel}/src/logic/stdlogic.h (100%)
 rename {code/nel => nel}/src/misc/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/misc/aabbox.cpp (100%)
 rename {code/nel => nel}/src/misc/algo.cpp (100%)
 rename {code/nel => nel}/src/misc/app_context.cpp (100%)
 rename {code/nel => nel}/src/misc/async_file_manager.cpp (100%)
 rename {code/nel => nel}/src/misc/big_file.cpp (100%)
 rename {code/nel => nel}/src/misc/bit_mem_stream.cpp (100%)
 rename {code/nel => nel}/src/misc/bit_set.cpp (100%)
 rename {code/nel => nel}/src/misc/bitmap.cpp (100%)
 rename {code/nel => nel}/src/misc/bitmap_gif.cpp (100%)
 rename {code/nel => nel}/src/misc/bitmap_jpeg.cpp (100%)
 rename {code/nel => nel}/src/misc/bitmap_png.cpp (100%)
 rename {code/nel => nel}/src/misc/block_memory.cpp (100%)
 rename {code/nel => nel}/src/misc/bsphere.cpp (100%)
 rename {code/nel => nel}/src/misc/buf_fifo.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_bank_handler.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_branch.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_branch_observing_handler.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_check_sum.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_leaf.cpp (100%)
 rename {code/nel => nel}/src/misc/cdb_manager.cpp (100%)
 rename {code/nel => nel}/src/misc/check_fpu.cpp (100%)
 rename {code/nel => nel}/src/misc/class_id.cpp (100%)
 rename {code/nel => nel}/src/misc/class_registry.cpp (100%)
 rename {code/nel => nel}/src/misc/cmd_args.cpp (100%)
 rename {code/nel => nel}/src/misc/co_task.cpp (100%)
 rename {code/nel => nel}/src/misc/command.cpp (100%)
 rename {code/nel => nel}/src/misc/common.cpp (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_bison.simple (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_flex.skl (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_gramatical.cpp (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_gramatical.h (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_gramatical.ypp (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_lexical.cpp (100%)
 rename {code/nel => nel}/src/misc/config_file/cf_lexical.lpp (100%)
 rename {code/nel => nel}/src/misc/config_file/config_file.cpp (100%)
 rename {code/nel => nel}/src/misc/config_file/do.bat (100%)
 rename {code/nel => nel}/src/misc/contiguous_block_allocator.cpp (100%)
 rename {code/nel => nel}/src/misc/cpu_time_stat.cpp (100%)
 rename {code/nel => nel}/src/misc/debug.cpp (100%)
 rename {code/nel => nel}/src/misc/diff_tool.cpp (100%)
 rename {code/nel => nel}/src/misc/displayer.cpp (100%)
 rename {code/nel => nel}/src/misc/dummy_window.cpp (100%)
 rename {code/nel => nel}/src/misc/dynloadlib.cpp (100%)
 rename {code/nel => nel}/src/misc/eid_translator.cpp (100%)
 rename {code/nel => nel}/src/misc/entity_id.cpp (100%)
 rename {code/nel => nel}/src/misc/eval_num_expr.cpp (100%)
 rename {code/nel => nel}/src/misc/event_emitter_multi.cpp (100%)
 rename {code/nel => nel}/src/misc/event_listener.cpp (100%)
 rename {code/nel => nel}/src/misc/event_server.cpp (100%)
 rename {code/nel => nel}/src/misc/events.cpp (100%)
 rename {code/nel => nel}/src/misc/fast_floor.cpp (100%)
 rename {code/nel => nel}/src/misc/fast_mem.cpp (100%)
 rename {code/nel => nel}/src/misc/file.cpp (100%)
 rename {code/nel => nel}/src/misc/fixed_size_allocator.cpp (100%)
 rename {code/nel => nel}/src/misc/grid_traversal.cpp (100%)
 rename {code/nel => nel}/src/misc/gtk_displayer.cpp (100%)
 rename {code/nel => nel}/src/misc/heap_memory.cpp (100%)
 rename {code/nel => nel}/src/misc/hierarchical_timer.cpp (100%)
 rename {code/nel => nel}/src/misc/i18n.cpp (100%)
 rename {code/nel => nel}/src/misc/i_streamed_package_provider.cpp (100%)
 rename {code/nel => nel}/src/misc/i_xml.cpp (100%)
 rename {code/nel => nel}/src/misc/inter_window_msg_queue.cpp (100%)
 rename {code/nel => nel}/src/misc/line.cpp (100%)
 rename {code/nel => nel}/src/misc/log.cpp (100%)
 rename {code/nel => nel}/src/misc/matrix.cpp (100%)
 rename {code/nel => nel}/src/misc/md5.cpp (100%)
 rename {code/nel => nel}/src/misc/mem_displayer.cpp (100%)
 rename {code/nel => nel}/src/misc/mem_stream.cpp (100%)
 rename {code/nel => nel}/src/misc/mouse_smoother.cpp (100%)
 rename {code/nel => nel}/src/misc/mutex.cpp (100%)
 rename {code/nel => nel}/src/misc/nel-misc.pc (100%)
 rename {code/nel => nel}/src/misc/nel-misc.pc.in (100%)
 rename {code/nel => nel}/src/misc/noise_value.cpp (100%)
 rename {code/nel => nel}/src/misc/o_xml.cpp (100%)
 rename {code/nel => nel}/src/misc/object_arena_allocator.cpp (100%)
 rename {code/nel => nel}/src/misc/p_thread.cpp (100%)
 rename {code/nel => nel}/src/misc/path.cpp (100%)
 rename {code/nel => nel}/src/misc/plane.cpp (100%)
 rename {code/nel => nel}/src/misc/polygon.cpp (100%)
 rename {code/nel => nel}/src/misc/progress_callback.cpp (100%)
 rename {code/nel => nel}/src/misc/quat.cpp (100%)
 rename {code/nel => nel}/src/misc/reader_writer.cpp (100%)
 rename {code/nel => nel}/src/misc/rect.cpp (100%)
 rename {code/nel => nel}/src/misc/report.cpp (100%)
 rename {code/nel => nel}/src/misc/rgba.cpp (100%)
 rename {code/nel => nel}/src/misc/seven_zip.cpp (100%)
 rename {code/nel => nel}/src/misc/sha1.cpp (100%)
 rename {code/nel => nel}/src/misc/shared_memory.cpp (100%)
 rename {code/nel => nel}/src/misc/sheet_id.cpp (100%)
 rename {code/nel => nel}/src/misc/smart_ptr.cpp (100%)
 rename {code/nel => nel}/src/misc/sstring.cpp (100%)
 rename {code/nel => nel}/src/misc/stdmisc.cpp (100%)
 rename {code/nel => nel}/src/misc/stdmisc.h (100%)
 rename {code/nel => nel}/src/misc/stop_watch.cpp (100%)
 rename {code/nel => nel}/src/misc/stream.cpp (100%)
 rename {code/nel => nel}/src/misc/streamed_package.cpp (100%)
 rename {code/nel => nel}/src/misc/streamed_package_manager.cpp (100%)
 rename {code/nel => nel}/src/misc/string_common.cpp (100%)
 rename {code/nel => nel}/src/misc/string_mapper.cpp (100%)
 rename {code/nel => nel}/src/misc/system_info.cpp (100%)
 rename {code/nel => nel}/src/misc/system_utils.cpp (100%)
 rename {code/nel => nel}/src/misc/task_manager.cpp (100%)
 rename {code/nel => nel}/src/misc/tds.cpp (100%)
 rename {code/nel => nel}/src/misc/time_nl.cpp (100%)
 rename {code/nel => nel}/src/misc/triangle.cpp (100%)
 rename {code/nel => nel}/src/misc/unicode.cpp (100%)
 rename {code/nel => nel}/src/misc/variable.cpp (100%)
 rename {code/nel => nel}/src/misc/vector.cpp (100%)
 rename {code/nel => nel}/src/misc/vector_2f.cpp (100%)
 rename {code/nel => nel}/src/misc/vectord.cpp (100%)
 rename {code/nel => nel}/src/misc/win32_util.cpp (100%)
 rename {code/nel => nel}/src/misc/win_displayer.cpp (100%)
 rename {code/nel => nel}/src/misc/win_event_emitter.cpp (100%)
 rename {code/nel => nel}/src/misc/win_thread.cpp (100%)
 rename {code/nel => nel}/src/misc/window_displayer.cpp (100%)
 rename {code/nel => nel}/src/misc/words_dictionary.cpp (100%)
 rename {code/nel => nel}/src/misc/xml_auto_ptr.cpp (100%)
 rename {code/nel => nel}/src/misc/xml_pack.cpp (100%)
 rename {code/nel => nel}/src/net/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/net/admin.cpp (100%)
 rename {code/nel => nel}/src/net/buf_client.cpp (100%)
 rename {code/nel => nel}/src/net/buf_net_base.cpp (100%)
 rename {code/nel => nel}/src/net/buf_server.cpp (100%)
 rename {code/nel => nel}/src/net/buf_sock.cpp (100%)
 rename {code/nel => nel}/src/net/callback_client.cpp (100%)
 rename {code/nel => nel}/src/net/callback_net_base.cpp (100%)
 rename {code/nel => nel}/src/net/callback_server.cpp (100%)
 rename {code/nel => nel}/src/net/dummy_tcp_sock.cpp (100%)
 rename {code/nel => nel}/src/net/email.cpp (100%)
 rename {code/nel => nel}/src/net/inet_address.cpp (100%)
 rename {code/nel => nel}/src/net/listen_sock.cpp (100%)
 rename {code/nel => nel}/src/net/login_client.cpp (100%)
 rename {code/nel => nel}/src/net/login_cookie.cpp (100%)
 rename {code/nel => nel}/src/net/login_server.cpp (100%)
 rename {code/nel => nel}/src/net/message.cpp (100%)
 rename {code/nel => nel}/src/net/message_recorder.cpp (100%)
 rename {code/nel => nel}/src/net/module.cpp (100%)
 rename {code/nel => nel}/src/net/module_common.cpp (100%)
 rename {code/nel => nel}/src/net/module_gateway.cpp (100%)
 rename {code/nel => nel}/src/net/module_gateway_transport.cpp (100%)
 rename {code/nel => nel}/src/net/module_l5_transport.cpp (100%)
 rename {code/nel => nel}/src/net/module_local_gateway.cpp (100%)
 rename {code/nel => nel}/src/net/module_manager.cpp (100%)
 rename {code/nel => nel}/src/net/module_message.cpp (100%)
 rename {code/nel => nel}/src/net/module_socket.cpp (100%)
 rename {code/nel => nel}/src/net/naming_client.cpp (100%)
 rename {code/nel => nel}/src/net/nel-net.pc.in (100%)
 rename {code/nel => nel}/src/net/net_displayer.cpp (100%)
 rename {code/nel => nel}/src/net/net_log.cpp (100%)
 rename {code/nel => nel}/src/net/net_manager.cpp (100%)
 rename {code/nel => nel}/src/net/service.cpp (100%)
 rename {code/nel => nel}/src/net/sock.cpp (100%)
 rename {code/nel => nel}/src/net/stdin_monitor_thread.cpp (100%)
 rename {code/nel => nel}/src/net/stdin_monitor_thread.h (100%)
 rename {code/nel => nel}/src/net/stdnet.cpp (100%)
 rename {code/nel => nel}/src/net/stdnet.h (100%)
 rename {code/nel => nel}/src/net/tcp_sock.cpp (100%)
 rename {code/nel => nel}/src/net/transport_class.cpp (100%)
 rename {code/nel => nel}/src/net/udp_sim_sock.cpp (100%)
 rename {code/nel => nel}/src/net/udp_sock.cpp (100%)
 rename {code/nel => nel}/src/net/unified_network.cpp (100%)
 rename {code/nel => nel}/src/net/unitime.cpp (100%)
 rename {code/nel => nel}/src/net/varpath.cpp (100%)
 rename {code/nel => nel}/src/pacs/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/pacs/build_indoor.cpp (100%)
 rename {code/nel => nel}/src/pacs/chain.cpp (100%)
 rename {code/nel => nel}/src/pacs/chain_quad.cpp (100%)
 rename {code/nel => nel}/src/pacs/collision_callback.cpp (100%)
 rename {code/nel => nel}/src/pacs/collision_desc.cpp (100%)
 rename {code/nel => nel}/src/pacs/collision_ot.cpp (100%)
 rename {code/nel => nel}/src/pacs/collision_surface_temp.cpp (100%)
 rename {code/nel => nel}/src/pacs/edge_collide.cpp (100%)
 rename {code/nel => nel}/src/pacs/edge_quad.cpp (100%)
 rename {code/nel => nel}/src/pacs/exterior_mesh.cpp (100%)
 rename {code/nel => nel}/src/pacs/global_retriever.cpp (100%)
 rename {code/nel => nel}/src/pacs/local_retriever.cpp (100%)
 rename {code/nel => nel}/src/pacs/move_cell.cpp (100%)
 rename {code/nel => nel}/src/pacs/move_container.cpp (100%)
 rename {code/nel => nel}/src/pacs/move_element.cpp (100%)
 rename {code/nel => nel}/src/pacs/move_primitive.cpp (100%)
 rename {code/nel => nel}/src/pacs/nel-pacs.pc.in (100%)
 rename {code/nel => nel}/src/pacs/primitive_block_pacs.cpp (100%)
 rename {code/nel => nel}/src/pacs/primitive_world_image.cpp (100%)
 rename {code/nel => nel}/src/pacs/retrievable_surface.cpp (100%)
 rename {code/nel => nel}/src/pacs/retriever_bank.cpp (100%)
 rename {code/nel => nel}/src/pacs/retriever_instance.cpp (100%)
 rename {code/nel => nel}/src/pacs/stdpacs.cpp (100%)
 rename {code/nel => nel}/src/pacs/stdpacs.h (100%)
 rename {code/nel => nel}/src/pacs/surface_quad.cpp (100%)
 rename {code/nel => nel}/src/pacs/vector_2s.cpp (100%)
 rename {code/nel => nel}/src/pipeline/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/pipeline/database_config.cpp (100%)
 rename {code/nel => nel}/src/pipeline/project_config.cpp (100%)
 rename {code/nel => nel}/src/pipeline/tool_logger.cpp (100%)
 rename {code/nel => nel}/src/sound/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/async_file_manager_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/audio_decoder.cpp (100%)
 rename {code/nel => nel}/src/sound/audio_decoder_ffmpeg.cpp (100%)
 rename {code/nel => nel}/src/sound/audio_decoder_mp3.cpp (100%)
 rename {code/nel => nel}/src/sound/audio_decoder_vorbis.cpp (100%)
 rename {code/nel => nel}/src/sound/audio_mixer_user.cpp (100%)
 rename {code/nel => nel}/src/sound/background_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/background_sound_manager.cpp (100%)
 rename {code/nel => nel}/src/sound/background_source.cpp (100%)
 rename {code/nel => nel}/src/sound/clustered_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/complex_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/complex_source.cpp (100%)
 rename {code/nel => nel}/src/sound/context_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/driver/buffer.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/buffer_dsound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/buffer_dsound.h (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/driver_dsound.def (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/listener_dsound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/listener_dsound.h (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/resources.rc (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/sound_driver_dsound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/sound_driver_dsound.h (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/source_dsound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/source_dsound.h (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/stddsound.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/dsound/stddsound.h (100%)
 rename {code/nel => nel}/src/sound/driver/effect.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/buffer_fmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/buffer_fmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/driver_fmod.def (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/listener_fmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/listener_fmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/music_channel_fmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/music_channel_fmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/resources.rc (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/sound_driver_fmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/sound_driver_fmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/source_fmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/source_fmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/stdfmod.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/fmod/stdfmod.h (100%)
 rename {code/nel => nel}/src/sound/driver/listener.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/music_channel.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/driver/openal/buffer_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/buffer_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/driver_openal.def (100%)
 rename {code/nel => nel}/src/sound/driver/openal/effect_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/effect_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/ext_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/ext_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/listener_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/listener_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/resources.rc (100%)
 rename {code/nel => nel}/src/sound/driver/openal/sound_driver_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/sound_driver_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/source_al.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/source_al.h (100%)
 rename {code/nel => nel}/src/sound/driver/openal/stdopenal.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/openal/stdopenal.h (100%)
 rename {code/nel => nel}/src/sound/driver/sound_driver.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/source.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/stdsound_lowlevel.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/stdsound_lowlevel.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/adpcm_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/adpcm_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/buffer_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/buffer_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/driver_xaudio2.def (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/effect_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/effect_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/listener_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/listener_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/resources.rc (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/sound_driver_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/source_xaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/source_xaudio2.h (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/stdxaudio2.cpp (100%)
 rename {code/nel => nel}/src/sound/driver/xaudio2/stdxaudio2.h (100%)
 rename {code/nel => nel}/src/sound/group_controller.cpp (100%)
 rename {code/nel => nel}/src/sound/group_controller_root.cpp (100%)
 rename {code/nel => nel}/src/sound/listener_user.cpp (100%)
 rename {code/nel => nel}/src/sound/mixing_track.cpp (100%)
 rename {code/nel => nel}/src/sound/music_channel_fader.cpp (100%)
 rename {code/nel => nel}/src/sound/music_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/music_sound_manager.cpp (100%)
 rename {code/nel => nel}/src/sound/music_source.cpp (100%)
 rename {code/nel => nel}/src/sound/nel-sound.pc.in (100%)
 rename {code/nel => nel}/src/sound/sample_bank.cpp (100%)
 rename {code/nel => nel}/src/sound/sample_bank_manager.cpp (100%)
 rename {code/nel => nel}/src/sound/simple_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/simple_source.cpp (100%)
 rename {code/nel => nel}/src/sound/sound.cpp (100%)
 rename {code/nel => nel}/src/sound/sound_anim_manager.cpp (100%)
 rename {code/nel => nel}/src/sound/sound_anim_marker.cpp (100%)
 rename {code/nel => nel}/src/sound/sound_animation.cpp (100%)
 rename {code/nel => nel}/src/sound/sound_bank.cpp (100%)
 rename {code/nel => nel}/src/sound/source_common.cpp (100%)
 rename {code/nel => nel}/src/sound/source_music_channel.cpp (100%)
 rename {code/nel => nel}/src/sound/stdsound.cpp (100%)
 rename {code/nel => nel}/src/sound/stdsound.h (100%)
 rename {code/nel => nel}/src/sound/stream_file_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/stream_file_source.cpp (100%)
 rename {code/nel => nel}/src/sound/stream_sound.cpp (100%)
 rename {code/nel => nel}/src/sound/stream_source.cpp (100%)
 rename {code/nel => nel}/src/web/CMakeLists.txt (100%)
 rename {code/nel => nel}/src/web/curl_certificates.cpp (100%)
 rename {code/nel => nel}/src/web/http_client_curl.cpp (100%)
 rename {code/nel => nel}/src/web/http_package_provider.cpp (100%)
 rename {code/nel => nel}/src/web/nel-web.pc.in (100%)
 rename {code/nel => nel}/src/web/stdweb.cpp (100%)
 rename {code/nel => nel}/src/web/stdweb.h (100%)
 rename {code/nel => nel}/tools/3d/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/anim_builder/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/anim_builder/anim_builder.cpp (100%)
 rename {code/nel => nel}/tools/3d/anim_builder/anim_builder.h (100%)
 rename {code/nel => nel}/tools/3d/anim_builder/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/anim_builder/main.rc (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/anim_utility.cpp (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/anim_utility.h (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/animation_set_builder.cpp (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/gold_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/animation_set_builder/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/build_clod_bank.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/config_example.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_clod_bank/path_config_example.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/lod_texture_builder.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/lod_texture_builder.h (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_clodtex/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_coarse_mesh/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_coarse_mesh/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_coarse_mesh/build.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_coarse_mesh/build_coarse_mesh.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_coarse_mesh/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_far_bank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_far_bank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_far_bank/build_far_bank.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_far_bank/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/Howto export.txt (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/_idle.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/config.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/directories.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/panoply.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/properties_draft.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/properties_final.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/cfg/site.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/client_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/client_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/maxscript/anim_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/anim/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/cfg/local_path.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/maxscript/clod_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/process_doc.txt (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/clodbank/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/displace/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/farbank/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/font/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/maxscript/ig_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ig_light/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/interface/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ligo/sh/renametozone.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/map/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/pacs_prim/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/ps/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/cfg/ai_build_wmap.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/maxscript/rbank_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/sh/clean.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/rbank/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/cfg/config_header.cfg (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/maxscript/shape_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/sh/transfert_lightmap_optimize.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/shape/sh/transfert_shape_optimize.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/maxscript/skel_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/skel/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/smallbank/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/maxscript/swt_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/swt/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/tiles/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/maxscript/veget_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/veget/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/vegetset/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/maxscript/zone_export.ms (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/0_setup.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/1_clean.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/2_export.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/3_build.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/4_install.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/export_build_all_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/export_build_data.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/patch_tile_water.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/processes/zone_light/sh/patch_tile_water.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/set_title.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/build.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/clean.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/client_clean.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/client_setup.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/export.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/install.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/sh/setup.sh (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/update_local_tools.bat (100%)
 rename {code/nel => nel}/tools/3d/build_gamedata/update_tools.bat (100%)
 rename {code/nel => nel}/tools/3d/build_interface/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_interface/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_interface/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_interface/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_shadow_skin/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_shadow_skin/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_shadow_skin/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_shadow_skin/main.rc (100%)
 rename {code/nel => nel}/tools/3d/build_smallbank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/build_smallbank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/build_smallbank/build_smallbank.cpp (100%)
 rename {code/nel => nel}/tools/3d/build_smallbank/main.rc (100%)
 rename {code/nel => nel}/tools/3d/cluster_viewer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/cluster_viewer/main.rc (100%)
 rename {code/nel => nel}/tools/3d/cluster_viewer/red_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/cluster_viewer/view_cs.cpp (100%)
 rename {code/nel => nel}/tools/3d/cluster_viewer/view_cs.txt (100%)
 rename {code/nel => nel}/tools/3d/crash_log_analyser/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/file_info/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/file_info/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/get_neighbors/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/get_neighbors/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/get_neighbors/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/get_neighbors/main.rc (100%)
 rename {code/nel => nel}/tools/3d/hls_bank_maker/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/hls_bank_maker/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/hls_bank_maker/hls_bank_maker.cpp (100%)
 rename {code/nel => nel}/tools/3d/hls_bank_maker/hls_bank_maker.h (100%)
 rename {code/nel => nel}/tools/3d/hls_bank_maker/main.rc (100%)
 rename {code/nel => nel}/tools/3d/ig_add/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ig_add/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/ig_add/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/ig_add/main.rc (100%)
 rename {code/nel => nel}/tools/3d/ig_elevation/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ig_elevation/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/ig_elevation/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/ig_elevation/main.rc (100%)
 rename {code/nel => nel}/tools/3d/ig_info/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ig_info/ig_info.cpp (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter/config.cfg (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter/ig_lighter.cpp (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter/main.rc (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp (100%)
 rename {code/nel => nel}/tools/3d/ig_lighter_lib/ig_lighter_lib.h (100%)
 rename {code/nel => nel}/tools/3d/lightmap_optimizer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/lightmap_optimizer/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/lightmap_optimizer/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/lightmap_optimizer/main.rc (100%)
 rename {code/nel => nel}/tools/3d/ligo/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ligo/ligoscape.cfg (100%)
 rename {code/nel => nel}/tools/3d/ligo/ligoscape.txt (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/ligoscape_utility.def (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/ligoscape_utility.h (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/ligoscape_utility.rc (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/ligoscript.txt (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/macroscripts/nel_ligoscape.mcr (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/max_to_ligo.cpp (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/max_to_ligo.h (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/resource.h (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/script.cpp (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/scripts/nel_ligoscape.ms (100%)
 rename {code/nel => nel}/tools/3d/ligo/plugin_max/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/mesh_export/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/mesh_export/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/mesh_export/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_export/main.rc (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/assimp_material.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/assimp_material.h (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/assimp_shape.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/assimp_shape.h (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/mesh_utils.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/mesh_utils.h (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/scene_context.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/scene_context.h (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/scene_meta.cpp (100%)
 rename {code/nel => nel}/tools/3d/mesh_utils/scene_meta.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/about_dialog.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/about_dialog.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/animation_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/animation_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/animation_set_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/animation_set_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/attrib_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/attrib_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/attrib_list_box.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/attrib_list_box.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/auto_lod_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/auto_lod_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ball.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/basis_edit.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/basis_edit.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bin_op_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bin_op_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bitmap1.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bitmap2.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bitmap3.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bitmap4.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/blend_wnd.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/blend_wnd.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00001.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00002.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00003.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00004.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00005.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00006.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00007.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00008.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00009.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00010.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00011.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00012.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00013.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00014.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00015.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00016.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00017.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00018.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00019.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00020.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00021.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00022.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00023.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00024.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00025.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00026.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bmp00027.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/bound_checker.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_bg_color_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_bg_color_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_frame_delay.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_frame_delay.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_name.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_name.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_pool_id.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_pool_id.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_sun_color_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/choose_sun_color_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/collision_zone_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/collision_zone_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_button.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_button.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_edit.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_edit.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_static.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/color_static.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_tex_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/constraint_mesh_tex_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/create_file_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/create_file_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/curve_edit.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/curve_edit.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/day_night_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/day_night_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/dialog_progress.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/dialog_progress.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/dialog_stack.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/direction_attr.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/direction_attr.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/direction_edit.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/direction_edit.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/dup_ps.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/dup_ps.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_attrib_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ex.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ex.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_follow_path.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_follow_path.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_morph_mesh_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_morph_mesh_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ps_light.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ps_light.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ps_sound.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_ps_sound.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_spinner.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_spinner.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_user_param.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/edit_user_param.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/editable_range.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/editable_range.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/emitter_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/emitter_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/fire.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/fog_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/fog_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/global_wind_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/global_wind_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/graph.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/graph.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/halo.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/i1.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/i2.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/i3.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/lb_extern_id_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/lb_extern_id_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/light_at.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/light_group_factor.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/light_group_factor.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_bindable_dialog.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_bindable_dialog.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_properties.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_properties.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_target_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/located_target_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/main_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/main_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/main_frame.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/main_frame.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/mesh_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/mesh_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/multi_tex_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/multi_tex_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/nevraxpill.ico (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer.cfg (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer.def (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer.rc (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer_debug.def (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/object_viewer_interface.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_system_edit.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_system_edit.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_tree_ctrl.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_tree_ctrl.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_workspace.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/particle_workspace.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pick_sound.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pick_sound.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_back.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_beak.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_face.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_foot.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_snow.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/pingoo_stick.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/popup_notify.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/precomputed_rotations_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/precomputed_rotations_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_global_color_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_global_color_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_initial_pos.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_initial_pos.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_mover_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_mover_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ps_wrapper.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/range_manager.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/range_manager.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/range_selector.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/range_selector.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/res/object_viewer.rc2 (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/resource.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ribbon.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ribbon_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/ribbon_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/save_options_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/save_options_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scene_rot_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scene_rot_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scheme_bank_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scheme_bank_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scheme_manager.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/scheme_manager.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/select_movie_size.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/select_movie_size.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/select_string.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/select_string.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/set_value_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/set_value_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/shock.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/skeleton_scale_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/skeleton_scale_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/skippable_message_box.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/skippable_message_box.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/slot_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/slot_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/smiley.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/snapshot_tool_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/snapshot_tool_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/snow.tga (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_anim_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_anim_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_anim_view.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_anim_view.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_system.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/sound_system.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/start_stop_particle_system.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/start_stop_particle_system.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/std_afx.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/std_afx.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/tail_particle_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/tail_particle_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/texture_anim_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/texture_anim_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/texture_chooser.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/texture_chooser.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/toolbar1.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/tune_mrm_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/tune_mrm_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_blender_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_blender_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_from_emitter_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_from_emitter_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_gradient_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/value_gradient_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_apperance_page.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_apperance_page.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_copy_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_copy_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_density_page.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_density_page.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_edit_tools.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_edit_tools.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_list_box.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_list_box.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_list_color.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_list_color.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_noise_value_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_noise_value_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_refresh.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_refresh.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_rotate_page.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_rotate_page.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_scale_page.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_scale_page.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_select_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_select_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_wind_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/vegetable_wind_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/version.ver (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/water_pool_editor.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/water_pool_editor.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer/workspace.bmp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/nevraxpill.ico (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/object_viewer_exe.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/object_viewer_exe.rc (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/resource.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/std_afx.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/std_afx.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_exe/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/entity.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/entity.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/interfaces.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/object_viewer_widget.h (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/stdpch.cpp (100%)
 rename {code/nel => nel}/tools/3d/object_viewer_widget/src/stdpch.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/color_mask.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/color_modifier.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/color_modifier.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/hls_bank_texture_info.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/hls_bank_texture_info.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/main.rc (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/panoply.cfg (100%)
 rename {code/nel => nel}/tools/3d/panoply_maker/panoply_maker.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/green_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/main.rc (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/main_window.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/main_window.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/panoply_preview.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/panoply_preview.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/tool_config.h (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/tool_main.cpp (100%)
 rename {code/nel => nel}/tools/3d/panoply_preview/tool_main.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/animatable.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/animatable.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/base_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/base_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/bitmap_tex.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/bitmap_tex.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/builtin.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/builtin.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/editable_patch.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/editable_patch.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/geom_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/geom_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/i_node.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/i_node.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/modifier.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/modifier.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/mtl.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/mtl.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/mtl_base.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/mtl_base.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/multi_mtl.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/multi_mtl.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/node_impl.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/node_impl.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/param_block.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/param_block.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/param_block_2.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/param_block_2.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/patch_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/patch_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/poly_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/poly_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/reference_maker.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/reference_maker.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/reference_target.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/reference_target.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/root_node.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/root_node.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/scene_impl.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/scene_impl.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/std_mat.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/std_mat.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/std_mat_2.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/std_mat_2.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/storage/app_data.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/storage/app_data.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/storage/geom_buffers.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/super_class_unknown.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/super_class_unknown.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/texmap.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/texmap.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/track_view_node.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/track_view_node.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/tri_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/builtin/tri_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/class_data.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/class_data.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/class_directory_3.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/class_directory_3.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/config.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/config.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/derived_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/derived_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/dll_directory.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/dll_directory.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/dll_plugin_desc.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/dll_plugin_desc.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/epoly/editable_poly.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/epoly/editable_poly.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/epoly/epoly.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/epoly/epoly.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class_registry.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class_registry.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class_unknown.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/scene_class_unknown.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_array.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_array.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_chunks.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_chunks.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_file.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_file.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_stream.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_stream.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_value.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/storage_value.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/super_class_desc.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/super_class_desc.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/typedefs.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/typedefs.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/update1/editable_mesh.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/update1/editable_mesh.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/update1/update1.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/update1/update1.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/wsm_derived_object.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max/wsm_derived_object.h (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/class_directory_3_2010.c (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/class_directory_3_3.c (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/config_2010.c (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/config_2010.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/config_3.c (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/info.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/scene_2010.c (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_dump/scene_graph_5.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/pipeline_max_rewrite_assets/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/compilation_notes.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/compilation_notes_vc7.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/install_plugin_max.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/macroscripts/nel_mirror_weights.mcr (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/macroscripts/nel_node_properties.mcr (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/macroscripts/nel_xref_building.mcr (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/max_animation_support.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/max_light_support.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/max_lightmap_support.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/max_material_support.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/max_skinning_support.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/last_lightmap.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_collision.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_export.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_lightmap_v1.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_lightmap_v2.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_scene.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_scene.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_script.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_swt.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_view.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/nel_export_zone.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/progress.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/progress.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/std_afx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/std_afx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_export/version.ver (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rad.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_anim.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_appdata.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_flare.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_light.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_lod_character.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_material.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_mesh_interface.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_nel.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_particle_system.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_remanence.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_scene.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_mesh_lib/export_vegetable.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/PO2RPO.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/script.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_converter/version.ver (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/addvertc.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/attach.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bevel.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bin00001.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bmp00001.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bmp00002.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bmp00003.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/booleant.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/boolinte.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/boolsubt.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/boolunio.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bulbmask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/bulbs.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/chamfer.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/crosshr.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/crossins.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/cur00001.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/cur00002.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/cursor1.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/echamfer.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/editpat.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/extrudec.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/faceselt.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/fillet.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/icon1.ico (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/icon2.ico (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/icon3.ico (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/large.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/large.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/light.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/light.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/magnify.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/mask_boo.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/mask_fac.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/mask_unw.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/medium.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/medium.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/mods.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/mods.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/modsres.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/move_x.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/move_y.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/nel_patch_edit.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_data.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_mod.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_editpops.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_ep_vert_mapper.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_add_patches.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_bevel.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_del.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_detach.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_extrude.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_file.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_gui.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_hide.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_hook.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_material.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_remember.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_subdivide.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_gui_bind.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_main.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_patch_point_tab.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_patch_restore.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_patch_sel_restore.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_patch_vertex_delta.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_pick_patch_attach.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_record.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/outline.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/panhand.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/patselm.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/patselt.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/pick_color.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/region.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/scale_x.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/scale_y.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/segbreak.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/segrefin.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/selmask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/splinese.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/splselm.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/stdafx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/thselcur.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/trim.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_option.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_option_mask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_transform.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_transform_mask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_verts.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_verts_mask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_view.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrap_view_mask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/unwrapto.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/vchamfer.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/vertconn.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/vinsert.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_edit/weld.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/rpo.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/rpo.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/stdafx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/DllEntry.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_0.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_0.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_1.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_1.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_10.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_10.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_11.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_11.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_128.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_128.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_2.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_2.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_256.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_256.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_3.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_3.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_4.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_4.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_5.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_5.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_6.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_6.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_7.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_7.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_8.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_8.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_9.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_9.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_small.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/_small.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/all.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/all.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/cur00001.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/cursor1.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/goofy.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/goofy.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/keys.cfg (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/large.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/large.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/light.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/light.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/lock.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/lock.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/medium.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/medium.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nel_paint.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nothing.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/nothing.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/oriented.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/oriented.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_data.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_file.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_fill.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_fill.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_light.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_light.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_main.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_mod.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_pops.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_record.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_restore.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_tileset.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_tileset.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_ui.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_undo.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_undo.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/pick_col.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/pick_color.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/regular.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/regular.tga (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/stdafx.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/user_guide.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_patch_paint/version.ver (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/Buttons.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/Paint.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/buttonmask.bmp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/dropcurs.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/paintcur.cur (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/nel_water_material.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/resolve_troubles.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/db_cleaner.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/db_erase_mesh.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/db_shooter.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/extrude_water.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_add_name_ref_scale.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_png.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_png_database.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_resave.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_batched_script.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_copy_biped_figure_mode.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_create_matrix.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_mat_converter.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_mirror_weights.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_move_animation.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_node_properties.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_orient_zones.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_rename.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_repair_xref.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_select.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_select_ig.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_utility.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_xref_building.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_zone_namer.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/reload_textures.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_flare.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_light.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms.v1 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms.v11 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms.v2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms.v3 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_material.ms.v5 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_multi_set.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_pacs_box.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_pacs_cylinder.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_ps.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_swt.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/scripts/startup/nel_wave_maker.ms (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/resource.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/rgbadd.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/tile_utility.cpp (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/tile_utility.def (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/tile_utility.h (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/tile_utility.rc (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/plugin_max/tile_utility/version.ver (100%)
 rename {code/nel => nel}/tools/3d/s3tc_compressor_lib/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/s3tc_compressor_lib/s3tc_compressor.cpp (100%)
 rename {code/nel => nel}/tools/3d/s3tc_compressor_lib/s3tc_compressor.h (100%)
 rename {code/nel => nel}/tools/3d/shape2obj/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/shape2obj/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/gold_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/main.rc (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/shapes_exporter.cfg (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/shapes_exporter.cpp (100%)
 rename {code/nel => nel}/tools/3d/shapes_exporter/shapes_exporter.h (100%)
 rename {code/nel => nel}/tools/3d/shared_widgets/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/shared_widgets/command_log.cpp (100%)
 rename {code/nel => nel}/tools/3d/shared_widgets/command_log.h (100%)
 rename {code/nel => nel}/tools/3d/shared_widgets/common.h (100%)
 rename {code/nel => nel}/tools/3d/textures_optimizer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/textures_optimizer/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/textures_tool/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/textures_tool/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/tga_2_dds/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/tga_2_dds/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/tga_2_dds/main.rc (100%)
 rename {code/nel => nel}/tools/3d/tga_2_dds/tga2dds.cpp (100%)
 rename {code/nel => nel}/tools/3d/tga_cut/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/tga_cut/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/tga_cut/main.rc (100%)
 rename {code/nel => nel}/tools/3d/tga_cut/tga_cut.cpp (100%)
 rename {code/nel => nel}/tools/3d/tga_resize/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/tga_resize/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/Browse.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/Browse.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/DialogEditList.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/DialogEditList.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/DllEntry.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/GetVal.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/GetVal.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/Popup.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/Popup.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/ReadMe.txt (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/SelectionTerritoire.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/SelectionTerritoire.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileCtrl.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileCtrl.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileList.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileList.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileView.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/TileView.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/View.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/View.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/ViewColumn.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/ViewColumn.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/choose_veget_set.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/choose_veget_set.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/cpu.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/cursor1.cur (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/custom.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/custom.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/nevraxpill.ico (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/resource.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/rot0.bmp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/rot1.bmp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/rot2.bmp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/rot3.bmp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/select_rotation.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/select_rotation.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/stdafx.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/stdafx.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/thread.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/thread_win32.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/thread_win32.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/tile32_32.bmp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/tile_edit_exe.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/tile_edit_exe.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/tile_edit_exe.rc (100%)
 rename {code/nel => nel}/tools/3d/tile_edit/version.rc2 (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/add_tile.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/browser_model.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/browser_model.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/common.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/common.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/delete_image.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/delete_tile.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/down.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/empty_image.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/items_edit_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/items_edit_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/items_edit_qt.ui (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/left.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/main.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/nel.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/replace_image.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/reset.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/right.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/rotation0.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/rotation180.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/rotation270.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/rotation90.png (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_browser_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_browser_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_browser_qt.ui (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_edit_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_edit_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_edit_qt.qrc (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_edit_qt.ui (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_listwidgetitem.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_listwidgetitem.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_rotation_dlg.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_rotation_dlg.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_rotation_qt.ui (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_widget.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_widget.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tile_widget_qt.ui (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tiles_model.cpp (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/tiles_model.h (100%)
 rename {code/nel => nel}/tools/3d/tile_edit_qt/up.png (100%)
 rename {code/nel => nel}/tools/3d/unbuild_interface/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/unbuild_interface/gold_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/unbuild_interface/main.rc (100%)
 rename {code/nel => nel}/tools/3d/unbuild_interface/unbuild_interface.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_check_bind/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_check_bind/zone_check_bind.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_check_bind/zone_utility.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_check_bind/zone_utility.h (100%)
 rename {code/nel => nel}/tools/3d/zone_dependencies/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_dependencies/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/zone_dependencies/main.rc (100%)
 rename {code/nel => nel}/tools/3d/zone_dependencies/zone_dependencies.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_dump/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_dump/zone_dump.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_elevation/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_elevation/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/zone_elevation/main.rc (100%)
 rename {code/nel => nel}/tools/3d/zone_elevation/zone_elevation.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_ig_lighter/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_ig_lighter/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/zone_ig_lighter/main.rc (100%)
 rename {code/nel => nel}/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_lib/zone_utility.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_lib/zone_utility.h (100%)
 rename {code/nel => nel}/tools/3d/zone_lighter/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_lighter/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/zone_lighter/main.rc (100%)
 rename {code/nel => nel}/tools/3d/zone_lighter/zone_lighter.cfg (100%)
 rename {code/nel => nel}/tools/3d/zone_lighter/zone_lighter.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/internal_weld.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/main.rc (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/zone_welder.cpp (100%)
 rename {code/nel => nel}/tools/3d/zone_welder/zwelder.cfg (100%)
 rename {code/nel => nel}/tools/3d/zviewer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/3d/zviewer/heightmap.tga (100%)
 rename {code/nel => nel}/tools/3d/zviewer/move_listener.cpp (100%)
 rename {code/nel => nel}/tools/3d/zviewer/move_listener.h (100%)
 rename {code/nel => nel}/tools/3d/zviewer/nevraxpill.ico (100%)
 rename {code/nel => nel}/tools/3d/zviewer/readme.txt (100%)
 rename {code/nel => nel}/tools/3d/zviewer/resource.h (100%)
 rename {code/nel => nel}/tools/3d/zviewer/zviewer.cfg (100%)
 rename {code/nel => nel}/tools/3d/zviewer/zviewer.cpp (100%)
 rename {code/nel => nel}/tools/3d/zviewer/zviewer.rc (100%)
 rename {code/nel => nel}/tools/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/build_gamedata/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/9_upload.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/a1_worldedit_data.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/all_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/all_install_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/b1_client_dev.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/b2_shard_data.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/c1_shard_patch.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/characters_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/configuration/scripts.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/configuration/tools.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/d1_client_patch.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/d2_client_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/executables_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/export_build_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/ecosystem_project_template/directories.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/ecosystem_project_template/process.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/generate_all.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/generate_ecosystem_projects.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/generate_simple_max_exporters.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/generate_tagged_max_exporters.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/anim.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/anim.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/clod.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/clod.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/cmb.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/ig.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/shape.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/skel.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/skel.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/swt.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/swt.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/veget.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/veget.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/zone.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/max_exporter_scripts/zone.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/interface_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/leveldesign_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/panoply_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/_dummy/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/_dummy/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/_dummy/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/_dummy/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ai_wmap/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ai_wmap/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ai_wmap/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ai_wmap/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/anim/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/anim/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/anim/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/anim/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/anim/maxscript/anim_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cartographer/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cartographer/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cartographer/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cartographer/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cegui/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cegui/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cegui/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/cegui/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/clodbank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/clodbank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/clodbank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/clodbank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/copy/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/copy/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/copy/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/copy/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/displace/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/displace/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/displace/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/displace/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/farbank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/farbank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/farbank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/farbank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/font/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/font/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/font/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/font/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig/maxscript/ig_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig_light/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig_light/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig_light/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ig_light/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/interface/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/interface/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/interface/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/interface/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ligo/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ligo/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ligo/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ligo/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/map/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/map/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/map/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/map/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim_list/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim_list/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim_list/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pacs_prim_list/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/properties/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/properties/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/properties/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/properties/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ps/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ps/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ps/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/ps/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pz/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pz/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pz/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/pz/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/rbank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/rbank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/rbank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/rbank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/samplebank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/samplebank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/samplebank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/samplebank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/shape/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/shape/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/shape/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/shape/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/shape/maxscript/shape_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheet_id/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheet_id/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheet_id/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheet_id/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets_shard/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets_shard/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets_shard/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sheets_shard/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sign/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sign/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sign/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sign/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/skel/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/skel/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/skel/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/skel/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/skel/maxscript/skel_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/smallbank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/smallbank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/smallbank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/smallbank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sound/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sound/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sound/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/sound/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/soundbank/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/soundbank/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/soundbank/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/soundbank/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/swt/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/swt/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/swt/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/swt/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/swt/maxscript/swt_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/tiles/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/tiles/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/tiles/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/tiles/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/veget/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/veget/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/veget/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/veget/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/veget/maxscript/veget_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/vegetset/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/vegetset/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/vegetset/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/vegetset/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/maxscript/zone_export.ms (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/todo_build_dependencies (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone/todo_export_maxscript (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone_light/0_setup.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone_light/1_export.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone_light/2_build.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone_light/3_install.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/processes/zone_light/todo_patch_tile_water (100%)
 rename {code/nel => nel}/tools/build_gamedata/sky_dev.bat (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/README.md (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/a1_make_phrase_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/a2_merge_phrase_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/a3_make_clause_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/a4_merge_clause_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/b1_make_words_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/b2_merge_words_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/c1_make_string_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/c2_merge_string_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/d1_make_botnames_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/d2_merge_botnames_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/e1_clean_string_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/e2_clean_words_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/e3_clean_clause_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/e4_clean_phrase_diff.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/make_merge_all.py (100%)
 rename {code/nel => nel}/tools/build_gamedata/translation/make_merge_wk.py (100%)
 rename {code/nel => nel}/tools/georges/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/georges/georges2csv/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/georges/georges2csv/georges2csv.cpp (100%)
 rename {code/nel => nel}/tools/georges/georges2csv/test.script (100%)
 rename {code/nel => nel}/tools/ligo/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/ligo/unbuild_land/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/ligo/unbuild_land/gold_pill.ico (100%)
 rename {code/nel => nel}/tools/ligo/unbuild_land/main.rc (100%)
 rename {code/nel => nel}/tools/ligo/unbuild_land/unbuild_land.cpp (100%)
 rename {code/nel => nel}/tools/logic/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ChildFrm.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ChildFrm.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/Condition.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/Condition.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ConditionPage.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ConditionPage.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ConditionsView.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ConditionsView.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/Counter.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/Counter.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/CounterPage.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/CounterPage.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/EditorFormView.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/EditorFormView.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/EditorPropertySheet.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/EditorPropertySheet.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/LogicTreeView.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/LogicTreeView.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/MainFrm.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/MainFrm.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/NumEdit.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/NumEdit.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ResizablePage.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ResizablePage.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ResizableSheet.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/ResizableSheet.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/State.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/State.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StatePage.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StatePage.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StatesView.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StatesView.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/StdAfx.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/TMenu.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/TMenu.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/VariablePage.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/VariablePage.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor.rc (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editorDoc.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editorDoc.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editorView.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editorView.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor_debug.def (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor_debug_fast.def (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor_interface.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor_release.def (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/logic_editor_release_debug.def (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/res/Toolbar.bmp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/res/logic_editor.ico (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/res/logic_editor.rc2 (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/res/logic_editorDoc.ico (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_dll/resource.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/StdAfx.h (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/logic_editor_exe.cpp (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/main.rc (100%)
 rename {code/nel => nel}/tools/logic/logic_editor_exe/red_pill.ico (100%)
 rename {code/nel => nel}/tools/memory/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/memory/memlog/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/memory/memlog/memlog.cpp (100%)
 rename {code/nel => nel}/tools/misc/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/bnp_make/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/bnp_make/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/bnp_make/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/bnp_make/main.rc (100%)
 rename {code/nel => nel}/tools/misc/bnp_make_qt/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/bnp_make_qt/main.h (100%)
 rename {code/nel => nel}/tools/misc/bnp_make_qt/mainwindow.cpp (100%)
 rename {code/nel => nel}/tools/misc/bnp_make_qt/mainwindow.h (100%)
 rename {code/nel => nel}/tools/misc/bnp_make_qt/mainwindow.ui (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/StdAfx.h (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcher.cpp (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcher.h (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcher.rc (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcherDlg.cpp (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcherDlg.h (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/branch_patcher_install.reg (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/res/branch_patcher.rc2 (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/res/nevrax_pill_3d_rgba.ico (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/resource.h (100%)
 rename {code/nel => nel}/tools/misc/branch_patcher/version.rc2 (100%)
 rename {code/nel => nel}/tools/misc/crash_report/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report.cpp (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report.rc (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_data.h (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_socket.cpp (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_socket.h (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_widget.cpp (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_widget.h (100%)
 rename {code/nel => nel}/tools/misc/crash_report/crash_report_widget.ui (100%)
 rename {code/nel => nel}/tools/misc/crash_report/nevraxpill.ico (100%)
 rename {code/nel => nel}/tools/misc/crash_report/resources.qrc (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/Resource.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/StdAfx.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/config.cfg (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/data_mirror.cpp (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/data_mirror.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/data_mirror.rc (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/data_mirrorDlg.cpp (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/data_mirrorDlg.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/my_list_ctrl.cpp (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/my_list_ctrl.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/progress_dialog.cpp (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/progress_dialog.h (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/res/data_mirror.ico (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/res/data_mirror.rc2 (100%)
 rename {code/nel => nel}/tools/misc/data_mirror/version.rc2 (100%)
 rename {code/nel => nel}/tools/misc/disp_sheet_id/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/disp_sheet_id/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/exec_timeout/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/exec_timeout/exec_timeout.cpp (100%)
 rename {code/nel => nel}/tools/misc/exec_timeout/main.rc (100%)
 rename {code/nel => nel}/tools/misc/exec_timeout/yellow_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/extract_filename/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/extract_filename/extract_filename.cpp (100%)
 rename {code/nel => nel}/tools/misc/lock/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/lock/lock.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/FilterDialog.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/FilterDialog.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/LogSessions.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/LogSessions.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/PlugInSelector.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/PlugInSelector.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/StdAfx.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/ViewDialog.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/ViewDialog.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/log_analyser.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/log_analyser.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/log_analyser.rc (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/log_analyserDlg.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/log_analyserDlg.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/res/log_analyser.ico (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/res/log_analyser.rc2 (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/resource.h (100%)
 rename {code/nel => nel}/tools/misc/log_analyser/version.rc2 (100%)
 rename {code/nel => nel}/tools/misc/log_analyser_plug_ins/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/log_analyser_plug_ins/extract_warnings/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp (100%)
 rename {code/nel => nel}/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.def (100%)
 rename {code/nel => nel}/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h (100%)
 rename {code/nel => nel}/tools/misc/make_sheet_id/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/make_sheet_id/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/make_sheet_id/main.rc (100%)
 rename {code/nel => nel}/tools/misc/make_sheet_id/make_sheet_id.cfg (100%)
 rename {code/nel => nel}/tools/misc/make_sheet_id/make_sheet_id.cpp (100%)
 rename {code/nel => nel}/tools/misc/message_box/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/message_box/main.rc (100%)
 rename {code/nel => nel}/tools/misc/message_box/message_box.cpp (100%)
 rename {code/nel => nel}/tools/misc/message_box/message_box.h (100%)
 rename {code/nel => nel}/tools/misc/message_box/yellow_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/message_box_qt/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/message_box_qt/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/message_box_qt/main.rc (100%)
 rename {code/nel => nel}/tools/misc/message_box_qt/yellow_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/resource.h (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/setup.ico (100%)
 rename {code/nel => nel}/tools/misc/multi_cd_setup_fix/version.rc2 (100%)
 rename {code/nel => nel}/tools/misc/probe_timers/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/probe_timers/gold_pill.ico (100%)
 rename {code/nel => nel}/tools/misc/probe_timers/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/probe_timers/main.rc (100%)
 rename {code/nel => nel}/tools/misc/snp_make/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/snp_make/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/words_dic/DicSplashScreen.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic/DicSplashScreen.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic/StdAfx.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic/res/words_dic.ico (100%)
 rename {code/nel => nel}/tools/misc/words_dic/res/words_dic.rc2 (100%)
 rename {code/nel => nel}/tools/misc/words_dic/resource.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic/version.rc2 (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dic.cfg (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dic.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dic.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dic.rc (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dicDlg.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic/words_dicDlg.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/main.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/nel.png (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/resource.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dic.cfg (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dic.ico (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dic.rc (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dicDlg.cpp (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dicDlg.h (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dic_Qt.qrc (100%)
 rename {code/nel => nel}/tools/misc/words_dic_qt/words_dic_Qt.ui (100%)
 rename {code/nel => nel}/tools/misc/xml_packer/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/misc/xml_packer/xml_packer.cpp (100%)
 rename {code/nel => nel}/tools/nel_unit_test/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/nel_unit_test/nel_unit_test.cpp (100%)
 rename {code/nel => nel}/tools/nel_unit_test/run_test.bat (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_ligo.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_ligo_primitive.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_base64.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_co_task.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_command.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_common.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_config_file.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_debug.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_dynlibload.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_file.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_bad_test.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_define.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_error.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_error_main.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_include.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_include_and_optional.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/cfg_with_optional.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/file1_in_bnp.txt (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/file2_in_bnp.txt (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files.bnp (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/.xml_pack_index (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file1_in_sub_1.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file2_in_sub_1.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/samename.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/.xml_pack_index (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file1_in_sub_2.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file2_in_sub_2.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/samename.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/included_cfg.cfg (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/xml_files/file1_in_xml_pack.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/xml_files/file2_in_xml_pack.xml (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_1/samename/samename.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_2/samename/samename.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_files/xml_files/xml_files.xml_pack (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_pack_file.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_singleton.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_sstring.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_stream.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_string_common.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_types.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_misc_variable.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_net.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_net_layer3.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_net_message.h (100%)
 rename {code/nel => nel}/tools/nel_unit_test/ut_net_module.h (100%)
 rename {code/nel => nel}/tools/pacs/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/pacs/build_ig_boxes/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/pacs/build_ig_boxes/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/pacs/build_ig_boxes/build_ig_boxes.cfg (100%)
 rename {code/nel => nel}/tools/pacs/build_ig_boxes/main.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_ig_boxes/main.rc (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/build_indoor_rbank.cfg (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/build_surfaces.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/build_surfaces.h (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/main.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/main.rc (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/mouline.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_indoor_rbank/mouline.h (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/build_rbank.cfg (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/build_rbank.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/build_rbank.h (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/build_surf.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/build_surf.h (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/main.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/main.rc (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/prim_checker.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/prim_checker.h (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/surface_splitter.cpp (100%)
 rename {code/nel => nel}/tools/pacs/build_rbank/surface_splitter.h (100%)
 rename {code/nel => nel}/tools/sound/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/build_samplebank.cpp (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/build_samplebank_readme.txt (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/build_samplebank_script.bat (100%)
 rename {code/nel => nel}/tools/sound/build_samplebank/main.rc (100%)
 rename {code/nel => nel}/tools/sound/build_sound/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/sound/build_sound/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/sound/build_sound/build_sound.cpp (100%)
 rename {code/nel => nel}/tools/sound/build_sound/build_sound_readme.txt (100%)
 rename {code/nel => nel}/tools/sound/build_sound/build_sound_script.bat (100%)
 rename {code/nel => nel}/tools/sound/build_sound/main.rc (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/CMakeLists.txt (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/blue_pill.ico (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/build_soundbank.cpp (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/build_soundbank_readme.txt (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/build_soundbank_script.bat (100%)
 rename {code/nel => nel}/tools/sound/build_soundbank/main.rc (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/SoundPage.cpp (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/SoundPage.h (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/StdAfx.cpp (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/StdAfx.h (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/file_dialog.cpp (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/file_dialog.h (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/resource.h (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/source_sounds_builder.cpp (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/source_sounds_builder.h (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/source_sounds_builder.rc (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/source_sounds_builderDlg.cpp (100%)
 rename {code/nel => nel}/tools/sound/source_sounds_builder/source_sounds_builderDlg.h (100%)
 rename code/nelDashBuild.cmd => nelDashBuild.cmd (100%)
 rename code/nelDashBuild.sh => nelDashBuild.sh (100%)
 rename {code/nelns => nelns}/AUTHORS (100%)
 rename {code/nelns => nelns}/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/CMakePackaging.txt (100%)
 rename {code/nelns => nelns}/COPYING (100%)
 rename {code/nelns => nelns}/ChangeLog (100%)
 rename {code/nelns => nelns}/INSTALL (100%)
 rename {code/nelns => nelns}/NEWS (100%)
 rename {code/nelns => nelns}/README (100%)
 rename {code/nelns => nelns}/admin/config.php (100%)
 rename {code/nelns => nelns}/admin/public_html/admin.php (100%)
 rename {code/nelns => nelns}/admin/public_html/authenticate.php (100%)
 rename {code/nelns => nelns}/admin/public_html/backup_interface.php (100%)
 rename {code/nelns => nelns}/admin/public_html/commands.php (100%)
 rename {code/nelns => nelns}/admin/public_html/custom_view.php (100%)
 rename {code/nelns => nelns}/admin/public_html/disp_vars.php (100%)
 rename {code/nelns => nelns}/admin/public_html/display_view.php (100%)
 rename {code/nelns => nelns}/admin/public_html/foo.php (100%)
 rename {code/nelns => nelns}/admin/public_html/help.php (100%)
 rename {code/nelns => nelns}/admin/public_html/html_headers.php (100%)
 rename {code/nelns => nelns}/admin/public_html/index.php (100%)
 rename {code/nelns => nelns}/admin/public_html/init.php (100%)
 rename {code/nelns => nelns}/admin/public_html/las_connection.php (100%)
 rename {code/nelns => nelns}/admin/public_html/las_interface.php (100%)
 rename {code/nelns => nelns}/admin/public_html/login_form.php (100%)
 rename {code/nelns => nelns}/admin/public_html/nel.gif (100%)
 rename {code/nelns => nelns}/admin/public_html/player_locator.php (100%)
 rename {code/nelns => nelns}/admin/public_html/prefs.php (100%)
 rename {code/nelns => nelns}/admin/public_html/request_interface.php (100%)
 rename {code/nelns => nelns}/admin/public_html/session_auth.php (100%)
 rename {code/nelns => nelns}/admin/public_html/sql_connection.php (100%)
 rename {code/nelns => nelns}/admin/public_html/update_daily.php (100%)
 rename {code/nelns => nelns}/admin_executor_service/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/admin_executor_service/admin_executor_service.cfg (100%)
 rename {code/nelns => nelns}/admin_executor_service/admin_executor_service.cpp (100%)
 rename {code/nelns => nelns}/admin_executor_service/common.cfg (100%)
 rename {code/nelns => nelns}/admin_executor_service/log_report.cpp (100%)
 rename {code/nelns => nelns}/admin_executor_service/log_report.h (100%)
 rename {code/nelns => nelns}/admin_service/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/admin_service/admin_service.cfg (100%)
 rename {code/nelns => nelns}/admin_service/admin_service.cpp (100%)
 rename {code/nelns => nelns}/admin_service/admin_service.h (100%)
 rename {code/nelns => nelns}/admin_service/common.cfg (100%)
 rename {code/nelns => nelns}/admin_service/connection_web.cpp (100%)
 rename {code/nelns => nelns}/admin_service/connection_web.h (100%)
 rename {code/nelns => nelns}/login_service/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/login_service/common.cfg (100%)
 rename {code/nelns => nelns}/login_service/connection_client.cpp (100%)
 rename {code/nelns => nelns}/login_service/connection_client.h (100%)
 rename {code/nelns => nelns}/login_service/connection_web.cpp (100%)
 rename {code/nelns => nelns}/login_service/connection_web.h (100%)
 rename {code/nelns => nelns}/login_service/connection_ws.cpp (100%)
 rename {code/nelns => nelns}/login_service/connection_ws.h (100%)
 rename {code/nelns => nelns}/login_service/login_service.cfg (100%)
 rename {code/nelns => nelns}/login_service/login_service.cpp (100%)
 rename {code/nelns => nelns}/login_service/login_service.h (100%)
 rename {code/nelns => nelns}/login_service/mysql_helper.cpp (100%)
 rename {code/nelns => nelns}/login_service/mysql_helper.h (100%)
 rename {code/nelns => nelns}/login_system/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/connection.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/connection.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/main.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/nel_launcher.cfg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/nel_launcher_dlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/nel_launcher_dlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/nel_launcher_dlg.ui (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_qt/shard.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/StdAfx.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/StdAfx.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcher.cfg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcher.clw (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcher.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcher.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcher.rc (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcherDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/nel_launcherDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/patch.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/patch.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/pleasewait.html (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/res/nel_launcher.ico (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/res/nel_launcher.rc2 (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/resource.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/webbrowser2.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows/webbrowser2.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/BarTabsWnd.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/BarTabsWnd.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/BarWnd.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/BarWnd.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/Configuration.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/Configuration.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/LoadingPageDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/LoadingPageDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/LoginDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/LoginDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/Md5.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/Md5.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/MsgDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/MsgDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/PictureHlp.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/PictureHlp.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/ProgressDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/ProgressDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/StdAfx.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/StdAfx.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/WebDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/WebDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcher.cfg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcher.clw (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcher.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcher.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcher.rc (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcherDlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/nel_launcherDlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/patch.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/patch.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/background.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/barre_top.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bg_login.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bitmap1.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bitmap2.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bitmap3.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bmp00001.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bmp00002.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/bmp00003.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/btn_login_down.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/btn_login_up.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/btn_quit_down.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/btn_quit_up.bmp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/cursor1.cur (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/nel_launcher.rc2 (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/progress.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/ryzom.ico (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_news.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_news_focus.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_rn.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_rn_focus.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_servers.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/res/tab_servers_focus.jpg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/resource.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/webbrowser2.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext/webbrowser2.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/connection.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/connection.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher.cfg (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher.rc (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/patch.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/patch.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/res/nel_launcher.ico (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/res/nel_launcher.rc2 (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/resource.h (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/std_afx.cpp (100%)
 rename {code/nelns => nelns}/login_system/nel_launcher_windows_ext2/std_afx.h (100%)
 rename {code/nelns => nelns}/login_system/www/config.php (100%)
 rename {code/nelns => nelns}/login_system/www/public_html/index.php (100%)
 rename {code/nelns => nelns}/login_system/www/public_html/service_connection.php (100%)
 rename {code/nelns => nelns}/naming_service/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/naming_service/common.cfg (100%)
 rename {code/nelns => nelns}/naming_service/naming_service.cfg (100%)
 rename {code/nelns => nelns}/naming_service/naming_service.cpp (100%)
 rename {code/nelns => nelns}/resources/custom.ini (100%)
 rename {code/nelns => nelns}/resources/nel.bmp (100%)
 rename {code/nelns => nelns}/resources/nel.png (100%)
 rename {code/nelns => nelns}/resources/nevraxpill.ico (100%)
 rename {code/nelns => nelns}/welcome_service/CMakeLists.txt (100%)
 rename {code/nelns => nelns}/welcome_service/common.cfg (100%)
 rename {code/nelns => nelns}/welcome_service/welcome_service.cfg (100%)
 rename {code/nelns => nelns}/welcome_service/welcome_service.cpp (100%)
 rename {code/nelns => nelns}/welcome_service/welcome_service.h (100%)
 rename {code/nelns => nelns}/welcome_service/welcome_service_itf.cpp (100%)
 rename {code/nelns => nelns}/welcome_service/welcome_service_itf.h (100%)
 rename {code/personal => personal}/README.md (100%)
 rename {code/ryzom => ryzom}/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/COPYING (100%)
 rename {code/ryzom => ryzom}/client/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/client/macosx/Info.plist (100%)
 rename {code/ryzom => ryzom}/client/macosx/PkgInfo (100%)
 rename {code/ryzom => ryzom}/client/macosx/ryzom.entitlements (100%)
 rename {code/ryzom => ryzom}/client/macosx/ryzom.icns (100%)
 rename {code/ryzom => ryzom}/client/src/3d_notes.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/3d_notes.h (100%)
 rename {code/ryzom => ryzom}/client/src/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/client/src/actions.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/actions.h (100%)
 rename {code/ryzom => ryzom}/client/src/actions_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/actions_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/animated_scene_object.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animated_scene_object.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_id_array.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_id_array.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_misc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_misc.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_fx_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_misc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_misc.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_set.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_set.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_state.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/animation_state.h (100%)
 rename {code/ryzom => ryzom}/client/src/animation_type.h (100%)
 rename {code/ryzom => ryzom}/client/src/app_bundle_utils.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/app_bundle_utils.h (100%)
 rename {code/ryzom => ryzom}/client/src/attached_fx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/attached_fx.h (100%)
 rename {code/ryzom => ryzom}/client/src/attack.h (100%)
 rename {code/ryzom => ryzom}/client/src/attack_info.h (100%)
 rename {code/ryzom => ryzom}/client/src/attack_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/attack_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/auto_anim.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/auto_anim.h (100%)
 rename {code/ryzom => ryzom}/client/src/behaviour_context.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/behaviour_context.h (100%)
 rename {code/ryzom => ryzom}/client/src/bg_downloader_access.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/bg_downloader_access.h (100%)
 rename {code/ryzom => ryzom}/client/src/browse_faq.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/browse_faq.h (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/EmailDlg.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/EmailDlg.h (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/bug_report.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/bug_report.h (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/bug_report.rc (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/bug_reportDlg.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/bug_reportDlg.h (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/res/bug_report.ico (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/res/bug_report.rc2 (100%)
 rename {code/ryzom => ryzom}/client/src/bug_report/resource.h (100%)
 rename {code/ryzom => ryzom}/client/src/camera.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/camera.h (100%)
 rename {code/ryzom => ryzom}/client/src/camera_recorder.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/camera_recorder.h (100%)
 rename {code/ryzom => ryzom}/client/src/candidate.h (100%)
 rename {code/ryzom => ryzom}/client/src/cdb_synchronised.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/cdb_synchronised.h (100%)
 rename {code/ryzom => ryzom}/client/src/character_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/character_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client.rc (100%)
 rename {code/ryzom => ryzom}/client/src/client_cfg.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_cfg.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_chat_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_chat_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_fx_set_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_fx_set_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_fx_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_fx_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_set_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/animation_set_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_id_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_id_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/attack_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/automaton_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/automaton_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/body_to_bone_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/body_to_bone_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/building_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/building_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/character_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/character_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/client_sheets.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/client_sheets.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/continent_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/continent_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/emot_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/emot_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/entity_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/entity_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/faction_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/faction_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/flora_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/flora_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/forage_source_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/forage_source_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/fx_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/fx_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/fx_stick_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/fx_stick_mode.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/ground_fx_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/ground_fx_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/id_to_string_array.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/id_to_string_array.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/item_fx_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/item_fx_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/item_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/item_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/light_cycle_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/light_cycle_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/mission_icon_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/mission_icon_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/mission_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/mission_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_building_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_building_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_squad_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/outpost_squad_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/pact_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/pact_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/plant_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/plant_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/player_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/player_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/race_stats_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/race_stats_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sbrick_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sbrick_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/skills_tree_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/skills_tree_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sky_object_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sky_object_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sky_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sky_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sphrase_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/sphrase_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/stdpch.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/success_table_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/success_table_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/text_emot_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/text_emot_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/unblock_titles_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/unblock_titles_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/village_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/village_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/weather_function_params_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/weather_function_params_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/weather_setup_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/weather_setup_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/world_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/client_sheets/world_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/color_slot_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/color_slot_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/commands.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/commands.h (100%)
 rename {code/ryzom => ryzom}/client/src/connection.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/connection.h (100%)
 rename {code/ryzom => ryzom}/client/src/contextual_cursor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/contextual_cursor.h (100%)
 rename {code/ryzom => ryzom}/client/src/continent.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/continent.h (100%)
 rename {code/ryzom => ryzom}/client/src/continent_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/continent_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/continent_manager_build.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/continent_manager_build.h (100%)
 rename {code/ryzom => ryzom}/client/src/cursor_functions.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/cursor_functions.h (100%)
 rename {code/ryzom => ryzom}/client/src/custom_matrix.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/custom_matrix.h (100%)
 rename {code/ryzom => ryzom}/client/src/debug_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/debug_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/decal.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/decal.h (100%)
 rename {code/ryzom => ryzom}/client/src/decal_anim.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/decal_anim.h (100%)
 rename {code/ryzom => ryzom}/client/src/demo.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/demo.h (100%)
 rename {code/ryzom => ryzom}/client/src/door_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/door_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/dummy_progress.h (100%)
 rename {code/ryzom => ryzom}/client/src/entities.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/entities.h (100%)
 rename {code/ryzom => ryzom}/client/src/entity_animation_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/entity_animation_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/entity_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/entity_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/entity_fx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/entity_fx.h (100%)
 rename {code/ryzom => ryzom}/client/src/error_logo.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/events_listener.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/events_listener.h (100%)
 rename {code/ryzom => ryzom}/client/src/faction_war_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/faction_war_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/far_tp.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/far_tp.h (100%)
 rename {code/ryzom => ryzom}/client/src/fix_season_data.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/fix_season_data.h (100%)
 rename {code/ryzom => ryzom}/client/src/fog_map.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/fog_map.h (100%)
 rename {code/ryzom => ryzom}/client/src/forage_source_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/forage_source_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/fx_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/fx_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/fx_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/fx_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/gabarit.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/gabarit.h (100%)
 rename {code/ryzom => ryzom}/client/src/game_context_menu.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/game_context_menu.h (100%)
 rename {code/ryzom => ryzom}/client/src/gateway_fec_transport.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/global.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/global.h (100%)
 rename {code/ryzom => ryzom}/client/src/graph.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/graph.h (100%)
 rename {code/ryzom => ryzom}/client/src/graphic.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/graphic.h (100%)
 rename {code/ryzom => ryzom}/client/src/ground_fx_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ground_fx_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/hair_set.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/hair_set.h (100%)
 rename {code/ryzom => ryzom}/client/src/ig_callback.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ig_callback.h (100%)
 rename {code/ryzom => ryzom}/client/src/ig_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ig_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/ig_enum.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ig_enum.h (100%)
 rename {code/ryzom => ryzom}/client/src/ig_season_callback.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ig_season_callback.h (100%)
 rename {code/ryzom => ryzom}/client/src/impulse_decoder.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/impulse_decoder.h (100%)
 rename {code/ryzom => ryzom}/client/src/ingame_database_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ingame_database_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/init.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/init.h (100%)
 rename {code/ryzom => ryzom}/client/src/init_main_loop.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/init_main_loop.h (100%)
 rename {code/ryzom => ryzom}/client/src/input.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/input.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_debug.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_edit.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_game.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_help.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_help.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_item.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_item.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_misc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_misc.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_move.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_outpost.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_phrase.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_tools.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_tools.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_handler_ui.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_phrase_faber.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/action_phrase_faber.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/add_on_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/add_on_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/animal_position_state.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/animal_position_state.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bar_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bar_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bonus_malus.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bonus_malus.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_all.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_all.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_create_guild.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_create_guild.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_dynamic_mission.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_mission.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_mission.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_mission_end.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_mission_end.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_news.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_news.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_player_gift.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_player_gift.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_ring_sessions.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_ring_sessions.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_trade.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/bot_chat_page_trade.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/brick_learned_callback.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/brick_learned_callback.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/character_3d.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/character_3d.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_displayer.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_displayer.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_filter.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_filter.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_text_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_text_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_window.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/chat_window.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbctrl_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbctrl_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_build_phrase.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_build_phrase.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_mission.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_mission.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_text_share.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_trade.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/dbgroup_list_sheet_trade.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/encyclopedia_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/encyclopedia_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/filtered_chat_summary.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/filtered_chat_summary.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/flying_text_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/flying_text_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_career.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_career.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_compas.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_compas.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_cs.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_cs.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_forum.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_forum.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_mail.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_mail.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_qcm.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_qcm.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_webig.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_html_webig.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene_bubble.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene_bubble.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene_user_info.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_in_scene_user_info.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_map.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_map.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_modal_get_key.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_modal_get_key.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_phrase_skill_filter.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_phrase_skill_filter.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_quick_help.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_quick_help.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_skills.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/group_skills.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/guild_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/guild_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/input_handler_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/input_handler_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_3d_scene.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_3d_scene.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_config.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_config.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_ddx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_ddx.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_expr_user_fct_game.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_expr_user_fct_items.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_observer.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_observer.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_options_ryzom.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_options_ryzom.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/interface_pointer.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/inventory_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/inventory_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/item_consumable_effect.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/item_consumable_effect.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/item_info_waiter.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/item_special_effect.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/item_special_effect.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/list_sheet_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/list_sheet_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/lua_dll.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/lua_dll.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/lua_ihm_ryzom.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/lua_ihm_ryzom.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/macrocmd_key.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/macrocmd_key.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/macrocmd_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/macrocmd_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/music_player.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/music_player.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/obs_huge_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/obs_huge_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/parser_modules.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/parser_modules.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/people_interraction.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/people_interraction.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/people_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/people_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/player_trade.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/player_trade.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/register_interface_elements.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/register_interface_elements.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/req_skill_formula.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/req_skill_formula.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/sbrick_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/sbrick_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/skill_change_callback.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/skill_change_callback.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/skill_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/skill_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/sphrase_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/sphrase_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/task_bar_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/task_bar_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/trade_common.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/trade_common.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_bitmap_faber_mp.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_bitmap_faber_mp.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_bitmap_progress.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_bitmap_progress.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_pointer_ryzom.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_pointer_ryzom.h (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_radar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interface_v3/view_radar.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/bitmap.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/bitmap.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/bitmap_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/bitmap_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/brick_control.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/brick_control.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/brick_receptacle.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/brick_receptacle.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/button.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/button.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/button_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/button_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/candidate_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/candidate_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/capture.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/capture.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/casting_bar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/casting_bar.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/chat_control.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/chat_control.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/chat_input.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/chat_input.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/choice_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/choice_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/control.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/control.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/control_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/control_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/horizontal_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/horizontal_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interf_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interf_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interf_script.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interf_script.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interfaces_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/interfaces_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/multi_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/multi_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/osd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/osd.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/osd_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/osd_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/pen.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/pen.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/progress_bar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/progress_bar.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/radio_button.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/radio_button.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/radio_controller.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/radio_controller.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/scroll_bar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/scroll_bar.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/scrollable_control.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/scrollable_control.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/spell_control.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/spell_control.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/spell_list.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/spell_list.h (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/text.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/interfaces_manager/text.h (100%)
 rename {code/ryzom => ryzom}/client/src/item_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/item_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/item_group_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/item_group_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/landscape_poly_drawer.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/landscape_poly_drawer.h (100%)
 rename {code/ryzom => ryzom}/client/src/light_cycle_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/light_cycle_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/lod_character_user_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lod_character_user_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/login.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/login.h (100%)
 rename {code/ryzom => ryzom}/client/src/login_patch.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/login_patch.h (100%)
 rename {code/ryzom => ryzom}/client/src/login_progress_post_thread.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/login_progress_post_thread.h (100%)
 rename {code/ryzom => ryzom}/client/src/login_xdelta.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/login_xdelta.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CoolBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/CoolMenu.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/FixTB.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/FlatBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/MenuBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/ModulVer.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/ShellPidl.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/ShellTree.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/Subclass.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/cj60/hyperlink.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/Accessor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/KeyWords.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/PropSet.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/SString.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/SciLexer.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/Scintilla.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/ScintillaWidget.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/include/scintilla/WindowAccessor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60Lib.rc (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.def (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolMenu.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FixTB.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FlatBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/MenuBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ModulVer.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellPidl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellTree.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Subclass.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/readme.txt (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_arro.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_explorer.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/button_images.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj60lib.rc2 (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj_logo.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/hsplitba.cur (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/vsplitba.cur (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/resource.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeCtrl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/DebuggerMessages.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/HelloWorld.lua (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Project.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/Project.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/columntreectrl.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.rc (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/HelloWorld.lua (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/LuaDoc.ico (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/Toolbar.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.ico (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.rc2 (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_file.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_tab.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/resource.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/Ide2/test.lpr (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide2_dll.def (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide_interface.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/Readme.txt (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/libapi.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/libapi.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/libapi/libapi.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Document.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Document.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/KeyWords.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexAVE.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexAda.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexBullant.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexConf.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexCrontab.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexEiffel.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexHTML.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexLisp.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexLua.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexMatlab.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexOthers.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexPascal.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexPerl.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexPython.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexRuby.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexSQL.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LexVB.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Margin.cur (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/PropSet.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/SVector.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ScintRes.rc (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Style.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/Style.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/WindowAccessor.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/Margin.cur (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatWin.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatformRes.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintRes.rc (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintillaWin.cxx (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/lauxlib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/lbaselib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/ldblib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/liolib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/lmathlib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/loadlib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/lstrlib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/standard/ltablib.c (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/stdlib/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test.lua (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test2.lua (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/resource.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/small.ico (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.h (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.ico (100%)
 rename {code/ryzom => ryzom}/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.rc (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop.h (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_debug.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_debug.h (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_temp.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_temp.h (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_utilities.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/main_loop_utilities.h (100%)
 rename {code/ryzom => ryzom}/client/src/mesh_camera_col_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/mesh_camera_col_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/micro_life_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/micro_life_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/misc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/misc.h (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/ai_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/death_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/free_head.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/interface_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/mount_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/modes/third_mode.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/user_controls.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/motion/user_controls.h (100%)
 rename {code/ryzom => ryzom}/client/src/movie_shooter.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/movie_shooter.h (100%)
 rename {code/ryzom => ryzom}/client/src/net_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/net_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/network_connection.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/network_connection.h (100%)
 rename {code/ryzom => ryzom}/client/src/npc_icon.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/npc_icon.h (100%)
 rename {code/ryzom => ryzom}/client/src/outpost.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/outpost.h (100%)
 rename {code/ryzom => ryzom}/client/src/outpost_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/outpost_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/pacs_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/pacs_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/permanent_ban.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/permanent_ban.h (100%)
 rename {code/ryzom => ryzom}/client/src/ping.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/ping.h (100%)
 rename {code/ryzom => ryzom}/client/src/player_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/player_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/player_r2_cl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/player_r2_cl.h (100%)
 rename {code/ryzom => ryzom}/client/src/precipitation.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/precipitation.h (100%)
 rename {code/ryzom => ryzom}/client/src/precipitation_clip_grid.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/precipitation_clip_grid.h (100%)
 rename {code/ryzom => ryzom}/client/src/prim_file.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/prim_file.h (100%)
 rename {code/ryzom => ryzom}/client/src/profiling.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/profiling.h (100%)
 rename {code/ryzom => ryzom}/client/src/progress.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/progress.h (100%)
 rename {code/ryzom => ryzom}/client/src/projectile_desc.h (100%)
 rename {code/ryzom => ryzom}/client/src/projectile_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/projectile_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/property_decoder.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/property_decoder.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/auto_group.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/auto_group.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/config_var.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/config_var.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_base.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_base.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_lua.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_lua.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_property.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_activity_sequence.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_activity_sequence.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_entity.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_entity.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_group.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_group.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_road.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_road.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_shape.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/displayer_visual_shape.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/action_historic.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/action_historic.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/client_edition_module.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/client_edition_module.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/com_lua_module.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/com_lua_module.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/dmc.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/dmc.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/idmc.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/palette.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/palette.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/property_accessor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/dmc/property_accessor.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/ed_command.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/editor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/editor.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/entity_custom_select_box.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/entity_custom_select_box.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/entity_sorter.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/entity_sorter.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/instance.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/instance.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/instance_map_deco.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/instance_map_deco.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/island_collision.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/island_collision.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/lua_event_forwarder.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/lua_event_forwarder.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/mesh_array.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/mesh_array.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/npc_editor.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/npc_editor.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/object_factory_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/object_factory_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/palette_node.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/palette_node.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/prim_render.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/prim_render.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/r2_config.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/r2_config.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/r2_lua.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/r2_lua.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_choose_pos.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_choose_pos.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_choose_pos_lua.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_choose_pos_lua.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_create_entity.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_create_entity.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_draw_prim.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_draw_prim.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_draw_road.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_draw_road.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_maintained_action.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_maintained_action.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_new_vertex.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_new_vertex.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_pick.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_pick.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_select_move.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_select_move.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_select_rotate.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/tool_select_rotate.h (100%)
 rename {code/ryzom => ryzom}/client/src/r2/verbose_clock.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/r2/verbose_clock.h (100%)
 rename {code/ryzom => ryzom}/client/src/release.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/release.h (100%)
 rename {code/ryzom => ryzom}/client/src/resource.h (100%)
 rename {code/ryzom => ryzom}/client/src/rosace.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/rosace.h (100%)
 rename {code/ryzom => ryzom}/client/src/rosace_functions.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/rosace_functions.h (100%)
 rename {code/ryzom => ryzom}/client/src/ryzom.ico (100%)
 rename {code/ryzom => ryzom}/client/src/ryzom_small.ico (100%)
 rename {code/ryzom => ryzom}/client/src/scalable_time.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/scalable_time.h (100%)
 rename {code/ryzom => ryzom}/client/src/scene_parser.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/scene_parser.h (100%)
 rename {code/ryzom => ryzom}/client/src/session_browser.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/session_browser.h (100%)
 rename {code/ryzom => ryzom}/client/src/session_browser_impl.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/session_browser_impl.h (100%)
 rename {code/ryzom => ryzom}/client/src/sheet_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sheet_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/sky.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sky.h (100%)
 rename {code/ryzom => ryzom}/client/src/sky_material_setup.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sky_material_setup.h (100%)
 rename {code/ryzom => ryzom}/client/src/sky_object.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sky_object.h (100%)
 rename {code/ryzom => ryzom}/client/src/sky_render.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sky_render.h (100%)
 rename {code/ryzom => ryzom}/client/src/sound_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/sound_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/splash_screen.bmp (100%)
 rename {code/ryzom => ryzom}/client/src/stage.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/stage.h (100%)
 rename {code/ryzom => ryzom}/client/src/starting_roles.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/starting_roles.h (100%)
 rename {code/ryzom => ryzom}/client/src/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/stdpch.h (100%)
 rename {code/ryzom => ryzom}/client/src/steam_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/steam_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_entity.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_entity.h (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_entity_composite.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_entity_composite.h (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_ig.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/streamable_ig.h (100%)
 rename {code/ryzom => ryzom}/client/src/stremable_ig.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/string_manager_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/string_manager_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/teleport.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/teleport.h (100%)
 rename {code/ryzom => ryzom}/client/src/text_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/text_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/time_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/time_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/timed_fx_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/timed_fx_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/user_agent.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/user_agent.h (100%)
 rename {code/ryzom => ryzom}/client/src/user_entity.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/user_entity.h (100%)
 rename {code/ryzom => ryzom}/client/src/view.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/view.h (100%)
 rename {code/ryzom => ryzom}/client/src/village.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/village.h (100%)
 rename {code/ryzom => ryzom}/client/src/water_env_map_rdr.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/water_env_map_rdr.h (100%)
 rename {code/ryzom => ryzom}/client/src/water_map.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/water_map.h (100%)
 rename {code/ryzom => ryzom}/client/src/weather.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/weather.h (100%)
 rename {code/ryzom => ryzom}/client/src/weather_manager_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/weather_manager_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/weather_setup_client.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/weather_setup_client.h (100%)
 rename {code/ryzom => ryzom}/client/src/world_database_manager.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/world_database_manager.h (100%)
 rename {code/ryzom => ryzom}/client/src/zone_util.cpp (100%)
 rename {code/ryzom => ryzom}/client/src/zone_util.h (100%)
 rename {code/ryzom => ryzom}/client/unix/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_128x128.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_16x16.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_22x22.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_24x24.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_256x256.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_32x32.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_48x48.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_64x64.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_client.desktop.in (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_client.png (100%)
 rename {code/ryzom => ryzom}/client/unix/ryzom_client.xpm (100%)
 rename {code/ryzom => ryzom}/common/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/add_compass.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/ai_event.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/bot_chat.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/buy.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/cast.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/craft.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_set.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_table.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/depositzone.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/destroy_item.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/do_mission.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/dyn_answer.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/escort.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/fail.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/forage.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_item.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_money.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/group_fauna.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/item_guidelines.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/jump_to.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/keywords.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/kill.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/learn_action.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_continue.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_fail.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_retry.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/loot.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/mission_tree.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/no_answer.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_bot.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_event_handler_action.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group_parameters.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/people.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/population.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/popup_msg.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/pre_requisite.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_faction_point.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_fame.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_item.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_money.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_xp.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/rite_nomenclature_guidelines.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/script_guidelines.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/sell.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/set_constrains.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/skill.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/spawn_mission.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_any.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_dyn_chat.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_failure.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_if.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_ooo.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/system_msg.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/talk_to.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/target.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_destination.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_spawn_zone.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_trigger.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/text_guidelines.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/user_model.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_creature.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_faction.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_group.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_item.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_npc.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_place.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quality.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quantity.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_text.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/class_doc/visit.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/fyros.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/matis.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/nexus.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/prime_root.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/tryker.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/continents/zorai.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/bandit.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/civil.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/degen.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/fauna.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_carnivore.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_herbivore.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/flora.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/goo.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/kami.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/karavan.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/kitin.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/kitin_invasion.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/mp.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ancient_dryads.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_antikamis.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_barkers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_beachcombers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_black_circle.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cholorogoos.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cockroaches.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_company_of_the_eternal_tree.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_corsair.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cute.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_darkening_sap.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_dune_riders.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ecowarriors.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_firebrands.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_first_deserter.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar_hunters.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_gibbay.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_goo_heads.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_green_seed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_hamazans_of_the_dead_seed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_icon_workshipers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_keepers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_kitin_gatheres.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lagoon_brothers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lawless.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_leviers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_master_of_the_goo.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_matisian_border_guards.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_night_turners.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_oasis_diggers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_pyromancers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_recoverers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_renegades.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_restorers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_root_tappers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sacred_sap.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_gleaners.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_slaves.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_scorchers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_shadow_runners.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_siblings_of_the_weeds.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_silt_sculptors.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_slavers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_smuglers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_arid_matis.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_kuilde.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_slash_and_burn.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_tutors.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_water_breakers.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_woven_bridles.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_carn.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_cute_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_degen.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_frahar_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_gibbai_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_goo_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_herb.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_plant.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_carn.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_cute_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_degen.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_frahar_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_gibbai_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_goo_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_herb.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin_invasion.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_spawn.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/begin_state.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/code.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if_else.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/despawn.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/doxygen.css (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/emot.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/modify_variable.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/multi_actions.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/null_action.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/outpost_giver_ready.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select_state.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/say.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/send_message.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_fauna_activity.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_flags_on_dyn_zones.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_state_timeout.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t0.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t1.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t2.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t3.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/sit_down.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/spawn.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/stand_up.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_0.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_1.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_2.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_3.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_4.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_5.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_6.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_7.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_8.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_9.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/bandit.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/escorted.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard_escorted.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/no_change.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/normal.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/follow_route.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/idle.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_start_point.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_vertices.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wait.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wander.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_leader.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_escorted.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_with_team.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_place.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_team.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/unspawned.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_arrived_from_stable.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_gone_to_stable.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_npcs_present.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_players_present.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_begin_fight.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_killed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_target_killed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_all.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_first.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/egs_up.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/end_of_state.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_away.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_back.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_attack_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_despawned.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_eliminated.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_under_attack.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_enters_view.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_meets_team.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_attacker_changed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_begin.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_owner_changed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_begin.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_state_changed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_begin.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_follow_npc.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_target_npc.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/punctual_state_timeout.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/set_flags_on_dyn_zones.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/start_of_state.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/state_timeout.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked_end.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_LD.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_badly_hurt.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_killed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_logout.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_hurt.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_killed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t0_triggered.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t1_triggered.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t2_triggered.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t3_triggered.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_0.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_1.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_2.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_3.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_4.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_5.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_6.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_7.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_8.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_9.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/variable_changed.html (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_ambush.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_harvest.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_kami_wander.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_attack.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_def.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_rest.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_spawn.zone (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml (100%)
 rename {code/ryzom => ryzom}/common/data_leveldesign/leveldesign/world_editor_files/world_editor_primitive_configuration.xml (100%)
 rename {code/ryzom => ryzom}/common/src/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/_backup_service_interface_implementation.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/_backup_service_interface_non_module.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/_backup_service_interface_singleton.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/_backup_service_interface_singleton.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_association.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_block.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_block.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_disconnection.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_dummy.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_factory.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_factory.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_generic.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_generic.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_generic_multi_part.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_login.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_nature.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_nature.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_position.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_position.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_sint64.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_sint64.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_sync.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_sync.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/action_target_slot.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ai_wrapper.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/animal_status.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/animal_status.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/animal_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/animals_orders.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/animals_orders.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/armor_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/armor_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/backup_service_interface.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/backup_service_interface.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/backup_service_messages.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/base_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bg_downloader_msg.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bg_downloader_msg.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bmp4image.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bnp_patch.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bnp_patch.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/body.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/body.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bot_chat_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/bot_chat_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_families.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_families.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_flags.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_flags.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/brick_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/callback_adaptor.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/change_tracker_base.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/change_tracker_base.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/change_tracker_client.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/change_tracker_client.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/characs_build.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/characs_build.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_summary.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_summary.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_sync_itf.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_sync_itf.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_sync_itf.xml (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_title.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/character_title.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/characteristics.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/characteristics.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/chat_group.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/chat_group.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/client_action_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/client_action_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/combat_flying_text.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/constants.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/continent.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/continent.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/continuous_action.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/continuous_action.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/crafting_tool_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/crafting_tool_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/crypt.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/crypt.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/crypt_sha512.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/cst_loader.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/cst_loader.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/damage_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/damage_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/data_set_base.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/data_set_base.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/deployment_configuration.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/deployment_configuration.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dir_light_setup.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dir_light_setup.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dms.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dms.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dyn_chat.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/dyn_chat.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ecosystem.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ecosystem.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/effect_families.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/effect_families.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/emote_list_parser.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/emote_list_parser.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/entity_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_generator.lua (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_generator_template_cpp.lua (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_generator_template_h.lua (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_template.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_template.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/enum_template.txt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fame.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fame.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/far_position.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/far_position.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/file_description_container.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/file_description_container.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fog_map_build.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fog_map_build.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fog_of_war.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fog_of_war.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/fog_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/gender.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generate_client_db.xslt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generate_logs.tmpl (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generate_module_interface.xslt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generate_module_interface_doc.txt (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generic_xml_msg_mngr.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/generic_xml_msg_mngr.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/georges_helper.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/georges_helper.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/guild_grade.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/guild_grade.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/guild_grade_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/hit_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/http_client.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/http_client.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/intensity_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/intensity_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/interface_flags.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/interface_flags.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/inventories.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/inventories.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ios_interface.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_family.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_family.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_infos.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_infos.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_origin.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_origin.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_special_effect.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_special_effect.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_special_effect.lua (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/item_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/lift_icons.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/lift_icons.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/light_cycle.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/light_cycle.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/login_registry.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/login_registry.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/loot_harvest_state.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/loot_harvest_state.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/magic_fx.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/magic_fx.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mainland_summary.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/memorization_set_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/memorization_set_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror_misc_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror_prop_value.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror_prop_value.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirror_prop_value_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirrored_data_set.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirrored_data_set.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirrored_data_set_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mirrored_data_set_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/misc_const.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mission_desc.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mission_desc.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mode_and_behaviour.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mode_and_behaviour.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/module_security.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mount_people.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mount_people.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mp_category.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/mp_category.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/msg_ais_egs_gen.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/msg_ais_egs_gen.xml (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/msg_client_server.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/msg_encyclopedia.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/multi_target.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/multi_target.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/object.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/object.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/outpost.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/outpost.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pact.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pact.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/people.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/people.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/people_pd.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/people_pd.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/people_pd_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/permanent_ban_magic_number.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data_template.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data_tree.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/persistent_data_tree.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/player_vision_delta.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/player_visual_properties.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/player_visual_properties.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/power_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/power_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/prerequisit_infos.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/properties.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/property_allocator.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/property_allocator.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/property_allocator_client.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/property_allocator_client.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/protection_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/protection_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pvp_clan.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pvp_clan.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pvp_mode.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/pvp_mode.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_basic_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_ligo_config.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_ligo_config.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_messages.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_modules_itf.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_modules_itf.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_modules_itf.xml (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_share_itf.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_share_itf.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_share_itf.xml (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/r2_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/range_weapon_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/range_weapon_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/resistance_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/resistance_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_access.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_access.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_session_manager_itf.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_session_manager_itf.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_session_manager_itf.php (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ring_session_manager_itf.xml (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/rm_family.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/rm_family.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/rolemaster_flags.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/rolemaster_flags.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/roles.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/roles.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_database_banks.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_database_banks.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_entity_id.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_entity_id.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_mirror_properties.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_mirror_properties.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/ryzom_version.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sabrina_com.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sabrina_com.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sadge_tests.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scenario.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scenario.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scenario_entry_points.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scenario_entry_points.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scores.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/scores.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/season.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/season.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/season_file_ext.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/season_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/security_check.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/security_check.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/seeds.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/seeds.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/send_chat.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/send_chat.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sentence_appraisal.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sentence_appraisal.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_admin_module.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_admin_module.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_animation_module.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_animation_module.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_edition_module.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/server_edition_module.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/shard_names.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/shard_names.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/shield_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/shield_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/simlag.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/simlag.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/singleton_registry.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/skills.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/skills.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/skills_build.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/skills_build.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/slot_equipment.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/slot_equipment.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/slot_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/slot_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/small_string_manager.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/small_string_manager.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sp_type.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sp_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sp_type_inline.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sphrase_com.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/sphrase_com.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/starting_point.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/starting_point.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/stdpch.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/string_manager_sender.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/string_manager_sender.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/string_mgr_module.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/string_mgr_module.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/synchronised_message.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/system_message.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/task_list.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/teleport_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/teleport_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/temp_inventory_mode.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/temp_inventory_mode.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/tick_event_handler.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/tick_event_handler.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/tick_proxy_time_measure.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/static_light_cycle.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/static_light_cycle.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/time_and_season.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/time_and_season.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/time_date_season_manager.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/time_date_season_manager.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_function_sheet.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_manager.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_manager.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_predict.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_predict.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_setup.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_setup.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/time_weather_season/weather_setup_sheet_base.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/timer.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/timer.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/trade_slot_type.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/txt_command.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/type_skill_mod.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/type_skill_mod.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/user_connection_mgr.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/utils.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/utils.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/visual_fx.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/visual_slot_manager.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/visual_slot_manager.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/weapon_types.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/weapon_types.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/welcome_service_itf.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/welcome_service_itf.h (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/zc_shard_common.cpp (100%)
 rename {code/ryzom => ryzom}/common/src/game_share/zc_shard_common.h (100%)
 rename {code/ryzom => ryzom}/server/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/server/data_shard/egs/client_commands_privileges.txt (100%)
 rename {code/ryzom => ryzom}/server/data_shard/egs/shop_category.cfg (100%)
 rename {code/ryzom => ryzom}/server/data_shard/mirror_sheets/fame.dataset (100%)
 rename {code/ryzom => ryzom}/server/data_shard/mirror_sheets/fe_temp.dataset (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/README.md (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/admin (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/admin.screen.rc (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/ps_services (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/run_forever (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/ryzom_domain_screen_wrapper.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/shard (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/startup (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/dont_keep_cores (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/loop_aes.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/loop_patchman.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/make_next_live.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_list (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service_base.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/screen.rc.default (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/service_launcher.sh (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman/special_patchman_list (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/admin_install/patchman_service_local.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/00_base.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/01_domain_mini01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/01_domain_std01.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_mini_mainland.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_mini_ring.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_mini_unifier.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_std_mainland.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_std_ring.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/cfg/02_shard_type_std_unifier.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/ai_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/backup_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/dynamic_scenario_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/entities_game_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/frontend_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/gpm_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/input_output_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/log_analyser_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/logger_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/mail_forum_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/mirror_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/naming_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/ryzom_as.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/shard_unifier_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/tick_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/default/welcome_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/shard_ctrl_definitions.txt (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/shard_ctrl_mini01.txt (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/shard_ctrl_std01.txt (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_mini01/patchman_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_mini01/server_park_database.txt (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_mini01/terminal_mini01.bat (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_std01/patchman_service.cfg (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_std01/server_park_database.txt (100%)
 rename {code/ryzom => ryzom}/server/patchman_cfg/terminal_std01/terminal_std01.bat (100%)
 rename {code/ryzom => ryzom}/server/shard_start.bat (100%)
 rename {code/ryzom => ryzom}/server/shard_start_cmake.bat (100%)
 rename {code/ryzom => ryzom}/server/shard_stop.bat (100%)
 rename {code/ryzom => ryzom}/server/shard_stop_cmake.bat (100%)
 rename {code/ryzom => ryzom}/tools/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/att_tree.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/attribute.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/attribute.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/brain.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/brain.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/cond_node.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/cond_node.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/field.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/field.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/mode7.txt (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/mood.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/mood.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/node.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/node.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/record.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/record.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/result_node.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/result_node.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/test.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/tree.cpp (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/tree.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/val_nodes.h (100%)
 rename {code/ryzom => ryzom}/tools/assoc_mem/value.h (100%)
 rename {code/ryzom => ryzom}/tools/client/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/bar.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/bar.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/base_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/base_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/cfg_file.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/cfg_file.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/client_config.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/client_config.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/client_config.rc (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/client_configDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/client_configDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/database.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/database.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_advanced_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_advanced_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_details_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_details_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_information_d3d_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_information_d3d_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_information_gl_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/display_information_gl_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/general_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/general_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/preset_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/preset_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/card_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/client_config.ico (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/client_config.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/display_config_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/display_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/display_properties_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/general_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/left_bitmap_0.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/network_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/sound_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/splash_screen.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/top_right.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/update_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/res/welcome_icon.bmp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/sound_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/sound_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/system_information_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config/system_information_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/card_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/client_config.ico (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/client_config_qt.rc (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/display_config_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/display_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/display_properties_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/general_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/left_bitmap_0.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/network_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/resources.qrc (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/sound_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/splash_screen.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/top_right.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/update_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/resources/welcome_icon.png (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/client_config_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/client_config_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/config.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/config.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_advanced_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_details_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_details_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/display_settings_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/general_settings_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/general_settings_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sound_settings_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sound_settings_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/stdpch.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_d3d_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_opengl_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_widget.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/sys_info_widget.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/system.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/system.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/src/widget_base.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/qtbase_de.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/qtbase_es.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/qtbase_fr.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/qtbase_ru.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/ryzom_configuration_de.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/ryzom_configuration_es.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/translations/translations.qrc (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/client_config_dialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/display_settings_details_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/display_settings_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/general_settings_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/sound_settings_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_config_qt/ui/sys_info_widget.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/client_data_check.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/client_data_check.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/client_data_check.rc (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/client_data_checkDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/client_data_checkDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/data_scan.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/data_scan.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/res/client_data_check.ico (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/res/client_data_check.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/client/client_data_check/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/client/client_patcher/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/client/client_patcher/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/screenshot_islands.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/r2_islands_textures/screenshot_islands.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/Info.plist (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/PkgInfo (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/background.png (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/resources.qrc (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/resources.rc (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/ryzom.icns (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/ryzom.ico (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/ryzom.png (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/ryzom_installer.ini (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/shortcut.sh (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/res/template.desktop (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/configfile.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/configfile.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/downloader.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/downloader.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filescleaner.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filescleaner.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filescopier.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filescopier.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filesextractor.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/filesextractor.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/installdialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/installdialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/mainwindow.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/mainwindow.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/migratedialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/migratedialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/operation.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/operation.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/operationdialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/operationdialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profile.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profile.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profilesdialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profilesdialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profilesmodel.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/profilesmodel.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/qzip.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/qzipreader.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/qzipwriter.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/server.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/server.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/serversmodel.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/serversmodel.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/settingsdialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/settingsdialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/stdpch.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/uninstalldialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/uninstalldialog.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/utils.cpp (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/src/utils.h (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/qtbase_de.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/qtbase_es.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/qtbase_fr.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/qtbase_ru.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/ryzom_installer_de.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/ryzom_installer_es.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/translations/translations.qrc (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/installdialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/mainwindow.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/migratedialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/operationdialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/profilesdialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/settingsdialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/client/ryzom_installer/ui/uninstalldialog.ui (100%)
 rename {code/ryzom => ryzom}/tools/connection_stats/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/connection_stats/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/connection_stats/connection_stats.cpp (100%)
 rename {code/ryzom => ryzom}/tools/connection_stats/connection_stats.def (100%)
 rename {code/ryzom => ryzom}/tools/connection_stats/connection_stats.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/alias_synchronizer/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/alias_synchronizer/alias_synchronizer.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/csv_transform.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/test.scr (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/test1.scr (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/csv_transform/test2.scr (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/export.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/export.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/formFlora.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/formFlora.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/formPlant.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/formPlant.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/tools.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/export/tools.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/common.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_atom.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_atom.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_list.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_list.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_struct.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_body_elt_struct.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_file.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_file.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_head.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_head.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_loader.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/form_loader.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/georges_convert.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/georges_loader.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/georges_loader.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_atom.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_atom.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_list.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_list.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_struct.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_elt_struct.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_loader.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/item_loader.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_define.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_define.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_define_list.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_define_list.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_type.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_type.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_type_list.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_elt_type_list.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_loader.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/mold_loader.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/stdgeorgesconvert.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/stdgeorgesconvert.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/string_ex.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/string_ex.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_double.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_double.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_file_name.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_file_name.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_int_signed.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_int_signed.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_int_unsigned.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_int_unsigned.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_string.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_convert/type_unit_string.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/Resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/action.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/action.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/base_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/base_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/child_frm.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/child_frm.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/color_wnd.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/color_wnd.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/cool_dialog_bar.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/cool_dialog_bar.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/dfn_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/dfn_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/displayer.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/displayer.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/edit_list_ctrl.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/edit_list_ctrl.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/file_browser_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/file_browser_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/file_tree_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/file_tree_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/form_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/form_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_debug.def (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_dll_d.exp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_dll_r.exp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit.html (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit_dll.def (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit_doc.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit_doc.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_edit_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_implementation.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_interface.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/georges_release.def (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/header_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/header_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/icon_wnd.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/icon_wnd.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/imagelist_ex.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/imagelist_ex.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/left_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/left_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/main_frm.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/main_frm.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/memory_combo_box.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/memory_combo_box.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/output_console_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/output_console_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/plugin_interface.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/reg_shell_ext.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/reg_shell_ext.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/Toolbar.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/array.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/georges_edit.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/header.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/hold.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/root.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/struct.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/vstruct.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/worldbuilder.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/zen.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/res/zfee51.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/settings_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/settings_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/splash_screen.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/splash_screen.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/stdafx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/stdafx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/type_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/type_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_dll/version.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/data/georges_editor.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/data/georges_editor_default.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/geqt_config.h.cmake (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/completer_line_edit.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/completer_line_edit.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/configuration.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/configuration.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/entity.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/entity.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/filesystem_model.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/formdelegate.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/formitem.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/formitem.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_dirtree_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_editor_qt.qrc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_splash.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_splash.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georges_treeview_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georgesform_model.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/.directory (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/go-down.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/go-up.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/khead.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/list-add.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/list-remove.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/mp_generic.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/nel.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/open-file.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/pqrticles.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/images/preferences.png (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/log_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/log_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/log_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/main_window.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/main_window.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/modules.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/modules.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/new_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/new_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/objectviewer_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/progress_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/progress_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/qt_displayer.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/settings_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/settings_form.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/splash.ui (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_editor_qt/src/stdpch.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/_typ.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/_type.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/boolean.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/filename.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/float.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/sint16.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/sint32.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/sint64.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/sint8.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/string.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/typ.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/uint16.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/uint32.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/uint64.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/dfn/uint8.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/georges_exe.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/georges_exe.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_exe/version.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBase.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBase.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBgFades.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBgFades.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBgFlags.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageBgFlags.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageComplex.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageComplex.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageComtext.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageComtext.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PagePosition.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PagePosition.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageSimple.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/PageSimple.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/bitmap1.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/bmp00001.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.clw (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.def (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/listener_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/listener_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/loading_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/loading_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/res/georges_plugin_sound.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/resource.hm (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_document_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_document_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/sound_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/start.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_sound/stop.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/Resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/georges_plugin_test.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/georges_plugin_test.def (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/georges_plugin_test.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/georges_plugin_test.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/res/georges_plugin_test.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/test_global_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/test_global_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/test_local_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/georges_plugin_test/test_local_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/icon_search/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/icon_search/icon_search.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/icon_search/icon_search_default.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/create_levedesign_archive.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/create_levedesign_data_archive.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/georges.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/history.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ligoscape.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/mission_compiler.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/mount_l.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/actions.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/alias.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/audio.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/audio_hiden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/bot_template_npc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/bot_template_npc_ml.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/bot_template_outpost.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/bot_template_outpost_ml.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/building_destination.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/building_instance.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/building_template.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/building_trigger.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/cell.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/cell_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/cell_zones.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/continent.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/deposit.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/depositzone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dyn_answer.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dyn_fauna_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dyn_npc_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dyn_road.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dynamic_region.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/dynamic_system.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/emissary.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/env_fx.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/env_fx_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/event.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/event_action.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/event_handler_action.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/exclude.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna_event_handler_action.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna_generic_place.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna_state.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/fauna_state_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flat_dyn_chat_continue.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flat_dyn_chat_fail.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flat_dyn_chat_retry.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flat_dyn_chat_skippable.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flora.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flora_exclude.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flora_path.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/flora_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/food.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/gear.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/geom_items.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_descriptions.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_fauna.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_fauna_ex.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template_fauna.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template_npc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template_npc_ml.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template_outpost.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/group_template_outpost_ml.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/handon.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/jump_to.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_base.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_deposit.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_group.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_guardian.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_manager.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/kami_preacher.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/karavan_base.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/karavan_emissary.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/karavan_group.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/karavan_guard.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/karavan_manager.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/linear_dyn_chat_continue.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/linear_dyn_chat_fail.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/linear_dyn_chat_retry.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/linear_dyn_chat_skippable.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/manager.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_bot_chat_step.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_objectives.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_reward.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_reward_group.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_step.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/mission_tree.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/missions_editor.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/no_answer.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/no_go.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_bot.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_event_handler_action.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_folder.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_group.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_group_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_manager.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_punctual_state.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_route.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_state_chat.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_state_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_state_profile.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/npc_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/outpost.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/outpost_manager.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/outpost_spawn_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/path.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/people.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/place.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/point.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/population.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/preacher.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/raw_material_flora.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/raw_material_ground.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/raw_material_season.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/region.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/respawn_point.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/respawn_points.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/rest.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/result_no.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/result_yes.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/room_destination.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/room_template.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sample_bank_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sample_banks.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/shield.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sound_path.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sound_point.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sound_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/sounds.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/spawn.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/spawn_base.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/stable.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/stable_entry.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/stables.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/state.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/state_event_handler.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/state_machine.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/state_machine_list.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step_any.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step_dyn_chat.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step_failure.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step_if.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/step_ooo.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/teleport_dest.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/teleport_destination.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/teleport_dests.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/teleport_spawn_zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/teleport_trigger.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/temp.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/time.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_creature.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_faction.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_item.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_npc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_place.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_quality.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_quantity.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/var_text.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/ui/zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/world_editor.html (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/world_editor_plugin.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/install/world_editor_script.xml (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/ld_0_clean.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/ld_1_get.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/ld_2_build.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/ld_3_make_distrib.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ChooseDir.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ChooseDir.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ChooseTag.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ChooseTag.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ContinentCfg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ContinentCfg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ContinentPropertiesDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ContinentPropertiesDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ExportCBDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ExportCBDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ExportDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ExportDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/MainFrm.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/MainFrm.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/MasterTree.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/MasterTree.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/NameEditDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/NameEditDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/easy_cfg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/easy_cfg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/master.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/master.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/master.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/n019003l.pfb (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/backup.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/continents.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/file.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/folder.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/master.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/master.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/masterDoc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/regions.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/res/trash.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/master/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/AddPathDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/AddPathDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/CompilDialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/CompilDialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/Resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/dialog_mode.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/dialog_mode.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/res/icon1.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/res/icon_fil.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/res/mission_compiler_fe.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/res/red_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/test_compilateur.primitive (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/test_compilateur.script (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/test_compilateur_gn.primitive (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_fe/version.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/mission_compiler.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/step.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/step_content.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/steps.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mission_compiler_lib/variables.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/creature_models.csv (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/moulinette.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/mp_generator.doc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/raw_material_generation.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/rm_fam_prop.csv (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/rm_item_parts.csv (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/utils.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/mp_generator/v4_source_tables2.xls (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/make_named_items_csv.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/make_named_items_txt.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/named_items.csv (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/named_items.script (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/prim_export/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/prim_export/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/prim_export/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/prim_export/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/prim_export/prim_export.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/ZoneBitmaps/_UNUSED_.TGA (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/_typ.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/_type.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/boolean.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/filename.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/float.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/plant.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/plant_instance.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/sint16.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/sint32.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/sint64.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/sint8.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/string.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/typ.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/uint16.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/uint32.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/uint64.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/uint8.typ (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/common/dfn/vegetable.dfn (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/test_root/ligoscape.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/uni_conv/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/uni_conv/uni_conv.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/update_tools.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/lua_helper.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/lua_helper.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/lua_helper_inline.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/res/variable_parser.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/res/variable_parser.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/variable_parser.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/variable_parser.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/variable_parser.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/variable_parserDlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/variable_parser/variable_parserDlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export/land_export.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export_lib/export.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/land_export_lib/export.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/ligoscape.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/ligoscape.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/action.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/action.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_logic.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_logic.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_zone.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_zone.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/builder_zone_region.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/color_button.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/color_button.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/custom_snapshot.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/custom_snapshot.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/dialog_properties.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/display.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/display.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/editor_primitive.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/editor_primitive.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/export_cb_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/export_cb_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/export_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/export_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/external_editor.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/external_editor.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/generate_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/generate_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/generate_primitive.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/generate_primitive.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/goto_dialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/goto_dialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/imagelist_ex.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/main_frm.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/main_frm.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/move_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/move_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/my_list_box.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/my_list_box.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/name_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/name_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/pacs.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/pacs.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/plugin_interface.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/primitive_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/primitive_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/project_settings.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/project_settings.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/Toolbar.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/WorldEditor.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/_Legoscape edit.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/_Selecteur de Zone.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/_icon1.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/_patatoid edit.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/add_point.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/copy.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/erro.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/folder_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/folder_h.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/folder_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/folder_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/hand.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/insert_point.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/line_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/line_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/line_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/move.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/point_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/point_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/point_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/property.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/property_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/property_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/property_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/radius.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/root.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/root_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/root_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/root_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/rotate.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/scale.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/select.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/select_copy.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/turn.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/world_editor.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/world_editor.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/world_editor_doc.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/zone_closed.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/zone_hidden.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/zone_opened.ico (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/res/zoom.cur (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/select_by_location.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/select_by_location.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/splash_screen.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/splash_screen.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/stdafx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/stdafx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/tools_logic.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/tools_logic.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/tools_zone.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/tools_zone.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_manager_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_manager_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_sel_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/type_sel_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/update_continents.bat (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/version.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor_doc.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor_georges.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor_view.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor/world_editor_view.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/ReadMe.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/Resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/fauna_flags.tga (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/res/world_editor_fauna_graph_plugin.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/res/world_editor_graph_plugin.rc2 (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/WorldEditorPlugin.cfg (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/world_editor_plugin.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_plugin/world_editor_scriptPLAYER.xml (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_display_info.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_icons.tga (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.rc (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.xml (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bitmap1.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00001.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00002.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00003.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/res/toolbar1.bmp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/resource.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h (100%)
 rename {code/ryzom => ryzom}/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.rc (100%)
 rename {code/ryzom => ryzom}/tools/make_alias_file/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/make_alias_file/make_alias_file.cfg (100%)
 rename {code/ryzom => ryzom}/tools/make_alias_file/make_alias_file.cpp (100%)
 rename {code/ryzom => ryzom}/tools/make_anim_by_race/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/make_anim_by_race/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/make_anim_melee_impact/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/make_anim_melee_impact/anim.txt (100%)
 rename {code/ryzom => ryzom}/tools/make_anim_melee_impact/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/occ2huff/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/occ2huff/occ2huff.cpp (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen.rc (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_common.cpp (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_main.h (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_service.cpp (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_service.h (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/patch_gen_service.rc (100%)
 rename {code/ryzom => ryzom}/tools/patch_gen/red_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/cpp_output.h (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/parse_node.h (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/parser.cpp (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/parser.h (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/parser_rules.cpp (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/parser_rules.h (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/templatizer.cpp (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/templatizer.h (100%)
 rename {code/ryzom => ryzom}/tools/pd_parser/tokenizer.h (100%)
 rename {code/ryzom => ryzom}/tools/pdr_util/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/pdr_util/pdr_util.cpp (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/phrase_generator.cpp (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/skill_tree.cpp (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/skill_tree.h (100%)
 rename {code/ryzom => ryzom}/tools/phrase_generator/sstring.h (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/reynolds_manager.cpp (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/reynolds_manager.h (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/stdpch.h (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/track.cpp (100%)
 rename {code/ryzom => ryzom}/tools/reynolds/track.h (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/build (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/buildmode (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/clean_log.sh (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/generate_packed_sheets.sh (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/loop_aes.sh (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/make_all (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/ryzom_domain_screen_wrapper.sh (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/service_launcher.sh (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/shard (100%)
 rename {code/ryzom => ryzom}/tools/scripts/linux/utilities (100%)
 rename {code/ryzom => ryzom}/tools/scripts/windows/tools/replace_vista_icon.exe (100%)
 rename {code/ryzom => ryzom}/tools/server/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ai_build_wmap/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ai_build_wmap/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/server/ai_build_wmap/build_proximity_maps.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/ai_build_wmap/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/ai_build_wmap/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/server/brick_param_extractor/brick_param_extractor.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_spell_sheet/build_spell_sheet.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_spell_sheet/build_spells.cfg (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/build_world_packed_col.cfg (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/build_world_packed_col.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/builder_config.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/builder_config.h (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/packed_world_builder.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/packed_world_builder.h (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/std_header.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/std_header.h (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/test_col_world.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/village.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/village.h (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/zone_util.cpp (100%)
 rename {code/ryzom => ryzom}/tools/server/build_world_packed_col/zone_util.h (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/.classpath (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/.project (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/AndroidManifest.xml (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/BuildConfig.java (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/R.java (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/info.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/proguard.cfg (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/project.properties (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/res/drawable-hdpi/ic_launcher.png (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/res/drawable-ldpi/ic_launcher.png (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/res/drawable/ic_launcher.png (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/res/layout/main.xml (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/res/values/strings.xml (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/android_app/src/com/mkyong/android/MainActivity.java (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/credits.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/doc.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.info (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.install (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.module (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/oldmodule/templates/ingame_register.phtml (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/config.default.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/logout.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/settings.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_user.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.info (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.install (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/createticket.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/dashboard.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/ingame_register.phtml (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_admin.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_mod.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_user.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/sgroup_list.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_queue.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_reply.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_sgroup.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_info.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_log.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_user.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/todo.txt (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/www/config.php (100%)
 rename {code/ryzom => ryzom}/tools/server/ryzom_ams/www/is_installed (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/StdAfx.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/StdAfx.h (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/raw_material_generation.cfg (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/sheet_random_generator.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/srg_utilities.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheet_random_generator/srg_utilities.h (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/sheets_packer.cfg (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/sheets_packer.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/sheets_packer_cfg.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/sheets_packer_cfg.h (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/stdpch.cpp (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer/stdpch.h (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer_shard/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer_shard/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer_shard/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/sheets_packer_shard/sheets_packer_shard.cpp (100%)
 rename {code/ryzom => ryzom}/tools/skill_extractor/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/skill_extractor/skill_extractor.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_commands.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_filter_factory.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_filter_factory.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_info_extractor_factory.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_info_extractor_factory.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_scan_script.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/char_scan_script.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/character.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/character.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/character_scan_job.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/character_scan_job.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/job_manager.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/job_manager.h (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/service_main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/user_char_filters.cpp (100%)
 rename {code/ryzom => ryzom}/tools/stats_scan/user_char_info_extractors.cpp (100%)
 rename {code/ryzom => ryzom}/tools/translation/5_make_words_diff.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/6_merge_words_diff.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/7_install_translation.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/AA_clean_string_diff.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/A_make_string_diff.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/B_merge_string_diff.bat (100%)
 rename {code/ryzom => ryzom}/tools/translation/bin/put_translation_tools_here.tag (100%)
 rename {code/ryzom => ryzom}/tools/translation/diff/do_not_remove.tag (100%)
 rename {code/ryzom => ryzom}/tools/translation/history/do_not_remove_this_file.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/languages.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/readme.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/bodypart_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/career_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/characteristic_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/classificationtype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/creature_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damage_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damage_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damage_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damage_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/damagetype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/de.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ecosystem_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/en.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/es.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/faction_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/fr.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/item_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/job_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/outpost_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/place_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/powertype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/r2_de.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/r2_en.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/r2_es.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/r2_fr.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/r2_ru.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/race_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/ru.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sbrick_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/score_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/skill_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/sphrase_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_de.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_en.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_es.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_fr.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_ru.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/title_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/translated/wk.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/bodypart_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/career_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/characteristic_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/classificationtype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/creature_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/damagetype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/ecosystem_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/faction_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/item_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/job_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/outpost_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/place_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/powertype_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/race_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/sbrick_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/score_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/skill_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/sphrase_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/title_words_wk.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation/work/wk.uxt (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/CMakeLists.txt (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/blue_pill.ico (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/extract_bot_names.cpp (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/extract_new_sheet_names.cpp (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/main.cpp (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/main.rc (100%)
 rename {code/ryzom => ryzom}/tools/translation_tools/translation_tools.cfg (100%)
 rename {code/ryzom => ryzom}/tools/xml_packer/xml_packer.cpp (100%)
 rename {code/snowballs2 => snowballs2}/AUTHORS (100%)
 rename {code/snowballs2 => snowballs2}/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/CMakePackaging.txt (100%)
 rename {code/snowballs2 => snowballs2}/COPYING (100%)
 rename {code/snowballs2 => snowballs2}/ChangeLog (100%)
 rename {code/snowballs2 => snowballs2}/INSTALL (100%)
 rename {code/snowballs2 => snowballs2}/NEWS (100%)
 rename {code/snowballs2 => snowballs2}/README (100%)
 rename {code/snowballs2 => snowballs2}/THANKS (100%)
 rename {code/snowballs2 => snowballs2}/bin/chat_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/collision_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/common.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/copy_nel_d.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/copy_nel_r.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/empty_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/frontend_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_00_naming_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_01_login_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_10_welcome_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_11_position_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_12_chat_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_13_collision_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_20_frontend_service.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/init_r_90_snowballs_client.bat (100%)
 rename {code/snowballs2 => snowballs2}/bin/position_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/pp_oculus_vr.cg (100%)
 rename {code/snowballs2 => snowballs2}/bin/pp_stereo_debug.cg (100%)
 rename {code/snowballs2 => snowballs2}/bin/pp_test.cg (100%)
 rename {code/snowballs2 => snowballs2}/bin/snowballs_client.cfg (100%)
 rename {code/snowballs2 => snowballs2}/bin/snowballs_client_default.cfg (100%)
 rename {code/snowballs2 => snowballs2}/client/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/client/client.cfg.in (100%)
 rename {code/snowballs2 => snowballs2}/client/src/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/client/src/animation.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/animation.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/camera.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/camera.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/commands.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/commands.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/compass.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/compass.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/configuration.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/configuration.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/entities.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/entities.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/game_time.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/game_time.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/graph.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/graph.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/interface.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/interface.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/internationalization.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/internationalization.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/landscape.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/landscape.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/lens_flare.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/lens_flare.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/mouse_listener.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/mouse_listener.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/network.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/network.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/pacs.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/pacs.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/physics.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/physics.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/radar.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/radar.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/snowballs_client.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/snowballs_client.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/snowballs_config.h (100%)
 rename {code/snowballs2 => snowballs2}/client/src/sound.cpp (100%)
 rename {code/snowballs2 => snowballs2}/client/src/sound.h (100%)
 rename {code/snowballs2 => snowballs2}/resources/custom.ini (100%)
 rename {code/snowballs2 => snowballs2}/resources/nel.bmp (100%)
 rename {code/snowballs2 => snowballs2}/resources/nel.png (100%)
 rename {code/snowballs2 => snowballs2}/resources/nevraxpill.ico (100%)
 rename {code/snowballs2 => snowballs2}/server/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/chat/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/chat/chat_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/chat/src/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/chat/src/main.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/collision/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/collision/collision_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/collision/src/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/collision/src/collision_service.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/collision/src/collision_service.h (100%)
 rename {code/snowballs2 => snowballs2}/server/common.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/empty/empty_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/empty/src/empty_service.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/empty/src/empty_service.h (100%)
 rename {code/snowballs2 => snowballs2}/server/frontend/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/frontend/frontend_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/frontend/src/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/frontend/src/main.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/position/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/position/position_service.cfg (100%)
 rename {code/snowballs2 => snowballs2}/server/position/src/CMakeLists.txt (100%)
 rename {code/snowballs2 => snowballs2}/server/position/src/main.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/position/src/physics.cpp (100%)
 rename {code/snowballs2 => snowballs2}/server/position/src/physics.h (100%)
 rename {code/studio => studio}/CMakeLists.txt (100%)
 rename {code/studio => studio}/data/andbasr.ttf (100%)
 rename {code/studio => studio}/doc/html/cdirection_widget.png (100%)
 rename {code/studio => studio}/doc/html/cedit_color_widget.png (100%)
 rename {code/studio => studio}/doc/html/cedit_range_float_widget.png (100%)
 rename {code/studio => studio}/doc/html/cedit_range_int_widget.png (100%)
 rename {code/studio => studio}/doc/html/gui_struct.png (100%)
 rename {code/studio => studio}/doc/html/object_viewer_qt_window.png (100%)
 rename {code/studio => studio}/doc/make_ovqt_dox.bat (100%)
 rename {code/studio => studio}/doc/make_ovqt_dox.sh (100%)
 rename {code/studio => studio}/doc/ovqt.dox (100%)
 rename {code/studio => studio}/ovqt_config.h.cmake (100%)
 rename {code/studio => studio}/src/3rdparty/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/LICENSE.GPL3 (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/LICENSE.LGPL (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtBrowserItem (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtCharEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtCharPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtColorEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtColorPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDateEditFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDatePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtFontEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtFontPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtIntPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtLineEditFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtPointPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtProperty (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtRectPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtScrollBarFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtSizePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtSliderFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtStringPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtTimeEditFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtTimePropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtVariantProperty (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/README.TXT (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-busy.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-cross.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-hand.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-wait.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/images/resetproperty.png (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qteditorfactory.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtpropertymanager.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp (100%)
 rename {code/studio => studio}/src/3rdparty/qtpropertybrowser/qtvariantproperty.h (100%)
 rename {code/studio => studio}/src/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/description.h (100%)
 rename {code/studio => studio}/src/extension_system/iplugin.h (100%)
 rename {code/studio => studio}/src/extension_system/iplugin_manager.h (100%)
 rename {code/studio => studio}/src/extension_system/iplugin_spec.h (100%)
 rename {code/studio => studio}/src/extension_system/plugin_manager.cpp (100%)
 rename {code/studio => studio}/src/extension_system/plugin_manager.h (100%)
 rename {code/studio => studio}/src/extension_system/plugin_spec.cpp (100%)
 rename {code/studio => studio}/src/extension_system/plugin_spec.h (100%)
 rename {code/studio => studio}/src/images/studio_splash.png (100%)
 rename {code/studio => studio}/src/main.cpp (100%)
 rename {code/studio => studio}/src/plugins/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_dirtree_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_dirtree_form.ui (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_file.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_file.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_filelist_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_filelist_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_filelist_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_filesystem_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_filesystem_model.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager.qrc (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_constants.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_window.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_manager_window.ui (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_proxy_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/bnp_proxy_model.h (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_add_item.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_bnp_make.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_delete_item.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_export.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_new.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/images/ic_nel_reset_all.png (100%)
 rename {code/studio => studio}/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml (100%)
 rename {code/studio => studio}/src/plugins/core/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/core/Nel3DWidget/nel3d_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/Nel3DWidget/nel3d_widget.h (100%)
 rename {code/studio => studio}/src/plugins/core/context_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/context_manager.h (100%)
 rename {code/studio => studio}/src/plugins/core/core.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/core.h (100%)
 rename {code/studio => studio}/src/plugins/core/core.qrc (100%)
 rename {code/studio => studio}/src/plugins/core/core_config.h.cmake (100%)
 rename {code/studio => studio}/src/plugins/core/core_constants.h (100%)
 rename {code/studio => studio}/src/plugins/core/core_global.h (100%)
 rename {code/studio => studio}/src/plugins/core/core_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/core_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/core/general_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/general_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/core/general_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_add_item.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_crash.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_delete_item.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_down_item.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_generic_settings.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_new.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_open.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_path_settings.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_pill.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_redo.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_reset_all.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_save.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_save_as.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_undo.png (100%)
 rename {code/studio => studio}/src/plugins/core/icons/ic_nel_up_item.png (100%)
 rename {code/studio => studio}/src/plugins/core/icontext.h (100%)
 rename {code/studio => studio}/src/plugins/core/icore.h (100%)
 rename {code/studio => studio}/src/plugins/core/icore_listener.h (100%)
 rename {code/studio => studio}/src/plugins/core/images/nel.png (100%)
 rename {code/studio => studio}/src/plugins/core/images/preferences.png (100%)
 rename {code/studio => studio}/src/plugins/core/ioptions_page.h (100%)
 rename {code/studio => studio}/src/plugins/core/main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/main_window.h (100%)
 rename {code/studio => studio}/src/plugins/core/menu_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/menu_manager.h (100%)
 rename {code/studio => studio}/src/plugins/core/plugin_view_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/plugin_view_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/core/plugin_view_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/core/qtwin.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/qtwin.h (100%)
 rename {code/studio => studio}/src/plugins/core/search_paths_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/search_paths_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/core/search_paths_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/core/settings_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/core/settings_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/core/settings_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/core/studio_plugin_core.xml (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/sheet_id_view.cpp (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/sheet_id_view.h (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/sheet_id_view.ui (100%)
 rename {code/studio => studio}/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml (100%)
 rename {code/studio => studio}/src/plugins/example/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/example/example_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/example/example_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/example/example_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/example/example_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/example/example_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/example/qnel_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/example/qnel_widget.h (100%)
 rename {code/studio => studio}/src/plugins/example/simple_viewer.cpp (100%)
 rename {code/studio => studio}/src/plugins/example/simple_viewer.h (100%)
 rename {code/studio => studio}/src/plugins/example/studio_plugin_example.xml (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/actions.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/actions.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/browser_ctrl.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/browser_ctrl.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/browser_ctrl_pvt.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/browser_ctrl_pvt.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/dfn_browser_ctrl.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/dfn_browser_ctrl.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/expandable_headerview.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/expandable_headerview.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/filepath_property_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/filepath_property_manager.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/formdelegate.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/formdelegate.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/formitem.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/formitem.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dfn_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dfn_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dfn_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dirtree_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dirtree_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dirtree_form.ui (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dock_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_dock_widget.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor.qrc (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_constants.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_form.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_form.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_form.ui (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_editor_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_filesystem_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_filesystem_model.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_treeview_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_treeview_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_treeview_form.ui (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_typ_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_typ_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georges_typ_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georgesform_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georgesform_model.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georgesform_proxy_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/georgesform_proxy_model.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/array.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/header.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/hold.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/ic_nel_georges_editor.png (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/root.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/struct.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/vstruct.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/images/zfee51.ico (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/stdpch.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/stdpch.h (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/studio_plugin_georges_editor.xml (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/typ_browser_ctrl.cpp (100%)
 rename {code/studio => studio}/src/plugins/georges_editor/typ_browser_ctrl.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_editor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_editor.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_list.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_list.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_list.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_property_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/action_property_manager.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/add_widget_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/add_widget_widget.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/add_widget_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/editor_message_processor.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/editor_message_processor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/editor_selection_watcher.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/editor_selection_watcher.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expr_link_dlg.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expr_link_dlg.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expr_link_dlg.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expr_slot_info.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_editor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_editor.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_info.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_link.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_link.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_loader.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_loader.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_node.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_node.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_store.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expression_store.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/abs.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/add.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/and.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/band.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/bnot.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/bor.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/bxor.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/dbcount.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/depends.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/div.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/eq.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/extSign11To64.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/extSign8To64.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getAlpha.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getBlue.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getGreen.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getRed.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getbit.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/getprop.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/identity.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/ifthenelse.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/ilinear.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/int.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/intToColor.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/isFinalVersion.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/localize.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/makeRGB.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/max.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/min.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/mod.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/mul.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/ne.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/not.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/oldvalue.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/or.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/rand.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/sal.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/sar.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/secondsToTimeString.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/shl.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/shr.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/str.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/sub.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/switch.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/expressions/value.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/fonts/ryzom.ttf (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_config.h.cmake (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_constants.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_context.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_context.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_core_listener.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_core_listener.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_global.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_window.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/gui_editor_window.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_editor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_editor.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_list.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_list.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/link_list.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/nelgui_ctrl.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/nelgui_ctrl.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_gui_dlg.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_gui_dlg.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_gui_dlg.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_property_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_property_widget.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_property_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_widget_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_widget_widget.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/new_widget_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_editor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_editor.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_list.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_list.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/proc_list.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_file_parser.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_file_parser.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_file_serializer.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_file_serializer.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_files.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_files/login.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_window.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/project_window.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/property_browser_ctrl.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/property_browser_ctrl.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/studio_plugin_gui_editor.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/texture_chooser.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/texture_chooser.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/texture_chooser.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/texture_property_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/texture_property_manager.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_hierarchy.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_hierarchy.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_hierarchy.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info_serializer.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info_serializer.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info_tree.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info_tree_node.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_info_tree_visitor.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_properties.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_properties.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_properties.ui (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_properties_parser.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_properties_parser.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_serializer.cpp (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widget_serializer.h (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlBase.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlBaseButton.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlButton.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlColPick.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlScroll.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlTabButton.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/CtrlTextButton.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBViewBar.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBViewBar3.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBViewDigit.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBViewNumber.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/DBViewQuantity.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupCell.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupContainer.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupEditBox.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupFrame.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupHTML.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupHeader.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupList.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupMenu.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupModal.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupParagraph.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupScrollText.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupTab.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupTable.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/GroupTree.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/InterfaceElement.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/InterfaceGroup.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/RootGroup.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewBitmap.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewText.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewTextFormated.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewTextID.xml (100%)
 rename {code/studio => studio}/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone_base.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone_base.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone_region.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/builder_zone_region.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_grid.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_transition_land.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_world_editor.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_zone.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_zonel.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_nel_zones.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/icons/ic_snapshot.png (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_actions.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_actions.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor.qrc (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_constants.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_global.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_window.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_editor_window.ui (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_scene.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_scene.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_scene_base.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_scene_base.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_view.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/landscape_view.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/list_zones_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/list_zones_model.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/list_zones_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/list_zones_widget.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/list_zones_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/pixmap_database.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/pixmap_database.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/project_settings_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/project_settings_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/project_settings_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/shapshot_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/snapshot_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/snapshot_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/zone_region_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/landscape_editor/zone_region_editor.h (100%)
 rename {code/studio => studio}/src/plugins/log/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/log/log_form.ui (100%)
 rename {code/studio => studio}/src/plugins/log/log_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/log/log_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/log/log_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/log/log_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/log/log_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/log/qt_displayer.cpp (100%)
 rename {code/studio => studio}/src/plugins/log/qt_displayer.h (100%)
 rename {code/studio => studio}/src/plugins/log/studio_plugin_log.xml (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/arrow-left-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/arrow-left-double-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/arrow-right-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/arrow-right-double-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/document-export-4.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_add_item.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_delete_item.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_down_item.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_generic_settings.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_reset_all.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/ic_nel_up_item.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/news-subscribe-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/images/run-build-2.png (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler.qrc (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_main_window.h (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_main_window.ui (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_plugin_constants.h (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/mission_compiler_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/server_entry_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/server_entry_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/server_entry_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/validation_file.cpp (100%)
 rename {code/studio => studio}/src/plugins/mission_compiler/validation_file.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/graphics_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/graphics_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/graphics_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/graphics_viewport.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/graphics_viewport.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_add_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_anim.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_animset.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_append_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_bgcolor.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_camera_add.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_camera_del.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_camera_fps.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_daynight.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_delete_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_down_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_framedelay.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_insert_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_mixer.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_new.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_open.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_particle_system.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_particles.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_pill.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_reset_all.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_reset_camera.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_save.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_save_as.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_skelscale.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_sound.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_up_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_veget.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_vegetset.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_water.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_wind.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/ic_nel_workspace_item.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/dqynight.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/ico_mrm_mesh.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/mixer.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/nel.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/pause.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/play.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/polymode.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/pqrticles.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/refresh.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/rmfill.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/rmline.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/rmpoints.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/seek-backward.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/seek-forward.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/skip-backward.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/skip-forward.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/sound.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/stop.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/water.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/images/wind.png (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/main_window.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/modules.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/modules.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer.qrc (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer_constants.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/object_viewer_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/attrib_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/attrib_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/attrib_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/auto_lod_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/auto_lod_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/basic_edit_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/basic_edit_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/bin_op_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/curve_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/curve_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/curve_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/direction_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/direction_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/direction_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/dup_ps.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/dup_ps.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/emitter_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/emitter_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/emitter_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/follow_path_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_bindable_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_bindable_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_bindable_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/located_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/mesh_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/mesh_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/mesh_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/morph_mesh_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/multi_tex_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/multi_tex_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_control_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_control_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_editor.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_force_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_force_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_force_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_light_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_light_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_light_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_node.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_node.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_property_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_sound_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_sound_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_sound_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_system_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_system_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_system_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_texture_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_tree_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_tree_model.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_workspace_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_workspace_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_zone_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_zone_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/particle_zone_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_initial_pos.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_mover_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_mover_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_mover_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/ps_wrapper.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/scheme_bank_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/scheme_manager.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/scheme_manager.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/spinner_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/spinner_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/tail_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/tail_particle_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_blender_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_gradient_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/value_gradient_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/particle_system/workspace_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_set_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_set_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/animation_set_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/camera_control.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/camera_control.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/day_night_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/day_night_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/day_night_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/entity.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/entity.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/global_wind_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/global_wind_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/global_wind_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/setup_fog_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/setup_fog_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/setup_fog_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/skeleton_scale_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/skeleton_scale_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/skeleton_tree_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/skeleton_tree_model.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/slot_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/slot_manager_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/slot_manager_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/sun_color_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/sun_color_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/sun_color_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_mrm_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_mrm_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_timer_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_timer_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/tune_timer_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/water_pool_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/water_pool_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/scene/water_pool_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/sound_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/sound_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/sound_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/sound_system.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/sound_system.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/stdpch.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/stdpch.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/studio_plugin_object_viewer.xml (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_density_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_density_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_editor.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_node.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_node.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable/vegetable_scale_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/vegetable_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/color_edit_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/color_edit_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/color_edit_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/edit_range_float_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/edit_range_uint_form.ui (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/edit_range_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/edit_range_widget.h (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/hoverpoints.cpp (100%)
 rename {code/studio => studio}/src/plugins/object_viewer/widgets/hoverpoints.h (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/sheetbuilder.h (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h (100%)
 rename {code/studio => studio}/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/add_tile.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/delete_image.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/delete_tile.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/down.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/empty_image.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_add_item.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_delete_item.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_new.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_open.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_save.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/ic_nel_save_as.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/left.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/nel.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/replace_image.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/reset.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/right.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/rotation0.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/rotation180.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/rotation270.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/rotation90.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/images/up.png (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/land_edit_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/land_edit_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/land_edit_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/studio_plugin_tile_editor.xml (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_bank.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_bank.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_constants.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor.qrc (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor_main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor_main_window.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor_main_window.ui (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_editor_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_images.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_item.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_item.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_item_delegate.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_item_delegate.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tile_model.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tilebank_loader.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tilebank_loader.h (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tilebank_saver.cpp (100%)
 rename {code/studio => studio}/src/plugins/tile_editor/tilebank_saver.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/README (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/editor_phrase.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/editor_phrase.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/editor_worksheet.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/editor_worksheet.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/extract_bot_names.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/extract_bot_names.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/extract_new_sheet_names.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/extract_new_sheet_names.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/ftp_selection.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/ftp_selection.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/ftp_selection.qrc (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/ftp_selection.ui (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/images/cdtoparent.png (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/images/dir.png (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/images/file.png (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/source_selection.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/source_selection.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/source_selection.ui (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/studio_plugin_translation_manager.xml (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_constants.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_editor.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_main_window.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_main_window.ui (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/translation_manager_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/uxt_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/translation_manager/uxt_editor.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/world_editor/const_string_array_editor.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/const_string_array_editor.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/const_string_array_editor.ui (100%)
 rename {code/studio => studio}/src/plugins/world_editor/const_string_array_property.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/const_string_array_property.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_move.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_rotate.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_scale.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_select.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_turn.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/icons/ic_nel_world_editor.png (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitive_item.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitive_item.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitives_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitives_model.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitives_view.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/primitives_view.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/project_settings_dialog.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/project_settings_dialog.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/project_settings_dialog.ui (100%)
 rename {code/studio => studio}/src/plugins/world_editor/property_editor_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/property_editor_widget.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/property_editor_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/world_editor/studio_plugin_world_editor.xml (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor.qrc (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_actions.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_actions.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_constants.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_global.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_misc.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_misc.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_scene.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_scene.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_scene_item.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_scene_item.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_settings_page.ui (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_window.h (100%)
 rename {code/studio => studio}/src/plugins/world_editor/world_editor_window.ui (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/CMakeLists.txt (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/color-fill.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/color-picker-black.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/colorize.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/draw-brush.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/go-down-7.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/go-jump-4.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/lock-6.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/images/lock-silver.png (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/painter_dock_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/painter_dock_widget.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/painter_dock_widget.ui (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/qnel_widget.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/qnel_widget.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/studio_plugin_zone_painter.xml (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter.qrc (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_main_window.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_main_window.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_main_window.ui (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_model.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_model.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_plugin.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_plugin.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_settings_page.cpp (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_settings_page.h (100%)
 rename {code/studio => studio}/src/plugins/zone_painter/zone_painter_settings_page.ui (100%)
 rename {code/studio => studio}/src/pm_watcher.cpp (100%)
 rename {code/studio => studio}/src/pm_watcher.h (100%)
 rename {code/studio => studio}/src/splash_screen.cpp (100%)
 rename {code/studio => studio}/src/splash_screen.h (100%)
 rename {code/studio => studio}/src/startup_settings_dlg.cpp (100%)
 rename {code/studio => studio}/src/startup_settings_dlg.h (100%)
 rename {code/studio => studio}/src/startup_settings_dlg.ui (100%)
 rename {code/studio => studio}/src/studio.ico (100%)
 rename {code/studio => studio}/src/studio.qrc (100%)
 rename {code/studio => studio}/src/studio.rc (100%)
 rename {code/studio => studio}/src/translations/object_viewer_qt_de.ts (100%)
 rename {code/studio => studio}/src/translations/object_viewer_qt_en.ts (100%)
 rename {code/studio => studio}/src/translations/object_viewer_qt_fr.ts (100%)
 rename {code/studio => studio}/src/translations/object_viewer_qt_ru.ts (100%)
 rename {code/studio => studio}/src/translations/translations.qrc (100%)
 rename {code/tool => tool}/CMakeLists.txt (100%)
 rename {code/tool => tool}/attribution/annotate.py (100%)
 rename {code/tool => tool}/bin2c/CMakeLists.txt (100%)
 rename {code/tool => tool}/bin2c/bin2c.cpp (100%)
 rename {code/tool => tool}/build/build (100%)
 rename {code/tool => tool}/build/buildquiet (100%)
 rename {code/tool => tool}/crash/crash.cpp (100%)
 rename {code/tool => tool}/increment_version/increment_version.cpp (100%)
 rename {code/tool => tool}/increment_version/increment_version.py (100%)
 rename {code/tool => tool}/mkdir_date/mkdir_date.cpp (100%)
 rename {code/tool => tool}/open_file/open_file.cpp (100%)
 rename {code/tool => tool}/path_content_diff/path_content_diff.cpp (100%)
 rename {code/tool => tool}/ren_date/ren_date.cpp (100%)
 rename {code/tool => tool}/resswap/ResSwap.cpp (100%)
 rename {code/tool => tool}/resswap/icon1.ico (100%)
 rename {code/tool => tool}/visual_studio_macros/autoexp.dat (100%)
 rename {code/tool => tool}/visual_studio_macros/autoexp_vc10.dat (100%)
 rename {code/tool => tool}/visual_studio_macros/doxbar.chm (100%)
 rename {code/tool => tool}/visual_studio_macros/nevrax_macros.dsm (100%)
 rename {code/tool => tool}/visual_studio_macros/nevrax_macros_98.dsm (100%)
 rename {code/tool => tool}/visual_studio_macros/nevrax_macros_howto.txt (100%)
 rename {code/tool => tool}/visual_studio_macros/nevrax_macros_ryzom.dsm (100%)
 rename {code/tool => tool}/visual_studio_macros/usertype.dat (100%)
 rename {code/tool => tool}/visual_studio_macros/visual studio paths.reg (100%)
 rename {code/web => web}/docs/admin/shard_restart/Filelist.xml (100%)
 rename {code/web => web}/docs/admin/shard_restart/H38.css (100%)
 rename {code/web => web}/docs/admin/shard_restart/H70_2.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hd36.xml (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hf69.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg39_1.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg39_1.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg41_2.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg41_2.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg43_3.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg43_3.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg45_4.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg45_4.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg47_5.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg47_5.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg49_6.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg49_6.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg51_7.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg51_7.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg53_8.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg53_8.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg55_9.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg55_9.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg57_10.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg57_10.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg59_11.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg59_11.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg61_12.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hg61_12.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hn68.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hu37.js (100%)
 rename {code/web => web}/docs/admin/shard_restart/Hz63.htm (100%)
 rename {code/web => web}/docs/admin/shard_restart/lt_off.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/lt_over.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/rt_off.gif (100%)
 rename {code/web => web}/docs/admin/shard_restart/rt_over.gif (100%)
 rename {code/web => web}/docs/ams/doxygen/Doxyfile (100%)
 rename {code/web => web}/docs/ams/doxygen/img/db.png (100%)
 rename {code/web => web}/docs/ams/doxygen/img/info.jpg (100%)
 rename {code/web => web}/docs/ams/doxygen/img/info.psd (100%)
 rename {code/web => web}/docs/ams/doxygen/info.php (100%)
 rename {code/web => web}/docs/ams/doxygen/logo.png (100%)
 rename {code/web => web}/private_php/ams/autoload/assigned.php (100%)
 rename {code/web => web}/private_php/ams/autoload/dblayer.php (100%)
 rename {code/web => web}/private_php/ams/autoload/forwarded.php (100%)
 rename {code/web => web}/private_php/ams/autoload/gui_elements.php (100%)
 rename {code/web => web}/private_php/ams/autoload/helpers.php (100%)
 rename {code/web => web}/private_php/ams/autoload/in_support_group.php (100%)
 rename {code/web => web}/private_php/ams/autoload/mail_handler.php (100%)
 rename {code/web => web}/private_php/ams/autoload/mycrypt.php (100%)
 rename {code/web => web}/private_php/ams/autoload/pagination.php (100%)
 rename {code/web => web}/private_php/ams/autoload/plugincache.php (100%)
 rename {code/web => web}/private_php/ams/autoload/querycache.php (100%)
 rename {code/web => web}/private_php/ams/autoload/rest_api.php (100%)
 rename {code/web => web}/private_php/ams/autoload/support_group.php (100%)
 rename {code/web => web}/private_php/ams/autoload/sync.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_category.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_content.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_info.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_log.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_queue.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_queue_handler.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_reply.php (100%)
 rename {code/web => web}/private_php/ams/autoload/ticket_user.php (100%)
 rename {code/web => web}/private_php/ams/autoload/users.php (100%)
 rename {code/web => web}/private_php/ams/configs/ams_lib.conf (100%)
 rename {code/web => web}/private_php/ams/configs/ingame_layout.ini (100%)
 rename {code/web => web}/private_php/ams/img/info/client.png (100%)
 rename {code/web => web}/private_php/ams/img/info/connect.png (100%)
 rename {code/web => web}/private_php/ams/img/info/cpuid.png (100%)
 rename {code/web => web}/private_php/ams/img/info/ht.png (100%)
 rename {code/web => web}/private_php/ams/img/info/local.png (100%)
 rename {code/web => web}/private_php/ams/img/info/mask.png (100%)
 rename {code/web => web}/private_php/ams/img/info/memory.png (100%)
 rename {code/web => web}/private_php/ams/img/info/nel.png (100%)
 rename {code/web => web}/private_php/ams/img/info/os.png (100%)
 rename {code/web => web}/private_php/ams/img/info/patch.png (100%)
 rename {code/web => web}/private_php/ams/img/info/position.png (100%)
 rename {code/web => web}/private_php/ams/img/info/processor.png (100%)
 rename {code/web => web}/private_php/ams/img/info/server.png (100%)
 rename {code/web => web}/private_php/ams/img/info/shard.png (100%)
 rename {code/web => web}/private_php/ams/img/info/user.png (100%)
 rename {code/web => web}/private_php/ams/img/info/view.png (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/createticket.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/dashboard.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/index.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/layout.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/layout_admin.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/layout_mod.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/layout_user.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/login.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/register.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/settings.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/sgroup_list.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_queue.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_reply.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_sgroup.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_ticket.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_ticket_info.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_ticket_log.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/show_user.tpl (100%)
 rename {code/web => web}/private_php/ams/ingame_templates/userlist.tpl (100%)
 rename {code/web => web}/private_php/ams/libinclude.php (100%)
 rename {code/web => web}/private_php/ams/mail/placeholder (100%)
 rename {code/web => web}/private_php/ams/plugins/API_key_management/.info (100%)
 rename {code/web => web}/private_php/ams/plugins/API_key_management/API_key_management.php (100%)
 rename {code/web => web}/private_php/ams/plugins/API_key_management/generate_key.php (100%)
 rename {code/web => web}/private_php/ams/plugins/API_key_management/templates/gen_key.tpl (100%)
 rename {code/web => web}/private_php/ams/plugins/API_key_management/templates/index.tpl (100%)
 rename {code/web => web}/private_php/ams/plugins/Achievements/.info (100%)
 rename {code/web => web}/private_php/ams/plugins/Achievements/Achievements.php (100%)
 rename {code/web => web}/private_php/ams/plugins/Achievements/templates/index.tpl (100%)
 rename {code/web => web}/private_php/ams/plugins/Domain_Management/.info (100%)
 rename {code/web => web}/private_php/ams/plugins/Domain_Management/Domain_Management.php (100%)
 rename {code/web => web}/private_php/ams/plugins/Domain_Management/templates/index.tpl (100%)
 rename {code/web => web}/private_php/ams/plugins/cacheresource.apc.php (100%)
 rename {code/web => web}/private_php/ams/plugins/cacheresource.memcache.php (100%)
 rename {code/web => web}/private_php/ams/plugins/cacheresource.mysql.php (100%)
 rename {code/web => web}/private_php/ams/plugins/doxygen_plugin_management.php (100%)
 rename {code/web => web}/private_php/ams/plugins/resource.extendsall.php (100%)
 rename {code/web => web}/private_php/ams/plugins/resource.mysql.php (100%)
 rename {code/web => web}/private_php/ams/plugins/resource.mysqls.php (100%)
 rename {code/web => web}/private_php/ams/smarty/README (100%)
 rename {code/web => web}/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt (100%)
 rename {code/web => web}/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt (100%)
 rename {code/web => web}/private_php/ams/smarty/SMARTY_3.1_NOTES.txt (100%)
 rename {code/web => web}/private_php/ams/smarty/change_log.txt (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/Smarty.class.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/SmartyBC.class.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/debug.tpl (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/block.textformat.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.counter.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.cycle.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.fetch.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_image.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_options.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_radios.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_select_date.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_select_time.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.html_table.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.mailto.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/function.math.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.capitalize.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.date_format.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.escape.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.replace.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.spacify.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifier.truncate.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_resource.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php (100%)
 rename {code/web => web}/private_php/ams/smarty/libs/sysplugins/smarty_security.php (100%)
 rename {code/web => web}/private_php/ams/tmp/placeholder (100%)
 rename {code/web => web}/private_php/ams/translations/en.ini (100%)
 rename {code/web => web}/private_php/ams/translations/fr.ini (100%)
 rename {code/web => web}/private_php/setup/config/config.php (100%)
 rename {code/web => web}/private_php/setup/config/config_user.php (100%)
 rename {code/web => web}/private_php/setup/sql/nel_00001.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_00002.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_00003.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_00004.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_00001.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_00002.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00001.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00002.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00003.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00004.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00005.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00006.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_ams_lib_00007.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_tool_00001.sql (100%)
 rename {code/web => web}/private_php/setup/sql/nel_tool_00002.sql (100%)
 rename {code/web => web}/private_php/setup/sql/ring_domain_00001.sql (100%)
 rename {code/web => web}/private_php/setup/sql/webig_00001.sql (100%)
 rename {code/web => web}/public_php/admin/common.php (100%)
 rename {code/web => web}/public_php/admin/config.php (100%)
 rename {code/web => web}/public_php/admin/crons/cron_harddisk.php (100%)
 rename {code/web => web}/public_php/admin/crons/cron_harddisk.sh (100%)
 rename {code/web => web}/public_php/admin/crons/index.html (100%)
 rename {code/web => web}/public_php/admin/functions_auth.php (100%)
 rename {code/web => web}/public_php/admin/functions_common.php (100%)
 rename {code/web => web}/public_php/admin/functions_mysqli.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_administration.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_applications.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_event_entities.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_graphs.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_guild_locator.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_log_analyser.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_main.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_mfs.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_notes.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_player_locator.php (100%)
 rename {code/web => web}/public_php/admin/functions_tool_preferences.php (100%)
 rename {code/web => web}/public_php/admin/graphs_output/placeholder (100%)
 rename {code/web => web}/public_php/admin/imgs/bg_live.png (100%)
 rename {code/web => web}/public_php/admin/imgs/getfirefox.png (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_admin.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_entity.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_graphs.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_guild_locator.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_log_analyser.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_logout.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_main.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_notes.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_player_locator.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_preferences.gif (100%)
 rename {code/web => web}/public_php/admin/imgs/icon_unknown.png (100%)
 rename {code/web => web}/public_php/admin/imgs/nel.gif (100%)
 rename {code/web => web}/public_php/admin/index.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/flags.dat (100%)
 rename {code/web => web}/public_php/admin/jpgraph/flags_thumb100x100.dat (100%)
 rename {code/web => web}/public_php/admin/jpgraph/flags_thumb35x35.dat (100%)
 rename {code/web => web}/public_php/admin/jpgraph/flags_thumb60x60.dat (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_balls.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_bevels.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_diamonds.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_pushpins.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_squares.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/imgdata_stars.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpg-config.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_antispam-digits.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_antispam.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_bar.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_canvas.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_canvtools.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_date.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_error.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_flags.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_gantt.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_gb2312.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_gradient.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_iconplot.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_imgtrans.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_line.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_log.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_pie.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_pie3d.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_plotband.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_plotmark.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_polar.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_radar.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_regstat.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_scatter.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_stock.php (100%)
 rename {code/web => web}/public_php/admin/jpgraph/jpgraph_utils.inc (100%)
 rename {code/web => web}/public_php/admin/jpgraph/lang/en.inc.php (100%)
 rename {code/web => web}/public_php/admin/logs/empty.txt (100%)
 rename {code/web => web}/public_php/admin/nel/admin_modules_itf.php (100%)
 rename {code/web => web}/public_php/admin/nel/nel_message.php (100%)
 rename {code/web => web}/public_php/admin/neltool.css (100%)
 rename {code/web => web}/public_php/admin/overlib/handgrab.gif (100%)
 rename {code/web => web}/public_php/admin/overlib/makemini.pl (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib.js (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib_anchor.js (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib_anchor_mini.js (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib_draggable.js (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib_draggable_mini.js (100%)
 rename {code/web => web}/public_php/admin/overlib/overlib_mini.js (100%)
 rename {code/web => web}/public_php/admin/scripts/index.html (100%)
 rename {code/web => web}/public_php/admin/scripts/restart_sequence.php (100%)
 rename {code/web => web}/public_php/admin/scripts/run_script.sh (100%)
 rename {code/web => web}/public_php/admin/smarty/Config_File.class.php (100%)
 rename {code/web => web}/public_php/admin/smarty/Smarty.class.php (100%)
 rename {code/web => web}/public_php/admin/smarty/Smarty_Compiler.class.php (100%)
 rename {code/web => web}/public_php/admin/smarty/debug.tpl (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.assign_smarty_interface.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.create_dir_structure.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.display_debug_console.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.get_include_path.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.get_microtime.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.get_php_resource.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.is_secure.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.is_trusted.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.load_plugins.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.load_resource_plugin.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.process_cached_inserts.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.process_compiled_include.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.read_cache_file.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.rm_auto.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.rmdir.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.run_insert_handler.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.smarty_include_php.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.write_cache_file.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.write_compiled_include.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.write_compiled_resource.php (100%)
 rename {code/web => web}/public_php/admin/smarty/internals/core.write_file.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/block.textformat.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/compiler.assign.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.assign_debug_info.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.config_load.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.counter.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.cycle.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.debug.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.eval.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.fetch.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_checkboxes.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_image.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_options.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_radios.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_select_date.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_select_time.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.html_table.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.mailto.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.math.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.popup.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.popup_init.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/function.substr.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.capitalize.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.cat.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.count_characters.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.count_paragraphs.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.count_sentences.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.count_words.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.date_format.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.debug_print_var.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.default.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.escape.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.indent.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.lower.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.nl2br.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.regex_replace.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.replace.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.spacify.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.string_format.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.strip.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.strip_tags.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.truncate.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.upper.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/modifier.wordwrap.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/shared.escape_special_chars.php (100%)
 rename {code/web => web}/public_php/admin/smarty/plugins/shared.make_timestamp.php (100%)
 rename {code/web => web}/public_php/admin/templates/default/index.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/index_login.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/index_restart_sequence.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/page_footer.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/page_footer_light.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/page_header.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/page_header_light.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_actions.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_applications.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_domains.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_groups.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_logs.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_restarts.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_shards.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_users.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_administration_users.tpl.backup (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_event_entities.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_graphs.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_graphs_ccu.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_graphs_hires.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_graphs_tech.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_guild_locator.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_log_analyser.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_log_analyser_file_view.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_mfs.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_notes.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_player_locator.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default/tool_preferences.tpl (100%)
 rename {code/web => web}/public_php/admin/templates/default_c/placeholder (100%)
 rename {code/web => web}/public_php/admin/tool_actions.php (100%)
 rename {code/web => web}/public_php/admin/tool_administration.php (100%)
 rename {code/web => web}/public_php/admin/tool_event_entities.php (100%)
 rename {code/web => web}/public_php/admin/tool_graphs.php (100%)
 rename {code/web => web}/public_php/admin/tool_guild_locator.php (100%)
 rename {code/web => web}/public_php/admin/tool_log_analyser.php (100%)
 rename {code/web => web}/public_php/admin/tool_mfs.php (100%)
 rename {code/web => web}/public_php/admin/tool_notes.php (100%)
 rename {code/web => web}/public_php/admin/tool_player_locator.php (100%)
 rename {code/web => web}/public_php/admin/tool_preferences.php (100%)
 rename {code/web => web}/public_php/ams/autoload/webusers.php (100%)
 rename {code/web => web}/public_php/ams/cache/placeholder (100%)
 rename {code/web => web}/public_php/ams/configs/ams_lib.conf (100%)
 rename {code/web => web}/public_php/ams/cron/mail_cron.php (100%)
 rename {code/web => web}/public_php/ams/cron/sync_cron.php (100%)
 rename {code/web => web}/public_php/ams/css/animate.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-cerulean.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-cerulean.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-classic.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-classic.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-cyborg.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-cyborg.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-darkly.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-journal.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-lumen.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-redy.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-responsive.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-responsive.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-simplex.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-simplex.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-slate.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-slate.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-spacelab.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-spacelab.min.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-united.css (100%)
 rename {code/web => web}/public_php/ams/css/bootstrap-united.min.css (100%)
 rename {code/web => web}/public_php/ams/css/charisma-app.css (100%)
 rename {code/web => web}/public_php/ams/css/chosen.css (100%)
 rename {code/web => web}/public_php/ams/css/colorbox.css (100%)
 rename {code/web => web}/public_php/ams/css/custom.css (100%)
 rename {code/web => web}/public_php/ams/css/elfinder.min.css (100%)
 rename {code/web => web}/public_php/ams/css/elfinder.theme.css (100%)
 rename {code/web => web}/public_php/ams/css/fullcalendar.css (100%)
 rename {code/web => web}/public_php/ams/css/fullcalendar.print.css (100%)
 rename {code/web => web}/public_php/ams/css/jquery-ui-1.8.21.custom.css (100%)
 rename {code/web => web}/public_php/ams/css/jquery.cleditor.css (100%)
 rename {code/web => web}/public_php/ams/css/jquery.iphone.toggle.css (100%)
 rename {code/web => web}/public_php/ams/css/jquery.noty.css (100%)
 rename {code/web => web}/public_php/ams/css/noty_theme_default.css (100%)
 rename {code/web => web}/public_php/ams/css/opa-icons.css (100%)
 rename {code/web => web}/public_php/ams/css/uniform.default.css (100%)
 rename {code/web => web}/public_php/ams/css/uploadify.css (100%)
 rename {code/web => web}/public_php/ams/doc/assets/images/html_structure.png (100%)
 rename {code/web => web}/public_php/ams/doc/assets/images/image_1.png (100%)
 rename {code/web => web}/public_php/ams/doc/css/documenter_style.css (100%)
 rename {code/web => web}/public_php/ams/doc/css/img/info.png (100%)
 rename {code/web => web}/public_php/ams/doc/css/img/pre_bg.png (100%)
 rename {code/web => web}/public_php/ams/doc/css/img/warning.png (100%)
 rename {code/web => web}/public_php/ams/doc/favicon.ico (100%)
 rename {code/web => web}/public_php/ams/doc/index.html (100%)
 rename {code/web => web}/public_php/ams/doc/js/jquery.1.6.4.js (100%)
 rename {code/web => web}/public_php/ams/doc/js/jquery.easing.js (100%)
 rename {code/web => web}/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js (100%)
 rename {code/web => web}/public_php/ams/doc/js/script.js (100%)
 rename {code/web => web}/public_php/ams/files/.htaccess (100%)
 rename {code/web => web}/public_php/ams/files/index.html (100%)
 rename {code/web => web}/public_php/ams/fonts/glyphicons-halflings-regular.eot (100%)
 rename {code/web => web}/public_php/ams/fonts/glyphicons-halflings-regular.svg (100%)
 rename {code/web => web}/public_php/ams/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {code/web => web}/public_php/ams/fonts/glyphicons-halflings-regular.woff (100%)
 rename {code/web => web}/public_php/ams/func/activate_plugin.php (100%)
 rename {code/web => web}/public_php/ams/func/add_sgroup.php (100%)
 rename {code/web => web}/public_php/ams/func/add_user.php (100%)
 rename {code/web => web}/public_php/ams/func/add_user_to_sgroup.php (100%)
 rename {code/web => web}/public_php/ams/func/change_info.php (100%)
 rename {code/web => web}/public_php/ams/func/change_mail.php (100%)
 rename {code/web => web}/public_php/ams/func/change_password.php (100%)
 rename {code/web => web}/public_php/ams/func/change_receivemail.php (100%)
 rename {code/web => web}/public_php/ams/func/create_ticket.php (100%)
 rename {code/web => web}/public_php/ams/func/deactivate_plugin.php (100%)
 rename {code/web => web}/public_php/ams/func/delete_plugin.php (100%)
 rename {code/web => web}/public_php/ams/func/forgot_password.php (100%)
 rename {code/web => web}/public_php/ams/func/install_plugin.php (100%)
 rename {code/web => web}/public_php/ams/func/login.php (100%)
 rename {code/web => web}/public_php/ams/func/modify_email_of_sgroup.php (100%)
 rename {code/web => web}/public_php/ams/func/reply_on_ticket.php (100%)
 rename {code/web => web}/public_php/ams/func/reset_password.php (100%)
 rename {code/web => web}/public_php/ams/func/update_plugin.php (100%)
 rename {code/web => web}/public_php/ams/func/upload.php (100%)
 rename {code/web => web}/public_php/ams/func/userRegistration.php (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-1.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-2.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-3.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-4.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-5.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-6.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-7.gif (100%)
 rename {code/web => web}/public_php/ams/img/ajax-loaders/ajax-loader-8.gif (100%)
 rename {code/web => web}/public_php/ams/img/arrows-active.png (100%)
 rename {code/web => web}/public_php/ams/img/arrows-normal.png (100%)
 rename {code/web => web}/public_php/ams/img/bg-input-focus.png (100%)
 rename {code/web => web}/public_php/ams/img/bg-input.png (100%)
 rename {code/web => web}/public_php/ams/img/border.png (100%)
 rename {code/web => web}/public_php/ams/img/buttons.gif (100%)
 rename {code/web => web}/public_php/ams/img/cancel-off.png (100%)
 rename {code/web => web}/public_php/ams/img/cancel-on.png (100%)
 rename {code/web => web}/public_php/ams/img/chosen-sprite.png (100%)
 rename {code/web => web}/public_php/ams/img/controls.png (100%)
 rename {code/web => web}/public_php/ams/img/crop.gif (100%)
 rename {code/web => web}/public_php/ams/img/dialogs.png (100%)
 rename {code/web => web}/public_php/ams/img/en.png (100%)
 rename {code/web => web}/public_php/ams/img/error_bg.png (100%)
 rename {code/web => web}/public_php/ams/img/favicon.ico (100%)
 rename {code/web => web}/public_php/ams/img/fr.png (100%)
 rename {code/web => web}/public_php/ams/img/glyphicons-halflings-white.png (100%)
 rename {code/web => web}/public_php/ams/img/glyphicons-halflings.png (100%)
 rename {code/web => web}/public_php/ams/img/icons-big.png (100%)
 rename {code/web => web}/public_php/ams/img/icons-small.png (100%)
 rename {code/web => web}/public_php/ams/img/info/client.png (100%)
 rename {code/web => web}/public_php/ams/img/info/connect.png (100%)
 rename {code/web => web}/public_php/ams/img/info/cpuid.png (100%)
 rename {code/web => web}/public_php/ams/img/info/ht.png (100%)
 rename {code/web => web}/public_php/ams/img/info/local.png (100%)
 rename {code/web => web}/public_php/ams/img/info/mask.png (100%)
 rename {code/web => web}/public_php/ams/img/info/memory.png (100%)
 rename {code/web => web}/public_php/ams/img/info/nel.png (100%)
 rename {code/web => web}/public_php/ams/img/info/os.png (100%)
 rename {code/web => web}/public_php/ams/img/info/patch.png (100%)
 rename {code/web => web}/public_php/ams/img/info/position.png (100%)
 rename {code/web => web}/public_php/ams/img/info/processor.png (100%)
 rename {code/web => web}/public_php/ams/img/info/server.png (100%)
 rename {code/web => web}/public_php/ams/img/info/shard.png (100%)
 rename {code/web => web}/public_php/ams/img/info/user.png (100%)
 rename {code/web => web}/public_php/ams/img/info/view.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/off.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/on.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/slider.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/slider_center.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/slider_left.png (100%)
 rename {code/web => web}/public_php/ams/img/iphone-style-checkboxes/slider_right.png (100%)
 rename {code/web => web}/public_php/ams/img/loading.gif (100%)
 rename {code/web => web}/public_php/ams/img/loading_background.png (100%)
 rename {code/web => web}/public_php/ams/img/logo.png (100%)
 rename {code/web => web}/public_php/ams/img/logo20.png (100%)
 rename {code/web => web}/public_php/ams/img/mainlogo.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-black16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-black32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-blue16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-blue32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-color16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-color32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-darkgray16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-darkgray32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-gray16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-gray32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-green16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-green32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-orange16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-orange32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-red16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-red32.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-white16.png (100%)
 rename {code/web => web}/public_php/ams/img/opa-icons-white32.png (100%)
 rename {code/web => web}/public_php/ams/img/progress.gif (100%)
 rename {code/web => web}/public_php/ams/img/qrcode.png (100%)
 rename {code/web => web}/public_php/ams/img/qrcode136.png (100%)
 rename {code/web => web}/public_php/ams/img/quicklook-bg.png (100%)
 rename {code/web => web}/public_php/ams/img/quicklook-icons.png (100%)
 rename {code/web => web}/public_php/ams/img/resize.png (100%)
 rename {code/web => web}/public_php/ams/img/ryzomcore.png (100%)
 rename {code/web => web}/public_php/ams/img/ryzomcore_166_62.png (100%)
 rename {code/web => web}/public_php/ams/img/ryzomlogo.psd (100%)
 rename {code/web => web}/public_php/ams/img/ryzomtop.png (100%)
 rename {code/web => web}/public_php/ams/img/spinner-mini.gif (100%)
 rename {code/web => web}/public_php/ams/img/sprite.png (100%)
 rename {code/web => web}/public_php/ams/img/star-half.png (100%)
 rename {code/web => web}/public_php/ams/img/star-off.png (100%)
 rename {code/web => web}/public_php/ams/img/star-on.png (100%)
 rename {code/web => web}/public_php/ams/img/thumb.png (100%)
 rename {code/web => web}/public_php/ams/img/toolbar.gif (100%)
 rename {code/web => web}/public_php/ams/img/toolbar.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-icons_222222_256x240.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-icons_2e83ff_256x240.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-icons_454545_256x240.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-icons_888888_256x240.png (100%)
 rename {code/web => web}/public_php/ams/img/ui-icons_cd0a0a_256x240.png (100%)
 rename {code/web => web}/public_php/ams/img/uploadify-cancel.png (100%)
 rename {code/web => web}/public_php/ams/inc/change_permission.php (100%)
 rename {code/web => web}/public_php/ams/inc/createticket.php (100%)
 rename {code/web => web}/public_php/ams/inc/dashboard.php (100%)
 rename {code/web => web}/public_php/ams/inc/error.php (100%)
 rename {code/web => web}/public_php/ams/inc/forgot_password.php (100%)
 rename {code/web => web}/public_php/ams/inc/login.php (100%)
 rename {code/web => web}/public_php/ams/inc/logout.php (100%)
 rename {code/web => web}/public_php/ams/inc/plugins.php (100%)
 rename {code/web => web}/public_php/ams/inc/plugins_update.php (100%)
 rename {code/web => web}/public_php/ams/inc/register.php (100%)
 rename {code/web => web}/public_php/ams/inc/reset_password.php (100%)
 rename {code/web => web}/public_php/ams/inc/settings.php (100%)
 rename {code/web => web}/public_php/ams/inc/sgroup_list.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_queue.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_reply.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_sgroup.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_ticket.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_ticket_info.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_ticket_log.php (100%)
 rename {code/web => web}/public_php/ams/inc/show_user.php (100%)
 rename {code/web => web}/public_php/ams/inc/syncing.php (100%)
 rename {code/web => web}/public_php/ams/inc/userlist.php (100%)
 rename {code/web => web}/public_php/ams/index.php (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-alert.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-button.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-carousel.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-collapse.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-dropdown.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-modal.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-popover.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-scrollspy.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-tab.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-toggle.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-tooltip.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-tour.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-transition.js (100%)
 rename {code/web => web}/public_php/ams/js/bootstrap-typeahead.js (100%)
 rename {code/web => web}/public_php/ams/js/charisma.js (100%)
 rename {code/web => web}/public_php/ams/js/custom.js (100%)
 rename {code/web => web}/public_php/ams/js/excanvas.js (100%)
 rename {code/web => web}/public_php/ams/js/fullcalendar.min.js (100%)
 rename {code/web => web}/public_php/ams/js/help.js (100%)
 rename {code/web => web}/public_php/ams/js/init-chart.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery-1.7.2.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery-ui-1.8.21.custom.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.autogrow-textarea.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.chosen.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.cleditor.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.colorbox.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.cookie.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.dataTables.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.elfinder.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.flot.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.flot.pie.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.flot.resize.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.flot.stack.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.history.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.iphone.toggle.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.noty.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.raty.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.uniform.min.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.uploadify-3.1.js (100%)
 rename {code/web => web}/public_php/ams/js/jquery.uploadify-3.1.min.js (100%)
 rename {code/web => web}/public_php/ams/js/masonry.pkgd.min.js (100%)
 rename {code/web => web}/public_php/ams/misc/check-exists.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/MySQLStorage.sql (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/connector.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/elFinder.class.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php (100%)
 rename {code/web => web}/public_php/ams/misc/elfinder-connector/mime.types (100%)
 rename {code/web => web}/public_php/ams/misc/uploadify.php (100%)
 rename {code/web => web}/public_php/ams/misc/uploadify.swf (100%)
 rename {code/web => web}/public_php/ams/sql/DBScheme.png (100%)
 rename {code/web => web}/public_php/ams/sql/db.sql (100%)
 rename {code/web => web}/public_php/ams/sql/importusers.php (100%)
 rename {code/web => web}/public_php/ams/sql/ticketsql.sql (100%)
 rename {code/web => web}/public_php/ams/sql/ticketsystemmodel.mwb (100%)
 rename {code/web => web}/public_php/ams/templates/README.md (100%)
 rename {code/web => web}/public_php/ams/templates/createticket.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/dashboard.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/error.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/forgot_password.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/homebackup.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/install.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/install_plugin.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/layout.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/layout_admin.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/layout_mod.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/layout_plugin.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/layout_user.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/license.txt (100%)
 rename {code/web => web}/public_php/ams/templates/login.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/logout.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/plugins.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/plugins_update.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/register.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/register_feedback.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/reset_password.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/reset_success.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/settings.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/sgroup_list.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_queue.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_reply.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_sgroup.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_ticket.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_ticket_info.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_ticket_log.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/show_user.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/syncing.tpl (100%)
 rename {code/web => web}/public_php/ams/templates/userlist.tpl (100%)
 rename {code/web => web}/public_php/ams/templates_c/placeholder (100%)
 rename {code/web => web}/public_php/api/client/auth.php (100%)
 rename {code/web => web}/public_php/api/client/config.php.default (100%)
 rename {code/web => web}/public_php/api/client/time.php (100%)
 rename {code/web => web}/public_php/api/client/user.php (100%)
 rename {code/web => web}/public_php/api/client/utils.php (100%)
 rename {code/web => web}/public_php/api/common/actionPage.php (100%)
 rename {code/web => web}/public_php/api/common/auth.php (100%)
 rename {code/web => web}/public_php/api/common/bbCode.php (100%)
 rename {code/web => web}/public_php/api/common/config.php.default (100%)
 rename {code/web => web}/public_php/api/common/db_defs.php (100%)
 rename {code/web => web}/public_php/api/common/db_lib.php (100%)
 rename {code/web => web}/public_php/api/common/dfm.php (100%)
 rename {code/web => web}/public_php/api/common/logger.php (100%)
 rename {code/web => web}/public_php/api/common/render.php (100%)
 rename {code/web => web}/public_php/api/common/ryform.php (100%)
 rename {code/web => web}/public_php/api/common/ryformBases.php (100%)
 rename {code/web => web}/public_php/api/common/time.php (100%)
 rename {code/web => web}/public_php/api/common/user.php (100%)
 rename {code/web => web}/public_php/api/common/utils.php (100%)
 rename {code/web => web}/public_php/api/common/xml_utils.php (100%)
 rename {code/web => web}/public_php/api/data/css/ryzom_iphone.css (100%)
 rename {code/web => web}/public_php/api/data/css/ryzom_ui.css (100%)
 rename {code/web => web}/public_php/api/data/css/skin_b.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_bl.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_blank.png (100%)
 rename {code/web => web}/public_php/api/data/css/skin_blank_inner.png (100%)
 rename {code/web => web}/public_php/api/data/css/skin_br.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_header_l.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_header_m.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_header_r.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_l.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_r.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_t.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_tl.gif (100%)
 rename {code/web => web}/public_php/api/data/css/skin_tr.gif (100%)
 rename {code/web => web}/public_php/api/data/icons/add_app.png (100%)
 rename {code/web => web}/public_php/api/data/icons/edit.png (100%)
 rename {code/web => web}/public_php/api/data/icons/edit_16.png (100%)
 rename {code/web => web}/public_php/api/data/icons/no_action.png (100%)
 rename {code/web => web}/public_php/api/data/icons/spe_com.png (100%)
 rename {code/web => web}/public_php/api/data/img/backgrounds/parchemin.png (100%)
 rename {code/web => web}/public_php/api/data/img/bg.jpg (100%)
 rename {code/web => web}/public_php/api/data/img/bordure.png (100%)
 rename {code/web => web}/public_php/api/data/img/lang/de.png (100%)
 rename {code/web => web}/public_php/api/data/img/lang/en.png (100%)
 rename {code/web => web}/public_php/api/data/img/lang/es.png (100%)
 rename {code/web => web}/public_php/api/data/img/lang/fr.png (100%)
 rename {code/web => web}/public_php/api/data/img/lang/ru.png (100%)
 rename {code/web => web}/public_php/api/data/img/logo.gif (100%)
 rename {code/web => web}/public_php/api/data/js/combobox.js (100%)
 rename {code/web => web}/public_php/api/data/js/jquery-1.7.1.js (100%)
 rename {code/web => web}/public_php/api/data/js/tab.js (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/.htaccess (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/1h_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/2h_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/am_logo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_armpad.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_armpad_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_botte.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_botte_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_gilet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_gilet_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_hand.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_hand_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_helmet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_helmet_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_pantabotte.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_exit.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_rolemastercraft.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_rolemasterfight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_rolemastermagic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/asc_unknown.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bg_downloader.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bg_empty.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_aura.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_conso.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_consommable.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_fyros.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_fyros_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_generic_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_goo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_guild.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_horde.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_kami.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_karavan.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_matis.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_matis_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_mission.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_mission2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_outpost.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_outpost_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_power.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_primes.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_service.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_training.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_tryker.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_tryker_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_zorai.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/bk_zorai_brick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/brick_default.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/building_state_24x24.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cb_main_nue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ch_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/charge.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/clef.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_branche.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_branche_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_fleur.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_fleur_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_grappe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_grappe_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_nectar.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/conso_nectar_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/construction.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_over_break.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_over_less.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_over_more.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_over_opening.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cp_over_opening_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cristal_ammo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cristal_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/cristal_spell.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ef_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ef_over_break.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ef_over_less.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ef_over_more.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fo_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fo_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_ammo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_armor.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_building.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_jewel.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_melee.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_range.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_shield.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/fp_tools.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_absorb_damage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_accurate.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_acid.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_head.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_amande.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_ammo_bullet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_ammo_jacket.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_angle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_clip.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_heavy.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_kitin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_light.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_medium.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_penalty.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_armor_shell.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_atys.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_atysian.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_balance_hp.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_barrel.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_bash.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_berserk.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_blade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_bleeding.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_blind.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_blunt.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_bomb.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_celestial.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_circular_attack.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_clothes.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_cold.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_concentration.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_consommable_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_constitution.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_counterweight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_craft_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_create_sapload.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_curse.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_debuff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_debuff_resist.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_debuff_skill.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_desert.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_dexterity.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_disarm.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_dodge.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_dot.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_durability.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_electric.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_explosif.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_extracting.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fear.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_feint.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fire.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_firing_pin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_focus.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_forage_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_forbid_item.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_forest.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_foreuse.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_gardening.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_gentle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_goo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_gripp.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_haircolor.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_haircut.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_hammer.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_harmful.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_hatred.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_heal.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_hit_rate.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_incapacity.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_intelligence.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_interrupt.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_invulnerability.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_jewel_stone.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_jungle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_lacustre.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_landmark_bonus.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_level.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_lining.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_location.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_madness.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_magic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_magic_action_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_magic_focus.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_magic_target_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_melee_action_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_melee_target_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mental.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_metabolism.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mezz.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_misfortune.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_art_matis.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_barrel.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_bottle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_casket.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_medicine.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_message.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_package.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_pot.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_mission_purse.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_move.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_multi_fight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_multiple_spots.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_noix.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_opening_hit.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_autumn.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_degenerated.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_fauna.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_flora.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_arms.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_chest.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_feet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_hands.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_head.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_hit_legs.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_homin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_kitin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_magic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_melee.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_racial.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_range.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_special.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_spring.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_summer.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_over_winter.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_parry.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_piercing.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_pointe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_poison.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_power.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_preservation.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_primal.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_prime_roots.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_private.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_prospecting.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_quality.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_racine.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_range.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_range_action_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_range_target_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_ricochet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_root.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_rot.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_safe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_sap.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_self_damage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_shaft.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_shield_buff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_shield_up.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_shielding.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_shockwave.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_sickness.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_slashing.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_slow.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_soft_spot.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_source_knowledge.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_source_time.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_speed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_speeding_up.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_spell_break.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_spores.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_spray.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_spying.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_stamina.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_strength.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_stuffing.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_stunn.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_craft.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_done.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_failed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_fight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_forage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_generic_quart.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_guild.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_rite.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_task_travel.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_tatoo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_taunt.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_time.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_time_bonus.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_tourbe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_trigger.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_umbrella.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_use_enchantement.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_vampire.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_visibility.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_war_cry.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_weight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_wellbalanced.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_will.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_windding.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/ico_wisdom.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/improved_tool.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/item_default.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/item_plan_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/lucky_flower.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mail.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mektoub_pack.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mektoub_steed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mf_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mf_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mg_glove.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mission_icon_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mission_icon_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mission_icon_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mission_icon_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_amber.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_back_curative.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_back_offensive.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_back_selfonly.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_bark.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_brique.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_colonne.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_comble.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_ornement.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_revetement.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_socle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_batiment_statue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_beak.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_blood.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_bone.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_bud.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_buterfly_blue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_cereal.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_claw.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dandelion.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dry (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dry wood.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dry.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dry_wood.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_dust.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_egg.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_eyes.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_fang.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_fiber.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_filament.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_fish_scale.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_flowers.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_fruit.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_generic_colorize.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_gomme.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_goo_residue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_hairs.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_hoof.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_horn.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_horney.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_insect_fossil.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_kitin_flesh.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_kitin_secretion.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_kitinshell.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_larva.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_leaf.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_leather.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_liane.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_lichen.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_ligament.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_mandible.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_meat.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_moss.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_mushroom.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_nail.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_oil.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_over_link.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_parasite.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_pearl.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_pelvis.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_pigment.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_pistil.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_plant_fossil.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_pollen.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_resin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_ronce.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_rostrum.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_sap.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_sawdust.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_seed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_shell.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_silk_worm.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_skin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_skull.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_spiders_web.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_spine.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_stem.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_sting.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_straw.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_suc.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_tail.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_tooth.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_trunk.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_whiskers.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_wing.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_wood.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mp_wood_node.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_2h_axe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_2h_lance.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_2h_mace.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_2h_sword.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_axe.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_dagger.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_lance.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_mace.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_staff.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/mw_sword.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/no_action.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/num_slash.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/op_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/op_over_break.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/op_over_less.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/op_over_more.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_anklet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_back.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_bracelet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_diadem.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_earring.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_over_break.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_over_less.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_over_more.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_pendant.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pa_ring.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/profile.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/protect_amber.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_primas.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_ally_ranger.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_aura.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_aura_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_boost.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_boost_mask.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_5.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_7.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_heavy.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_light.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/pw_medium.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_coeur.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_foie.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_jeton.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_langue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_louche.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_oreille.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_patte.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_poils.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_queue.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/quest_ticket.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/r2_live.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/r2_live_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/r2_live_pushed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/r2_palette_entities.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/requirement.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_f.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_f_upgrade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_h.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_h_upgrade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_m.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_m_upgrade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_r.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rm_r_upgrade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_200.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_201.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_202.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_203.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_204.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_205.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_206.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_207.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_advanced.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_elementary.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_roleplay.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task_certificats.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task_convert.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task_elementary.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_200_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_200_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_200_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_201_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_201_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_201_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_202_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_202_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_202_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_203_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_203_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_203_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_204_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_204_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_204_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_205_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_205_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_205_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_206_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_206_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_206_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_207_a.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_207_b.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_207_c.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rpjobitem_certifications.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_autolaunch.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_bowgun.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_grenade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_harpoongun.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_launcher.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_pistol.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_pistolarc.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/rw_rifle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/sapload.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/sh_buckler.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/sh_large_shield.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_craft.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_done.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_failed.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_fight.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_forage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_generic.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_guild.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_rite.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/small_task_travel.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_beast.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_com.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_inventory.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_labs.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_memory.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_options.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/spe_status.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/stimulating_water.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_attack.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_config.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_disband.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_disengage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_extract.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_invite.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_kick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_move.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_run.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_sit.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_stand.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_stop.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_talk.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_action_walk.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_animals.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_config.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_connection.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_contacts.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_desk_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_desk_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_desk_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_desk_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_faction.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_forum.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_guild.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_help2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_keys.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_macros.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_mail.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_mode.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_mode_dodge.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_mode_parry.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_over.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_support.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_team.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tb_windows.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tetekitin.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_ammo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_armor.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_cooking_pot.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_fishing_rod.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_forage.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_hammer.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_jewelry_hammer.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_jewels.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_leathercutter.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_melee.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_needle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_pestle.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_range.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_searake.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_spade.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_stick.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_tunneling_knife.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_whip.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/to_wrench.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tp_caravane.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/tp_kami.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_5.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_7.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_8.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_back_9.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_5.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_7.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_8.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_ico_9.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_over_0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_over_1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_over_2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_over_3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/us_over_4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_am_logo.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_leader.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_major.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_anklet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_bracelet.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_diadem.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_earring.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_pendant.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_pa_ring.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/interface/xp_cat_green.png (100%)
 rename {code/web => web}/public_php/api/data/ryzom/items_db.php (100%)
 rename {code/web => web}/public_php/api/data/ryzom/ryShapesPs.php (100%)
 rename {code/web => web}/public_php/api/data/ryzom/sbrick_db.php (100%)
 rename {code/web => web}/public_php/api/index.php (100%)
 rename {code/web => web}/public_php/api/player_auth.php (100%)
 rename {code/web => web}/public_php/api/ryzom_api.php (100%)
 rename {code/web => web}/public_php/api/server/auth.php (100%)
 rename {code/web => web}/public_php/api/server/config.php.default (100%)
 rename {code/web => web}/public_php/api/server/guilds.php (100%)
 rename {code/web => web}/public_php/api/server/hmagic.php (100%)
 rename {code/web => web}/public_php/api/server/item_icon.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/AchWebParser.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/_test/char_346.xml (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/_test/diff_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/_test/diff_test.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/Atom_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/Callback_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/Logfile_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/Stats_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/class/mySQL_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/conf.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/include/functions_inc.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_ (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/parse_new_xml.sh (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/script/_scriptDir (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/script/item_grade_script.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/script/places/continents.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/script/places/global.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/script/statsdb.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/debug.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/faction.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/fame.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/inventory.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/logs.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/missions.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/public.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/shop.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/skills.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/social.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/achievement_script/xmldef/stats.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/create_guilds_xml.php (100%)
 rename {code/web => web}/public_php/api/server/scripts/generate_guild_icon.sh (100%)
 rename {code/web => web}/public_php/api/server/scripts/get_guilds_xml.sh (100%)
 rename {code/web => web}/public_php/api/server/time.php (100%)
 rename {code/web => web}/public_php/api/server/user.php (100%)
 rename {code/web => web}/public_php/api/server/utils.php (100%)
 rename {code/web => web}/public_php/api/time.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/_API/ach_progress.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/_API/ach_struct.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/_API/class/mySQL_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/_API/conf.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/Class_scheme.dia (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/Class_scheme.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/ER & Class Schema.pdf (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/ER_scheme.dia (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/ER_scheme.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/devshot_001.jpg (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/devshot_002.jpg (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/devshot_003.jpg (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/devshot_004.jpg (100%)
 rename {code/web => web}/public_php/app/app_achievements/_doc/structure_app_achievements.sql (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AVLTree_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchAchievement_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchCategory_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchList_abstract.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchMenuNode_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchMenu_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchObjective_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchSummary_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/AchTask_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/DLL_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/InDev_trait.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/NodeIterator_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/Node_abstract.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/Parentum_abstract.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/RyzomUser_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/class/Tieable_inter.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/conf.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/favicon.ico (100%)
 rename {code/web => web}/public_php/app/app_achievements/favicon.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/fb/base_facebook.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/fb/facebook.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt (100%)
 rename {code/web => web}/public_php/app/app_achievements/include/ach_render_common.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/include/ach_render_ig.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/include/ach_render_web.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/index.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/lang.php (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/ach_news.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_b.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_bg.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_bl.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_br.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_l.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_r.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_u.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_ul.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_done_ur.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_b.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_bl.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_br.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_l.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_r.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_u.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_ul.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/bar_pending_ur.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/check.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/f-connect.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/facebook-logo.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/icon/grey/small/test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/icon/grey/test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/icon/small/test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/icon/test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/menu/ig_summary.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/menu/ig_test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/menu/summary.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/menu/test.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/menu_space.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/pending.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/star_done.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/yubo_done.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/yubo_done_small.png (100%)
 rename {code/web => web}/public_php/app/app_achievements/pic/yubo_pending.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/_doc/ADM_scheme.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/ADM_inter.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmAchievement_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmAtom_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmCategory_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmMenu_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmObjective_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/AdmTask_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRAchievement_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRAtom_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRCategory_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRObjective_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSRTask_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/CSR_inter.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/class/mySQL_class.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/conf.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/favicon.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_ach.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_atom.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_csr.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_lang.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_menu.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/include/adm_render_stats.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/index.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/lang.php (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/b_drop.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/b_insrow.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/b_tblops.png (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/green.gif (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/icon_edit.gif (100%)
 rename {code/web => web}/public_php/app/app_achievements_admin/pic/red.gif (100%)
 rename {code/web => web}/public_php/app/app_test/create.sql (100%)
 rename {code/web => web}/public_php/app/app_test/favicon.png (100%)
 rename {code/web => web}/public_php/app/app_test/index.php (100%)
 rename {code/web => web}/public_php/app/app_test/lang.php (100%)
 rename {code/web => web}/public_php/app/config.php.default (100%)
 rename {code/web => web}/public_php/app/index.php (100%)
 rename {code/web => web}/public_php/app/lang.php (100%)
 rename {code/web => web}/public_php/crash_report/config.inc.php (100%)
 rename {code/web => web}/public_php/crash_report/log.inc.php (100%)
 rename {code/web => web}/public_php/crash_report/submit.php (100%)
 rename {code/web => web}/public_php/index.php (100%)
 rename {code/web => web}/public_php/login/client_install.php (100%)
 rename {code/web => web}/public_php/login/config.php (100%)
 rename {code/web => web}/public_php/login/email/RFC822.php (100%)
 rename {code/web => web}/public_php/login/email/htmlMimeMail.php (100%)
 rename {code/web => web}/public_php/login/email/mimePart.php (100%)
 rename {code/web => web}/public_php/login/email/smtp.php (100%)
 rename {code/web => web}/public_php/login/login_service_itf.php (100%)
 rename {code/web => web}/public_php/login/login_translations.php (100%)
 rename {code/web => web}/public_php/login/r2_login.php (100%)
 rename {code/web => web}/public_php/ring/anim_session.php (100%)
 rename {code/web => web}/public_php/ring/cancel_session.php (100%)
 rename {code/web => web}/public_php/ring/close_session.php (100%)
 rename {code/web => web}/public_php/ring/edit_session.php (100%)
 rename {code/web => web}/public_php/ring/invite_pioneer.php (100%)
 rename {code/web => web}/public_php/ring/join_session.php (100%)
 rename {code/web => web}/public_php/ring/join_shard.php (100%)
 rename {code/web => web}/public_php/ring/mail_forum_itf.php (100%)
 rename {code/web => web}/public_php/ring/plan_edit_session.php (100%)
 rename {code/web => web}/public_php/ring/ring_session_manager_itf.php (100%)
 rename {code/web => web}/public_php/ring/send_plan_edit_session.php (100%)
 rename {code/web => web}/public_php/ring/session_tools.php (100%)
 rename {code/web => web}/public_php/ring/start_session.php (100%)
 rename {code/web => web}/public_php/ring/welcome_service_itf.php (100%)
 rename {code/web => web}/public_php/setup/auth.php (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap-theme.css (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap-theme.css.map (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap-theme.min.css (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap.css (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap.css.map (100%)
 rename {code/web => web}/public_php/setup/css/bootstrap.min.css (100%)
 rename {code/web => web}/public_php/setup/database.php (100%)
 rename {code/web => web}/public_php/setup/fonts/glyphicons-halflings-regular.eot (100%)
 rename {code/web => web}/public_php/setup/fonts/glyphicons-halflings-regular.svg (100%)
 rename {code/web => web}/public_php/setup/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {code/web => web}/public_php/setup/fonts/glyphicons-halflings-regular.woff (100%)
 rename {code/web => web}/public_php/setup/footer.php (100%)
 rename {code/web => web}/public_php/setup/header.php (100%)
 rename {code/web => web}/public_php/setup/img/agplv3-88x31.png (100%)
 rename {code/web => web}/public_php/setup/index.php (100%)
 rename {code/web => web}/public_php/setup/install.php (100%)
 rename {code/web => web}/public_php/setup/js/bootstrap.js (100%)
 rename {code/web => web}/public_php/setup/js/bootstrap.min.js (100%)
 rename {code/web => web}/public_php/setup/template.htm (100%)
 rename {code/web => web}/public_php/setup/upgrade.php (100%)
 rename {code/web => web}/public_php/setup/version.php (100%)
 rename {code/web => web}/public_php/tools/domain_info.php (100%)
 rename {code/web => web}/public_php/tools/nel_message.php (100%)
 rename {code/web => web}/public_php/tools/validate_cookie.php (100%)
 rename {code/web => web}/public_php/webtt/.gitignore (100%)
 rename {code/web => web}/public_php/webtt/.htaccess (100%)
 rename {code/web => web}/public_php/webtt/CakePHP_README (100%)
 rename {code/web => web}/public_php/webtt/app/.htaccess (100%)
 rename {code/web => web}/public_php/webtt/app/config/acl.ini.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/bootstrap.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/core.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/database.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/database.php.default (100%)
 rename {code/web => web}/public_php/webtt/app/config/routes.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/schema/db_acl.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/schema/i18n.php (100%)
 rename {code/web => web}/public_php/webtt/app/config/schema/sessions.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/app_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/comments_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/components/empty (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/components/path_resolver.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/file_identifiers_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/identifier_columns_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/identifiers_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/imported_translation_files_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/languages_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/pages_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/raw_files_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/translation_files_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/translations_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/users_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/controllers/votes_controller.php (100%)
 rename {code/web => web}/public_php/webtt/app/index.php (100%)
 rename {code/web => web}/public_php/webtt/app/libs/empty (100%)
 rename {code/web => web}/public_php/webtt/app/locale/eng/LC_MESSAGES/empty (100%)
 rename {code/web => web}/public_php/webtt/app/models/app_model.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/behaviors/empty (100%)
 rename {code/web => web}/public_php/webtt/app/models/behaviors/null.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/comment.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/datasources/empty (100%)
 rename {code/web => web}/public_php/webtt/app/models/datasources/raw_files_source.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/file_identifier.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/identifier.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/identifier_column.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/imported_translation_file.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/language.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/raw_file.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/translation.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/translation_file.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/user.php (100%)
 rename {code/web => web}/public_php/webtt/app/models/vote.php (100%)
 rename {code/web => web}/public_php/webtt/app/plugins/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/cases/behaviors/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/cases/components/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/cases/controllers/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/cases/helpers/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/cases/models/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/fixtures/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tests/groups/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/cache/models/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/cache/persistent/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/cache/views/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/logs/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/sessions/empty (100%)
 rename {code/web => web}/public_php/webtt/app/tmp/tests/empty (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/PhraseParser.php (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/SheetParser.php (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/StringParser.php (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/empty (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/comments/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/email/html/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/email/html/registration.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/email/text/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/email/text/registration.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/elements/neighbours.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/errors/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/file_identifiers/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/helpers/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifier_columns/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifier_columns/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifier_columns/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifier_columns/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/identifiers/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/imported_translation_files/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/languages/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/admin.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/default_debug.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/js/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/new.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/rss/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/layouts/xml/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/pages/admin/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/pages/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/raw_files/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/raw_files/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/raw_files/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/raw_files/listdir.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/raw_files/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/scaffolds/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/scaffolds/empty (100%)
 rename {code/web => web}/public_php/webtt/app/views/scaffolds/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/scaffolds/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translation_files/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translation_files/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translation_files/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translation_files/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/translations/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/login.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/register.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/users/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/admin_add.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/admin_edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/admin_index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/admin_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/views/votes/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/.htaccess (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css.php (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/960.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/cake.generic.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/grid.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/ie.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/ie6.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/labelWidth.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/layout.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/nav.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/reset.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/css/text.css (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/favicon.ico (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/files/empty (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/img/cake.icon.png (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/img/cake.power.gif (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/img/switch_minus.gif (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/img/switch_plus.gif (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/index.php (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/js/empty (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/js/jquery-fluid16.js (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/js/jquery-ui.js (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/test.php (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/testfiles/raw_testfile.csv (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv (100%)
 rename {code/web => web}/public_php/webtt/app/webroot/testfiles/ugabla.csv (100%)
 rename {code/web => web}/public_php/webtt/cake/LICENSE.txt (100%)
 rename {code/web => web}/public_php/webtt/cake/VERSION.txt (100%)
 rename {code/web => web}/public_php/webtt/cake/basics.php (100%)
 rename {code/web => web}/public_php/webtt/cake/bootstrap.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/config.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/paths.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php (100%)
 rename {code/web => web}/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/cake (100%)
 rename {code/web => web}/public_php/webtt/cake/console/cake.bat (100%)
 rename {code/web => web}/public_php/webtt/cake/console/cake.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/error.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/acl.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/api.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/bake.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/console.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/i18n.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/schema.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/shell.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/bake.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/db_config.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/extract.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/plugin.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/project.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/template.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/tasks/view.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/libs/testsuite.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/classes/controller.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/classes/fixture.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/classes/model.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/classes/test.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/views/form.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/views/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/views/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/default/views/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/.htaccess (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/app_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/app_helper.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/app_model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/acl.ini.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/bootstrap.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/core.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/database.php.default (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/routes.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/controllers/components/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/index.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/libs/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/models/behaviors/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/models/datasources/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/plugins/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tests/groups/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/logs/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/tmp/tests/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/elements/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/errors/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/helpers/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/pages/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/.htaccess (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/css.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/index.php (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/js/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/console/templates/skel/webroot/test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/dispatcher.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cache/apc.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cache/file.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cache/memcache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cache/xcache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cake_log.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cake_session.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/cake_socket.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/class_registry.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/configure.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/app_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/component.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/acl.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/auth.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/cookie.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/email.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/request_handler.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/security.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/components/session.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/pages_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/controller/scaffold.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/debugger.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/error.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/file.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/folder.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/http_socket.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/i18n.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/inflector.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/l10n.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/log/file_log.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/magic_db.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/app_model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/behaviors/acl.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/behaviors/containable.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/behaviors/translate.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/behaviors/tree.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/cake_schema.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/connection_manager.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/datasource.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/datasources/dbo_source.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/db_acl.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/model/model_behavior.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/multibyte.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/object.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/overloadable.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/overloadable_php4.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/overloadable_php5.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/router.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/sanitize.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/security.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/set.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/string.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/validation.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/elements/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/elements/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/elements/sql_dump.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/error404.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/error500.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_action.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_connection.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_controller.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_layout.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_model.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_table.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/missing_view.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/private_action.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helper.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/ajax.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/app_helper.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/cache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/form.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/html.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/javascript.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/jquery_engine.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/js.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/mootools_engine.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/number.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/paginator.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/prototype_engine.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/rss.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/session.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/text.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/time.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/helpers/xml.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/ajax.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/flash.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/js/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/rss/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/layouts/xml/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/media.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/pages/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/scaffolds/edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/scaffolds/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/scaffolds/view.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/theme.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/view/view.php (100%)
 rename {code/web => web}/public_php/webtt/cake/libs/xml.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/basics.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/cake.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/acl.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/api.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/bake.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/schema.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/shell.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/dispatcher.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cache.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cache/file.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cake_log.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cake_session.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/class_registry.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/configure.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/component.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/debugger.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/error.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/file.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/folder.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/http_socket.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/i18n.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/inflector.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/l10n.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/magic_db.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/model/models.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/multibyte.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/object.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/overloadable.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/router.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/sanitize.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/security.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/set.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/string.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/test_manager.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/validation.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helper.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/media.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/theme.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/view/view.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/cases/libs/xml.test.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/account_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aco_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/ad_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/another_article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/apple_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aro_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/attachment_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/author_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/basket_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/bid_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/book_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/callback_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/campaign_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/category_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/cd_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/comment_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/content_account_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/content_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/data_test_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/datatype_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/dependency_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/device_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/device_type_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/document_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/featured_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/film_file_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/fruit_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/home_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/image_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/item_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_a_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_b_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_c_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/message_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/my_category_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/my_product_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/my_user_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/node_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/person_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/post_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/product_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/project_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/sample_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/session_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/something_else_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/something_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/story_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/syfile_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/thread_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translate_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/user_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuid_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/acl.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/bake.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/behaviors.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/cache.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/components.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/configure.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/console.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/controller.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/database.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/helpers.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/i18n.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/javascript.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/lib.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/model.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/routing_system.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/socket.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/test_suite.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/view.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/groups/xml.group.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/cake_test_case.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/cake_test_fixture.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/cake_test_model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/cake_web_test_case.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/code_coverage_manager.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/templates/footer.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/templates/header.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/templates/menu.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/templates/simpletest.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/templates/xdebug.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/lib/test_manager.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/config/acl.ini.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/controllers/components/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/libs/library.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/behaviors/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/comment.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/persister_one.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/persister_two.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/models/post.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/tmp/dir_map (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/vendors/welcome.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/errors/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/helpers/banana.php (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/helpers/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/pages/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/pages/home.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/scaffolds/empty (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif (100%)
 rename {code/web => web}/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg (100%)
 rename {code/web => web}/public_php/webtt/docs/INSTALL (100%)
 rename {code/web => web}/public_php/webtt/docs/db/CakePHP_Associations (100%)
 rename {code/web => web}/public_php/webtt/docs/db/erd.png (100%)
 rename {code/web => web}/public_php/webtt/docs/db/webtt2.db (100%)
 rename {code/web => web}/public_php/webtt/index.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/.gitignore (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/README.mdown (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/build.py (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/models/toolbar_access.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/debug.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png (100%)
 rename {code/web => web}/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js (100%)
 rename {code/web => web}/public_php/webtt/plugins/empty (100%)
 rename {code/web => web}/public_php/webtt/vendors/shells/tasks/empty (100%)
 rename {code/web => web}/public_php/webtt/vendors/shells/templates/empty (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/LICENSE (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/README (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/VERSION (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/authentication.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/autorun.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/browser.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/collector.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/compatibility.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/cookies.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/default_reporter.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/detached.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/docs.css (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/index.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/overview.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/docs.css (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/index.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/overview.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/dumper.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/eclipse.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/encoding.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/errors.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/exceptions.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/expectation.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/extensions/testdox.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/extensions/testdox/test.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/form.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/frames.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/http.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/invoker.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/mock_objects.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/page.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/php_parser.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/reflection_php4.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/reflection_php5.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/remote.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/reporter.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/scorer.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/selector.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/shell_tester.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/simpletest.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/socket.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/tag.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/test_case.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/tidy_parser.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/unit_tester.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/url.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/user_agent.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/web_tester.php (100%)
 rename {code/web => web}/public_php/webtt/vendors/simpletest/xml.php (100%)

diff --git a/code/.clang-format b/.clang-format
similarity index 100%
rename from code/.clang-format
rename to .clang-format
diff --git a/code/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from code/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/code/CMakeModules/AndroidToolChain.cmake b/CMakeModules/AndroidToolChain.cmake
similarity index 100%
rename from code/CMakeModules/AndroidToolChain.cmake
rename to CMakeModules/AndroidToolChain.cmake
diff --git a/code/CMakeModules/CheckDepends.cmake b/CMakeModules/CheckDepends.cmake
similarity index 100%
rename from code/CMakeModules/CheckDepends.cmake
rename to CMakeModules/CheckDepends.cmake
diff --git a/code/CMakeModules/ConfigureChecks.cmake b/CMakeModules/ConfigureChecks.cmake
similarity index 100%
rename from code/CMakeModules/ConfigureChecks.cmake
rename to CMakeModules/ConfigureChecks.cmake
diff --git a/code/CMakeModules/Find3dsMaxSDK.cmake b/CMakeModules/Find3dsMaxSDK.cmake
similarity index 100%
rename from code/CMakeModules/Find3dsMaxSDK.cmake
rename to CMakeModules/Find3dsMaxSDK.cmake
diff --git a/code/CMakeModules/FindCEGUI.cmake b/CMakeModules/FindCEGUI.cmake
similarity index 100%
rename from code/CMakeModules/FindCEGUI.cmake
rename to CMakeModules/FindCEGUI.cmake
diff --git a/code/CMakeModules/FindCppTest.cmake b/CMakeModules/FindCppTest.cmake
similarity index 100%
rename from code/CMakeModules/FindCppTest.cmake
rename to CMakeModules/FindCppTest.cmake
diff --git a/code/CMakeModules/FindCustomMFC.cmake b/CMakeModules/FindCustomMFC.cmake
similarity index 100%
rename from code/CMakeModules/FindCustomMFC.cmake
rename to CMakeModules/FindCustomMFC.cmake
diff --git a/code/CMakeModules/FindDSound.cmake b/CMakeModules/FindDSound.cmake
similarity index 100%
rename from code/CMakeModules/FindDSound.cmake
rename to CMakeModules/FindDSound.cmake
diff --git a/code/CMakeModules/FindDirectXSDK.cmake b/CMakeModules/FindDirectXSDK.cmake
similarity index 100%
rename from code/CMakeModules/FindDirectXSDK.cmake
rename to CMakeModules/FindDirectXSDK.cmake
diff --git a/code/CMakeModules/FindEFXUtil.cmake b/CMakeModules/FindEFXUtil.cmake
similarity index 100%
rename from code/CMakeModules/FindEFXUtil.cmake
rename to CMakeModules/FindEFXUtil.cmake
diff --git a/code/CMakeModules/FindExternal.cmake b/CMakeModules/FindExternal.cmake
similarity index 100%
rename from code/CMakeModules/FindExternal.cmake
rename to CMakeModules/FindExternal.cmake
diff --git a/code/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake
similarity index 100%
rename from code/CMakeModules/FindFFmpeg.cmake
rename to CMakeModules/FindFFmpeg.cmake
diff --git a/code/CMakeModules/FindFMOD.cmake b/CMakeModules/FindFMOD.cmake
similarity index 100%
rename from code/CMakeModules/FindFMOD.cmake
rename to CMakeModules/FindFMOD.cmake
diff --git a/code/CMakeModules/FindFreeType.cmake b/CMakeModules/FindFreeType.cmake
similarity index 100%
rename from code/CMakeModules/FindFreeType.cmake
rename to CMakeModules/FindFreeType.cmake
diff --git a/code/CMakeModules/FindGLIB2.cmake b/CMakeModules/FindGLIB2.cmake
similarity index 100%
rename from code/CMakeModules/FindGLIB2.cmake
rename to CMakeModules/FindGLIB2.cmake
diff --git a/code/CMakeModules/FindGOBJECT2.cmake b/CMakeModules/FindGOBJECT2.cmake
similarity index 100%
rename from code/CMakeModules/FindGOBJECT2.cmake
rename to CMakeModules/FindGOBJECT2.cmake
diff --git a/code/CMakeModules/FindGTK2.cmake b/CMakeModules/FindGTK2.cmake
similarity index 100%
rename from code/CMakeModules/FindGTK2.cmake
rename to CMakeModules/FindGTK2.cmake
diff --git a/code/CMakeModules/FindHelpers.cmake b/CMakeModules/FindHelpers.cmake
similarity index 100%
rename from code/CMakeModules/FindHelpers.cmake
rename to CMakeModules/FindHelpers.cmake
diff --git a/code/CMakeModules/FindIconv.cmake b/CMakeModules/FindIconv.cmake
similarity index 100%
rename from code/CMakeModules/FindIconv.cmake
rename to CMakeModules/FindIconv.cmake
diff --git a/code/CMakeModules/FindJpeg.cmake b/CMakeModules/FindJpeg.cmake
similarity index 100%
rename from code/CMakeModules/FindJpeg.cmake
rename to CMakeModules/FindJpeg.cmake
diff --git a/code/CMakeModules/FindLIBGSF.cmake b/CMakeModules/FindLIBGSF.cmake
similarity index 100%
rename from code/CMakeModules/FindLIBGSF.cmake
rename to CMakeModules/FindLIBGSF.cmake
diff --git a/code/CMakeModules/FindLibOVR.cmake b/CMakeModules/FindLibOVR.cmake
similarity index 100%
rename from code/CMakeModules/FindLibOVR.cmake
rename to CMakeModules/FindLibOVR.cmake
diff --git a/code/CMakeModules/FindLibVR.cmake b/CMakeModules/FindLibVR.cmake
similarity index 100%
rename from code/CMakeModules/FindLibVR.cmake
rename to CMakeModules/FindLibVR.cmake
diff --git a/code/CMakeModules/FindLua52.cmake b/CMakeModules/FindLua52.cmake
similarity index 100%
rename from code/CMakeModules/FindLua52.cmake
rename to CMakeModules/FindLua52.cmake
diff --git a/code/CMakeModules/FindLua53.cmake b/CMakeModules/FindLua53.cmake
similarity index 100%
rename from code/CMakeModules/FindLua53.cmake
rename to CMakeModules/FindLua53.cmake
diff --git a/code/CMakeModules/FindLuabind.cmake b/CMakeModules/FindLuabind.cmake
similarity index 100%
rename from code/CMakeModules/FindLuabind.cmake
rename to CMakeModules/FindLuabind.cmake
diff --git a/code/CMakeModules/FindMSVC.cmake b/CMakeModules/FindMSVC.cmake
similarity index 100%
rename from code/CMakeModules/FindMSVC.cmake
rename to CMakeModules/FindMSVC.cmake
diff --git a/code/CMakeModules/FindMercurial.cmake b/CMakeModules/FindMercurial.cmake
similarity index 100%
rename from code/CMakeModules/FindMercurial.cmake
rename to CMakeModules/FindMercurial.cmake
diff --git a/code/CMakeModules/FindMySQL.cmake b/CMakeModules/FindMySQL.cmake
similarity index 100%
rename from code/CMakeModules/FindMySQL.cmake
rename to CMakeModules/FindMySQL.cmake
diff --git a/code/CMakeModules/FindNeL.cmake b/CMakeModules/FindNeL.cmake
similarity index 100%
rename from code/CMakeModules/FindNeL.cmake
rename to CMakeModules/FindNeL.cmake
diff --git a/code/CMakeModules/FindOgg.cmake b/CMakeModules/FindOgg.cmake
similarity index 100%
rename from code/CMakeModules/FindOgg.cmake
rename to CMakeModules/FindOgg.cmake
diff --git a/code/CMakeModules/FindOpenGLES.cmake b/CMakeModules/FindOpenGLES.cmake
similarity index 100%
rename from code/CMakeModules/FindOpenGLES.cmake
rename to CMakeModules/FindOpenGLES.cmake
diff --git a/code/CMakeModules/FindRyzomGameShare.cmake b/CMakeModules/FindRyzomGameShare.cmake
similarity index 100%
rename from code/CMakeModules/FindRyzomGameShare.cmake
rename to CMakeModules/FindRyzomGameShare.cmake
diff --git a/code/CMakeModules/FindSTLport.cmake b/CMakeModules/FindSTLport.cmake
similarity index 100%
rename from code/CMakeModules/FindSTLport.cmake
rename to CMakeModules/FindSTLport.cmake
diff --git a/code/CMakeModules/FindSquish.cmake b/CMakeModules/FindSquish.cmake
similarity index 100%
rename from code/CMakeModules/FindSquish.cmake
rename to CMakeModules/FindSquish.cmake
diff --git a/code/CMakeModules/FindSteam.cmake b/CMakeModules/FindSteam.cmake
similarity index 100%
rename from code/CMakeModules/FindSteam.cmake
rename to CMakeModules/FindSteam.cmake
diff --git a/code/CMakeModules/FindVorbis.cmake b/CMakeModules/FindVorbis.cmake
similarity index 100%
rename from code/CMakeModules/FindVorbis.cmake
rename to CMakeModules/FindVorbis.cmake
diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/CMakeModules/FindWindowsSDK.cmake
similarity index 100%
rename from code/CMakeModules/FindWindowsSDK.cmake
rename to CMakeModules/FindWindowsSDK.cmake
diff --git a/code/CMakeModules/FindXF86VidMode.cmake b/CMakeModules/FindXF86VidMode.cmake
similarity index 100%
rename from code/CMakeModules/FindXF86VidMode.cmake
rename to CMakeModules/FindXF86VidMode.cmake
diff --git a/code/CMakeModules/Findassimp.cmake b/CMakeModules/Findassimp.cmake
similarity index 100%
rename from code/CMakeModules/Findassimp.cmake
rename to CMakeModules/Findassimp.cmake
diff --git a/code/CMakeModules/GetRevision.cmake b/CMakeModules/GetRevision.cmake
similarity index 100%
rename from code/CMakeModules/GetRevision.cmake
rename to CMakeModules/GetRevision.cmake
diff --git a/code/CMakeModules/OSXToolChain.cmake b/CMakeModules/OSXToolChain.cmake
similarity index 100%
rename from code/CMakeModules/OSXToolChain.cmake
rename to CMakeModules/OSXToolChain.cmake
diff --git a/code/CMakeModules/PCHSupport.cmake b/CMakeModules/PCHSupport.cmake
similarity index 100%
rename from code/CMakeModules/PCHSupport.cmake
rename to CMakeModules/PCHSupport.cmake
diff --git a/code/CMakeModules/iOSToolChain.cmake b/CMakeModules/iOSToolChain.cmake
similarity index 100%
rename from code/CMakeModules/iOSToolChain.cmake
rename to CMakeModules/iOSToolChain.cmake
diff --git a/code/CMakeModules/nel.cmake b/CMakeModules/nel.cmake
similarity index 100%
rename from code/CMakeModules/nel.cmake
rename to CMakeModules/nel.cmake
diff --git a/code/CMakePackaging.txt b/CMakePackaging.txt
similarity index 100%
rename from code/CMakePackaging.txt
rename to CMakePackaging.txt
diff --git a/code/COPYING b/COPYING
similarity index 100%
rename from code/COPYING
rename to COPYING
diff --git a/code/CTestConfig.cmake b/CTestConfig.cmake
similarity index 100%
rename from code/CTestConfig.cmake
rename to CTestConfig.cmake
diff --git a/code/README b/README
similarity index 100%
rename from code/README
rename to README
diff --git a/code/changelog.template b/changelog.template
similarity index 100%
rename from code/changelog.template
rename to changelog.template
diff --git a/code/.editorconfig b/code/.editorconfig
deleted file mode 100644
index e4aef2c53..000000000
--- a/code/.editorconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-; Top-most EditorConfig file
-root = true
-
-; 4-column tab indentation
-[*.cpp]
-indent_style = tab
-indent_size = 4
-
-[*.c]
-indent_style = tab
-indent_size = 4
-
-[*.h]
-indent_style = tab
-indent_size = 4
-
-[*.py]
-indent_style = tab
-indent_size = 4
-
-[*.config]
-indent_style = space
-indent_size = 2
diff --git a/code/config.h.cmake b/config.h.cmake
similarity index 100%
rename from code/config.h.cmake
rename to config.h.cmake
diff --git a/code/nel/3rdparty/CMakeLists.txt b/nel/3rdparty/CMakeLists.txt
similarity index 100%
rename from code/nel/3rdparty/CMakeLists.txt
rename to nel/3rdparty/CMakeLists.txt
diff --git a/code/nel/3rdparty/seven_zip/7z.h b/nel/3rdparty/seven_zip/7z.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7z.h
rename to nel/3rdparty/seven_zip/7z.h
diff --git a/code/nel/3rdparty/seven_zip/7zAlloc.c b/nel/3rdparty/seven_zip/7zAlloc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zAlloc.c
rename to nel/3rdparty/seven_zip/7zAlloc.c
diff --git a/code/nel/3rdparty/seven_zip/7zAlloc.h b/nel/3rdparty/seven_zip/7zAlloc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zAlloc.h
rename to nel/3rdparty/seven_zip/7zAlloc.h
diff --git a/code/nel/3rdparty/seven_zip/7zArcIn.c b/nel/3rdparty/seven_zip/7zArcIn.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zArcIn.c
rename to nel/3rdparty/seven_zip/7zArcIn.c
diff --git a/code/nel/3rdparty/seven_zip/7zBuf.c b/nel/3rdparty/seven_zip/7zBuf.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zBuf.c
rename to nel/3rdparty/seven_zip/7zBuf.c
diff --git a/code/nel/3rdparty/seven_zip/7zBuf.h b/nel/3rdparty/seven_zip/7zBuf.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zBuf.h
rename to nel/3rdparty/seven_zip/7zBuf.h
diff --git a/code/nel/3rdparty/seven_zip/7zBuf2.c b/nel/3rdparty/seven_zip/7zBuf2.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zBuf2.c
rename to nel/3rdparty/seven_zip/7zBuf2.c
diff --git a/code/nel/3rdparty/seven_zip/7zCrc.c b/nel/3rdparty/seven_zip/7zCrc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zCrc.c
rename to nel/3rdparty/seven_zip/7zCrc.c
diff --git a/code/nel/3rdparty/seven_zip/7zCrc.h b/nel/3rdparty/seven_zip/7zCrc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zCrc.h
rename to nel/3rdparty/seven_zip/7zCrc.h
diff --git a/code/nel/3rdparty/seven_zip/7zCrcOpt.c b/nel/3rdparty/seven_zip/7zCrcOpt.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zCrcOpt.c
rename to nel/3rdparty/seven_zip/7zCrcOpt.c
diff --git a/code/nel/3rdparty/seven_zip/7zDec.c b/nel/3rdparty/seven_zip/7zDec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zDec.c
rename to nel/3rdparty/seven_zip/7zDec.c
diff --git a/code/nel/3rdparty/seven_zip/7zFile.c b/nel/3rdparty/seven_zip/7zFile.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zFile.c
rename to nel/3rdparty/seven_zip/7zFile.c
diff --git a/code/nel/3rdparty/seven_zip/7zFile.h b/nel/3rdparty/seven_zip/7zFile.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zFile.h
rename to nel/3rdparty/seven_zip/7zFile.h
diff --git a/code/nel/3rdparty/seven_zip/7zStream.c b/nel/3rdparty/seven_zip/7zStream.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zStream.c
rename to nel/3rdparty/seven_zip/7zStream.c
diff --git a/code/nel/3rdparty/seven_zip/7zTypes.h b/nel/3rdparty/seven_zip/7zTypes.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zTypes.h
rename to nel/3rdparty/seven_zip/7zTypes.h
diff --git a/code/nel/3rdparty/seven_zip/7zVersion.h b/nel/3rdparty/seven_zip/7zVersion.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zVersion.h
rename to nel/3rdparty/seven_zip/7zVersion.h
diff --git a/code/nel/3rdparty/seven_zip/7zVersion.rc b/nel/3rdparty/seven_zip/7zVersion.rc
similarity index 100%
rename from code/nel/3rdparty/seven_zip/7zVersion.rc
rename to nel/3rdparty/seven_zip/7zVersion.rc
diff --git a/code/nel/3rdparty/seven_zip/Aes.c b/nel/3rdparty/seven_zip/Aes.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Aes.c
rename to nel/3rdparty/seven_zip/Aes.c
diff --git a/code/nel/3rdparty/seven_zip/Aes.h b/nel/3rdparty/seven_zip/Aes.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Aes.h
rename to nel/3rdparty/seven_zip/Aes.h
diff --git a/code/nel/3rdparty/seven_zip/AesOpt.c b/nel/3rdparty/seven_zip/AesOpt.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/AesOpt.c
rename to nel/3rdparty/seven_zip/AesOpt.c
diff --git a/code/nel/3rdparty/seven_zip/Alloc.c b/nel/3rdparty/seven_zip/Alloc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Alloc.c
rename to nel/3rdparty/seven_zip/Alloc.c
diff --git a/code/nel/3rdparty/seven_zip/Alloc.h b/nel/3rdparty/seven_zip/Alloc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Alloc.h
rename to nel/3rdparty/seven_zip/Alloc.h
diff --git a/code/nel/3rdparty/seven_zip/Bcj2.c b/nel/3rdparty/seven_zip/Bcj2.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bcj2.c
rename to nel/3rdparty/seven_zip/Bcj2.c
diff --git a/code/nel/3rdparty/seven_zip/Bcj2.h b/nel/3rdparty/seven_zip/Bcj2.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bcj2.h
rename to nel/3rdparty/seven_zip/Bcj2.h
diff --git a/code/nel/3rdparty/seven_zip/Bcj2Enc.c b/nel/3rdparty/seven_zip/Bcj2Enc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bcj2Enc.c
rename to nel/3rdparty/seven_zip/Bcj2Enc.c
diff --git a/code/nel/3rdparty/seven_zip/Bra.c b/nel/3rdparty/seven_zip/Bra.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bra.c
rename to nel/3rdparty/seven_zip/Bra.c
diff --git a/code/nel/3rdparty/seven_zip/Bra.h b/nel/3rdparty/seven_zip/Bra.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bra.h
rename to nel/3rdparty/seven_zip/Bra.h
diff --git a/code/nel/3rdparty/seven_zip/Bra86.c b/nel/3rdparty/seven_zip/Bra86.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Bra86.c
rename to nel/3rdparty/seven_zip/Bra86.c
diff --git a/code/nel/3rdparty/seven_zip/BraIA64.c b/nel/3rdparty/seven_zip/BraIA64.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/BraIA64.c
rename to nel/3rdparty/seven_zip/BraIA64.c
diff --git a/code/nel/3rdparty/seven_zip/CMakeLists.txt b/nel/3rdparty/seven_zip/CMakeLists.txt
similarity index 100%
rename from code/nel/3rdparty/seven_zip/CMakeLists.txt
rename to nel/3rdparty/seven_zip/CMakeLists.txt
diff --git a/code/nel/3rdparty/seven_zip/Compiler.h b/nel/3rdparty/seven_zip/Compiler.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Compiler.h
rename to nel/3rdparty/seven_zip/Compiler.h
diff --git a/code/nel/3rdparty/seven_zip/CpuArch.c b/nel/3rdparty/seven_zip/CpuArch.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/CpuArch.c
rename to nel/3rdparty/seven_zip/CpuArch.c
diff --git a/code/nel/3rdparty/seven_zip/CpuArch.h b/nel/3rdparty/seven_zip/CpuArch.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/CpuArch.h
rename to nel/3rdparty/seven_zip/CpuArch.h
diff --git a/code/nel/3rdparty/seven_zip/Delta.c b/nel/3rdparty/seven_zip/Delta.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Delta.c
rename to nel/3rdparty/seven_zip/Delta.c
diff --git a/code/nel/3rdparty/seven_zip/Delta.h b/nel/3rdparty/seven_zip/Delta.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Delta.h
rename to nel/3rdparty/seven_zip/Delta.h
diff --git a/code/nel/3rdparty/seven_zip/DllSecur.c b/nel/3rdparty/seven_zip/DllSecur.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/DllSecur.c
rename to nel/3rdparty/seven_zip/DllSecur.c
diff --git a/code/nel/3rdparty/seven_zip/DllSecur.h b/nel/3rdparty/seven_zip/DllSecur.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/DllSecur.h
rename to nel/3rdparty/seven_zip/DllSecur.h
diff --git a/code/nel/3rdparty/seven_zip/LzFind.c b/nel/3rdparty/seven_zip/LzFind.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzFind.c
rename to nel/3rdparty/seven_zip/LzFind.c
diff --git a/code/nel/3rdparty/seven_zip/LzFind.h b/nel/3rdparty/seven_zip/LzFind.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzFind.h
rename to nel/3rdparty/seven_zip/LzFind.h
diff --git a/code/nel/3rdparty/seven_zip/LzHash.h b/nel/3rdparty/seven_zip/LzHash.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzHash.h
rename to nel/3rdparty/seven_zip/LzHash.h
diff --git a/code/nel/3rdparty/seven_zip/Lzma2Dec.c b/nel/3rdparty/seven_zip/Lzma2Dec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2Dec.c
rename to nel/3rdparty/seven_zip/Lzma2Dec.c
diff --git a/code/nel/3rdparty/seven_zip/Lzma2Dec.h b/nel/3rdparty/seven_zip/Lzma2Dec.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2Dec.h
rename to nel/3rdparty/seven_zip/Lzma2Dec.h
diff --git a/code/nel/3rdparty/seven_zip/Lzma2DecMt.c b/nel/3rdparty/seven_zip/Lzma2DecMt.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2DecMt.c
rename to nel/3rdparty/seven_zip/Lzma2DecMt.c
diff --git a/code/nel/3rdparty/seven_zip/Lzma2DecMt.h b/nel/3rdparty/seven_zip/Lzma2DecMt.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2DecMt.h
rename to nel/3rdparty/seven_zip/Lzma2DecMt.h
diff --git a/code/nel/3rdparty/seven_zip/Lzma2Enc.c b/nel/3rdparty/seven_zip/Lzma2Enc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2Enc.c
rename to nel/3rdparty/seven_zip/Lzma2Enc.c
diff --git a/code/nel/3rdparty/seven_zip/Lzma2Enc.h b/nel/3rdparty/seven_zip/Lzma2Enc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma2Enc.h
rename to nel/3rdparty/seven_zip/Lzma2Enc.h
diff --git a/code/nel/3rdparty/seven_zip/Lzma86.h b/nel/3rdparty/seven_zip/Lzma86.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma86.h
rename to nel/3rdparty/seven_zip/Lzma86.h
diff --git a/code/nel/3rdparty/seven_zip/Lzma86Dec.c b/nel/3rdparty/seven_zip/Lzma86Dec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma86Dec.c
rename to nel/3rdparty/seven_zip/Lzma86Dec.c
diff --git a/code/nel/3rdparty/seven_zip/Lzma86Enc.c b/nel/3rdparty/seven_zip/Lzma86Enc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Lzma86Enc.c
rename to nel/3rdparty/seven_zip/Lzma86Enc.c
diff --git a/code/nel/3rdparty/seven_zip/LzmaDec.c b/nel/3rdparty/seven_zip/LzmaDec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaDec.c
rename to nel/3rdparty/seven_zip/LzmaDec.c
diff --git a/code/nel/3rdparty/seven_zip/LzmaDec.h b/nel/3rdparty/seven_zip/LzmaDec.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaDec.h
rename to nel/3rdparty/seven_zip/LzmaDec.h
diff --git a/code/nel/3rdparty/seven_zip/LzmaEnc.c b/nel/3rdparty/seven_zip/LzmaEnc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaEnc.c
rename to nel/3rdparty/seven_zip/LzmaEnc.c
diff --git a/code/nel/3rdparty/seven_zip/LzmaEnc.h b/nel/3rdparty/seven_zip/LzmaEnc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaEnc.h
rename to nel/3rdparty/seven_zip/LzmaEnc.h
diff --git a/code/nel/3rdparty/seven_zip/LzmaLib.c b/nel/3rdparty/seven_zip/LzmaLib.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaLib.c
rename to nel/3rdparty/seven_zip/LzmaLib.c
diff --git a/code/nel/3rdparty/seven_zip/LzmaLib.h b/nel/3rdparty/seven_zip/LzmaLib.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaLib.h
rename to nel/3rdparty/seven_zip/LzmaLib.h
diff --git a/code/nel/3rdparty/seven_zip/LzmaUtil.c b/nel/3rdparty/seven_zip/LzmaUtil.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/LzmaUtil.c
rename to nel/3rdparty/seven_zip/LzmaUtil.c
diff --git a/code/nel/3rdparty/seven_zip/Ppmd.h b/nel/3rdparty/seven_zip/Ppmd.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Ppmd.h
rename to nel/3rdparty/seven_zip/Ppmd.h
diff --git a/code/nel/3rdparty/seven_zip/Ppmd7.c b/nel/3rdparty/seven_zip/Ppmd7.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Ppmd7.c
rename to nel/3rdparty/seven_zip/Ppmd7.c
diff --git a/code/nel/3rdparty/seven_zip/Ppmd7.h b/nel/3rdparty/seven_zip/Ppmd7.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Ppmd7.h
rename to nel/3rdparty/seven_zip/Ppmd7.h
diff --git a/code/nel/3rdparty/seven_zip/Ppmd7Dec.c b/nel/3rdparty/seven_zip/Ppmd7Dec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Ppmd7Dec.c
rename to nel/3rdparty/seven_zip/Ppmd7Dec.c
diff --git a/code/nel/3rdparty/seven_zip/Ppmd7Enc.c b/nel/3rdparty/seven_zip/Ppmd7Enc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Ppmd7Enc.c
rename to nel/3rdparty/seven_zip/Ppmd7Enc.c
diff --git a/code/nel/3rdparty/seven_zip/Precomp.h b/nel/3rdparty/seven_zip/Precomp.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Precomp.h
rename to nel/3rdparty/seven_zip/Precomp.h
diff --git a/code/nel/3rdparty/seven_zip/RotateDefs.h b/nel/3rdparty/seven_zip/RotateDefs.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/RotateDefs.h
rename to nel/3rdparty/seven_zip/RotateDefs.h
diff --git a/code/nel/3rdparty/seven_zip/Sha256.c b/nel/3rdparty/seven_zip/Sha256.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Sha256.c
rename to nel/3rdparty/seven_zip/Sha256.c
diff --git a/code/nel/3rdparty/seven_zip/Sha256.h b/nel/3rdparty/seven_zip/Sha256.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Sha256.h
rename to nel/3rdparty/seven_zip/Sha256.h
diff --git a/code/nel/3rdparty/seven_zip/Sort.c b/nel/3rdparty/seven_zip/Sort.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Sort.c
rename to nel/3rdparty/seven_zip/Sort.c
diff --git a/code/nel/3rdparty/seven_zip/Sort.h b/nel/3rdparty/seven_zip/Sort.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Sort.h
rename to nel/3rdparty/seven_zip/Sort.h
diff --git a/code/nel/3rdparty/seven_zip/Xz.c b/nel/3rdparty/seven_zip/Xz.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Xz.c
rename to nel/3rdparty/seven_zip/Xz.c
diff --git a/code/nel/3rdparty/seven_zip/Xz.h b/nel/3rdparty/seven_zip/Xz.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/Xz.h
rename to nel/3rdparty/seven_zip/Xz.h
diff --git a/code/nel/3rdparty/seven_zip/XzCrc64.c b/nel/3rdparty/seven_zip/XzCrc64.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzCrc64.c
rename to nel/3rdparty/seven_zip/XzCrc64.c
diff --git a/code/nel/3rdparty/seven_zip/XzCrc64.h b/nel/3rdparty/seven_zip/XzCrc64.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzCrc64.h
rename to nel/3rdparty/seven_zip/XzCrc64.h
diff --git a/code/nel/3rdparty/seven_zip/XzCrc64Opt.c b/nel/3rdparty/seven_zip/XzCrc64Opt.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzCrc64Opt.c
rename to nel/3rdparty/seven_zip/XzCrc64Opt.c
diff --git a/code/nel/3rdparty/seven_zip/XzDec.c b/nel/3rdparty/seven_zip/XzDec.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzDec.c
rename to nel/3rdparty/seven_zip/XzDec.c
diff --git a/code/nel/3rdparty/seven_zip/XzEnc.c b/nel/3rdparty/seven_zip/XzEnc.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzEnc.c
rename to nel/3rdparty/seven_zip/XzEnc.c
diff --git a/code/nel/3rdparty/seven_zip/XzEnc.h b/nel/3rdparty/seven_zip/XzEnc.h
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzEnc.h
rename to nel/3rdparty/seven_zip/XzEnc.h
diff --git a/code/nel/3rdparty/seven_zip/XzIn.c b/nel/3rdparty/seven_zip/XzIn.c
similarity index 100%
rename from code/nel/3rdparty/seven_zip/XzIn.c
rename to nel/3rdparty/seven_zip/XzIn.c
diff --git a/code/nel/AUTHORS b/nel/AUTHORS
similarity index 100%
rename from code/nel/AUTHORS
rename to nel/AUTHORS
diff --git a/code/nel/CMakeLists.txt b/nel/CMakeLists.txt
similarity index 100%
rename from code/nel/CMakeLists.txt
rename to nel/CMakeLists.txt
diff --git a/code/nel/COPYING b/nel/COPYING
similarity index 100%
rename from code/nel/COPYING
rename to nel/COPYING
diff --git a/code/nel/ChangeLog b/nel/ChangeLog
similarity index 100%
rename from code/nel/ChangeLog
rename to nel/ChangeLog
diff --git a/code/nel/INSTALL b/nel/INSTALL
similarity index 100%
rename from code/nel/INSTALL
rename to nel/INSTALL
diff --git a/code/nel/NEWS b/nel/NEWS
similarity index 100%
rename from code/nel/NEWS
rename to nel/NEWS
diff --git a/code/nel/README b/nel/README
similarity index 100%
rename from code/nel/README
rename to nel/README
diff --git a/code/nel/doc/Doxyfile.cmake.in b/nel/doc/Doxyfile.cmake.in
similarity index 100%
rename from code/nel/doc/Doxyfile.cmake.in
rename to nel/doc/Doxyfile.cmake.in
diff --git a/code/nel/doc/html/index.html b/nel/doc/html/index.html
similarity index 100%
rename from code/nel/doc/html/index.html
rename to nel/doc/html/index.html
diff --git a/code/nel/doc/make_all_dox.sh b/nel/doc/make_all_dox.sh
similarity index 100%
rename from code/nel/doc/make_all_dox.sh
rename to nel/doc/make_all_dox.sh
diff --git a/code/nel/doc/make_nel_dox.bat b/nel/doc/make_nel_dox.bat
similarity index 100%
rename from code/nel/doc/make_nel_dox.bat
rename to nel/doc/make_nel_dox.bat
diff --git a/code/nel/doc/make_nel_dox.sh b/nel/doc/make_nel_dox.sh
similarity index 100%
rename from code/nel/doc/make_nel_dox.sh
rename to nel/doc/make_nel_dox.sh
diff --git a/code/nel/doc/make_nelns_dox.bat b/nel/doc/make_nelns_dox.bat
similarity index 100%
rename from code/nel/doc/make_nelns_dox.bat
rename to nel/doc/make_nelns_dox.bat
diff --git a/code/nel/doc/make_nelns_dox.sh b/nel/doc/make_nelns_dox.sh
similarity index 100%
rename from code/nel/doc/make_nelns_dox.sh
rename to nel/doc/make_nelns_dox.sh
diff --git a/code/nel/doc/make_neltools_dox.bat b/nel/doc/make_neltools_dox.bat
similarity index 100%
rename from code/nel/doc/make_neltools_dox.bat
rename to nel/doc/make_neltools_dox.bat
diff --git a/code/nel/doc/make_neltools_dox.sh b/nel/doc/make_neltools_dox.sh
similarity index 100%
rename from code/nel/doc/make_neltools_dox.sh
rename to nel/doc/make_neltools_dox.sh
diff --git a/code/nel/doc/make_packages_doc.bat b/nel/doc/make_packages_doc.bat
similarity index 100%
rename from code/nel/doc/make_packages_doc.bat
rename to nel/doc/make_packages_doc.bat
diff --git a/code/nel/doc/make_packages_doc.sh b/nel/doc/make_packages_doc.sh
similarity index 100%
rename from code/nel/doc/make_packages_doc.sh
rename to nel/doc/make_packages_doc.sh
diff --git a/code/nel/doc/misc/event_callback.vsd b/nel/doc/misc/event_callback.vsd
similarity index 100%
rename from code/nel/doc/misc/event_callback.vsd
rename to nel/doc/misc/event_callback.vsd
diff --git a/code/nel/doc/misc/event_listener.vsd b/nel/doc/misc/event_listener.vsd
similarity index 100%
rename from code/nel/doc/misc/event_listener.vsd
rename to nel/doc/misc/event_listener.vsd
diff --git a/code/nel/doc/misc/event_pump.vsd b/nel/doc/misc/event_pump.vsd
similarity index 100%
rename from code/nel/doc/misc/event_pump.vsd
rename to nel/doc/misc/event_pump.vsd
diff --git a/code/nel/doc/nel.dox b/nel/doc/nel.dox
similarity index 100%
rename from code/nel/doc/nel.dox
rename to nel/doc/nel.dox
diff --git a/code/nel/doc/nel.hhp b/nel/doc/nel.hhp
similarity index 100%
rename from code/nel/doc/nel.hhp
rename to nel/doc/nel.hhp
diff --git a/code/nel/doc/nelns.dox b/nel/doc/nelns.dox
similarity index 100%
rename from code/nel/doc/nelns.dox
rename to nel/doc/nelns.dox
diff --git a/code/nel/doc/nelns.hhp b/nel/doc/nelns.hhp
similarity index 100%
rename from code/nel/doc/nelns.hhp
rename to nel/doc/nelns.hhp
diff --git a/code/nel/doc/neltools.dox b/nel/doc/neltools.dox
similarity index 100%
rename from code/nel/doc/neltools.dox
rename to nel/doc/neltools.dox
diff --git a/code/nel/doc/neltools.hhp b/nel/doc/neltools.hhp
similarity index 100%
rename from code/nel/doc/neltools.hhp
rename to nel/doc/neltools.hhp
diff --git a/code/nel/doc/net/login_system.vsd b/nel/doc/net/login_system.vsd
similarity index 100%
rename from code/nel/doc/net/login_system.vsd
rename to nel/doc/net/login_system.vsd
diff --git a/code/nel/doc/net/nelnet-layer1-server-obj.png b/nel/doc/net/nelnet-layer1-server-obj.png
similarity index 100%
rename from code/nel/doc/net/nelnet-layer1-server-obj.png
rename to nel/doc/net/nelnet-layer1-server-obj.png
diff --git a/code/nel/doc/net/net.dxt b/nel/doc/net/net.dxt
similarity index 100%
rename from code/nel/doc/net/net.dxt
rename to nel/doc/net/net.dxt
diff --git a/code/nel/include/CMakeLists.txt b/nel/include/CMakeLists.txt
similarity index 100%
rename from code/nel/include/CMakeLists.txt
rename to nel/include/CMakeLists.txt
diff --git a/code/nel/include/nel/3d/CMakeLists.txt b/nel/include/nel/3d/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/3d/CMakeLists.txt
rename to nel/include/nel/3d/CMakeLists.txt
diff --git a/code/nel/include/nel/3d/anim_ctrl.h b/nel/include/nel/3d/anim_ctrl.h
similarity index 100%
rename from code/nel/include/nel/3d/anim_ctrl.h
rename to nel/include/nel/3d/anim_ctrl.h
diff --git a/code/nel/include/nel/3d/anim_detail_trav.h b/nel/include/nel/3d/anim_detail_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/anim_detail_trav.h
rename to nel/include/nel/3d/anim_detail_trav.h
diff --git a/code/nel/include/nel/3d/animatable.h b/nel/include/nel/3d/animatable.h
similarity index 100%
rename from code/nel/include/nel/3d/animatable.h
rename to nel/include/nel/3d/animatable.h
diff --git a/code/nel/include/nel/3d/animated_lightmap.h b/nel/include/nel/3d/animated_lightmap.h
similarity index 100%
rename from code/nel/include/nel/3d/animated_lightmap.h
rename to nel/include/nel/3d/animated_lightmap.h
diff --git a/code/nel/include/nel/3d/animated_material.h b/nel/include/nel/3d/animated_material.h
similarity index 100%
rename from code/nel/include/nel/3d/animated_material.h
rename to nel/include/nel/3d/animated_material.h
diff --git a/code/nel/include/nel/3d/animated_morph.h b/nel/include/nel/3d/animated_morph.h
similarity index 100%
rename from code/nel/include/nel/3d/animated_morph.h
rename to nel/include/nel/3d/animated_morph.h
diff --git a/code/nel/include/nel/3d/animated_value.h b/nel/include/nel/3d/animated_value.h
similarity index 100%
rename from code/nel/include/nel/3d/animated_value.h
rename to nel/include/nel/3d/animated_value.h
diff --git a/code/nel/include/nel/3d/animation.h b/nel/include/nel/3d/animation.h
similarity index 100%
rename from code/nel/include/nel/3d/animation.h
rename to nel/include/nel/3d/animation.h
diff --git a/code/nel/include/nel/3d/animation_optimizer.h b/nel/include/nel/3d/animation_optimizer.h
similarity index 100%
rename from code/nel/include/nel/3d/animation_optimizer.h
rename to nel/include/nel/3d/animation_optimizer.h
diff --git a/code/nel/include/nel/3d/animation_playlist.h b/nel/include/nel/3d/animation_playlist.h
similarity index 100%
rename from code/nel/include/nel/3d/animation_playlist.h
rename to nel/include/nel/3d/animation_playlist.h
diff --git a/code/nel/include/nel/3d/animation_set.h b/nel/include/nel/3d/animation_set.h
similarity index 100%
rename from code/nel/include/nel/3d/animation_set.h
rename to nel/include/nel/3d/animation_set.h
diff --git a/code/nel/include/nel/3d/animation_set_user.h b/nel/include/nel/3d/animation_set_user.h
similarity index 100%
rename from code/nel/include/nel/3d/animation_set_user.h
rename to nel/include/nel/3d/animation_set_user.h
diff --git a/code/nel/include/nel/3d/animation_time.h b/nel/include/nel/3d/animation_time.h
similarity index 100%
rename from code/nel/include/nel/3d/animation_time.h
rename to nel/include/nel/3d/animation_time.h
diff --git a/code/nel/include/nel/3d/async_file_manager_3d.h b/nel/include/nel/3d/async_file_manager_3d.h
similarity index 100%
rename from code/nel/include/nel/3d/async_file_manager_3d.h
rename to nel/include/nel/3d/async_file_manager_3d.h
diff --git a/code/nel/include/nel/3d/async_texture_block.h b/nel/include/nel/3d/async_texture_block.h
similarity index 100%
rename from code/nel/include/nel/3d/async_texture_block.h
rename to nel/include/nel/3d/async_texture_block.h
diff --git a/code/nel/include/nel/3d/async_texture_manager.h b/nel/include/nel/3d/async_texture_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/async_texture_manager.h
rename to nel/include/nel/3d/async_texture_manager.h
diff --git a/code/nel/include/nel/3d/bezier_patch.h b/nel/include/nel/3d/bezier_patch.h
similarity index 100%
rename from code/nel/include/nel/3d/bezier_patch.h
rename to nel/include/nel/3d/bezier_patch.h
diff --git a/code/nel/include/nel/3d/bloom_effect.h b/nel/include/nel/3d/bloom_effect.h
similarity index 100%
rename from code/nel/include/nel/3d/bloom_effect.h
rename to nel/include/nel/3d/bloom_effect.h
diff --git a/code/nel/include/nel/3d/bone.h b/nel/include/nel/3d/bone.h
similarity index 100%
rename from code/nel/include/nel/3d/bone.h
rename to nel/include/nel/3d/bone.h
diff --git a/code/nel/include/nel/3d/bsp_tree.h b/nel/include/nel/3d/bsp_tree.h
similarity index 100%
rename from code/nel/include/nel/3d/bsp_tree.h
rename to nel/include/nel/3d/bsp_tree.h
diff --git a/code/nel/include/nel/3d/camera.h b/nel/include/nel/3d/camera.h
similarity index 100%
rename from code/nel/include/nel/3d/camera.h
rename to nel/include/nel/3d/camera.h
diff --git a/code/nel/include/nel/3d/camera_col.h b/nel/include/nel/3d/camera_col.h
similarity index 100%
rename from code/nel/include/nel/3d/camera_col.h
rename to nel/include/nel/3d/camera_col.h
diff --git a/code/nel/include/nel/3d/channel_mixer.h b/nel/include/nel/3d/channel_mixer.h
similarity index 100%
rename from code/nel/include/nel/3d/channel_mixer.h
rename to nel/include/nel/3d/channel_mixer.h
diff --git a/code/nel/include/nel/3d/clip_trav.h b/nel/include/nel/3d/clip_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/clip_trav.h
rename to nel/include/nel/3d/clip_trav.h
diff --git a/code/nel/include/nel/3d/cloud.h b/nel/include/nel/3d/cloud.h
similarity index 100%
rename from code/nel/include/nel/3d/cloud.h
rename to nel/include/nel/3d/cloud.h
diff --git a/code/nel/include/nel/3d/cloud_scape.h b/nel/include/nel/3d/cloud_scape.h
similarity index 100%
rename from code/nel/include/nel/3d/cloud_scape.h
rename to nel/include/nel/3d/cloud_scape.h
diff --git a/code/nel/include/nel/3d/cloud_scape_user.h b/nel/include/nel/3d/cloud_scape_user.h
similarity index 100%
rename from code/nel/include/nel/3d/cloud_scape_user.h
rename to nel/include/nel/3d/cloud_scape_user.h
diff --git a/code/nel/include/nel/3d/cluster.h b/nel/include/nel/3d/cluster.h
similarity index 100%
rename from code/nel/include/nel/3d/cluster.h
rename to nel/include/nel/3d/cluster.h
diff --git a/code/nel/include/nel/3d/coarse_mesh_build.h b/nel/include/nel/3d/coarse_mesh_build.h
similarity index 100%
rename from code/nel/include/nel/3d/coarse_mesh_build.h
rename to nel/include/nel/3d/coarse_mesh_build.h
diff --git a/code/nel/include/nel/3d/coarse_mesh_manager.h b/nel/include/nel/3d/coarse_mesh_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/coarse_mesh_manager.h
rename to nel/include/nel/3d/coarse_mesh_manager.h
diff --git a/code/nel/include/nel/3d/computed_string.h b/nel/include/nel/3d/computed_string.h
similarity index 100%
rename from code/nel/include/nel/3d/computed_string.h
rename to nel/include/nel/3d/computed_string.h
diff --git a/code/nel/include/nel/3d/cube_grid.h b/nel/include/nel/3d/cube_grid.h
similarity index 100%
rename from code/nel/include/nel/3d/cube_grid.h
rename to nel/include/nel/3d/cube_grid.h
diff --git a/code/nel/include/nel/3d/cube_map_builder.h b/nel/include/nel/3d/cube_map_builder.h
similarity index 100%
rename from code/nel/include/nel/3d/cube_map_builder.h
rename to nel/include/nel/3d/cube_map_builder.h
diff --git a/code/nel/include/nel/3d/debug_vb.h b/nel/include/nel/3d/debug_vb.h
similarity index 100%
rename from code/nel/include/nel/3d/debug_vb.h
rename to nel/include/nel/3d/debug_vb.h
diff --git a/code/nel/include/nel/3d/deform_2d.h b/nel/include/nel/3d/deform_2d.h
similarity index 100%
rename from code/nel/include/nel/3d/deform_2d.h
rename to nel/include/nel/3d/deform_2d.h
diff --git a/code/nel/include/nel/3d/driver.h b/nel/include/nel/3d/driver.h
similarity index 100%
rename from code/nel/include/nel/3d/driver.h
rename to nel/include/nel/3d/driver.h
diff --git a/code/nel/include/nel/3d/driver_material_inline.h b/nel/include/nel/3d/driver_material_inline.h
similarity index 100%
rename from code/nel/include/nel/3d/driver_material_inline.h
rename to nel/include/nel/3d/driver_material_inline.h
diff --git a/code/nel/include/nel/3d/driver_user.h b/nel/include/nel/3d/driver_user.h
similarity index 100%
rename from code/nel/include/nel/3d/driver_user.h
rename to nel/include/nel/3d/driver_user.h
diff --git a/code/nel/include/nel/3d/dru.h b/nel/include/nel/3d/dru.h
similarity index 100%
rename from code/nel/include/nel/3d/dru.h
rename to nel/include/nel/3d/dru.h
diff --git a/code/nel/include/nel/3d/event_mouse_listener.h b/nel/include/nel/3d/event_mouse_listener.h
similarity index 100%
rename from code/nel/include/nel/3d/event_mouse_listener.h
rename to nel/include/nel/3d/event_mouse_listener.h
diff --git a/code/nel/include/nel/3d/fast_ptr_list.h b/nel/include/nel/3d/fast_ptr_list.h
similarity index 100%
rename from code/nel/include/nel/3d/fast_ptr_list.h
rename to nel/include/nel/3d/fast_ptr_list.h
diff --git a/code/nel/include/nel/3d/fasthls_modifier.h b/nel/include/nel/3d/fasthls_modifier.h
similarity index 100%
rename from code/nel/include/nel/3d/fasthls_modifier.h
rename to nel/include/nel/3d/fasthls_modifier.h
diff --git a/code/nel/include/nel/3d/flare_model.h b/nel/include/nel/3d/flare_model.h
similarity index 100%
rename from code/nel/include/nel/3d/flare_model.h
rename to nel/include/nel/3d/flare_model.h
diff --git a/code/nel/include/nel/3d/flare_shape.h b/nel/include/nel/3d/flare_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/flare_shape.h
rename to nel/include/nel/3d/flare_shape.h
diff --git a/code/nel/include/nel/3d/font_generator.h b/nel/include/nel/3d/font_generator.h
similarity index 100%
rename from code/nel/include/nel/3d/font_generator.h
rename to nel/include/nel/3d/font_generator.h
diff --git a/code/nel/include/nel/3d/font_manager.h b/nel/include/nel/3d/font_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/font_manager.h
rename to nel/include/nel/3d/font_manager.h
diff --git a/code/nel/include/nel/3d/frustum.h b/nel/include/nel/3d/frustum.h
similarity index 100%
rename from code/nel/include/nel/3d/frustum.h
rename to nel/include/nel/3d/frustum.h
diff --git a/code/nel/include/nel/3d/fxaa.h b/nel/include/nel/3d/fxaa.h
similarity index 100%
rename from code/nel/include/nel/3d/fxaa.h
rename to nel/include/nel/3d/fxaa.h
diff --git a/code/nel/include/nel/3d/geometry_program.h b/nel/include/nel/3d/geometry_program.h
similarity index 100%
rename from code/nel/include/nel/3d/geometry_program.h
rename to nel/include/nel/3d/geometry_program.h
diff --git a/code/nel/include/nel/3d/gpu_program_params.h b/nel/include/nel/3d/gpu_program_params.h
similarity index 100%
rename from code/nel/include/nel/3d/gpu_program_params.h
rename to nel/include/nel/3d/gpu_program_params.h
diff --git a/code/nel/include/nel/3d/heat_haze.h b/nel/include/nel/3d/heat_haze.h
similarity index 100%
rename from code/nel/include/nel/3d/heat_haze.h
rename to nel/include/nel/3d/heat_haze.h
diff --git a/code/nel/include/nel/3d/height_map.h b/nel/include/nel/3d/height_map.h
similarity index 100%
rename from code/nel/include/nel/3d/height_map.h
rename to nel/include/nel/3d/height_map.h
diff --git a/code/nel/include/nel/3d/hls_color_texture.h b/nel/include/nel/3d/hls_color_texture.h
similarity index 100%
rename from code/nel/include/nel/3d/hls_color_texture.h
rename to nel/include/nel/3d/hls_color_texture.h
diff --git a/code/nel/include/nel/3d/hls_texture_bank.h b/nel/include/nel/3d/hls_texture_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/hls_texture_bank.h
rename to nel/include/nel/3d/hls_texture_bank.h
diff --git a/code/nel/include/nel/3d/hls_texture_manager.h b/nel/include/nel/3d/hls_texture_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/hls_texture_manager.h
rename to nel/include/nel/3d/hls_texture_manager.h
diff --git a/code/nel/include/nel/3d/hrc_trav.h b/nel/include/nel/3d/hrc_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/hrc_trav.h
rename to nel/include/nel/3d/hrc_trav.h
diff --git a/code/nel/include/nel/3d/ig_surface_light.h b/nel/include/nel/3d/ig_surface_light.h
similarity index 100%
rename from code/nel/include/nel/3d/ig_surface_light.h
rename to nel/include/nel/3d/ig_surface_light.h
diff --git a/code/nel/include/nel/3d/ig_surface_light_build.h b/nel/include/nel/3d/ig_surface_light_build.h
similarity index 100%
rename from code/nel/include/nel/3d/ig_surface_light_build.h
rename to nel/include/nel/3d/ig_surface_light_build.h
diff --git a/code/nel/include/nel/3d/index_buffer.h b/nel/include/nel/3d/index_buffer.h
similarity index 100%
rename from code/nel/include/nel/3d/index_buffer.h
rename to nel/include/nel/3d/index_buffer.h
diff --git a/code/nel/include/nel/3d/init_3d.h b/nel/include/nel/3d/init_3d.h
similarity index 100%
rename from code/nel/include/nel/3d/init_3d.h
rename to nel/include/nel/3d/init_3d.h
diff --git a/code/nel/include/nel/3d/instance_group_user.h b/nel/include/nel/3d/instance_group_user.h
similarity index 100%
rename from code/nel/include/nel/3d/instance_group_user.h
rename to nel/include/nel/3d/instance_group_user.h
diff --git a/code/nel/include/nel/3d/instance_lighter.h b/nel/include/nel/3d/instance_lighter.h
similarity index 100%
rename from code/nel/include/nel/3d/instance_lighter.h
rename to nel/include/nel/3d/instance_lighter.h
diff --git a/code/nel/include/nel/3d/key.h b/nel/include/nel/3d/key.h
similarity index 100%
rename from code/nel/include/nel/3d/key.h
rename to nel/include/nel/3d/key.h
diff --git a/code/nel/include/nel/3d/landscape.h b/nel/include/nel/3d/landscape.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape.h
rename to nel/include/nel/3d/landscape.h
diff --git a/code/nel/include/nel/3d/landscape_collision_grid.h b/nel/include/nel/3d/landscape_collision_grid.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_collision_grid.h
rename to nel/include/nel/3d/landscape_collision_grid.h
diff --git a/code/nel/include/nel/3d/landscape_def.h b/nel/include/nel/3d/landscape_def.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_def.h
rename to nel/include/nel/3d/landscape_def.h
diff --git a/code/nel/include/nel/3d/landscape_face_vector_manager.h b/nel/include/nel/3d/landscape_face_vector_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_face_vector_manager.h
rename to nel/include/nel/3d/landscape_face_vector_manager.h
diff --git a/code/nel/include/nel/3d/landscape_model.h b/nel/include/nel/3d/landscape_model.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_model.h
rename to nel/include/nel/3d/landscape_model.h
diff --git a/code/nel/include/nel/3d/landscape_profile.h b/nel/include/nel/3d/landscape_profile.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_profile.h
rename to nel/include/nel/3d/landscape_profile.h
diff --git a/code/nel/include/nel/3d/landscape_user.h b/nel/include/nel/3d/landscape_user.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_user.h
rename to nel/include/nel/3d/landscape_user.h
diff --git a/code/nel/include/nel/3d/landscape_vegetable_block.h b/nel/include/nel/3d/landscape_vegetable_block.h
similarity index 100%
rename from code/nel/include/nel/3d/landscape_vegetable_block.h
rename to nel/include/nel/3d/landscape_vegetable_block.h
diff --git a/code/nel/include/nel/3d/landscapeig_manager.h b/nel/include/nel/3d/landscapeig_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/landscapeig_manager.h
rename to nel/include/nel/3d/landscapeig_manager.h
diff --git a/code/nel/include/nel/3d/landscapevb_allocator.h b/nel/include/nel/3d/landscapevb_allocator.h
similarity index 100%
rename from code/nel/include/nel/3d/landscapevb_allocator.h
rename to nel/include/nel/3d/landscapevb_allocator.h
diff --git a/code/nel/include/nel/3d/landscapevb_info.h b/nel/include/nel/3d/landscapevb_info.h
similarity index 100%
rename from code/nel/include/nel/3d/landscapevb_info.h
rename to nel/include/nel/3d/landscapevb_info.h
diff --git a/code/nel/include/nel/3d/layered_ordering_table.h b/nel/include/nel/3d/layered_ordering_table.h
similarity index 100%
rename from code/nel/include/nel/3d/layered_ordering_table.h
rename to nel/include/nel/3d/layered_ordering_table.h
diff --git a/code/nel/include/nel/3d/light.h b/nel/include/nel/3d/light.h
similarity index 100%
rename from code/nel/include/nel/3d/light.h
rename to nel/include/nel/3d/light.h
diff --git a/code/nel/include/nel/3d/light_contribution.h b/nel/include/nel/3d/light_contribution.h
similarity index 100%
rename from code/nel/include/nel/3d/light_contribution.h
rename to nel/include/nel/3d/light_contribution.h
diff --git a/code/nel/include/nel/3d/light_influence_interpolator.h b/nel/include/nel/3d/light_influence_interpolator.h
similarity index 100%
rename from code/nel/include/nel/3d/light_influence_interpolator.h
rename to nel/include/nel/3d/light_influence_interpolator.h
diff --git a/code/nel/include/nel/3d/light_trav.h b/nel/include/nel/3d/light_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/light_trav.h
rename to nel/include/nel/3d/light_trav.h
diff --git a/code/nel/include/nel/3d/light_user.h b/nel/include/nel/3d/light_user.h
similarity index 100%
rename from code/nel/include/nel/3d/light_user.h
rename to nel/include/nel/3d/light_user.h
diff --git a/code/nel/include/nel/3d/lighting_manager.h b/nel/include/nel/3d/lighting_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/lighting_manager.h
rename to nel/include/nel/3d/lighting_manager.h
diff --git a/code/nel/include/nel/3d/load_balancing_trav.h b/nel/include/nel/3d/load_balancing_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/load_balancing_trav.h
rename to nel/include/nel/3d/load_balancing_trav.h
diff --git a/code/nel/include/nel/3d/lod_character_builder.h b/nel/include/nel/3d/lod_character_builder.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_builder.h
rename to nel/include/nel/3d/lod_character_builder.h
diff --git a/code/nel/include/nel/3d/lod_character_instance.h b/nel/include/nel/3d/lod_character_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_instance.h
rename to nel/include/nel/3d/lod_character_instance.h
diff --git a/code/nel/include/nel/3d/lod_character_manager.h b/nel/include/nel/3d/lod_character_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_manager.h
rename to nel/include/nel/3d/lod_character_manager.h
diff --git a/code/nel/include/nel/3d/lod_character_shape.h b/nel/include/nel/3d/lod_character_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_shape.h
rename to nel/include/nel/3d/lod_character_shape.h
diff --git a/code/nel/include/nel/3d/lod_character_shape_bank.h b/nel/include/nel/3d/lod_character_shape_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_shape_bank.h
rename to nel/include/nel/3d/lod_character_shape_bank.h
diff --git a/code/nel/include/nel/3d/lod_character_texture.h b/nel/include/nel/3d/lod_character_texture.h
similarity index 100%
rename from code/nel/include/nel/3d/lod_character_texture.h
rename to nel/include/nel/3d/lod_character_texture.h
diff --git a/code/nel/include/nel/3d/logic_info.h b/nel/include/nel/3d/logic_info.h
similarity index 100%
rename from code/nel/include/nel/3d/logic_info.h
rename to nel/include/nel/3d/logic_info.h
diff --git a/code/nel/include/nel/3d/material.h b/nel/include/nel/3d/material.h
similarity index 100%
rename from code/nel/include/nel/3d/material.h
rename to nel/include/nel/3d/material.h
diff --git a/code/nel/include/nel/3d/matrix_3x4.h b/nel/include/nel/3d/matrix_3x4.h
similarity index 100%
rename from code/nel/include/nel/3d/matrix_3x4.h
rename to nel/include/nel/3d/matrix_3x4.h
diff --git a/code/nel/include/nel/3d/mesh.h b/nel/include/nel/3d/mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh.h
rename to nel/include/nel/3d/mesh.h
diff --git a/code/nel/include/nel/3d/mesh_base.h b/nel/include/nel/3d/mesh_base.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_base.h
rename to nel/include/nel/3d/mesh_base.h
diff --git a/code/nel/include/nel/3d/mesh_base_instance.h b/nel/include/nel/3d/mesh_base_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_base_instance.h
rename to nel/include/nel/3d/mesh_base_instance.h
diff --git a/code/nel/include/nel/3d/mesh_blender.h b/nel/include/nel/3d/mesh_blender.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_blender.h
rename to nel/include/nel/3d/mesh_blender.h
diff --git a/code/nel/include/nel/3d/mesh_block_manager.h b/nel/include/nel/3d/mesh_block_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_block_manager.h
rename to nel/include/nel/3d/mesh_block_manager.h
diff --git a/code/nel/include/nel/3d/mesh_geom.h b/nel/include/nel/3d/mesh_geom.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_geom.h
rename to nel/include/nel/3d/mesh_geom.h
diff --git a/code/nel/include/nel/3d/mesh_instance.h b/nel/include/nel/3d/mesh_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_instance.h
rename to nel/include/nel/3d/mesh_instance.h
diff --git a/code/nel/include/nel/3d/mesh_morpher.h b/nel/include/nel/3d/mesh_morpher.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_morpher.h
rename to nel/include/nel/3d/mesh_morpher.h
diff --git a/code/nel/include/nel/3d/mesh_mrm.h b/nel/include/nel/3d/mesh_mrm.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_mrm.h
rename to nel/include/nel/3d/mesh_mrm.h
diff --git a/code/nel/include/nel/3d/mesh_mrm_instance.h b/nel/include/nel/3d/mesh_mrm_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_mrm_instance.h
rename to nel/include/nel/3d/mesh_mrm_instance.h
diff --git a/code/nel/include/nel/3d/mesh_mrm_skinned.h b/nel/include/nel/3d/mesh_mrm_skinned.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_mrm_skinned.h
rename to nel/include/nel/3d/mesh_mrm_skinned.h
diff --git a/code/nel/include/nel/3d/mesh_mrm_skinned_instance.h b/nel/include/nel/3d/mesh_mrm_skinned_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_mrm_skinned_instance.h
rename to nel/include/nel/3d/mesh_mrm_skinned_instance.h
diff --git a/code/nel/include/nel/3d/mesh_multi_lod.h b/nel/include/nel/3d/mesh_multi_lod.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_multi_lod.h
rename to nel/include/nel/3d/mesh_multi_lod.h
diff --git a/code/nel/include/nel/3d/mesh_multi_lod_instance.h b/nel/include/nel/3d/mesh_multi_lod_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_multi_lod_instance.h
rename to nel/include/nel/3d/mesh_multi_lod_instance.h
diff --git a/code/nel/include/nel/3d/mesh_vertex_program.h b/nel/include/nel/3d/mesh_vertex_program.h
similarity index 100%
rename from code/nel/include/nel/3d/mesh_vertex_program.h
rename to nel/include/nel/3d/mesh_vertex_program.h
diff --git a/code/nel/include/nel/3d/meshvp_per_pixel_light.h b/nel/include/nel/3d/meshvp_per_pixel_light.h
similarity index 100%
rename from code/nel/include/nel/3d/meshvp_per_pixel_light.h
rename to nel/include/nel/3d/meshvp_per_pixel_light.h
diff --git a/code/nel/include/nel/3d/meshvp_wind_tree.h b/nel/include/nel/3d/meshvp_wind_tree.h
similarity index 100%
rename from code/nel/include/nel/3d/meshvp_wind_tree.h
rename to nel/include/nel/3d/meshvp_wind_tree.h
diff --git a/code/nel/include/nel/3d/mini_col.h b/nel/include/nel/3d/mini_col.h
similarity index 100%
rename from code/nel/include/nel/3d/mini_col.h
rename to nel/include/nel/3d/mini_col.h
diff --git a/code/nel/include/nel/3d/motion_blur.h b/nel/include/nel/3d/motion_blur.h
similarity index 100%
rename from code/nel/include/nel/3d/motion_blur.h
rename to nel/include/nel/3d/motion_blur.h
diff --git a/code/nel/include/nel/3d/mrm_builder.h b/nel/include/nel/3d/mrm_builder.h
similarity index 100%
rename from code/nel/include/nel/3d/mrm_builder.h
rename to nel/include/nel/3d/mrm_builder.h
diff --git a/code/nel/include/nel/3d/mrm_internal.h b/nel/include/nel/3d/mrm_internal.h
similarity index 100%
rename from code/nel/include/nel/3d/mrm_internal.h
rename to nel/include/nel/3d/mrm_internal.h
diff --git a/code/nel/include/nel/3d/mrm_level_detail.h b/nel/include/nel/3d/mrm_level_detail.h
similarity index 100%
rename from code/nel/include/nel/3d/mrm_level_detail.h
rename to nel/include/nel/3d/mrm_level_detail.h
diff --git a/code/nel/include/nel/3d/mrm_mesh.h b/nel/include/nel/3d/mrm_mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/mrm_mesh.h
rename to nel/include/nel/3d/mrm_mesh.h
diff --git a/code/nel/include/nel/3d/mrm_parameters.h b/nel/include/nel/3d/mrm_parameters.h
similarity index 100%
rename from code/nel/include/nel/3d/mrm_parameters.h
rename to nel/include/nel/3d/mrm_parameters.h
diff --git a/code/nel/include/nel/3d/nelu.h b/nel/include/nel/3d/nelu.h
similarity index 100%
rename from code/nel/include/nel/3d/nelu.h
rename to nel/include/nel/3d/nelu.h
diff --git a/code/nel/include/nel/3d/noise_3d.h b/nel/include/nel/3d/noise_3d.h
similarity index 100%
rename from code/nel/include/nel/3d/noise_3d.h
rename to nel/include/nel/3d/noise_3d.h
diff --git a/code/nel/include/nel/3d/occlusion_query.h b/nel/include/nel/3d/occlusion_query.h
similarity index 100%
rename from code/nel/include/nel/3d/occlusion_query.h
rename to nel/include/nel/3d/occlusion_query.h
diff --git a/code/nel/include/nel/3d/ordering_table.h b/nel/include/nel/3d/ordering_table.h
similarity index 100%
rename from code/nel/include/nel/3d/ordering_table.h
rename to nel/include/nel/3d/ordering_table.h
diff --git a/code/nel/include/nel/3d/packed_world.h b/nel/include/nel/3d/packed_world.h
similarity index 100%
rename from code/nel/include/nel/3d/packed_world.h
rename to nel/include/nel/3d/packed_world.h
diff --git a/code/nel/include/nel/3d/packed_zone.h b/nel/include/nel/3d/packed_zone.h
similarity index 100%
rename from code/nel/include/nel/3d/packed_zone.h
rename to nel/include/nel/3d/packed_zone.h
diff --git a/code/nel/include/nel/3d/particle_system.h b/nel/include/nel/3d/particle_system.h
similarity index 100%
rename from code/nel/include/nel/3d/particle_system.h
rename to nel/include/nel/3d/particle_system.h
diff --git a/code/nel/include/nel/3d/particle_system_manager.h b/nel/include/nel/3d/particle_system_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/particle_system_manager.h
rename to nel/include/nel/3d/particle_system_manager.h
diff --git a/code/nel/include/nel/3d/particle_system_model.h b/nel/include/nel/3d/particle_system_model.h
similarity index 100%
rename from code/nel/include/nel/3d/particle_system_model.h
rename to nel/include/nel/3d/particle_system_model.h
diff --git a/code/nel/include/nel/3d/particle_system_process.h b/nel/include/nel/3d/particle_system_process.h
similarity index 100%
rename from code/nel/include/nel/3d/particle_system_process.h
rename to nel/include/nel/3d/particle_system_process.h
diff --git a/code/nel/include/nel/3d/particle_system_shape.h b/nel/include/nel/3d/particle_system_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/particle_system_shape.h
rename to nel/include/nel/3d/particle_system_shape.h
diff --git a/code/nel/include/nel/3d/patch.h b/nel/include/nel/3d/patch.h
similarity index 100%
rename from code/nel/include/nel/3d/patch.h
rename to nel/include/nel/3d/patch.h
diff --git a/code/nel/include/nel/3d/patch_rdr_pass.h b/nel/include/nel/3d/patch_rdr_pass.h
similarity index 100%
rename from code/nel/include/nel/3d/patch_rdr_pass.h
rename to nel/include/nel/3d/patch_rdr_pass.h
diff --git a/code/nel/include/nel/3d/patchdlm_context.h b/nel/include/nel/3d/patchdlm_context.h
similarity index 100%
rename from code/nel/include/nel/3d/patchdlm_context.h
rename to nel/include/nel/3d/patchdlm_context.h
diff --git a/code/nel/include/nel/3d/patchuv_locator.h b/nel/include/nel/3d/patchuv_locator.h
similarity index 100%
rename from code/nel/include/nel/3d/patchuv_locator.h
rename to nel/include/nel/3d/patchuv_locator.h
diff --git a/code/nel/include/nel/3d/pixel_program.h b/nel/include/nel/3d/pixel_program.h
similarity index 100%
rename from code/nel/include/nel/3d/pixel_program.h
rename to nel/include/nel/3d/pixel_program.h
diff --git a/code/nel/include/nel/3d/play_list_manager.h b/nel/include/nel/3d/play_list_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/play_list_manager.h
rename to nel/include/nel/3d/play_list_manager.h
diff --git a/code/nel/include/nel/3d/play_list_manager_user.h b/nel/include/nel/3d/play_list_manager_user.h
similarity index 100%
rename from code/nel/include/nel/3d/play_list_manager_user.h
rename to nel/include/nel/3d/play_list_manager_user.h
diff --git a/code/nel/include/nel/3d/play_list_user.h b/nel/include/nel/3d/play_list_user.h
similarity index 100%
rename from code/nel/include/nel/3d/play_list_user.h
rename to nel/include/nel/3d/play_list_user.h
diff --git a/code/nel/include/nel/3d/point_light.h b/nel/include/nel/3d/point_light.h
similarity index 100%
rename from code/nel/include/nel/3d/point_light.h
rename to nel/include/nel/3d/point_light.h
diff --git a/code/nel/include/nel/3d/point_light_influence.h b/nel/include/nel/3d/point_light_influence.h
similarity index 100%
rename from code/nel/include/nel/3d/point_light_influence.h
rename to nel/include/nel/3d/point_light_influence.h
diff --git a/code/nel/include/nel/3d/point_light_model.h b/nel/include/nel/3d/point_light_model.h
similarity index 100%
rename from code/nel/include/nel/3d/point_light_model.h
rename to nel/include/nel/3d/point_light_model.h
diff --git a/code/nel/include/nel/3d/point_light_named.h b/nel/include/nel/3d/point_light_named.h
similarity index 100%
rename from code/nel/include/nel/3d/point_light_named.h
rename to nel/include/nel/3d/point_light_named.h
diff --git a/code/nel/include/nel/3d/point_light_named_array.h b/nel/include/nel/3d/point_light_named_array.h
similarity index 100%
rename from code/nel/include/nel/3d/point_light_named_array.h
rename to nel/include/nel/3d/point_light_named_array.h
diff --git a/code/nel/include/nel/3d/portal.h b/nel/include/nel/3d/portal.h
similarity index 100%
rename from code/nel/include/nel/3d/portal.h
rename to nel/include/nel/3d/portal.h
diff --git a/code/nel/include/nel/3d/primitive_profile.h b/nel/include/nel/3d/primitive_profile.h
similarity index 100%
rename from code/nel/include/nel/3d/primitive_profile.h
rename to nel/include/nel/3d/primitive_profile.h
diff --git a/code/nel/include/nel/3d/program.h b/nel/include/nel/3d/program.h
similarity index 100%
rename from code/nel/include/nel/3d/program.h
rename to nel/include/nel/3d/program.h
diff --git a/code/nel/include/nel/3d/ps_allocator.h b/nel/include/nel/3d/ps_allocator.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_allocator.h
rename to nel/include/nel/3d/ps_allocator.h
diff --git a/code/nel/include/nel/3d/ps_attrib.h b/nel/include/nel/3d/ps_attrib.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib.h
rename to nel/include/nel/3d/ps_attrib.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker.h b/nel/include/nel/3d/ps_attrib_maker.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker.h
rename to nel/include/nel/3d/ps_attrib_maker.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h b/nel/include/nel/3d/ps_attrib_maker_bin_op.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
rename to nel/include/nel/3d/ps_attrib_maker_bin_op.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
rename to nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_helper.h b/nel/include/nel/3d/ps_attrib_maker_helper.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker_helper.h
rename to nel/include/nel/3d/ps_attrib_maker_helper.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_iterators.h b/nel/include/nel/3d/ps_attrib_maker_iterators.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker_iterators.h
rename to nel/include/nel/3d/ps_attrib_maker_iterators.h
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_template.h b/nel/include/nel/3d/ps_attrib_maker_template.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_attrib_maker_template.h
rename to nel/include/nel/3d/ps_attrib_maker_template.h
diff --git a/code/nel/include/nel/3d/ps_color.h b/nel/include/nel/3d/ps_color.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_color.h
rename to nel/include/nel/3d/ps_color.h
diff --git a/code/nel/include/nel/3d/ps_direction.h b/nel/include/nel/3d/ps_direction.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_direction.h
rename to nel/include/nel/3d/ps_direction.h
diff --git a/code/nel/include/nel/3d/ps_dot.h b/nel/include/nel/3d/ps_dot.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_dot.h
rename to nel/include/nel/3d/ps_dot.h
diff --git a/code/nel/include/nel/3d/ps_edit.h b/nel/include/nel/3d/ps_edit.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_edit.h
rename to nel/include/nel/3d/ps_edit.h
diff --git a/code/nel/include/nel/3d/ps_emitter.h b/nel/include/nel/3d/ps_emitter.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_emitter.h
rename to nel/include/nel/3d/ps_emitter.h
diff --git a/code/nel/include/nel/3d/ps_face.h b/nel/include/nel/3d/ps_face.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_face.h
rename to nel/include/nel/3d/ps_face.h
diff --git a/code/nel/include/nel/3d/ps_face_look_at.h b/nel/include/nel/3d/ps_face_look_at.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_face_look_at.h
rename to nel/include/nel/3d/ps_face_look_at.h
diff --git a/code/nel/include/nel/3d/ps_fan_light.h b/nel/include/nel/3d/ps_fan_light.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_fan_light.h
rename to nel/include/nel/3d/ps_fan_light.h
diff --git a/code/nel/include/nel/3d/ps_float.h b/nel/include/nel/3d/ps_float.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_float.h
rename to nel/include/nel/3d/ps_float.h
diff --git a/code/nel/include/nel/3d/ps_force.h b/nel/include/nel/3d/ps_force.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_force.h
rename to nel/include/nel/3d/ps_force.h
diff --git a/code/nel/include/nel/3d/ps_int.h b/nel/include/nel/3d/ps_int.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_int.h
rename to nel/include/nel/3d/ps_int.h
diff --git a/code/nel/include/nel/3d/ps_iterator.h b/nel/include/nel/3d/ps_iterator.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_iterator.h
rename to nel/include/nel/3d/ps_iterator.h
diff --git a/code/nel/include/nel/3d/ps_light.h b/nel/include/nel/3d/ps_light.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_light.h
rename to nel/include/nel/3d/ps_light.h
diff --git a/code/nel/include/nel/3d/ps_located.h b/nel/include/nel/3d/ps_located.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_located.h
rename to nel/include/nel/3d/ps_located.h
diff --git a/code/nel/include/nel/3d/ps_lod.h b/nel/include/nel/3d/ps_lod.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_lod.h
rename to nel/include/nel/3d/ps_lod.h
diff --git a/code/nel/include/nel/3d/ps_macro.h b/nel/include/nel/3d/ps_macro.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_macro.h
rename to nel/include/nel/3d/ps_macro.h
diff --git a/code/nel/include/nel/3d/ps_mesh.h b/nel/include/nel/3d/ps_mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_mesh.h
rename to nel/include/nel/3d/ps_mesh.h
diff --git a/code/nel/include/nel/3d/ps_misc.h b/nel/include/nel/3d/ps_misc.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_misc.h
rename to nel/include/nel/3d/ps_misc.h
diff --git a/code/nel/include/nel/3d/ps_particle.h b/nel/include/nel/3d/ps_particle.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_particle.h
rename to nel/include/nel/3d/ps_particle.h
diff --git a/code/nel/include/nel/3d/ps_particle2.h b/nel/include/nel/3d/ps_particle2.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_particle2.h
rename to nel/include/nel/3d/ps_particle2.h
diff --git a/code/nel/include/nel/3d/ps_particle_basic.h b/nel/include/nel/3d/ps_particle_basic.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_particle_basic.h
rename to nel/include/nel/3d/ps_particle_basic.h
diff --git a/code/nel/include/nel/3d/ps_plane_basis.h b/nel/include/nel/3d/ps_plane_basis.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_plane_basis.h
rename to nel/include/nel/3d/ps_plane_basis.h
diff --git a/code/nel/include/nel/3d/ps_plane_basis_maker.h b/nel/include/nel/3d/ps_plane_basis_maker.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_plane_basis_maker.h
rename to nel/include/nel/3d/ps_plane_basis_maker.h
diff --git a/code/nel/include/nel/3d/ps_quad.h b/nel/include/nel/3d/ps_quad.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_quad.h
rename to nel/include/nel/3d/ps_quad.h
diff --git a/code/nel/include/nel/3d/ps_register_color_attribs.h b/nel/include/nel/3d/ps_register_color_attribs.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_register_color_attribs.h
rename to nel/include/nel/3d/ps_register_color_attribs.h
diff --git a/code/nel/include/nel/3d/ps_register_float_attribs.h b/nel/include/nel/3d/ps_register_float_attribs.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_register_float_attribs.h
rename to nel/include/nel/3d/ps_register_float_attribs.h
diff --git a/code/nel/include/nel/3d/ps_register_int_attribs.h b/nel/include/nel/3d/ps_register_int_attribs.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_register_int_attribs.h
rename to nel/include/nel/3d/ps_register_int_attribs.h
diff --git a/code/nel/include/nel/3d/ps_register_plane_basis_attribs.h b/nel/include/nel/3d/ps_register_plane_basis_attribs.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_register_plane_basis_attribs.h
rename to nel/include/nel/3d/ps_register_plane_basis_attribs.h
diff --git a/code/nel/include/nel/3d/ps_ribbon.h b/nel/include/nel/3d/ps_ribbon.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_ribbon.h
rename to nel/include/nel/3d/ps_ribbon.h
diff --git a/code/nel/include/nel/3d/ps_ribbon_base.h b/nel/include/nel/3d/ps_ribbon_base.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_ribbon_base.h
rename to nel/include/nel/3d/ps_ribbon_base.h
diff --git a/code/nel/include/nel/3d/ps_ribbon_look_at.h b/nel/include/nel/3d/ps_ribbon_look_at.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_ribbon_look_at.h
rename to nel/include/nel/3d/ps_ribbon_look_at.h
diff --git a/code/nel/include/nel/3d/ps_shockwave.h b/nel/include/nel/3d/ps_shockwave.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_shockwave.h
rename to nel/include/nel/3d/ps_shockwave.h
diff --git a/code/nel/include/nel/3d/ps_sound.h b/nel/include/nel/3d/ps_sound.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_sound.h
rename to nel/include/nel/3d/ps_sound.h
diff --git a/code/nel/include/nel/3d/ps_spawn_info.h b/nel/include/nel/3d/ps_spawn_info.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_spawn_info.h
rename to nel/include/nel/3d/ps_spawn_info.h
diff --git a/code/nel/include/nel/3d/ps_tail_dot.h b/nel/include/nel/3d/ps_tail_dot.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_tail_dot.h
rename to nel/include/nel/3d/ps_tail_dot.h
diff --git a/code/nel/include/nel/3d/ps_util.h b/nel/include/nel/3d/ps_util.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_util.h
rename to nel/include/nel/3d/ps_util.h
diff --git a/code/nel/include/nel/3d/ps_zone.h b/nel/include/nel/3d/ps_zone.h
similarity index 100%
rename from code/nel/include/nel/3d/ps_zone.h
rename to nel/include/nel/3d/ps_zone.h
diff --git a/code/nel/include/nel/3d/ptr_set.h b/nel/include/nel/3d/ptr_set.h
similarity index 100%
rename from code/nel/include/nel/3d/ptr_set.h
rename to nel/include/nel/3d/ptr_set.h
diff --git a/code/nel/include/nel/3d/quad_effect.h b/nel/include/nel/3d/quad_effect.h
similarity index 100%
rename from code/nel/include/nel/3d/quad_effect.h
rename to nel/include/nel/3d/quad_effect.h
diff --git a/code/nel/include/nel/3d/quad_grid.h b/nel/include/nel/3d/quad_grid.h
similarity index 100%
rename from code/nel/include/nel/3d/quad_grid.h
rename to nel/include/nel/3d/quad_grid.h
diff --git a/code/nel/include/nel/3d/quad_grid_clip_cluster.h b/nel/include/nel/3d/quad_grid_clip_cluster.h
similarity index 100%
rename from code/nel/include/nel/3d/quad_grid_clip_cluster.h
rename to nel/include/nel/3d/quad_grid_clip_cluster.h
diff --git a/code/nel/include/nel/3d/quad_grid_clip_manager.h b/nel/include/nel/3d/quad_grid_clip_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/quad_grid_clip_manager.h
rename to nel/include/nel/3d/quad_grid_clip_manager.h
diff --git a/code/nel/include/nel/3d/quad_tree.h b/nel/include/nel/3d/quad_tree.h
similarity index 100%
rename from code/nel/include/nel/3d/quad_tree.h
rename to nel/include/nel/3d/quad_tree.h
diff --git a/code/nel/include/nel/3d/radix_sort.h b/nel/include/nel/3d/radix_sort.h
similarity index 100%
rename from code/nel/include/nel/3d/radix_sort.h
rename to nel/include/nel/3d/radix_sort.h
diff --git a/code/nel/include/nel/3d/raw_skin.h b/nel/include/nel/3d/raw_skin.h
similarity index 100%
rename from code/nel/include/nel/3d/raw_skin.h
rename to nel/include/nel/3d/raw_skin.h
diff --git a/code/nel/include/nel/3d/raw_skinned.h b/nel/include/nel/3d/raw_skinned.h
similarity index 100%
rename from code/nel/include/nel/3d/raw_skinned.h
rename to nel/include/nel/3d/raw_skinned.h
diff --git a/code/nel/include/nel/3d/ray_mesh.h b/nel/include/nel/3d/ray_mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/ray_mesh.h
rename to nel/include/nel/3d/ray_mesh.h
diff --git a/code/nel/include/nel/3d/register_3d.h b/nel/include/nel/3d/register_3d.h
similarity index 100%
rename from code/nel/include/nel/3d/register_3d.h
rename to nel/include/nel/3d/register_3d.h
diff --git a/code/nel/include/nel/3d/render_target_manager.h b/nel/include/nel/3d/render_target_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/render_target_manager.h
rename to nel/include/nel/3d/render_target_manager.h
diff --git a/code/nel/include/nel/3d/render_trav.h b/nel/include/nel/3d/render_trav.h
similarity index 100%
rename from code/nel/include/nel/3d/render_trav.h
rename to nel/include/nel/3d/render_trav.h
diff --git a/code/nel/include/nel/3d/root_model.h b/nel/include/nel/3d/root_model.h
similarity index 100%
rename from code/nel/include/nel/3d/root_model.h
rename to nel/include/nel/3d/root_model.h
diff --git a/code/nel/include/nel/3d/scene.h b/nel/include/nel/3d/scene.h
similarity index 100%
rename from code/nel/include/nel/3d/scene.h
rename to nel/include/nel/3d/scene.h
diff --git a/code/nel/include/nel/3d/scene_group.h b/nel/include/nel/3d/scene_group.h
similarity index 100%
rename from code/nel/include/nel/3d/scene_group.h
rename to nel/include/nel/3d/scene_group.h
diff --git a/code/nel/include/nel/3d/scene_user.h b/nel/include/nel/3d/scene_user.h
similarity index 100%
rename from code/nel/include/nel/3d/scene_user.h
rename to nel/include/nel/3d/scene_user.h
diff --git a/code/nel/include/nel/3d/scissor.h b/nel/include/nel/3d/scissor.h
similarity index 100%
rename from code/nel/include/nel/3d/scissor.h
rename to nel/include/nel/3d/scissor.h
diff --git a/code/nel/include/nel/3d/seg_remanence.h b/nel/include/nel/3d/seg_remanence.h
similarity index 100%
rename from code/nel/include/nel/3d/seg_remanence.h
rename to nel/include/nel/3d/seg_remanence.h
diff --git a/code/nel/include/nel/3d/seg_remanence_shape.h b/nel/include/nel/3d/seg_remanence_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/seg_remanence_shape.h
rename to nel/include/nel/3d/seg_remanence_shape.h
diff --git a/code/nel/include/nel/3d/shadow_map.h b/nel/include/nel/3d/shadow_map.h
similarity index 100%
rename from code/nel/include/nel/3d/shadow_map.h
rename to nel/include/nel/3d/shadow_map.h
diff --git a/code/nel/include/nel/3d/shadow_map_manager.h b/nel/include/nel/3d/shadow_map_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/shadow_map_manager.h
rename to nel/include/nel/3d/shadow_map_manager.h
diff --git a/code/nel/include/nel/3d/shadow_poly_receiver.h b/nel/include/nel/3d/shadow_poly_receiver.h
similarity index 100%
rename from code/nel/include/nel/3d/shadow_poly_receiver.h
rename to nel/include/nel/3d/shadow_poly_receiver.h
diff --git a/code/nel/include/nel/3d/shadow_skin.h b/nel/include/nel/3d/shadow_skin.h
similarity index 100%
rename from code/nel/include/nel/3d/shadow_skin.h
rename to nel/include/nel/3d/shadow_skin.h
diff --git a/code/nel/include/nel/3d/shape.h b/nel/include/nel/3d/shape.h
similarity index 100%
rename from code/nel/include/nel/3d/shape.h
rename to nel/include/nel/3d/shape.h
diff --git a/code/nel/include/nel/3d/shape_bank.h b/nel/include/nel/3d/shape_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/shape_bank.h
rename to nel/include/nel/3d/shape_bank.h
diff --git a/code/nel/include/nel/3d/shape_bank_user.h b/nel/include/nel/3d/shape_bank_user.h
similarity index 100%
rename from code/nel/include/nel/3d/shape_bank_user.h
rename to nel/include/nel/3d/shape_bank_user.h
diff --git a/code/nel/include/nel/3d/shape_info.h b/nel/include/nel/3d/shape_info.h
similarity index 100%
rename from code/nel/include/nel/3d/shape_info.h
rename to nel/include/nel/3d/shape_info.h
diff --git a/code/nel/include/nel/3d/shifted_triangle_cache.h b/nel/include/nel/3d/shifted_triangle_cache.h
similarity index 100%
rename from code/nel/include/nel/3d/shifted_triangle_cache.h
rename to nel/include/nel/3d/shifted_triangle_cache.h
diff --git a/code/nel/include/nel/3d/skeleton_model.h b/nel/include/nel/3d/skeleton_model.h
similarity index 100%
rename from code/nel/include/nel/3d/skeleton_model.h
rename to nel/include/nel/3d/skeleton_model.h
diff --git a/code/nel/include/nel/3d/skeleton_shape.h b/nel/include/nel/3d/skeleton_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/skeleton_shape.h
rename to nel/include/nel/3d/skeleton_shape.h
diff --git a/code/nel/include/nel/3d/skeleton_spawn_script.h b/nel/include/nel/3d/skeleton_spawn_script.h
similarity index 100%
rename from code/nel/include/nel/3d/skeleton_spawn_script.h
rename to nel/include/nel/3d/skeleton_spawn_script.h
diff --git a/code/nel/include/nel/3d/skeleton_weight.h b/nel/include/nel/3d/skeleton_weight.h
similarity index 100%
rename from code/nel/include/nel/3d/skeleton_weight.h
rename to nel/include/nel/3d/skeleton_weight.h
diff --git a/code/nel/include/nel/3d/static_quad_grid.h b/nel/include/nel/3d/static_quad_grid.h
similarity index 100%
rename from code/nel/include/nel/3d/static_quad_grid.h
rename to nel/include/nel/3d/static_quad_grid.h
diff --git a/code/nel/include/nel/3d/stereo_debugger.h b/nel/include/nel/3d/stereo_debugger.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_debugger.h
rename to nel/include/nel/3d/stereo_debugger.h
diff --git a/code/nel/include/nel/3d/stereo_display.h b/nel/include/nel/3d/stereo_display.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_display.h
rename to nel/include/nel/3d/stereo_display.h
diff --git a/code/nel/include/nel/3d/stereo_hmd.h b/nel/include/nel/3d/stereo_hmd.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_hmd.h
rename to nel/include/nel/3d/stereo_hmd.h
diff --git a/code/nel/include/nel/3d/stereo_libvr.h b/nel/include/nel/3d/stereo_libvr.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_libvr.h
rename to nel/include/nel/3d/stereo_libvr.h
diff --git a/code/nel/include/nel/3d/stereo_ovr.h b/nel/include/nel/3d/stereo_ovr.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_ovr.h
rename to nel/include/nel/3d/stereo_ovr.h
diff --git a/code/nel/include/nel/3d/stereo_ovr_04.h b/nel/include/nel/3d/stereo_ovr_04.h
similarity index 100%
rename from code/nel/include/nel/3d/stereo_ovr_04.h
rename to nel/include/nel/3d/stereo_ovr_04.h
diff --git a/code/nel/include/nel/3d/stripifier.h b/nel/include/nel/3d/stripifier.h
similarity index 100%
rename from code/nel/include/nel/3d/stripifier.h
rename to nel/include/nel/3d/stripifier.h
diff --git a/code/nel/include/nel/3d/surface_light_grid.h b/nel/include/nel/3d/surface_light_grid.h
similarity index 100%
rename from code/nel/include/nel/3d/surface_light_grid.h
rename to nel/include/nel/3d/surface_light_grid.h
diff --git a/code/nel/include/nel/3d/tangent_space_build.h b/nel/include/nel/3d/tangent_space_build.h
similarity index 100%
rename from code/nel/include/nel/3d/tangent_space_build.h
rename to nel/include/nel/3d/tangent_space_build.h
diff --git a/code/nel/include/nel/3d/target_anim_ctrl.h b/nel/include/nel/3d/target_anim_ctrl.h
similarity index 100%
rename from code/nel/include/nel/3d/target_anim_ctrl.h
rename to nel/include/nel/3d/target_anim_ctrl.h
diff --git a/code/nel/include/nel/3d/tess_block.h b/nel/include/nel/3d/tess_block.h
similarity index 100%
rename from code/nel/include/nel/3d/tess_block.h
rename to nel/include/nel/3d/tess_block.h
diff --git a/code/nel/include/nel/3d/tess_face_priority_list.h b/nel/include/nel/3d/tess_face_priority_list.h
similarity index 100%
rename from code/nel/include/nel/3d/tess_face_priority_list.h
rename to nel/include/nel/3d/tess_face_priority_list.h
diff --git a/code/nel/include/nel/3d/tess_list.h b/nel/include/nel/3d/tess_list.h
similarity index 100%
rename from code/nel/include/nel/3d/tess_list.h
rename to nel/include/nel/3d/tess_list.h
diff --git a/code/nel/include/nel/3d/tessellation.h b/nel/include/nel/3d/tessellation.h
similarity index 100%
rename from code/nel/include/nel/3d/tessellation.h
rename to nel/include/nel/3d/tessellation.h
diff --git a/code/nel/include/nel/3d/text_context.h b/nel/include/nel/3d/text_context.h
similarity index 100%
rename from code/nel/include/nel/3d/text_context.h
rename to nel/include/nel/3d/text_context.h
diff --git a/code/nel/include/nel/3d/text_context_user.h b/nel/include/nel/3d/text_context_user.h
similarity index 100%
rename from code/nel/include/nel/3d/text_context_user.h
rename to nel/include/nel/3d/text_context_user.h
diff --git a/code/nel/include/nel/3d/texture.h b/nel/include/nel/3d/texture.h
similarity index 100%
rename from code/nel/include/nel/3d/texture.h
rename to nel/include/nel/3d/texture.h
diff --git a/code/nel/include/nel/3d/texture_blank.h b/nel/include/nel/3d/texture_blank.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_blank.h
rename to nel/include/nel/3d/texture_blank.h
diff --git a/code/nel/include/nel/3d/texture_blend.h b/nel/include/nel/3d/texture_blend.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_blend.h
rename to nel/include/nel/3d/texture_blend.h
diff --git a/code/nel/include/nel/3d/texture_bloom.h b/nel/include/nel/3d/texture_bloom.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_bloom.h
rename to nel/include/nel/3d/texture_bloom.h
diff --git a/code/nel/include/nel/3d/texture_bump.h b/nel/include/nel/3d/texture_bump.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_bump.h
rename to nel/include/nel/3d/texture_bump.h
diff --git a/code/nel/include/nel/3d/texture_cube.h b/nel/include/nel/3d/texture_cube.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_cube.h
rename to nel/include/nel/3d/texture_cube.h
diff --git a/code/nel/include/nel/3d/texture_dlm.h b/nel/include/nel/3d/texture_dlm.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_dlm.h
rename to nel/include/nel/3d/texture_dlm.h
diff --git a/code/nel/include/nel/3d/texture_emboss.h b/nel/include/nel/3d/texture_emboss.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_emboss.h
rename to nel/include/nel/3d/texture_emboss.h
diff --git a/code/nel/include/nel/3d/texture_far.h b/nel/include/nel/3d/texture_far.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_far.h
rename to nel/include/nel/3d/texture_far.h
diff --git a/code/nel/include/nel/3d/texture_file.h b/nel/include/nel/3d/texture_file.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_file.h
rename to nel/include/nel/3d/texture_file.h
diff --git a/code/nel/include/nel/3d/texture_font.h b/nel/include/nel/3d/texture_font.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_font.h
rename to nel/include/nel/3d/texture_font.h
diff --git a/code/nel/include/nel/3d/texture_grouped.h b/nel/include/nel/3d/texture_grouped.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_grouped.h
rename to nel/include/nel/3d/texture_grouped.h
diff --git a/code/nel/include/nel/3d/texture_mem.h b/nel/include/nel/3d/texture_mem.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_mem.h
rename to nel/include/nel/3d/texture_mem.h
diff --git a/code/nel/include/nel/3d/texture_multi_file.h b/nel/include/nel/3d/texture_multi_file.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_multi_file.h
rename to nel/include/nel/3d/texture_multi_file.h
diff --git a/code/nel/include/nel/3d/texture_near.h b/nel/include/nel/3d/texture_near.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_near.h
rename to nel/include/nel/3d/texture_near.h
diff --git a/code/nel/include/nel/3d/texture_user.h b/nel/include/nel/3d/texture_user.h
similarity index 100%
rename from code/nel/include/nel/3d/texture_user.h
rename to nel/include/nel/3d/texture_user.h
diff --git a/code/nel/include/nel/3d/tile_bank.h b/nel/include/nel/3d/tile_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_bank.h
rename to nel/include/nel/3d/tile_bank.h
diff --git a/code/nel/include/nel/3d/tile_color.h b/nel/include/nel/3d/tile_color.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_color.h
rename to nel/include/nel/3d/tile_color.h
diff --git a/code/nel/include/nel/3d/tile_element.h b/nel/include/nel/3d/tile_element.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_element.h
rename to nel/include/nel/3d/tile_element.h
diff --git a/code/nel/include/nel/3d/tile_far_bank.h b/nel/include/nel/3d/tile_far_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_far_bank.h
rename to nel/include/nel/3d/tile_far_bank.h
diff --git a/code/nel/include/nel/3d/tile_light_influence.h b/nel/include/nel/3d/tile_light_influence.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_light_influence.h
rename to nel/include/nel/3d/tile_light_influence.h
diff --git a/code/nel/include/nel/3d/tile_lumel.h b/nel/include/nel/3d/tile_lumel.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_lumel.h
rename to nel/include/nel/3d/tile_lumel.h
diff --git a/code/nel/include/nel/3d/tile_noise_map.h b/nel/include/nel/3d/tile_noise_map.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_noise_map.h
rename to nel/include/nel/3d/tile_noise_map.h
diff --git a/code/nel/include/nel/3d/tile_vegetable_desc.h b/nel/include/nel/3d/tile_vegetable_desc.h
similarity index 100%
rename from code/nel/include/nel/3d/tile_vegetable_desc.h
rename to nel/include/nel/3d/tile_vegetable_desc.h
diff --git a/code/nel/include/nel/3d/track.h b/nel/include/nel/3d/track.h
similarity index 100%
rename from code/nel/include/nel/3d/track.h
rename to nel/include/nel/3d/track.h
diff --git a/code/nel/include/nel/3d/track_bezier.h b/nel/include/nel/3d/track_bezier.h
similarity index 100%
rename from code/nel/include/nel/3d/track_bezier.h
rename to nel/include/nel/3d/track_bezier.h
diff --git a/code/nel/include/nel/3d/track_keyframer.h b/nel/include/nel/3d/track_keyframer.h
similarity index 100%
rename from code/nel/include/nel/3d/track_keyframer.h
rename to nel/include/nel/3d/track_keyframer.h
diff --git a/code/nel/include/nel/3d/track_sampled_common.h b/nel/include/nel/3d/track_sampled_common.h
similarity index 100%
rename from code/nel/include/nel/3d/track_sampled_common.h
rename to nel/include/nel/3d/track_sampled_common.h
diff --git a/code/nel/include/nel/3d/track_sampled_quat.h b/nel/include/nel/3d/track_sampled_quat.h
similarity index 100%
rename from code/nel/include/nel/3d/track_sampled_quat.h
rename to nel/include/nel/3d/track_sampled_quat.h
diff --git a/code/nel/include/nel/3d/track_sampled_quat_small_header.h b/nel/include/nel/3d/track_sampled_quat_small_header.h
similarity index 100%
rename from code/nel/include/nel/3d/track_sampled_quat_small_header.h
rename to nel/include/nel/3d/track_sampled_quat_small_header.h
diff --git a/code/nel/include/nel/3d/track_sampled_vector.h b/nel/include/nel/3d/track_sampled_vector.h
similarity index 100%
rename from code/nel/include/nel/3d/track_sampled_vector.h
rename to nel/include/nel/3d/track_sampled_vector.h
diff --git a/code/nel/include/nel/3d/track_tcb.h b/nel/include/nel/3d/track_tcb.h
similarity index 100%
rename from code/nel/include/nel/3d/track_tcb.h
rename to nel/include/nel/3d/track_tcb.h
diff --git a/code/nel/include/nel/3d/transform.h b/nel/include/nel/3d/transform.h
similarity index 100%
rename from code/nel/include/nel/3d/transform.h
rename to nel/include/nel/3d/transform.h
diff --git a/code/nel/include/nel/3d/transform_shape.h b/nel/include/nel/3d/transform_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/transform_shape.h
rename to nel/include/nel/3d/transform_shape.h
diff --git a/code/nel/include/nel/3d/transformable.h b/nel/include/nel/3d/transformable.h
similarity index 100%
rename from code/nel/include/nel/3d/transformable.h
rename to nel/include/nel/3d/transformable.h
diff --git a/code/nel/include/nel/3d/trav_scene.h b/nel/include/nel/3d/trav_scene.h
similarity index 100%
rename from code/nel/include/nel/3d/trav_scene.h
rename to nel/include/nel/3d/trav_scene.h
diff --git a/code/nel/include/nel/3d/u_3d_mouse_listener.h b/nel/include/nel/3d/u_3d_mouse_listener.h
similarity index 100%
rename from code/nel/include/nel/3d/u_3d_mouse_listener.h
rename to nel/include/nel/3d/u_3d_mouse_listener.h
diff --git a/code/nel/include/nel/3d/u_animation.h b/nel/include/nel/3d/u_animation.h
similarity index 100%
rename from code/nel/include/nel/3d/u_animation.h
rename to nel/include/nel/3d/u_animation.h
diff --git a/code/nel/include/nel/3d/u_animation_set.h b/nel/include/nel/3d/u_animation_set.h
similarity index 100%
rename from code/nel/include/nel/3d/u_animation_set.h
rename to nel/include/nel/3d/u_animation_set.h
diff --git a/code/nel/include/nel/3d/u_bone.h b/nel/include/nel/3d/u_bone.h
similarity index 100%
rename from code/nel/include/nel/3d/u_bone.h
rename to nel/include/nel/3d/u_bone.h
diff --git a/code/nel/include/nel/3d/u_camera.h b/nel/include/nel/3d/u_camera.h
similarity index 100%
rename from code/nel/include/nel/3d/u_camera.h
rename to nel/include/nel/3d/u_camera.h
diff --git a/code/nel/include/nel/3d/u_cloud_scape.h b/nel/include/nel/3d/u_cloud_scape.h
similarity index 100%
rename from code/nel/include/nel/3d/u_cloud_scape.h
rename to nel/include/nel/3d/u_cloud_scape.h
diff --git a/code/nel/include/nel/3d/u_driver.h b/nel/include/nel/3d/u_driver.h
similarity index 100%
rename from code/nel/include/nel/3d/u_driver.h
rename to nel/include/nel/3d/u_driver.h
diff --git a/code/nel/include/nel/3d/u_instance.h b/nel/include/nel/3d/u_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/u_instance.h
rename to nel/include/nel/3d/u_instance.h
diff --git a/code/nel/include/nel/3d/u_instance_group.h b/nel/include/nel/3d/u_instance_group.h
similarity index 100%
rename from code/nel/include/nel/3d/u_instance_group.h
rename to nel/include/nel/3d/u_instance_group.h
diff --git a/code/nel/include/nel/3d/u_instance_material.h b/nel/include/nel/3d/u_instance_material.h
similarity index 100%
rename from code/nel/include/nel/3d/u_instance_material.h
rename to nel/include/nel/3d/u_instance_material.h
diff --git a/code/nel/include/nel/3d/u_landscape.h b/nel/include/nel/3d/u_landscape.h
similarity index 100%
rename from code/nel/include/nel/3d/u_landscape.h
rename to nel/include/nel/3d/u_landscape.h
diff --git a/code/nel/include/nel/3d/u_light.h b/nel/include/nel/3d/u_light.h
similarity index 100%
rename from code/nel/include/nel/3d/u_light.h
rename to nel/include/nel/3d/u_light.h
diff --git a/code/nel/include/nel/3d/u_material.h b/nel/include/nel/3d/u_material.h
similarity index 100%
rename from code/nel/include/nel/3d/u_material.h
rename to nel/include/nel/3d/u_material.h
diff --git a/code/nel/include/nel/3d/u_particle_system_instance.h b/nel/include/nel/3d/u_particle_system_instance.h
similarity index 100%
rename from code/nel/include/nel/3d/u_particle_system_instance.h
rename to nel/include/nel/3d/u_particle_system_instance.h
diff --git a/code/nel/include/nel/3d/u_particle_system_sound.h b/nel/include/nel/3d/u_particle_system_sound.h
similarity index 100%
rename from code/nel/include/nel/3d/u_particle_system_sound.h
rename to nel/include/nel/3d/u_particle_system_sound.h
diff --git a/code/nel/include/nel/3d/u_play_list.h b/nel/include/nel/3d/u_play_list.h
similarity index 100%
rename from code/nel/include/nel/3d/u_play_list.h
rename to nel/include/nel/3d/u_play_list.h
diff --git a/code/nel/include/nel/3d/u_play_list_manager.h b/nel/include/nel/3d/u_play_list_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/u_play_list_manager.h
rename to nel/include/nel/3d/u_play_list_manager.h
diff --git a/code/nel/include/nel/3d/u_point_light.h b/nel/include/nel/3d/u_point_light.h
similarity index 100%
rename from code/nel/include/nel/3d/u_point_light.h
rename to nel/include/nel/3d/u_point_light.h
diff --git a/code/nel/include/nel/3d/u_ps_sound_impl.h b/nel/include/nel/3d/u_ps_sound_impl.h
similarity index 100%
rename from code/nel/include/nel/3d/u_ps_sound_impl.h
rename to nel/include/nel/3d/u_ps_sound_impl.h
diff --git a/code/nel/include/nel/3d/u_ps_sound_interface.h b/nel/include/nel/3d/u_ps_sound_interface.h
similarity index 100%
rename from code/nel/include/nel/3d/u_ps_sound_interface.h
rename to nel/include/nel/3d/u_ps_sound_interface.h
diff --git a/code/nel/include/nel/3d/u_scene.h b/nel/include/nel/3d/u_scene.h
similarity index 100%
rename from code/nel/include/nel/3d/u_scene.h
rename to nel/include/nel/3d/u_scene.h
diff --git a/code/nel/include/nel/3d/u_shape.h b/nel/include/nel/3d/u_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/u_shape.h
rename to nel/include/nel/3d/u_shape.h
diff --git a/code/nel/include/nel/3d/u_shape_bank.h b/nel/include/nel/3d/u_shape_bank.h
similarity index 100%
rename from code/nel/include/nel/3d/u_shape_bank.h
rename to nel/include/nel/3d/u_shape_bank.h
diff --git a/code/nel/include/nel/3d/u_skeleton.h b/nel/include/nel/3d/u_skeleton.h
similarity index 100%
rename from code/nel/include/nel/3d/u_skeleton.h
rename to nel/include/nel/3d/u_skeleton.h
diff --git a/code/nel/include/nel/3d/u_text_context.h b/nel/include/nel/3d/u_text_context.h
similarity index 100%
rename from code/nel/include/nel/3d/u_text_context.h
rename to nel/include/nel/3d/u_text_context.h
diff --git a/code/nel/include/nel/3d/u_texture.h b/nel/include/nel/3d/u_texture.h
similarity index 100%
rename from code/nel/include/nel/3d/u_texture.h
rename to nel/include/nel/3d/u_texture.h
diff --git a/code/nel/include/nel/3d/u_track.h b/nel/include/nel/3d/u_track.h
similarity index 100%
rename from code/nel/include/nel/3d/u_track.h
rename to nel/include/nel/3d/u_track.h
diff --git a/code/nel/include/nel/3d/u_transform.h b/nel/include/nel/3d/u_transform.h
similarity index 100%
rename from code/nel/include/nel/3d/u_transform.h
rename to nel/include/nel/3d/u_transform.h
diff --git a/code/nel/include/nel/3d/u_transformable.h b/nel/include/nel/3d/u_transformable.h
similarity index 100%
rename from code/nel/include/nel/3d/u_transformable.h
rename to nel/include/nel/3d/u_transformable.h
diff --git a/code/nel/include/nel/3d/u_visual_collision_entity.h b/nel/include/nel/3d/u_visual_collision_entity.h
similarity index 100%
rename from code/nel/include/nel/3d/u_visual_collision_entity.h
rename to nel/include/nel/3d/u_visual_collision_entity.h
diff --git a/code/nel/include/nel/3d/u_visual_collision_manager.h b/nel/include/nel/3d/u_visual_collision_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/u_visual_collision_manager.h
rename to nel/include/nel/3d/u_visual_collision_manager.h
diff --git a/code/nel/include/nel/3d/u_visual_collision_mesh.h b/nel/include/nel/3d/u_visual_collision_mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/u_visual_collision_mesh.h
rename to nel/include/nel/3d/u_visual_collision_mesh.h
diff --git a/code/nel/include/nel/3d/u_water.h b/nel/include/nel/3d/u_water.h
similarity index 100%
rename from code/nel/include/nel/3d/u_water.h
rename to nel/include/nel/3d/u_water.h
diff --git a/code/nel/include/nel/3d/u_water_env_map.h b/nel/include/nel/3d/u_water_env_map.h
similarity index 100%
rename from code/nel/include/nel/3d/u_water_env_map.h
rename to nel/include/nel/3d/u_water_env_map.h
diff --git a/code/nel/include/nel/3d/vegetable.h b/nel/include/nel/3d/vegetable.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable.h
rename to nel/include/nel/3d/vegetable.h
diff --git a/code/nel/include/nel/3d/vegetable_blend_layer_model.h b/nel/include/nel/3d/vegetable_blend_layer_model.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_blend_layer_model.h
rename to nel/include/nel/3d/vegetable_blend_layer_model.h
diff --git a/code/nel/include/nel/3d/vegetable_clip_block.h b/nel/include/nel/3d/vegetable_clip_block.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_clip_block.h
rename to nel/include/nel/3d/vegetable_clip_block.h
diff --git a/code/nel/include/nel/3d/vegetable_def.h b/nel/include/nel/3d/vegetable_def.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_def.h
rename to nel/include/nel/3d/vegetable_def.h
diff --git a/code/nel/include/nel/3d/vegetable_instance_group.h b/nel/include/nel/3d/vegetable_instance_group.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_instance_group.h
rename to nel/include/nel/3d/vegetable_instance_group.h
diff --git a/code/nel/include/nel/3d/vegetable_light_ex.h b/nel/include/nel/3d/vegetable_light_ex.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_light_ex.h
rename to nel/include/nel/3d/vegetable_light_ex.h
diff --git a/code/nel/include/nel/3d/vegetable_manager.h b/nel/include/nel/3d/vegetable_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_manager.h
rename to nel/include/nel/3d/vegetable_manager.h
diff --git a/code/nel/include/nel/3d/vegetable_quadrant.h b/nel/include/nel/3d/vegetable_quadrant.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_quadrant.h
rename to nel/include/nel/3d/vegetable_quadrant.h
diff --git a/code/nel/include/nel/3d/vegetable_shape.h b/nel/include/nel/3d/vegetable_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_shape.h
rename to nel/include/nel/3d/vegetable_shape.h
diff --git a/code/nel/include/nel/3d/vegetable_sort_block.h b/nel/include/nel/3d/vegetable_sort_block.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_sort_block.h
rename to nel/include/nel/3d/vegetable_sort_block.h
diff --git a/code/nel/include/nel/3d/vegetable_uv8.h b/nel/include/nel/3d/vegetable_uv8.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetable_uv8.h
rename to nel/include/nel/3d/vegetable_uv8.h
diff --git a/code/nel/include/nel/3d/vegetablevb_allocator.h b/nel/include/nel/3d/vegetablevb_allocator.h
similarity index 100%
rename from code/nel/include/nel/3d/vegetablevb_allocator.h
rename to nel/include/nel/3d/vegetablevb_allocator.h
diff --git a/code/nel/include/nel/3d/vertex_buffer.h b/nel/include/nel/3d/vertex_buffer.h
similarity index 100%
rename from code/nel/include/nel/3d/vertex_buffer.h
rename to nel/include/nel/3d/vertex_buffer.h
diff --git a/code/nel/include/nel/3d/vertex_buffer_heap.h b/nel/include/nel/3d/vertex_buffer_heap.h
similarity index 100%
rename from code/nel/include/nel/3d/vertex_buffer_heap.h
rename to nel/include/nel/3d/vertex_buffer_heap.h
diff --git a/code/nel/include/nel/3d/vertex_program.h b/nel/include/nel/3d/vertex_program.h
similarity index 100%
rename from code/nel/include/nel/3d/vertex_program.h
rename to nel/include/nel/3d/vertex_program.h
diff --git a/code/nel/include/nel/3d/vertex_program_parse.h b/nel/include/nel/3d/vertex_program_parse.h
similarity index 100%
rename from code/nel/include/nel/3d/vertex_program_parse.h
rename to nel/include/nel/3d/vertex_program_parse.h
diff --git a/code/nel/include/nel/3d/vertex_stream_manager.h b/nel/include/nel/3d/vertex_stream_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/vertex_stream_manager.h
rename to nel/include/nel/3d/vertex_stream_manager.h
diff --git a/code/nel/include/nel/3d/viewport.h b/nel/include/nel/3d/viewport.h
similarity index 100%
rename from code/nel/include/nel/3d/viewport.h
rename to nel/include/nel/3d/viewport.h
diff --git a/code/nel/include/nel/3d/visual_collision_entity.h b/nel/include/nel/3d/visual_collision_entity.h
similarity index 100%
rename from code/nel/include/nel/3d/visual_collision_entity.h
rename to nel/include/nel/3d/visual_collision_entity.h
diff --git a/code/nel/include/nel/3d/visual_collision_entity_user.h b/nel/include/nel/3d/visual_collision_entity_user.h
similarity index 100%
rename from code/nel/include/nel/3d/visual_collision_entity_user.h
rename to nel/include/nel/3d/visual_collision_entity_user.h
diff --git a/code/nel/include/nel/3d/visual_collision_manager.h b/nel/include/nel/3d/visual_collision_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/visual_collision_manager.h
rename to nel/include/nel/3d/visual_collision_manager.h
diff --git a/code/nel/include/nel/3d/visual_collision_manager_user.h b/nel/include/nel/3d/visual_collision_manager_user.h
similarity index 100%
rename from code/nel/include/nel/3d/visual_collision_manager_user.h
rename to nel/include/nel/3d/visual_collision_manager_user.h
diff --git a/code/nel/include/nel/3d/visual_collision_mesh.h b/nel/include/nel/3d/visual_collision_mesh.h
similarity index 100%
rename from code/nel/include/nel/3d/visual_collision_mesh.h
rename to nel/include/nel/3d/visual_collision_mesh.h
diff --git a/code/nel/include/nel/3d/water_env_map.h b/nel/include/nel/3d/water_env_map.h
similarity index 100%
rename from code/nel/include/nel/3d/water_env_map.h
rename to nel/include/nel/3d/water_env_map.h
diff --git a/code/nel/include/nel/3d/water_env_map_user.h b/nel/include/nel/3d/water_env_map_user.h
similarity index 100%
rename from code/nel/include/nel/3d/water_env_map_user.h
rename to nel/include/nel/3d/water_env_map_user.h
diff --git a/code/nel/include/nel/3d/water_height_map.h b/nel/include/nel/3d/water_height_map.h
similarity index 100%
rename from code/nel/include/nel/3d/water_height_map.h
rename to nel/include/nel/3d/water_height_map.h
diff --git a/code/nel/include/nel/3d/water_model.h b/nel/include/nel/3d/water_model.h
similarity index 100%
rename from code/nel/include/nel/3d/water_model.h
rename to nel/include/nel/3d/water_model.h
diff --git a/code/nel/include/nel/3d/water_pool_manager.h b/nel/include/nel/3d/water_pool_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/water_pool_manager.h
rename to nel/include/nel/3d/water_pool_manager.h
diff --git a/code/nel/include/nel/3d/water_shape.h b/nel/include/nel/3d/water_shape.h
similarity index 100%
rename from code/nel/include/nel/3d/water_shape.h
rename to nel/include/nel/3d/water_shape.h
diff --git a/code/nel/include/nel/3d/zone.h b/nel/include/nel/3d/zone.h
similarity index 100%
rename from code/nel/include/nel/3d/zone.h
rename to nel/include/nel/3d/zone.h
diff --git a/code/nel/include/nel/3d/zone_corner_smoother.h b/nel/include/nel/3d/zone_corner_smoother.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_corner_smoother.h
rename to nel/include/nel/3d/zone_corner_smoother.h
diff --git a/code/nel/include/nel/3d/zone_lighter.h b/nel/include/nel/3d/zone_lighter.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_lighter.h
rename to nel/include/nel/3d/zone_lighter.h
diff --git a/code/nel/include/nel/3d/zone_manager.h b/nel/include/nel/3d/zone_manager.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_manager.h
rename to nel/include/nel/3d/zone_manager.h
diff --git a/code/nel/include/nel/3d/zone_search.h b/nel/include/nel/3d/zone_search.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_search.h
rename to nel/include/nel/3d/zone_search.h
diff --git a/code/nel/include/nel/3d/zone_smoother.h b/nel/include/nel/3d/zone_smoother.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_smoother.h
rename to nel/include/nel/3d/zone_smoother.h
diff --git a/code/nel/include/nel/3d/zone_symmetrisation.h b/nel/include/nel/3d/zone_symmetrisation.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_symmetrisation.h
rename to nel/include/nel/3d/zone_symmetrisation.h
diff --git a/code/nel/include/nel/3d/zone_tgt_smoother.h b/nel/include/nel/3d/zone_tgt_smoother.h
similarity index 100%
rename from code/nel/include/nel/3d/zone_tgt_smoother.h
rename to nel/include/nel/3d/zone_tgt_smoother.h
diff --git a/code/nel/include/nel/CMakeLists.txt b/nel/include/nel/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/CMakeLists.txt
rename to nel/include/nel/CMakeLists.txt
diff --git a/code/nel/include/nel/cegui/CMakeLists.txt b/nel/include/nel/cegui/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/cegui/CMakeLists.txt
rename to nel/include/nel/cegui/CMakeLists.txt
diff --git a/code/nel/include/nel/cegui/inellibrary.h b/nel/include/nel/cegui/inellibrary.h
similarity index 100%
rename from code/nel/include/nel/cegui/inellibrary.h
rename to nel/include/nel/cegui/inellibrary.h
diff --git a/code/nel/include/nel/cegui/nellogger.h b/nel/include/nel/cegui/nellogger.h
similarity index 100%
rename from code/nel/include/nel/cegui/nellogger.h
rename to nel/include/nel/cegui/nellogger.h
diff --git a/code/nel/include/nel/cegui/nelrenderer.h b/nel/include/nel/cegui/nelrenderer.h
similarity index 100%
rename from code/nel/include/nel/cegui/nelrenderer.h
rename to nel/include/nel/cegui/nelrenderer.h
diff --git a/code/nel/include/nel/cegui/nelresourceprovider.h b/nel/include/nel/cegui/nelresourceprovider.h
similarity index 100%
rename from code/nel/include/nel/cegui/nelresourceprovider.h
rename to nel/include/nel/cegui/nelresourceprovider.h
diff --git a/code/nel/include/nel/cegui/neltexture.h b/nel/include/nel/cegui/neltexture.h
similarity index 100%
rename from code/nel/include/nel/cegui/neltexture.h
rename to nel/include/nel/cegui/neltexture.h
diff --git a/code/nel/include/nel/georges/CMakeLists.txt b/nel/include/nel/georges/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/georges/CMakeLists.txt
rename to nel/include/nel/georges/CMakeLists.txt
diff --git a/code/nel/include/nel/georges/form.h b/nel/include/nel/georges/form.h
similarity index 100%
rename from code/nel/include/nel/georges/form.h
rename to nel/include/nel/georges/form.h
diff --git a/code/nel/include/nel/georges/form_dfn.h b/nel/include/nel/georges/form_dfn.h
similarity index 100%
rename from code/nel/include/nel/georges/form_dfn.h
rename to nel/include/nel/georges/form_dfn.h
diff --git a/code/nel/include/nel/georges/form_elm.h b/nel/include/nel/georges/form_elm.h
similarity index 100%
rename from code/nel/include/nel/georges/form_elm.h
rename to nel/include/nel/georges/form_elm.h
diff --git a/code/nel/include/nel/georges/form_loader.h b/nel/include/nel/georges/form_loader.h
similarity index 100%
rename from code/nel/include/nel/georges/form_loader.h
rename to nel/include/nel/georges/form_loader.h
diff --git a/code/nel/include/nel/georges/header.h b/nel/include/nel/georges/header.h
similarity index 100%
rename from code/nel/include/nel/georges/header.h
rename to nel/include/nel/georges/header.h
diff --git a/code/nel/include/nel/georges/load_form.h b/nel/include/nel/georges/load_form.h
similarity index 100%
rename from code/nel/include/nel/georges/load_form.h
rename to nel/include/nel/georges/load_form.h
diff --git a/code/nel/include/nel/georges/type.h b/nel/include/nel/georges/type.h
similarity index 100%
rename from code/nel/include/nel/georges/type.h
rename to nel/include/nel/georges/type.h
diff --git a/code/nel/include/nel/georges/u_form.h b/nel/include/nel/georges/u_form.h
similarity index 100%
rename from code/nel/include/nel/georges/u_form.h
rename to nel/include/nel/georges/u_form.h
diff --git a/code/nel/include/nel/georges/u_form_dfn.h b/nel/include/nel/georges/u_form_dfn.h
similarity index 100%
rename from code/nel/include/nel/georges/u_form_dfn.h
rename to nel/include/nel/georges/u_form_dfn.h
diff --git a/code/nel/include/nel/georges/u_form_elm.h b/nel/include/nel/georges/u_form_elm.h
similarity index 100%
rename from code/nel/include/nel/georges/u_form_elm.h
rename to nel/include/nel/georges/u_form_elm.h
diff --git a/code/nel/include/nel/georges/u_form_loader.h b/nel/include/nel/georges/u_form_loader.h
similarity index 100%
rename from code/nel/include/nel/georges/u_form_loader.h
rename to nel/include/nel/georges/u_form_loader.h
diff --git a/code/nel/include/nel/georges/u_type.h b/nel/include/nel/georges/u_type.h
similarity index 100%
rename from code/nel/include/nel/georges/u_type.h
rename to nel/include/nel/georges/u_type.h
diff --git a/code/nel/include/nel/gui/CMakeLists.txt b/nel/include/nel/gui/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/gui/CMakeLists.txt
rename to nel/include/nel/gui/CMakeLists.txt
diff --git a/code/nel/include/nel/gui/action_handler.h b/nel/include/nel/gui/action_handler.h
similarity index 100%
rename from code/nel/include/nel/gui/action_handler.h
rename to nel/include/nel/gui/action_handler.h
diff --git a/code/nel/include/nel/gui/css_border_renderer.h b/nel/include/nel/gui/css_border_renderer.h
similarity index 100%
rename from code/nel/include/nel/gui/css_border_renderer.h
rename to nel/include/nel/gui/css_border_renderer.h
diff --git a/code/nel/include/nel/gui/css_parser.h b/nel/include/nel/gui/css_parser.h
similarity index 100%
rename from code/nel/include/nel/gui/css_parser.h
rename to nel/include/nel/gui/css_parser.h
diff --git a/code/nel/include/nel/gui/css_selector.h b/nel/include/nel/gui/css_selector.h
similarity index 100%
rename from code/nel/include/nel/gui/css_selector.h
rename to nel/include/nel/gui/css_selector.h
diff --git a/code/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
similarity index 100%
rename from code/nel/include/nel/gui/css_style.h
rename to nel/include/nel/gui/css_style.h
diff --git a/code/nel/include/nel/gui/css_types.h b/nel/include/nel/gui/css_types.h
similarity index 100%
rename from code/nel/include/nel/gui/css_types.h
rename to nel/include/nel/gui/css_types.h
diff --git a/code/nel/include/nel/gui/ctrl_base.h b/nel/include/nel/gui/ctrl_base.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_base.h
rename to nel/include/nel/gui/ctrl_base.h
diff --git a/code/nel/include/nel/gui/ctrl_base_button.h b/nel/include/nel/gui/ctrl_base_button.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_base_button.h
rename to nel/include/nel/gui/ctrl_base_button.h
diff --git a/code/nel/include/nel/gui/ctrl_button.h b/nel/include/nel/gui/ctrl_button.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_button.h
rename to nel/include/nel/gui/ctrl_button.h
diff --git a/code/nel/include/nel/gui/ctrl_col_pick.h b/nel/include/nel/gui/ctrl_col_pick.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_col_pick.h
rename to nel/include/nel/gui/ctrl_col_pick.h
diff --git a/code/nel/include/nel/gui/ctrl_draggable.h b/nel/include/nel/gui/ctrl_draggable.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_draggable.h
rename to nel/include/nel/gui/ctrl_draggable.h
diff --git a/code/nel/include/nel/gui/ctrl_polygon.h b/nel/include/nel/gui/ctrl_polygon.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_polygon.h
rename to nel/include/nel/gui/ctrl_polygon.h
diff --git a/code/nel/include/nel/gui/ctrl_quad.h b/nel/include/nel/gui/ctrl_quad.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_quad.h
rename to nel/include/nel/gui/ctrl_quad.h
diff --git a/code/nel/include/nel/gui/ctrl_scroll.h b/nel/include/nel/gui/ctrl_scroll.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_scroll.h
rename to nel/include/nel/gui/ctrl_scroll.h
diff --git a/code/nel/include/nel/gui/ctrl_scroll_base.h b/nel/include/nel/gui/ctrl_scroll_base.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_scroll_base.h
rename to nel/include/nel/gui/ctrl_scroll_base.h
diff --git a/code/nel/include/nel/gui/ctrl_sheet_selection.h b/nel/include/nel/gui/ctrl_sheet_selection.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_sheet_selection.h
rename to nel/include/nel/gui/ctrl_sheet_selection.h
diff --git a/code/nel/include/nel/gui/ctrl_text_button.h b/nel/include/nel/gui/ctrl_text_button.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_text_button.h
rename to nel/include/nel/gui/ctrl_text_button.h
diff --git a/code/nel/include/nel/gui/ctrl_tooltip.h b/nel/include/nel/gui/ctrl_tooltip.h
similarity index 100%
rename from code/nel/include/nel/gui/ctrl_tooltip.h
rename to nel/include/nel/gui/ctrl_tooltip.h
diff --git a/code/nel/include/nel/gui/db_manager.h b/nel/include/nel/gui/db_manager.h
similarity index 100%
rename from code/nel/include/nel/gui/db_manager.h
rename to nel/include/nel/gui/db_manager.h
diff --git a/code/nel/include/nel/gui/dbgroup_combo_box.h b/nel/include/nel/gui/dbgroup_combo_box.h
similarity index 100%
rename from code/nel/include/nel/gui/dbgroup_combo_box.h
rename to nel/include/nel/gui/dbgroup_combo_box.h
diff --git a/code/nel/include/nel/gui/dbgroup_select_number.h b/nel/include/nel/gui/dbgroup_select_number.h
similarity index 100%
rename from code/nel/include/nel/gui/dbgroup_select_number.h
rename to nel/include/nel/gui/dbgroup_select_number.h
diff --git a/code/nel/include/nel/gui/dbview_bar.h b/nel/include/nel/gui/dbview_bar.h
similarity index 100%
rename from code/nel/include/nel/gui/dbview_bar.h
rename to nel/include/nel/gui/dbview_bar.h
diff --git a/code/nel/include/nel/gui/dbview_bar3.h b/nel/include/nel/gui/dbview_bar3.h
similarity index 100%
rename from code/nel/include/nel/gui/dbview_bar3.h
rename to nel/include/nel/gui/dbview_bar3.h
diff --git a/code/nel/include/nel/gui/dbview_digit.h b/nel/include/nel/gui/dbview_digit.h
similarity index 100%
rename from code/nel/include/nel/gui/dbview_digit.h
rename to nel/include/nel/gui/dbview_digit.h
diff --git a/code/nel/include/nel/gui/dbview_number.h b/nel/include/nel/gui/dbview_number.h
similarity index 100%
rename from code/nel/include/nel/gui/dbview_number.h
rename to nel/include/nel/gui/dbview_number.h
diff --git a/code/nel/include/nel/gui/dbview_quantity.h b/nel/include/nel/gui/dbview_quantity.h
similarity index 100%
rename from code/nel/include/nel/gui/dbview_quantity.h
rename to nel/include/nel/gui/dbview_quantity.h
diff --git a/code/nel/include/nel/gui/editor_selection_watcher.h b/nel/include/nel/gui/editor_selection_watcher.h
similarity index 100%
rename from code/nel/include/nel/gui/editor_selection_watcher.h
rename to nel/include/nel/gui/editor_selection_watcher.h
diff --git a/code/nel/include/nel/gui/event_descriptor.h b/nel/include/nel/gui/event_descriptor.h
similarity index 100%
rename from code/nel/include/nel/gui/event_descriptor.h
rename to nel/include/nel/gui/event_descriptor.h
diff --git a/code/nel/include/nel/gui/event_listener.h b/nel/include/nel/gui/event_listener.h
similarity index 100%
rename from code/nel/include/nel/gui/event_listener.h
rename to nel/include/nel/gui/event_listener.h
diff --git a/code/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
similarity index 100%
rename from code/nel/include/nel/gui/group_container.h
rename to nel/include/nel/gui/group_container.h
diff --git a/code/nel/include/nel/gui/group_container_base.h b/nel/include/nel/gui/group_container_base.h
similarity index 100%
rename from code/nel/include/nel/gui/group_container_base.h
rename to nel/include/nel/gui/group_container_base.h
diff --git a/code/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
similarity index 100%
rename from code/nel/include/nel/gui/group_editbox.h
rename to nel/include/nel/gui/group_editbox.h
diff --git a/code/nel/include/nel/gui/group_editbox_base.h b/nel/include/nel/gui/group_editbox_base.h
similarity index 100%
rename from code/nel/include/nel/gui/group_editbox_base.h
rename to nel/include/nel/gui/group_editbox_base.h
diff --git a/code/nel/include/nel/gui/group_editbox_decor.h b/nel/include/nel/gui/group_editbox_decor.h
similarity index 100%
rename from code/nel/include/nel/gui/group_editbox_decor.h
rename to nel/include/nel/gui/group_editbox_decor.h
diff --git a/code/nel/include/nel/gui/group_frame.h b/nel/include/nel/gui/group_frame.h
similarity index 100%
rename from code/nel/include/nel/gui/group_frame.h
rename to nel/include/nel/gui/group_frame.h
diff --git a/code/nel/include/nel/gui/group_header.h b/nel/include/nel/gui/group_header.h
similarity index 100%
rename from code/nel/include/nel/gui/group_header.h
rename to nel/include/nel/gui/group_header.h
diff --git a/code/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
similarity index 100%
rename from code/nel/include/nel/gui/group_html.h
rename to nel/include/nel/gui/group_html.h
diff --git a/code/nel/include/nel/gui/group_list.h b/nel/include/nel/gui/group_list.h
similarity index 100%
rename from code/nel/include/nel/gui/group_list.h
rename to nel/include/nel/gui/group_list.h
diff --git a/code/nel/include/nel/gui/group_menu.h b/nel/include/nel/gui/group_menu.h
similarity index 100%
rename from code/nel/include/nel/gui/group_menu.h
rename to nel/include/nel/gui/group_menu.h
diff --git a/code/nel/include/nel/gui/group_modal.h b/nel/include/nel/gui/group_modal.h
similarity index 100%
rename from code/nel/include/nel/gui/group_modal.h
rename to nel/include/nel/gui/group_modal.h
diff --git a/code/nel/include/nel/gui/group_paragraph.h b/nel/include/nel/gui/group_paragraph.h
similarity index 100%
rename from code/nel/include/nel/gui/group_paragraph.h
rename to nel/include/nel/gui/group_paragraph.h
diff --git a/code/nel/include/nel/gui/group_scrolltext.h b/nel/include/nel/gui/group_scrolltext.h
similarity index 100%
rename from code/nel/include/nel/gui/group_scrolltext.h
rename to nel/include/nel/gui/group_scrolltext.h
diff --git a/code/nel/include/nel/gui/group_submenu_base.h b/nel/include/nel/gui/group_submenu_base.h
similarity index 100%
rename from code/nel/include/nel/gui/group_submenu_base.h
rename to nel/include/nel/gui/group_submenu_base.h
diff --git a/code/nel/include/nel/gui/group_tab.h b/nel/include/nel/gui/group_tab.h
similarity index 100%
rename from code/nel/include/nel/gui/group_tab.h
rename to nel/include/nel/gui/group_tab.h
diff --git a/code/nel/include/nel/gui/group_table.h b/nel/include/nel/gui/group_table.h
similarity index 100%
rename from code/nel/include/nel/gui/group_table.h
rename to nel/include/nel/gui/group_table.h
diff --git a/code/nel/include/nel/gui/group_tree.h b/nel/include/nel/gui/group_tree.h
similarity index 100%
rename from code/nel/include/nel/gui/group_tree.h
rename to nel/include/nel/gui/group_tree.h
diff --git a/code/nel/include/nel/gui/group_wheel.h b/nel/include/nel/gui/group_wheel.h
similarity index 100%
rename from code/nel/include/nel/gui/group_wheel.h
rename to nel/include/nel/gui/group_wheel.h
diff --git a/code/nel/include/nel/gui/html_element.h b/nel/include/nel/gui/html_element.h
similarity index 100%
rename from code/nel/include/nel/gui/html_element.h
rename to nel/include/nel/gui/html_element.h
diff --git a/code/nel/include/nel/gui/html_parser.h b/nel/include/nel/gui/html_parser.h
similarity index 100%
rename from code/nel/include/nel/gui/html_parser.h
rename to nel/include/nel/gui/html_parser.h
diff --git a/code/nel/include/nel/gui/http_cache.h b/nel/include/nel/gui/http_cache.h
similarity index 100%
rename from code/nel/include/nel/gui/http_cache.h
rename to nel/include/nel/gui/http_cache.h
diff --git a/code/nel/include/nel/gui/http_hsts.h b/nel/include/nel/gui/http_hsts.h
similarity index 100%
rename from code/nel/include/nel/gui/http_hsts.h
rename to nel/include/nel/gui/http_hsts.h
diff --git a/code/nel/include/nel/gui/input_event_listener.h b/nel/include/nel/gui/input_event_listener.h
similarity index 100%
rename from code/nel/include/nel/gui/input_event_listener.h
rename to nel/include/nel/gui/input_event_listener.h
diff --git a/code/nel/include/nel/gui/input_handler.h b/nel/include/nel/gui/input_handler.h
similarity index 100%
rename from code/nel/include/nel/gui/input_handler.h
rename to nel/include/nel/gui/input_handler.h
diff --git a/code/nel/include/nel/gui/interface_anim.h b/nel/include/nel/gui/interface_anim.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_anim.h
rename to nel/include/nel/gui/interface_anim.h
diff --git a/code/nel/include/nel/gui/interface_common.h b/nel/include/nel/gui/interface_common.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_common.h
rename to nel/include/nel/gui/interface_common.h
diff --git a/code/nel/include/nel/gui/interface_element.h b/nel/include/nel/gui/interface_element.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_element.h
rename to nel/include/nel/gui/interface_element.h
diff --git a/code/nel/include/nel/gui/interface_expr.h b/nel/include/nel/gui/interface_expr.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_expr.h
rename to nel/include/nel/gui/interface_expr.h
diff --git a/code/nel/include/nel/gui/interface_expr_node.h b/nel/include/nel/gui/interface_expr_node.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_expr_node.h
rename to nel/include/nel/gui/interface_expr_node.h
diff --git a/code/nel/include/nel/gui/interface_factory.h b/nel/include/nel/gui/interface_factory.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_factory.h
rename to nel/include/nel/gui/interface_factory.h
diff --git a/code/nel/include/nel/gui/interface_group.h b/nel/include/nel/gui/interface_group.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_group.h
rename to nel/include/nel/gui/interface_group.h
diff --git a/code/nel/include/nel/gui/interface_link.h b/nel/include/nel/gui/interface_link.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_link.h
rename to nel/include/nel/gui/interface_link.h
diff --git a/code/nel/include/nel/gui/interface_options.h b/nel/include/nel/gui/interface_options.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_options.h
rename to nel/include/nel/gui/interface_options.h
diff --git a/code/nel/include/nel/gui/interface_parser.h b/nel/include/nel/gui/interface_parser.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_parser.h
rename to nel/include/nel/gui/interface_parser.h
diff --git a/code/nel/include/nel/gui/interface_property.h b/nel/include/nel/gui/interface_property.h
similarity index 100%
rename from code/nel/include/nel/gui/interface_property.h
rename to nel/include/nel/gui/interface_property.h
diff --git a/code/nel/include/nel/gui/libwww.h b/nel/include/nel/gui/libwww.h
similarity index 100%
rename from code/nel/include/nel/gui/libwww.h
rename to nel/include/nel/gui/libwww.h
diff --git a/code/nel/include/nel/gui/link_data.h b/nel/include/nel/gui/link_data.h
similarity index 100%
rename from code/nel/include/nel/gui/link_data.h
rename to nel/include/nel/gui/link_data.h
diff --git a/code/nel/include/nel/gui/lua_helper.h b/nel/include/nel/gui/lua_helper.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_helper.h
rename to nel/include/nel/gui/lua_helper.h
diff --git a/code/nel/include/nel/gui/lua_helper_inline.h b/nel/include/nel/gui/lua_helper_inline.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_helper_inline.h
rename to nel/include/nel/gui/lua_helper_inline.h
diff --git a/code/nel/include/nel/gui/lua_ihm.h b/nel/include/nel/gui/lua_ihm.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_ihm.h
rename to nel/include/nel/gui/lua_ihm.h
diff --git a/code/nel/include/nel/gui/lua_loadlib.h b/nel/include/nel/gui/lua_loadlib.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_loadlib.h
rename to nel/include/nel/gui/lua_loadlib.h
diff --git a/code/nel/include/nel/gui/lua_manager.h b/nel/include/nel/gui/lua_manager.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_manager.h
rename to nel/include/nel/gui/lua_manager.h
diff --git a/code/nel/include/nel/gui/lua_object.h b/nel/include/nel/gui/lua_object.h
similarity index 100%
rename from code/nel/include/nel/gui/lua_object.h
rename to nel/include/nel/gui/lua_object.h
diff --git a/code/nel/include/nel/gui/parser.h b/nel/include/nel/gui/parser.h
similarity index 100%
rename from code/nel/include/nel/gui/parser.h
rename to nel/include/nel/gui/parser.h
diff --git a/code/nel/include/nel/gui/proc.h b/nel/include/nel/gui/proc.h
similarity index 100%
rename from code/nel/include/nel/gui/proc.h
rename to nel/include/nel/gui/proc.h
diff --git a/code/nel/include/nel/gui/reflect.h b/nel/include/nel/gui/reflect.h
similarity index 100%
rename from code/nel/include/nel/gui/reflect.h
rename to nel/include/nel/gui/reflect.h
diff --git a/code/nel/include/nel/gui/reflect_register.h b/nel/include/nel/gui/reflect_register.h
similarity index 100%
rename from code/nel/include/nel/gui/reflect_register.h
rename to nel/include/nel/gui/reflect_register.h
diff --git a/code/nel/include/nel/gui/root_group.h b/nel/include/nel/gui/root_group.h
similarity index 100%
rename from code/nel/include/nel/gui/root_group.h
rename to nel/include/nel/gui/root_group.h
diff --git a/code/nel/include/nel/gui/string_case.h b/nel/include/nel/gui/string_case.h
similarity index 100%
rename from code/nel/include/nel/gui/string_case.h
rename to nel/include/nel/gui/string_case.h
diff --git a/code/nel/include/nel/gui/url_parser.h b/nel/include/nel/gui/url_parser.h
similarity index 100%
rename from code/nel/include/nel/gui/url_parser.h
rename to nel/include/nel/gui/url_parser.h
diff --git a/code/nel/include/nel/gui/variable_data.h b/nel/include/nel/gui/variable_data.h
similarity index 100%
rename from code/nel/include/nel/gui/variable_data.h
rename to nel/include/nel/gui/variable_data.h
diff --git a/code/nel/include/nel/gui/view_base.h b/nel/include/nel/gui/view_base.h
similarity index 100%
rename from code/nel/include/nel/gui/view_base.h
rename to nel/include/nel/gui/view_base.h
diff --git a/code/nel/include/nel/gui/view_bitmap.h b/nel/include/nel/gui/view_bitmap.h
similarity index 100%
rename from code/nel/include/nel/gui/view_bitmap.h
rename to nel/include/nel/gui/view_bitmap.h
diff --git a/code/nel/include/nel/gui/view_bitmap_combo.h b/nel/include/nel/gui/view_bitmap_combo.h
similarity index 100%
rename from code/nel/include/nel/gui/view_bitmap_combo.h
rename to nel/include/nel/gui/view_bitmap_combo.h
diff --git a/code/nel/include/nel/gui/view_link.h b/nel/include/nel/gui/view_link.h
similarity index 100%
rename from code/nel/include/nel/gui/view_link.h
rename to nel/include/nel/gui/view_link.h
diff --git a/code/nel/include/nel/gui/view_pointer.h b/nel/include/nel/gui/view_pointer.h
similarity index 100%
rename from code/nel/include/nel/gui/view_pointer.h
rename to nel/include/nel/gui/view_pointer.h
diff --git a/code/nel/include/nel/gui/view_pointer_base.h b/nel/include/nel/gui/view_pointer_base.h
similarity index 100%
rename from code/nel/include/nel/gui/view_pointer_base.h
rename to nel/include/nel/gui/view_pointer_base.h
diff --git a/code/nel/include/nel/gui/view_polygon.h b/nel/include/nel/gui/view_polygon.h
similarity index 100%
rename from code/nel/include/nel/gui/view_polygon.h
rename to nel/include/nel/gui/view_polygon.h
diff --git a/code/nel/include/nel/gui/view_quad.h b/nel/include/nel/gui/view_quad.h
similarity index 100%
rename from code/nel/include/nel/gui/view_quad.h
rename to nel/include/nel/gui/view_quad.h
diff --git a/code/nel/include/nel/gui/view_renderer.h b/nel/include/nel/gui/view_renderer.h
similarity index 100%
rename from code/nel/include/nel/gui/view_renderer.h
rename to nel/include/nel/gui/view_renderer.h
diff --git a/code/nel/include/nel/gui/view_text.h b/nel/include/nel/gui/view_text.h
similarity index 100%
rename from code/nel/include/nel/gui/view_text.h
rename to nel/include/nel/gui/view_text.h
diff --git a/code/nel/include/nel/gui/view_text_formated.h b/nel/include/nel/gui/view_text_formated.h
similarity index 100%
rename from code/nel/include/nel/gui/view_text_formated.h
rename to nel/include/nel/gui/view_text_formated.h
diff --git a/code/nel/include/nel/gui/view_text_id.h b/nel/include/nel/gui/view_text_id.h
similarity index 100%
rename from code/nel/include/nel/gui/view_text_id.h
rename to nel/include/nel/gui/view_text_id.h
diff --git a/code/nel/include/nel/gui/view_text_id_formated.h b/nel/include/nel/gui/view_text_id_formated.h
similarity index 100%
rename from code/nel/include/nel/gui/view_text_id_formated.h
rename to nel/include/nel/gui/view_text_id_formated.h
diff --git a/code/nel/include/nel/gui/widget_manager.h b/nel/include/nel/gui/widget_manager.h
similarity index 100%
rename from code/nel/include/nel/gui/widget_manager.h
rename to nel/include/nel/gui/widget_manager.h
diff --git a/code/nel/include/nel/ligo/CMakeLists.txt b/nel/include/nel/ligo/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/ligo/CMakeLists.txt
rename to nel/include/nel/ligo/CMakeLists.txt
diff --git a/code/nel/include/nel/ligo/ligo_config.h b/nel/include/nel/ligo/ligo_config.h
similarity index 100%
rename from code/nel/include/nel/ligo/ligo_config.h
rename to nel/include/nel/ligo/ligo_config.h
diff --git a/code/nel/include/nel/ligo/ligo_error.h b/nel/include/nel/ligo/ligo_error.h
similarity index 100%
rename from code/nel/include/nel/ligo/ligo_error.h
rename to nel/include/nel/ligo/ligo_error.h
diff --git a/code/nel/include/nel/ligo/ligo_material.h b/nel/include/nel/ligo/ligo_material.h
similarity index 100%
rename from code/nel/include/nel/ligo/ligo_material.h
rename to nel/include/nel/ligo/ligo_material.h
diff --git a/code/nel/include/nel/ligo/primitive.h b/nel/include/nel/ligo/primitive.h
similarity index 100%
rename from code/nel/include/nel/ligo/primitive.h
rename to nel/include/nel/ligo/primitive.h
diff --git a/code/nel/include/nel/ligo/primitive_class.h b/nel/include/nel/ligo/primitive_class.h
similarity index 100%
rename from code/nel/include/nel/ligo/primitive_class.h
rename to nel/include/nel/ligo/primitive_class.h
diff --git a/code/nel/include/nel/ligo/primitive_configuration.h b/nel/include/nel/ligo/primitive_configuration.h
similarity index 100%
rename from code/nel/include/nel/ligo/primitive_configuration.h
rename to nel/include/nel/ligo/primitive_configuration.h
diff --git a/code/nel/include/nel/ligo/primitive_utils.h b/nel/include/nel/ligo/primitive_utils.h
similarity index 100%
rename from code/nel/include/nel/ligo/primitive_utils.h
rename to nel/include/nel/ligo/primitive_utils.h
diff --git a/code/nel/include/nel/ligo/transition.h b/nel/include/nel/ligo/transition.h
similarity index 100%
rename from code/nel/include/nel/ligo/transition.h
rename to nel/include/nel/ligo/transition.h
diff --git a/code/nel/include/nel/ligo/zone_bank.h b/nel/include/nel/ligo/zone_bank.h
similarity index 100%
rename from code/nel/include/nel/ligo/zone_bank.h
rename to nel/include/nel/ligo/zone_bank.h
diff --git a/code/nel/include/nel/ligo/zone_edge.h b/nel/include/nel/ligo/zone_edge.h
similarity index 100%
rename from code/nel/include/nel/ligo/zone_edge.h
rename to nel/include/nel/ligo/zone_edge.h
diff --git a/code/nel/include/nel/ligo/zone_region.h b/nel/include/nel/ligo/zone_region.h
similarity index 100%
rename from code/nel/include/nel/ligo/zone_region.h
rename to nel/include/nel/ligo/zone_region.h
diff --git a/code/nel/include/nel/ligo/zone_template.h b/nel/include/nel/ligo/zone_template.h
similarity index 100%
rename from code/nel/include/nel/ligo/zone_template.h
rename to nel/include/nel/ligo/zone_template.h
diff --git a/code/nel/include/nel/logic/CMakeLists.txt b/nel/include/nel/logic/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/logic/CMakeLists.txt
rename to nel/include/nel/logic/CMakeLists.txt
diff --git a/code/nel/include/nel/logic/logic_condition.h b/nel/include/nel/logic/logic_condition.h
similarity index 100%
rename from code/nel/include/nel/logic/logic_condition.h
rename to nel/include/nel/logic/logic_condition.h
diff --git a/code/nel/include/nel/logic/logic_event.h b/nel/include/nel/logic/logic_event.h
similarity index 100%
rename from code/nel/include/nel/logic/logic_event.h
rename to nel/include/nel/logic/logic_event.h
diff --git a/code/nel/include/nel/logic/logic_state.h b/nel/include/nel/logic/logic_state.h
similarity index 100%
rename from code/nel/include/nel/logic/logic_state.h
rename to nel/include/nel/logic/logic_state.h
diff --git a/code/nel/include/nel/logic/logic_state_machine.h b/nel/include/nel/logic/logic_state_machine.h
similarity index 100%
rename from code/nel/include/nel/logic/logic_state_machine.h
rename to nel/include/nel/logic/logic_state_machine.h
diff --git a/code/nel/include/nel/logic/logic_variable.h b/nel/include/nel/logic/logic_variable.h
similarity index 100%
rename from code/nel/include/nel/logic/logic_variable.h
rename to nel/include/nel/logic/logic_variable.h
diff --git a/code/nel/include/nel/misc/CMakeLists.txt b/nel/include/nel/misc/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/misc/CMakeLists.txt
rename to nel/include/nel/misc/CMakeLists.txt
diff --git a/code/nel/include/nel/misc/aabbox.h b/nel/include/nel/misc/aabbox.h
similarity index 100%
rename from code/nel/include/nel/misc/aabbox.h
rename to nel/include/nel/misc/aabbox.h
diff --git a/code/nel/include/nel/misc/algo.h b/nel/include/nel/misc/algo.h
similarity index 100%
rename from code/nel/include/nel/misc/algo.h
rename to nel/include/nel/misc/algo.h
diff --git a/code/nel/include/nel/misc/app_context.h b/nel/include/nel/misc/app_context.h
similarity index 100%
rename from code/nel/include/nel/misc/app_context.h
rename to nel/include/nel/misc/app_context.h
diff --git a/code/nel/include/nel/misc/array_2d.h b/nel/include/nel/misc/array_2d.h
similarity index 100%
rename from code/nel/include/nel/misc/array_2d.h
rename to nel/include/nel/misc/array_2d.h
diff --git a/code/nel/include/nel/misc/async_file_manager.h b/nel/include/nel/misc/async_file_manager.h
similarity index 100%
rename from code/nel/include/nel/misc/async_file_manager.h
rename to nel/include/nel/misc/async_file_manager.h
diff --git a/code/nel/include/nel/misc/base64.h b/nel/include/nel/misc/base64.h
similarity index 100%
rename from code/nel/include/nel/misc/base64.h
rename to nel/include/nel/misc/base64.h
diff --git a/code/nel/include/nel/misc/big_file.h b/nel/include/nel/misc/big_file.h
similarity index 100%
rename from code/nel/include/nel/misc/big_file.h
rename to nel/include/nel/misc/big_file.h
diff --git a/code/nel/include/nel/misc/bit_mem_stream.h b/nel/include/nel/misc/bit_mem_stream.h
similarity index 100%
rename from code/nel/include/nel/misc/bit_mem_stream.h
rename to nel/include/nel/misc/bit_mem_stream.h
diff --git a/code/nel/include/nel/misc/bit_set.h b/nel/include/nel/misc/bit_set.h
similarity index 100%
rename from code/nel/include/nel/misc/bit_set.h
rename to nel/include/nel/misc/bit_set.h
diff --git a/code/nel/include/nel/misc/bitmap.h b/nel/include/nel/misc/bitmap.h
similarity index 100%
rename from code/nel/include/nel/misc/bitmap.h
rename to nel/include/nel/misc/bitmap.h
diff --git a/code/nel/include/nel/misc/block_memory.h b/nel/include/nel/misc/block_memory.h
similarity index 100%
rename from code/nel/include/nel/misc/block_memory.h
rename to nel/include/nel/misc/block_memory.h
diff --git a/code/nel/include/nel/misc/bsphere.h b/nel/include/nel/misc/bsphere.h
similarity index 100%
rename from code/nel/include/nel/misc/bsphere.h
rename to nel/include/nel/misc/bsphere.h
diff --git a/code/nel/include/nel/misc/buf_fifo.h b/nel/include/nel/misc/buf_fifo.h
similarity index 100%
rename from code/nel/include/nel/misc/buf_fifo.h
rename to nel/include/nel/misc/buf_fifo.h
diff --git a/code/nel/include/nel/misc/callback.h b/nel/include/nel/misc/callback.h
similarity index 100%
rename from code/nel/include/nel/misc/callback.h
rename to nel/include/nel/misc/callback.h
diff --git a/code/nel/include/nel/misc/cdb.h b/nel/include/nel/misc/cdb.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb.h
rename to nel/include/nel/misc/cdb.h
diff --git a/code/nel/include/nel/misc/cdb_bank_handler.h b/nel/include/nel/misc/cdb_bank_handler.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_bank_handler.h
rename to nel/include/nel/misc/cdb_bank_handler.h
diff --git a/code/nel/include/nel/misc/cdb_branch.h b/nel/include/nel/misc/cdb_branch.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_branch.h
rename to nel/include/nel/misc/cdb_branch.h
diff --git a/code/nel/include/nel/misc/cdb_branch_observing_handler.h b/nel/include/nel/misc/cdb_branch_observing_handler.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_branch_observing_handler.h
rename to nel/include/nel/misc/cdb_branch_observing_handler.h
diff --git a/code/nel/include/nel/misc/cdb_check_sum.h b/nel/include/nel/misc/cdb_check_sum.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_check_sum.h
rename to nel/include/nel/misc/cdb_check_sum.h
diff --git a/code/nel/include/nel/misc/cdb_leaf.h b/nel/include/nel/misc/cdb_leaf.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_leaf.h
rename to nel/include/nel/misc/cdb_leaf.h
diff --git a/code/nel/include/nel/misc/cdb_manager.h b/nel/include/nel/misc/cdb_manager.h
similarity index 100%
rename from code/nel/include/nel/misc/cdb_manager.h
rename to nel/include/nel/misc/cdb_manager.h
diff --git a/code/nel/include/nel/misc/check_fpu.h b/nel/include/nel/misc/check_fpu.h
similarity index 100%
rename from code/nel/include/nel/misc/check_fpu.h
rename to nel/include/nel/misc/check_fpu.h
diff --git a/code/nel/include/nel/misc/class_id.h b/nel/include/nel/misc/class_id.h
similarity index 100%
rename from code/nel/include/nel/misc/class_id.h
rename to nel/include/nel/misc/class_id.h
diff --git a/code/nel/include/nel/misc/class_registry.h b/nel/include/nel/misc/class_registry.h
similarity index 100%
rename from code/nel/include/nel/misc/class_registry.h
rename to nel/include/nel/misc/class_registry.h
diff --git a/code/nel/include/nel/misc/cmd_args.h b/nel/include/nel/misc/cmd_args.h
similarity index 100%
rename from code/nel/include/nel/misc/cmd_args.h
rename to nel/include/nel/misc/cmd_args.h
diff --git a/code/nel/include/nel/misc/co_task.h b/nel/include/nel/misc/co_task.h
similarity index 100%
rename from code/nel/include/nel/misc/co_task.h
rename to nel/include/nel/misc/co_task.h
diff --git a/code/nel/include/nel/misc/command.h b/nel/include/nel/misc/command.h
similarity index 100%
rename from code/nel/include/nel/misc/command.h
rename to nel/include/nel/misc/command.h
diff --git a/code/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h
similarity index 100%
rename from code/nel/include/nel/misc/common.h
rename to nel/include/nel/misc/common.h
diff --git a/code/nel/include/nel/misc/config_file.h b/nel/include/nel/misc/config_file.h
similarity index 100%
rename from code/nel/include/nel/misc/config_file.h
rename to nel/include/nel/misc/config_file.h
diff --git a/code/nel/include/nel/misc/contiguous_block_allocator.h b/nel/include/nel/misc/contiguous_block_allocator.h
similarity index 100%
rename from code/nel/include/nel/misc/contiguous_block_allocator.h
rename to nel/include/nel/misc/contiguous_block_allocator.h
diff --git a/code/nel/include/nel/misc/cpu_time_stat.h b/nel/include/nel/misc/cpu_time_stat.h
similarity index 100%
rename from code/nel/include/nel/misc/cpu_time_stat.h
rename to nel/include/nel/misc/cpu_time_stat.h
diff --git a/code/nel/include/nel/misc/debug.h b/nel/include/nel/misc/debug.h
similarity index 100%
rename from code/nel/include/nel/misc/debug.h
rename to nel/include/nel/misc/debug.h
diff --git a/code/nel/include/nel/misc/diff_tool.h b/nel/include/nel/misc/diff_tool.h
similarity index 100%
rename from code/nel/include/nel/misc/diff_tool.h
rename to nel/include/nel/misc/diff_tool.h
diff --git a/code/nel/include/nel/misc/displayer.h b/nel/include/nel/misc/displayer.h
similarity index 100%
rename from code/nel/include/nel/misc/displayer.h
rename to nel/include/nel/misc/displayer.h
diff --git a/code/nel/include/nel/misc/dummy_window.h b/nel/include/nel/misc/dummy_window.h
similarity index 100%
rename from code/nel/include/nel/misc/dummy_window.h
rename to nel/include/nel/misc/dummy_window.h
diff --git a/code/nel/include/nel/misc/dynloadlib.h b/nel/include/nel/misc/dynloadlib.h
similarity index 100%
rename from code/nel/include/nel/misc/dynloadlib.h
rename to nel/include/nel/misc/dynloadlib.h
diff --git a/code/nel/include/nel/misc/eid_translator.h b/nel/include/nel/misc/eid_translator.h
similarity index 100%
rename from code/nel/include/nel/misc/eid_translator.h
rename to nel/include/nel/misc/eid_translator.h
diff --git a/code/nel/include/nel/misc/entity_id.h b/nel/include/nel/misc/entity_id.h
similarity index 100%
rename from code/nel/include/nel/misc/entity_id.h
rename to nel/include/nel/misc/entity_id.h
diff --git a/code/nel/include/nel/misc/enum_bitset.h b/nel/include/nel/misc/enum_bitset.h
similarity index 100%
rename from code/nel/include/nel/misc/enum_bitset.h
rename to nel/include/nel/misc/enum_bitset.h
diff --git a/code/nel/include/nel/misc/eval_num_expr.h b/nel/include/nel/misc/eval_num_expr.h
similarity index 100%
rename from code/nel/include/nel/misc/eval_num_expr.h
rename to nel/include/nel/misc/eval_num_expr.h
diff --git a/code/nel/include/nel/misc/event_emitter.h b/nel/include/nel/misc/event_emitter.h
similarity index 100%
rename from code/nel/include/nel/misc/event_emitter.h
rename to nel/include/nel/misc/event_emitter.h
diff --git a/code/nel/include/nel/misc/event_emitter_multi.h b/nel/include/nel/misc/event_emitter_multi.h
similarity index 100%
rename from code/nel/include/nel/misc/event_emitter_multi.h
rename to nel/include/nel/misc/event_emitter_multi.h
diff --git a/code/nel/include/nel/misc/event_listener.h b/nel/include/nel/misc/event_listener.h
similarity index 100%
rename from code/nel/include/nel/misc/event_listener.h
rename to nel/include/nel/misc/event_listener.h
diff --git a/code/nel/include/nel/misc/event_server.h b/nel/include/nel/misc/event_server.h
similarity index 100%
rename from code/nel/include/nel/misc/event_server.h
rename to nel/include/nel/misc/event_server.h
diff --git a/code/nel/include/nel/misc/events.h b/nel/include/nel/misc/events.h
similarity index 100%
rename from code/nel/include/nel/misc/events.h
rename to nel/include/nel/misc/events.h
diff --git a/code/nel/include/nel/misc/factory.h b/nel/include/nel/misc/factory.h
similarity index 100%
rename from code/nel/include/nel/misc/factory.h
rename to nel/include/nel/misc/factory.h
diff --git a/code/nel/include/nel/misc/fast_floor.h b/nel/include/nel/misc/fast_floor.h
similarity index 100%
rename from code/nel/include/nel/misc/fast_floor.h
rename to nel/include/nel/misc/fast_floor.h
diff --git a/code/nel/include/nel/misc/fast_id_map.h b/nel/include/nel/misc/fast_id_map.h
similarity index 100%
rename from code/nel/include/nel/misc/fast_id_map.h
rename to nel/include/nel/misc/fast_id_map.h
diff --git a/code/nel/include/nel/misc/fast_mem.h b/nel/include/nel/misc/fast_mem.h
similarity index 100%
rename from code/nel/include/nel/misc/fast_mem.h
rename to nel/include/nel/misc/fast_mem.h
diff --git a/code/nel/include/nel/misc/file.h b/nel/include/nel/misc/file.h
similarity index 100%
rename from code/nel/include/nel/misc/file.h
rename to nel/include/nel/misc/file.h
diff --git a/code/nel/include/nel/misc/fixed_size_allocator.h b/nel/include/nel/misc/fixed_size_allocator.h
similarity index 100%
rename from code/nel/include/nel/misc/fixed_size_allocator.h
rename to nel/include/nel/misc/fixed_size_allocator.h
diff --git a/code/nel/include/nel/misc/geom_ext.h b/nel/include/nel/misc/geom_ext.h
similarity index 100%
rename from code/nel/include/nel/misc/geom_ext.h
rename to nel/include/nel/misc/geom_ext.h
diff --git a/code/nel/include/nel/misc/grid_traversal.h b/nel/include/nel/misc/grid_traversal.h
similarity index 100%
rename from code/nel/include/nel/misc/grid_traversal.h
rename to nel/include/nel/misc/grid_traversal.h
diff --git a/code/nel/include/nel/misc/gtk_displayer.h b/nel/include/nel/misc/gtk_displayer.h
similarity index 100%
rename from code/nel/include/nel/misc/gtk_displayer.h
rename to nel/include/nel/misc/gtk_displayer.h
diff --git a/code/nel/include/nel/misc/heap_memory.h b/nel/include/nel/misc/heap_memory.h
similarity index 100%
rename from code/nel/include/nel/misc/heap_memory.h
rename to nel/include/nel/misc/heap_memory.h
diff --git a/code/nel/include/nel/misc/hierarchical_timer.h b/nel/include/nel/misc/hierarchical_timer.h
similarity index 100%
rename from code/nel/include/nel/misc/hierarchical_timer.h
rename to nel/include/nel/misc/hierarchical_timer.h
diff --git a/code/nel/include/nel/misc/historic.h b/nel/include/nel/misc/historic.h
similarity index 100%
rename from code/nel/include/nel/misc/historic.h
rename to nel/include/nel/misc/historic.h
diff --git a/code/nel/include/nel/misc/i18n.h b/nel/include/nel/misc/i18n.h
similarity index 100%
rename from code/nel/include/nel/misc/i18n.h
rename to nel/include/nel/misc/i18n.h
diff --git a/code/nel/include/nel/misc/i_streamed_package_provider.h b/nel/include/nel/misc/i_streamed_package_provider.h
similarity index 100%
rename from code/nel/include/nel/misc/i_streamed_package_provider.h
rename to nel/include/nel/misc/i_streamed_package_provider.h
diff --git a/code/nel/include/nel/misc/i_xml.h b/nel/include/nel/misc/i_xml.h
similarity index 100%
rename from code/nel/include/nel/misc/i_xml.h
rename to nel/include/nel/misc/i_xml.h
diff --git a/code/nel/include/nel/misc/inter_window_msg_queue.h b/nel/include/nel/misc/inter_window_msg_queue.h
similarity index 100%
rename from code/nel/include/nel/misc/inter_window_msg_queue.h
rename to nel/include/nel/misc/inter_window_msg_queue.h
diff --git a/code/nel/include/nel/misc/line.h b/nel/include/nel/misc/line.h
similarity index 100%
rename from code/nel/include/nel/misc/line.h
rename to nel/include/nel/misc/line.h
diff --git a/code/nel/include/nel/misc/log.h b/nel/include/nel/misc/log.h
similarity index 100%
rename from code/nel/include/nel/misc/log.h
rename to nel/include/nel/misc/log.h
diff --git a/code/nel/include/nel/misc/matrix.h b/nel/include/nel/misc/matrix.h
similarity index 100%
rename from code/nel/include/nel/misc/matrix.h
rename to nel/include/nel/misc/matrix.h
diff --git a/code/nel/include/nel/misc/md5.h b/nel/include/nel/misc/md5.h
similarity index 100%
rename from code/nel/include/nel/misc/md5.h
rename to nel/include/nel/misc/md5.h
diff --git a/code/nel/include/nel/misc/mem_displayer.h b/nel/include/nel/misc/mem_displayer.h
similarity index 100%
rename from code/nel/include/nel/misc/mem_displayer.h
rename to nel/include/nel/misc/mem_displayer.h
diff --git a/code/nel/include/nel/misc/mem_stream.h b/nel/include/nel/misc/mem_stream.h
similarity index 100%
rename from code/nel/include/nel/misc/mem_stream.h
rename to nel/include/nel/misc/mem_stream.h
diff --git a/code/nel/include/nel/misc/mouse_smoother.h b/nel/include/nel/misc/mouse_smoother.h
similarity index 100%
rename from code/nel/include/nel/misc/mouse_smoother.h
rename to nel/include/nel/misc/mouse_smoother.h
diff --git a/code/nel/include/nel/misc/mutable_container.h b/nel/include/nel/misc/mutable_container.h
similarity index 100%
rename from code/nel/include/nel/misc/mutable_container.h
rename to nel/include/nel/misc/mutable_container.h
diff --git a/code/nel/include/nel/misc/mutex.h b/nel/include/nel/misc/mutex.h
similarity index 100%
rename from code/nel/include/nel/misc/mutex.h
rename to nel/include/nel/misc/mutex.h
diff --git a/code/nel/include/nel/misc/noise_value.h b/nel/include/nel/misc/noise_value.h
similarity index 100%
rename from code/nel/include/nel/misc/noise_value.h
rename to nel/include/nel/misc/noise_value.h
diff --git a/code/nel/include/nel/misc/o_xml.h b/nel/include/nel/misc/o_xml.h
similarity index 100%
rename from code/nel/include/nel/misc/o_xml.h
rename to nel/include/nel/misc/o_xml.h
diff --git a/code/nel/include/nel/misc/object_arena_allocator.h b/nel/include/nel/misc/object_arena_allocator.h
similarity index 100%
rename from code/nel/include/nel/misc/object_arena_allocator.h
rename to nel/include/nel/misc/object_arena_allocator.h
diff --git a/code/nel/include/nel/misc/object_vector.h b/nel/include/nel/misc/object_vector.h
similarity index 100%
rename from code/nel/include/nel/misc/object_vector.h
rename to nel/include/nel/misc/object_vector.h
diff --git a/code/nel/include/nel/misc/p_thread.h b/nel/include/nel/misc/p_thread.h
similarity index 100%
rename from code/nel/include/nel/misc/p_thread.h
rename to nel/include/nel/misc/p_thread.h
diff --git a/code/nel/include/nel/misc/path.h b/nel/include/nel/misc/path.h
similarity index 100%
rename from code/nel/include/nel/misc/path.h
rename to nel/include/nel/misc/path.h
diff --git a/code/nel/include/nel/misc/plane.h b/nel/include/nel/misc/plane.h
similarity index 100%
rename from code/nel/include/nel/misc/plane.h
rename to nel/include/nel/misc/plane.h
diff --git a/code/nel/include/nel/misc/plane_inline.h b/nel/include/nel/misc/plane_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/plane_inline.h
rename to nel/include/nel/misc/plane_inline.h
diff --git a/code/nel/include/nel/misc/polygon.h b/nel/include/nel/misc/polygon.h
similarity index 100%
rename from code/nel/include/nel/misc/polygon.h
rename to nel/include/nel/misc/polygon.h
diff --git a/code/nel/include/nel/misc/pool_memory.h b/nel/include/nel/misc/pool_memory.h
similarity index 100%
rename from code/nel/include/nel/misc/pool_memory.h
rename to nel/include/nel/misc/pool_memory.h
diff --git a/code/nel/include/nel/misc/progress_callback.h b/nel/include/nel/misc/progress_callback.h
similarity index 100%
rename from code/nel/include/nel/misc/progress_callback.h
rename to nel/include/nel/misc/progress_callback.h
diff --git a/code/nel/include/nel/misc/quad.h b/nel/include/nel/misc/quad.h
similarity index 100%
rename from code/nel/include/nel/misc/quad.h
rename to nel/include/nel/misc/quad.h
diff --git a/code/nel/include/nel/misc/quat.h b/nel/include/nel/misc/quat.h
similarity index 100%
rename from code/nel/include/nel/misc/quat.h
rename to nel/include/nel/misc/quat.h
diff --git a/code/nel/include/nel/misc/random.h b/nel/include/nel/misc/random.h
similarity index 100%
rename from code/nel/include/nel/misc/random.h
rename to nel/include/nel/misc/random.h
diff --git a/code/nel/include/nel/misc/reader_writer.h b/nel/include/nel/misc/reader_writer.h
similarity index 100%
rename from code/nel/include/nel/misc/reader_writer.h
rename to nel/include/nel/misc/reader_writer.h
diff --git a/code/nel/include/nel/misc/rect.h b/nel/include/nel/misc/rect.h
similarity index 100%
rename from code/nel/include/nel/misc/rect.h
rename to nel/include/nel/misc/rect.h
diff --git a/code/nel/include/nel/misc/report.h b/nel/include/nel/misc/report.h
similarity index 100%
rename from code/nel/include/nel/misc/report.h
rename to nel/include/nel/misc/report.h
diff --git a/code/nel/include/nel/misc/resource_ptr.h b/nel/include/nel/misc/resource_ptr.h
similarity index 100%
rename from code/nel/include/nel/misc/resource_ptr.h
rename to nel/include/nel/misc/resource_ptr.h
diff --git a/code/nel/include/nel/misc/resource_ptr_inline.h b/nel/include/nel/misc/resource_ptr_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/resource_ptr_inline.h
rename to nel/include/nel/misc/resource_ptr_inline.h
diff --git a/code/nel/include/nel/misc/rgba.h b/nel/include/nel/misc/rgba.h
similarity index 100%
rename from code/nel/include/nel/misc/rgba.h
rename to nel/include/nel/misc/rgba.h
diff --git a/code/nel/include/nel/misc/seven_zip.h b/nel/include/nel/misc/seven_zip.h
similarity index 100%
rename from code/nel/include/nel/misc/seven_zip.h
rename to nel/include/nel/misc/seven_zip.h
diff --git a/code/nel/include/nel/misc/sha1.h b/nel/include/nel/misc/sha1.h
similarity index 100%
rename from code/nel/include/nel/misc/sha1.h
rename to nel/include/nel/misc/sha1.h
diff --git a/code/nel/include/nel/misc/shared_memory.h b/nel/include/nel/misc/shared_memory.h
similarity index 100%
rename from code/nel/include/nel/misc/shared_memory.h
rename to nel/include/nel/misc/shared_memory.h
diff --git a/code/nel/include/nel/misc/sheet_id.h b/nel/include/nel/misc/sheet_id.h
similarity index 100%
rename from code/nel/include/nel/misc/sheet_id.h
rename to nel/include/nel/misc/sheet_id.h
diff --git a/code/nel/include/nel/misc/singleton.h b/nel/include/nel/misc/singleton.h
similarity index 100%
rename from code/nel/include/nel/misc/singleton.h
rename to nel/include/nel/misc/singleton.h
diff --git a/code/nel/include/nel/misc/smart_ptr.h b/nel/include/nel/misc/smart_ptr.h
similarity index 100%
rename from code/nel/include/nel/misc/smart_ptr.h
rename to nel/include/nel/misc/smart_ptr.h
diff --git a/code/nel/include/nel/misc/smart_ptr_inline.h b/nel/include/nel/misc/smart_ptr_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/smart_ptr_inline.h
rename to nel/include/nel/misc/smart_ptr_inline.h
diff --git a/code/nel/include/nel/misc/speaker_listener.h b/nel/include/nel/misc/speaker_listener.h
similarity index 100%
rename from code/nel/include/nel/misc/speaker_listener.h
rename to nel/include/nel/misc/speaker_listener.h
diff --git a/code/nel/include/nel/misc/sstring.h b/nel/include/nel/misc/sstring.h
similarity index 100%
rename from code/nel/include/nel/misc/sstring.h
rename to nel/include/nel/misc/sstring.h
diff --git a/code/nel/include/nel/misc/static_map.h b/nel/include/nel/misc/static_map.h
similarity index 100%
rename from code/nel/include/nel/misc/static_map.h
rename to nel/include/nel/misc/static_map.h
diff --git a/code/nel/include/nel/misc/stl_block_allocator.h b/nel/include/nel/misc/stl_block_allocator.h
similarity index 100%
rename from code/nel/include/nel/misc/stl_block_allocator.h
rename to nel/include/nel/misc/stl_block_allocator.h
diff --git a/code/nel/include/nel/misc/stl_block_list.h b/nel/include/nel/misc/stl_block_list.h
similarity index 100%
rename from code/nel/include/nel/misc/stl_block_list.h
rename to nel/include/nel/misc/stl_block_list.h
diff --git a/code/nel/include/nel/misc/stop_watch.h b/nel/include/nel/misc/stop_watch.h
similarity index 100%
rename from code/nel/include/nel/misc/stop_watch.h
rename to nel/include/nel/misc/stop_watch.h
diff --git a/code/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h
similarity index 100%
rename from code/nel/include/nel/misc/stream.h
rename to nel/include/nel/misc/stream.h
diff --git a/code/nel/include/nel/misc/stream_inline.h b/nel/include/nel/misc/stream_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/stream_inline.h
rename to nel/include/nel/misc/stream_inline.h
diff --git a/code/nel/include/nel/misc/streamed_package.h b/nel/include/nel/misc/streamed_package.h
similarity index 100%
rename from code/nel/include/nel/misc/streamed_package.h
rename to nel/include/nel/misc/streamed_package.h
diff --git a/code/nel/include/nel/misc/streamed_package_manager.h b/nel/include/nel/misc/streamed_package_manager.h
similarity index 100%
rename from code/nel/include/nel/misc/streamed_package_manager.h
rename to nel/include/nel/misc/streamed_package_manager.h
diff --git a/code/nel/include/nel/misc/string_common.h b/nel/include/nel/misc/string_common.h
similarity index 100%
rename from code/nel/include/nel/misc/string_common.h
rename to nel/include/nel/misc/string_common.h
diff --git a/code/nel/include/nel/misc/string_conversion.h b/nel/include/nel/misc/string_conversion.h
similarity index 100%
rename from code/nel/include/nel/misc/string_conversion.h
rename to nel/include/nel/misc/string_conversion.h
diff --git a/code/nel/include/nel/misc/string_id_array.h b/nel/include/nel/misc/string_id_array.h
similarity index 100%
rename from code/nel/include/nel/misc/string_id_array.h
rename to nel/include/nel/misc/string_id_array.h
diff --git a/code/nel/include/nel/misc/string_mapper.h b/nel/include/nel/misc/string_mapper.h
similarity index 100%
rename from code/nel/include/nel/misc/string_mapper.h
rename to nel/include/nel/misc/string_mapper.h
diff --git a/code/nel/include/nel/misc/string_stream.h b/nel/include/nel/misc/string_stream.h
similarity index 100%
rename from code/nel/include/nel/misc/string_stream.h
rename to nel/include/nel/misc/string_stream.h
diff --git a/code/nel/include/nel/misc/system_info.h b/nel/include/nel/misc/system_info.h
similarity index 100%
rename from code/nel/include/nel/misc/system_info.h
rename to nel/include/nel/misc/system_info.h
diff --git a/code/nel/include/nel/misc/system_utils.h b/nel/include/nel/misc/system_utils.h
similarity index 100%
rename from code/nel/include/nel/misc/system_utils.h
rename to nel/include/nel/misc/system_utils.h
diff --git a/code/nel/include/nel/misc/task_manager.h b/nel/include/nel/misc/task_manager.h
similarity index 100%
rename from code/nel/include/nel/misc/task_manager.h
rename to nel/include/nel/misc/task_manager.h
diff --git a/code/nel/include/nel/misc/tds.h b/nel/include/nel/misc/tds.h
similarity index 100%
rename from code/nel/include/nel/misc/tds.h
rename to nel/include/nel/misc/tds.h
diff --git a/code/nel/include/nel/misc/thread.h b/nel/include/nel/misc/thread.h
similarity index 100%
rename from code/nel/include/nel/misc/thread.h
rename to nel/include/nel/misc/thread.h
diff --git a/code/nel/include/nel/misc/time_nl.h b/nel/include/nel/misc/time_nl.h
similarity index 100%
rename from code/nel/include/nel/misc/time_nl.h
rename to nel/include/nel/misc/time_nl.h
diff --git a/code/nel/include/nel/misc/timeout_assertion_thread.h b/nel/include/nel/misc/timeout_assertion_thread.h
similarity index 100%
rename from code/nel/include/nel/misc/timeout_assertion_thread.h
rename to nel/include/nel/misc/timeout_assertion_thread.h
diff --git a/code/nel/include/nel/misc/traits_nl.h b/nel/include/nel/misc/traits_nl.h
similarity index 100%
rename from code/nel/include/nel/misc/traits_nl.h
rename to nel/include/nel/misc/traits_nl.h
diff --git a/code/nel/include/nel/misc/triangle.h b/nel/include/nel/misc/triangle.h
similarity index 100%
rename from code/nel/include/nel/misc/triangle.h
rename to nel/include/nel/misc/triangle.h
diff --git a/code/nel/include/nel/misc/twin_map.h b/nel/include/nel/misc/twin_map.h
similarity index 100%
rename from code/nel/include/nel/misc/twin_map.h
rename to nel/include/nel/misc/twin_map.h
diff --git a/code/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h
similarity index 100%
rename from code/nel/include/nel/misc/types_nl.h
rename to nel/include/nel/misc/types_nl.h
diff --git a/code/nel/include/nel/misc/ucstring.h b/nel/include/nel/misc/ucstring.h
similarity index 100%
rename from code/nel/include/nel/misc/ucstring.h
rename to nel/include/nel/misc/ucstring.h
diff --git a/code/nel/include/nel/misc/uv.h b/nel/include/nel/misc/uv.h
similarity index 100%
rename from code/nel/include/nel/misc/uv.h
rename to nel/include/nel/misc/uv.h
diff --git a/code/nel/include/nel/misc/value_smoother.h b/nel/include/nel/misc/value_smoother.h
similarity index 100%
rename from code/nel/include/nel/misc/value_smoother.h
rename to nel/include/nel/misc/value_smoother.h
diff --git a/code/nel/include/nel/misc/variable.h b/nel/include/nel/misc/variable.h
similarity index 100%
rename from code/nel/include/nel/misc/variable.h
rename to nel/include/nel/misc/variable.h
diff --git a/code/nel/include/nel/misc/vector.h b/nel/include/nel/misc/vector.h
similarity index 100%
rename from code/nel/include/nel/misc/vector.h
rename to nel/include/nel/misc/vector.h
diff --git a/code/nel/include/nel/misc/vector_2d.h b/nel/include/nel/misc/vector_2d.h
similarity index 100%
rename from code/nel/include/nel/misc/vector_2d.h
rename to nel/include/nel/misc/vector_2d.h
diff --git a/code/nel/include/nel/misc/vector_2f.h b/nel/include/nel/misc/vector_2f.h
similarity index 100%
rename from code/nel/include/nel/misc/vector_2f.h
rename to nel/include/nel/misc/vector_2f.h
diff --git a/code/nel/include/nel/misc/vector_h.h b/nel/include/nel/misc/vector_h.h
similarity index 100%
rename from code/nel/include/nel/misc/vector_h.h
rename to nel/include/nel/misc/vector_h.h
diff --git a/code/nel/include/nel/misc/vector_inline.h b/nel/include/nel/misc/vector_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/vector_inline.h
rename to nel/include/nel/misc/vector_inline.h
diff --git a/code/nel/include/nel/misc/vectord.h b/nel/include/nel/misc/vectord.h
similarity index 100%
rename from code/nel/include/nel/misc/vectord.h
rename to nel/include/nel/misc/vectord.h
diff --git a/code/nel/include/nel/misc/vectord_inline.h b/nel/include/nel/misc/vectord_inline.h
similarity index 100%
rename from code/nel/include/nel/misc/vectord_inline.h
rename to nel/include/nel/misc/vectord_inline.h
diff --git a/code/nel/include/nel/misc/version_nl.cmake b/nel/include/nel/misc/version_nl.cmake
similarity index 100%
rename from code/nel/include/nel/misc/version_nl.cmake
rename to nel/include/nel/misc/version_nl.cmake
diff --git a/code/nel/include/nel/misc/wang_hash.h b/nel/include/nel/misc/wang_hash.h
similarity index 100%
rename from code/nel/include/nel/misc/wang_hash.h
rename to nel/include/nel/misc/wang_hash.h
diff --git a/code/nel/include/nel/misc/win32_util.h b/nel/include/nel/misc/win32_util.h
similarity index 100%
rename from code/nel/include/nel/misc/win32_util.h
rename to nel/include/nel/misc/win32_util.h
diff --git a/code/nel/include/nel/misc/win_displayer.h b/nel/include/nel/misc/win_displayer.h
similarity index 100%
rename from code/nel/include/nel/misc/win_displayer.h
rename to nel/include/nel/misc/win_displayer.h
diff --git a/code/nel/include/nel/misc/win_event_emitter.h b/nel/include/nel/misc/win_event_emitter.h
similarity index 100%
rename from code/nel/include/nel/misc/win_event_emitter.h
rename to nel/include/nel/misc/win_event_emitter.h
diff --git a/code/nel/include/nel/misc/win_thread.h b/nel/include/nel/misc/win_thread.h
similarity index 100%
rename from code/nel/include/nel/misc/win_thread.h
rename to nel/include/nel/misc/win_thread.h
diff --git a/code/nel/include/nel/misc/window_displayer.h b/nel/include/nel/misc/window_displayer.h
similarity index 100%
rename from code/nel/include/nel/misc/window_displayer.h
rename to nel/include/nel/misc/window_displayer.h
diff --git a/code/nel/include/nel/misc/words_dictionary.h b/nel/include/nel/misc/words_dictionary.h
similarity index 100%
rename from code/nel/include/nel/misc/words_dictionary.h
rename to nel/include/nel/misc/words_dictionary.h
diff --git a/code/nel/include/nel/misc/xml_auto_ptr.h b/nel/include/nel/misc/xml_auto_ptr.h
similarity index 100%
rename from code/nel/include/nel/misc/xml_auto_ptr.h
rename to nel/include/nel/misc/xml_auto_ptr.h
diff --git a/code/nel/include/nel/misc/xml_macros.h b/nel/include/nel/misc/xml_macros.h
similarity index 100%
rename from code/nel/include/nel/misc/xml_macros.h
rename to nel/include/nel/misc/xml_macros.h
diff --git a/code/nel/include/nel/misc/xml_pack.h b/nel/include/nel/misc/xml_pack.h
similarity index 100%
rename from code/nel/include/nel/misc/xml_pack.h
rename to nel/include/nel/misc/xml_pack.h
diff --git a/code/nel/include/nel/net/CMakeLists.txt b/nel/include/nel/net/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/net/CMakeLists.txt
rename to nel/include/nel/net/CMakeLists.txt
diff --git a/code/nel/include/nel/net/admin.h b/nel/include/nel/net/admin.h
similarity index 100%
rename from code/nel/include/nel/net/admin.h
rename to nel/include/nel/net/admin.h
diff --git a/code/nel/include/nel/net/buf_client.h b/nel/include/nel/net/buf_client.h
similarity index 100%
rename from code/nel/include/nel/net/buf_client.h
rename to nel/include/nel/net/buf_client.h
diff --git a/code/nel/include/nel/net/buf_net_base.h b/nel/include/nel/net/buf_net_base.h
similarity index 100%
rename from code/nel/include/nel/net/buf_net_base.h
rename to nel/include/nel/net/buf_net_base.h
diff --git a/code/nel/include/nel/net/buf_server.h b/nel/include/nel/net/buf_server.h
similarity index 100%
rename from code/nel/include/nel/net/buf_server.h
rename to nel/include/nel/net/buf_server.h
diff --git a/code/nel/include/nel/net/buf_sock.h b/nel/include/nel/net/buf_sock.h
similarity index 100%
rename from code/nel/include/nel/net/buf_sock.h
rename to nel/include/nel/net/buf_sock.h
diff --git a/code/nel/include/nel/net/callback_client.h b/nel/include/nel/net/callback_client.h
similarity index 100%
rename from code/nel/include/nel/net/callback_client.h
rename to nel/include/nel/net/callback_client.h
diff --git a/code/nel/include/nel/net/callback_net_base.h b/nel/include/nel/net/callback_net_base.h
similarity index 100%
rename from code/nel/include/nel/net/callback_net_base.h
rename to nel/include/nel/net/callback_net_base.h
diff --git a/code/nel/include/nel/net/callback_server.h b/nel/include/nel/net/callback_server.h
similarity index 100%
rename from code/nel/include/nel/net/callback_server.h
rename to nel/include/nel/net/callback_server.h
diff --git a/code/nel/include/nel/net/cvar_log_filter.h b/nel/include/nel/net/cvar_log_filter.h
similarity index 100%
rename from code/nel/include/nel/net/cvar_log_filter.h
rename to nel/include/nel/net/cvar_log_filter.h
diff --git a/code/nel/include/nel/net/dummy_tcp_sock.h b/nel/include/nel/net/dummy_tcp_sock.h
similarity index 100%
rename from code/nel/include/nel/net/dummy_tcp_sock.h
rename to nel/include/nel/net/dummy_tcp_sock.h
diff --git a/code/nel/include/nel/net/email.h b/nel/include/nel/net/email.h
similarity index 100%
rename from code/nel/include/nel/net/email.h
rename to nel/include/nel/net/email.h
diff --git a/code/nel/include/nel/net/inet_address.h b/nel/include/nel/net/inet_address.h
similarity index 100%
rename from code/nel/include/nel/net/inet_address.h
rename to nel/include/nel/net/inet_address.h
diff --git a/code/nel/include/nel/net/listen_sock.h b/nel/include/nel/net/listen_sock.h
similarity index 100%
rename from code/nel/include/nel/net/listen_sock.h
rename to nel/include/nel/net/listen_sock.h
diff --git a/code/nel/include/nel/net/login_client.h b/nel/include/nel/net/login_client.h
similarity index 100%
rename from code/nel/include/nel/net/login_client.h
rename to nel/include/nel/net/login_client.h
diff --git a/code/nel/include/nel/net/login_cookie.h b/nel/include/nel/net/login_cookie.h
similarity index 100%
rename from code/nel/include/nel/net/login_cookie.h
rename to nel/include/nel/net/login_cookie.h
diff --git a/code/nel/include/nel/net/login_server.h b/nel/include/nel/net/login_server.h
similarity index 100%
rename from code/nel/include/nel/net/login_server.h
rename to nel/include/nel/net/login_server.h
diff --git a/code/nel/include/nel/net/message.h b/nel/include/nel/net/message.h
similarity index 100%
rename from code/nel/include/nel/net/message.h
rename to nel/include/nel/net/message.h
diff --git a/code/nel/include/nel/net/message_recorder.h b/nel/include/nel/net/message_recorder.h
similarity index 100%
rename from code/nel/include/nel/net/message_recorder.h
rename to nel/include/nel/net/message_recorder.h
diff --git a/code/nel/include/nel/net/module.h b/nel/include/nel/net/module.h
similarity index 100%
rename from code/nel/include/nel/net/module.h
rename to nel/include/nel/net/module.h
diff --git a/code/nel/include/nel/net/module_builder_parts.h b/nel/include/nel/net/module_builder_parts.h
similarity index 100%
rename from code/nel/include/nel/net/module_builder_parts.h
rename to nel/include/nel/net/module_builder_parts.h
diff --git a/code/nel/include/nel/net/module_common.h b/nel/include/nel/net/module_common.h
similarity index 100%
rename from code/nel/include/nel/net/module_common.h
rename to nel/include/nel/net/module_common.h
diff --git a/code/nel/include/nel/net/module_gateway.h b/nel/include/nel/net/module_gateway.h
similarity index 100%
rename from code/nel/include/nel/net/module_gateway.h
rename to nel/include/nel/net/module_gateway.h
diff --git a/code/nel/include/nel/net/module_manager.h b/nel/include/nel/net/module_manager.h
similarity index 100%
rename from code/nel/include/nel/net/module_manager.h
rename to nel/include/nel/net/module_manager.h
diff --git a/code/nel/include/nel/net/module_message.h b/nel/include/nel/net/module_message.h
similarity index 100%
rename from code/nel/include/nel/net/module_message.h
rename to nel/include/nel/net/module_message.h
diff --git a/code/nel/include/nel/net/module_socket.h b/nel/include/nel/net/module_socket.h
similarity index 100%
rename from code/nel/include/nel/net/module_socket.h
rename to nel/include/nel/net/module_socket.h
diff --git a/code/nel/include/nel/net/naming_client.h b/nel/include/nel/net/naming_client.h
similarity index 100%
rename from code/nel/include/nel/net/naming_client.h
rename to nel/include/nel/net/naming_client.h
diff --git a/code/nel/include/nel/net/net_displayer.h b/nel/include/nel/net/net_displayer.h
similarity index 100%
rename from code/nel/include/nel/net/net_displayer.h
rename to nel/include/nel/net/net_displayer.h
diff --git a/code/nel/include/nel/net/net_log.h b/nel/include/nel/net/net_log.h
similarity index 100%
rename from code/nel/include/nel/net/net_log.h
rename to nel/include/nel/net/net_log.h
diff --git a/code/nel/include/nel/net/net_manager.h b/nel/include/nel/net/net_manager.h
similarity index 100%
rename from code/nel/include/nel/net/net_manager.h
rename to nel/include/nel/net/net_manager.h
diff --git a/code/nel/include/nel/net/pacs_client.h b/nel/include/nel/net/pacs_client.h
similarity index 100%
rename from code/nel/include/nel/net/pacs_client.h
rename to nel/include/nel/net/pacs_client.h
diff --git a/code/nel/include/nel/net/service.h b/nel/include/nel/net/service.h
similarity index 100%
rename from code/nel/include/nel/net/service.h
rename to nel/include/nel/net/service.h
diff --git a/code/nel/include/nel/net/sock.h b/nel/include/nel/net/sock.h
similarity index 100%
rename from code/nel/include/nel/net/sock.h
rename to nel/include/nel/net/sock.h
diff --git a/code/nel/include/nel/net/tcp_sock.h b/nel/include/nel/net/tcp_sock.h
similarity index 100%
rename from code/nel/include/nel/net/tcp_sock.h
rename to nel/include/nel/net/tcp_sock.h
diff --git a/code/nel/include/nel/net/transport_class.h b/nel/include/nel/net/transport_class.h
similarity index 100%
rename from code/nel/include/nel/net/transport_class.h
rename to nel/include/nel/net/transport_class.h
diff --git a/code/nel/include/nel/net/udp_sim_sock.h b/nel/include/nel/net/udp_sim_sock.h
similarity index 100%
rename from code/nel/include/nel/net/udp_sim_sock.h
rename to nel/include/nel/net/udp_sim_sock.h
diff --git a/code/nel/include/nel/net/udp_sock.h b/nel/include/nel/net/udp_sock.h
similarity index 100%
rename from code/nel/include/nel/net/udp_sock.h
rename to nel/include/nel/net/udp_sock.h
diff --git a/code/nel/include/nel/net/unified_network.h b/nel/include/nel/net/unified_network.h
similarity index 100%
rename from code/nel/include/nel/net/unified_network.h
rename to nel/include/nel/net/unified_network.h
diff --git a/code/nel/include/nel/net/unitime.h b/nel/include/nel/net/unitime.h
similarity index 100%
rename from code/nel/include/nel/net/unitime.h
rename to nel/include/nel/net/unitime.h
diff --git a/code/nel/include/nel/net/varpath.h b/nel/include/nel/net/varpath.h
similarity index 100%
rename from code/nel/include/nel/net/varpath.h
rename to nel/include/nel/net/varpath.h
diff --git a/code/nel/include/nel/pacs/CMakeLists.txt b/nel/include/nel/pacs/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/pacs/CMakeLists.txt
rename to nel/include/nel/pacs/CMakeLists.txt
diff --git a/code/nel/include/nel/pacs/build_indoor.h b/nel/include/nel/pacs/build_indoor.h
similarity index 100%
rename from code/nel/include/nel/pacs/build_indoor.h
rename to nel/include/nel/pacs/build_indoor.h
diff --git a/code/nel/include/nel/pacs/chain.h b/nel/include/nel/pacs/chain.h
similarity index 100%
rename from code/nel/include/nel/pacs/chain.h
rename to nel/include/nel/pacs/chain.h
diff --git a/code/nel/include/nel/pacs/chain_quad.h b/nel/include/nel/pacs/chain_quad.h
similarity index 100%
rename from code/nel/include/nel/pacs/chain_quad.h
rename to nel/include/nel/pacs/chain_quad.h
diff --git a/code/nel/include/nel/pacs/collision_callback.h b/nel/include/nel/pacs/collision_callback.h
similarity index 100%
rename from code/nel/include/nel/pacs/collision_callback.h
rename to nel/include/nel/pacs/collision_callback.h
diff --git a/code/nel/include/nel/pacs/collision_desc.h b/nel/include/nel/pacs/collision_desc.h
similarity index 100%
rename from code/nel/include/nel/pacs/collision_desc.h
rename to nel/include/nel/pacs/collision_desc.h
diff --git a/code/nel/include/nel/pacs/collision_mesh_build.h b/nel/include/nel/pacs/collision_mesh_build.h
similarity index 100%
rename from code/nel/include/nel/pacs/collision_mesh_build.h
rename to nel/include/nel/pacs/collision_mesh_build.h
diff --git a/code/nel/include/nel/pacs/collision_ot.h b/nel/include/nel/pacs/collision_ot.h
similarity index 100%
rename from code/nel/include/nel/pacs/collision_ot.h
rename to nel/include/nel/pacs/collision_ot.h
diff --git a/code/nel/include/nel/pacs/collision_surface_temp.h b/nel/include/nel/pacs/collision_surface_temp.h
similarity index 100%
rename from code/nel/include/nel/pacs/collision_surface_temp.h
rename to nel/include/nel/pacs/collision_surface_temp.h
diff --git a/code/nel/include/nel/pacs/edge_collide.h b/nel/include/nel/pacs/edge_collide.h
similarity index 100%
rename from code/nel/include/nel/pacs/edge_collide.h
rename to nel/include/nel/pacs/edge_collide.h
diff --git a/code/nel/include/nel/pacs/edge_quad.h b/nel/include/nel/pacs/edge_quad.h
similarity index 100%
rename from code/nel/include/nel/pacs/edge_quad.h
rename to nel/include/nel/pacs/edge_quad.h
diff --git a/code/nel/include/nel/pacs/exterior_mesh.h b/nel/include/nel/pacs/exterior_mesh.h
similarity index 100%
rename from code/nel/include/nel/pacs/exterior_mesh.h
rename to nel/include/nel/pacs/exterior_mesh.h
diff --git a/code/nel/include/nel/pacs/face_grid.h b/nel/include/nel/pacs/face_grid.h
similarity index 100%
rename from code/nel/include/nel/pacs/face_grid.h
rename to nel/include/nel/pacs/face_grid.h
diff --git a/code/nel/include/nel/pacs/global_retriever.h b/nel/include/nel/pacs/global_retriever.h
similarity index 100%
rename from code/nel/include/nel/pacs/global_retriever.h
rename to nel/include/nel/pacs/global_retriever.h
diff --git a/code/nel/include/nel/pacs/local_retriever.h b/nel/include/nel/pacs/local_retriever.h
similarity index 100%
rename from code/nel/include/nel/pacs/local_retriever.h
rename to nel/include/nel/pacs/local_retriever.h
diff --git a/code/nel/include/nel/pacs/move_cell.h b/nel/include/nel/pacs/move_cell.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_cell.h
rename to nel/include/nel/pacs/move_cell.h
diff --git a/code/nel/include/nel/pacs/move_container.h b/nel/include/nel/pacs/move_container.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_container.h
rename to nel/include/nel/pacs/move_container.h
diff --git a/code/nel/include/nel/pacs/move_container_inline.h b/nel/include/nel/pacs/move_container_inline.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_container_inline.h
rename to nel/include/nel/pacs/move_container_inline.h
diff --git a/code/nel/include/nel/pacs/move_element.h b/nel/include/nel/pacs/move_element.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_element.h
rename to nel/include/nel/pacs/move_element.h
diff --git a/code/nel/include/nel/pacs/move_element_inline.h b/nel/include/nel/pacs/move_element_inline.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_element_inline.h
rename to nel/include/nel/pacs/move_element_inline.h
diff --git a/code/nel/include/nel/pacs/move_primitive.h b/nel/include/nel/pacs/move_primitive.h
similarity index 100%
rename from code/nel/include/nel/pacs/move_primitive.h
rename to nel/include/nel/pacs/move_primitive.h
diff --git a/code/nel/include/nel/pacs/primitive_block.h b/nel/include/nel/pacs/primitive_block.h
similarity index 100%
rename from code/nel/include/nel/pacs/primitive_block.h
rename to nel/include/nel/pacs/primitive_block.h
diff --git a/code/nel/include/nel/pacs/primitive_world_image.h b/nel/include/nel/pacs/primitive_world_image.h
similarity index 100%
rename from code/nel/include/nel/pacs/primitive_world_image.h
rename to nel/include/nel/pacs/primitive_world_image.h
diff --git a/code/nel/include/nel/pacs/quad_grid.h b/nel/include/nel/pacs/quad_grid.h
similarity index 100%
rename from code/nel/include/nel/pacs/quad_grid.h
rename to nel/include/nel/pacs/quad_grid.h
diff --git a/code/nel/include/nel/pacs/retrievable_surface.h b/nel/include/nel/pacs/retrievable_surface.h
similarity index 100%
rename from code/nel/include/nel/pacs/retrievable_surface.h
rename to nel/include/nel/pacs/retrievable_surface.h
diff --git a/code/nel/include/nel/pacs/retriever_bank.h b/nel/include/nel/pacs/retriever_bank.h
similarity index 100%
rename from code/nel/include/nel/pacs/retriever_bank.h
rename to nel/include/nel/pacs/retriever_bank.h
diff --git a/code/nel/include/nel/pacs/retriever_instance.h b/nel/include/nel/pacs/retriever_instance.h
similarity index 100%
rename from code/nel/include/nel/pacs/retriever_instance.h
rename to nel/include/nel/pacs/retriever_instance.h
diff --git a/code/nel/include/nel/pacs/surface_quad.h b/nel/include/nel/pacs/surface_quad.h
similarity index 100%
rename from code/nel/include/nel/pacs/surface_quad.h
rename to nel/include/nel/pacs/surface_quad.h
diff --git a/code/nel/include/nel/pacs/u_collision_desc.h b/nel/include/nel/pacs/u_collision_desc.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_collision_desc.h
rename to nel/include/nel/pacs/u_collision_desc.h
diff --git a/code/nel/include/nel/pacs/u_global_position.h b/nel/include/nel/pacs/u_global_position.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_global_position.h
rename to nel/include/nel/pacs/u_global_position.h
diff --git a/code/nel/include/nel/pacs/u_global_retriever.h b/nel/include/nel/pacs/u_global_retriever.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_global_retriever.h
rename to nel/include/nel/pacs/u_global_retriever.h
diff --git a/code/nel/include/nel/pacs/u_move_container.h b/nel/include/nel/pacs/u_move_container.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_move_container.h
rename to nel/include/nel/pacs/u_move_container.h
diff --git a/code/nel/include/nel/pacs/u_move_primitive.h b/nel/include/nel/pacs/u_move_primitive.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_move_primitive.h
rename to nel/include/nel/pacs/u_move_primitive.h
diff --git a/code/nel/include/nel/pacs/u_primitive_block.h b/nel/include/nel/pacs/u_primitive_block.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_primitive_block.h
rename to nel/include/nel/pacs/u_primitive_block.h
diff --git a/code/nel/include/nel/pacs/u_retriever_bank.h b/nel/include/nel/pacs/u_retriever_bank.h
similarity index 100%
rename from code/nel/include/nel/pacs/u_retriever_bank.h
rename to nel/include/nel/pacs/u_retriever_bank.h
diff --git a/code/nel/include/nel/pacs/vector_2s.h b/nel/include/nel/pacs/vector_2s.h
similarity index 100%
rename from code/nel/include/nel/pacs/vector_2s.h
rename to nel/include/nel/pacs/vector_2s.h
diff --git a/code/nel/include/nel/pipeline/database_config.h b/nel/include/nel/pipeline/database_config.h
similarity index 100%
rename from code/nel/include/nel/pipeline/database_config.h
rename to nel/include/nel/pipeline/database_config.h
diff --git a/code/nel/include/nel/pipeline/project_config.h b/nel/include/nel/pipeline/project_config.h
similarity index 100%
rename from code/nel/include/nel/pipeline/project_config.h
rename to nel/include/nel/pipeline/project_config.h
diff --git a/code/nel/include/nel/pipeline/tool_logger.h b/nel/include/nel/pipeline/tool_logger.h
similarity index 100%
rename from code/nel/include/nel/pipeline/tool_logger.h
rename to nel/include/nel/pipeline/tool_logger.h
diff --git a/code/nel/include/nel/sound/CMakeLists.txt b/nel/include/nel/sound/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/sound/CMakeLists.txt
rename to nel/include/nel/sound/CMakeLists.txt
diff --git a/code/nel/include/nel/sound/async_file_manager_sound.h b/nel/include/nel/sound/async_file_manager_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/async_file_manager_sound.h
rename to nel/include/nel/sound/async_file_manager_sound.h
diff --git a/code/nel/include/nel/sound/audio_decoder.h b/nel/include/nel/sound/audio_decoder.h
similarity index 100%
rename from code/nel/include/nel/sound/audio_decoder.h
rename to nel/include/nel/sound/audio_decoder.h
diff --git a/code/nel/include/nel/sound/audio_decoder_ffmpeg.h b/nel/include/nel/sound/audio_decoder_ffmpeg.h
similarity index 100%
rename from code/nel/include/nel/sound/audio_decoder_ffmpeg.h
rename to nel/include/nel/sound/audio_decoder_ffmpeg.h
diff --git a/code/nel/include/nel/sound/audio_decoder_mp3.h b/nel/include/nel/sound/audio_decoder_mp3.h
similarity index 100%
rename from code/nel/include/nel/sound/audio_decoder_mp3.h
rename to nel/include/nel/sound/audio_decoder_mp3.h
diff --git a/code/nel/include/nel/sound/audio_decoder_vorbis.h b/nel/include/nel/sound/audio_decoder_vorbis.h
similarity index 100%
rename from code/nel/include/nel/sound/audio_decoder_vorbis.h
rename to nel/include/nel/sound/audio_decoder_vorbis.h
diff --git a/code/nel/include/nel/sound/audio_mixer_user.h b/nel/include/nel/sound/audio_mixer_user.h
similarity index 100%
rename from code/nel/include/nel/sound/audio_mixer_user.h
rename to nel/include/nel/sound/audio_mixer_user.h
diff --git a/code/nel/include/nel/sound/background_sound.h b/nel/include/nel/sound/background_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/background_sound.h
rename to nel/include/nel/sound/background_sound.h
diff --git a/code/nel/include/nel/sound/background_sound_manager.h b/nel/include/nel/sound/background_sound_manager.h
similarity index 100%
rename from code/nel/include/nel/sound/background_sound_manager.h
rename to nel/include/nel/sound/background_sound_manager.h
diff --git a/code/nel/include/nel/sound/background_source.h b/nel/include/nel/sound/background_source.h
similarity index 100%
rename from code/nel/include/nel/sound/background_source.h
rename to nel/include/nel/sound/background_source.h
diff --git a/code/nel/include/nel/sound/clustered_sound.h b/nel/include/nel/sound/clustered_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/clustered_sound.h
rename to nel/include/nel/sound/clustered_sound.h
diff --git a/code/nel/include/nel/sound/complex_sound.h b/nel/include/nel/sound/complex_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/complex_sound.h
rename to nel/include/nel/sound/complex_sound.h
diff --git a/code/nel/include/nel/sound/complex_source.h b/nel/include/nel/sound/complex_source.h
similarity index 100%
rename from code/nel/include/nel/sound/complex_source.h
rename to nel/include/nel/sound/complex_source.h
diff --git a/code/nel/include/nel/sound/containers.h b/nel/include/nel/sound/containers.h
similarity index 100%
rename from code/nel/include/nel/sound/containers.h
rename to nel/include/nel/sound/containers.h
diff --git a/code/nel/include/nel/sound/context_sound.h b/nel/include/nel/sound/context_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/context_sound.h
rename to nel/include/nel/sound/context_sound.h
diff --git a/code/nel/include/nel/sound/decoder/dr_mp3.h b/nel/include/nel/sound/decoder/dr_mp3.h
similarity index 100%
rename from code/nel/include/nel/sound/decoder/dr_mp3.h
rename to nel/include/nel/sound/decoder/dr_mp3.h
diff --git a/code/nel/include/nel/sound/driver/CMakeLists.txt b/nel/include/nel/sound/driver/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/sound/driver/CMakeLists.txt
rename to nel/include/nel/sound/driver/CMakeLists.txt
diff --git a/code/nel/include/nel/sound/driver/buffer.h b/nel/include/nel/sound/driver/buffer.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/buffer.h
rename to nel/include/nel/sound/driver/buffer.h
diff --git a/code/nel/include/nel/sound/driver/effect.h b/nel/include/nel/sound/driver/effect.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/effect.h
rename to nel/include/nel/sound/driver/effect.h
diff --git a/code/nel/include/nel/sound/driver/listener.h b/nel/include/nel/sound/driver/listener.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/listener.h
rename to nel/include/nel/sound/driver/listener.h
diff --git a/code/nel/include/nel/sound/driver/music_channel.h b/nel/include/nel/sound/driver/music_channel.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/music_channel.h
rename to nel/include/nel/sound/driver/music_channel.h
diff --git a/code/nel/include/nel/sound/driver/sound_driver.h b/nel/include/nel/sound/driver/sound_driver.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/sound_driver.h
rename to nel/include/nel/sound/driver/sound_driver.h
diff --git a/code/nel/include/nel/sound/driver/source.h b/nel/include/nel/sound/driver/source.h
similarity index 100%
rename from code/nel/include/nel/sound/driver/source.h
rename to nel/include/nel/sound/driver/source.h
diff --git a/code/nel/include/nel/sound/group_controller.h b/nel/include/nel/sound/group_controller.h
similarity index 100%
rename from code/nel/include/nel/sound/group_controller.h
rename to nel/include/nel/sound/group_controller.h
diff --git a/code/nel/include/nel/sound/group_controller_root.h b/nel/include/nel/sound/group_controller_root.h
similarity index 100%
rename from code/nel/include/nel/sound/group_controller_root.h
rename to nel/include/nel/sound/group_controller_root.h
diff --git a/code/nel/include/nel/sound/listener_user.h b/nel/include/nel/sound/listener_user.h
similarity index 100%
rename from code/nel/include/nel/sound/listener_user.h
rename to nel/include/nel/sound/listener_user.h
diff --git a/code/nel/include/nel/sound/mixing_track.h b/nel/include/nel/sound/mixing_track.h
similarity index 100%
rename from code/nel/include/nel/sound/mixing_track.h
rename to nel/include/nel/sound/mixing_track.h
diff --git a/code/nel/include/nel/sound/music_channel_fader.h b/nel/include/nel/sound/music_channel_fader.h
similarity index 100%
rename from code/nel/include/nel/sound/music_channel_fader.h
rename to nel/include/nel/sound/music_channel_fader.h
diff --git a/code/nel/include/nel/sound/music_sound.h b/nel/include/nel/sound/music_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/music_sound.h
rename to nel/include/nel/sound/music_sound.h
diff --git a/code/nel/include/nel/sound/music_sound_manager.h b/nel/include/nel/sound/music_sound_manager.h
similarity index 100%
rename from code/nel/include/nel/sound/music_sound_manager.h
rename to nel/include/nel/sound/music_sound_manager.h
diff --git a/code/nel/include/nel/sound/music_source.h b/nel/include/nel/sound/music_source.h
similarity index 100%
rename from code/nel/include/nel/sound/music_source.h
rename to nel/include/nel/sound/music_source.h
diff --git a/code/nel/include/nel/sound/sample_bank.h b/nel/include/nel/sound/sample_bank.h
similarity index 100%
rename from code/nel/include/nel/sound/sample_bank.h
rename to nel/include/nel/sound/sample_bank.h
diff --git a/code/nel/include/nel/sound/sample_bank_manager.h b/nel/include/nel/sound/sample_bank_manager.h
similarity index 100%
rename from code/nel/include/nel/sound/sample_bank_manager.h
rename to nel/include/nel/sound/sample_bank_manager.h
diff --git a/code/nel/include/nel/sound/simple_sound.h b/nel/include/nel/sound/simple_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/simple_sound.h
rename to nel/include/nel/sound/simple_sound.h
diff --git a/code/nel/include/nel/sound/simple_source.h b/nel/include/nel/sound/simple_source.h
similarity index 100%
rename from code/nel/include/nel/sound/simple_source.h
rename to nel/include/nel/sound/simple_source.h
diff --git a/code/nel/include/nel/sound/sound.h b/nel/include/nel/sound/sound.h
similarity index 100%
rename from code/nel/include/nel/sound/sound.h
rename to nel/include/nel/sound/sound.h
diff --git a/code/nel/include/nel/sound/sound_anim_manager.h b/nel/include/nel/sound/sound_anim_manager.h
similarity index 100%
rename from code/nel/include/nel/sound/sound_anim_manager.h
rename to nel/include/nel/sound/sound_anim_manager.h
diff --git a/code/nel/include/nel/sound/sound_anim_marker.h b/nel/include/nel/sound/sound_anim_marker.h
similarity index 100%
rename from code/nel/include/nel/sound/sound_anim_marker.h
rename to nel/include/nel/sound/sound_anim_marker.h
diff --git a/code/nel/include/nel/sound/sound_animation.h b/nel/include/nel/sound/sound_animation.h
similarity index 100%
rename from code/nel/include/nel/sound/sound_animation.h
rename to nel/include/nel/sound/sound_animation.h
diff --git a/code/nel/include/nel/sound/sound_bank.h b/nel/include/nel/sound/sound_bank.h
similarity index 100%
rename from code/nel/include/nel/sound/sound_bank.h
rename to nel/include/nel/sound/sound_bank.h
diff --git a/code/nel/include/nel/sound/sound_pattern.h b/nel/include/nel/sound/sound_pattern.h
similarity index 100%
rename from code/nel/include/nel/sound/sound_pattern.h
rename to nel/include/nel/sound/sound_pattern.h
diff --git a/code/nel/include/nel/sound/source_common.h b/nel/include/nel/sound/source_common.h
similarity index 100%
rename from code/nel/include/nel/sound/source_common.h
rename to nel/include/nel/sound/source_common.h
diff --git a/code/nel/include/nel/sound/source_music_channel.h b/nel/include/nel/sound/source_music_channel.h
similarity index 100%
rename from code/nel/include/nel/sound/source_music_channel.h
rename to nel/include/nel/sound/source_music_channel.h
diff --git a/code/nel/include/nel/sound/stream_file_sound.h b/nel/include/nel/sound/stream_file_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/stream_file_sound.h
rename to nel/include/nel/sound/stream_file_sound.h
diff --git a/code/nel/include/nel/sound/stream_file_source.h b/nel/include/nel/sound/stream_file_source.h
similarity index 100%
rename from code/nel/include/nel/sound/stream_file_source.h
rename to nel/include/nel/sound/stream_file_source.h
diff --git a/code/nel/include/nel/sound/stream_sound.h b/nel/include/nel/sound/stream_sound.h
similarity index 100%
rename from code/nel/include/nel/sound/stream_sound.h
rename to nel/include/nel/sound/stream_sound.h
diff --git a/code/nel/include/nel/sound/stream_source.h b/nel/include/nel/sound/stream_source.h
similarity index 100%
rename from code/nel/include/nel/sound/stream_source.h
rename to nel/include/nel/sound/stream_source.h
diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/nel/include/nel/sound/u_audio_mixer.h
similarity index 100%
rename from code/nel/include/nel/sound/u_audio_mixer.h
rename to nel/include/nel/sound/u_audio_mixer.h
diff --git a/code/nel/include/nel/sound/u_group_controller.h b/nel/include/nel/sound/u_group_controller.h
similarity index 100%
rename from code/nel/include/nel/sound/u_group_controller.h
rename to nel/include/nel/sound/u_group_controller.h
diff --git a/code/nel/include/nel/sound/u_listener.h b/nel/include/nel/sound/u_listener.h
similarity index 100%
rename from code/nel/include/nel/sound/u_listener.h
rename to nel/include/nel/sound/u_listener.h
diff --git a/code/nel/include/nel/sound/u_source.h b/nel/include/nel/sound/u_source.h
similarity index 100%
rename from code/nel/include/nel/sound/u_source.h
rename to nel/include/nel/sound/u_source.h
diff --git a/code/nel/include/nel/sound/u_stream_source.h b/nel/include/nel/sound/u_stream_source.h
similarity index 100%
rename from code/nel/include/nel/sound/u_stream_source.h
rename to nel/include/nel/sound/u_stream_source.h
diff --git a/code/nel/include/nel/web/CMakeLists.txt b/nel/include/nel/web/CMakeLists.txt
similarity index 100%
rename from code/nel/include/nel/web/CMakeLists.txt
rename to nel/include/nel/web/CMakeLists.txt
diff --git a/code/nel/include/nel/web/curl_certificates.h b/nel/include/nel/web/curl_certificates.h
similarity index 100%
rename from code/nel/include/nel/web/curl_certificates.h
rename to nel/include/nel/web/curl_certificates.h
diff --git a/code/nel/include/nel/web/http_client_curl.h b/nel/include/nel/web/http_client_curl.h
similarity index 100%
rename from code/nel/include/nel/web/http_client_curl.h
rename to nel/include/nel/web/http_client_curl.h
diff --git a/code/nel/include/nel/web/http_package_provider.h b/nel/include/nel/web/http_package_provider.h
similarity index 100%
rename from code/nel/include/nel/web/http_package_provider.h
rename to nel/include/nel/web/http_package_provider.h
diff --git a/code/nel/nel-config.in b/nel/nel-config.in
similarity index 100%
rename from code/nel/nel-config.in
rename to nel/nel-config.in
diff --git a/code/nel/resources/nel.bmp b/nel/resources/nel.bmp
similarity index 100%
rename from code/nel/resources/nel.bmp
rename to nel/resources/nel.bmp
diff --git a/code/nel/resources/nel.png b/nel/resources/nel.png
similarity index 100%
rename from code/nel/resources/nel.png
rename to nel/resources/nel.png
diff --git a/code/nel/resources/nevraxpill.ico b/nel/resources/nevraxpill.ico
similarity index 100%
rename from code/nel/resources/nevraxpill.ico
rename to nel/resources/nevraxpill.ico
diff --git a/code/nel/samples/3d/CMakeLists.txt b/nel/samples/3d/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/CMakeLists.txt
rename to nel/samples/3d/CMakeLists.txt
diff --git a/code/nel/samples/3d/cegui/CMakeLists.txt b/nel/samples/3d/cegui/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/cegui/CMakeLists.txt
rename to nel/samples/3d/cegui/CMakeLists.txt
diff --git a/code/nel/samples/3d/cegui/NeLDriver.cpp b/nel/samples/3d/cegui/NeLDriver.cpp
similarity index 100%
rename from code/nel/samples/3d/cegui/NeLDriver.cpp
rename to nel/samples/3d/cegui/NeLDriver.cpp
diff --git a/code/nel/samples/3d/cegui/NeLDriver.h b/nel/samples/3d/cegui/NeLDriver.h
similarity index 100%
rename from code/nel/samples/3d/cegui/NeLDriver.h
rename to nel/samples/3d/cegui/NeLDriver.h
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/Commonv2c.ttf b/nel/samples/3d/cegui/datafiles/fonts/Commonv2c.ttf
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/Commonv2c.ttf
rename to nel/samples/3d/cegui/datafiles/fonts/Commonv2c.ttf
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/Commonwealth-10.font b/nel/samples/3d/cegui/datafiles/fonts/Commonwealth-10.font
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/Commonwealth-10.font
rename to nel/samples/3d/cegui/datafiles/fonts/Commonwealth-10.font
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/Font.xsd b/nel/samples/3d/cegui/datafiles/fonts/Font.xsd
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/Font.xsd
rename to nel/samples/3d/cegui/datafiles/fonts/Font.xsd
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/Legal.txt b/nel/samples/3d/cegui/datafiles/fonts/Legal.txt
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/Legal.txt
rename to nel/samples/3d/cegui/datafiles/fonts/Legal.txt
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/README b/nel/samples/3d/cegui/datafiles/fonts/README
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/README
rename to nel/samples/3d/cegui/datafiles/fonts/README
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/common.txt b/nel/samples/3d/cegui/datafiles/fonts/common.txt
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/common.txt
rename to nel/samples/3d/cegui/datafiles/fonts/common.txt
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/tahoma-12.font b/nel/samples/3d/cegui/datafiles/fonts/tahoma-12.font
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/tahoma-12.font
rename to nel/samples/3d/cegui/datafiles/fonts/tahoma-12.font
diff --git a/code/nel/samples/3d/cegui/datafiles/fonts/tahoma.ttf b/nel/samples/3d/cegui/datafiles/fonts/tahoma.ttf
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/fonts/tahoma.ttf
rename to nel/samples/3d/cegui/datafiles/fonts/tahoma.ttf
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/GPN-2000-001437.tga b/nel/samples/3d/cegui/datafiles/imagesets/GPN-2000-001437.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/GPN-2000-001437.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/GPN-2000-001437.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/Imageset.xsd b/nel/samples/3d/cegui/datafiles/imagesets/Imageset.xsd
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/Imageset.xsd
rename to nel/samples/3d/cegui/datafiles/imagesets/Imageset.xsd
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/ReadMe.txt b/nel/samples/3d/cegui/datafiles/imagesets/ReadMe.txt
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/ReadMe.txt
rename to nel/samples/3d/cegui/datafiles/imagesets/ReadMe.txt
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.imageset b/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.imageset
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.imageset
rename to nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.imageset
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.tga b/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/TaharezLook.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/WerewolfLook.tga b/nel/samples/3d/cegui/datafiles/imagesets/WerewolfLook.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/WerewolfLook.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/WerewolfLook.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.imageset b/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.imageset
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.imageset
rename to nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.imageset
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.tga b/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/WindowsLook.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/ogregui.imageset b/nel/samples/3d/cegui/datafiles/imagesets/ogregui.imageset
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/ogregui.imageset
rename to nel/samples/3d/cegui/datafiles/imagesets/ogregui.imageset
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/ogregui.tga b/nel/samples/3d/cegui/datafiles/imagesets/ogregui.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/ogregui.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/ogregui.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.imageset b/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.imageset
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.imageset
rename to nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.imageset
diff --git a/code/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.tga b/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.tga
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.tga
rename to nel/samples/3d/cegui/datafiles/imagesets/werewolfgui.tga
diff --git a/code/nel/samples/3d/cegui/datafiles/layouts/Demo7Windows.layout b/nel/samples/3d/cegui/datafiles/layouts/Demo7Windows.layout
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/layouts/Demo7Windows.layout
rename to nel/samples/3d/cegui/datafiles/layouts/Demo7Windows.layout
diff --git a/code/nel/samples/3d/cegui/datafiles/layouts/GUILayout.xsd b/nel/samples/3d/cegui/datafiles/layouts/GUILayout.xsd
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/layouts/GUILayout.xsd
rename to nel/samples/3d/cegui/datafiles/layouts/GUILayout.xsd
diff --git a/code/nel/samples/3d/cegui/datafiles/looknfeel/Falagard.xsd b/nel/samples/3d/cegui/datafiles/looknfeel/Falagard.xsd
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/looknfeel/Falagard.xsd
rename to nel/samples/3d/cegui/datafiles/looknfeel/Falagard.xsd
diff --git a/code/nel/samples/3d/cegui/datafiles/looknfeel/TaharezLook.looknfeel b/nel/samples/3d/cegui/datafiles/looknfeel/TaharezLook.looknfeel
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/looknfeel/TaharezLook.looknfeel
rename to nel/samples/3d/cegui/datafiles/looknfeel/TaharezLook.looknfeel
diff --git a/code/nel/samples/3d/cegui/datafiles/looknfeel/Vanilla.looknfeel b/nel/samples/3d/cegui/datafiles/looknfeel/Vanilla.looknfeel
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/looknfeel/Vanilla.looknfeel
rename to nel/samples/3d/cegui/datafiles/looknfeel/Vanilla.looknfeel
diff --git a/code/nel/samples/3d/cegui/datafiles/looknfeel/WindowsLook.looknfeel b/nel/samples/3d/cegui/datafiles/looknfeel/WindowsLook.looknfeel
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/looknfeel/WindowsLook.looknfeel
rename to nel/samples/3d/cegui/datafiles/looknfeel/WindowsLook.looknfeel
diff --git a/code/nel/samples/3d/cegui/datafiles/n019003l.pfb b/nel/samples/3d/cegui/datafiles/n019003l.pfb
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/n019003l.pfb
rename to nel/samples/3d/cegui/datafiles/n019003l.pfb
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/GUIScheme.xsd b/nel/samples/3d/cegui/datafiles/schemes/GUIScheme.xsd
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/GUIScheme.xsd
rename to nel/samples/3d/cegui/datafiles/schemes/GUIScheme.xsd
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/TaharezLook.scheme b/nel/samples/3d/cegui/datafiles/schemes/TaharezLook.scheme
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/TaharezLook.scheme
rename to nel/samples/3d/cegui/datafiles/schemes/TaharezLook.scheme
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme b/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
rename to nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgets.scheme b/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgets.scheme
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgets.scheme
rename to nel/samples/3d/cegui/datafiles/schemes/TaharezLookWidgets.scheme
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/WindowsLook.scheme b/nel/samples/3d/cegui/datafiles/schemes/WindowsLook.scheme
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/WindowsLook.scheme
rename to nel/samples/3d/cegui/datafiles/schemes/WindowsLook.scheme
diff --git a/code/nel/samples/3d/cegui/datafiles/schemes/WindowsLookWidgets.scheme b/nel/samples/3d/cegui/datafiles/schemes/WindowsLookWidgets.scheme
similarity index 100%
rename from code/nel/samples/3d/cegui/datafiles/schemes/WindowsLookWidgets.scheme
rename to nel/samples/3d/cegui/datafiles/schemes/WindowsLookWidgets.scheme
diff --git a/code/nel/samples/3d/cegui/demonel.rc b/nel/samples/3d/cegui/demonel.rc
similarity index 100%
rename from code/nel/samples/3d/cegui/demonel.rc
rename to nel/samples/3d/cegui/demonel.rc
diff --git a/code/nel/samples/3d/cegui/globals.h b/nel/samples/3d/cegui/globals.h
similarity index 100%
rename from code/nel/samples/3d/cegui/globals.h
rename to nel/samples/3d/cegui/globals.h
diff --git a/code/nel/samples/3d/cegui/icon1.ico b/nel/samples/3d/cegui/icon1.ico
similarity index 100%
rename from code/nel/samples/3d/cegui/icon1.ico
rename to nel/samples/3d/cegui/icon1.ico
diff --git a/code/nel/samples/3d/cegui/main.cpp b/nel/samples/3d/cegui/main.cpp
similarity index 100%
rename from code/nel/samples/3d/cegui/main.cpp
rename to nel/samples/3d/cegui/main.cpp
diff --git a/code/nel/samples/3d/cegui/resource.h b/nel/samples/3d/cegui/resource.h
similarity index 100%
rename from code/nel/samples/3d/cegui/resource.h
rename to nel/samples/3d/cegui/resource.h
diff --git a/code/nel/samples/3d/cegui/resource1.h b/nel/samples/3d/cegui/resource1.h
similarity index 100%
rename from code/nel/samples/3d/cegui/resource1.h
rename to nel/samples/3d/cegui/resource1.h
diff --git a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt b/nel/samples/3d/cluster_viewer/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/CMakeLists.txt
rename to nel/samples/3d/cluster_viewer/CMakeLists.txt
diff --git a/code/nel/samples/3d/cluster_viewer/fonts/n019003l.pfb b/nel/samples/3d/cluster_viewer/fonts/n019003l.pfb
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/fonts/n019003l.pfb
rename to nel/samples/3d/cluster_viewer/fonts/n019003l.pfb
diff --git a/code/nel/samples/3d/cluster_viewer/groups/street.ig b/nel/samples/3d/cluster_viewer/groups/street.ig
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/groups/street.ig
rename to nel/samples/3d/cluster_viewer/groups/street.ig
diff --git a/code/nel/samples/3d/cluster_viewer/main.cpp b/nel/samples/3d/cluster_viewer/main.cpp
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/main.cpp
rename to nel/samples/3d/cluster_viewer/main.cpp
diff --git a/code/nel/samples/3d/cluster_viewer/main.cvs b/nel/samples/3d/cluster_viewer/main.cvs
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/main.cvs
rename to nel/samples/3d/cluster_viewer/main.cvs
diff --git a/code/nel/samples/3d/cluster_viewer/max/street.max b/nel/samples/3d/cluster_viewer/max/street.max
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/max/street.max
rename to nel/samples/3d/cluster_viewer/max/street.max
diff --git a/code/nel/samples/3d/cluster_viewer/readme.txt b/nel/samples/3d/cluster_viewer/readme.txt
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/readme.txt
rename to nel/samples/3d/cluster_viewer/readme.txt
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/box02.shape b/nel/samples/3d/cluster_viewer/shapes/box02.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/box02.shape
rename to nel/samples/3d/cluster_viewer/shapes/box02.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere01.shape b/nel/samples/3d/cluster_viewer/shapes/sphere01.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere01.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere01.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere02.shape b/nel/samples/3d/cluster_viewer/shapes/sphere02.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere02.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere02.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere03.shape b/nel/samples/3d/cluster_viewer/shapes/sphere03.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere03.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere03.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere04.shape b/nel/samples/3d/cluster_viewer/shapes/sphere04.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere04.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere04.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere05.shape b/nel/samples/3d/cluster_viewer/shapes/sphere05.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere05.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere05.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere06.shape b/nel/samples/3d/cluster_viewer/shapes/sphere06.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere06.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere06.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere07.shape b/nel/samples/3d/cluster_viewer/shapes/sphere07.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere07.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere07.shape
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/sphere08.shape b/nel/samples/3d/cluster_viewer/shapes/sphere08.shape
similarity index 100%
rename from code/nel/samples/3d/cluster_viewer/shapes/sphere08.shape
rename to nel/samples/3d/cluster_viewer/shapes/sphere08.shape
diff --git a/code/nel/samples/3d/font/CMakeLists.txt b/nel/samples/3d/font/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/font/CMakeLists.txt
rename to nel/samples/3d/font/CMakeLists.txt
diff --git a/code/nel/samples/3d/font/beteckna.ttf b/nel/samples/3d/font/beteckna.ttf
similarity index 100%
rename from code/nel/samples/3d/font/beteckna.ttf
rename to nel/samples/3d/font/beteckna.ttf
diff --git a/code/nel/samples/3d/font/main.cpp b/nel/samples/3d/font/main.cpp
similarity index 100%
rename from code/nel/samples/3d/font/main.cpp
rename to nel/samples/3d/font/main.cpp
diff --git a/code/nel/samples/3d/nel_qt/callback.cpp b/nel/samples/3d/nel_qt/callback.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/callback.cpp
rename to nel/samples/3d/nel_qt/callback.cpp
diff --git a/code/nel/samples/3d/nel_qt/callback.h b/nel/samples/3d/nel_qt/callback.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/callback.h
rename to nel/samples/3d/nel_qt/callback.h
diff --git a/code/nel/samples/3d/nel_qt/command_log.cpp b/nel/samples/3d/nel_qt/command_log.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/command_log.cpp
rename to nel/samples/3d/nel_qt/command_log.cpp
diff --git a/code/nel/samples/3d/nel_qt/command_log.h b/nel/samples/3d/nel_qt/command_log.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/command_log.h
rename to nel/samples/3d/nel_qt/command_log.h
diff --git a/code/nel/samples/3d/nel_qt/configuration.cpp b/nel/samples/3d/nel_qt/configuration.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/configuration.cpp
rename to nel/samples/3d/nel_qt/configuration.cpp
diff --git a/code/nel/samples/3d/nel_qt/configuration.h b/nel/samples/3d/nel_qt/configuration.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/configuration.h
rename to nel/samples/3d/nel_qt/configuration.h
diff --git a/code/nel/samples/3d/nel_qt/data/andbasr.ttf b/nel/samples/3d/nel_qt/data/andbasr.ttf
similarity index 100%
rename from code/nel/samples/3d/nel_qt/data/andbasr.ttf
rename to nel/samples/3d/nel_qt/data/andbasr.ttf
diff --git a/code/nel/samples/3d/nel_qt/data/andbasr.txt b/nel/samples/3d/nel_qt/data/andbasr.txt
similarity index 100%
rename from code/nel/samples/3d/nel_qt/data/andbasr.txt
rename to nel/samples/3d/nel_qt/data/andbasr.txt
diff --git a/code/nel/samples/3d/nel_qt/data/en.uxt b/nel/samples/3d/nel_qt/data/en.uxt
similarity index 100%
rename from code/nel/samples/3d/nel_qt/data/en.uxt
rename to nel/samples/3d/nel_qt/data/en.uxt
diff --git a/code/nel/samples/3d/nel_qt/graphics_config.cpp b/nel/samples/3d/nel_qt/graphics_config.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/graphics_config.cpp
rename to nel/samples/3d/nel_qt/graphics_config.cpp
diff --git a/code/nel/samples/3d/nel_qt/graphics_config.h b/nel/samples/3d/nel_qt/graphics_config.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/graphics_config.h
rename to nel/samples/3d/nel_qt/graphics_config.h
diff --git a/code/nel/samples/3d/nel_qt/graphics_viewport.cpp b/nel/samples/3d/nel_qt/graphics_viewport.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/graphics_viewport.cpp
rename to nel/samples/3d/nel_qt/graphics_viewport.cpp
diff --git a/code/nel/samples/3d/nel_qt/graphics_viewport.h b/nel/samples/3d/nel_qt/graphics_viewport.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/graphics_viewport.h
rename to nel/samples/3d/nel_qt/graphics_viewport.h
diff --git a/code/nel/samples/3d/nel_qt/internationalization.cpp b/nel/samples/3d/nel_qt/internationalization.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/internationalization.cpp
rename to nel/samples/3d/nel_qt/internationalization.cpp
diff --git a/code/nel/samples/3d/nel_qt/internationalization.h b/nel/samples/3d/nel_qt/internationalization.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/internationalization.h
rename to nel/samples/3d/nel_qt/internationalization.h
diff --git a/code/nel/samples/3d/nel_qt/main_window.cpp b/nel/samples/3d/nel_qt/main_window.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/main_window.cpp
rename to nel/samples/3d/nel_qt/main_window.cpp
diff --git a/code/nel/samples/3d/nel_qt/main_window.h b/nel/samples/3d/nel_qt/main_window.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/main_window.h
rename to nel/samples/3d/nel_qt/main_window.h
diff --git a/code/nel/samples/3d/nel_qt/nel_qt.cfg b/nel/samples/3d/nel_qt/nel_qt.cfg
similarity index 100%
rename from code/nel/samples/3d/nel_qt/nel_qt.cfg
rename to nel/samples/3d/nel_qt/nel_qt.cfg
diff --git a/code/nel/samples/3d/nel_qt/nel_qt.cpp b/nel/samples/3d/nel_qt/nel_qt.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/nel_qt.cpp
rename to nel/samples/3d/nel_qt/nel_qt.cpp
diff --git a/code/nel/samples/3d/nel_qt/nel_qt.h b/nel/samples/3d/nel_qt/nel_qt.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/nel_qt.h
rename to nel/samples/3d/nel_qt/nel_qt.h
diff --git a/code/nel/samples/3d/nel_qt/nel_qt_config.h b/nel/samples/3d/nel_qt/nel_qt_config.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/nel_qt_config.h
rename to nel/samples/3d/nel_qt/nel_qt_config.h
diff --git a/code/nel/samples/3d/nel_qt/nel_qt_default.cfg b/nel/samples/3d/nel_qt/nel_qt_default.cfg
similarity index 100%
rename from code/nel/samples/3d/nel_qt/nel_qt_default.cfg
rename to nel/samples/3d/nel_qt/nel_qt_default.cfg
diff --git a/code/nel/samples/3d/nel_qt/qtcolorpicker.h b/nel/samples/3d/nel_qt/qtcolorpicker.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/qtcolorpicker.h
rename to nel/samples/3d/nel_qt/qtcolorpicker.h
diff --git a/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h b/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
rename to nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
diff --git a/code/nel/samples/3d/nel_qt/sound_utilities.cpp b/nel/samples/3d/nel_qt/sound_utilities.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/sound_utilities.cpp
rename to nel/samples/3d/nel_qt/sound_utilities.cpp
diff --git a/code/nel/samples/3d/nel_qt/sound_utilities.h b/nel/samples/3d/nel_qt/sound_utilities.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/sound_utilities.h
rename to nel/samples/3d/nel_qt/sound_utilities.h
diff --git a/code/nel/samples/3d/nel_qt/undo_redo_binders.cpp b/nel/samples/3d/nel_qt/undo_redo_binders.cpp
similarity index 100%
rename from code/nel/samples/3d/nel_qt/undo_redo_binders.cpp
rename to nel/samples/3d/nel_qt/undo_redo_binders.cpp
diff --git a/code/nel/samples/3d/nel_qt/undo_redo_binders.h b/nel/samples/3d/nel_qt/undo_redo_binders.h
similarity index 100%
rename from code/nel/samples/3d/nel_qt/undo_redo_binders.h
rename to nel/samples/3d/nel_qt/undo_redo_binders.h
diff --git a/code/nel/samples/3d/qtnel/CMakeLists.txt b/nel/samples/3d/qtnel/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/qtnel/CMakeLists.txt
rename to nel/samples/3d/qtnel/CMakeLists.txt
diff --git a/code/nel/samples/3d/qtnel/main.cpp b/nel/samples/3d/qtnel/main.cpp
similarity index 100%
rename from code/nel/samples/3d/qtnel/main.cpp
rename to nel/samples/3d/qtnel/main.cpp
diff --git a/code/nel/samples/3d/qtnel/qnelwidget.cpp b/nel/samples/3d/qtnel/qnelwidget.cpp
similarity index 100%
rename from code/nel/samples/3d/qtnel/qnelwidget.cpp
rename to nel/samples/3d/qtnel/qnelwidget.cpp
diff --git a/code/nel/samples/3d/qtnel/qnelwidget.h b/nel/samples/3d/qtnel/qnelwidget.h
similarity index 100%
rename from code/nel/samples/3d/qtnel/qnelwidget.h
rename to nel/samples/3d/qtnel/qnelwidget.h
diff --git a/code/nel/samples/3d/qtnel/qnelwindow.cpp b/nel/samples/3d/qtnel/qnelwindow.cpp
similarity index 100%
rename from code/nel/samples/3d/qtnel/qnelwindow.cpp
rename to nel/samples/3d/qtnel/qnelwindow.cpp
diff --git a/code/nel/samples/3d/qtnel/qnelwindow.h b/nel/samples/3d/qtnel/qnelwindow.h
similarity index 100%
rename from code/nel/samples/3d/qtnel/qnelwindow.h
rename to nel/samples/3d/qtnel/qnelwindow.h
diff --git a/code/nel/samples/3d/shape_viewer/CMakeLists.txt b/nel/samples/3d/shape_viewer/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/3d/shape_viewer/CMakeLists.txt
rename to nel/samples/3d/shape_viewer/CMakeLists.txt
diff --git a/code/nel/samples/3d/shape_viewer/main.cpp b/nel/samples/3d/shape_viewer/main.cpp
similarity index 100%
rename from code/nel/samples/3d/shape_viewer/main.cpp
rename to nel/samples/3d/shape_viewer/main.cpp
diff --git a/code/nel/samples/CMakeLists.txt b/nel/samples/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/CMakeLists.txt
rename to nel/samples/CMakeLists.txt
diff --git a/code/nel/samples/georges/CMakeLists.txt b/nel/samples/georges/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/georges/CMakeLists.txt
rename to nel/samples/georges/CMakeLists.txt
diff --git a/code/nel/samples/georges/boolean.typ b/nel/samples/georges/boolean.typ
similarity index 100%
rename from code/nel/samples/georges/boolean.typ
rename to nel/samples/georges/boolean.typ
diff --git a/code/nel/samples/georges/coolfilesinfo.dfn b/nel/samples/georges/coolfilesinfo.dfn
similarity index 100%
rename from code/nel/samples/georges/coolfilesinfo.dfn
rename to nel/samples/georges/coolfilesinfo.dfn
diff --git a/code/nel/samples/georges/default.sample_config b/nel/samples/georges/default.sample_config
similarity index 100%
rename from code/nel/samples/georges/default.sample_config
rename to nel/samples/georges/default.sample_config
diff --git a/code/nel/samples/georges/int.typ b/nel/samples/georges/int.typ
similarity index 100%
rename from code/nel/samples/georges/int.typ
rename to nel/samples/georges/int.typ
diff --git a/code/nel/samples/georges/main.cpp b/nel/samples/georges/main.cpp
similarity index 100%
rename from code/nel/samples/georges/main.cpp
rename to nel/samples/georges/main.cpp
diff --git a/code/nel/samples/georges/positiondata.dfn b/nel/samples/georges/positiondata.dfn
similarity index 100%
rename from code/nel/samples/georges/positiondata.dfn
rename to nel/samples/georges/positiondata.dfn
diff --git a/code/nel/samples/georges/sample_config.dfn b/nel/samples/georges/sample_config.dfn
similarity index 100%
rename from code/nel/samples/georges/sample_config.dfn
rename to nel/samples/georges/sample_config.dfn
diff --git a/code/nel/samples/georges/sheet_id.bin b/nel/samples/georges/sheet_id.bin
similarity index 100%
rename from code/nel/samples/georges/sheet_id.bin
rename to nel/samples/georges/sheet_id.bin
diff --git a/code/nel/samples/georges/string.typ b/nel/samples/georges/string.typ
similarity index 100%
rename from code/nel/samples/georges/string.typ
rename to nel/samples/georges/string.typ
diff --git a/code/nel/samples/misc/CMakeLists.txt b/nel/samples/misc/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/CMakeLists.txt
rename to nel/samples/misc/CMakeLists.txt
diff --git a/code/nel/samples/misc/callback/CMakeLists.txt b/nel/samples/misc/callback/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/callback/CMakeLists.txt
rename to nel/samples/misc/callback/CMakeLists.txt
diff --git a/code/nel/samples/misc/callback/main.cpp b/nel/samples/misc/callback/main.cpp
similarity index 100%
rename from code/nel/samples/misc/callback/main.cpp
rename to nel/samples/misc/callback/main.cpp
diff --git a/code/nel/samples/misc/command/CMakeLists.txt b/nel/samples/misc/command/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/command/CMakeLists.txt
rename to nel/samples/misc/command/CMakeLists.txt
diff --git a/code/nel/samples/misc/command/main.cpp b/nel/samples/misc/command/main.cpp
similarity index 100%
rename from code/nel/samples/misc/command/main.cpp
rename to nel/samples/misc/command/main.cpp
diff --git a/code/nel/samples/misc/configfile/CMakeLists.txt b/nel/samples/misc/configfile/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/configfile/CMakeLists.txt
rename to nel/samples/misc/configfile/CMakeLists.txt
diff --git a/code/nel/samples/misc/configfile/main.cpp b/nel/samples/misc/configfile/main.cpp
similarity index 100%
rename from code/nel/samples/misc/configfile/main.cpp
rename to nel/samples/misc/configfile/main.cpp
diff --git a/code/nel/samples/misc/configfile/simpletest.txt b/nel/samples/misc/configfile/simpletest.txt
similarity index 100%
rename from code/nel/samples/misc/configfile/simpletest.txt
rename to nel/samples/misc/configfile/simpletest.txt
diff --git a/code/nel/samples/misc/debug/CMakeLists.txt b/nel/samples/misc/debug/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/debug/CMakeLists.txt
rename to nel/samples/misc/debug/CMakeLists.txt
diff --git a/code/nel/samples/misc/debug/main.cpp b/nel/samples/misc/debug/main.cpp
similarity index 100%
rename from code/nel/samples/misc/debug/main.cpp
rename to nel/samples/misc/debug/main.cpp
diff --git a/code/nel/samples/misc/i18n/CMakeLists.txt b/nel/samples/misc/i18n/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/i18n/CMakeLists.txt
rename to nel/samples/misc/i18n/CMakeLists.txt
diff --git a/code/nel/samples/misc/i18n/de.uxt b/nel/samples/misc/i18n/de.uxt
similarity index 100%
rename from code/nel/samples/misc/i18n/de.uxt
rename to nel/samples/misc/i18n/de.uxt
diff --git a/code/nel/samples/misc/i18n/en.uxt b/nel/samples/misc/i18n/en.uxt
similarity index 100%
rename from code/nel/samples/misc/i18n/en.uxt
rename to nel/samples/misc/i18n/en.uxt
diff --git a/code/nel/samples/misc/i18n/fr.uxt b/nel/samples/misc/i18n/fr.uxt
similarity index 100%
rename from code/nel/samples/misc/i18n/fr.uxt
rename to nel/samples/misc/i18n/fr.uxt
diff --git a/code/nel/samples/misc/i18n/main.cpp b/nel/samples/misc/i18n/main.cpp
similarity index 100%
rename from code/nel/samples/misc/i18n/main.cpp
rename to nel/samples/misc/i18n/main.cpp
diff --git a/code/nel/samples/misc/log/CMakeLists.txt b/nel/samples/misc/log/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/log/CMakeLists.txt
rename to nel/samples/misc/log/CMakeLists.txt
diff --git a/code/nel/samples/misc/log/main.cpp b/nel/samples/misc/log/main.cpp
similarity index 100%
rename from code/nel/samples/misc/log/main.cpp
rename to nel/samples/misc/log/main.cpp
diff --git a/code/nel/samples/misc/strings/CMakeLists.txt b/nel/samples/misc/strings/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/strings/CMakeLists.txt
rename to nel/samples/misc/strings/CMakeLists.txt
diff --git a/code/nel/samples/misc/strings/main.cpp b/nel/samples/misc/strings/main.cpp
similarity index 100%
rename from code/nel/samples/misc/strings/main.cpp
rename to nel/samples/misc/strings/main.cpp
diff --git a/code/nel/samples/misc/types_check/CMakeLists.txt b/nel/samples/misc/types_check/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/misc/types_check/CMakeLists.txt
rename to nel/samples/misc/types_check/CMakeLists.txt
diff --git a/code/nel/samples/misc/types_check/main.cpp b/nel/samples/misc/types_check/main.cpp
similarity index 100%
rename from code/nel/samples/misc/types_check/main.cpp
rename to nel/samples/misc/types_check/main.cpp
diff --git a/code/nel/samples/net/CMakeLists.txt b/nel/samples/net/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/net/CMakeLists.txt
rename to nel/samples/net/CMakeLists.txt
diff --git a/code/nel/samples/net/chat/CMakeLists.txt b/nel/samples/net/chat/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/net/chat/CMakeLists.txt
rename to nel/samples/net/chat/CMakeLists.txt
diff --git a/code/nel/samples/net/chat/chat_service.cfg b/nel/samples/net/chat/chat_service.cfg
similarity index 100%
rename from code/nel/samples/net/chat/chat_service.cfg
rename to nel/samples/net/chat/chat_service.cfg
diff --git a/code/nel/samples/net/chat/client.cfg b/nel/samples/net/chat/client.cfg
similarity index 100%
rename from code/nel/samples/net/chat/client.cfg
rename to nel/samples/net/chat/client.cfg
diff --git a/code/nel/samples/net/chat/client.cpp b/nel/samples/net/chat/client.cpp
similarity index 100%
rename from code/nel/samples/net/chat/client.cpp
rename to nel/samples/net/chat/client.cpp
diff --git a/code/nel/samples/net/chat/kbhit.cpp b/nel/samples/net/chat/kbhit.cpp
similarity index 100%
rename from code/nel/samples/net/chat/kbhit.cpp
rename to nel/samples/net/chat/kbhit.cpp
diff --git a/code/nel/samples/net/chat/kbhit.h b/nel/samples/net/chat/kbhit.h
similarity index 100%
rename from code/nel/samples/net/chat/kbhit.h
rename to nel/samples/net/chat/kbhit.h
diff --git a/code/nel/samples/net/chat/server.cpp b/nel/samples/net/chat/server.cpp
similarity index 100%
rename from code/nel/samples/net/chat/server.cpp
rename to nel/samples/net/chat/server.cpp
diff --git a/code/nel/samples/net/class_transport/CMakeLists.txt b/nel/samples/net/class_transport/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/net/class_transport/CMakeLists.txt
rename to nel/samples/net/class_transport/CMakeLists.txt
diff --git a/code/nel/samples/net/class_transport/ai_service.cfg b/nel/samples/net/class_transport/ai_service.cfg
similarity index 100%
rename from code/nel/samples/net/class_transport/ai_service.cfg
rename to nel/samples/net/class_transport/ai_service.cfg
diff --git a/code/nel/samples/net/class_transport/ai_service.cpp b/nel/samples/net/class_transport/ai_service.cpp
similarity index 100%
rename from code/nel/samples/net/class_transport/ai_service.cpp
rename to nel/samples/net/class_transport/ai_service.cpp
diff --git a/code/nel/samples/net/class_transport/gd_service.cfg b/nel/samples/net/class_transport/gd_service.cfg
similarity index 100%
rename from code/nel/samples/net/class_transport/gd_service.cfg
rename to nel/samples/net/class_transport/gd_service.cfg
diff --git a/code/nel/samples/net/class_transport/gd_service.cpp b/nel/samples/net/class_transport/gd_service.cpp
similarity index 100%
rename from code/nel/samples/net/class_transport/gd_service.cpp
rename to nel/samples/net/class_transport/gd_service.cpp
diff --git a/code/nel/samples/net/login_system/CMakeLists.txt b/nel/samples/net/login_system/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/net/login_system/CMakeLists.txt
rename to nel/samples/net/login_system/CMakeLists.txt
diff --git a/code/nel/samples/net/login_system/client.cfg b/nel/samples/net/login_system/client.cfg
similarity index 100%
rename from code/nel/samples/net/login_system/client.cfg
rename to nel/samples/net/login_system/client.cfg
diff --git a/code/nel/samples/net/login_system/client.cpp b/nel/samples/net/login_system/client.cpp
similarity index 100%
rename from code/nel/samples/net/login_system/client.cpp
rename to nel/samples/net/login_system/client.cpp
diff --git a/code/nel/samples/net/login_system/frontend_service.cfg b/nel/samples/net/login_system/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/login_system/frontend_service.cfg
rename to nel/samples/net/login_system/frontend_service.cfg
diff --git a/code/nel/samples/net/login_system/frontend_service.cpp b/nel/samples/net/login_system/frontend_service.cpp
similarity index 100%
rename from code/nel/samples/net/login_system/frontend_service.cpp
rename to nel/samples/net/login_system/frontend_service.cpp
diff --git a/code/nel/samples/net/multi_shards/client.cpp b/nel/samples/net/multi_shards/client.cpp
similarity index 100%
rename from code/nel/samples/net/multi_shards/client.cpp
rename to nel/samples/net/multi_shards/client.cpp
diff --git a/code/nel/samples/net/multi_shards/frontend_service.cpp b/nel/samples/net/multi_shards/frontend_service.cpp
similarity index 100%
rename from code/nel/samples/net/multi_shards/frontend_service.cpp
rename to nel/samples/net/multi_shards/frontend_service.cpp
diff --git a/code/nel/samples/net/multi_shards/shard_config/01_admin_executor_service.lnk b/nel/samples/net/multi_shards/shard_config/01_admin_executor_service.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/01_admin_executor_service.lnk
rename to nel/samples/net/multi_shards/shard_config/01_admin_executor_service.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/02_login_service.lnk b/nel/samples/net/multi_shards/shard_config/02_login_service.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/02_login_service.lnk
rename to nel/samples/net/multi_shards/shard_config/02_login_service.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/03_naming_service_shard1.lnk b/nel/samples/net/multi_shards/shard_config/03_naming_service_shard1.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/03_naming_service_shard1.lnk
rename to nel/samples/net/multi_shards/shard_config/03_naming_service_shard1.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/04_welcome_service_shard1.lnk b/nel/samples/net/multi_shards/shard_config/04_welcome_service_shard1.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/04_welcome_service_shard1.lnk
rename to nel/samples/net/multi_shards/shard_config/04_welcome_service_shard1.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/05_frontend_service_shard1.lnk b/nel/samples/net/multi_shards/shard_config/05_frontend_service_shard1.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/05_frontend_service_shard1.lnk
rename to nel/samples/net/multi_shards/shard_config/05_frontend_service_shard1.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/06_naming_service_shard2.lnk b/nel/samples/net/multi_shards/shard_config/06_naming_service_shard2.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/06_naming_service_shard2.lnk
rename to nel/samples/net/multi_shards/shard_config/06_naming_service_shard2.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/07_welcome_service_shard2.lnk b/nel/samples/net/multi_shards/shard_config/07_welcome_service_shard2.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/07_welcome_service_shard2.lnk
rename to nel/samples/net/multi_shards/shard_config/07_welcome_service_shard2.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/08_frontend_service_shard2.lnk b/nel/samples/net/multi_shards/shard_config/08_frontend_service_shard2.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/08_frontend_service_shard2.lnk
rename to nel/samples/net/multi_shards/shard_config/08_frontend_service_shard2.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/09_naming_service_shard3.lnk b/nel/samples/net/multi_shards/shard_config/09_naming_service_shard3.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/09_naming_service_shard3.lnk
rename to nel/samples/net/multi_shards/shard_config/09_naming_service_shard3.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/10_frontend_service_shard3.lnk b/nel/samples/net/multi_shards/shard_config/10_frontend_service_shard3.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/10_frontend_service_shard3.lnk
rename to nel/samples/net/multi_shards/shard_config/10_frontend_service_shard3.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/11_welcome_service_shard3.lnk b/nel/samples/net/multi_shards/shard_config/11_welcome_service_shard3.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/11_welcome_service_shard3.lnk
rename to nel/samples/net/multi_shards/shard_config/11_welcome_service_shard3.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/12_client.lnk b/nel/samples/net/multi_shards/shard_config/12_client.lnk
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/12_client.lnk
rename to nel/samples/net/multi_shards/shard_config/12_client.lnk
diff --git a/code/nel/samples/net/multi_shards/shard_config/admin_executor_service.cfg b/nel/samples/net/multi_shards/shard_config/admin_executor_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/admin_executor_service.cfg
rename to nel/samples/net/multi_shards/shard_config/admin_executor_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/client.cfg b/nel/samples/net/multi_shards/shard_config/client.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/client.cfg
rename to nel/samples/net/multi_shards/shard_config/client.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/login_service.cfg b/nel/samples/net/multi_shards/shard_config/login_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/login_service.cfg
rename to nel/samples/net/multi_shards/shard_config/login_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/login_service_database.cfg b/nel/samples/net/multi_shards/shard_config/login_service_database.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/login_service_database.cfg
rename to nel/samples/net/multi_shards/shard_config/login_service_database.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard1_config/frontend_service.cfg b/nel/samples/net/multi_shards/shard_config/shard1_config/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard1_config/frontend_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard1_config/frontend_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard1_config/naming_service.cfg b/nel/samples/net/multi_shards/shard_config/shard1_config/naming_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard1_config/naming_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard1_config/naming_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard1_config/welcome_service.cfg b/nel/samples/net/multi_shards/shard_config/shard1_config/welcome_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard1_config/welcome_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard1_config/welcome_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard2_config/frontend_service.cfg b/nel/samples/net/multi_shards/shard_config/shard2_config/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard2_config/frontend_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard2_config/frontend_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard2_config/naming_service.cfg b/nel/samples/net/multi_shards/shard_config/shard2_config/naming_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard2_config/naming_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard2_config/naming_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard2_config/welcome_service.cfg b/nel/samples/net/multi_shards/shard_config/shard2_config/welcome_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard2_config/welcome_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard2_config/welcome_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard3_config/frontend_service.cfg b/nel/samples/net/multi_shards/shard_config/shard3_config/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard3_config/frontend_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard3_config/frontend_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard3_config/naming_service.cfg b/nel/samples/net/multi_shards/shard_config/shard3_config/naming_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard3_config/naming_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard3_config/naming_service.cfg
diff --git a/code/nel/samples/net/multi_shards/shard_config/shard3_config/welcome_service.cfg b/nel/samples/net/multi_shards/shard_config/shard3_config/welcome_service.cfg
similarity index 100%
rename from code/nel/samples/net/multi_shards/shard_config/shard3_config/welcome_service.cfg
rename to nel/samples/net/multi_shards/shard_config/shard3_config/welcome_service.cfg
diff --git a/code/nel/samples/net/net_layer3/client.cpp b/nel/samples/net/net_layer3/client.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer3/client.cpp
rename to nel/samples/net/net_layer3/client.cpp
diff --git a/code/nel/samples/net/net_layer3/frontend_service.cfg b/nel/samples/net/net_layer3/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer3/frontend_service.cfg
rename to nel/samples/net/net_layer3/frontend_service.cfg
diff --git a/code/nel/samples/net/net_layer3/frontend_service.cpp b/nel/samples/net/net_layer3/frontend_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer3/frontend_service.cpp
rename to nel/samples/net/net_layer3/frontend_service.cpp
diff --git a/code/nel/samples/net/net_layer3/ping_service.cfg b/nel/samples/net/net_layer3/ping_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer3/ping_service.cfg
rename to nel/samples/net/net_layer3/ping_service.cfg
diff --git a/code/nel/samples/net/net_layer3/ping_service.cpp b/nel/samples/net/net_layer3/ping_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer3/ping_service.cpp
rename to nel/samples/net/net_layer3/ping_service.cpp
diff --git a/code/nel/samples/net/net_layer4/client.cpp b/nel/samples/net/net_layer4/client.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer4/client.cpp
rename to nel/samples/net/net_layer4/client.cpp
diff --git a/code/nel/samples/net/net_layer4/frontend_service.cfg b/nel/samples/net/net_layer4/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer4/frontend_service.cfg
rename to nel/samples/net/net_layer4/frontend_service.cfg
diff --git a/code/nel/samples/net/net_layer4/frontend_service.cpp b/nel/samples/net/net_layer4/frontend_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer4/frontend_service.cpp
rename to nel/samples/net/net_layer4/frontend_service.cpp
diff --git a/code/nel/samples/net/net_layer4/ping_service.cfg b/nel/samples/net/net_layer4/ping_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer4/ping_service.cfg
rename to nel/samples/net/net_layer4/ping_service.cfg
diff --git a/code/nel/samples/net/net_layer4/ping_service.cpp b/nel/samples/net/net_layer4/ping_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer4/ping_service.cpp
rename to nel/samples/net/net_layer4/ping_service.cpp
diff --git a/code/nel/samples/net/net_layer5/flood_service.cfg b/nel/samples/net/net_layer5/flood_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer5/flood_service.cfg
rename to nel/samples/net/net_layer5/flood_service.cfg
diff --git a/code/nel/samples/net/net_layer5/flood_service.cpp b/nel/samples/net/net_layer5/flood_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer5/flood_service.cpp
rename to nel/samples/net/net_layer5/flood_service.cpp
diff --git a/code/nel/samples/net/net_layer5/frontend_service.cfg b/nel/samples/net/net_layer5/frontend_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer5/frontend_service.cfg
rename to nel/samples/net/net_layer5/frontend_service.cfg
diff --git a/code/nel/samples/net/net_layer5/frontend_service.cpp b/nel/samples/net/net_layer5/frontend_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer5/frontend_service.cpp
rename to nel/samples/net/net_layer5/frontend_service.cpp
diff --git a/code/nel/samples/net/net_layer5/gpm_service.cfg b/nel/samples/net/net_layer5/gpm_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer5/gpm_service.cfg
rename to nel/samples/net/net_layer5/gpm_service.cfg
diff --git a/code/nel/samples/net/net_layer5/gpm_service.cpp b/nel/samples/net/net_layer5/gpm_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer5/gpm_service.cpp
rename to nel/samples/net/net_layer5/gpm_service.cpp
diff --git a/code/nel/samples/net/net_layer5/ping_service.cfg b/nel/samples/net/net_layer5/ping_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer5/ping_service.cfg
rename to nel/samples/net/net_layer5/ping_service.cfg
diff --git a/code/nel/samples/net/net_layer5/ping_service.cpp b/nel/samples/net/net_layer5/ping_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer5/ping_service.cpp
rename to nel/samples/net/net_layer5/ping_service.cpp
diff --git a/code/nel/samples/net/net_layer5/player_service.cfg b/nel/samples/net/net_layer5/player_service.cfg
similarity index 100%
rename from code/nel/samples/net/net_layer5/player_service.cfg
rename to nel/samples/net/net_layer5/player_service.cfg
diff --git a/code/nel/samples/net/net_layer5/player_service.cpp b/nel/samples/net/net_layer5/player_service.cpp
similarity index 100%
rename from code/nel/samples/net/net_layer5/player_service.cpp
rename to nel/samples/net/net_layer5/player_service.cpp
diff --git a/code/nel/samples/net/service/chat_service.cfg b/nel/samples/net/service/chat_service.cfg
similarity index 100%
rename from code/nel/samples/net/service/chat_service.cfg
rename to nel/samples/net/service/chat_service.cfg
diff --git a/code/nel/samples/net/service/chat_service.cpp b/nel/samples/net/service/chat_service.cpp
similarity index 100%
rename from code/nel/samples/net/service/chat_service.cpp
rename to nel/samples/net/service/chat_service.cpp
diff --git a/code/nel/samples/net/udp/CMakeLists.txt b/nel/samples/net/udp/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/net/udp/CMakeLists.txt
rename to nel/samples/net/udp/CMakeLists.txt
diff --git a/code/nel/samples/net/udp/bench_service.cfg b/nel/samples/net/udp/bench_service.cfg
similarity index 100%
rename from code/nel/samples/net/udp/bench_service.cfg
rename to nel/samples/net/udp/bench_service.cfg
diff --git a/code/nel/samples/net/udp/bench_service.cpp b/nel/samples/net/udp/bench_service.cpp
similarity index 100%
rename from code/nel/samples/net/udp/bench_service.cpp
rename to nel/samples/net/udp/bench_service.cpp
diff --git a/code/nel/samples/net/udp/client.cfg b/nel/samples/net/udp/client.cfg
similarity index 100%
rename from code/nel/samples/net/udp/client.cfg
rename to nel/samples/net/udp/client.cfg
diff --git a/code/nel/samples/net/udp/client.cpp b/nel/samples/net/udp/client.cpp
similarity index 100%
rename from code/nel/samples/net/udp/client.cpp
rename to nel/samples/net/udp/client.cpp
diff --git a/code/nel/samples/net/udp/graph.cpp b/nel/samples/net/udp/graph.cpp
similarity index 100%
rename from code/nel/samples/net/udp/graph.cpp
rename to nel/samples/net/udp/graph.cpp
diff --git a/code/nel/samples/net/udp/graph.h b/nel/samples/net/udp/graph.h
similarity index 100%
rename from code/nel/samples/net/udp/graph.h
rename to nel/samples/net/udp/graph.h
diff --git a/code/nel/samples/net/udp/n019003l.pfb b/nel/samples/net/udp/n019003l.pfb
similarity index 100%
rename from code/nel/samples/net/udp/n019003l.pfb
rename to nel/samples/net/udp/n019003l.pfb
diff --git a/code/nel/samples/net/udp/readme.txt b/nel/samples/net/udp/readme.txt
similarity index 100%
rename from code/nel/samples/net/udp/readme.txt
rename to nel/samples/net/udp/readme.txt
diff --git a/code/nel/samples/net/udp/receive_task.cpp b/nel/samples/net/udp/receive_task.cpp
similarity index 100%
rename from code/nel/samples/net/udp/receive_task.cpp
rename to nel/samples/net/udp/receive_task.cpp
diff --git a/code/nel/samples/net/udp/receive_task.h b/nel/samples/net/udp/receive_task.h
similarity index 100%
rename from code/nel/samples/net/udp/receive_task.h
rename to nel/samples/net/udp/receive_task.h
diff --git a/code/nel/samples/net/udp/simlag.cpp b/nel/samples/net/udp/simlag.cpp
similarity index 100%
rename from code/nel/samples/net/udp/simlag.cpp
rename to nel/samples/net/udp/simlag.cpp
diff --git a/code/nel/samples/net/udp/simlag.h b/nel/samples/net/udp/simlag.h
similarity index 100%
rename from code/nel/samples/net/udp/simlag.h
rename to nel/samples/net/udp/simlag.h
diff --git a/code/nel/samples/net/udp_ping/client.cpp b/nel/samples/net/udp_ping/client.cpp
similarity index 100%
rename from code/nel/samples/net/udp_ping/client.cpp
rename to nel/samples/net/udp_ping/client.cpp
diff --git a/code/nel/samples/net/udp_ping/udp_service.cfg b/nel/samples/net/udp_ping/udp_service.cfg
similarity index 100%
rename from code/nel/samples/net/udp_ping/udp_service.cfg
rename to nel/samples/net/udp_ping/udp_service.cfg
diff --git a/code/nel/samples/net/udp_ping/udp_service.cpp b/nel/samples/net/udp_ping/udp_service.cpp
similarity index 100%
rename from code/nel/samples/net/udp_ping/udp_service.cpp
rename to nel/samples/net/udp_ping/udp_service.cpp
diff --git a/code/nel/samples/pacs/CMakeLists.txt b/nel/samples/pacs/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/pacs/CMakeLists.txt
rename to nel/samples/pacs/CMakeLists.txt
diff --git a/code/nel/samples/pacs/main.cpp b/nel/samples/pacs/main.cpp
similarity index 100%
rename from code/nel/samples/pacs/main.cpp
rename to nel/samples/pacs/main.cpp
diff --git a/code/nel/samples/pacs/object.cpp b/nel/samples/pacs/object.cpp
similarity index 100%
rename from code/nel/samples/pacs/object.cpp
rename to nel/samples/pacs/object.cpp
diff --git a/code/nel/samples/pacs/object.h b/nel/samples/pacs/object.h
similarity index 100%
rename from code/nel/samples/pacs/object.h
rename to nel/samples/pacs/object.h
diff --git a/code/nel/samples/pacs/readme.txt b/nel/samples/pacs/readme.txt
similarity index 100%
rename from code/nel/samples/pacs/readme.txt
rename to nel/samples/pacs/readme.txt
diff --git a/code/nel/samples/pacs/shapes/arena.shape b/nel/samples/pacs/shapes/arena.shape
similarity index 100%
rename from code/nel/samples/pacs/shapes/arena.shape
rename to nel/samples/pacs/shapes/arena.shape
diff --git a/code/nel/samples/pacs/shapes/cylinder.shape b/nel/samples/pacs/shapes/cylinder.shape
similarity index 100%
rename from code/nel/samples/pacs/shapes/cylinder.shape
rename to nel/samples/pacs/shapes/cylinder.shape
diff --git a/code/nel/samples/pacs/shapes/rectangle.shape b/nel/samples/pacs/shapes/rectangle.shape
similarity index 100%
rename from code/nel/samples/pacs/shapes/rectangle.shape
rename to nel/samples/pacs/shapes/rectangle.shape
diff --git a/code/nel/samples/sound/CMakeLists.txt b/nel/samples/sound/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/sound/CMakeLists.txt
rename to nel/samples/sound/CMakeLists.txt
diff --git a/code/nel/samples/sound/sound_sources/CMakeLists.txt b/nel/samples/sound/sound_sources/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/sound/sound_sources/CMakeLists.txt
rename to nel/samples/sound/sound_sources/CMakeLists.txt
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/alpha.typ b/nel/samples/sound/sound_sources/data/DFN/alpha.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/alpha.typ
rename to nel/samples/sound/sound_sources/data/DFN/alpha.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/angle.typ b/nel/samples/sound/sound_sources/data/DFN/angle.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/angle.typ
rename to nel/samples/sound/sound_sources/data/DFN/angle.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn b/nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn
rename to nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn b/nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn
rename to nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/background_sound.dfn b/nel/samples/sound/sound_sources/data/DFN/background_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/background_sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/background_sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn b/nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn
rename to nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/_type.typ b/nel/samples/sound/sound_sources/data/DFN/basics/_type.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/_type.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/_type.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ b/nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/filename.typ b/nel/samples/sound/sound_sources/data/DFN/basics/filename.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/filename.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/filename.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/float.typ b/nel/samples/sound/sound_sources/data/DFN/basics/float.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/float.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/float.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ b/nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/int.typ b/nel/samples/sound/sound_sources/data/DFN/basics/int.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/int.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/int.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/string.typ b/nel/samples/sound/sound_sources/data/DFN/basics/string.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/string.typ
rename to nel/samples/sound/sound_sources/data/DFN/basics/string.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn b/nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn
rename to nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn b/nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/context_sound.dfn b/nel/samples/sound/sound_sources/data/DFN/context_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/context_sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/context_sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/direction.dfn b/nel/samples/sound/sound_sources/data/DFN/direction.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/direction.dfn
rename to nel/samples/sound/sound_sources/data/DFN/direction.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/distance.typ b/nel/samples/sound/sound_sources/data/DFN/distance.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/distance.typ
rename to nel/samples/sound/sound_sources/data/DFN/distance.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/doppler.typ b/nel/samples/sound/sound_sources/data/DFN/doppler.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/doppler.typ
rename to nel/samples/sound/sound_sources/data/DFN/doppler.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/gain.typ b/nel/samples/sound/sound_sources/data/DFN/gain.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/gain.typ
rename to nel/samples/sound/sound_sources/data/DFN/gain.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/listener.dfn b/nel/samples/sound/sound_sources/data/DFN/listener.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/listener.dfn
rename to nel/samples/sound/sound_sources/data/DFN/listener.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn b/nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn
rename to nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/music_sound.dfn b/nel/samples/sound/sound_sources/data/DFN/music_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/music_sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/music_sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/parameter_id.typ b/nel/samples/sound/sound_sources/data/DFN/parameter_id.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/parameter_id.typ
rename to nel/samples/sound/sound_sources/data/DFN/parameter_id.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ b/nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ
rename to nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/priority.typ b/nel/samples/sound/sound_sources/data/DFN/priority.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/priority.typ
rename to nel/samples/sound/sound_sources/data/DFN/priority.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/rolloff.typ b/nel/samples/sound/sound_sources/data/DFN/rolloff.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/rolloff.typ
rename to nel/samples/sound/sound_sources/data/DFN/rolloff.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn b/nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/sound.dfn b/nel/samples/sound/sound_sources/data/DFN/sound.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/sound.dfn
rename to nel/samples/sound/sound_sources/data/DFN/sound.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/sound_group.dfn b/nel/samples/sound/sound_sources/data/DFN/sound_group.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/sound_group.dfn
rename to nel/samples/sound/sound_sources/data/DFN/sound_group.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn b/nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn
rename to nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/soundbank.dfn b/nel/samples/sound/sound_sources/data/DFN/soundbank.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/soundbank.dfn
rename to nel/samples/sound/sound_sources/data/DFN/soundbank.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/transposition.typ b/nel/samples/sound/sound_sources/data/DFN/transposition.typ
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/transposition.typ
rename to nel/samples/sound/sound_sources/data/DFN/transposition.typ
diff --git a/code/nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn b/nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn
rename to nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn
diff --git a/code/nel/samples/sound/sound_sources/data/animations/readme.txt b/nel/samples/sound/sound_sources/data/animations/readme.txt
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/animations/readme.txt
rename to nel/samples/sound/sound_sources/data/animations/readme.txt
diff --git a/code/nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim b/nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim
rename to nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim
diff --git a/code/nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive b/nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive
rename to nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive
diff --git a/code/nel/samples/sound/sound_sources/data/background_sounds/readme.txt b/nel/samples/sound/sound_sources/data/background_sounds/readme.txt
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/background_sounds/readme.txt
rename to nel/samples/sound/sound_sources/data/background_sounds/readme.txt
diff --git a/code/nel/samples/sound/sound_sources/data/cluster_sound/readme.txt b/nel/samples/sound/sound_sources/data/cluster_sound/readme.txt
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/cluster_sound/readme.txt
rename to nel/samples/sound/sound_sources/data/cluster_sound/readme.txt
diff --git a/code/nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group b/nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group
rename to nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group
diff --git a/code/nel/samples/sound/sound_sources/data/default.mixer_config b/nel/samples/sound/sound_sources/data/default.mixer_config
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/default.mixer_config
rename to nel/samples/sound/sound_sources/data/default.mixer_config
diff --git a/code/nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav b/nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav
rename to nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav
diff --git a/code/nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav b/nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav
rename to nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav
diff --git a/code/nel/samples/sound/sound_sources/data/soundbank/beep.sound b/nel/samples/sound/sound_sources/data/soundbank/beep.sound
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/soundbank/beep.sound
rename to nel/samples/sound/sound_sources/data/soundbank/beep.sound
diff --git a/code/nel/samples/sound/sound_sources/data/soundbank/tuut.sound b/nel/samples/sound/sound_sources/data/soundbank/tuut.sound
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/soundbank/tuut.sound
rename to nel/samples/sound/sound_sources/data/soundbank/tuut.sound
diff --git a/code/nel/samples/sound/sound_sources/data/world_editor_classes.xml b/nel/samples/sound/sound_sources/data/world_editor_classes.xml
similarity index 100%
rename from code/nel/samples/sound/sound_sources/data/world_editor_classes.xml
rename to nel/samples/sound/sound_sources/data/world_editor_classes.xml
diff --git a/code/nel/samples/sound/sound_sources/main.cpp b/nel/samples/sound/sound_sources/main.cpp
similarity index 100%
rename from code/nel/samples/sound/sound_sources/main.cpp
rename to nel/samples/sound/sound_sources/main.cpp
diff --git a/code/nel/samples/sound/stream_file/CMakeLists.txt b/nel/samples/sound/stream_file/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/sound/stream_file/CMakeLists.txt
rename to nel/samples/sound/stream_file/CMakeLists.txt
diff --git a/code/nel/samples/sound/stream_file/base_samples.sample_bank b/nel/samples/sound/stream_file/base_samples.sample_bank
similarity index 100%
rename from code/nel/samples/sound/stream_file/base_samples.sample_bank
rename to nel/samples/sound/stream_file/base_samples.sample_bank
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn b/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn
rename to nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/_type.typ b/nel/samples/sound/stream_file/data/DFN/basics/_type.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/_type.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/_type.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ b/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/boolean.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/filename.typ b/nel/samples/sound/stream_file/data/DFN/basics/filename.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/filename.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/filename.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/float.typ b/nel/samples/sound/stream_file/data/DFN/basics/float.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/float.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/float.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ b/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/int.typ b/nel/samples/sound/stream_file/data/DFN/basics/int.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/int.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/int.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ b/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/sint16.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ b/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/sint32.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ b/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/sint64.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ b/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/sint8.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/string.typ b/nel/samples/sound/stream_file/data/DFN/basics/string.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/string.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/string.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn b/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn
rename to nel/samples/sound/stream_file/data/DFN/basics/typ.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ b/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/uint16.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ b/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/uint32.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ b/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/uint64.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ b/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ
rename to nel/samples/sound/stream_file/data/DFN/basics/uint8.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ b/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/alpha.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/angle.typ b/nel/samples/sound/stream_file/data/DFN/sound/angle.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/angle.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/angle.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn b/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn b/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn b/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/direction.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/distance.typ b/nel/samples/sound/stream_file/data/DFN/sound/distance.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/distance.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/distance.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ b/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/doppler.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/gain.typ b/nel/samples/sound/stream_file/data/DFN/sound/gain.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/gain.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/gain.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn b/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/listener.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn b/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ b/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ b/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/priority.typ b/nel/samples/sound/stream_file/data/DFN/sound/priority.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/priority.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/priority.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ b/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn b/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn b/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn b/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn b/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ b/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ
rename to nel/samples/sound/stream_file/data/DFN/sound/transposition.typ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn b/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn
rename to nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn
diff --git a/code/nel/samples/sound/stream_file/data/animations/readme.txt b/nel/samples/sound/stream_file/data/animations/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/animations/readme.txt
rename to nel/samples/sound/stream_file/data/animations/readme.txt
diff --git a/code/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim b/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim
rename to nel/samples/sound/stream_file/data/animations/test_anim.sound_anim
diff --git a/code/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive b/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive
rename to nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive
diff --git a/code/nel/samples/sound/stream_file/data/background_sounds/readme.txt b/nel/samples/sound/stream_file/data/background_sounds/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/background_sounds/readme.txt
rename to nel/samples/sound/stream_file/data/background_sounds/readme.txt
diff --git a/code/nel/samples/sound/stream_file/data/cluster_sound/readme.txt b/nel/samples/sound/stream_file/data/cluster_sound/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/cluster_sound/readme.txt
rename to nel/samples/sound/stream_file/data/cluster_sound/readme.txt
diff --git a/code/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group b/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group
rename to nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group
diff --git a/code/nel/samples/sound/stream_file/data/default.mixer_config b/nel/samples/sound/stream_file/data/default.mixer_config
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/default.mixer_config
rename to nel/samples/sound/stream_file/data/default.mixer_config
diff --git a/code/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav b/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav
rename to nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav
diff --git a/code/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav b/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav
rename to nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/beep.sound b/nel/samples/sound/stream_file/data/soundbank/beep.sound
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/soundbank/beep.sound
rename to nel/samples/sound/stream_file/data/soundbank/beep.sound
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/default_stream.sound b/nel/samples/sound/stream_file/data/soundbank/default_stream.sound
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/soundbank/default_stream.sound
rename to nel/samples/sound/stream_file/data/soundbank/default_stream.sound
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/stream_file.sound b/nel/samples/sound/stream_file/data/soundbank/stream_file.sound
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/soundbank/stream_file.sound
rename to nel/samples/sound/stream_file/data/soundbank/stream_file.sound
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/tuut.sound b/nel/samples/sound/stream_file/data/soundbank/tuut.sound
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/soundbank/tuut.sound
rename to nel/samples/sound/stream_file/data/soundbank/tuut.sound
diff --git a/code/nel/samples/sound/stream_file/data/world_editor_classes.xml b/nel/samples/sound/stream_file/data/world_editor_classes.xml
similarity index 100%
rename from code/nel/samples/sound/stream_file/data/world_editor_classes.xml
rename to nel/samples/sound/stream_file/data/world_editor_classes.xml
diff --git a/code/nel/samples/sound/stream_file/stream_file.cpp b/nel/samples/sound/stream_file/stream_file.cpp
similarity index 100%
rename from code/nel/samples/sound/stream_file/stream_file.cpp
rename to nel/samples/sound/stream_file/stream_file.cpp
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt b/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
rename to nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheet_id.bin b/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheet_id.bin
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheet_id.bin
rename to nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheet_id.bin
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheets.txt b/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheets.txt
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheets.txt
rename to nel/samples/sound/stream_ogg_vorbis/database/build/sheet_id/sheets.txt
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_samplebanks/base_samples.sample_bank b/nel/samples/sound/stream_ogg_vorbis/database/build/sound_samplebanks/base_samples.sample_bank
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_samplebanks/base_samples.sample_bank
rename to nel/samples/sound/stream_ogg_vorbis/database/build/sound_samplebanks/base_samples.sample_bank
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/sounds.packed_sheets b/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/sounds.packed_sheets
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/sounds.packed_sheets
rename to nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/sounds.packed_sheets
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/user_var_binding.packed_sheets b/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/user_var_binding.packed_sheets
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/user_var_binding.packed_sheets
rename to nel/samples/sound/stream_ogg_vorbis/database/build/sound_sheets/user_var_binding.packed_sheets
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_typ.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_typ.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_typ.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_typ.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_type.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_type.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_type.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/_type.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/boolean.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/boolean.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/boolean.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/boolean.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/filename.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/filename.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/filename.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/filename.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/float.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/float.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/float.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/float.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/iboolean.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/iboolean.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/iboolean.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/iboolean.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/int.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/int.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/int.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/int.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint16.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint16.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint16.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint16.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint32.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint32.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint32.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint32.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint64.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint64.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint64.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint64.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint8.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint8.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint8.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/sint8.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/string.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/string.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/string.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/string.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/typ.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/typ.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/typ.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/typ.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint16.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint16.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint16.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint16.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint32.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint32.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint32.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint32.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint64.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint64.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint64.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint64.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint8.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint8.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint8.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/basics/uint8.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/alpha.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/alpha.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/alpha.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/alpha.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/angle.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/angle.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/angle.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/angle.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/backgound_sound_item.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/backgound_sound_item.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/backgound_sound_item.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/backgound_sound_item.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_flag_config.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_flag_config.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_flag_config.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_flag_config.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/background_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/complex_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/complex_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/complex_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/complex_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/context_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/context_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/context_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/context_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/direction.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/direction.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/direction.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/direction.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/distance.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/distance.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/distance.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/distance.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/doppler.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/doppler.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/doppler.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/doppler.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/gain.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/gain.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/gain.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/gain.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/listener.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/listener.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/listener.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/listener.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/mixer_config.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/mixer_config.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/mixer_config.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/mixer_config.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/music_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/music_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/music_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/music_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/parameter_id.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/parameter_id.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/parameter_id.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/parameter_id.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/pattern_mode.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/pattern_mode.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/pattern_mode.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/pattern_mode.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/priority.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/priority.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/priority.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/priority.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/rolloff.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/rolloff.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/rolloff.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/rolloff.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/simple_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/simple_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/simple_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/simple_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group_item.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group_item.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group_item.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/sound_group_item.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/soundbank.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/soundbank.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/soundbank.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/soundbank.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/stream_sound.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/stream_sound.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/stream_sound.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/stream_sound.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/transposition.typ b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/transposition.typ
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/transposition.typ
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/transposition.typ
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/user_var_binding.dfn b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/user_var_binding.dfn
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/user_var_binding.dfn
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/dfn/sound/user_var_binding.dfn
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/animations/readme.txt b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/animations/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/animations/readme.txt
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/animations/readme.txt
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/background_sounds/readme.txt b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/background_sounds/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/background_sounds/readme.txt
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/background_sounds/readme.txt
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/cluster_sounds/readme.txt b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/cluster_sounds/readme.txt
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/cluster_sounds/readme.txt
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/cluster_sounds/readme.txt
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/default.mixer_config b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/default.mixer_config
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/default.mixer_config
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/default.mixer_config
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/beep.sound b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/beep.sound
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/beep.sound
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/beep.sound
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/default_stream.sound b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/default_stream.sound
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/default_stream.sound
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/default_stream.sound
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/tuut.sound b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/tuut.sound
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/tuut.sound
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/soundbanks/tuut.sound
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/test_var_binding.user_var_binding b/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/test_var_binding.user_var_binding
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/test_var_binding.user_var_binding
rename to nel/samples/sound/stream_ogg_vorbis/database/leveldesign/sound/test_var_binding.user_var_binding
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/beep.wav b/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/beep.wav
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/beep.wav
rename to nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/beep.wav
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/tuut.wav b/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/tuut.wav
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/tuut.wav
rename to nel/samples/sound/stream_ogg_vorbis/database/source/sound/samplebanks/base_samples/tuut.wav
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp b/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
similarity index 100%
rename from code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
rename to nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
diff --git a/code/nel/src/3d/CMakeLists.txt b/nel/src/3d/CMakeLists.txt
similarity index 100%
rename from code/nel/src/3d/CMakeLists.txt
rename to nel/src/3d/CMakeLists.txt
diff --git a/code/nel/src/3d/anim_detail_trav.cpp b/nel/src/3d/anim_detail_trav.cpp
similarity index 100%
rename from code/nel/src/3d/anim_detail_trav.cpp
rename to nel/src/3d/anim_detail_trav.cpp
diff --git a/code/nel/src/3d/animatable.cpp b/nel/src/3d/animatable.cpp
similarity index 100%
rename from code/nel/src/3d/animatable.cpp
rename to nel/src/3d/animatable.cpp
diff --git a/code/nel/src/3d/animated_lightmap.cpp b/nel/src/3d/animated_lightmap.cpp
similarity index 100%
rename from code/nel/src/3d/animated_lightmap.cpp
rename to nel/src/3d/animated_lightmap.cpp
diff --git a/code/nel/src/3d/animated_material.cpp b/nel/src/3d/animated_material.cpp
similarity index 100%
rename from code/nel/src/3d/animated_material.cpp
rename to nel/src/3d/animated_material.cpp
diff --git a/code/nel/src/3d/animated_morph.cpp b/nel/src/3d/animated_morph.cpp
similarity index 100%
rename from code/nel/src/3d/animated_morph.cpp
rename to nel/src/3d/animated_morph.cpp
diff --git a/code/nel/src/3d/animation.cpp b/nel/src/3d/animation.cpp
similarity index 100%
rename from code/nel/src/3d/animation.cpp
rename to nel/src/3d/animation.cpp
diff --git a/code/nel/src/3d/animation_optimizer.cpp b/nel/src/3d/animation_optimizer.cpp
similarity index 100%
rename from code/nel/src/3d/animation_optimizer.cpp
rename to nel/src/3d/animation_optimizer.cpp
diff --git a/code/nel/src/3d/animation_playlist.cpp b/nel/src/3d/animation_playlist.cpp
similarity index 100%
rename from code/nel/src/3d/animation_playlist.cpp
rename to nel/src/3d/animation_playlist.cpp
diff --git a/code/nel/src/3d/animation_set.cpp b/nel/src/3d/animation_set.cpp
similarity index 100%
rename from code/nel/src/3d/animation_set.cpp
rename to nel/src/3d/animation_set.cpp
diff --git a/code/nel/src/3d/animation_set_user.cpp b/nel/src/3d/animation_set_user.cpp
similarity index 100%
rename from code/nel/src/3d/animation_set_user.cpp
rename to nel/src/3d/animation_set_user.cpp
diff --git a/code/nel/src/3d/async_file_manager_3d.cpp b/nel/src/3d/async_file_manager_3d.cpp
similarity index 100%
rename from code/nel/src/3d/async_file_manager_3d.cpp
rename to nel/src/3d/async_file_manager_3d.cpp
diff --git a/code/nel/src/3d/async_texture_manager.cpp b/nel/src/3d/async_texture_manager.cpp
similarity index 100%
rename from code/nel/src/3d/async_texture_manager.cpp
rename to nel/src/3d/async_texture_manager.cpp
diff --git a/code/nel/src/3d/bezier_patch.cpp b/nel/src/3d/bezier_patch.cpp
similarity index 100%
rename from code/nel/src/3d/bezier_patch.cpp
rename to nel/src/3d/bezier_patch.cpp
diff --git a/code/nel/src/3d/bloom_effect.cpp b/nel/src/3d/bloom_effect.cpp
similarity index 100%
rename from code/nel/src/3d/bloom_effect.cpp
rename to nel/src/3d/bloom_effect.cpp
diff --git a/code/nel/src/3d/bone.cpp b/nel/src/3d/bone.cpp
similarity index 100%
rename from code/nel/src/3d/bone.cpp
rename to nel/src/3d/bone.cpp
diff --git a/code/nel/src/3d/camera.cpp b/nel/src/3d/camera.cpp
similarity index 100%
rename from code/nel/src/3d/camera.cpp
rename to nel/src/3d/camera.cpp
diff --git a/code/nel/src/3d/camera_col.cpp b/nel/src/3d/camera_col.cpp
similarity index 100%
rename from code/nel/src/3d/camera_col.cpp
rename to nel/src/3d/camera_col.cpp
diff --git a/code/nel/src/3d/channel_mixer.cpp b/nel/src/3d/channel_mixer.cpp
similarity index 100%
rename from code/nel/src/3d/channel_mixer.cpp
rename to nel/src/3d/channel_mixer.cpp
diff --git a/code/nel/src/3d/clip_trav.cpp b/nel/src/3d/clip_trav.cpp
similarity index 100%
rename from code/nel/src/3d/clip_trav.cpp
rename to nel/src/3d/clip_trav.cpp
diff --git a/code/nel/src/3d/cloud.cpp b/nel/src/3d/cloud.cpp
similarity index 100%
rename from code/nel/src/3d/cloud.cpp
rename to nel/src/3d/cloud.cpp
diff --git a/code/nel/src/3d/cloud_scape.cpp b/nel/src/3d/cloud_scape.cpp
similarity index 100%
rename from code/nel/src/3d/cloud_scape.cpp
rename to nel/src/3d/cloud_scape.cpp
diff --git a/code/nel/src/3d/cloud_scape_user.cpp b/nel/src/3d/cloud_scape_user.cpp
similarity index 100%
rename from code/nel/src/3d/cloud_scape_user.cpp
rename to nel/src/3d/cloud_scape_user.cpp
diff --git a/code/nel/src/3d/cluster.cpp b/nel/src/3d/cluster.cpp
similarity index 100%
rename from code/nel/src/3d/cluster.cpp
rename to nel/src/3d/cluster.cpp
diff --git a/code/nel/src/3d/coarse_mesh_build.cpp b/nel/src/3d/coarse_mesh_build.cpp
similarity index 100%
rename from code/nel/src/3d/coarse_mesh_build.cpp
rename to nel/src/3d/coarse_mesh_build.cpp
diff --git a/code/nel/src/3d/coarse_mesh_manager.cpp b/nel/src/3d/coarse_mesh_manager.cpp
similarity index 100%
rename from code/nel/src/3d/coarse_mesh_manager.cpp
rename to nel/src/3d/coarse_mesh_manager.cpp
diff --git a/code/nel/src/3d/computed_string.cpp b/nel/src/3d/computed_string.cpp
similarity index 100%
rename from code/nel/src/3d/computed_string.cpp
rename to nel/src/3d/computed_string.cpp
diff --git a/code/nel/src/3d/cube_map_builder.cpp b/nel/src/3d/cube_map_builder.cpp
similarity index 100%
rename from code/nel/src/3d/cube_map_builder.cpp
rename to nel/src/3d/cube_map_builder.cpp
diff --git a/code/nel/src/3d/debug_vb.cpp b/nel/src/3d/debug_vb.cpp
similarity index 100%
rename from code/nel/src/3d/debug_vb.cpp
rename to nel/src/3d/debug_vb.cpp
diff --git a/code/nel/src/3d/deform_2d.cpp b/nel/src/3d/deform_2d.cpp
similarity index 100%
rename from code/nel/src/3d/deform_2d.cpp
rename to nel/src/3d/deform_2d.cpp
diff --git a/code/nel/src/3d/driver.cpp b/nel/src/3d/driver.cpp
similarity index 100%
rename from code/nel/src/3d/driver.cpp
rename to nel/src/3d/driver.cpp
diff --git a/code/nel/src/3d/driver/CMakeLists.txt b/nel/src/3d/driver/CMakeLists.txt
similarity index 100%
rename from code/nel/src/3d/driver/CMakeLists.txt
rename to nel/src/3d/driver/CMakeLists.txt
diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/nel/src/3d/driver/direct3d/CMakeLists.txt
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/CMakeLists.txt
rename to nel/src/3d/driver/direct3d/CMakeLists.txt
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/nel/src/3d/driver/direct3d/driver_direct3d.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.def b/nel/src/3d/driver/direct3d/driver_direct3d.def
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d.def
rename to nel/src/3d/driver/direct3d/driver_direct3d.def
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/nel/src/3d/driver/direct3d/driver_direct3d.h
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d.h
rename to nel/src/3d/driver/direct3d/driver_direct3d.h
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_index.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_light.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_light.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_light.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_light.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_profile.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_profile.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_profile.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_profile.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_render.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_render.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_render.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_render.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_uniform.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_uniform.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_uniform.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_uniform.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp
rename to nel/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp
diff --git a/code/nel/src/3d/driver/direct3d/resources.rc b/nel/src/3d/driver/direct3d/resources.rc
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/resources.rc
rename to nel/src/3d/driver/direct3d/resources.rc
diff --git a/code/nel/src/3d/driver/direct3d/stddirect3d.cpp b/nel/src/3d/driver/direct3d/stddirect3d.cpp
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/stddirect3d.cpp
rename to nel/src/3d/driver/direct3d/stddirect3d.cpp
diff --git a/code/nel/src/3d/driver/direct3d/stddirect3d.h b/nel/src/3d/driver/direct3d/stddirect3d.h
similarity index 100%
rename from code/nel/src/3d/driver/direct3d/stddirect3d.h
rename to nel/src/3d/driver/direct3d/stddirect3d.h
diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/nel/src/3d/driver/opengl/CMakeLists.txt
similarity index 100%
rename from code/nel/src/3d/driver/opengl/CMakeLists.txt
rename to nel/src/3d/driver/opengl/CMakeLists.txt
diff --git a/code/nel/src/3d/driver/opengl/EGL/egl.h b/nel/src/3d/driver/opengl/EGL/egl.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/EGL/egl.h
rename to nel/src/3d/driver/opengl/EGL/egl.h
diff --git a/code/nel/src/3d/driver/opengl/EGL/eglext.h b/nel/src/3d/driver/opengl/EGL/eglext.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/EGL/eglext.h
rename to nel/src/3d/driver/opengl/EGL/eglext.h
diff --git a/code/nel/src/3d/driver/opengl/EGL/eglplatform.h b/nel/src/3d/driver/opengl/EGL/eglplatform.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/EGL/eglplatform.h
rename to nel/src/3d/driver/opengl/EGL/eglplatform.h
diff --git a/code/nel/src/3d/driver/opengl/GL/glext.h b/nel/src/3d/driver/opengl/GL/glext.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GL/glext.h
rename to nel/src/3d/driver/opengl/GL/glext.h
diff --git a/code/nel/src/3d/driver/opengl/GL/glxext.h b/nel/src/3d/driver/opengl/GL/glxext.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GL/glxext.h
rename to nel/src/3d/driver/opengl/GL/glxext.h
diff --git a/code/nel/src/3d/driver/opengl/GL/wglext.h b/nel/src/3d/driver/opengl/GL/wglext.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GL/wglext.h
rename to nel/src/3d/driver/opengl/GL/wglext.h
diff --git a/code/nel/src/3d/driver/opengl/GLES/egl.h b/nel/src/3d/driver/opengl/GLES/egl.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GLES/egl.h
rename to nel/src/3d/driver/opengl/GLES/egl.h
diff --git a/code/nel/src/3d/driver/opengl/GLES/gl.h b/nel/src/3d/driver/opengl/GLES/gl.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GLES/gl.h
rename to nel/src/3d/driver/opengl/GLES/gl.h
diff --git a/code/nel/src/3d/driver/opengl/GLES/glext.h b/nel/src/3d/driver/opengl/GLES/glext.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GLES/glext.h
rename to nel/src/3d/driver/opengl/GLES/glext.h
diff --git a/code/nel/src/3d/driver/opengl/GLES/glplatform.h b/nel/src/3d/driver/opengl/GLES/glplatform.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/GLES/glplatform.h
rename to nel/src/3d/driver/opengl/GLES/glplatform.h
diff --git a/code/nel/src/3d/driver/opengl/KHR/khrplatform.h b/nel/src/3d/driver/opengl/KHR/khrplatform.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/KHR/khrplatform.h
rename to nel/src/3d/driver/opengl/KHR/khrplatform.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/nel/src/3d/driver/opengl/driver_opengl.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl.cpp
rename to nel/src/3d/driver/opengl/driver_opengl.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.def b/nel/src/3d/driver/opengl/driver_opengl.def
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl.def
rename to nel/src/3d/driver/opengl/driver_opengl.def
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/nel/src/3d/driver/opengl/driver_opengl.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl.h
rename to nel/src/3d/driver/opengl/driver_opengl.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_extension.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/nel/src/3d/driver/opengl/driver_opengl_extension.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_extension.h
rename to nel/src/3d/driver/opengl/driver_opengl_extension.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h b/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
rename to nel/src/3d/driver/opengl/driver_opengl_extension_def.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp b/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp b/nel/src/3d/driver/opengl/driver_opengl_light.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_light.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/nel/src/3d/driver/opengl/driver_opengl_material.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_material.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp b/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp b/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/nel/src/3d/driver/opengl/driver_opengl_states.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_states.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.h b/nel/src/3d/driver/opengl/driver_opengl_states.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_states.h
rename to nel/src/3d/driver/opengl/driver_opengl_states.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_texture.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp b/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.h b/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.h
rename to nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.h
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
rename to nel/src/3d/driver/opengl/driver_opengl_window.cpp
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h b/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h
rename to nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.mm b/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.mm
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.mm
rename to nel/src/3d/driver/opengl/mac/cocoa_application_delegate.mm
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp b/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
rename to nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h b/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
rename to nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h b/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h
rename to nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm b/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm
rename to nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h b/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
rename to nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm b/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm
similarity index 100%
rename from code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm
rename to nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm
diff --git a/code/nel/src/3d/driver/opengl/nel-driverogl.pc b/nel/src/3d/driver/opengl/nel-driverogl.pc
similarity index 100%
rename from code/nel/src/3d/driver/opengl/nel-driverogl.pc
rename to nel/src/3d/driver/opengl/nel-driverogl.pc
diff --git a/code/nel/src/3d/driver/opengl/nel-driverogl.pc.in b/nel/src/3d/driver/opengl/nel-driverogl.pc.in
similarity index 100%
rename from code/nel/src/3d/driver/opengl/nel-driverogl.pc.in
rename to nel/src/3d/driver/opengl/nel-driverogl.pc.in
diff --git a/code/nel/src/3d/driver/opengl/resources.rc b/nel/src/3d/driver/opengl/resources.rc
similarity index 100%
rename from code/nel/src/3d/driver/opengl/resources.rc
rename to nel/src/3d/driver/opengl/resources.rc
diff --git a/code/nel/src/3d/driver/opengl/stdopengl.cpp b/nel/src/3d/driver/opengl/stdopengl.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/stdopengl.cpp
rename to nel/src/3d/driver/opengl/stdopengl.cpp
diff --git a/code/nel/src/3d/driver/opengl/stdopengl.h b/nel/src/3d/driver/opengl/stdopengl.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/stdopengl.h
rename to nel/src/3d/driver/opengl/stdopengl.h
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/nel/src/3d/driver/opengl/unix_event_emitter.cpp
similarity index 100%
rename from code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
rename to nel/src/3d/driver/opengl/unix_event_emitter.cpp
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/nel/src/3d/driver/opengl/unix_event_emitter.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/unix_event_emitter.h
rename to nel/src/3d/driver/opengl/unix_event_emitter.h
diff --git a/code/nel/src/3d/driver/opengles/CMakeLists.txt b/nel/src/3d/driver/opengles/CMakeLists.txt
similarity index 100%
rename from code/nel/src/3d/driver/opengles/CMakeLists.txt
rename to nel/src/3d/driver/opengles/CMakeLists.txt
diff --git a/code/nel/src/3d/driver/opengles/resources.rc b/nel/src/3d/driver/opengles/resources.rc
similarity index 100%
rename from code/nel/src/3d/driver/opengles/resources.rc
rename to nel/src/3d/driver/opengles/resources.rc
diff --git a/code/nel/src/3d/driver_user.cpp b/nel/src/3d/driver_user.cpp
similarity index 100%
rename from code/nel/src/3d/driver_user.cpp
rename to nel/src/3d/driver_user.cpp
diff --git a/code/nel/src/3d/driver_user2.cpp b/nel/src/3d/driver_user2.cpp
similarity index 100%
rename from code/nel/src/3d/driver_user2.cpp
rename to nel/src/3d/driver_user2.cpp
diff --git a/code/nel/src/3d/dru.cpp b/nel/src/3d/dru.cpp
similarity index 100%
rename from code/nel/src/3d/dru.cpp
rename to nel/src/3d/dru.cpp
diff --git a/code/nel/src/3d/event_mouse_listener.cpp b/nel/src/3d/event_mouse_listener.cpp
similarity index 100%
rename from code/nel/src/3d/event_mouse_listener.cpp
rename to nel/src/3d/event_mouse_listener.cpp
diff --git a/code/nel/src/3d/fast_ptr_list.cpp b/nel/src/3d/fast_ptr_list.cpp
similarity index 100%
rename from code/nel/src/3d/fast_ptr_list.cpp
rename to nel/src/3d/fast_ptr_list.cpp
diff --git a/code/nel/src/3d/fasthls_modifier.cpp b/nel/src/3d/fasthls_modifier.cpp
similarity index 100%
rename from code/nel/src/3d/fasthls_modifier.cpp
rename to nel/src/3d/fasthls_modifier.cpp
diff --git a/code/nel/src/3d/flare_model.cpp b/nel/src/3d/flare_model.cpp
similarity index 100%
rename from code/nel/src/3d/flare_model.cpp
rename to nel/src/3d/flare_model.cpp
diff --git a/code/nel/src/3d/flare_shape.cpp b/nel/src/3d/flare_shape.cpp
similarity index 100%
rename from code/nel/src/3d/flare_shape.cpp
rename to nel/src/3d/flare_shape.cpp
diff --git a/code/nel/src/3d/font_generator.cpp b/nel/src/3d/font_generator.cpp
similarity index 100%
rename from code/nel/src/3d/font_generator.cpp
rename to nel/src/3d/font_generator.cpp
diff --git a/code/nel/src/3d/font_manager.cpp b/nel/src/3d/font_manager.cpp
similarity index 100%
rename from code/nel/src/3d/font_manager.cpp
rename to nel/src/3d/font_manager.cpp
diff --git a/code/nel/src/3d/frustum.cpp b/nel/src/3d/frustum.cpp
similarity index 100%
rename from code/nel/src/3d/frustum.cpp
rename to nel/src/3d/frustum.cpp
diff --git a/code/nel/src/3d/fxaa.cpp b/nel/src/3d/fxaa.cpp
similarity index 100%
rename from code/nel/src/3d/fxaa.cpp
rename to nel/src/3d/fxaa.cpp
diff --git a/code/nel/src/3d/fxaa_program.h b/nel/src/3d/fxaa_program.h
similarity index 100%
rename from code/nel/src/3d/fxaa_program.h
rename to nel/src/3d/fxaa_program.h
diff --git a/code/nel/src/3d/geometry_program.cpp b/nel/src/3d/geometry_program.cpp
similarity index 100%
rename from code/nel/src/3d/geometry_program.cpp
rename to nel/src/3d/geometry_program.cpp
diff --git a/code/nel/src/3d/gpu_program_params.cpp b/nel/src/3d/gpu_program_params.cpp
similarity index 100%
rename from code/nel/src/3d/gpu_program_params.cpp
rename to nel/src/3d/gpu_program_params.cpp
diff --git a/code/nel/src/3d/heat_haze.cpp b/nel/src/3d/heat_haze.cpp
similarity index 100%
rename from code/nel/src/3d/heat_haze.cpp
rename to nel/src/3d/heat_haze.cpp
diff --git a/code/nel/src/3d/height_map.cpp b/nel/src/3d/height_map.cpp
similarity index 100%
rename from code/nel/src/3d/height_map.cpp
rename to nel/src/3d/height_map.cpp
diff --git a/code/nel/src/3d/hls_color_texture.cpp b/nel/src/3d/hls_color_texture.cpp
similarity index 100%
rename from code/nel/src/3d/hls_color_texture.cpp
rename to nel/src/3d/hls_color_texture.cpp
diff --git a/code/nel/src/3d/hls_texture_bank.cpp b/nel/src/3d/hls_texture_bank.cpp
similarity index 100%
rename from code/nel/src/3d/hls_texture_bank.cpp
rename to nel/src/3d/hls_texture_bank.cpp
diff --git a/code/nel/src/3d/hls_texture_manager.cpp b/nel/src/3d/hls_texture_manager.cpp
similarity index 100%
rename from code/nel/src/3d/hls_texture_manager.cpp
rename to nel/src/3d/hls_texture_manager.cpp
diff --git a/code/nel/src/3d/hrc_trav.cpp b/nel/src/3d/hrc_trav.cpp
similarity index 100%
rename from code/nel/src/3d/hrc_trav.cpp
rename to nel/src/3d/hrc_trav.cpp
diff --git a/code/nel/src/3d/ig_surface_light.cpp b/nel/src/3d/ig_surface_light.cpp
similarity index 100%
rename from code/nel/src/3d/ig_surface_light.cpp
rename to nel/src/3d/ig_surface_light.cpp
diff --git a/code/nel/src/3d/ig_surface_light_build.cpp b/nel/src/3d/ig_surface_light_build.cpp
similarity index 100%
rename from code/nel/src/3d/ig_surface_light_build.cpp
rename to nel/src/3d/ig_surface_light_build.cpp
diff --git a/code/nel/src/3d/index_buffer.cpp b/nel/src/3d/index_buffer.cpp
similarity index 100%
rename from code/nel/src/3d/index_buffer.cpp
rename to nel/src/3d/index_buffer.cpp
diff --git a/code/nel/src/3d/init_3d.cpp b/nel/src/3d/init_3d.cpp
similarity index 100%
rename from code/nel/src/3d/init_3d.cpp
rename to nel/src/3d/init_3d.cpp
diff --git a/code/nel/src/3d/instance_group_user.cpp b/nel/src/3d/instance_group_user.cpp
similarity index 100%
rename from code/nel/src/3d/instance_group_user.cpp
rename to nel/src/3d/instance_group_user.cpp
diff --git a/code/nel/src/3d/instance_lighter.cpp b/nel/src/3d/instance_lighter.cpp
similarity index 100%
rename from code/nel/src/3d/instance_lighter.cpp
rename to nel/src/3d/instance_lighter.cpp
diff --git a/code/nel/src/3d/key.cpp b/nel/src/3d/key.cpp
similarity index 100%
rename from code/nel/src/3d/key.cpp
rename to nel/src/3d/key.cpp
diff --git a/code/nel/src/3d/landscape.cpp b/nel/src/3d/landscape.cpp
similarity index 100%
rename from code/nel/src/3d/landscape.cpp
rename to nel/src/3d/landscape.cpp
diff --git a/code/nel/src/3d/landscape_collision_grid.cpp b/nel/src/3d/landscape_collision_grid.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_collision_grid.cpp
rename to nel/src/3d/landscape_collision_grid.cpp
diff --git a/code/nel/src/3d/landscape_def.cpp b/nel/src/3d/landscape_def.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_def.cpp
rename to nel/src/3d/landscape_def.cpp
diff --git a/code/nel/src/3d/landscape_face_vector_manager.cpp b/nel/src/3d/landscape_face_vector_manager.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_face_vector_manager.cpp
rename to nel/src/3d/landscape_face_vector_manager.cpp
diff --git a/code/nel/src/3d/landscape_model.cpp b/nel/src/3d/landscape_model.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_model.cpp
rename to nel/src/3d/landscape_model.cpp
diff --git a/code/nel/src/3d/landscape_profile.cpp b/nel/src/3d/landscape_profile.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_profile.cpp
rename to nel/src/3d/landscape_profile.cpp
diff --git a/code/nel/src/3d/landscape_user.cpp b/nel/src/3d/landscape_user.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_user.cpp
rename to nel/src/3d/landscape_user.cpp
diff --git a/code/nel/src/3d/landscape_vegetable_block.cpp b/nel/src/3d/landscape_vegetable_block.cpp
similarity index 100%
rename from code/nel/src/3d/landscape_vegetable_block.cpp
rename to nel/src/3d/landscape_vegetable_block.cpp
diff --git a/code/nel/src/3d/landscapeig_manager.cpp b/nel/src/3d/landscapeig_manager.cpp
similarity index 100%
rename from code/nel/src/3d/landscapeig_manager.cpp
rename to nel/src/3d/landscapeig_manager.cpp
diff --git a/code/nel/src/3d/landscapevb_allocator.cpp b/nel/src/3d/landscapevb_allocator.cpp
similarity index 100%
rename from code/nel/src/3d/landscapevb_allocator.cpp
rename to nel/src/3d/landscapevb_allocator.cpp
diff --git a/code/nel/src/3d/landscapevb_info.cpp b/nel/src/3d/landscapevb_info.cpp
similarity index 100%
rename from code/nel/src/3d/landscapevb_info.cpp
rename to nel/src/3d/landscapevb_info.cpp
diff --git a/code/nel/src/3d/light.cpp b/nel/src/3d/light.cpp
similarity index 100%
rename from code/nel/src/3d/light.cpp
rename to nel/src/3d/light.cpp
diff --git a/code/nel/src/3d/light_contribution.cpp b/nel/src/3d/light_contribution.cpp
similarity index 100%
rename from code/nel/src/3d/light_contribution.cpp
rename to nel/src/3d/light_contribution.cpp
diff --git a/code/nel/src/3d/light_influence_interpolator.cpp b/nel/src/3d/light_influence_interpolator.cpp
similarity index 100%
rename from code/nel/src/3d/light_influence_interpolator.cpp
rename to nel/src/3d/light_influence_interpolator.cpp
diff --git a/code/nel/src/3d/light_trav.cpp b/nel/src/3d/light_trav.cpp
similarity index 100%
rename from code/nel/src/3d/light_trav.cpp
rename to nel/src/3d/light_trav.cpp
diff --git a/code/nel/src/3d/light_user.cpp b/nel/src/3d/light_user.cpp
similarity index 100%
rename from code/nel/src/3d/light_user.cpp
rename to nel/src/3d/light_user.cpp
diff --git a/code/nel/src/3d/lighting_manager.cpp b/nel/src/3d/lighting_manager.cpp
similarity index 100%
rename from code/nel/src/3d/lighting_manager.cpp
rename to nel/src/3d/lighting_manager.cpp
diff --git a/code/nel/src/3d/load_balancing_trav.cpp b/nel/src/3d/load_balancing_trav.cpp
similarity index 100%
rename from code/nel/src/3d/load_balancing_trav.cpp
rename to nel/src/3d/load_balancing_trav.cpp
diff --git a/code/nel/src/3d/lod_character_builder.cpp b/nel/src/3d/lod_character_builder.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_builder.cpp
rename to nel/src/3d/lod_character_builder.cpp
diff --git a/code/nel/src/3d/lod_character_instance.cpp b/nel/src/3d/lod_character_instance.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_instance.cpp
rename to nel/src/3d/lod_character_instance.cpp
diff --git a/code/nel/src/3d/lod_character_manager.cpp b/nel/src/3d/lod_character_manager.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_manager.cpp
rename to nel/src/3d/lod_character_manager.cpp
diff --git a/code/nel/src/3d/lod_character_shape.cpp b/nel/src/3d/lod_character_shape.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_shape.cpp
rename to nel/src/3d/lod_character_shape.cpp
diff --git a/code/nel/src/3d/lod_character_shape_bank.cpp b/nel/src/3d/lod_character_shape_bank.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_shape_bank.cpp
rename to nel/src/3d/lod_character_shape_bank.cpp
diff --git a/code/nel/src/3d/lod_character_texture.cpp b/nel/src/3d/lod_character_texture.cpp
similarity index 100%
rename from code/nel/src/3d/lod_character_texture.cpp
rename to nel/src/3d/lod_character_texture.cpp
diff --git a/code/nel/src/3d/logic_info.cpp b/nel/src/3d/logic_info.cpp
similarity index 100%
rename from code/nel/src/3d/logic_info.cpp
rename to nel/src/3d/logic_info.cpp
diff --git a/code/nel/src/3d/material.cpp b/nel/src/3d/material.cpp
similarity index 100%
rename from code/nel/src/3d/material.cpp
rename to nel/src/3d/material.cpp
diff --git a/code/nel/src/3d/mesh.cpp b/nel/src/3d/mesh.cpp
similarity index 100%
rename from code/nel/src/3d/mesh.cpp
rename to nel/src/3d/mesh.cpp
diff --git a/code/nel/src/3d/mesh_base.cpp b/nel/src/3d/mesh_base.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_base.cpp
rename to nel/src/3d/mesh_base.cpp
diff --git a/code/nel/src/3d/mesh_base_instance.cpp b/nel/src/3d/mesh_base_instance.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_base_instance.cpp
rename to nel/src/3d/mesh_base_instance.cpp
diff --git a/code/nel/src/3d/mesh_blender.cpp b/nel/src/3d/mesh_blender.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_blender.cpp
rename to nel/src/3d/mesh_blender.cpp
diff --git a/code/nel/src/3d/mesh_block_manager.cpp b/nel/src/3d/mesh_block_manager.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_block_manager.cpp
rename to nel/src/3d/mesh_block_manager.cpp
diff --git a/code/nel/src/3d/mesh_geom.cpp b/nel/src/3d/mesh_geom.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_geom.cpp
rename to nel/src/3d/mesh_geom.cpp
diff --git a/code/nel/src/3d/mesh_instance.cpp b/nel/src/3d/mesh_instance.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_instance.cpp
rename to nel/src/3d/mesh_instance.cpp
diff --git a/code/nel/src/3d/mesh_morpher.cpp b/nel/src/3d/mesh_morpher.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_morpher.cpp
rename to nel/src/3d/mesh_morpher.cpp
diff --git a/code/nel/src/3d/mesh_mrm.cpp b/nel/src/3d/mesh_mrm.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm.cpp
rename to nel/src/3d/mesh_mrm.cpp
diff --git a/code/nel/src/3d/mesh_mrm_instance.cpp b/nel/src/3d/mesh_mrm_instance.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_instance.cpp
rename to nel/src/3d/mesh_mrm_instance.cpp
diff --git a/code/nel/src/3d/mesh_mrm_skin.cpp b/nel/src/3d/mesh_mrm_skin.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_skin.cpp
rename to nel/src/3d/mesh_mrm_skin.cpp
diff --git a/code/nel/src/3d/mesh_mrm_skin_template.cpp b/nel/src/3d/mesh_mrm_skin_template.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_skin_template.cpp
rename to nel/src/3d/mesh_mrm_skin_template.cpp
diff --git a/code/nel/src/3d/mesh_mrm_skinned.cpp b/nel/src/3d/mesh_mrm_skinned.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_skinned.cpp
rename to nel/src/3d/mesh_mrm_skinned.cpp
diff --git a/code/nel/src/3d/mesh_mrm_skinned_instance.cpp b/nel/src/3d/mesh_mrm_skinned_instance.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_skinned_instance.cpp
rename to nel/src/3d/mesh_mrm_skinned_instance.cpp
diff --git a/code/nel/src/3d/mesh_mrm_skinned_template.cpp b/nel/src/3d/mesh_mrm_skinned_template.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_mrm_skinned_template.cpp
rename to nel/src/3d/mesh_mrm_skinned_template.cpp
diff --git a/code/nel/src/3d/mesh_multi_lod.cpp b/nel/src/3d/mesh_multi_lod.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_multi_lod.cpp
rename to nel/src/3d/mesh_multi_lod.cpp
diff --git a/code/nel/src/3d/mesh_multi_lod_instance.cpp b/nel/src/3d/mesh_multi_lod_instance.cpp
similarity index 100%
rename from code/nel/src/3d/mesh_multi_lod_instance.cpp
rename to nel/src/3d/mesh_multi_lod_instance.cpp
diff --git a/code/nel/src/3d/meshvp_per_pixel_light.cpp b/nel/src/3d/meshvp_per_pixel_light.cpp
similarity index 100%
rename from code/nel/src/3d/meshvp_per_pixel_light.cpp
rename to nel/src/3d/meshvp_per_pixel_light.cpp
diff --git a/code/nel/src/3d/meshvp_wind_tree.cpp b/nel/src/3d/meshvp_wind_tree.cpp
similarity index 100%
rename from code/nel/src/3d/meshvp_wind_tree.cpp
rename to nel/src/3d/meshvp_wind_tree.cpp
diff --git a/code/nel/src/3d/mini_col.cpp b/nel/src/3d/mini_col.cpp
similarity index 100%
rename from code/nel/src/3d/mini_col.cpp
rename to nel/src/3d/mini_col.cpp
diff --git a/code/nel/src/3d/motion_blur.cpp b/nel/src/3d/motion_blur.cpp
similarity index 100%
rename from code/nel/src/3d/motion_blur.cpp
rename to nel/src/3d/motion_blur.cpp
diff --git a/code/nel/src/3d/mrm_builder.cpp b/nel/src/3d/mrm_builder.cpp
similarity index 100%
rename from code/nel/src/3d/mrm_builder.cpp
rename to nel/src/3d/mrm_builder.cpp
diff --git a/code/nel/src/3d/mrm_internal.cpp b/nel/src/3d/mrm_internal.cpp
similarity index 100%
rename from code/nel/src/3d/mrm_internal.cpp
rename to nel/src/3d/mrm_internal.cpp
diff --git a/code/nel/src/3d/mrm_level_detail.cpp b/nel/src/3d/mrm_level_detail.cpp
similarity index 100%
rename from code/nel/src/3d/mrm_level_detail.cpp
rename to nel/src/3d/mrm_level_detail.cpp
diff --git a/code/nel/src/3d/mrm_mesh.cpp b/nel/src/3d/mrm_mesh.cpp
similarity index 100%
rename from code/nel/src/3d/mrm_mesh.cpp
rename to nel/src/3d/mrm_mesh.cpp
diff --git a/code/nel/src/3d/nel-3d.pc b/nel/src/3d/nel-3d.pc
similarity index 100%
rename from code/nel/src/3d/nel-3d.pc
rename to nel/src/3d/nel-3d.pc
diff --git a/code/nel/src/3d/nel-3d.pc.in b/nel/src/3d/nel-3d.pc.in
similarity index 100%
rename from code/nel/src/3d/nel-3d.pc.in
rename to nel/src/3d/nel-3d.pc.in
diff --git a/code/nel/src/3d/nelu.cpp b/nel/src/3d/nelu.cpp
similarity index 100%
rename from code/nel/src/3d/nelu.cpp
rename to nel/src/3d/nelu.cpp
diff --git a/code/nel/src/3d/noise_3d.cpp b/nel/src/3d/noise_3d.cpp
similarity index 100%
rename from code/nel/src/3d/noise_3d.cpp
rename to nel/src/3d/noise_3d.cpp
diff --git a/code/nel/src/3d/packed_world.cpp b/nel/src/3d/packed_world.cpp
similarity index 100%
rename from code/nel/src/3d/packed_world.cpp
rename to nel/src/3d/packed_world.cpp
diff --git a/code/nel/src/3d/packed_zone.cpp b/nel/src/3d/packed_zone.cpp
similarity index 100%
rename from code/nel/src/3d/packed_zone.cpp
rename to nel/src/3d/packed_zone.cpp
diff --git a/code/nel/src/3d/particle_system.cpp b/nel/src/3d/particle_system.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system.cpp
rename to nel/src/3d/particle_system.cpp
diff --git a/code/nel/src/3d/particle_system_manager.cpp b/nel/src/3d/particle_system_manager.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system_manager.cpp
rename to nel/src/3d/particle_system_manager.cpp
diff --git a/code/nel/src/3d/particle_system_model.cpp b/nel/src/3d/particle_system_model.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system_model.cpp
rename to nel/src/3d/particle_system_model.cpp
diff --git a/code/nel/src/3d/particle_system_process.cpp b/nel/src/3d/particle_system_process.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system_process.cpp
rename to nel/src/3d/particle_system_process.cpp
diff --git a/code/nel/src/3d/particle_system_shape.cpp b/nel/src/3d/particle_system_shape.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system_shape.cpp
rename to nel/src/3d/particle_system_shape.cpp
diff --git a/code/nel/src/3d/particle_system_sound_user.cpp b/nel/src/3d/particle_system_sound_user.cpp
similarity index 100%
rename from code/nel/src/3d/particle_system_sound_user.cpp
rename to nel/src/3d/particle_system_sound_user.cpp
diff --git a/code/nel/src/3d/patch.cpp b/nel/src/3d/patch.cpp
similarity index 100%
rename from code/nel/src/3d/patch.cpp
rename to nel/src/3d/patch.cpp
diff --git a/code/nel/src/3d/patch_lightmap.cpp b/nel/src/3d/patch_lightmap.cpp
similarity index 100%
rename from code/nel/src/3d/patch_lightmap.cpp
rename to nel/src/3d/patch_lightmap.cpp
diff --git a/code/nel/src/3d/patch_noise.cpp b/nel/src/3d/patch_noise.cpp
similarity index 100%
rename from code/nel/src/3d/patch_noise.cpp
rename to nel/src/3d/patch_noise.cpp
diff --git a/code/nel/src/3d/patch_rdr_pass.cpp b/nel/src/3d/patch_rdr_pass.cpp
similarity index 100%
rename from code/nel/src/3d/patch_rdr_pass.cpp
rename to nel/src/3d/patch_rdr_pass.cpp
diff --git a/code/nel/src/3d/patch_render.cpp b/nel/src/3d/patch_render.cpp
similarity index 100%
rename from code/nel/src/3d/patch_render.cpp
rename to nel/src/3d/patch_render.cpp
diff --git a/code/nel/src/3d/patch_vegetable.cpp b/nel/src/3d/patch_vegetable.cpp
similarity index 100%
rename from code/nel/src/3d/patch_vegetable.cpp
rename to nel/src/3d/patch_vegetable.cpp
diff --git a/code/nel/src/3d/patchdlm_context.cpp b/nel/src/3d/patchdlm_context.cpp
similarity index 100%
rename from code/nel/src/3d/patchdlm_context.cpp
rename to nel/src/3d/patchdlm_context.cpp
diff --git a/code/nel/src/3d/patchuv_locator.cpp b/nel/src/3d/patchuv_locator.cpp
similarity index 100%
rename from code/nel/src/3d/patchuv_locator.cpp
rename to nel/src/3d/patchuv_locator.cpp
diff --git a/code/nel/src/3d/pixel_program.cpp b/nel/src/3d/pixel_program.cpp
similarity index 100%
rename from code/nel/src/3d/pixel_program.cpp
rename to nel/src/3d/pixel_program.cpp
diff --git a/code/nel/src/3d/play_list_manager.cpp b/nel/src/3d/play_list_manager.cpp
similarity index 100%
rename from code/nel/src/3d/play_list_manager.cpp
rename to nel/src/3d/play_list_manager.cpp
diff --git a/code/nel/src/3d/play_list_manager_user.cpp b/nel/src/3d/play_list_manager_user.cpp
similarity index 100%
rename from code/nel/src/3d/play_list_manager_user.cpp
rename to nel/src/3d/play_list_manager_user.cpp
diff --git a/code/nel/src/3d/play_list_user.cpp b/nel/src/3d/play_list_user.cpp
similarity index 100%
rename from code/nel/src/3d/play_list_user.cpp
rename to nel/src/3d/play_list_user.cpp
diff --git a/code/nel/src/3d/point_light.cpp b/nel/src/3d/point_light.cpp
similarity index 100%
rename from code/nel/src/3d/point_light.cpp
rename to nel/src/3d/point_light.cpp
diff --git a/code/nel/src/3d/point_light_model.cpp b/nel/src/3d/point_light_model.cpp
similarity index 100%
rename from code/nel/src/3d/point_light_model.cpp
rename to nel/src/3d/point_light_model.cpp
diff --git a/code/nel/src/3d/point_light_named.cpp b/nel/src/3d/point_light_named.cpp
similarity index 100%
rename from code/nel/src/3d/point_light_named.cpp
rename to nel/src/3d/point_light_named.cpp
diff --git a/code/nel/src/3d/point_light_named_array.cpp b/nel/src/3d/point_light_named_array.cpp
similarity index 100%
rename from code/nel/src/3d/point_light_named_array.cpp
rename to nel/src/3d/point_light_named_array.cpp
diff --git a/code/nel/src/3d/portal.cpp b/nel/src/3d/portal.cpp
similarity index 100%
rename from code/nel/src/3d/portal.cpp
rename to nel/src/3d/portal.cpp
diff --git a/code/nel/src/3d/primitive_profile.cpp b/nel/src/3d/primitive_profile.cpp
similarity index 100%
rename from code/nel/src/3d/primitive_profile.cpp
rename to nel/src/3d/primitive_profile.cpp
diff --git a/code/nel/src/3d/program.cpp b/nel/src/3d/program.cpp
similarity index 100%
rename from code/nel/src/3d/program.cpp
rename to nel/src/3d/program.cpp
diff --git a/code/nel/src/3d/ps_allocator.cpp b/nel/src/3d/ps_allocator.cpp
similarity index 100%
rename from code/nel/src/3d/ps_allocator.cpp
rename to nel/src/3d/ps_allocator.cpp
diff --git a/code/nel/src/3d/ps_attrib_maker_bin_op.cpp b/nel/src/3d/ps_attrib_maker_bin_op.cpp
similarity index 100%
rename from code/nel/src/3d/ps_attrib_maker_bin_op.cpp
rename to nel/src/3d/ps_attrib_maker_bin_op.cpp
diff --git a/code/nel/src/3d/ps_attrib_maker_helper.cpp b/nel/src/3d/ps_attrib_maker_helper.cpp
similarity index 100%
rename from code/nel/src/3d/ps_attrib_maker_helper.cpp
rename to nel/src/3d/ps_attrib_maker_helper.cpp
diff --git a/code/nel/src/3d/ps_attrib_maker_template.cpp b/nel/src/3d/ps_attrib_maker_template.cpp
similarity index 100%
rename from code/nel/src/3d/ps_attrib_maker_template.cpp
rename to nel/src/3d/ps_attrib_maker_template.cpp
diff --git a/code/nel/src/3d/ps_color.cpp b/nel/src/3d/ps_color.cpp
similarity index 100%
rename from code/nel/src/3d/ps_color.cpp
rename to nel/src/3d/ps_color.cpp
diff --git a/code/nel/src/3d/ps_dot.cpp b/nel/src/3d/ps_dot.cpp
similarity index 100%
rename from code/nel/src/3d/ps_dot.cpp
rename to nel/src/3d/ps_dot.cpp
diff --git a/code/nel/src/3d/ps_emitter.cpp b/nel/src/3d/ps_emitter.cpp
similarity index 100%
rename from code/nel/src/3d/ps_emitter.cpp
rename to nel/src/3d/ps_emitter.cpp
diff --git a/code/nel/src/3d/ps_face.cpp b/nel/src/3d/ps_face.cpp
similarity index 100%
rename from code/nel/src/3d/ps_face.cpp
rename to nel/src/3d/ps_face.cpp
diff --git a/code/nel/src/3d/ps_face_look_at.cpp b/nel/src/3d/ps_face_look_at.cpp
similarity index 100%
rename from code/nel/src/3d/ps_face_look_at.cpp
rename to nel/src/3d/ps_face_look_at.cpp
diff --git a/code/nel/src/3d/ps_fan_light.cpp b/nel/src/3d/ps_fan_light.cpp
similarity index 100%
rename from code/nel/src/3d/ps_fan_light.cpp
rename to nel/src/3d/ps_fan_light.cpp
diff --git a/code/nel/src/3d/ps_float.cpp b/nel/src/3d/ps_float.cpp
similarity index 100%
rename from code/nel/src/3d/ps_float.cpp
rename to nel/src/3d/ps_float.cpp
diff --git a/code/nel/src/3d/ps_force.cpp b/nel/src/3d/ps_force.cpp
similarity index 100%
rename from code/nel/src/3d/ps_force.cpp
rename to nel/src/3d/ps_force.cpp
diff --git a/code/nel/src/3d/ps_int.cpp b/nel/src/3d/ps_int.cpp
similarity index 100%
rename from code/nel/src/3d/ps_int.cpp
rename to nel/src/3d/ps_int.cpp
diff --git a/code/nel/src/3d/ps_light.cpp b/nel/src/3d/ps_light.cpp
similarity index 100%
rename from code/nel/src/3d/ps_light.cpp
rename to nel/src/3d/ps_light.cpp
diff --git a/code/nel/src/3d/ps_located.cpp b/nel/src/3d/ps_located.cpp
similarity index 100%
rename from code/nel/src/3d/ps_located.cpp
rename to nel/src/3d/ps_located.cpp
diff --git a/code/nel/src/3d/ps_mesh.cpp b/nel/src/3d/ps_mesh.cpp
similarity index 100%
rename from code/nel/src/3d/ps_mesh.cpp
rename to nel/src/3d/ps_mesh.cpp
diff --git a/code/nel/src/3d/ps_particle_basic.cpp b/nel/src/3d/ps_particle_basic.cpp
similarity index 100%
rename from code/nel/src/3d/ps_particle_basic.cpp
rename to nel/src/3d/ps_particle_basic.cpp
diff --git a/code/nel/src/3d/ps_plane_basis_maker.cpp b/nel/src/3d/ps_plane_basis_maker.cpp
similarity index 100%
rename from code/nel/src/3d/ps_plane_basis_maker.cpp
rename to nel/src/3d/ps_plane_basis_maker.cpp
diff --git a/code/nel/src/3d/ps_quad.cpp b/nel/src/3d/ps_quad.cpp
similarity index 100%
rename from code/nel/src/3d/ps_quad.cpp
rename to nel/src/3d/ps_quad.cpp
diff --git a/code/nel/src/3d/ps_register_attribs.cpp b/nel/src/3d/ps_register_attribs.cpp
similarity index 100%
rename from code/nel/src/3d/ps_register_attribs.cpp
rename to nel/src/3d/ps_register_attribs.cpp
diff --git a/code/nel/src/3d/ps_register_emitters.cpp b/nel/src/3d/ps_register_emitters.cpp
similarity index 100%
rename from code/nel/src/3d/ps_register_emitters.cpp
rename to nel/src/3d/ps_register_emitters.cpp
diff --git a/code/nel/src/3d/ps_register_forces.cpp b/nel/src/3d/ps_register_forces.cpp
similarity index 100%
rename from code/nel/src/3d/ps_register_forces.cpp
rename to nel/src/3d/ps_register_forces.cpp
diff --git a/code/nel/src/3d/ps_register_particles.cpp b/nel/src/3d/ps_register_particles.cpp
similarity index 100%
rename from code/nel/src/3d/ps_register_particles.cpp
rename to nel/src/3d/ps_register_particles.cpp
diff --git a/code/nel/src/3d/ps_register_zones.cpp b/nel/src/3d/ps_register_zones.cpp
similarity index 100%
rename from code/nel/src/3d/ps_register_zones.cpp
rename to nel/src/3d/ps_register_zones.cpp
diff --git a/code/nel/src/3d/ps_ribbon.cpp b/nel/src/3d/ps_ribbon.cpp
similarity index 100%
rename from code/nel/src/3d/ps_ribbon.cpp
rename to nel/src/3d/ps_ribbon.cpp
diff --git a/code/nel/src/3d/ps_ribbon_base.cpp b/nel/src/3d/ps_ribbon_base.cpp
similarity index 100%
rename from code/nel/src/3d/ps_ribbon_base.cpp
rename to nel/src/3d/ps_ribbon_base.cpp
diff --git a/code/nel/src/3d/ps_ribbon_look_at.cpp b/nel/src/3d/ps_ribbon_look_at.cpp
similarity index 100%
rename from code/nel/src/3d/ps_ribbon_look_at.cpp
rename to nel/src/3d/ps_ribbon_look_at.cpp
diff --git a/code/nel/src/3d/ps_shockwave.cpp b/nel/src/3d/ps_shockwave.cpp
similarity index 100%
rename from code/nel/src/3d/ps_shockwave.cpp
rename to nel/src/3d/ps_shockwave.cpp
diff --git a/code/nel/src/3d/ps_sound.cpp b/nel/src/3d/ps_sound.cpp
similarity index 100%
rename from code/nel/src/3d/ps_sound.cpp
rename to nel/src/3d/ps_sound.cpp
diff --git a/code/nel/src/3d/ps_tail_dot.cpp b/nel/src/3d/ps_tail_dot.cpp
similarity index 100%
rename from code/nel/src/3d/ps_tail_dot.cpp
rename to nel/src/3d/ps_tail_dot.cpp
diff --git a/code/nel/src/3d/ps_util.cpp b/nel/src/3d/ps_util.cpp
similarity index 100%
rename from code/nel/src/3d/ps_util.cpp
rename to nel/src/3d/ps_util.cpp
diff --git a/code/nel/src/3d/ps_zone.cpp b/nel/src/3d/ps_zone.cpp
similarity index 100%
rename from code/nel/src/3d/ps_zone.cpp
rename to nel/src/3d/ps_zone.cpp
diff --git a/code/nel/src/3d/quad_effect.cpp b/nel/src/3d/quad_effect.cpp
similarity index 100%
rename from code/nel/src/3d/quad_effect.cpp
rename to nel/src/3d/quad_effect.cpp
diff --git a/code/nel/src/3d/quad_grid.cpp b/nel/src/3d/quad_grid.cpp
similarity index 100%
rename from code/nel/src/3d/quad_grid.cpp
rename to nel/src/3d/quad_grid.cpp
diff --git a/code/nel/src/3d/quad_grid_clip_cluster.cpp b/nel/src/3d/quad_grid_clip_cluster.cpp
similarity index 100%
rename from code/nel/src/3d/quad_grid_clip_cluster.cpp
rename to nel/src/3d/quad_grid_clip_cluster.cpp
diff --git a/code/nel/src/3d/quad_grid_clip_manager.cpp b/nel/src/3d/quad_grid_clip_manager.cpp
similarity index 100%
rename from code/nel/src/3d/quad_grid_clip_manager.cpp
rename to nel/src/3d/quad_grid_clip_manager.cpp
diff --git a/code/nel/src/3d/raw_skin.cpp b/nel/src/3d/raw_skin.cpp
similarity index 100%
rename from code/nel/src/3d/raw_skin.cpp
rename to nel/src/3d/raw_skin.cpp
diff --git a/code/nel/src/3d/raw_skinned.cpp b/nel/src/3d/raw_skinned.cpp
similarity index 100%
rename from code/nel/src/3d/raw_skinned.cpp
rename to nel/src/3d/raw_skinned.cpp
diff --git a/code/nel/src/3d/ray_mesh.cpp b/nel/src/3d/ray_mesh.cpp
similarity index 100%
rename from code/nel/src/3d/ray_mesh.cpp
rename to nel/src/3d/ray_mesh.cpp
diff --git a/code/nel/src/3d/register_3d.cpp b/nel/src/3d/register_3d.cpp
similarity index 100%
rename from code/nel/src/3d/register_3d.cpp
rename to nel/src/3d/register_3d.cpp
diff --git a/code/nel/src/3d/render_target_manager.cpp b/nel/src/3d/render_target_manager.cpp
similarity index 100%
rename from code/nel/src/3d/render_target_manager.cpp
rename to nel/src/3d/render_target_manager.cpp
diff --git a/code/nel/src/3d/render_trav.cpp b/nel/src/3d/render_trav.cpp
similarity index 100%
rename from code/nel/src/3d/render_trav.cpp
rename to nel/src/3d/render_trav.cpp
diff --git a/code/nel/src/3d/root_model.cpp b/nel/src/3d/root_model.cpp
similarity index 100%
rename from code/nel/src/3d/root_model.cpp
rename to nel/src/3d/root_model.cpp
diff --git a/code/nel/src/3d/scene.cpp b/nel/src/3d/scene.cpp
similarity index 100%
rename from code/nel/src/3d/scene.cpp
rename to nel/src/3d/scene.cpp
diff --git a/code/nel/src/3d/scene_group.cpp b/nel/src/3d/scene_group.cpp
similarity index 100%
rename from code/nel/src/3d/scene_group.cpp
rename to nel/src/3d/scene_group.cpp
diff --git a/code/nel/src/3d/scene_user.cpp b/nel/src/3d/scene_user.cpp
similarity index 100%
rename from code/nel/src/3d/scene_user.cpp
rename to nel/src/3d/scene_user.cpp
diff --git a/code/nel/src/3d/seg_remanence.cpp b/nel/src/3d/seg_remanence.cpp
similarity index 100%
rename from code/nel/src/3d/seg_remanence.cpp
rename to nel/src/3d/seg_remanence.cpp
diff --git a/code/nel/src/3d/seg_remanence_shape.cpp b/nel/src/3d/seg_remanence_shape.cpp
similarity index 100%
rename from code/nel/src/3d/seg_remanence_shape.cpp
rename to nel/src/3d/seg_remanence_shape.cpp
diff --git a/code/nel/src/3d/shaders/compile.bat b/nel/src/3d/shaders/compile.bat
similarity index 100%
rename from code/nel/src/3d/shaders/compile.bat
rename to nel/src/3d/shaders/compile.bat
diff --git a/code/nel/src/3d/shaders/fxaa3_11.h b/nel/src/3d/shaders/fxaa3_11.h
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa3_11.h
rename to nel/src/3d/shaders/fxaa3_11.h
diff --git a/code/nel/src/3d/shaders/fxaa_pp.cg b/nel/src/3d/shaders/fxaa_pp.cg
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa_pp.cg
rename to nel/src/3d/shaders/fxaa_pp.cg
diff --git a/code/nel/src/3d/shaders/fxaa_pp_arbfp1.txt b/nel/src/3d/shaders/fxaa_pp_arbfp1.txt
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa_pp_arbfp1.txt
rename to nel/src/3d/shaders/fxaa_pp_arbfp1.txt
diff --git a/code/nel/src/3d/shaders/fxaa_pp_ps_2_0.txt b/nel/src/3d/shaders/fxaa_pp_ps_2_0.txt
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa_pp_ps_2_0.txt
rename to nel/src/3d/shaders/fxaa_pp_ps_2_0.txt
diff --git a/code/nel/src/3d/shaders/fxaa_vp.cg b/nel/src/3d/shaders/fxaa_vp.cg
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa_vp.cg
rename to nel/src/3d/shaders/fxaa_vp.cg
diff --git a/code/nel/src/3d/shaders/fxaa_vp_arbvp1.txt b/nel/src/3d/shaders/fxaa_vp_arbvp1.txt
similarity index 100%
rename from code/nel/src/3d/shaders/fxaa_vp_arbvp1.txt
rename to nel/src/3d/shaders/fxaa_vp_arbvp1.txt
diff --git a/code/nel/src/3d/shaders/readme.txt b/nel/src/3d/shaders/readme.txt
similarity index 100%
rename from code/nel/src/3d/shaders/readme.txt
rename to nel/src/3d/shaders/readme.txt
diff --git a/code/nel/src/3d/shadow_map.cpp b/nel/src/3d/shadow_map.cpp
similarity index 100%
rename from code/nel/src/3d/shadow_map.cpp
rename to nel/src/3d/shadow_map.cpp
diff --git a/code/nel/src/3d/shadow_map_manager.cpp b/nel/src/3d/shadow_map_manager.cpp
similarity index 100%
rename from code/nel/src/3d/shadow_map_manager.cpp
rename to nel/src/3d/shadow_map_manager.cpp
diff --git a/code/nel/src/3d/shadow_poly_receiver.cpp b/nel/src/3d/shadow_poly_receiver.cpp
similarity index 100%
rename from code/nel/src/3d/shadow_poly_receiver.cpp
rename to nel/src/3d/shadow_poly_receiver.cpp
diff --git a/code/nel/src/3d/shadow_skin.cpp b/nel/src/3d/shadow_skin.cpp
similarity index 100%
rename from code/nel/src/3d/shadow_skin.cpp
rename to nel/src/3d/shadow_skin.cpp
diff --git a/code/nel/src/3d/shape.cpp b/nel/src/3d/shape.cpp
similarity index 100%
rename from code/nel/src/3d/shape.cpp
rename to nel/src/3d/shape.cpp
diff --git a/code/nel/src/3d/shape_bank.cpp b/nel/src/3d/shape_bank.cpp
similarity index 100%
rename from code/nel/src/3d/shape_bank.cpp
rename to nel/src/3d/shape_bank.cpp
diff --git a/code/nel/src/3d/shape_bank_user.cpp b/nel/src/3d/shape_bank_user.cpp
similarity index 100%
rename from code/nel/src/3d/shape_bank_user.cpp
rename to nel/src/3d/shape_bank_user.cpp
diff --git a/code/nel/src/3d/shape_info.cpp b/nel/src/3d/shape_info.cpp
similarity index 100%
rename from code/nel/src/3d/shape_info.cpp
rename to nel/src/3d/shape_info.cpp
diff --git a/code/nel/src/3d/shifted_triangle_cache.cpp b/nel/src/3d/shifted_triangle_cache.cpp
similarity index 100%
rename from code/nel/src/3d/shifted_triangle_cache.cpp
rename to nel/src/3d/shifted_triangle_cache.cpp
diff --git a/code/nel/src/3d/skeleton_model.cpp b/nel/src/3d/skeleton_model.cpp
similarity index 100%
rename from code/nel/src/3d/skeleton_model.cpp
rename to nel/src/3d/skeleton_model.cpp
diff --git a/code/nel/src/3d/skeleton_shape.cpp b/nel/src/3d/skeleton_shape.cpp
similarity index 100%
rename from code/nel/src/3d/skeleton_shape.cpp
rename to nel/src/3d/skeleton_shape.cpp
diff --git a/code/nel/src/3d/skeleton_spawn_script.cpp b/nel/src/3d/skeleton_spawn_script.cpp
similarity index 100%
rename from code/nel/src/3d/skeleton_spawn_script.cpp
rename to nel/src/3d/skeleton_spawn_script.cpp
diff --git a/code/nel/src/3d/skeleton_weight.cpp b/nel/src/3d/skeleton_weight.cpp
similarity index 100%
rename from code/nel/src/3d/skeleton_weight.cpp
rename to nel/src/3d/skeleton_weight.cpp
diff --git a/code/nel/src/3d/std3d.cpp b/nel/src/3d/std3d.cpp
similarity index 100%
rename from code/nel/src/3d/std3d.cpp
rename to nel/src/3d/std3d.cpp
diff --git a/code/nel/src/3d/std3d.h b/nel/src/3d/std3d.h
similarity index 100%
rename from code/nel/src/3d/std3d.h
rename to nel/src/3d/std3d.h
diff --git a/code/nel/src/3d/stereo_debugger.cpp b/nel/src/3d/stereo_debugger.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_debugger.cpp
rename to nel/src/3d/stereo_debugger.cpp
diff --git a/code/nel/src/3d/stereo_display.cpp b/nel/src/3d/stereo_display.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_display.cpp
rename to nel/src/3d/stereo_display.cpp
diff --git a/code/nel/src/3d/stereo_hmd.cpp b/nel/src/3d/stereo_hmd.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_hmd.cpp
rename to nel/src/3d/stereo_hmd.cpp
diff --git a/code/nel/src/3d/stereo_libvr.cpp b/nel/src/3d/stereo_libvr.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_libvr.cpp
rename to nel/src/3d/stereo_libvr.cpp
diff --git a/code/nel/src/3d/stereo_ovr.cpp b/nel/src/3d/stereo_ovr.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_ovr.cpp
rename to nel/src/3d/stereo_ovr.cpp
diff --git a/code/nel/src/3d/stereo_ovr_04.cpp b/nel/src/3d/stereo_ovr_04.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_ovr_04.cpp
rename to nel/src/3d/stereo_ovr_04.cpp
diff --git a/code/nel/src/3d/stereo_ovr_04_program.h b/nel/src/3d/stereo_ovr_04_program.h
similarity index 100%
rename from code/nel/src/3d/stereo_ovr_04_program.h
rename to nel/src/3d/stereo_ovr_04_program.h
diff --git a/code/nel/src/3d/stereo_ovr_fp.cpp b/nel/src/3d/stereo_ovr_fp.cpp
similarity index 100%
rename from code/nel/src/3d/stereo_ovr_fp.cpp
rename to nel/src/3d/stereo_ovr_fp.cpp
diff --git a/code/nel/src/3d/stripifier.cpp b/nel/src/3d/stripifier.cpp
similarity index 100%
rename from code/nel/src/3d/stripifier.cpp
rename to nel/src/3d/stripifier.cpp
diff --git a/code/nel/src/3d/surface_light_grid.cpp b/nel/src/3d/surface_light_grid.cpp
similarity index 100%
rename from code/nel/src/3d/surface_light_grid.cpp
rename to nel/src/3d/surface_light_grid.cpp
diff --git a/code/nel/src/3d/tangent_space_build.cpp b/nel/src/3d/tangent_space_build.cpp
similarity index 100%
rename from code/nel/src/3d/tangent_space_build.cpp
rename to nel/src/3d/tangent_space_build.cpp
diff --git a/code/nel/src/3d/target_anim_ctrl.cpp b/nel/src/3d/target_anim_ctrl.cpp
similarity index 100%
rename from code/nel/src/3d/target_anim_ctrl.cpp
rename to nel/src/3d/target_anim_ctrl.cpp
diff --git a/code/nel/src/3d/tess_block.cpp b/nel/src/3d/tess_block.cpp
similarity index 100%
rename from code/nel/src/3d/tess_block.cpp
rename to nel/src/3d/tess_block.cpp
diff --git a/code/nel/src/3d/tess_face_priority_list.cpp b/nel/src/3d/tess_face_priority_list.cpp
similarity index 100%
rename from code/nel/src/3d/tess_face_priority_list.cpp
rename to nel/src/3d/tess_face_priority_list.cpp
diff --git a/code/nel/src/3d/tessellation.cpp b/nel/src/3d/tessellation.cpp
similarity index 100%
rename from code/nel/src/3d/tessellation.cpp
rename to nel/src/3d/tessellation.cpp
diff --git a/code/nel/src/3d/text_context.cpp b/nel/src/3d/text_context.cpp
similarity index 100%
rename from code/nel/src/3d/text_context.cpp
rename to nel/src/3d/text_context.cpp
diff --git a/code/nel/src/3d/text_context_user.cpp b/nel/src/3d/text_context_user.cpp
similarity index 100%
rename from code/nel/src/3d/text_context_user.cpp
rename to nel/src/3d/text_context_user.cpp
diff --git a/code/nel/src/3d/texture.cpp b/nel/src/3d/texture.cpp
similarity index 100%
rename from code/nel/src/3d/texture.cpp
rename to nel/src/3d/texture.cpp
diff --git a/code/nel/src/3d/texture_blank.cpp b/nel/src/3d/texture_blank.cpp
similarity index 100%
rename from code/nel/src/3d/texture_blank.cpp
rename to nel/src/3d/texture_blank.cpp
diff --git a/code/nel/src/3d/texture_blend.cpp b/nel/src/3d/texture_blend.cpp
similarity index 100%
rename from code/nel/src/3d/texture_blend.cpp
rename to nel/src/3d/texture_blend.cpp
diff --git a/code/nel/src/3d/texture_bump.cpp b/nel/src/3d/texture_bump.cpp
similarity index 100%
rename from code/nel/src/3d/texture_bump.cpp
rename to nel/src/3d/texture_bump.cpp
diff --git a/code/nel/src/3d/texture_cube.cpp b/nel/src/3d/texture_cube.cpp
similarity index 100%
rename from code/nel/src/3d/texture_cube.cpp
rename to nel/src/3d/texture_cube.cpp
diff --git a/code/nel/src/3d/texture_dlm.cpp b/nel/src/3d/texture_dlm.cpp
similarity index 100%
rename from code/nel/src/3d/texture_dlm.cpp
rename to nel/src/3d/texture_dlm.cpp
diff --git a/code/nel/src/3d/texture_emboss.cpp b/nel/src/3d/texture_emboss.cpp
similarity index 100%
rename from code/nel/src/3d/texture_emboss.cpp
rename to nel/src/3d/texture_emboss.cpp
diff --git a/code/nel/src/3d/texture_far.cpp b/nel/src/3d/texture_far.cpp
similarity index 100%
rename from code/nel/src/3d/texture_far.cpp
rename to nel/src/3d/texture_far.cpp
diff --git a/code/nel/src/3d/texture_file.cpp b/nel/src/3d/texture_file.cpp
similarity index 100%
rename from code/nel/src/3d/texture_file.cpp
rename to nel/src/3d/texture_file.cpp
diff --git a/code/nel/src/3d/texture_font.cpp b/nel/src/3d/texture_font.cpp
similarity index 100%
rename from code/nel/src/3d/texture_font.cpp
rename to nel/src/3d/texture_font.cpp
diff --git a/code/nel/src/3d/texture_grouped.cpp b/nel/src/3d/texture_grouped.cpp
similarity index 100%
rename from code/nel/src/3d/texture_grouped.cpp
rename to nel/src/3d/texture_grouped.cpp
diff --git a/code/nel/src/3d/texture_mem.cpp b/nel/src/3d/texture_mem.cpp
similarity index 100%
rename from code/nel/src/3d/texture_mem.cpp
rename to nel/src/3d/texture_mem.cpp
diff --git a/code/nel/src/3d/texture_multi_file.cpp b/nel/src/3d/texture_multi_file.cpp
similarity index 100%
rename from code/nel/src/3d/texture_multi_file.cpp
rename to nel/src/3d/texture_multi_file.cpp
diff --git a/code/nel/src/3d/texture_near.cpp b/nel/src/3d/texture_near.cpp
similarity index 100%
rename from code/nel/src/3d/texture_near.cpp
rename to nel/src/3d/texture_near.cpp
diff --git a/code/nel/src/3d/tile_bank.cpp b/nel/src/3d/tile_bank.cpp
similarity index 100%
rename from code/nel/src/3d/tile_bank.cpp
rename to nel/src/3d/tile_bank.cpp
diff --git a/code/nel/src/3d/tile_element.cpp b/nel/src/3d/tile_element.cpp
similarity index 100%
rename from code/nel/src/3d/tile_element.cpp
rename to nel/src/3d/tile_element.cpp
diff --git a/code/nel/src/3d/tile_far_bank.cpp b/nel/src/3d/tile_far_bank.cpp
similarity index 100%
rename from code/nel/src/3d/tile_far_bank.cpp
rename to nel/src/3d/tile_far_bank.cpp
diff --git a/code/nel/src/3d/tile_light_influence.cpp b/nel/src/3d/tile_light_influence.cpp
similarity index 100%
rename from code/nel/src/3d/tile_light_influence.cpp
rename to nel/src/3d/tile_light_influence.cpp
diff --git a/code/nel/src/3d/tile_lumel.cpp b/nel/src/3d/tile_lumel.cpp
similarity index 100%
rename from code/nel/src/3d/tile_lumel.cpp
rename to nel/src/3d/tile_lumel.cpp
diff --git a/code/nel/src/3d/tile_noise_map.cpp b/nel/src/3d/tile_noise_map.cpp
similarity index 100%
rename from code/nel/src/3d/tile_noise_map.cpp
rename to nel/src/3d/tile_noise_map.cpp
diff --git a/code/nel/src/3d/tile_vegetable_desc.cpp b/nel/src/3d/tile_vegetable_desc.cpp
similarity index 100%
rename from code/nel/src/3d/tile_vegetable_desc.cpp
rename to nel/src/3d/tile_vegetable_desc.cpp
diff --git a/code/nel/src/3d/track.cpp b/nel/src/3d/track.cpp
similarity index 100%
rename from code/nel/src/3d/track.cpp
rename to nel/src/3d/track.cpp
diff --git a/code/nel/src/3d/track_keyframer.cpp b/nel/src/3d/track_keyframer.cpp
similarity index 100%
rename from code/nel/src/3d/track_keyframer.cpp
rename to nel/src/3d/track_keyframer.cpp
diff --git a/code/nel/src/3d/track_sampled_common.cpp b/nel/src/3d/track_sampled_common.cpp
similarity index 100%
rename from code/nel/src/3d/track_sampled_common.cpp
rename to nel/src/3d/track_sampled_common.cpp
diff --git a/code/nel/src/3d/track_sampled_quat.cpp b/nel/src/3d/track_sampled_quat.cpp
similarity index 100%
rename from code/nel/src/3d/track_sampled_quat.cpp
rename to nel/src/3d/track_sampled_quat.cpp
diff --git a/code/nel/src/3d/track_sampled_quat_small_header.cpp b/nel/src/3d/track_sampled_quat_small_header.cpp
similarity index 100%
rename from code/nel/src/3d/track_sampled_quat_small_header.cpp
rename to nel/src/3d/track_sampled_quat_small_header.cpp
diff --git a/code/nel/src/3d/track_sampled_vector.cpp b/nel/src/3d/track_sampled_vector.cpp
similarity index 100%
rename from code/nel/src/3d/track_sampled_vector.cpp
rename to nel/src/3d/track_sampled_vector.cpp
diff --git a/code/nel/src/3d/transform.cpp b/nel/src/3d/transform.cpp
similarity index 100%
rename from code/nel/src/3d/transform.cpp
rename to nel/src/3d/transform.cpp
diff --git a/code/nel/src/3d/transform_shape.cpp b/nel/src/3d/transform_shape.cpp
similarity index 100%
rename from code/nel/src/3d/transform_shape.cpp
rename to nel/src/3d/transform_shape.cpp
diff --git a/code/nel/src/3d/transformable.cpp b/nel/src/3d/transformable.cpp
similarity index 100%
rename from code/nel/src/3d/transformable.cpp
rename to nel/src/3d/transformable.cpp
diff --git a/code/nel/src/3d/u_bone.cpp b/nel/src/3d/u_bone.cpp
similarity index 100%
rename from code/nel/src/3d/u_bone.cpp
rename to nel/src/3d/u_bone.cpp
diff --git a/code/nel/src/3d/u_camera.cpp b/nel/src/3d/u_camera.cpp
similarity index 100%
rename from code/nel/src/3d/u_camera.cpp
rename to nel/src/3d/u_camera.cpp
diff --git a/code/nel/src/3d/u_instance.cpp b/nel/src/3d/u_instance.cpp
similarity index 100%
rename from code/nel/src/3d/u_instance.cpp
rename to nel/src/3d/u_instance.cpp
diff --git a/code/nel/src/3d/u_instance_material.cpp b/nel/src/3d/u_instance_material.cpp
similarity index 100%
rename from code/nel/src/3d/u_instance_material.cpp
rename to nel/src/3d/u_instance_material.cpp
diff --git a/code/nel/src/3d/u_material.cpp b/nel/src/3d/u_material.cpp
similarity index 100%
rename from code/nel/src/3d/u_material.cpp
rename to nel/src/3d/u_material.cpp
diff --git a/code/nel/src/3d/u_particle_system_instance.cpp b/nel/src/3d/u_particle_system_instance.cpp
similarity index 100%
rename from code/nel/src/3d/u_particle_system_instance.cpp
rename to nel/src/3d/u_particle_system_instance.cpp
diff --git a/code/nel/src/3d/u_point_light.cpp b/nel/src/3d/u_point_light.cpp
similarity index 100%
rename from code/nel/src/3d/u_point_light.cpp
rename to nel/src/3d/u_point_light.cpp
diff --git a/code/nel/src/3d/u_shape.cpp b/nel/src/3d/u_shape.cpp
similarity index 100%
rename from code/nel/src/3d/u_shape.cpp
rename to nel/src/3d/u_shape.cpp
diff --git a/code/nel/src/3d/u_skeleton.cpp b/nel/src/3d/u_skeleton.cpp
similarity index 100%
rename from code/nel/src/3d/u_skeleton.cpp
rename to nel/src/3d/u_skeleton.cpp
diff --git a/code/nel/src/3d/u_transform.cpp b/nel/src/3d/u_transform.cpp
similarity index 100%
rename from code/nel/src/3d/u_transform.cpp
rename to nel/src/3d/u_transform.cpp
diff --git a/code/nel/src/3d/u_transformable.cpp b/nel/src/3d/u_transformable.cpp
similarity index 100%
rename from code/nel/src/3d/u_transformable.cpp
rename to nel/src/3d/u_transformable.cpp
diff --git a/code/nel/src/3d/u_visual_collision_mesh.cpp b/nel/src/3d/u_visual_collision_mesh.cpp
similarity index 100%
rename from code/nel/src/3d/u_visual_collision_mesh.cpp
rename to nel/src/3d/u_visual_collision_mesh.cpp
diff --git a/code/nel/src/3d/u_water.cpp b/nel/src/3d/u_water.cpp
similarity index 100%
rename from code/nel/src/3d/u_water.cpp
rename to nel/src/3d/u_water.cpp
diff --git a/code/nel/src/3d/vegetable.cpp b/nel/src/3d/vegetable.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable.cpp
rename to nel/src/3d/vegetable.cpp
diff --git a/code/nel/src/3d/vegetable_blend_layer_model.cpp b/nel/src/3d/vegetable_blend_layer_model.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_blend_layer_model.cpp
rename to nel/src/3d/vegetable_blend_layer_model.cpp
diff --git a/code/nel/src/3d/vegetable_clip_block.cpp b/nel/src/3d/vegetable_clip_block.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_clip_block.cpp
rename to nel/src/3d/vegetable_clip_block.cpp
diff --git a/code/nel/src/3d/vegetable_instance_group.cpp b/nel/src/3d/vegetable_instance_group.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_instance_group.cpp
rename to nel/src/3d/vegetable_instance_group.cpp
diff --git a/code/nel/src/3d/vegetable_light_ex.cpp b/nel/src/3d/vegetable_light_ex.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_light_ex.cpp
rename to nel/src/3d/vegetable_light_ex.cpp
diff --git a/code/nel/src/3d/vegetable_manager.cpp b/nel/src/3d/vegetable_manager.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_manager.cpp
rename to nel/src/3d/vegetable_manager.cpp
diff --git a/code/nel/src/3d/vegetable_quadrant.cpp b/nel/src/3d/vegetable_quadrant.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_quadrant.cpp
rename to nel/src/3d/vegetable_quadrant.cpp
diff --git a/code/nel/src/3d/vegetable_shape.cpp b/nel/src/3d/vegetable_shape.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_shape.cpp
rename to nel/src/3d/vegetable_shape.cpp
diff --git a/code/nel/src/3d/vegetable_sort_block.cpp b/nel/src/3d/vegetable_sort_block.cpp
similarity index 100%
rename from code/nel/src/3d/vegetable_sort_block.cpp
rename to nel/src/3d/vegetable_sort_block.cpp
diff --git a/code/nel/src/3d/vegetablevb_allocator.cpp b/nel/src/3d/vegetablevb_allocator.cpp
similarity index 100%
rename from code/nel/src/3d/vegetablevb_allocator.cpp
rename to nel/src/3d/vegetablevb_allocator.cpp
diff --git a/code/nel/src/3d/vertex_buffer.cpp b/nel/src/3d/vertex_buffer.cpp
similarity index 100%
rename from code/nel/src/3d/vertex_buffer.cpp
rename to nel/src/3d/vertex_buffer.cpp
diff --git a/code/nel/src/3d/vertex_buffer_heap.cpp b/nel/src/3d/vertex_buffer_heap.cpp
similarity index 100%
rename from code/nel/src/3d/vertex_buffer_heap.cpp
rename to nel/src/3d/vertex_buffer_heap.cpp
diff --git a/code/nel/src/3d/vertex_program.cpp b/nel/src/3d/vertex_program.cpp
similarity index 100%
rename from code/nel/src/3d/vertex_program.cpp
rename to nel/src/3d/vertex_program.cpp
diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/nel/src/3d/vertex_program_parse.cpp
similarity index 100%
rename from code/nel/src/3d/vertex_program_parse.cpp
rename to nel/src/3d/vertex_program_parse.cpp
diff --git a/code/nel/src/3d/vertex_stream_manager.cpp b/nel/src/3d/vertex_stream_manager.cpp
similarity index 100%
rename from code/nel/src/3d/vertex_stream_manager.cpp
rename to nel/src/3d/vertex_stream_manager.cpp
diff --git a/code/nel/src/3d/viewport.cpp b/nel/src/3d/viewport.cpp
similarity index 100%
rename from code/nel/src/3d/viewport.cpp
rename to nel/src/3d/viewport.cpp
diff --git a/code/nel/src/3d/visual_collision_entity.cpp b/nel/src/3d/visual_collision_entity.cpp
similarity index 100%
rename from code/nel/src/3d/visual_collision_entity.cpp
rename to nel/src/3d/visual_collision_entity.cpp
diff --git a/code/nel/src/3d/visual_collision_entity_user.cpp b/nel/src/3d/visual_collision_entity_user.cpp
similarity index 100%
rename from code/nel/src/3d/visual_collision_entity_user.cpp
rename to nel/src/3d/visual_collision_entity_user.cpp
diff --git a/code/nel/src/3d/visual_collision_manager.cpp b/nel/src/3d/visual_collision_manager.cpp
similarity index 100%
rename from code/nel/src/3d/visual_collision_manager.cpp
rename to nel/src/3d/visual_collision_manager.cpp
diff --git a/code/nel/src/3d/visual_collision_manager_user.cpp b/nel/src/3d/visual_collision_manager_user.cpp
similarity index 100%
rename from code/nel/src/3d/visual_collision_manager_user.cpp
rename to nel/src/3d/visual_collision_manager_user.cpp
diff --git a/code/nel/src/3d/visual_collision_mesh.cpp b/nel/src/3d/visual_collision_mesh.cpp
similarity index 100%
rename from code/nel/src/3d/visual_collision_mesh.cpp
rename to nel/src/3d/visual_collision_mesh.cpp
diff --git a/code/nel/src/3d/water_env_map.cpp b/nel/src/3d/water_env_map.cpp
similarity index 100%
rename from code/nel/src/3d/water_env_map.cpp
rename to nel/src/3d/water_env_map.cpp
diff --git a/code/nel/src/3d/water_env_map_user.cpp b/nel/src/3d/water_env_map_user.cpp
similarity index 100%
rename from code/nel/src/3d/water_env_map_user.cpp
rename to nel/src/3d/water_env_map_user.cpp
diff --git a/code/nel/src/3d/water_height_map.cpp b/nel/src/3d/water_height_map.cpp
similarity index 100%
rename from code/nel/src/3d/water_height_map.cpp
rename to nel/src/3d/water_height_map.cpp
diff --git a/code/nel/src/3d/water_model.cpp b/nel/src/3d/water_model.cpp
similarity index 100%
rename from code/nel/src/3d/water_model.cpp
rename to nel/src/3d/water_model.cpp
diff --git a/code/nel/src/3d/water_pool_manager.cpp b/nel/src/3d/water_pool_manager.cpp
similarity index 100%
rename from code/nel/src/3d/water_pool_manager.cpp
rename to nel/src/3d/water_pool_manager.cpp
diff --git a/code/nel/src/3d/water_shape.cpp b/nel/src/3d/water_shape.cpp
similarity index 100%
rename from code/nel/src/3d/water_shape.cpp
rename to nel/src/3d/water_shape.cpp
diff --git a/code/nel/src/3d/zone.cpp b/nel/src/3d/zone.cpp
similarity index 100%
rename from code/nel/src/3d/zone.cpp
rename to nel/src/3d/zone.cpp
diff --git a/code/nel/src/3d/zone_corner_smoother.cpp b/nel/src/3d/zone_corner_smoother.cpp
similarity index 100%
rename from code/nel/src/3d/zone_corner_smoother.cpp
rename to nel/src/3d/zone_corner_smoother.cpp
diff --git a/code/nel/src/3d/zone_lighter.cpp b/nel/src/3d/zone_lighter.cpp
similarity index 100%
rename from code/nel/src/3d/zone_lighter.cpp
rename to nel/src/3d/zone_lighter.cpp
diff --git a/code/nel/src/3d/zone_manager.cpp b/nel/src/3d/zone_manager.cpp
similarity index 100%
rename from code/nel/src/3d/zone_manager.cpp
rename to nel/src/3d/zone_manager.cpp
diff --git a/code/nel/src/3d/zone_search.cpp b/nel/src/3d/zone_search.cpp
similarity index 100%
rename from code/nel/src/3d/zone_search.cpp
rename to nel/src/3d/zone_search.cpp
diff --git a/code/nel/src/3d/zone_smoother.cpp b/nel/src/3d/zone_smoother.cpp
similarity index 100%
rename from code/nel/src/3d/zone_smoother.cpp
rename to nel/src/3d/zone_smoother.cpp
diff --git a/code/nel/src/3d/zone_symmetrisation.cpp b/nel/src/3d/zone_symmetrisation.cpp
similarity index 100%
rename from code/nel/src/3d/zone_symmetrisation.cpp
rename to nel/src/3d/zone_symmetrisation.cpp
diff --git a/code/nel/src/3d/zone_tgt_smoother.cpp b/nel/src/3d/zone_tgt_smoother.cpp
similarity index 100%
rename from code/nel/src/3d/zone_tgt_smoother.cpp
rename to nel/src/3d/zone_tgt_smoother.cpp
diff --git a/code/nel/src/CMakeLists.txt b/nel/src/CMakeLists.txt
similarity index 100%
rename from code/nel/src/CMakeLists.txt
rename to nel/src/CMakeLists.txt
diff --git a/code/nel/src/cegui/CMakeLists.txt b/nel/src/cegui/CMakeLists.txt
similarity index 100%
rename from code/nel/src/cegui/CMakeLists.txt
rename to nel/src/cegui/CMakeLists.txt
diff --git a/code/nel/src/cegui/nelceguirenderer.def b/nel/src/cegui/nelceguirenderer.def
similarity index 100%
rename from code/nel/src/cegui/nelceguirenderer.def
rename to nel/src/cegui/nelceguirenderer.def
diff --git a/code/nel/src/cegui/nellogger.cpp b/nel/src/cegui/nellogger.cpp
similarity index 100%
rename from code/nel/src/cegui/nellogger.cpp
rename to nel/src/cegui/nellogger.cpp
diff --git a/code/nel/src/cegui/nelrenderer.cpp b/nel/src/cegui/nelrenderer.cpp
similarity index 100%
rename from code/nel/src/cegui/nelrenderer.cpp
rename to nel/src/cegui/nelrenderer.cpp
diff --git a/code/nel/src/cegui/nelresourceprovider.cpp b/nel/src/cegui/nelresourceprovider.cpp
similarity index 100%
rename from code/nel/src/cegui/nelresourceprovider.cpp
rename to nel/src/cegui/nelresourceprovider.cpp
diff --git a/code/nel/src/cegui/neltexture.cpp b/nel/src/cegui/neltexture.cpp
similarity index 100%
rename from code/nel/src/cegui/neltexture.cpp
rename to nel/src/cegui/neltexture.cpp
diff --git a/code/nel/src/georges/CMakeLists.txt b/nel/src/georges/CMakeLists.txt
similarity index 100%
rename from code/nel/src/georges/CMakeLists.txt
rename to nel/src/georges/CMakeLists.txt
diff --git a/code/nel/src/georges/form.cpp b/nel/src/georges/form.cpp
similarity index 100%
rename from code/nel/src/georges/form.cpp
rename to nel/src/georges/form.cpp
diff --git a/code/nel/src/georges/form_dfn.cpp b/nel/src/georges/form_dfn.cpp
similarity index 100%
rename from code/nel/src/georges/form_dfn.cpp
rename to nel/src/georges/form_dfn.cpp
diff --git a/code/nel/src/georges/form_elm.cpp b/nel/src/georges/form_elm.cpp
similarity index 100%
rename from code/nel/src/georges/form_elm.cpp
rename to nel/src/georges/form_elm.cpp
diff --git a/code/nel/src/georges/form_loader.cpp b/nel/src/georges/form_loader.cpp
similarity index 100%
rename from code/nel/src/georges/form_loader.cpp
rename to nel/src/georges/form_loader.cpp
diff --git a/code/nel/src/georges/georges_file_format.txt b/nel/src/georges/georges_file_format.txt
similarity index 100%
rename from code/nel/src/georges/georges_file_format.txt
rename to nel/src/georges/georges_file_format.txt
diff --git a/code/nel/src/georges/header.cpp b/nel/src/georges/header.cpp
similarity index 100%
rename from code/nel/src/georges/header.cpp
rename to nel/src/georges/header.cpp
diff --git a/code/nel/src/georges/nel-georges.pc.in b/nel/src/georges/nel-georges.pc.in
similarity index 100%
rename from code/nel/src/georges/nel-georges.pc.in
rename to nel/src/georges/nel-georges.pc.in
diff --git a/code/nel/src/georges/stdgeorges.cpp b/nel/src/georges/stdgeorges.cpp
similarity index 100%
rename from code/nel/src/georges/stdgeorges.cpp
rename to nel/src/georges/stdgeorges.cpp
diff --git a/code/nel/src/georges/stdgeorges.h b/nel/src/georges/stdgeorges.h
similarity index 100%
rename from code/nel/src/georges/stdgeorges.h
rename to nel/src/georges/stdgeorges.h
diff --git a/code/nel/src/georges/type.cpp b/nel/src/georges/type.cpp
similarity index 100%
rename from code/nel/src/georges/type.cpp
rename to nel/src/georges/type.cpp
diff --git a/code/nel/src/gui/CMakeLists.txt b/nel/src/gui/CMakeLists.txt
similarity index 100%
rename from code/nel/src/gui/CMakeLists.txt
rename to nel/src/gui/CMakeLists.txt
diff --git a/code/nel/src/gui/action_handler.cpp b/nel/src/gui/action_handler.cpp
similarity index 100%
rename from code/nel/src/gui/action_handler.cpp
rename to nel/src/gui/action_handler.cpp
diff --git a/code/nel/src/gui/css_border_renderer.cpp b/nel/src/gui/css_border_renderer.cpp
similarity index 100%
rename from code/nel/src/gui/css_border_renderer.cpp
rename to nel/src/gui/css_border_renderer.cpp
diff --git a/code/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
similarity index 100%
rename from code/nel/src/gui/css_parser.cpp
rename to nel/src/gui/css_parser.cpp
diff --git a/code/nel/src/gui/css_selector.cpp b/nel/src/gui/css_selector.cpp
similarity index 100%
rename from code/nel/src/gui/css_selector.cpp
rename to nel/src/gui/css_selector.cpp
diff --git a/code/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
similarity index 100%
rename from code/nel/src/gui/css_style.cpp
rename to nel/src/gui/css_style.cpp
diff --git a/code/nel/src/gui/ctrl_base.cpp b/nel/src/gui/ctrl_base.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_base.cpp
rename to nel/src/gui/ctrl_base.cpp
diff --git a/code/nel/src/gui/ctrl_base_button.cpp b/nel/src/gui/ctrl_base_button.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_base_button.cpp
rename to nel/src/gui/ctrl_base_button.cpp
diff --git a/code/nel/src/gui/ctrl_button.cpp b/nel/src/gui/ctrl_button.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_button.cpp
rename to nel/src/gui/ctrl_button.cpp
diff --git a/code/nel/src/gui/ctrl_col_pick.cpp b/nel/src/gui/ctrl_col_pick.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_col_pick.cpp
rename to nel/src/gui/ctrl_col_pick.cpp
diff --git a/code/nel/src/gui/ctrl_draggable.cpp b/nel/src/gui/ctrl_draggable.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_draggable.cpp
rename to nel/src/gui/ctrl_draggable.cpp
diff --git a/code/nel/src/gui/ctrl_polygon.cpp b/nel/src/gui/ctrl_polygon.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_polygon.cpp
rename to nel/src/gui/ctrl_polygon.cpp
diff --git a/code/nel/src/gui/ctrl_quad.cpp b/nel/src/gui/ctrl_quad.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_quad.cpp
rename to nel/src/gui/ctrl_quad.cpp
diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/nel/src/gui/ctrl_scroll.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_scroll.cpp
rename to nel/src/gui/ctrl_scroll.cpp
diff --git a/code/nel/src/gui/ctrl_scroll_base.cpp b/nel/src/gui/ctrl_scroll_base.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_scroll_base.cpp
rename to nel/src/gui/ctrl_scroll_base.cpp
diff --git a/code/nel/src/gui/ctrl_sheet_selection.cpp b/nel/src/gui/ctrl_sheet_selection.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_sheet_selection.cpp
rename to nel/src/gui/ctrl_sheet_selection.cpp
diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_text_button.cpp
rename to nel/src/gui/ctrl_text_button.cpp
diff --git a/code/nel/src/gui/ctrl_tooltip.cpp b/nel/src/gui/ctrl_tooltip.cpp
similarity index 100%
rename from code/nel/src/gui/ctrl_tooltip.cpp
rename to nel/src/gui/ctrl_tooltip.cpp
diff --git a/code/nel/src/gui/db_manager.cpp b/nel/src/gui/db_manager.cpp
similarity index 100%
rename from code/nel/src/gui/db_manager.cpp
rename to nel/src/gui/db_manager.cpp
diff --git a/code/nel/src/gui/dbgroup_combo_box.cpp b/nel/src/gui/dbgroup_combo_box.cpp
similarity index 100%
rename from code/nel/src/gui/dbgroup_combo_box.cpp
rename to nel/src/gui/dbgroup_combo_box.cpp
diff --git a/code/nel/src/gui/dbgroup_select_number.cpp b/nel/src/gui/dbgroup_select_number.cpp
similarity index 100%
rename from code/nel/src/gui/dbgroup_select_number.cpp
rename to nel/src/gui/dbgroup_select_number.cpp
diff --git a/code/nel/src/gui/dbview_bar.cpp b/nel/src/gui/dbview_bar.cpp
similarity index 100%
rename from code/nel/src/gui/dbview_bar.cpp
rename to nel/src/gui/dbview_bar.cpp
diff --git a/code/nel/src/gui/dbview_bar3.cpp b/nel/src/gui/dbview_bar3.cpp
similarity index 100%
rename from code/nel/src/gui/dbview_bar3.cpp
rename to nel/src/gui/dbview_bar3.cpp
diff --git a/code/nel/src/gui/dbview_digit.cpp b/nel/src/gui/dbview_digit.cpp
similarity index 100%
rename from code/nel/src/gui/dbview_digit.cpp
rename to nel/src/gui/dbview_digit.cpp
diff --git a/code/nel/src/gui/dbview_number.cpp b/nel/src/gui/dbview_number.cpp
similarity index 100%
rename from code/nel/src/gui/dbview_number.cpp
rename to nel/src/gui/dbview_number.cpp
diff --git a/code/nel/src/gui/dbview_quantity.cpp b/nel/src/gui/dbview_quantity.cpp
similarity index 100%
rename from code/nel/src/gui/dbview_quantity.cpp
rename to nel/src/gui/dbview_quantity.cpp
diff --git a/code/nel/src/gui/event_descriptor.cpp b/nel/src/gui/event_descriptor.cpp
similarity index 100%
rename from code/nel/src/gui/event_descriptor.cpp
rename to nel/src/gui/event_descriptor.cpp
diff --git a/code/nel/src/gui/event_listener.cpp b/nel/src/gui/event_listener.cpp
similarity index 100%
rename from code/nel/src/gui/event_listener.cpp
rename to nel/src/gui/event_listener.cpp
diff --git a/code/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
similarity index 100%
rename from code/nel/src/gui/group_container.cpp
rename to nel/src/gui/group_container.cpp
diff --git a/code/nel/src/gui/group_container_base.cpp b/nel/src/gui/group_container_base.cpp
similarity index 100%
rename from code/nel/src/gui/group_container_base.cpp
rename to nel/src/gui/group_container_base.cpp
diff --git a/code/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
similarity index 100%
rename from code/nel/src/gui/group_editbox.cpp
rename to nel/src/gui/group_editbox.cpp
diff --git a/code/nel/src/gui/group_editbox_base.cpp b/nel/src/gui/group_editbox_base.cpp
similarity index 100%
rename from code/nel/src/gui/group_editbox_base.cpp
rename to nel/src/gui/group_editbox_base.cpp
diff --git a/code/nel/src/gui/group_editbox_decor.cpp b/nel/src/gui/group_editbox_decor.cpp
similarity index 100%
rename from code/nel/src/gui/group_editbox_decor.cpp
rename to nel/src/gui/group_editbox_decor.cpp
diff --git a/code/nel/src/gui/group_frame.cpp b/nel/src/gui/group_frame.cpp
similarity index 100%
rename from code/nel/src/gui/group_frame.cpp
rename to nel/src/gui/group_frame.cpp
diff --git a/code/nel/src/gui/group_header.cpp b/nel/src/gui/group_header.cpp
similarity index 100%
rename from code/nel/src/gui/group_header.cpp
rename to nel/src/gui/group_header.cpp
diff --git a/code/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
similarity index 100%
rename from code/nel/src/gui/group_html.cpp
rename to nel/src/gui/group_html.cpp
diff --git a/code/nel/src/gui/group_list.cpp b/nel/src/gui/group_list.cpp
similarity index 100%
rename from code/nel/src/gui/group_list.cpp
rename to nel/src/gui/group_list.cpp
diff --git a/code/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
similarity index 100%
rename from code/nel/src/gui/group_menu.cpp
rename to nel/src/gui/group_menu.cpp
diff --git a/code/nel/src/gui/group_modal.cpp b/nel/src/gui/group_modal.cpp
similarity index 100%
rename from code/nel/src/gui/group_modal.cpp
rename to nel/src/gui/group_modal.cpp
diff --git a/code/nel/src/gui/group_paragraph.cpp b/nel/src/gui/group_paragraph.cpp
similarity index 100%
rename from code/nel/src/gui/group_paragraph.cpp
rename to nel/src/gui/group_paragraph.cpp
diff --git a/code/nel/src/gui/group_scrolltext.cpp b/nel/src/gui/group_scrolltext.cpp
similarity index 100%
rename from code/nel/src/gui/group_scrolltext.cpp
rename to nel/src/gui/group_scrolltext.cpp
diff --git a/code/nel/src/gui/group_submenu_base.cpp b/nel/src/gui/group_submenu_base.cpp
similarity index 100%
rename from code/nel/src/gui/group_submenu_base.cpp
rename to nel/src/gui/group_submenu_base.cpp
diff --git a/code/nel/src/gui/group_tab.cpp b/nel/src/gui/group_tab.cpp
similarity index 100%
rename from code/nel/src/gui/group_tab.cpp
rename to nel/src/gui/group_tab.cpp
diff --git a/code/nel/src/gui/group_table.cpp b/nel/src/gui/group_table.cpp
similarity index 100%
rename from code/nel/src/gui/group_table.cpp
rename to nel/src/gui/group_table.cpp
diff --git a/code/nel/src/gui/group_tree.cpp b/nel/src/gui/group_tree.cpp
similarity index 100%
rename from code/nel/src/gui/group_tree.cpp
rename to nel/src/gui/group_tree.cpp
diff --git a/code/nel/src/gui/group_wheel.cpp b/nel/src/gui/group_wheel.cpp
similarity index 100%
rename from code/nel/src/gui/group_wheel.cpp
rename to nel/src/gui/group_wheel.cpp
diff --git a/code/nel/src/gui/html_element.cpp b/nel/src/gui/html_element.cpp
similarity index 100%
rename from code/nel/src/gui/html_element.cpp
rename to nel/src/gui/html_element.cpp
diff --git a/code/nel/src/gui/html_parser.cpp b/nel/src/gui/html_parser.cpp
similarity index 100%
rename from code/nel/src/gui/html_parser.cpp
rename to nel/src/gui/html_parser.cpp
diff --git a/code/nel/src/gui/http_cache.cpp b/nel/src/gui/http_cache.cpp
similarity index 100%
rename from code/nel/src/gui/http_cache.cpp
rename to nel/src/gui/http_cache.cpp
diff --git a/code/nel/src/gui/http_hsts.cpp b/nel/src/gui/http_hsts.cpp
similarity index 100%
rename from code/nel/src/gui/http_hsts.cpp
rename to nel/src/gui/http_hsts.cpp
diff --git a/code/nel/src/gui/input_handler.cpp b/nel/src/gui/input_handler.cpp
similarity index 100%
rename from code/nel/src/gui/input_handler.cpp
rename to nel/src/gui/input_handler.cpp
diff --git a/code/nel/src/gui/interface_anim.cpp b/nel/src/gui/interface_anim.cpp
similarity index 100%
rename from code/nel/src/gui/interface_anim.cpp
rename to nel/src/gui/interface_anim.cpp
diff --git a/code/nel/src/gui/interface_element.cpp b/nel/src/gui/interface_element.cpp
similarity index 100%
rename from code/nel/src/gui/interface_element.cpp
rename to nel/src/gui/interface_element.cpp
diff --git a/code/nel/src/gui/interface_expr.cpp b/nel/src/gui/interface_expr.cpp
similarity index 100%
rename from code/nel/src/gui/interface_expr.cpp
rename to nel/src/gui/interface_expr.cpp
diff --git a/code/nel/src/gui/interface_expr_node.cpp b/nel/src/gui/interface_expr_node.cpp
similarity index 100%
rename from code/nel/src/gui/interface_expr_node.cpp
rename to nel/src/gui/interface_expr_node.cpp
diff --git a/code/nel/src/gui/interface_expr_user_fct.cpp b/nel/src/gui/interface_expr_user_fct.cpp
similarity index 100%
rename from code/nel/src/gui/interface_expr_user_fct.cpp
rename to nel/src/gui/interface_expr_user_fct.cpp
diff --git a/code/nel/src/gui/interface_factory.cpp b/nel/src/gui/interface_factory.cpp
similarity index 100%
rename from code/nel/src/gui/interface_factory.cpp
rename to nel/src/gui/interface_factory.cpp
diff --git a/code/nel/src/gui/interface_group.cpp b/nel/src/gui/interface_group.cpp
similarity index 100%
rename from code/nel/src/gui/interface_group.cpp
rename to nel/src/gui/interface_group.cpp
diff --git a/code/nel/src/gui/interface_link.cpp b/nel/src/gui/interface_link.cpp
similarity index 100%
rename from code/nel/src/gui/interface_link.cpp
rename to nel/src/gui/interface_link.cpp
diff --git a/code/nel/src/gui/interface_options.cpp b/nel/src/gui/interface_options.cpp
similarity index 100%
rename from code/nel/src/gui/interface_options.cpp
rename to nel/src/gui/interface_options.cpp
diff --git a/code/nel/src/gui/interface_parser.cpp b/nel/src/gui/interface_parser.cpp
similarity index 100%
rename from code/nel/src/gui/interface_parser.cpp
rename to nel/src/gui/interface_parser.cpp
diff --git a/code/nel/src/gui/interface_property.cpp b/nel/src/gui/interface_property.cpp
similarity index 100%
rename from code/nel/src/gui/interface_property.cpp
rename to nel/src/gui/interface_property.cpp
diff --git a/code/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
similarity index 100%
rename from code/nel/src/gui/libwww.cpp
rename to nel/src/gui/libwww.cpp
diff --git a/code/nel/src/gui/link_hack.cpp b/nel/src/gui/link_hack.cpp
similarity index 100%
rename from code/nel/src/gui/link_hack.cpp
rename to nel/src/gui/link_hack.cpp
diff --git a/code/nel/src/gui/lua_helper.cpp b/nel/src/gui/lua_helper.cpp
similarity index 100%
rename from code/nel/src/gui/lua_helper.cpp
rename to nel/src/gui/lua_helper.cpp
diff --git a/code/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp
similarity index 100%
rename from code/nel/src/gui/lua_ihm.cpp
rename to nel/src/gui/lua_ihm.cpp
diff --git a/code/nel/src/gui/lua_loadlib.c b/nel/src/gui/lua_loadlib.c
similarity index 100%
rename from code/nel/src/gui/lua_loadlib.c
rename to nel/src/gui/lua_loadlib.c
diff --git a/code/nel/src/gui/lua_manager.cpp b/nel/src/gui/lua_manager.cpp
similarity index 100%
rename from code/nel/src/gui/lua_manager.cpp
rename to nel/src/gui/lua_manager.cpp
diff --git a/code/nel/src/gui/lua_object.cpp b/nel/src/gui/lua_object.cpp
similarity index 100%
rename from code/nel/src/gui/lua_object.cpp
rename to nel/src/gui/lua_object.cpp
diff --git a/code/nel/src/gui/parser.cpp b/nel/src/gui/parser.cpp
similarity index 100%
rename from code/nel/src/gui/parser.cpp
rename to nel/src/gui/parser.cpp
diff --git a/code/nel/src/gui/proc.cpp b/nel/src/gui/proc.cpp
similarity index 100%
rename from code/nel/src/gui/proc.cpp
rename to nel/src/gui/proc.cpp
diff --git a/code/nel/src/gui/reflect.cpp b/nel/src/gui/reflect.cpp
similarity index 100%
rename from code/nel/src/gui/reflect.cpp
rename to nel/src/gui/reflect.cpp
diff --git a/code/nel/src/gui/reflect_register.cpp b/nel/src/gui/reflect_register.cpp
similarity index 100%
rename from code/nel/src/gui/reflect_register.cpp
rename to nel/src/gui/reflect_register.cpp
diff --git a/code/nel/src/gui/root_group.cpp b/nel/src/gui/root_group.cpp
similarity index 100%
rename from code/nel/src/gui/root_group.cpp
rename to nel/src/gui/root_group.cpp
diff --git a/code/nel/src/gui/stdpch.cpp b/nel/src/gui/stdpch.cpp
similarity index 100%
rename from code/nel/src/gui/stdpch.cpp
rename to nel/src/gui/stdpch.cpp
diff --git a/code/nel/src/gui/stdpch.h b/nel/src/gui/stdpch.h
similarity index 100%
rename from code/nel/src/gui/stdpch.h
rename to nel/src/gui/stdpch.h
diff --git a/code/nel/src/gui/string_case.cpp b/nel/src/gui/string_case.cpp
similarity index 100%
rename from code/nel/src/gui/string_case.cpp
rename to nel/src/gui/string_case.cpp
diff --git a/code/nel/src/gui/url_parser.cpp b/nel/src/gui/url_parser.cpp
similarity index 100%
rename from code/nel/src/gui/url_parser.cpp
rename to nel/src/gui/url_parser.cpp
diff --git a/code/nel/src/gui/view_base.cpp b/nel/src/gui/view_base.cpp
similarity index 100%
rename from code/nel/src/gui/view_base.cpp
rename to nel/src/gui/view_base.cpp
diff --git a/code/nel/src/gui/view_bitmap.cpp b/nel/src/gui/view_bitmap.cpp
similarity index 100%
rename from code/nel/src/gui/view_bitmap.cpp
rename to nel/src/gui/view_bitmap.cpp
diff --git a/code/nel/src/gui/view_bitmap_combo.cpp b/nel/src/gui/view_bitmap_combo.cpp
similarity index 100%
rename from code/nel/src/gui/view_bitmap_combo.cpp
rename to nel/src/gui/view_bitmap_combo.cpp
diff --git a/code/nel/src/gui/view_link.cpp b/nel/src/gui/view_link.cpp
similarity index 100%
rename from code/nel/src/gui/view_link.cpp
rename to nel/src/gui/view_link.cpp
diff --git a/code/nel/src/gui/view_pointer.cpp b/nel/src/gui/view_pointer.cpp
similarity index 100%
rename from code/nel/src/gui/view_pointer.cpp
rename to nel/src/gui/view_pointer.cpp
diff --git a/code/nel/src/gui/view_pointer_base.cpp b/nel/src/gui/view_pointer_base.cpp
similarity index 100%
rename from code/nel/src/gui/view_pointer_base.cpp
rename to nel/src/gui/view_pointer_base.cpp
diff --git a/code/nel/src/gui/view_polygon.cpp b/nel/src/gui/view_polygon.cpp
similarity index 100%
rename from code/nel/src/gui/view_polygon.cpp
rename to nel/src/gui/view_polygon.cpp
diff --git a/code/nel/src/gui/view_quad.cpp b/nel/src/gui/view_quad.cpp
similarity index 100%
rename from code/nel/src/gui/view_quad.cpp
rename to nel/src/gui/view_quad.cpp
diff --git a/code/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
similarity index 100%
rename from code/nel/src/gui/view_renderer.cpp
rename to nel/src/gui/view_renderer.cpp
diff --git a/code/nel/src/gui/view_text.cpp b/nel/src/gui/view_text.cpp
similarity index 100%
rename from code/nel/src/gui/view_text.cpp
rename to nel/src/gui/view_text.cpp
diff --git a/code/nel/src/gui/view_text_formated.cpp b/nel/src/gui/view_text_formated.cpp
similarity index 100%
rename from code/nel/src/gui/view_text_formated.cpp
rename to nel/src/gui/view_text_formated.cpp
diff --git a/code/nel/src/gui/view_text_id.cpp b/nel/src/gui/view_text_id.cpp
similarity index 100%
rename from code/nel/src/gui/view_text_id.cpp
rename to nel/src/gui/view_text_id.cpp
diff --git a/code/nel/src/gui/view_text_id_formated.cpp b/nel/src/gui/view_text_id_formated.cpp
similarity index 100%
rename from code/nel/src/gui/view_text_id_formated.cpp
rename to nel/src/gui/view_text_id_formated.cpp
diff --git a/code/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp
similarity index 100%
rename from code/nel/src/gui/widget_manager.cpp
rename to nel/src/gui/widget_manager.cpp
diff --git a/code/nel/src/ligo/CMakeLists.txt b/nel/src/ligo/CMakeLists.txt
similarity index 100%
rename from code/nel/src/ligo/CMakeLists.txt
rename to nel/src/ligo/CMakeLists.txt
diff --git a/code/nel/src/ligo/ligo_config.cpp b/nel/src/ligo/ligo_config.cpp
similarity index 100%
rename from code/nel/src/ligo/ligo_config.cpp
rename to nel/src/ligo/ligo_config.cpp
diff --git a/code/nel/src/ligo/ligo_error.cpp b/nel/src/ligo/ligo_error.cpp
similarity index 100%
rename from code/nel/src/ligo/ligo_error.cpp
rename to nel/src/ligo/ligo_error.cpp
diff --git a/code/nel/src/ligo/ligo_material.cpp b/nel/src/ligo/ligo_material.cpp
similarity index 100%
rename from code/nel/src/ligo/ligo_material.cpp
rename to nel/src/ligo/ligo_material.cpp
diff --git a/code/nel/src/ligo/nel-ligo.pc.in b/nel/src/ligo/nel-ligo.pc.in
similarity index 100%
rename from code/nel/src/ligo/nel-ligo.pc.in
rename to nel/src/ligo/nel-ligo.pc.in
diff --git a/code/nel/src/ligo/primitive.cpp b/nel/src/ligo/primitive.cpp
similarity index 100%
rename from code/nel/src/ligo/primitive.cpp
rename to nel/src/ligo/primitive.cpp
diff --git a/code/nel/src/ligo/primitive_class.cpp b/nel/src/ligo/primitive_class.cpp
similarity index 100%
rename from code/nel/src/ligo/primitive_class.cpp
rename to nel/src/ligo/primitive_class.cpp
diff --git a/code/nel/src/ligo/primitive_configuration.cpp b/nel/src/ligo/primitive_configuration.cpp
similarity index 100%
rename from code/nel/src/ligo/primitive_configuration.cpp
rename to nel/src/ligo/primitive_configuration.cpp
diff --git a/code/nel/src/ligo/primitive_utils.cpp b/nel/src/ligo/primitive_utils.cpp
similarity index 100%
rename from code/nel/src/ligo/primitive_utils.cpp
rename to nel/src/ligo/primitive_utils.cpp
diff --git a/code/nel/src/ligo/stdligo.cpp b/nel/src/ligo/stdligo.cpp
similarity index 100%
rename from code/nel/src/ligo/stdligo.cpp
rename to nel/src/ligo/stdligo.cpp
diff --git a/code/nel/src/ligo/stdligo.h b/nel/src/ligo/stdligo.h
similarity index 100%
rename from code/nel/src/ligo/stdligo.h
rename to nel/src/ligo/stdligo.h
diff --git a/code/nel/src/ligo/transition.cpp b/nel/src/ligo/transition.cpp
similarity index 100%
rename from code/nel/src/ligo/transition.cpp
rename to nel/src/ligo/transition.cpp
diff --git a/code/nel/src/ligo/zone_bank.cpp b/nel/src/ligo/zone_bank.cpp
similarity index 100%
rename from code/nel/src/ligo/zone_bank.cpp
rename to nel/src/ligo/zone_bank.cpp
diff --git a/code/nel/src/ligo/zone_edge.cpp b/nel/src/ligo/zone_edge.cpp
similarity index 100%
rename from code/nel/src/ligo/zone_edge.cpp
rename to nel/src/ligo/zone_edge.cpp
diff --git a/code/nel/src/ligo/zone_region.cpp b/nel/src/ligo/zone_region.cpp
similarity index 100%
rename from code/nel/src/ligo/zone_region.cpp
rename to nel/src/ligo/zone_region.cpp
diff --git a/code/nel/src/ligo/zone_template.cpp b/nel/src/ligo/zone_template.cpp
similarity index 100%
rename from code/nel/src/ligo/zone_template.cpp
rename to nel/src/ligo/zone_template.cpp
diff --git a/code/nel/src/logic/CMakeLists.txt b/nel/src/logic/CMakeLists.txt
similarity index 100%
rename from code/nel/src/logic/CMakeLists.txt
rename to nel/src/logic/CMakeLists.txt
diff --git a/code/nel/src/logic/logic_condition.cpp b/nel/src/logic/logic_condition.cpp
similarity index 100%
rename from code/nel/src/logic/logic_condition.cpp
rename to nel/src/logic/logic_condition.cpp
diff --git a/code/nel/src/logic/logic_event.cpp b/nel/src/logic/logic_event.cpp
similarity index 100%
rename from code/nel/src/logic/logic_event.cpp
rename to nel/src/logic/logic_event.cpp
diff --git a/code/nel/src/logic/logic_state.cpp b/nel/src/logic/logic_state.cpp
similarity index 100%
rename from code/nel/src/logic/logic_state.cpp
rename to nel/src/logic/logic_state.cpp
diff --git a/code/nel/src/logic/logic_state_machine.cpp b/nel/src/logic/logic_state_machine.cpp
similarity index 100%
rename from code/nel/src/logic/logic_state_machine.cpp
rename to nel/src/logic/logic_state_machine.cpp
diff --git a/code/nel/src/logic/logic_variable.cpp b/nel/src/logic/logic_variable.cpp
similarity index 100%
rename from code/nel/src/logic/logic_variable.cpp
rename to nel/src/logic/logic_variable.cpp
diff --git a/code/nel/src/logic/stdlogic.cpp b/nel/src/logic/stdlogic.cpp
similarity index 100%
rename from code/nel/src/logic/stdlogic.cpp
rename to nel/src/logic/stdlogic.cpp
diff --git a/code/nel/src/logic/stdlogic.h b/nel/src/logic/stdlogic.h
similarity index 100%
rename from code/nel/src/logic/stdlogic.h
rename to nel/src/logic/stdlogic.h
diff --git a/code/nel/src/misc/CMakeLists.txt b/nel/src/misc/CMakeLists.txt
similarity index 100%
rename from code/nel/src/misc/CMakeLists.txt
rename to nel/src/misc/CMakeLists.txt
diff --git a/code/nel/src/misc/aabbox.cpp b/nel/src/misc/aabbox.cpp
similarity index 100%
rename from code/nel/src/misc/aabbox.cpp
rename to nel/src/misc/aabbox.cpp
diff --git a/code/nel/src/misc/algo.cpp b/nel/src/misc/algo.cpp
similarity index 100%
rename from code/nel/src/misc/algo.cpp
rename to nel/src/misc/algo.cpp
diff --git a/code/nel/src/misc/app_context.cpp b/nel/src/misc/app_context.cpp
similarity index 100%
rename from code/nel/src/misc/app_context.cpp
rename to nel/src/misc/app_context.cpp
diff --git a/code/nel/src/misc/async_file_manager.cpp b/nel/src/misc/async_file_manager.cpp
similarity index 100%
rename from code/nel/src/misc/async_file_manager.cpp
rename to nel/src/misc/async_file_manager.cpp
diff --git a/code/nel/src/misc/big_file.cpp b/nel/src/misc/big_file.cpp
similarity index 100%
rename from code/nel/src/misc/big_file.cpp
rename to nel/src/misc/big_file.cpp
diff --git a/code/nel/src/misc/bit_mem_stream.cpp b/nel/src/misc/bit_mem_stream.cpp
similarity index 100%
rename from code/nel/src/misc/bit_mem_stream.cpp
rename to nel/src/misc/bit_mem_stream.cpp
diff --git a/code/nel/src/misc/bit_set.cpp b/nel/src/misc/bit_set.cpp
similarity index 100%
rename from code/nel/src/misc/bit_set.cpp
rename to nel/src/misc/bit_set.cpp
diff --git a/code/nel/src/misc/bitmap.cpp b/nel/src/misc/bitmap.cpp
similarity index 100%
rename from code/nel/src/misc/bitmap.cpp
rename to nel/src/misc/bitmap.cpp
diff --git a/code/nel/src/misc/bitmap_gif.cpp b/nel/src/misc/bitmap_gif.cpp
similarity index 100%
rename from code/nel/src/misc/bitmap_gif.cpp
rename to nel/src/misc/bitmap_gif.cpp
diff --git a/code/nel/src/misc/bitmap_jpeg.cpp b/nel/src/misc/bitmap_jpeg.cpp
similarity index 100%
rename from code/nel/src/misc/bitmap_jpeg.cpp
rename to nel/src/misc/bitmap_jpeg.cpp
diff --git a/code/nel/src/misc/bitmap_png.cpp b/nel/src/misc/bitmap_png.cpp
similarity index 100%
rename from code/nel/src/misc/bitmap_png.cpp
rename to nel/src/misc/bitmap_png.cpp
diff --git a/code/nel/src/misc/block_memory.cpp b/nel/src/misc/block_memory.cpp
similarity index 100%
rename from code/nel/src/misc/block_memory.cpp
rename to nel/src/misc/block_memory.cpp
diff --git a/code/nel/src/misc/bsphere.cpp b/nel/src/misc/bsphere.cpp
similarity index 100%
rename from code/nel/src/misc/bsphere.cpp
rename to nel/src/misc/bsphere.cpp
diff --git a/code/nel/src/misc/buf_fifo.cpp b/nel/src/misc/buf_fifo.cpp
similarity index 100%
rename from code/nel/src/misc/buf_fifo.cpp
rename to nel/src/misc/buf_fifo.cpp
diff --git a/code/nel/src/misc/cdb.cpp b/nel/src/misc/cdb.cpp
similarity index 100%
rename from code/nel/src/misc/cdb.cpp
rename to nel/src/misc/cdb.cpp
diff --git a/code/nel/src/misc/cdb_bank_handler.cpp b/nel/src/misc/cdb_bank_handler.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_bank_handler.cpp
rename to nel/src/misc/cdb_bank_handler.cpp
diff --git a/code/nel/src/misc/cdb_branch.cpp b/nel/src/misc/cdb_branch.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_branch.cpp
rename to nel/src/misc/cdb_branch.cpp
diff --git a/code/nel/src/misc/cdb_branch_observing_handler.cpp b/nel/src/misc/cdb_branch_observing_handler.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_branch_observing_handler.cpp
rename to nel/src/misc/cdb_branch_observing_handler.cpp
diff --git a/code/nel/src/misc/cdb_check_sum.cpp b/nel/src/misc/cdb_check_sum.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_check_sum.cpp
rename to nel/src/misc/cdb_check_sum.cpp
diff --git a/code/nel/src/misc/cdb_leaf.cpp b/nel/src/misc/cdb_leaf.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_leaf.cpp
rename to nel/src/misc/cdb_leaf.cpp
diff --git a/code/nel/src/misc/cdb_manager.cpp b/nel/src/misc/cdb_manager.cpp
similarity index 100%
rename from code/nel/src/misc/cdb_manager.cpp
rename to nel/src/misc/cdb_manager.cpp
diff --git a/code/nel/src/misc/check_fpu.cpp b/nel/src/misc/check_fpu.cpp
similarity index 100%
rename from code/nel/src/misc/check_fpu.cpp
rename to nel/src/misc/check_fpu.cpp
diff --git a/code/nel/src/misc/class_id.cpp b/nel/src/misc/class_id.cpp
similarity index 100%
rename from code/nel/src/misc/class_id.cpp
rename to nel/src/misc/class_id.cpp
diff --git a/code/nel/src/misc/class_registry.cpp b/nel/src/misc/class_registry.cpp
similarity index 100%
rename from code/nel/src/misc/class_registry.cpp
rename to nel/src/misc/class_registry.cpp
diff --git a/code/nel/src/misc/cmd_args.cpp b/nel/src/misc/cmd_args.cpp
similarity index 100%
rename from code/nel/src/misc/cmd_args.cpp
rename to nel/src/misc/cmd_args.cpp
diff --git a/code/nel/src/misc/co_task.cpp b/nel/src/misc/co_task.cpp
similarity index 100%
rename from code/nel/src/misc/co_task.cpp
rename to nel/src/misc/co_task.cpp
diff --git a/code/nel/src/misc/command.cpp b/nel/src/misc/command.cpp
similarity index 100%
rename from code/nel/src/misc/command.cpp
rename to nel/src/misc/command.cpp
diff --git a/code/nel/src/misc/common.cpp b/nel/src/misc/common.cpp
similarity index 100%
rename from code/nel/src/misc/common.cpp
rename to nel/src/misc/common.cpp
diff --git a/code/nel/src/misc/config_file/cf_bison.simple b/nel/src/misc/config_file/cf_bison.simple
similarity index 100%
rename from code/nel/src/misc/config_file/cf_bison.simple
rename to nel/src/misc/config_file/cf_bison.simple
diff --git a/code/nel/src/misc/config_file/cf_flex.skl b/nel/src/misc/config_file/cf_flex.skl
similarity index 100%
rename from code/nel/src/misc/config_file/cf_flex.skl
rename to nel/src/misc/config_file/cf_flex.skl
diff --git a/code/nel/src/misc/config_file/cf_gramatical.cpp b/nel/src/misc/config_file/cf_gramatical.cpp
similarity index 100%
rename from code/nel/src/misc/config_file/cf_gramatical.cpp
rename to nel/src/misc/config_file/cf_gramatical.cpp
diff --git a/code/nel/src/misc/config_file/cf_gramatical.h b/nel/src/misc/config_file/cf_gramatical.h
similarity index 100%
rename from code/nel/src/misc/config_file/cf_gramatical.h
rename to nel/src/misc/config_file/cf_gramatical.h
diff --git a/code/nel/src/misc/config_file/cf_gramatical.ypp b/nel/src/misc/config_file/cf_gramatical.ypp
similarity index 100%
rename from code/nel/src/misc/config_file/cf_gramatical.ypp
rename to nel/src/misc/config_file/cf_gramatical.ypp
diff --git a/code/nel/src/misc/config_file/cf_lexical.cpp b/nel/src/misc/config_file/cf_lexical.cpp
similarity index 100%
rename from code/nel/src/misc/config_file/cf_lexical.cpp
rename to nel/src/misc/config_file/cf_lexical.cpp
diff --git a/code/nel/src/misc/config_file/cf_lexical.lpp b/nel/src/misc/config_file/cf_lexical.lpp
similarity index 100%
rename from code/nel/src/misc/config_file/cf_lexical.lpp
rename to nel/src/misc/config_file/cf_lexical.lpp
diff --git a/code/nel/src/misc/config_file/config_file.cpp b/nel/src/misc/config_file/config_file.cpp
similarity index 100%
rename from code/nel/src/misc/config_file/config_file.cpp
rename to nel/src/misc/config_file/config_file.cpp
diff --git a/code/nel/src/misc/config_file/do.bat b/nel/src/misc/config_file/do.bat
similarity index 100%
rename from code/nel/src/misc/config_file/do.bat
rename to nel/src/misc/config_file/do.bat
diff --git a/code/nel/src/misc/contiguous_block_allocator.cpp b/nel/src/misc/contiguous_block_allocator.cpp
similarity index 100%
rename from code/nel/src/misc/contiguous_block_allocator.cpp
rename to nel/src/misc/contiguous_block_allocator.cpp
diff --git a/code/nel/src/misc/cpu_time_stat.cpp b/nel/src/misc/cpu_time_stat.cpp
similarity index 100%
rename from code/nel/src/misc/cpu_time_stat.cpp
rename to nel/src/misc/cpu_time_stat.cpp
diff --git a/code/nel/src/misc/debug.cpp b/nel/src/misc/debug.cpp
similarity index 100%
rename from code/nel/src/misc/debug.cpp
rename to nel/src/misc/debug.cpp
diff --git a/code/nel/src/misc/diff_tool.cpp b/nel/src/misc/diff_tool.cpp
similarity index 100%
rename from code/nel/src/misc/diff_tool.cpp
rename to nel/src/misc/diff_tool.cpp
diff --git a/code/nel/src/misc/displayer.cpp b/nel/src/misc/displayer.cpp
similarity index 100%
rename from code/nel/src/misc/displayer.cpp
rename to nel/src/misc/displayer.cpp
diff --git a/code/nel/src/misc/dummy_window.cpp b/nel/src/misc/dummy_window.cpp
similarity index 100%
rename from code/nel/src/misc/dummy_window.cpp
rename to nel/src/misc/dummy_window.cpp
diff --git a/code/nel/src/misc/dynloadlib.cpp b/nel/src/misc/dynloadlib.cpp
similarity index 100%
rename from code/nel/src/misc/dynloadlib.cpp
rename to nel/src/misc/dynloadlib.cpp
diff --git a/code/nel/src/misc/eid_translator.cpp b/nel/src/misc/eid_translator.cpp
similarity index 100%
rename from code/nel/src/misc/eid_translator.cpp
rename to nel/src/misc/eid_translator.cpp
diff --git a/code/nel/src/misc/entity_id.cpp b/nel/src/misc/entity_id.cpp
similarity index 100%
rename from code/nel/src/misc/entity_id.cpp
rename to nel/src/misc/entity_id.cpp
diff --git a/code/nel/src/misc/eval_num_expr.cpp b/nel/src/misc/eval_num_expr.cpp
similarity index 100%
rename from code/nel/src/misc/eval_num_expr.cpp
rename to nel/src/misc/eval_num_expr.cpp
diff --git a/code/nel/src/misc/event_emitter_multi.cpp b/nel/src/misc/event_emitter_multi.cpp
similarity index 100%
rename from code/nel/src/misc/event_emitter_multi.cpp
rename to nel/src/misc/event_emitter_multi.cpp
diff --git a/code/nel/src/misc/event_listener.cpp b/nel/src/misc/event_listener.cpp
similarity index 100%
rename from code/nel/src/misc/event_listener.cpp
rename to nel/src/misc/event_listener.cpp
diff --git a/code/nel/src/misc/event_server.cpp b/nel/src/misc/event_server.cpp
similarity index 100%
rename from code/nel/src/misc/event_server.cpp
rename to nel/src/misc/event_server.cpp
diff --git a/code/nel/src/misc/events.cpp b/nel/src/misc/events.cpp
similarity index 100%
rename from code/nel/src/misc/events.cpp
rename to nel/src/misc/events.cpp
diff --git a/code/nel/src/misc/fast_floor.cpp b/nel/src/misc/fast_floor.cpp
similarity index 100%
rename from code/nel/src/misc/fast_floor.cpp
rename to nel/src/misc/fast_floor.cpp
diff --git a/code/nel/src/misc/fast_mem.cpp b/nel/src/misc/fast_mem.cpp
similarity index 100%
rename from code/nel/src/misc/fast_mem.cpp
rename to nel/src/misc/fast_mem.cpp
diff --git a/code/nel/src/misc/file.cpp b/nel/src/misc/file.cpp
similarity index 100%
rename from code/nel/src/misc/file.cpp
rename to nel/src/misc/file.cpp
diff --git a/code/nel/src/misc/fixed_size_allocator.cpp b/nel/src/misc/fixed_size_allocator.cpp
similarity index 100%
rename from code/nel/src/misc/fixed_size_allocator.cpp
rename to nel/src/misc/fixed_size_allocator.cpp
diff --git a/code/nel/src/misc/grid_traversal.cpp b/nel/src/misc/grid_traversal.cpp
similarity index 100%
rename from code/nel/src/misc/grid_traversal.cpp
rename to nel/src/misc/grid_traversal.cpp
diff --git a/code/nel/src/misc/gtk_displayer.cpp b/nel/src/misc/gtk_displayer.cpp
similarity index 100%
rename from code/nel/src/misc/gtk_displayer.cpp
rename to nel/src/misc/gtk_displayer.cpp
diff --git a/code/nel/src/misc/heap_memory.cpp b/nel/src/misc/heap_memory.cpp
similarity index 100%
rename from code/nel/src/misc/heap_memory.cpp
rename to nel/src/misc/heap_memory.cpp
diff --git a/code/nel/src/misc/hierarchical_timer.cpp b/nel/src/misc/hierarchical_timer.cpp
similarity index 100%
rename from code/nel/src/misc/hierarchical_timer.cpp
rename to nel/src/misc/hierarchical_timer.cpp
diff --git a/code/nel/src/misc/i18n.cpp b/nel/src/misc/i18n.cpp
similarity index 100%
rename from code/nel/src/misc/i18n.cpp
rename to nel/src/misc/i18n.cpp
diff --git a/code/nel/src/misc/i_streamed_package_provider.cpp b/nel/src/misc/i_streamed_package_provider.cpp
similarity index 100%
rename from code/nel/src/misc/i_streamed_package_provider.cpp
rename to nel/src/misc/i_streamed_package_provider.cpp
diff --git a/code/nel/src/misc/i_xml.cpp b/nel/src/misc/i_xml.cpp
similarity index 100%
rename from code/nel/src/misc/i_xml.cpp
rename to nel/src/misc/i_xml.cpp
diff --git a/code/nel/src/misc/inter_window_msg_queue.cpp b/nel/src/misc/inter_window_msg_queue.cpp
similarity index 100%
rename from code/nel/src/misc/inter_window_msg_queue.cpp
rename to nel/src/misc/inter_window_msg_queue.cpp
diff --git a/code/nel/src/misc/line.cpp b/nel/src/misc/line.cpp
similarity index 100%
rename from code/nel/src/misc/line.cpp
rename to nel/src/misc/line.cpp
diff --git a/code/nel/src/misc/log.cpp b/nel/src/misc/log.cpp
similarity index 100%
rename from code/nel/src/misc/log.cpp
rename to nel/src/misc/log.cpp
diff --git a/code/nel/src/misc/matrix.cpp b/nel/src/misc/matrix.cpp
similarity index 100%
rename from code/nel/src/misc/matrix.cpp
rename to nel/src/misc/matrix.cpp
diff --git a/code/nel/src/misc/md5.cpp b/nel/src/misc/md5.cpp
similarity index 100%
rename from code/nel/src/misc/md5.cpp
rename to nel/src/misc/md5.cpp
diff --git a/code/nel/src/misc/mem_displayer.cpp b/nel/src/misc/mem_displayer.cpp
similarity index 100%
rename from code/nel/src/misc/mem_displayer.cpp
rename to nel/src/misc/mem_displayer.cpp
diff --git a/code/nel/src/misc/mem_stream.cpp b/nel/src/misc/mem_stream.cpp
similarity index 100%
rename from code/nel/src/misc/mem_stream.cpp
rename to nel/src/misc/mem_stream.cpp
diff --git a/code/nel/src/misc/mouse_smoother.cpp b/nel/src/misc/mouse_smoother.cpp
similarity index 100%
rename from code/nel/src/misc/mouse_smoother.cpp
rename to nel/src/misc/mouse_smoother.cpp
diff --git a/code/nel/src/misc/mutex.cpp b/nel/src/misc/mutex.cpp
similarity index 100%
rename from code/nel/src/misc/mutex.cpp
rename to nel/src/misc/mutex.cpp
diff --git a/code/nel/src/misc/nel-misc.pc b/nel/src/misc/nel-misc.pc
similarity index 100%
rename from code/nel/src/misc/nel-misc.pc
rename to nel/src/misc/nel-misc.pc
diff --git a/code/nel/src/misc/nel-misc.pc.in b/nel/src/misc/nel-misc.pc.in
similarity index 100%
rename from code/nel/src/misc/nel-misc.pc.in
rename to nel/src/misc/nel-misc.pc.in
diff --git a/code/nel/src/misc/noise_value.cpp b/nel/src/misc/noise_value.cpp
similarity index 100%
rename from code/nel/src/misc/noise_value.cpp
rename to nel/src/misc/noise_value.cpp
diff --git a/code/nel/src/misc/o_xml.cpp b/nel/src/misc/o_xml.cpp
similarity index 100%
rename from code/nel/src/misc/o_xml.cpp
rename to nel/src/misc/o_xml.cpp
diff --git a/code/nel/src/misc/object_arena_allocator.cpp b/nel/src/misc/object_arena_allocator.cpp
similarity index 100%
rename from code/nel/src/misc/object_arena_allocator.cpp
rename to nel/src/misc/object_arena_allocator.cpp
diff --git a/code/nel/src/misc/p_thread.cpp b/nel/src/misc/p_thread.cpp
similarity index 100%
rename from code/nel/src/misc/p_thread.cpp
rename to nel/src/misc/p_thread.cpp
diff --git a/code/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
similarity index 100%
rename from code/nel/src/misc/path.cpp
rename to nel/src/misc/path.cpp
diff --git a/code/nel/src/misc/plane.cpp b/nel/src/misc/plane.cpp
similarity index 100%
rename from code/nel/src/misc/plane.cpp
rename to nel/src/misc/plane.cpp
diff --git a/code/nel/src/misc/polygon.cpp b/nel/src/misc/polygon.cpp
similarity index 100%
rename from code/nel/src/misc/polygon.cpp
rename to nel/src/misc/polygon.cpp
diff --git a/code/nel/src/misc/progress_callback.cpp b/nel/src/misc/progress_callback.cpp
similarity index 100%
rename from code/nel/src/misc/progress_callback.cpp
rename to nel/src/misc/progress_callback.cpp
diff --git a/code/nel/src/misc/quat.cpp b/nel/src/misc/quat.cpp
similarity index 100%
rename from code/nel/src/misc/quat.cpp
rename to nel/src/misc/quat.cpp
diff --git a/code/nel/src/misc/reader_writer.cpp b/nel/src/misc/reader_writer.cpp
similarity index 100%
rename from code/nel/src/misc/reader_writer.cpp
rename to nel/src/misc/reader_writer.cpp
diff --git a/code/nel/src/misc/rect.cpp b/nel/src/misc/rect.cpp
similarity index 100%
rename from code/nel/src/misc/rect.cpp
rename to nel/src/misc/rect.cpp
diff --git a/code/nel/src/misc/report.cpp b/nel/src/misc/report.cpp
similarity index 100%
rename from code/nel/src/misc/report.cpp
rename to nel/src/misc/report.cpp
diff --git a/code/nel/src/misc/rgba.cpp b/nel/src/misc/rgba.cpp
similarity index 100%
rename from code/nel/src/misc/rgba.cpp
rename to nel/src/misc/rgba.cpp
diff --git a/code/nel/src/misc/seven_zip.cpp b/nel/src/misc/seven_zip.cpp
similarity index 100%
rename from code/nel/src/misc/seven_zip.cpp
rename to nel/src/misc/seven_zip.cpp
diff --git a/code/nel/src/misc/sha1.cpp b/nel/src/misc/sha1.cpp
similarity index 100%
rename from code/nel/src/misc/sha1.cpp
rename to nel/src/misc/sha1.cpp
diff --git a/code/nel/src/misc/shared_memory.cpp b/nel/src/misc/shared_memory.cpp
similarity index 100%
rename from code/nel/src/misc/shared_memory.cpp
rename to nel/src/misc/shared_memory.cpp
diff --git a/code/nel/src/misc/sheet_id.cpp b/nel/src/misc/sheet_id.cpp
similarity index 100%
rename from code/nel/src/misc/sheet_id.cpp
rename to nel/src/misc/sheet_id.cpp
diff --git a/code/nel/src/misc/smart_ptr.cpp b/nel/src/misc/smart_ptr.cpp
similarity index 100%
rename from code/nel/src/misc/smart_ptr.cpp
rename to nel/src/misc/smart_ptr.cpp
diff --git a/code/nel/src/misc/sstring.cpp b/nel/src/misc/sstring.cpp
similarity index 100%
rename from code/nel/src/misc/sstring.cpp
rename to nel/src/misc/sstring.cpp
diff --git a/code/nel/src/misc/stdmisc.cpp b/nel/src/misc/stdmisc.cpp
similarity index 100%
rename from code/nel/src/misc/stdmisc.cpp
rename to nel/src/misc/stdmisc.cpp
diff --git a/code/nel/src/misc/stdmisc.h b/nel/src/misc/stdmisc.h
similarity index 100%
rename from code/nel/src/misc/stdmisc.h
rename to nel/src/misc/stdmisc.h
diff --git a/code/nel/src/misc/stop_watch.cpp b/nel/src/misc/stop_watch.cpp
similarity index 100%
rename from code/nel/src/misc/stop_watch.cpp
rename to nel/src/misc/stop_watch.cpp
diff --git a/code/nel/src/misc/stream.cpp b/nel/src/misc/stream.cpp
similarity index 100%
rename from code/nel/src/misc/stream.cpp
rename to nel/src/misc/stream.cpp
diff --git a/code/nel/src/misc/streamed_package.cpp b/nel/src/misc/streamed_package.cpp
similarity index 100%
rename from code/nel/src/misc/streamed_package.cpp
rename to nel/src/misc/streamed_package.cpp
diff --git a/code/nel/src/misc/streamed_package_manager.cpp b/nel/src/misc/streamed_package_manager.cpp
similarity index 100%
rename from code/nel/src/misc/streamed_package_manager.cpp
rename to nel/src/misc/streamed_package_manager.cpp
diff --git a/code/nel/src/misc/string_common.cpp b/nel/src/misc/string_common.cpp
similarity index 100%
rename from code/nel/src/misc/string_common.cpp
rename to nel/src/misc/string_common.cpp
diff --git a/code/nel/src/misc/string_mapper.cpp b/nel/src/misc/string_mapper.cpp
similarity index 100%
rename from code/nel/src/misc/string_mapper.cpp
rename to nel/src/misc/string_mapper.cpp
diff --git a/code/nel/src/misc/system_info.cpp b/nel/src/misc/system_info.cpp
similarity index 100%
rename from code/nel/src/misc/system_info.cpp
rename to nel/src/misc/system_info.cpp
diff --git a/code/nel/src/misc/system_utils.cpp b/nel/src/misc/system_utils.cpp
similarity index 100%
rename from code/nel/src/misc/system_utils.cpp
rename to nel/src/misc/system_utils.cpp
diff --git a/code/nel/src/misc/task_manager.cpp b/nel/src/misc/task_manager.cpp
similarity index 100%
rename from code/nel/src/misc/task_manager.cpp
rename to nel/src/misc/task_manager.cpp
diff --git a/code/nel/src/misc/tds.cpp b/nel/src/misc/tds.cpp
similarity index 100%
rename from code/nel/src/misc/tds.cpp
rename to nel/src/misc/tds.cpp
diff --git a/code/nel/src/misc/time_nl.cpp b/nel/src/misc/time_nl.cpp
similarity index 100%
rename from code/nel/src/misc/time_nl.cpp
rename to nel/src/misc/time_nl.cpp
diff --git a/code/nel/src/misc/triangle.cpp b/nel/src/misc/triangle.cpp
similarity index 100%
rename from code/nel/src/misc/triangle.cpp
rename to nel/src/misc/triangle.cpp
diff --git a/code/nel/src/misc/unicode.cpp b/nel/src/misc/unicode.cpp
similarity index 100%
rename from code/nel/src/misc/unicode.cpp
rename to nel/src/misc/unicode.cpp
diff --git a/code/nel/src/misc/variable.cpp b/nel/src/misc/variable.cpp
similarity index 100%
rename from code/nel/src/misc/variable.cpp
rename to nel/src/misc/variable.cpp
diff --git a/code/nel/src/misc/vector.cpp b/nel/src/misc/vector.cpp
similarity index 100%
rename from code/nel/src/misc/vector.cpp
rename to nel/src/misc/vector.cpp
diff --git a/code/nel/src/misc/vector_2f.cpp b/nel/src/misc/vector_2f.cpp
similarity index 100%
rename from code/nel/src/misc/vector_2f.cpp
rename to nel/src/misc/vector_2f.cpp
diff --git a/code/nel/src/misc/vectord.cpp b/nel/src/misc/vectord.cpp
similarity index 100%
rename from code/nel/src/misc/vectord.cpp
rename to nel/src/misc/vectord.cpp
diff --git a/code/nel/src/misc/win32_util.cpp b/nel/src/misc/win32_util.cpp
similarity index 100%
rename from code/nel/src/misc/win32_util.cpp
rename to nel/src/misc/win32_util.cpp
diff --git a/code/nel/src/misc/win_displayer.cpp b/nel/src/misc/win_displayer.cpp
similarity index 100%
rename from code/nel/src/misc/win_displayer.cpp
rename to nel/src/misc/win_displayer.cpp
diff --git a/code/nel/src/misc/win_event_emitter.cpp b/nel/src/misc/win_event_emitter.cpp
similarity index 100%
rename from code/nel/src/misc/win_event_emitter.cpp
rename to nel/src/misc/win_event_emitter.cpp
diff --git a/code/nel/src/misc/win_thread.cpp b/nel/src/misc/win_thread.cpp
similarity index 100%
rename from code/nel/src/misc/win_thread.cpp
rename to nel/src/misc/win_thread.cpp
diff --git a/code/nel/src/misc/window_displayer.cpp b/nel/src/misc/window_displayer.cpp
similarity index 100%
rename from code/nel/src/misc/window_displayer.cpp
rename to nel/src/misc/window_displayer.cpp
diff --git a/code/nel/src/misc/words_dictionary.cpp b/nel/src/misc/words_dictionary.cpp
similarity index 100%
rename from code/nel/src/misc/words_dictionary.cpp
rename to nel/src/misc/words_dictionary.cpp
diff --git a/code/nel/src/misc/xml_auto_ptr.cpp b/nel/src/misc/xml_auto_ptr.cpp
similarity index 100%
rename from code/nel/src/misc/xml_auto_ptr.cpp
rename to nel/src/misc/xml_auto_ptr.cpp
diff --git a/code/nel/src/misc/xml_pack.cpp b/nel/src/misc/xml_pack.cpp
similarity index 100%
rename from code/nel/src/misc/xml_pack.cpp
rename to nel/src/misc/xml_pack.cpp
diff --git a/code/nel/src/net/CMakeLists.txt b/nel/src/net/CMakeLists.txt
similarity index 100%
rename from code/nel/src/net/CMakeLists.txt
rename to nel/src/net/CMakeLists.txt
diff --git a/code/nel/src/net/admin.cpp b/nel/src/net/admin.cpp
similarity index 100%
rename from code/nel/src/net/admin.cpp
rename to nel/src/net/admin.cpp
diff --git a/code/nel/src/net/buf_client.cpp b/nel/src/net/buf_client.cpp
similarity index 100%
rename from code/nel/src/net/buf_client.cpp
rename to nel/src/net/buf_client.cpp
diff --git a/code/nel/src/net/buf_net_base.cpp b/nel/src/net/buf_net_base.cpp
similarity index 100%
rename from code/nel/src/net/buf_net_base.cpp
rename to nel/src/net/buf_net_base.cpp
diff --git a/code/nel/src/net/buf_server.cpp b/nel/src/net/buf_server.cpp
similarity index 100%
rename from code/nel/src/net/buf_server.cpp
rename to nel/src/net/buf_server.cpp
diff --git a/code/nel/src/net/buf_sock.cpp b/nel/src/net/buf_sock.cpp
similarity index 100%
rename from code/nel/src/net/buf_sock.cpp
rename to nel/src/net/buf_sock.cpp
diff --git a/code/nel/src/net/callback_client.cpp b/nel/src/net/callback_client.cpp
similarity index 100%
rename from code/nel/src/net/callback_client.cpp
rename to nel/src/net/callback_client.cpp
diff --git a/code/nel/src/net/callback_net_base.cpp b/nel/src/net/callback_net_base.cpp
similarity index 100%
rename from code/nel/src/net/callback_net_base.cpp
rename to nel/src/net/callback_net_base.cpp
diff --git a/code/nel/src/net/callback_server.cpp b/nel/src/net/callback_server.cpp
similarity index 100%
rename from code/nel/src/net/callback_server.cpp
rename to nel/src/net/callback_server.cpp
diff --git a/code/nel/src/net/dummy_tcp_sock.cpp b/nel/src/net/dummy_tcp_sock.cpp
similarity index 100%
rename from code/nel/src/net/dummy_tcp_sock.cpp
rename to nel/src/net/dummy_tcp_sock.cpp
diff --git a/code/nel/src/net/email.cpp b/nel/src/net/email.cpp
similarity index 100%
rename from code/nel/src/net/email.cpp
rename to nel/src/net/email.cpp
diff --git a/code/nel/src/net/inet_address.cpp b/nel/src/net/inet_address.cpp
similarity index 100%
rename from code/nel/src/net/inet_address.cpp
rename to nel/src/net/inet_address.cpp
diff --git a/code/nel/src/net/listen_sock.cpp b/nel/src/net/listen_sock.cpp
similarity index 100%
rename from code/nel/src/net/listen_sock.cpp
rename to nel/src/net/listen_sock.cpp
diff --git a/code/nel/src/net/login_client.cpp b/nel/src/net/login_client.cpp
similarity index 100%
rename from code/nel/src/net/login_client.cpp
rename to nel/src/net/login_client.cpp
diff --git a/code/nel/src/net/login_cookie.cpp b/nel/src/net/login_cookie.cpp
similarity index 100%
rename from code/nel/src/net/login_cookie.cpp
rename to nel/src/net/login_cookie.cpp
diff --git a/code/nel/src/net/login_server.cpp b/nel/src/net/login_server.cpp
similarity index 100%
rename from code/nel/src/net/login_server.cpp
rename to nel/src/net/login_server.cpp
diff --git a/code/nel/src/net/message.cpp b/nel/src/net/message.cpp
similarity index 100%
rename from code/nel/src/net/message.cpp
rename to nel/src/net/message.cpp
diff --git a/code/nel/src/net/message_recorder.cpp b/nel/src/net/message_recorder.cpp
similarity index 100%
rename from code/nel/src/net/message_recorder.cpp
rename to nel/src/net/message_recorder.cpp
diff --git a/code/nel/src/net/module.cpp b/nel/src/net/module.cpp
similarity index 100%
rename from code/nel/src/net/module.cpp
rename to nel/src/net/module.cpp
diff --git a/code/nel/src/net/module_common.cpp b/nel/src/net/module_common.cpp
similarity index 100%
rename from code/nel/src/net/module_common.cpp
rename to nel/src/net/module_common.cpp
diff --git a/code/nel/src/net/module_gateway.cpp b/nel/src/net/module_gateway.cpp
similarity index 100%
rename from code/nel/src/net/module_gateway.cpp
rename to nel/src/net/module_gateway.cpp
diff --git a/code/nel/src/net/module_gateway_transport.cpp b/nel/src/net/module_gateway_transport.cpp
similarity index 100%
rename from code/nel/src/net/module_gateway_transport.cpp
rename to nel/src/net/module_gateway_transport.cpp
diff --git a/code/nel/src/net/module_l5_transport.cpp b/nel/src/net/module_l5_transport.cpp
similarity index 100%
rename from code/nel/src/net/module_l5_transport.cpp
rename to nel/src/net/module_l5_transport.cpp
diff --git a/code/nel/src/net/module_local_gateway.cpp b/nel/src/net/module_local_gateway.cpp
similarity index 100%
rename from code/nel/src/net/module_local_gateway.cpp
rename to nel/src/net/module_local_gateway.cpp
diff --git a/code/nel/src/net/module_manager.cpp b/nel/src/net/module_manager.cpp
similarity index 100%
rename from code/nel/src/net/module_manager.cpp
rename to nel/src/net/module_manager.cpp
diff --git a/code/nel/src/net/module_message.cpp b/nel/src/net/module_message.cpp
similarity index 100%
rename from code/nel/src/net/module_message.cpp
rename to nel/src/net/module_message.cpp
diff --git a/code/nel/src/net/module_socket.cpp b/nel/src/net/module_socket.cpp
similarity index 100%
rename from code/nel/src/net/module_socket.cpp
rename to nel/src/net/module_socket.cpp
diff --git a/code/nel/src/net/naming_client.cpp b/nel/src/net/naming_client.cpp
similarity index 100%
rename from code/nel/src/net/naming_client.cpp
rename to nel/src/net/naming_client.cpp
diff --git a/code/nel/src/net/nel-net.pc.in b/nel/src/net/nel-net.pc.in
similarity index 100%
rename from code/nel/src/net/nel-net.pc.in
rename to nel/src/net/nel-net.pc.in
diff --git a/code/nel/src/net/net_displayer.cpp b/nel/src/net/net_displayer.cpp
similarity index 100%
rename from code/nel/src/net/net_displayer.cpp
rename to nel/src/net/net_displayer.cpp
diff --git a/code/nel/src/net/net_log.cpp b/nel/src/net/net_log.cpp
similarity index 100%
rename from code/nel/src/net/net_log.cpp
rename to nel/src/net/net_log.cpp
diff --git a/code/nel/src/net/net_manager.cpp b/nel/src/net/net_manager.cpp
similarity index 100%
rename from code/nel/src/net/net_manager.cpp
rename to nel/src/net/net_manager.cpp
diff --git a/code/nel/src/net/service.cpp b/nel/src/net/service.cpp
similarity index 100%
rename from code/nel/src/net/service.cpp
rename to nel/src/net/service.cpp
diff --git a/code/nel/src/net/sock.cpp b/nel/src/net/sock.cpp
similarity index 100%
rename from code/nel/src/net/sock.cpp
rename to nel/src/net/sock.cpp
diff --git a/code/nel/src/net/stdin_monitor_thread.cpp b/nel/src/net/stdin_monitor_thread.cpp
similarity index 100%
rename from code/nel/src/net/stdin_monitor_thread.cpp
rename to nel/src/net/stdin_monitor_thread.cpp
diff --git a/code/nel/src/net/stdin_monitor_thread.h b/nel/src/net/stdin_monitor_thread.h
similarity index 100%
rename from code/nel/src/net/stdin_monitor_thread.h
rename to nel/src/net/stdin_monitor_thread.h
diff --git a/code/nel/src/net/stdnet.cpp b/nel/src/net/stdnet.cpp
similarity index 100%
rename from code/nel/src/net/stdnet.cpp
rename to nel/src/net/stdnet.cpp
diff --git a/code/nel/src/net/stdnet.h b/nel/src/net/stdnet.h
similarity index 100%
rename from code/nel/src/net/stdnet.h
rename to nel/src/net/stdnet.h
diff --git a/code/nel/src/net/tcp_sock.cpp b/nel/src/net/tcp_sock.cpp
similarity index 100%
rename from code/nel/src/net/tcp_sock.cpp
rename to nel/src/net/tcp_sock.cpp
diff --git a/code/nel/src/net/transport_class.cpp b/nel/src/net/transport_class.cpp
similarity index 100%
rename from code/nel/src/net/transport_class.cpp
rename to nel/src/net/transport_class.cpp
diff --git a/code/nel/src/net/udp_sim_sock.cpp b/nel/src/net/udp_sim_sock.cpp
similarity index 100%
rename from code/nel/src/net/udp_sim_sock.cpp
rename to nel/src/net/udp_sim_sock.cpp
diff --git a/code/nel/src/net/udp_sock.cpp b/nel/src/net/udp_sock.cpp
similarity index 100%
rename from code/nel/src/net/udp_sock.cpp
rename to nel/src/net/udp_sock.cpp
diff --git a/code/nel/src/net/unified_network.cpp b/nel/src/net/unified_network.cpp
similarity index 100%
rename from code/nel/src/net/unified_network.cpp
rename to nel/src/net/unified_network.cpp
diff --git a/code/nel/src/net/unitime.cpp b/nel/src/net/unitime.cpp
similarity index 100%
rename from code/nel/src/net/unitime.cpp
rename to nel/src/net/unitime.cpp
diff --git a/code/nel/src/net/varpath.cpp b/nel/src/net/varpath.cpp
similarity index 100%
rename from code/nel/src/net/varpath.cpp
rename to nel/src/net/varpath.cpp
diff --git a/code/nel/src/pacs/CMakeLists.txt b/nel/src/pacs/CMakeLists.txt
similarity index 100%
rename from code/nel/src/pacs/CMakeLists.txt
rename to nel/src/pacs/CMakeLists.txt
diff --git a/code/nel/src/pacs/build_indoor.cpp b/nel/src/pacs/build_indoor.cpp
similarity index 100%
rename from code/nel/src/pacs/build_indoor.cpp
rename to nel/src/pacs/build_indoor.cpp
diff --git a/code/nel/src/pacs/chain.cpp b/nel/src/pacs/chain.cpp
similarity index 100%
rename from code/nel/src/pacs/chain.cpp
rename to nel/src/pacs/chain.cpp
diff --git a/code/nel/src/pacs/chain_quad.cpp b/nel/src/pacs/chain_quad.cpp
similarity index 100%
rename from code/nel/src/pacs/chain_quad.cpp
rename to nel/src/pacs/chain_quad.cpp
diff --git a/code/nel/src/pacs/collision_callback.cpp b/nel/src/pacs/collision_callback.cpp
similarity index 100%
rename from code/nel/src/pacs/collision_callback.cpp
rename to nel/src/pacs/collision_callback.cpp
diff --git a/code/nel/src/pacs/collision_desc.cpp b/nel/src/pacs/collision_desc.cpp
similarity index 100%
rename from code/nel/src/pacs/collision_desc.cpp
rename to nel/src/pacs/collision_desc.cpp
diff --git a/code/nel/src/pacs/collision_ot.cpp b/nel/src/pacs/collision_ot.cpp
similarity index 100%
rename from code/nel/src/pacs/collision_ot.cpp
rename to nel/src/pacs/collision_ot.cpp
diff --git a/code/nel/src/pacs/collision_surface_temp.cpp b/nel/src/pacs/collision_surface_temp.cpp
similarity index 100%
rename from code/nel/src/pacs/collision_surface_temp.cpp
rename to nel/src/pacs/collision_surface_temp.cpp
diff --git a/code/nel/src/pacs/edge_collide.cpp b/nel/src/pacs/edge_collide.cpp
similarity index 100%
rename from code/nel/src/pacs/edge_collide.cpp
rename to nel/src/pacs/edge_collide.cpp
diff --git a/code/nel/src/pacs/edge_quad.cpp b/nel/src/pacs/edge_quad.cpp
similarity index 100%
rename from code/nel/src/pacs/edge_quad.cpp
rename to nel/src/pacs/edge_quad.cpp
diff --git a/code/nel/src/pacs/exterior_mesh.cpp b/nel/src/pacs/exterior_mesh.cpp
similarity index 100%
rename from code/nel/src/pacs/exterior_mesh.cpp
rename to nel/src/pacs/exterior_mesh.cpp
diff --git a/code/nel/src/pacs/global_retriever.cpp b/nel/src/pacs/global_retriever.cpp
similarity index 100%
rename from code/nel/src/pacs/global_retriever.cpp
rename to nel/src/pacs/global_retriever.cpp
diff --git a/code/nel/src/pacs/local_retriever.cpp b/nel/src/pacs/local_retriever.cpp
similarity index 100%
rename from code/nel/src/pacs/local_retriever.cpp
rename to nel/src/pacs/local_retriever.cpp
diff --git a/code/nel/src/pacs/move_cell.cpp b/nel/src/pacs/move_cell.cpp
similarity index 100%
rename from code/nel/src/pacs/move_cell.cpp
rename to nel/src/pacs/move_cell.cpp
diff --git a/code/nel/src/pacs/move_container.cpp b/nel/src/pacs/move_container.cpp
similarity index 100%
rename from code/nel/src/pacs/move_container.cpp
rename to nel/src/pacs/move_container.cpp
diff --git a/code/nel/src/pacs/move_element.cpp b/nel/src/pacs/move_element.cpp
similarity index 100%
rename from code/nel/src/pacs/move_element.cpp
rename to nel/src/pacs/move_element.cpp
diff --git a/code/nel/src/pacs/move_primitive.cpp b/nel/src/pacs/move_primitive.cpp
similarity index 100%
rename from code/nel/src/pacs/move_primitive.cpp
rename to nel/src/pacs/move_primitive.cpp
diff --git a/code/nel/src/pacs/nel-pacs.pc.in b/nel/src/pacs/nel-pacs.pc.in
similarity index 100%
rename from code/nel/src/pacs/nel-pacs.pc.in
rename to nel/src/pacs/nel-pacs.pc.in
diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/nel/src/pacs/primitive_block_pacs.cpp
similarity index 100%
rename from code/nel/src/pacs/primitive_block_pacs.cpp
rename to nel/src/pacs/primitive_block_pacs.cpp
diff --git a/code/nel/src/pacs/primitive_world_image.cpp b/nel/src/pacs/primitive_world_image.cpp
similarity index 100%
rename from code/nel/src/pacs/primitive_world_image.cpp
rename to nel/src/pacs/primitive_world_image.cpp
diff --git a/code/nel/src/pacs/retrievable_surface.cpp b/nel/src/pacs/retrievable_surface.cpp
similarity index 100%
rename from code/nel/src/pacs/retrievable_surface.cpp
rename to nel/src/pacs/retrievable_surface.cpp
diff --git a/code/nel/src/pacs/retriever_bank.cpp b/nel/src/pacs/retriever_bank.cpp
similarity index 100%
rename from code/nel/src/pacs/retriever_bank.cpp
rename to nel/src/pacs/retriever_bank.cpp
diff --git a/code/nel/src/pacs/retriever_instance.cpp b/nel/src/pacs/retriever_instance.cpp
similarity index 100%
rename from code/nel/src/pacs/retriever_instance.cpp
rename to nel/src/pacs/retriever_instance.cpp
diff --git a/code/nel/src/pacs/stdpacs.cpp b/nel/src/pacs/stdpacs.cpp
similarity index 100%
rename from code/nel/src/pacs/stdpacs.cpp
rename to nel/src/pacs/stdpacs.cpp
diff --git a/code/nel/src/pacs/stdpacs.h b/nel/src/pacs/stdpacs.h
similarity index 100%
rename from code/nel/src/pacs/stdpacs.h
rename to nel/src/pacs/stdpacs.h
diff --git a/code/nel/src/pacs/surface_quad.cpp b/nel/src/pacs/surface_quad.cpp
similarity index 100%
rename from code/nel/src/pacs/surface_quad.cpp
rename to nel/src/pacs/surface_quad.cpp
diff --git a/code/nel/src/pacs/vector_2s.cpp b/nel/src/pacs/vector_2s.cpp
similarity index 100%
rename from code/nel/src/pacs/vector_2s.cpp
rename to nel/src/pacs/vector_2s.cpp
diff --git a/code/nel/src/pipeline/CMakeLists.txt b/nel/src/pipeline/CMakeLists.txt
similarity index 100%
rename from code/nel/src/pipeline/CMakeLists.txt
rename to nel/src/pipeline/CMakeLists.txt
diff --git a/code/nel/src/pipeline/database_config.cpp b/nel/src/pipeline/database_config.cpp
similarity index 100%
rename from code/nel/src/pipeline/database_config.cpp
rename to nel/src/pipeline/database_config.cpp
diff --git a/code/nel/src/pipeline/project_config.cpp b/nel/src/pipeline/project_config.cpp
similarity index 100%
rename from code/nel/src/pipeline/project_config.cpp
rename to nel/src/pipeline/project_config.cpp
diff --git a/code/nel/src/pipeline/tool_logger.cpp b/nel/src/pipeline/tool_logger.cpp
similarity index 100%
rename from code/nel/src/pipeline/tool_logger.cpp
rename to nel/src/pipeline/tool_logger.cpp
diff --git a/code/nel/src/sound/CMakeLists.txt b/nel/src/sound/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/CMakeLists.txt
rename to nel/src/sound/CMakeLists.txt
diff --git a/code/nel/src/sound/async_file_manager_sound.cpp b/nel/src/sound/async_file_manager_sound.cpp
similarity index 100%
rename from code/nel/src/sound/async_file_manager_sound.cpp
rename to nel/src/sound/async_file_manager_sound.cpp
diff --git a/code/nel/src/sound/audio_decoder.cpp b/nel/src/sound/audio_decoder.cpp
similarity index 100%
rename from code/nel/src/sound/audio_decoder.cpp
rename to nel/src/sound/audio_decoder.cpp
diff --git a/code/nel/src/sound/audio_decoder_ffmpeg.cpp b/nel/src/sound/audio_decoder_ffmpeg.cpp
similarity index 100%
rename from code/nel/src/sound/audio_decoder_ffmpeg.cpp
rename to nel/src/sound/audio_decoder_ffmpeg.cpp
diff --git a/code/nel/src/sound/audio_decoder_mp3.cpp b/nel/src/sound/audio_decoder_mp3.cpp
similarity index 100%
rename from code/nel/src/sound/audio_decoder_mp3.cpp
rename to nel/src/sound/audio_decoder_mp3.cpp
diff --git a/code/nel/src/sound/audio_decoder_vorbis.cpp b/nel/src/sound/audio_decoder_vorbis.cpp
similarity index 100%
rename from code/nel/src/sound/audio_decoder_vorbis.cpp
rename to nel/src/sound/audio_decoder_vorbis.cpp
diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/nel/src/sound/audio_mixer_user.cpp
similarity index 100%
rename from code/nel/src/sound/audio_mixer_user.cpp
rename to nel/src/sound/audio_mixer_user.cpp
diff --git a/code/nel/src/sound/background_sound.cpp b/nel/src/sound/background_sound.cpp
similarity index 100%
rename from code/nel/src/sound/background_sound.cpp
rename to nel/src/sound/background_sound.cpp
diff --git a/code/nel/src/sound/background_sound_manager.cpp b/nel/src/sound/background_sound_manager.cpp
similarity index 100%
rename from code/nel/src/sound/background_sound_manager.cpp
rename to nel/src/sound/background_sound_manager.cpp
diff --git a/code/nel/src/sound/background_source.cpp b/nel/src/sound/background_source.cpp
similarity index 100%
rename from code/nel/src/sound/background_source.cpp
rename to nel/src/sound/background_source.cpp
diff --git a/code/nel/src/sound/clustered_sound.cpp b/nel/src/sound/clustered_sound.cpp
similarity index 100%
rename from code/nel/src/sound/clustered_sound.cpp
rename to nel/src/sound/clustered_sound.cpp
diff --git a/code/nel/src/sound/complex_sound.cpp b/nel/src/sound/complex_sound.cpp
similarity index 100%
rename from code/nel/src/sound/complex_sound.cpp
rename to nel/src/sound/complex_sound.cpp
diff --git a/code/nel/src/sound/complex_source.cpp b/nel/src/sound/complex_source.cpp
similarity index 100%
rename from code/nel/src/sound/complex_source.cpp
rename to nel/src/sound/complex_source.cpp
diff --git a/code/nel/src/sound/context_sound.cpp b/nel/src/sound/context_sound.cpp
similarity index 100%
rename from code/nel/src/sound/context_sound.cpp
rename to nel/src/sound/context_sound.cpp
diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/nel/src/sound/driver/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/driver/CMakeLists.txt
rename to nel/src/sound/driver/CMakeLists.txt
diff --git a/code/nel/src/sound/driver/buffer.cpp b/nel/src/sound/driver/buffer.cpp
similarity index 100%
rename from code/nel/src/sound/driver/buffer.cpp
rename to nel/src/sound/driver/buffer.cpp
diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/nel/src/sound/driver/dsound/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/driver/dsound/CMakeLists.txt
rename to nel/src/sound/driver/dsound/CMakeLists.txt
diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.cpp b/nel/src/sound/driver/dsound/buffer_dsound.cpp
similarity index 100%
rename from code/nel/src/sound/driver/dsound/buffer_dsound.cpp
rename to nel/src/sound/driver/dsound/buffer_dsound.cpp
diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.h b/nel/src/sound/driver/dsound/buffer_dsound.h
similarity index 100%
rename from code/nel/src/sound/driver/dsound/buffer_dsound.h
rename to nel/src/sound/driver/dsound/buffer_dsound.h
diff --git a/code/nel/src/sound/driver/dsound/driver_dsound.def b/nel/src/sound/driver/dsound/driver_dsound.def
similarity index 100%
rename from code/nel/src/sound/driver/dsound/driver_dsound.def
rename to nel/src/sound/driver/dsound/driver_dsound.def
diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.cpp b/nel/src/sound/driver/dsound/listener_dsound.cpp
similarity index 100%
rename from code/nel/src/sound/driver/dsound/listener_dsound.cpp
rename to nel/src/sound/driver/dsound/listener_dsound.cpp
diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.h b/nel/src/sound/driver/dsound/listener_dsound.h
similarity index 100%
rename from code/nel/src/sound/driver/dsound/listener_dsound.h
rename to nel/src/sound/driver/dsound/listener_dsound.h
diff --git a/code/nel/src/sound/driver/dsound/resources.rc b/nel/src/sound/driver/dsound/resources.rc
similarity index 100%
rename from code/nel/src/sound/driver/dsound/resources.rc
rename to nel/src/sound/driver/dsound/resources.rc
diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp b/nel/src/sound/driver/dsound/sound_driver_dsound.cpp
similarity index 100%
rename from code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp
rename to nel/src/sound/driver/dsound/sound_driver_dsound.cpp
diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h b/nel/src/sound/driver/dsound/sound_driver_dsound.h
similarity index 100%
rename from code/nel/src/sound/driver/dsound/sound_driver_dsound.h
rename to nel/src/sound/driver/dsound/sound_driver_dsound.h
diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/nel/src/sound/driver/dsound/source_dsound.cpp
similarity index 100%
rename from code/nel/src/sound/driver/dsound/source_dsound.cpp
rename to nel/src/sound/driver/dsound/source_dsound.cpp
diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/nel/src/sound/driver/dsound/source_dsound.h
similarity index 100%
rename from code/nel/src/sound/driver/dsound/source_dsound.h
rename to nel/src/sound/driver/dsound/source_dsound.h
diff --git a/code/nel/src/sound/driver/dsound/stddsound.cpp b/nel/src/sound/driver/dsound/stddsound.cpp
similarity index 100%
rename from code/nel/src/sound/driver/dsound/stddsound.cpp
rename to nel/src/sound/driver/dsound/stddsound.cpp
diff --git a/code/nel/src/sound/driver/dsound/stddsound.h b/nel/src/sound/driver/dsound/stddsound.h
similarity index 100%
rename from code/nel/src/sound/driver/dsound/stddsound.h
rename to nel/src/sound/driver/dsound/stddsound.h
diff --git a/code/nel/src/sound/driver/effect.cpp b/nel/src/sound/driver/effect.cpp
similarity index 100%
rename from code/nel/src/sound/driver/effect.cpp
rename to nel/src/sound/driver/effect.cpp
diff --git a/code/nel/src/sound/driver/fmod/CMakeLists.txt b/nel/src/sound/driver/fmod/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/driver/fmod/CMakeLists.txt
rename to nel/src/sound/driver/fmod/CMakeLists.txt
diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.cpp b/nel/src/sound/driver/fmod/buffer_fmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/buffer_fmod.cpp
rename to nel/src/sound/driver/fmod/buffer_fmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.h b/nel/src/sound/driver/fmod/buffer_fmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/buffer_fmod.h
rename to nel/src/sound/driver/fmod/buffer_fmod.h
diff --git a/code/nel/src/sound/driver/fmod/driver_fmod.def b/nel/src/sound/driver/fmod/driver_fmod.def
similarity index 100%
rename from code/nel/src/sound/driver/fmod/driver_fmod.def
rename to nel/src/sound/driver/fmod/driver_fmod.def
diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.cpp b/nel/src/sound/driver/fmod/listener_fmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/listener_fmod.cpp
rename to nel/src/sound/driver/fmod/listener_fmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.h b/nel/src/sound/driver/fmod/listener_fmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/listener_fmod.h
rename to nel/src/sound/driver/fmod/listener_fmod.h
diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp b/nel/src/sound/driver/fmod/music_channel_fmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
rename to nel/src/sound/driver/fmod/music_channel_fmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/nel/src/sound/driver/fmod/music_channel_fmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/music_channel_fmod.h
rename to nel/src/sound/driver/fmod/music_channel_fmod.h
diff --git a/code/nel/src/sound/driver/fmod/resources.rc b/nel/src/sound/driver/fmod/resources.rc
similarity index 100%
rename from code/nel/src/sound/driver/fmod/resources.rc
rename to nel/src/sound/driver/fmod/resources.rc
diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
rename to nel/src/sound/driver/fmod/sound_driver_fmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.h b/nel/src/sound/driver/fmod/sound_driver_fmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/sound_driver_fmod.h
rename to nel/src/sound/driver/fmod/sound_driver_fmod.h
diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/nel/src/sound/driver/fmod/source_fmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/source_fmod.cpp
rename to nel/src/sound/driver/fmod/source_fmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/source_fmod.h b/nel/src/sound/driver/fmod/source_fmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/source_fmod.h
rename to nel/src/sound/driver/fmod/source_fmod.h
diff --git a/code/nel/src/sound/driver/fmod/stdfmod.cpp b/nel/src/sound/driver/fmod/stdfmod.cpp
similarity index 100%
rename from code/nel/src/sound/driver/fmod/stdfmod.cpp
rename to nel/src/sound/driver/fmod/stdfmod.cpp
diff --git a/code/nel/src/sound/driver/fmod/stdfmod.h b/nel/src/sound/driver/fmod/stdfmod.h
similarity index 100%
rename from code/nel/src/sound/driver/fmod/stdfmod.h
rename to nel/src/sound/driver/fmod/stdfmod.h
diff --git a/code/nel/src/sound/driver/listener.cpp b/nel/src/sound/driver/listener.cpp
similarity index 100%
rename from code/nel/src/sound/driver/listener.cpp
rename to nel/src/sound/driver/listener.cpp
diff --git a/code/nel/src/sound/driver/music_channel.cpp b/nel/src/sound/driver/music_channel.cpp
similarity index 100%
rename from code/nel/src/sound/driver/music_channel.cpp
rename to nel/src/sound/driver/music_channel.cpp
diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/nel/src/sound/driver/openal/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/driver/openal/CMakeLists.txt
rename to nel/src/sound/driver/openal/CMakeLists.txt
diff --git a/code/nel/src/sound/driver/openal/buffer_al.cpp b/nel/src/sound/driver/openal/buffer_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/buffer_al.cpp
rename to nel/src/sound/driver/openal/buffer_al.cpp
diff --git a/code/nel/src/sound/driver/openal/buffer_al.h b/nel/src/sound/driver/openal/buffer_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/buffer_al.h
rename to nel/src/sound/driver/openal/buffer_al.h
diff --git a/code/nel/src/sound/driver/openal/driver_openal.def b/nel/src/sound/driver/openal/driver_openal.def
similarity index 100%
rename from code/nel/src/sound/driver/openal/driver_openal.def
rename to nel/src/sound/driver/openal/driver_openal.def
diff --git a/code/nel/src/sound/driver/openal/effect_al.cpp b/nel/src/sound/driver/openal/effect_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/effect_al.cpp
rename to nel/src/sound/driver/openal/effect_al.cpp
diff --git a/code/nel/src/sound/driver/openal/effect_al.h b/nel/src/sound/driver/openal/effect_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/effect_al.h
rename to nel/src/sound/driver/openal/effect_al.h
diff --git a/code/nel/src/sound/driver/openal/ext_al.cpp b/nel/src/sound/driver/openal/ext_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/ext_al.cpp
rename to nel/src/sound/driver/openal/ext_al.cpp
diff --git a/code/nel/src/sound/driver/openal/ext_al.h b/nel/src/sound/driver/openal/ext_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/ext_al.h
rename to nel/src/sound/driver/openal/ext_al.h
diff --git a/code/nel/src/sound/driver/openal/listener_al.cpp b/nel/src/sound/driver/openal/listener_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/listener_al.cpp
rename to nel/src/sound/driver/openal/listener_al.cpp
diff --git a/code/nel/src/sound/driver/openal/listener_al.h b/nel/src/sound/driver/openal/listener_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/listener_al.h
rename to nel/src/sound/driver/openal/listener_al.h
diff --git a/code/nel/src/sound/driver/openal/resources.rc b/nel/src/sound/driver/openal/resources.rc
similarity index 100%
rename from code/nel/src/sound/driver/openal/resources.rc
rename to nel/src/sound/driver/openal/resources.rc
diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.cpp b/nel/src/sound/driver/openal/sound_driver_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/sound_driver_al.cpp
rename to nel/src/sound/driver/openal/sound_driver_al.cpp
diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.h b/nel/src/sound/driver/openal/sound_driver_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/sound_driver_al.h
rename to nel/src/sound/driver/openal/sound_driver_al.h
diff --git a/code/nel/src/sound/driver/openal/source_al.cpp b/nel/src/sound/driver/openal/source_al.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/source_al.cpp
rename to nel/src/sound/driver/openal/source_al.cpp
diff --git a/code/nel/src/sound/driver/openal/source_al.h b/nel/src/sound/driver/openal/source_al.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/source_al.h
rename to nel/src/sound/driver/openal/source_al.h
diff --git a/code/nel/src/sound/driver/openal/stdopenal.cpp b/nel/src/sound/driver/openal/stdopenal.cpp
similarity index 100%
rename from code/nel/src/sound/driver/openal/stdopenal.cpp
rename to nel/src/sound/driver/openal/stdopenal.cpp
diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/nel/src/sound/driver/openal/stdopenal.h
similarity index 100%
rename from code/nel/src/sound/driver/openal/stdopenal.h
rename to nel/src/sound/driver/openal/stdopenal.h
diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/nel/src/sound/driver/sound_driver.cpp
similarity index 100%
rename from code/nel/src/sound/driver/sound_driver.cpp
rename to nel/src/sound/driver/sound_driver.cpp
diff --git a/code/nel/src/sound/driver/source.cpp b/nel/src/sound/driver/source.cpp
similarity index 100%
rename from code/nel/src/sound/driver/source.cpp
rename to nel/src/sound/driver/source.cpp
diff --git a/code/nel/src/sound/driver/stdsound_lowlevel.cpp b/nel/src/sound/driver/stdsound_lowlevel.cpp
similarity index 100%
rename from code/nel/src/sound/driver/stdsound_lowlevel.cpp
rename to nel/src/sound/driver/stdsound_lowlevel.cpp
diff --git a/code/nel/src/sound/driver/stdsound_lowlevel.h b/nel/src/sound/driver/stdsound_lowlevel.h
similarity index 100%
rename from code/nel/src/sound/driver/stdsound_lowlevel.h
rename to nel/src/sound/driver/stdsound_lowlevel.h
diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/nel/src/sound/driver/xaudio2/CMakeLists.txt
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/CMakeLists.txt
rename to nel/src/sound/driver/xaudio2/CMakeLists.txt
diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp b/nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h b/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
rename to nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp b/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h b/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
rename to nel/src/sound/driver/xaudio2/buffer_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/driver_xaudio2.def b/nel/src/sound/driver/xaudio2/driver_xaudio2.def
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/driver_xaudio2.def
rename to nel/src/sound/driver/xaudio2/driver_xaudio2.def
diff --git a/code/nel/src/sound/driver/xaudio2/effect_xaudio2.cpp b/nel/src/sound/driver/xaudio2/effect_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/effect_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/effect_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/effect_xaudio2.h b/nel/src/sound/driver/xaudio2/effect_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/effect_xaudio2.h
rename to nel/src/sound/driver/xaudio2/effect_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp b/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h b/nel/src/sound/driver/xaudio2/listener_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
rename to nel/src/sound/driver/xaudio2/listener_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/resources.rc b/nel/src/sound/driver/xaudio2/resources.rc
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/resources.rc
rename to nel/src/sound/driver/xaudio2/resources.rc
diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp b/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h b/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
rename to nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
rename to nel/src/sound/driver/xaudio2/source_xaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h b/nel/src/sound/driver/xaudio2/source_xaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/source_xaudio2.h
rename to nel/src/sound/driver/xaudio2/source_xaudio2.h
diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp b/nel/src/sound/driver/xaudio2/stdxaudio2.cpp
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp
rename to nel/src/sound/driver/xaudio2/stdxaudio2.cpp
diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h b/nel/src/sound/driver/xaudio2/stdxaudio2.h
similarity index 100%
rename from code/nel/src/sound/driver/xaudio2/stdxaudio2.h
rename to nel/src/sound/driver/xaudio2/stdxaudio2.h
diff --git a/code/nel/src/sound/group_controller.cpp b/nel/src/sound/group_controller.cpp
similarity index 100%
rename from code/nel/src/sound/group_controller.cpp
rename to nel/src/sound/group_controller.cpp
diff --git a/code/nel/src/sound/group_controller_root.cpp b/nel/src/sound/group_controller_root.cpp
similarity index 100%
rename from code/nel/src/sound/group_controller_root.cpp
rename to nel/src/sound/group_controller_root.cpp
diff --git a/code/nel/src/sound/listener_user.cpp b/nel/src/sound/listener_user.cpp
similarity index 100%
rename from code/nel/src/sound/listener_user.cpp
rename to nel/src/sound/listener_user.cpp
diff --git a/code/nel/src/sound/mixing_track.cpp b/nel/src/sound/mixing_track.cpp
similarity index 100%
rename from code/nel/src/sound/mixing_track.cpp
rename to nel/src/sound/mixing_track.cpp
diff --git a/code/nel/src/sound/music_channel_fader.cpp b/nel/src/sound/music_channel_fader.cpp
similarity index 100%
rename from code/nel/src/sound/music_channel_fader.cpp
rename to nel/src/sound/music_channel_fader.cpp
diff --git a/code/nel/src/sound/music_sound.cpp b/nel/src/sound/music_sound.cpp
similarity index 100%
rename from code/nel/src/sound/music_sound.cpp
rename to nel/src/sound/music_sound.cpp
diff --git a/code/nel/src/sound/music_sound_manager.cpp b/nel/src/sound/music_sound_manager.cpp
similarity index 100%
rename from code/nel/src/sound/music_sound_manager.cpp
rename to nel/src/sound/music_sound_manager.cpp
diff --git a/code/nel/src/sound/music_source.cpp b/nel/src/sound/music_source.cpp
similarity index 100%
rename from code/nel/src/sound/music_source.cpp
rename to nel/src/sound/music_source.cpp
diff --git a/code/nel/src/sound/nel-sound.pc.in b/nel/src/sound/nel-sound.pc.in
similarity index 100%
rename from code/nel/src/sound/nel-sound.pc.in
rename to nel/src/sound/nel-sound.pc.in
diff --git a/code/nel/src/sound/sample_bank.cpp b/nel/src/sound/sample_bank.cpp
similarity index 100%
rename from code/nel/src/sound/sample_bank.cpp
rename to nel/src/sound/sample_bank.cpp
diff --git a/code/nel/src/sound/sample_bank_manager.cpp b/nel/src/sound/sample_bank_manager.cpp
similarity index 100%
rename from code/nel/src/sound/sample_bank_manager.cpp
rename to nel/src/sound/sample_bank_manager.cpp
diff --git a/code/nel/src/sound/simple_sound.cpp b/nel/src/sound/simple_sound.cpp
similarity index 100%
rename from code/nel/src/sound/simple_sound.cpp
rename to nel/src/sound/simple_sound.cpp
diff --git a/code/nel/src/sound/simple_source.cpp b/nel/src/sound/simple_source.cpp
similarity index 100%
rename from code/nel/src/sound/simple_source.cpp
rename to nel/src/sound/simple_source.cpp
diff --git a/code/nel/src/sound/sound.cpp b/nel/src/sound/sound.cpp
similarity index 100%
rename from code/nel/src/sound/sound.cpp
rename to nel/src/sound/sound.cpp
diff --git a/code/nel/src/sound/sound_anim_manager.cpp b/nel/src/sound/sound_anim_manager.cpp
similarity index 100%
rename from code/nel/src/sound/sound_anim_manager.cpp
rename to nel/src/sound/sound_anim_manager.cpp
diff --git a/code/nel/src/sound/sound_anim_marker.cpp b/nel/src/sound/sound_anim_marker.cpp
similarity index 100%
rename from code/nel/src/sound/sound_anim_marker.cpp
rename to nel/src/sound/sound_anim_marker.cpp
diff --git a/code/nel/src/sound/sound_animation.cpp b/nel/src/sound/sound_animation.cpp
similarity index 100%
rename from code/nel/src/sound/sound_animation.cpp
rename to nel/src/sound/sound_animation.cpp
diff --git a/code/nel/src/sound/sound_bank.cpp b/nel/src/sound/sound_bank.cpp
similarity index 100%
rename from code/nel/src/sound/sound_bank.cpp
rename to nel/src/sound/sound_bank.cpp
diff --git a/code/nel/src/sound/source_common.cpp b/nel/src/sound/source_common.cpp
similarity index 100%
rename from code/nel/src/sound/source_common.cpp
rename to nel/src/sound/source_common.cpp
diff --git a/code/nel/src/sound/source_music_channel.cpp b/nel/src/sound/source_music_channel.cpp
similarity index 100%
rename from code/nel/src/sound/source_music_channel.cpp
rename to nel/src/sound/source_music_channel.cpp
diff --git a/code/nel/src/sound/stdsound.cpp b/nel/src/sound/stdsound.cpp
similarity index 100%
rename from code/nel/src/sound/stdsound.cpp
rename to nel/src/sound/stdsound.cpp
diff --git a/code/nel/src/sound/stdsound.h b/nel/src/sound/stdsound.h
similarity index 100%
rename from code/nel/src/sound/stdsound.h
rename to nel/src/sound/stdsound.h
diff --git a/code/nel/src/sound/stream_file_sound.cpp b/nel/src/sound/stream_file_sound.cpp
similarity index 100%
rename from code/nel/src/sound/stream_file_sound.cpp
rename to nel/src/sound/stream_file_sound.cpp
diff --git a/code/nel/src/sound/stream_file_source.cpp b/nel/src/sound/stream_file_source.cpp
similarity index 100%
rename from code/nel/src/sound/stream_file_source.cpp
rename to nel/src/sound/stream_file_source.cpp
diff --git a/code/nel/src/sound/stream_sound.cpp b/nel/src/sound/stream_sound.cpp
similarity index 100%
rename from code/nel/src/sound/stream_sound.cpp
rename to nel/src/sound/stream_sound.cpp
diff --git a/code/nel/src/sound/stream_source.cpp b/nel/src/sound/stream_source.cpp
similarity index 100%
rename from code/nel/src/sound/stream_source.cpp
rename to nel/src/sound/stream_source.cpp
diff --git a/code/nel/src/web/CMakeLists.txt b/nel/src/web/CMakeLists.txt
similarity index 100%
rename from code/nel/src/web/CMakeLists.txt
rename to nel/src/web/CMakeLists.txt
diff --git a/code/nel/src/web/curl_certificates.cpp b/nel/src/web/curl_certificates.cpp
similarity index 100%
rename from code/nel/src/web/curl_certificates.cpp
rename to nel/src/web/curl_certificates.cpp
diff --git a/code/nel/src/web/http_client_curl.cpp b/nel/src/web/http_client_curl.cpp
similarity index 100%
rename from code/nel/src/web/http_client_curl.cpp
rename to nel/src/web/http_client_curl.cpp
diff --git a/code/nel/src/web/http_package_provider.cpp b/nel/src/web/http_package_provider.cpp
similarity index 100%
rename from code/nel/src/web/http_package_provider.cpp
rename to nel/src/web/http_package_provider.cpp
diff --git a/code/nel/src/web/nel-web.pc.in b/nel/src/web/nel-web.pc.in
similarity index 100%
rename from code/nel/src/web/nel-web.pc.in
rename to nel/src/web/nel-web.pc.in
diff --git a/code/nel/src/web/stdweb.cpp b/nel/src/web/stdweb.cpp
similarity index 100%
rename from code/nel/src/web/stdweb.cpp
rename to nel/src/web/stdweb.cpp
diff --git a/code/nel/src/web/stdweb.h b/nel/src/web/stdweb.h
similarity index 100%
rename from code/nel/src/web/stdweb.h
rename to nel/src/web/stdweb.h
diff --git a/code/nel/tools/3d/CMakeLists.txt b/nel/tools/3d/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/CMakeLists.txt
rename to nel/tools/3d/CMakeLists.txt
diff --git a/code/nel/tools/3d/anim_builder/CMakeLists.txt b/nel/tools/3d/anim_builder/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/anim_builder/CMakeLists.txt
rename to nel/tools/3d/anim_builder/CMakeLists.txt
diff --git a/code/nel/tools/3d/anim_builder/anim_builder.cpp b/nel/tools/3d/anim_builder/anim_builder.cpp
similarity index 100%
rename from code/nel/tools/3d/anim_builder/anim_builder.cpp
rename to nel/tools/3d/anim_builder/anim_builder.cpp
diff --git a/code/nel/tools/3d/anim_builder/anim_builder.h b/nel/tools/3d/anim_builder/anim_builder.h
similarity index 100%
rename from code/nel/tools/3d/anim_builder/anim_builder.h
rename to nel/tools/3d/anim_builder/anim_builder.h
diff --git a/code/nel/tools/3d/anim_builder/blue_pill.ico b/nel/tools/3d/anim_builder/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/anim_builder/blue_pill.ico
rename to nel/tools/3d/anim_builder/blue_pill.ico
diff --git a/code/nel/tools/3d/anim_builder/main.rc b/nel/tools/3d/anim_builder/main.rc
similarity index 100%
rename from code/nel/tools/3d/anim_builder/main.rc
rename to nel/tools/3d/anim_builder/main.rc
diff --git a/code/nel/tools/3d/animation_set_builder/CMakeLists.txt b/nel/tools/3d/animation_set_builder/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/CMakeLists.txt
rename to nel/tools/3d/animation_set_builder/CMakeLists.txt
diff --git a/code/nel/tools/3d/animation_set_builder/anim_utility.cpp b/nel/tools/3d/animation_set_builder/anim_utility.cpp
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/anim_utility.cpp
rename to nel/tools/3d/animation_set_builder/anim_utility.cpp
diff --git a/code/nel/tools/3d/animation_set_builder/anim_utility.h b/nel/tools/3d/animation_set_builder/anim_utility.h
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/anim_utility.h
rename to nel/tools/3d/animation_set_builder/anim_utility.h
diff --git a/code/nel/tools/3d/animation_set_builder/animation_set_builder.cpp b/nel/tools/3d/animation_set_builder/animation_set_builder.cpp
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/animation_set_builder.cpp
rename to nel/tools/3d/animation_set_builder/animation_set_builder.cpp
diff --git a/code/nel/tools/3d/animation_set_builder/gold_pill.ico b/nel/tools/3d/animation_set_builder/gold_pill.ico
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/gold_pill.ico
rename to nel/tools/3d/animation_set_builder/gold_pill.ico
diff --git a/code/nel/tools/3d/animation_set_builder/main.rc b/nel/tools/3d/animation_set_builder/main.rc
similarity index 100%
rename from code/nel/tools/3d/animation_set_builder/main.rc
rename to nel/tools/3d/animation_set_builder/main.rc
diff --git a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt b/nel/tools/3d/build_clod_bank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/CMakeLists.txt
rename to nel/tools/3d/build_clod_bank/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_clod_bank/blue_pill.ico b/nel/tools/3d/build_clod_bank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/blue_pill.ico
rename to nel/tools/3d/build_clod_bank/blue_pill.ico
diff --git a/code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp b/nel/tools/3d/build_clod_bank/build_clod_bank.cpp
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp
rename to nel/tools/3d/build_clod_bank/build_clod_bank.cpp
diff --git a/code/nel/tools/3d/build_clod_bank/config_example.cfg b/nel/tools/3d/build_clod_bank/config_example.cfg
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/config_example.cfg
rename to nel/tools/3d/build_clod_bank/config_example.cfg
diff --git a/code/nel/tools/3d/build_clod_bank/main.rc b/nel/tools/3d/build_clod_bank/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/main.rc
rename to nel/tools/3d/build_clod_bank/main.rc
diff --git a/code/nel/tools/3d/build_clod_bank/path_config_example.cfg b/nel/tools/3d/build_clod_bank/path_config_example.cfg
similarity index 100%
rename from code/nel/tools/3d/build_clod_bank/path_config_example.cfg
rename to nel/tools/3d/build_clod_bank/path_config_example.cfg
diff --git a/code/nel/tools/3d/build_clodtex/CMakeLists.txt b/nel/tools/3d/build_clodtex/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/CMakeLists.txt
rename to nel/tools/3d/build_clodtex/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_clodtex/blue_pill.ico b/nel/tools/3d/build_clodtex/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/blue_pill.ico
rename to nel/tools/3d/build_clodtex/blue_pill.ico
diff --git a/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp b/nel/tools/3d/build_clodtex/lod_texture_builder.cpp
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp
rename to nel/tools/3d/build_clodtex/lod_texture_builder.cpp
diff --git a/code/nel/tools/3d/build_clodtex/lod_texture_builder.h b/nel/tools/3d/build_clodtex/lod_texture_builder.h
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/lod_texture_builder.h
rename to nel/tools/3d/build_clodtex/lod_texture_builder.h
diff --git a/code/nel/tools/3d/build_clodtex/main.cpp b/nel/tools/3d/build_clodtex/main.cpp
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/main.cpp
rename to nel/tools/3d/build_clodtex/main.cpp
diff --git a/code/nel/tools/3d/build_clodtex/main.rc b/nel/tools/3d/build_clodtex/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_clodtex/main.rc
rename to nel/tools/3d/build_clodtex/main.rc
diff --git a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt b/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
rename to nel/tools/3d/build_coarse_mesh/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_coarse_mesh/blue_pill.ico b/nel/tools/3d/build_coarse_mesh/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_coarse_mesh/blue_pill.ico
rename to nel/tools/3d/build_coarse_mesh/blue_pill.ico
diff --git a/code/nel/tools/3d/build_coarse_mesh/build.cfg b/nel/tools/3d/build_coarse_mesh/build.cfg
similarity index 100%
rename from code/nel/tools/3d/build_coarse_mesh/build.cfg
rename to nel/tools/3d/build_coarse_mesh/build.cfg
diff --git a/code/nel/tools/3d/build_coarse_mesh/build_coarse_mesh.cpp b/nel/tools/3d/build_coarse_mesh/build_coarse_mesh.cpp
similarity index 100%
rename from code/nel/tools/3d/build_coarse_mesh/build_coarse_mesh.cpp
rename to nel/tools/3d/build_coarse_mesh/build_coarse_mesh.cpp
diff --git a/code/nel/tools/3d/build_coarse_mesh/main.rc b/nel/tools/3d/build_coarse_mesh/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_coarse_mesh/main.rc
rename to nel/tools/3d/build_coarse_mesh/main.rc
diff --git a/code/nel/tools/3d/build_far_bank/CMakeLists.txt b/nel/tools/3d/build_far_bank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_far_bank/CMakeLists.txt
rename to nel/tools/3d/build_far_bank/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_far_bank/blue_pill.ico b/nel/tools/3d/build_far_bank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_far_bank/blue_pill.ico
rename to nel/tools/3d/build_far_bank/blue_pill.ico
diff --git a/code/nel/tools/3d/build_far_bank/build_far_bank.cpp b/nel/tools/3d/build_far_bank/build_far_bank.cpp
similarity index 100%
rename from code/nel/tools/3d/build_far_bank/build_far_bank.cpp
rename to nel/tools/3d/build_far_bank/build_far_bank.cpp
diff --git a/code/nel/tools/3d/build_far_bank/main.rc b/nel/tools/3d/build_far_bank/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_far_bank/main.rc
rename to nel/tools/3d/build_far_bank/main.rc
diff --git a/code/nel/tools/3d/build_gamedata/0_setup.bat b/nel/tools/3d/build_gamedata/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/0_setup.bat
rename to nel/tools/3d/build_gamedata/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/1_clean.bat b/nel/tools/3d/build_gamedata/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/1_clean.bat
rename to nel/tools/3d/build_gamedata/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/2_export.bat b/nel/tools/3d/build_gamedata/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/2_export.bat
rename to nel/tools/3d/build_gamedata/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/3_build.bat b/nel/tools/3d/build_gamedata/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/3_build.bat
rename to nel/tools/3d/build_gamedata/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/4_install.bat b/nel/tools/3d/build_gamedata/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/4_install.bat
rename to nel/tools/3d/build_gamedata/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/Howto export.txt b/nel/tools/3d/build_gamedata/Howto export.txt
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/Howto export.txt
rename to nel/tools/3d/build_gamedata/Howto export.txt
diff --git a/code/nel/tools/3d/build_gamedata/_idle.bat b/nel/tools/3d/build_gamedata/_idle.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/_idle.bat
rename to nel/tools/3d/build_gamedata/_idle.bat
diff --git a/code/nel/tools/3d/build_gamedata/cfg/config.cfg b/nel/tools/3d/build_gamedata/cfg/config.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/config.cfg
rename to nel/tools/3d/build_gamedata/cfg/config.cfg
diff --git a/code/nel/tools/3d/build_gamedata/cfg/directories.cfg b/nel/tools/3d/build_gamedata/cfg/directories.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/directories.cfg
rename to nel/tools/3d/build_gamedata/cfg/directories.cfg
diff --git a/code/nel/tools/3d/build_gamedata/cfg/panoply.cfg b/nel/tools/3d/build_gamedata/cfg/panoply.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/panoply.cfg
rename to nel/tools/3d/build_gamedata/cfg/panoply.cfg
diff --git a/code/nel/tools/3d/build_gamedata/cfg/properties_draft.cfg b/nel/tools/3d/build_gamedata/cfg/properties_draft.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/properties_draft.cfg
rename to nel/tools/3d/build_gamedata/cfg/properties_draft.cfg
diff --git a/code/nel/tools/3d/build_gamedata/cfg/properties_final.cfg b/nel/tools/3d/build_gamedata/cfg/properties_final.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/properties_final.cfg
rename to nel/tools/3d/build_gamedata/cfg/properties_final.cfg
diff --git a/code/nel/tools/3d/build_gamedata/cfg/site.cfg b/nel/tools/3d/build_gamedata/cfg/site.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/cfg/site.cfg
rename to nel/tools/3d/build_gamedata/cfg/site.cfg
diff --git a/code/nel/tools/3d/build_gamedata/client_clean.bat b/nel/tools/3d/build_gamedata/client_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/client_clean.bat
rename to nel/tools/3d/build_gamedata/client_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/client_setup.bat b/nel/tools/3d/build_gamedata/client_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/client_setup.bat
rename to nel/tools/3d/build_gamedata/client_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/export_build_all_data.bat b/nel/tools/3d/build_gamedata/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/export_build_data.bat b/nel/tools/3d/build_gamedata/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/export_build_data.bat
rename to nel/tools/3d/build_gamedata/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/0_setup.bat b/nel/tools/3d/build_gamedata/processes/anim/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/anim/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/1_clean.bat b/nel/tools/3d/build_gamedata/processes/anim/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/anim/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/2_export.bat b/nel/tools/3d/build_gamedata/processes/anim/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/anim/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/3_build.bat b/nel/tools/3d/build_gamedata/processes/anim/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/anim/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/4_install.bat b/nel/tools/3d/build_gamedata/processes/anim/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/anim/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/anim/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/anim/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/anim/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/anim/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/maxscript/anim_export.ms b/nel/tools/3d/build_gamedata/processes/anim/maxscript/anim_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/maxscript/anim_export.ms
rename to nel/tools/3d/build_gamedata/processes/anim/maxscript/anim_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/sh/build.sh b/nel/tools/3d/build_gamedata/processes/anim/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/anim/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/sh/export.sh b/nel/tools/3d/build_gamedata/processes/anim/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/anim/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/anim/sh/install.sh b/nel/tools/3d/build_gamedata/processes/anim/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/anim/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/anim/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/0_setup.bat b/nel/tools/3d/build_gamedata/processes/clodbank/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/1_clean.bat b/nel/tools/3d/build_gamedata/processes/clodbank/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/2_export.bat b/nel/tools/3d/build_gamedata/processes/clodbank/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/3_build.bat b/nel/tools/3d/build_gamedata/processes/clodbank/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/4_install.bat b/nel/tools/3d/build_gamedata/processes/clodbank/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/cfg/local_path.cfg b/nel/tools/3d/build_gamedata/processes/clodbank/cfg/local_path.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/cfg/local_path.cfg
rename to nel/tools/3d/build_gamedata/processes/clodbank/cfg/local_path.cfg
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/clodbank/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/clodbank/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/clodbank/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/nel/tools/3d/build_gamedata/processes/clodbank/maxscript/clod_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/maxscript/clod_export.ms
rename to nel/tools/3d/build_gamedata/processes/clodbank/maxscript/clod_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/process_doc.txt b/nel/tools/3d/build_gamedata/processes/clodbank/process_doc.txt
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/process_doc.txt
rename to nel/tools/3d/build_gamedata/processes/clodbank/process_doc.txt
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/sh/build.sh b/nel/tools/3d/build_gamedata/processes/clodbank/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/clodbank/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/sh/export.sh b/nel/tools/3d/build_gamedata/processes/clodbank/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/clodbank/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/clodbank/sh/install.sh b/nel/tools/3d/build_gamedata/processes/clodbank/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/clodbank/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/clodbank/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/0_setup.bat b/nel/tools/3d/build_gamedata/processes/displace/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/displace/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/1_clean.bat b/nel/tools/3d/build_gamedata/processes/displace/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/displace/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/2_export.bat b/nel/tools/3d/build_gamedata/processes/displace/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/displace/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/3_build.bat b/nel/tools/3d/build_gamedata/processes/displace/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/displace/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/4_install.bat b/nel/tools/3d/build_gamedata/processes/displace/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/displace/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/displace/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/displace/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/displace/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/displace/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/sh/export.sh b/nel/tools/3d/build_gamedata/processes/displace/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/displace/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/displace/sh/install.sh b/nel/tools/3d/build_gamedata/processes/displace/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/displace/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/displace/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/0_setup.bat b/nel/tools/3d/build_gamedata/processes/farbank/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/1_clean.bat b/nel/tools/3d/build_gamedata/processes/farbank/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/2_export.bat b/nel/tools/3d/build_gamedata/processes/farbank/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/3_build.bat b/nel/tools/3d/build_gamedata/processes/farbank/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/4_install.bat b/nel/tools/3d/build_gamedata/processes/farbank/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/farbank/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/farbank/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/farbank/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/sh/build.sh b/nel/tools/3d/build_gamedata/processes/farbank/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/farbank/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/farbank/sh/install.sh b/nel/tools/3d/build_gamedata/processes/farbank/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/farbank/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/farbank/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/0_setup.bat b/nel/tools/3d/build_gamedata/processes/font/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/font/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/1_clean.bat b/nel/tools/3d/build_gamedata/processes/font/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/font/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/2_export.bat b/nel/tools/3d/build_gamedata/processes/font/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/font/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/3_build.bat b/nel/tools/3d/build_gamedata/processes/font/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/font/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/4_install.bat b/nel/tools/3d/build_gamedata/processes/font/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/font/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/font/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/font/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/font/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/font/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/sh/export.sh b/nel/tools/3d/build_gamedata/processes/font/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/font/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/font/sh/install.sh b/nel/tools/3d/build_gamedata/processes/font/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/font/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/font/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/0_setup.bat b/nel/tools/3d/build_gamedata/processes/ig/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/ig/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/1_clean.bat b/nel/tools/3d/build_gamedata/processes/ig/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/ig/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/2_export.bat b/nel/tools/3d/build_gamedata/processes/ig/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/ig/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/3_build.bat b/nel/tools/3d/build_gamedata/processes/ig/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/ig/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/4_install.bat b/nel/tools/3d/build_gamedata/processes/ig/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/ig/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/ig/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/ig/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/ig/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/ig/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/maxscript/ig_export.ms b/nel/tools/3d/build_gamedata/processes/ig/maxscript/ig_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/maxscript/ig_export.ms
rename to nel/tools/3d/build_gamedata/processes/ig/maxscript/ig_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/sh/build.sh b/nel/tools/3d/build_gamedata/processes/ig/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/ig/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/sh/export.sh b/nel/tools/3d/build_gamedata/processes/ig/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/ig/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig/sh/install.sh b/nel/tools/3d/build_gamedata/processes/ig/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/ig/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/0_setup.bat b/nel/tools/3d/build_gamedata/processes/ig_light/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/1_clean.bat b/nel/tools/3d/build_gamedata/processes/ig_light/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/2_export.bat b/nel/tools/3d/build_gamedata/processes/ig_light/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/3_build.bat b/nel/tools/3d/build_gamedata/processes/ig_light/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/4_install.bat b/nel/tools/3d/build_gamedata/processes/ig_light/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/ig_light/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/ig_light/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/ig_light/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ig_light/sh/install.sh b/nel/tools/3d/build_gamedata/processes/ig_light/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ig_light/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/ig_light/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/0_setup.bat b/nel/tools/3d/build_gamedata/processes/interface/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/interface/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/1_clean.bat b/nel/tools/3d/build_gamedata/processes/interface/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/interface/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/2_export.bat b/nel/tools/3d/build_gamedata/processes/interface/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/interface/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/3_build.bat b/nel/tools/3d/build_gamedata/processes/interface/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/interface/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/4_install.bat b/nel/tools/3d/build_gamedata/processes/interface/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/interface/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/interface/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/interface/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/interface/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/interface/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/sh/build.sh b/nel/tools/3d/build_gamedata/processes/interface/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/interface/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/sh/export.sh b/nel/tools/3d/build_gamedata/processes/interface/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/interface/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/interface/sh/install.sh b/nel/tools/3d/build_gamedata/processes/interface/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/interface/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/interface/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/0_setup.bat b/nel/tools/3d/build_gamedata/processes/ligo/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/1_clean.bat b/nel/tools/3d/build_gamedata/processes/ligo/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/2_export.bat b/nel/tools/3d/build_gamedata/processes/ligo/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/3_build.bat b/nel/tools/3d/build_gamedata/processes/ligo/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/4_install.bat b/nel/tools/3d/build_gamedata/processes/ligo/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/ligo/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/ligo/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/nel/tools/3d/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
rename to nel/tools/3d/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/sh/build.sh b/nel/tools/3d/build_gamedata/processes/ligo/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/ligo/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/sh/export.sh b/nel/tools/3d/build_gamedata/processes/ligo/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/ligo/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ligo/sh/renametozone.bat b/nel/tools/3d/build_gamedata/processes/ligo/sh/renametozone.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ligo/sh/renametozone.bat
rename to nel/tools/3d/build_gamedata/processes/ligo/sh/renametozone.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/0_setup.bat b/nel/tools/3d/build_gamedata/processes/map/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/map/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/1_clean.bat b/nel/tools/3d/build_gamedata/processes/map/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/map/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/2_export.bat b/nel/tools/3d/build_gamedata/processes/map/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/map/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/3_build.bat b/nel/tools/3d/build_gamedata/processes/map/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/map/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/4_install.bat b/nel/tools/3d/build_gamedata/processes/map/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/map/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/map/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/map/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/map/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/map/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/sh/build.sh b/nel/tools/3d/build_gamedata/processes/map/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/map/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/sh/export.sh b/nel/tools/3d/build_gamedata/processes/map/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/map/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/map/sh/install.sh b/nel/tools/3d/build_gamedata/processes/map/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/map/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/map/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/0_setup.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/1_clean.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/2_export.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/3_build.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/4_install.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/nel/tools/3d/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/export.sh b/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/install.sh b/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/pacs_prim/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/pacs_prim/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/0_setup.bat b/nel/tools/3d/build_gamedata/processes/ps/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/ps/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/1_clean.bat b/nel/tools/3d/build_gamedata/processes/ps/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/ps/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/2_export.bat b/nel/tools/3d/build_gamedata/processes/ps/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/ps/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/3_build.bat b/nel/tools/3d/build_gamedata/processes/ps/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/ps/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/4_install.bat b/nel/tools/3d/build_gamedata/processes/ps/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/ps/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/ps/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/ps/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/ps/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/ps/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/sh/export.sh b/nel/tools/3d/build_gamedata/processes/ps/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/ps/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/ps/sh/install.sh b/nel/tools/3d/build_gamedata/processes/ps/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/ps/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/ps/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/0_setup.bat b/nel/tools/3d/build_gamedata/processes/rbank/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/1_clean.bat b/nel/tools/3d/build_gamedata/processes/rbank/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/2_export.bat b/nel/tools/3d/build_gamedata/processes/rbank/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/3_build.bat b/nel/tools/3d/build_gamedata/processes/rbank/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/4_install.bat b/nel/tools/3d/build_gamedata/processes/rbank/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/cfg/ai_build_wmap.cfg b/nel/tools/3d/build_gamedata/processes/rbank/cfg/ai_build_wmap.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/cfg/ai_build_wmap.cfg
rename to nel/tools/3d/build_gamedata/processes/rbank/cfg/ai_build_wmap.cfg
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg
rename to nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg
rename to nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/rbank/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/rbank/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/rbank/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/maxscript/rbank_export.ms b/nel/tools/3d/build_gamedata/processes/rbank/maxscript/rbank_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/maxscript/rbank_export.ms
rename to nel/tools/3d/build_gamedata/processes/rbank/maxscript/rbank_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/sh/build.sh b/nel/tools/3d/build_gamedata/processes/rbank/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/rbank/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/sh/clean.sh b/nel/tools/3d/build_gamedata/processes/rbank/sh/clean.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/sh/clean.sh
rename to nel/tools/3d/build_gamedata/processes/rbank/sh/clean.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/sh/export.sh b/nel/tools/3d/build_gamedata/processes/rbank/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/rbank/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/rbank/sh/install.sh b/nel/tools/3d/build_gamedata/processes/rbank/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/rbank/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/rbank/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/0_setup.bat b/nel/tools/3d/build_gamedata/processes/shape/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/shape/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/1_clean.bat b/nel/tools/3d/build_gamedata/processes/shape/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/shape/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/2_export.bat b/nel/tools/3d/build_gamedata/processes/shape/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/shape/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/3_build.bat b/nel/tools/3d/build_gamedata/processes/shape/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/shape/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/4_install.bat b/nel/tools/3d/build_gamedata/processes/shape/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/shape/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/cfg/config_header.cfg b/nel/tools/3d/build_gamedata/processes/shape/cfg/config_header.cfg
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/cfg/config_header.cfg
rename to nel/tools/3d/build_gamedata/processes/shape/cfg/config_header.cfg
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/shape/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/shape/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/shape/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/shape/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/maxscript/shape_export.ms b/nel/tools/3d/build_gamedata/processes/shape/maxscript/shape_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/maxscript/shape_export.ms
rename to nel/tools/3d/build_gamedata/processes/shape/maxscript/shape_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/sh/build.sh b/nel/tools/3d/build_gamedata/processes/shape/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/shape/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/sh/export.sh b/nel/tools/3d/build_gamedata/processes/shape/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/shape/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/sh/install.sh b/nel/tools/3d/build_gamedata/processes/shape/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/shape/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_lightmap_optimize.bat b/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_lightmap_optimize.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_lightmap_optimize.bat
rename to nel/tools/3d/build_gamedata/processes/shape/sh/transfert_lightmap_optimize.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_shape_optimize.bat b/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_shape_optimize.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/shape/sh/transfert_shape_optimize.bat
rename to nel/tools/3d/build_gamedata/processes/shape/sh/transfert_shape_optimize.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/0_setup.bat b/nel/tools/3d/build_gamedata/processes/skel/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/skel/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/1_clean.bat b/nel/tools/3d/build_gamedata/processes/skel/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/skel/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/2_export.bat b/nel/tools/3d/build_gamedata/processes/skel/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/skel/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/3_build.bat b/nel/tools/3d/build_gamedata/processes/skel/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/skel/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/4_install.bat b/nel/tools/3d/build_gamedata/processes/skel/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/skel/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/skel/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/skel/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/skel/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/skel/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/maxscript/skel_export.ms b/nel/tools/3d/build_gamedata/processes/skel/maxscript/skel_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/maxscript/skel_export.ms
rename to nel/tools/3d/build_gamedata/processes/skel/maxscript/skel_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/sh/export.sh b/nel/tools/3d/build_gamedata/processes/skel/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/skel/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/skel/sh/install.sh b/nel/tools/3d/build_gamedata/processes/skel/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/skel/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/skel/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/0_setup.bat b/nel/tools/3d/build_gamedata/processes/smallbank/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/1_clean.bat b/nel/tools/3d/build_gamedata/processes/smallbank/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/2_export.bat b/nel/tools/3d/build_gamedata/processes/smallbank/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/3_build.bat b/nel/tools/3d/build_gamedata/processes/smallbank/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/4_install.bat b/nel/tools/3d/build_gamedata/processes/smallbank/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/smallbank/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/smallbank/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/smallbank/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/sh/export.sh b/nel/tools/3d/build_gamedata/processes/smallbank/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/smallbank/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/smallbank/sh/install.sh b/nel/tools/3d/build_gamedata/processes/smallbank/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/smallbank/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/smallbank/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/0_setup.bat b/nel/tools/3d/build_gamedata/processes/swt/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/swt/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/1_clean.bat b/nel/tools/3d/build_gamedata/processes/swt/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/swt/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/2_export.bat b/nel/tools/3d/build_gamedata/processes/swt/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/swt/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/3_build.bat b/nel/tools/3d/build_gamedata/processes/swt/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/swt/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/4_install.bat b/nel/tools/3d/build_gamedata/processes/swt/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/swt/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/swt/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/swt/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/swt/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/swt/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/maxscript/swt_export.ms b/nel/tools/3d/build_gamedata/processes/swt/maxscript/swt_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/maxscript/swt_export.ms
rename to nel/tools/3d/build_gamedata/processes/swt/maxscript/swt_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/sh/export.sh b/nel/tools/3d/build_gamedata/processes/swt/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/swt/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/swt/sh/install.sh b/nel/tools/3d/build_gamedata/processes/swt/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/swt/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/swt/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/0_setup.bat b/nel/tools/3d/build_gamedata/processes/tiles/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/1_clean.bat b/nel/tools/3d/build_gamedata/processes/tiles/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/2_export.bat b/nel/tools/3d/build_gamedata/processes/tiles/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/3_build.bat b/nel/tools/3d/build_gamedata/processes/tiles/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/4_install.bat b/nel/tools/3d/build_gamedata/processes/tiles/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/tiles/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/tiles/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/tiles/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/sh/build.sh b/nel/tools/3d/build_gamedata/processes/tiles/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/tiles/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/sh/export.sh b/nel/tools/3d/build_gamedata/processes/tiles/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/tiles/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/tiles/sh/install.sh b/nel/tools/3d/build_gamedata/processes/tiles/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/tiles/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/tiles/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/0_setup.bat b/nel/tools/3d/build_gamedata/processes/veget/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/veget/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/1_clean.bat b/nel/tools/3d/build_gamedata/processes/veget/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/veget/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/2_export.bat b/nel/tools/3d/build_gamedata/processes/veget/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/veget/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/3_build.bat b/nel/tools/3d/build_gamedata/processes/veget/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/veget/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/4_install.bat b/nel/tools/3d/build_gamedata/processes/veget/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/veget/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/veget/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/veget/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/veget/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/veget/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/maxscript/veget_export.ms b/nel/tools/3d/build_gamedata/processes/veget/maxscript/veget_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/maxscript/veget_export.ms
rename to nel/tools/3d/build_gamedata/processes/veget/maxscript/veget_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/sh/export.sh b/nel/tools/3d/build_gamedata/processes/veget/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/veget/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/veget/sh/install.sh b/nel/tools/3d/build_gamedata/processes/veget/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/veget/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/veget/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/0_setup.bat b/nel/tools/3d/build_gamedata/processes/vegetset/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/1_clean.bat b/nel/tools/3d/build_gamedata/processes/vegetset/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/2_export.bat b/nel/tools/3d/build_gamedata/processes/vegetset/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/3_build.bat b/nel/tools/3d/build_gamedata/processes/vegetset/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/4_install.bat b/nel/tools/3d/build_gamedata/processes/vegetset/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/vegetset/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/vegetset/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/vegetset/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/sh/export.sh b/nel/tools/3d/build_gamedata/processes/vegetset/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/vegetset/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/vegetset/sh/install.sh b/nel/tools/3d/build_gamedata/processes/vegetset/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/vegetset/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/vegetset/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/0_setup.bat b/nel/tools/3d/build_gamedata/processes/zone/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/zone/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/1_clean.bat b/nel/tools/3d/build_gamedata/processes/zone/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/zone/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/2_export.bat b/nel/tools/3d/build_gamedata/processes/zone/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/zone/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/3_build.bat b/nel/tools/3d/build_gamedata/processes/zone/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/zone/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/4_install.bat b/nel/tools/3d/build_gamedata/processes/zone/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/zone/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/zone/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/zone/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/zone/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/zone/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/maxscript/zone_export.ms b/nel/tools/3d/build_gamedata/processes/zone/maxscript/zone_export.ms
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/maxscript/zone_export.ms
rename to nel/tools/3d/build_gamedata/processes/zone/maxscript/zone_export.ms
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/sh/build.sh b/nel/tools/3d/build_gamedata/processes/zone/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/zone/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone/sh/export.sh b/nel/tools/3d/build_gamedata/processes/zone/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/zone/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/0_setup.bat b/nel/tools/3d/build_gamedata/processes/zone_light/0_setup.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/0_setup.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/0_setup.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/1_clean.bat b/nel/tools/3d/build_gamedata/processes/zone_light/1_clean.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/1_clean.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/1_clean.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/2_export.bat b/nel/tools/3d/build_gamedata/processes/zone_light/2_export.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/2_export.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/2_export.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/3_build.bat b/nel/tools/3d/build_gamedata/processes/zone_light/3_build.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/3_build.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/3_build.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/4_install.bat b/nel/tools/3d/build_gamedata/processes/zone_light/4_install.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/4_install.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/4_install.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/export_build_all_data.bat b/nel/tools/3d/build_gamedata/processes/zone_light/export_build_all_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/export_build_all_data.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/export_build_all_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/export_build_data.bat b/nel/tools/3d/build_gamedata/processes/zone_light/export_build_data.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/export_build_data.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/export_build_data.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/patch_tile_water.bat b/nel/tools/3d/build_gamedata/processes/zone_light/patch_tile_water.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/patch_tile_water.bat
rename to nel/tools/3d/build_gamedata/processes/zone_light/patch_tile_water.bat
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/sh/build.sh b/nel/tools/3d/build_gamedata/processes/zone_light/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/sh/build.sh
rename to nel/tools/3d/build_gamedata/processes/zone_light/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/sh/export.sh b/nel/tools/3d/build_gamedata/processes/zone_light/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/sh/export.sh
rename to nel/tools/3d/build_gamedata/processes/zone_light/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/sh/install.sh b/nel/tools/3d/build_gamedata/processes/zone_light/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/sh/install.sh
rename to nel/tools/3d/build_gamedata/processes/zone_light/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/processes/zone_light/sh/patch_tile_water.sh b/nel/tools/3d/build_gamedata/processes/zone_light/sh/patch_tile_water.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/processes/zone_light/sh/patch_tile_water.sh
rename to nel/tools/3d/build_gamedata/processes/zone_light/sh/patch_tile_water.sh
diff --git a/code/nel/tools/3d/build_gamedata/set_title.bat b/nel/tools/3d/build_gamedata/set_title.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/set_title.bat
rename to nel/tools/3d/build_gamedata/set_title.bat
diff --git a/code/nel/tools/3d/build_gamedata/sh/build.sh b/nel/tools/3d/build_gamedata/sh/build.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/build.sh
rename to nel/tools/3d/build_gamedata/sh/build.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/clean.sh b/nel/tools/3d/build_gamedata/sh/clean.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/clean.sh
rename to nel/tools/3d/build_gamedata/sh/clean.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/client_clean.sh b/nel/tools/3d/build_gamedata/sh/client_clean.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/client_clean.sh
rename to nel/tools/3d/build_gamedata/sh/client_clean.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/client_setup.sh b/nel/tools/3d/build_gamedata/sh/client_setup.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/client_setup.sh
rename to nel/tools/3d/build_gamedata/sh/client_setup.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/export.sh b/nel/tools/3d/build_gamedata/sh/export.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/export.sh
rename to nel/tools/3d/build_gamedata/sh/export.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/install.sh b/nel/tools/3d/build_gamedata/sh/install.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/install.sh
rename to nel/tools/3d/build_gamedata/sh/install.sh
diff --git a/code/nel/tools/3d/build_gamedata/sh/setup.sh b/nel/tools/3d/build_gamedata/sh/setup.sh
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/sh/setup.sh
rename to nel/tools/3d/build_gamedata/sh/setup.sh
diff --git a/code/nel/tools/3d/build_gamedata/update_local_tools.bat b/nel/tools/3d/build_gamedata/update_local_tools.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/update_local_tools.bat
rename to nel/tools/3d/build_gamedata/update_local_tools.bat
diff --git a/code/nel/tools/3d/build_gamedata/update_tools.bat b/nel/tools/3d/build_gamedata/update_tools.bat
similarity index 100%
rename from code/nel/tools/3d/build_gamedata/update_tools.bat
rename to nel/tools/3d/build_gamedata/update_tools.bat
diff --git a/code/nel/tools/3d/build_interface/CMakeLists.txt b/nel/tools/3d/build_interface/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_interface/CMakeLists.txt
rename to nel/tools/3d/build_interface/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_interface/blue_pill.ico b/nel/tools/3d/build_interface/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_interface/blue_pill.ico
rename to nel/tools/3d/build_interface/blue_pill.ico
diff --git a/code/nel/tools/3d/build_interface/main.cpp b/nel/tools/3d/build_interface/main.cpp
similarity index 100%
rename from code/nel/tools/3d/build_interface/main.cpp
rename to nel/tools/3d/build_interface/main.cpp
diff --git a/code/nel/tools/3d/build_interface/main.rc b/nel/tools/3d/build_interface/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_interface/main.rc
rename to nel/tools/3d/build_interface/main.rc
diff --git a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt b/nel/tools/3d/build_shadow_skin/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_shadow_skin/CMakeLists.txt
rename to nel/tools/3d/build_shadow_skin/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_shadow_skin/blue_pill.ico b/nel/tools/3d/build_shadow_skin/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_shadow_skin/blue_pill.ico
rename to nel/tools/3d/build_shadow_skin/blue_pill.ico
diff --git a/code/nel/tools/3d/build_shadow_skin/main.cpp b/nel/tools/3d/build_shadow_skin/main.cpp
similarity index 100%
rename from code/nel/tools/3d/build_shadow_skin/main.cpp
rename to nel/tools/3d/build_shadow_skin/main.cpp
diff --git a/code/nel/tools/3d/build_shadow_skin/main.rc b/nel/tools/3d/build_shadow_skin/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_shadow_skin/main.rc
rename to nel/tools/3d/build_shadow_skin/main.rc
diff --git a/code/nel/tools/3d/build_smallbank/CMakeLists.txt b/nel/tools/3d/build_smallbank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/build_smallbank/CMakeLists.txt
rename to nel/tools/3d/build_smallbank/CMakeLists.txt
diff --git a/code/nel/tools/3d/build_smallbank/blue_pill.ico b/nel/tools/3d/build_smallbank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/build_smallbank/blue_pill.ico
rename to nel/tools/3d/build_smallbank/blue_pill.ico
diff --git a/code/nel/tools/3d/build_smallbank/build_smallbank.cpp b/nel/tools/3d/build_smallbank/build_smallbank.cpp
similarity index 100%
rename from code/nel/tools/3d/build_smallbank/build_smallbank.cpp
rename to nel/tools/3d/build_smallbank/build_smallbank.cpp
diff --git a/code/nel/tools/3d/build_smallbank/main.rc b/nel/tools/3d/build_smallbank/main.rc
similarity index 100%
rename from code/nel/tools/3d/build_smallbank/main.rc
rename to nel/tools/3d/build_smallbank/main.rc
diff --git a/code/nel/tools/3d/cluster_viewer/CMakeLists.txt b/nel/tools/3d/cluster_viewer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/cluster_viewer/CMakeLists.txt
rename to nel/tools/3d/cluster_viewer/CMakeLists.txt
diff --git a/code/nel/tools/3d/cluster_viewer/main.rc b/nel/tools/3d/cluster_viewer/main.rc
similarity index 100%
rename from code/nel/tools/3d/cluster_viewer/main.rc
rename to nel/tools/3d/cluster_viewer/main.rc
diff --git a/code/nel/tools/3d/cluster_viewer/red_pill.ico b/nel/tools/3d/cluster_viewer/red_pill.ico
similarity index 100%
rename from code/nel/tools/3d/cluster_viewer/red_pill.ico
rename to nel/tools/3d/cluster_viewer/red_pill.ico
diff --git a/code/nel/tools/3d/cluster_viewer/view_cs.cpp b/nel/tools/3d/cluster_viewer/view_cs.cpp
similarity index 100%
rename from code/nel/tools/3d/cluster_viewer/view_cs.cpp
rename to nel/tools/3d/cluster_viewer/view_cs.cpp
diff --git a/code/nel/tools/3d/cluster_viewer/view_cs.txt b/nel/tools/3d/cluster_viewer/view_cs.txt
similarity index 100%
rename from code/nel/tools/3d/cluster_viewer/view_cs.txt
rename to nel/tools/3d/cluster_viewer/view_cs.txt
diff --git a/code/nel/tools/3d/crash_log_analyser/main.cpp b/nel/tools/3d/crash_log_analyser/main.cpp
similarity index 100%
rename from code/nel/tools/3d/crash_log_analyser/main.cpp
rename to nel/tools/3d/crash_log_analyser/main.cpp
diff --git a/code/nel/tools/3d/file_info/CMakeLists.txt b/nel/tools/3d/file_info/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/file_info/CMakeLists.txt
rename to nel/tools/3d/file_info/CMakeLists.txt
diff --git a/code/nel/tools/3d/file_info/main.cpp b/nel/tools/3d/file_info/main.cpp
similarity index 100%
rename from code/nel/tools/3d/file_info/main.cpp
rename to nel/tools/3d/file_info/main.cpp
diff --git a/code/nel/tools/3d/get_neighbors/CMakeLists.txt b/nel/tools/3d/get_neighbors/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/get_neighbors/CMakeLists.txt
rename to nel/tools/3d/get_neighbors/CMakeLists.txt
diff --git a/code/nel/tools/3d/get_neighbors/blue_pill.ico b/nel/tools/3d/get_neighbors/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/get_neighbors/blue_pill.ico
rename to nel/tools/3d/get_neighbors/blue_pill.ico
diff --git a/code/nel/tools/3d/get_neighbors/main.cpp b/nel/tools/3d/get_neighbors/main.cpp
similarity index 100%
rename from code/nel/tools/3d/get_neighbors/main.cpp
rename to nel/tools/3d/get_neighbors/main.cpp
diff --git a/code/nel/tools/3d/get_neighbors/main.rc b/nel/tools/3d/get_neighbors/main.rc
similarity index 100%
rename from code/nel/tools/3d/get_neighbors/main.rc
rename to nel/tools/3d/get_neighbors/main.rc
diff --git a/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt b/nel/tools/3d/hls_bank_maker/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
rename to nel/tools/3d/hls_bank_maker/CMakeLists.txt
diff --git a/code/nel/tools/3d/hls_bank_maker/blue_pill.ico b/nel/tools/3d/hls_bank_maker/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/hls_bank_maker/blue_pill.ico
rename to nel/tools/3d/hls_bank_maker/blue_pill.ico
diff --git a/code/nel/tools/3d/hls_bank_maker/hls_bank_maker.cpp b/nel/tools/3d/hls_bank_maker/hls_bank_maker.cpp
similarity index 100%
rename from code/nel/tools/3d/hls_bank_maker/hls_bank_maker.cpp
rename to nel/tools/3d/hls_bank_maker/hls_bank_maker.cpp
diff --git a/code/nel/tools/3d/hls_bank_maker/hls_bank_maker.h b/nel/tools/3d/hls_bank_maker/hls_bank_maker.h
similarity index 100%
rename from code/nel/tools/3d/hls_bank_maker/hls_bank_maker.h
rename to nel/tools/3d/hls_bank_maker/hls_bank_maker.h
diff --git a/code/nel/tools/3d/hls_bank_maker/main.rc b/nel/tools/3d/hls_bank_maker/main.rc
similarity index 100%
rename from code/nel/tools/3d/hls_bank_maker/main.rc
rename to nel/tools/3d/hls_bank_maker/main.rc
diff --git a/code/nel/tools/3d/ig_add/CMakeLists.txt b/nel/tools/3d/ig_add/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ig_add/CMakeLists.txt
rename to nel/tools/3d/ig_add/CMakeLists.txt
diff --git a/code/nel/tools/3d/ig_add/blue_pill.ico b/nel/tools/3d/ig_add/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/ig_add/blue_pill.ico
rename to nel/tools/3d/ig_add/blue_pill.ico
diff --git a/code/nel/tools/3d/ig_add/main.cpp b/nel/tools/3d/ig_add/main.cpp
similarity index 100%
rename from code/nel/tools/3d/ig_add/main.cpp
rename to nel/tools/3d/ig_add/main.cpp
diff --git a/code/nel/tools/3d/ig_add/main.rc b/nel/tools/3d/ig_add/main.rc
similarity index 100%
rename from code/nel/tools/3d/ig_add/main.rc
rename to nel/tools/3d/ig_add/main.rc
diff --git a/code/nel/tools/3d/ig_elevation/CMakeLists.txt b/nel/tools/3d/ig_elevation/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ig_elevation/CMakeLists.txt
rename to nel/tools/3d/ig_elevation/CMakeLists.txt
diff --git a/code/nel/tools/3d/ig_elevation/blue_pill.ico b/nel/tools/3d/ig_elevation/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/ig_elevation/blue_pill.ico
rename to nel/tools/3d/ig_elevation/blue_pill.ico
diff --git a/code/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp
similarity index 100%
rename from code/nel/tools/3d/ig_elevation/main.cpp
rename to nel/tools/3d/ig_elevation/main.cpp
diff --git a/code/nel/tools/3d/ig_elevation/main.rc b/nel/tools/3d/ig_elevation/main.rc
similarity index 100%
rename from code/nel/tools/3d/ig_elevation/main.rc
rename to nel/tools/3d/ig_elevation/main.rc
diff --git a/code/nel/tools/3d/ig_info/CMakeLists.txt b/nel/tools/3d/ig_info/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ig_info/CMakeLists.txt
rename to nel/tools/3d/ig_info/CMakeLists.txt
diff --git a/code/nel/tools/3d/ig_info/ig_info.cpp b/nel/tools/3d/ig_info/ig_info.cpp
similarity index 100%
rename from code/nel/tools/3d/ig_info/ig_info.cpp
rename to nel/tools/3d/ig_info/ig_info.cpp
diff --git a/code/nel/tools/3d/ig_lighter/CMakeLists.txt b/nel/tools/3d/ig_lighter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ig_lighter/CMakeLists.txt
rename to nel/tools/3d/ig_lighter/CMakeLists.txt
diff --git a/code/nel/tools/3d/ig_lighter/blue_pill.ico b/nel/tools/3d/ig_lighter/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/ig_lighter/blue_pill.ico
rename to nel/tools/3d/ig_lighter/blue_pill.ico
diff --git a/code/nel/tools/3d/ig_lighter/config.cfg b/nel/tools/3d/ig_lighter/config.cfg
similarity index 100%
rename from code/nel/tools/3d/ig_lighter/config.cfg
rename to nel/tools/3d/ig_lighter/config.cfg
diff --git a/code/nel/tools/3d/ig_lighter/ig_lighter.cpp b/nel/tools/3d/ig_lighter/ig_lighter.cpp
similarity index 100%
rename from code/nel/tools/3d/ig_lighter/ig_lighter.cpp
rename to nel/tools/3d/ig_lighter/ig_lighter.cpp
diff --git a/code/nel/tools/3d/ig_lighter/main.rc b/nel/tools/3d/ig_lighter/main.rc
similarity index 100%
rename from code/nel/tools/3d/ig_lighter/main.rc
rename to nel/tools/3d/ig_lighter/main.rc
diff --git a/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
similarity index 100%
rename from code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
rename to nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
diff --git a/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.h b/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.h
similarity index 100%
rename from code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.h
rename to nel/tools/3d/ig_lighter_lib/ig_lighter_lib.h
diff --git a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt b/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
rename to nel/tools/3d/lightmap_optimizer/CMakeLists.txt
diff --git a/code/nel/tools/3d/lightmap_optimizer/blue_pill.ico b/nel/tools/3d/lightmap_optimizer/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/lightmap_optimizer/blue_pill.ico
rename to nel/tools/3d/lightmap_optimizer/blue_pill.ico
diff --git a/code/nel/tools/3d/lightmap_optimizer/main.cpp b/nel/tools/3d/lightmap_optimizer/main.cpp
similarity index 100%
rename from code/nel/tools/3d/lightmap_optimizer/main.cpp
rename to nel/tools/3d/lightmap_optimizer/main.cpp
diff --git a/code/nel/tools/3d/lightmap_optimizer/main.rc b/nel/tools/3d/lightmap_optimizer/main.rc
similarity index 100%
rename from code/nel/tools/3d/lightmap_optimizer/main.rc
rename to nel/tools/3d/lightmap_optimizer/main.rc
diff --git a/code/nel/tools/3d/ligo/CMakeLists.txt b/nel/tools/3d/ligo/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ligo/CMakeLists.txt
rename to nel/tools/3d/ligo/CMakeLists.txt
diff --git a/code/nel/tools/3d/ligo/ligoscape.cfg b/nel/tools/3d/ligo/ligoscape.cfg
similarity index 100%
rename from code/nel/tools/3d/ligo/ligoscape.cfg
rename to nel/tools/3d/ligo/ligoscape.cfg
diff --git a/code/nel/tools/3d/ligo/ligoscape.txt b/nel/tools/3d/ligo/ligoscape.txt
similarity index 100%
rename from code/nel/tools/3d/ligo/ligoscape.txt
rename to nel/tools/3d/ligo/ligoscape.txt
diff --git a/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt b/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
rename to nel/tools/3d/ligo/plugin_max/CMakeLists.txt
diff --git a/code/nel/tools/3d/ligo/plugin_max/DllEntry.cpp b/nel/tools/3d/ligo/plugin_max/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/DllEntry.cpp
rename to nel/tools/3d/ligo/plugin_max/DllEntry.cpp
diff --git a/code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.def b/nel/tools/3d/ligo/plugin_max/ligoscape_utility.def
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.def
rename to nel/tools/3d/ligo/plugin_max/ligoscape_utility.def
diff --git a/code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.h b/nel/tools/3d/ligo/plugin_max/ligoscape_utility.h
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.h
rename to nel/tools/3d/ligo/plugin_max/ligoscape_utility.h
diff --git a/code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc b/nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc
rename to nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc
diff --git a/code/nel/tools/3d/ligo/plugin_max/ligoscript.txt b/nel/tools/3d/ligo/plugin_max/ligoscript.txt
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/ligoscript.txt
rename to nel/tools/3d/ligo/plugin_max/ligoscript.txt
diff --git a/code/nel/tools/3d/ligo/plugin_max/macroscripts/nel_ligoscape.mcr b/nel/tools/3d/ligo/plugin_max/macroscripts/nel_ligoscape.mcr
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/macroscripts/nel_ligoscape.mcr
rename to nel/tools/3d/ligo/plugin_max/macroscripts/nel_ligoscape.mcr
diff --git a/code/nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp b/nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp
rename to nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp
diff --git a/code/nel/tools/3d/ligo/plugin_max/max_to_ligo.h b/nel/tools/3d/ligo/plugin_max/max_to_ligo.h
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/max_to_ligo.h
rename to nel/tools/3d/ligo/plugin_max/max_to_ligo.h
diff --git a/code/nel/tools/3d/ligo/plugin_max/resource.h b/nel/tools/3d/ligo/plugin_max/resource.h
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/resource.h
rename to nel/tools/3d/ligo/plugin_max/resource.h
diff --git a/code/nel/tools/3d/ligo/plugin_max/script.cpp b/nel/tools/3d/ligo/plugin_max/script.cpp
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/script.cpp
rename to nel/tools/3d/ligo/plugin_max/script.cpp
diff --git a/code/nel/tools/3d/ligo/plugin_max/scripts/nel_ligoscape.ms b/nel/tools/3d/ligo/plugin_max/scripts/nel_ligoscape.ms
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/scripts/nel_ligoscape.ms
rename to nel/tools/3d/ligo/plugin_max/scripts/nel_ligoscape.ms
diff --git a/code/nel/tools/3d/ligo/plugin_max/version.rc2 b/nel/tools/3d/ligo/plugin_max/version.rc2
similarity index 100%
rename from code/nel/tools/3d/ligo/plugin_max/version.rc2
rename to nel/tools/3d/ligo/plugin_max/version.rc2
diff --git a/code/nel/tools/3d/mesh_export/CMakeLists.txt b/nel/tools/3d/mesh_export/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/mesh_export/CMakeLists.txt
rename to nel/tools/3d/mesh_export/CMakeLists.txt
diff --git a/code/nel/tools/3d/mesh_export/blue_pill.ico b/nel/tools/3d/mesh_export/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/mesh_export/blue_pill.ico
rename to nel/tools/3d/mesh_export/blue_pill.ico
diff --git a/code/nel/tools/3d/mesh_export/main.cpp b/nel/tools/3d/mesh_export/main.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_export/main.cpp
rename to nel/tools/3d/mesh_export/main.cpp
diff --git a/code/nel/tools/3d/mesh_export/main.rc b/nel/tools/3d/mesh_export/main.rc
similarity index 100%
rename from code/nel/tools/3d/mesh_export/main.rc
rename to nel/tools/3d/mesh_export/main.rc
diff --git a/code/nel/tools/3d/mesh_utils/CMakeLists.txt b/nel/tools/3d/mesh_utils/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/CMakeLists.txt
rename to nel/tools/3d/mesh_utils/CMakeLists.txt
diff --git a/code/nel/tools/3d/mesh_utils/assimp_material.cpp b/nel/tools/3d/mesh_utils/assimp_material.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/assimp_material.cpp
rename to nel/tools/3d/mesh_utils/assimp_material.cpp
diff --git a/code/nel/tools/3d/mesh_utils/assimp_material.h b/nel/tools/3d/mesh_utils/assimp_material.h
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/assimp_material.h
rename to nel/tools/3d/mesh_utils/assimp_material.h
diff --git a/code/nel/tools/3d/mesh_utils/assimp_shape.cpp b/nel/tools/3d/mesh_utils/assimp_shape.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/assimp_shape.cpp
rename to nel/tools/3d/mesh_utils/assimp_shape.cpp
diff --git a/code/nel/tools/3d/mesh_utils/assimp_shape.h b/nel/tools/3d/mesh_utils/assimp_shape.h
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/assimp_shape.h
rename to nel/tools/3d/mesh_utils/assimp_shape.h
diff --git a/code/nel/tools/3d/mesh_utils/mesh_utils.cpp b/nel/tools/3d/mesh_utils/mesh_utils.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/mesh_utils.cpp
rename to nel/tools/3d/mesh_utils/mesh_utils.cpp
diff --git a/code/nel/tools/3d/mesh_utils/mesh_utils.h b/nel/tools/3d/mesh_utils/mesh_utils.h
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/mesh_utils.h
rename to nel/tools/3d/mesh_utils/mesh_utils.h
diff --git a/code/nel/tools/3d/mesh_utils/scene_context.cpp b/nel/tools/3d/mesh_utils/scene_context.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/scene_context.cpp
rename to nel/tools/3d/mesh_utils/scene_context.cpp
diff --git a/code/nel/tools/3d/mesh_utils/scene_context.h b/nel/tools/3d/mesh_utils/scene_context.h
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/scene_context.h
rename to nel/tools/3d/mesh_utils/scene_context.h
diff --git a/code/nel/tools/3d/mesh_utils/scene_meta.cpp b/nel/tools/3d/mesh_utils/scene_meta.cpp
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/scene_meta.cpp
rename to nel/tools/3d/mesh_utils/scene_meta.cpp
diff --git a/code/nel/tools/3d/mesh_utils/scene_meta.h b/nel/tools/3d/mesh_utils/scene_meta.h
similarity index 100%
rename from code/nel/tools/3d/mesh_utils/scene_meta.h
rename to nel/tools/3d/mesh_utils/scene_meta.h
diff --git a/code/nel/tools/3d/object_viewer/CMakeLists.txt b/nel/tools/3d/object_viewer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer/CMakeLists.txt
rename to nel/tools/3d/object_viewer/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer/about_dialog.cpp b/nel/tools/3d/object_viewer/about_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/about_dialog.cpp
rename to nel/tools/3d/object_viewer/about_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer/about_dialog.h b/nel/tools/3d/object_viewer/about_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/about_dialog.h
rename to nel/tools/3d/object_viewer/about_dialog.h
diff --git a/code/nel/tools/3d/object_viewer/animation_dlg.cpp b/nel/tools/3d/object_viewer/animation_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/animation_dlg.cpp
rename to nel/tools/3d/object_viewer/animation_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/animation_dlg.h b/nel/tools/3d/object_viewer/animation_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/animation_dlg.h
rename to nel/tools/3d/object_viewer/animation_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/animation_set_dlg.cpp b/nel/tools/3d/object_viewer/animation_set_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/animation_set_dlg.cpp
rename to nel/tools/3d/object_viewer/animation_set_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/animation_set_dlg.h b/nel/tools/3d/object_viewer/animation_set_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/animation_set_dlg.h
rename to nel/tools/3d/object_viewer/animation_set_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/attrib_dlg.cpp b/nel/tools/3d/object_viewer/attrib_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/attrib_dlg.cpp
rename to nel/tools/3d/object_viewer/attrib_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/attrib_dlg.h b/nel/tools/3d/object_viewer/attrib_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/attrib_dlg.h
rename to nel/tools/3d/object_viewer/attrib_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/attrib_list_box.cpp b/nel/tools/3d/object_viewer/attrib_list_box.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/attrib_list_box.cpp
rename to nel/tools/3d/object_viewer/attrib_list_box.cpp
diff --git a/code/nel/tools/3d/object_viewer/attrib_list_box.h b/nel/tools/3d/object_viewer/attrib_list_box.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/attrib_list_box.h
rename to nel/tools/3d/object_viewer/attrib_list_box.h
diff --git a/code/nel/tools/3d/object_viewer/auto_lod_dlg.cpp b/nel/tools/3d/object_viewer/auto_lod_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/auto_lod_dlg.cpp
rename to nel/tools/3d/object_viewer/auto_lod_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/auto_lod_dlg.h b/nel/tools/3d/object_viewer/auto_lod_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/auto_lod_dlg.h
rename to nel/tools/3d/object_viewer/auto_lod_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/ball.tga b/nel/tools/3d/object_viewer/ball.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ball.tga
rename to nel/tools/3d/object_viewer/ball.tga
diff --git a/code/nel/tools/3d/object_viewer/basis_edit.cpp b/nel/tools/3d/object_viewer/basis_edit.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/basis_edit.cpp
rename to nel/tools/3d/object_viewer/basis_edit.cpp
diff --git a/code/nel/tools/3d/object_viewer/basis_edit.h b/nel/tools/3d/object_viewer/basis_edit.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/basis_edit.h
rename to nel/tools/3d/object_viewer/basis_edit.h
diff --git a/code/nel/tools/3d/object_viewer/bin_op_dlg.cpp b/nel/tools/3d/object_viewer/bin_op_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bin_op_dlg.cpp
rename to nel/tools/3d/object_viewer/bin_op_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/bin_op_dlg.h b/nel/tools/3d/object_viewer/bin_op_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bin_op_dlg.h
rename to nel/tools/3d/object_viewer/bin_op_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/bitmap1.bmp b/nel/tools/3d/object_viewer/bitmap1.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bitmap1.bmp
rename to nel/tools/3d/object_viewer/bitmap1.bmp
diff --git a/code/nel/tools/3d/object_viewer/bitmap2.bmp b/nel/tools/3d/object_viewer/bitmap2.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bitmap2.bmp
rename to nel/tools/3d/object_viewer/bitmap2.bmp
diff --git a/code/nel/tools/3d/object_viewer/bitmap3.bmp b/nel/tools/3d/object_viewer/bitmap3.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bitmap3.bmp
rename to nel/tools/3d/object_viewer/bitmap3.bmp
diff --git a/code/nel/tools/3d/object_viewer/bitmap4.bmp b/nel/tools/3d/object_viewer/bitmap4.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bitmap4.bmp
rename to nel/tools/3d/object_viewer/bitmap4.bmp
diff --git a/code/nel/tools/3d/object_viewer/blend_wnd.cpp b/nel/tools/3d/object_viewer/blend_wnd.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/blend_wnd.cpp
rename to nel/tools/3d/object_viewer/blend_wnd.cpp
diff --git a/code/nel/tools/3d/object_viewer/blend_wnd.h b/nel/tools/3d/object_viewer/blend_wnd.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/blend_wnd.h
rename to nel/tools/3d/object_viewer/blend_wnd.h
diff --git a/code/nel/tools/3d/object_viewer/bmp00001.bmp b/nel/tools/3d/object_viewer/bmp00001.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00001.bmp
rename to nel/tools/3d/object_viewer/bmp00001.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00002.bmp b/nel/tools/3d/object_viewer/bmp00002.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00002.bmp
rename to nel/tools/3d/object_viewer/bmp00002.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00003.bmp b/nel/tools/3d/object_viewer/bmp00003.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00003.bmp
rename to nel/tools/3d/object_viewer/bmp00003.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00004.bmp b/nel/tools/3d/object_viewer/bmp00004.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00004.bmp
rename to nel/tools/3d/object_viewer/bmp00004.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00005.bmp b/nel/tools/3d/object_viewer/bmp00005.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00005.bmp
rename to nel/tools/3d/object_viewer/bmp00005.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00006.bmp b/nel/tools/3d/object_viewer/bmp00006.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00006.bmp
rename to nel/tools/3d/object_viewer/bmp00006.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00007.bmp b/nel/tools/3d/object_viewer/bmp00007.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00007.bmp
rename to nel/tools/3d/object_viewer/bmp00007.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00008.bmp b/nel/tools/3d/object_viewer/bmp00008.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00008.bmp
rename to nel/tools/3d/object_viewer/bmp00008.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00009.bmp b/nel/tools/3d/object_viewer/bmp00009.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00009.bmp
rename to nel/tools/3d/object_viewer/bmp00009.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00010.bmp b/nel/tools/3d/object_viewer/bmp00010.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00010.bmp
rename to nel/tools/3d/object_viewer/bmp00010.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00011.bmp b/nel/tools/3d/object_viewer/bmp00011.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00011.bmp
rename to nel/tools/3d/object_viewer/bmp00011.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00012.bmp b/nel/tools/3d/object_viewer/bmp00012.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00012.bmp
rename to nel/tools/3d/object_viewer/bmp00012.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00013.bmp b/nel/tools/3d/object_viewer/bmp00013.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00013.bmp
rename to nel/tools/3d/object_viewer/bmp00013.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00014.bmp b/nel/tools/3d/object_viewer/bmp00014.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00014.bmp
rename to nel/tools/3d/object_viewer/bmp00014.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00015.bmp b/nel/tools/3d/object_viewer/bmp00015.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00015.bmp
rename to nel/tools/3d/object_viewer/bmp00015.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00016.bmp b/nel/tools/3d/object_viewer/bmp00016.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00016.bmp
rename to nel/tools/3d/object_viewer/bmp00016.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00017.bmp b/nel/tools/3d/object_viewer/bmp00017.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00017.bmp
rename to nel/tools/3d/object_viewer/bmp00017.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00018.bmp b/nel/tools/3d/object_viewer/bmp00018.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00018.bmp
rename to nel/tools/3d/object_viewer/bmp00018.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00019.bmp b/nel/tools/3d/object_viewer/bmp00019.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00019.bmp
rename to nel/tools/3d/object_viewer/bmp00019.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00020.bmp b/nel/tools/3d/object_viewer/bmp00020.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00020.bmp
rename to nel/tools/3d/object_viewer/bmp00020.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00021.bmp b/nel/tools/3d/object_viewer/bmp00021.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00021.bmp
rename to nel/tools/3d/object_viewer/bmp00021.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00022.bmp b/nel/tools/3d/object_viewer/bmp00022.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00022.bmp
rename to nel/tools/3d/object_viewer/bmp00022.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00023.bmp b/nel/tools/3d/object_viewer/bmp00023.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00023.bmp
rename to nel/tools/3d/object_viewer/bmp00023.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00024.bmp b/nel/tools/3d/object_viewer/bmp00024.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00024.bmp
rename to nel/tools/3d/object_viewer/bmp00024.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00025.bmp b/nel/tools/3d/object_viewer/bmp00025.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00025.bmp
rename to nel/tools/3d/object_viewer/bmp00025.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00026.bmp b/nel/tools/3d/object_viewer/bmp00026.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00026.bmp
rename to nel/tools/3d/object_viewer/bmp00026.bmp
diff --git a/code/nel/tools/3d/object_viewer/bmp00027.bmp b/nel/tools/3d/object_viewer/bmp00027.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bmp00027.bmp
rename to nel/tools/3d/object_viewer/bmp00027.bmp
diff --git a/code/nel/tools/3d/object_viewer/bound_checker.h b/nel/tools/3d/object_viewer/bound_checker.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/bound_checker.h
rename to nel/tools/3d/object_viewer/bound_checker.h
diff --git a/code/nel/tools/3d/object_viewer/choose_bg_color_dlg.cpp b/nel/tools/3d/object_viewer/choose_bg_color_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_bg_color_dlg.cpp
rename to nel/tools/3d/object_viewer/choose_bg_color_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/choose_bg_color_dlg.h b/nel/tools/3d/object_viewer/choose_bg_color_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_bg_color_dlg.h
rename to nel/tools/3d/object_viewer/choose_bg_color_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/choose_frame_delay.cpp b/nel/tools/3d/object_viewer/choose_frame_delay.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_frame_delay.cpp
rename to nel/tools/3d/object_viewer/choose_frame_delay.cpp
diff --git a/code/nel/tools/3d/object_viewer/choose_frame_delay.h b/nel/tools/3d/object_viewer/choose_frame_delay.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_frame_delay.h
rename to nel/tools/3d/object_viewer/choose_frame_delay.h
diff --git a/code/nel/tools/3d/object_viewer/choose_name.cpp b/nel/tools/3d/object_viewer/choose_name.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_name.cpp
rename to nel/tools/3d/object_viewer/choose_name.cpp
diff --git a/code/nel/tools/3d/object_viewer/choose_name.h b/nel/tools/3d/object_viewer/choose_name.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_name.h
rename to nel/tools/3d/object_viewer/choose_name.h
diff --git a/code/nel/tools/3d/object_viewer/choose_pool_id.cpp b/nel/tools/3d/object_viewer/choose_pool_id.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_pool_id.cpp
rename to nel/tools/3d/object_viewer/choose_pool_id.cpp
diff --git a/code/nel/tools/3d/object_viewer/choose_pool_id.h b/nel/tools/3d/object_viewer/choose_pool_id.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_pool_id.h
rename to nel/tools/3d/object_viewer/choose_pool_id.h
diff --git a/code/nel/tools/3d/object_viewer/choose_sun_color_dlg.cpp b/nel/tools/3d/object_viewer/choose_sun_color_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_sun_color_dlg.cpp
rename to nel/tools/3d/object_viewer/choose_sun_color_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/choose_sun_color_dlg.h b/nel/tools/3d/object_viewer/choose_sun_color_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/choose_sun_color_dlg.h
rename to nel/tools/3d/object_viewer/choose_sun_color_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/collision_zone_dlg.cpp b/nel/tools/3d/object_viewer/collision_zone_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/collision_zone_dlg.cpp
rename to nel/tools/3d/object_viewer/collision_zone_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/collision_zone_dlg.h b/nel/tools/3d/object_viewer/collision_zone_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/collision_zone_dlg.h
rename to nel/tools/3d/object_viewer/collision_zone_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/color_button.cpp b/nel/tools/3d/object_viewer/color_button.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_button.cpp
rename to nel/tools/3d/object_viewer/color_button.cpp
diff --git a/code/nel/tools/3d/object_viewer/color_button.h b/nel/tools/3d/object_viewer/color_button.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_button.h
rename to nel/tools/3d/object_viewer/color_button.h
diff --git a/code/nel/tools/3d/object_viewer/color_edit.cpp b/nel/tools/3d/object_viewer/color_edit.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_edit.cpp
rename to nel/tools/3d/object_viewer/color_edit.cpp
diff --git a/code/nel/tools/3d/object_viewer/color_edit.h b/nel/tools/3d/object_viewer/color_edit.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_edit.h
rename to nel/tools/3d/object_viewer/color_edit.h
diff --git a/code/nel/tools/3d/object_viewer/color_static.cpp b/nel/tools/3d/object_viewer/color_static.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_static.cpp
rename to nel/tools/3d/object_viewer/color_static.cpp
diff --git a/code/nel/tools/3d/object_viewer/color_static.h b/nel/tools/3d/object_viewer/color_static.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/color_static.h
rename to nel/tools/3d/object_viewer/color_static.h
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_dlg.cpp b/nel/tools/3d/object_viewer/constraint_mesh_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_dlg.cpp
rename to nel/tools/3d/object_viewer/constraint_mesh_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_dlg.h b/nel/tools/3d/object_viewer/constraint_mesh_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_dlg.h
rename to nel/tools/3d/object_viewer/constraint_mesh_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.cpp b/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.cpp
rename to nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.h b/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.h
rename to nel/tools/3d/object_viewer/constraint_mesh_global_tex_anim_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.cpp b/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.cpp
rename to nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.h b/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.h
rename to nel/tools/3d/object_viewer/constraint_mesh_tex_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/create_file_dlg.cpp b/nel/tools/3d/object_viewer/create_file_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/create_file_dlg.cpp
rename to nel/tools/3d/object_viewer/create_file_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/create_file_dlg.h b/nel/tools/3d/object_viewer/create_file_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/create_file_dlg.h
rename to nel/tools/3d/object_viewer/create_file_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/curve_edit.cpp b/nel/tools/3d/object_viewer/curve_edit.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/curve_edit.cpp
rename to nel/tools/3d/object_viewer/curve_edit.cpp
diff --git a/code/nel/tools/3d/object_viewer/curve_edit.h b/nel/tools/3d/object_viewer/curve_edit.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/curve_edit.h
rename to nel/tools/3d/object_viewer/curve_edit.h
diff --git a/code/nel/tools/3d/object_viewer/day_night_dlg.cpp b/nel/tools/3d/object_viewer/day_night_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/day_night_dlg.cpp
rename to nel/tools/3d/object_viewer/day_night_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/day_night_dlg.h b/nel/tools/3d/object_viewer/day_night_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/day_night_dlg.h
rename to nel/tools/3d/object_viewer/day_night_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/dialog_progress.cpp b/nel/tools/3d/object_viewer/dialog_progress.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/dialog_progress.cpp
rename to nel/tools/3d/object_viewer/dialog_progress.cpp
diff --git a/code/nel/tools/3d/object_viewer/dialog_progress.h b/nel/tools/3d/object_viewer/dialog_progress.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/dialog_progress.h
rename to nel/tools/3d/object_viewer/dialog_progress.h
diff --git a/code/nel/tools/3d/object_viewer/dialog_stack.h b/nel/tools/3d/object_viewer/dialog_stack.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/dialog_stack.h
rename to nel/tools/3d/object_viewer/dialog_stack.h
diff --git a/code/nel/tools/3d/object_viewer/direction_attr.cpp b/nel/tools/3d/object_viewer/direction_attr.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/direction_attr.cpp
rename to nel/tools/3d/object_viewer/direction_attr.cpp
diff --git a/code/nel/tools/3d/object_viewer/direction_attr.h b/nel/tools/3d/object_viewer/direction_attr.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/direction_attr.h
rename to nel/tools/3d/object_viewer/direction_attr.h
diff --git a/code/nel/tools/3d/object_viewer/direction_edit.cpp b/nel/tools/3d/object_viewer/direction_edit.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/direction_edit.cpp
rename to nel/tools/3d/object_viewer/direction_edit.cpp
diff --git a/code/nel/tools/3d/object_viewer/direction_edit.h b/nel/tools/3d/object_viewer/direction_edit.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/direction_edit.h
rename to nel/tools/3d/object_viewer/direction_edit.h
diff --git a/code/nel/tools/3d/object_viewer/dup_ps.cpp b/nel/tools/3d/object_viewer/dup_ps.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/dup_ps.cpp
rename to nel/tools/3d/object_viewer/dup_ps.cpp
diff --git a/code/nel/tools/3d/object_viewer/dup_ps.h b/nel/tools/3d/object_viewer/dup_ps.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/dup_ps.h
rename to nel/tools/3d/object_viewer/dup_ps.h
diff --git a/code/nel/tools/3d/object_viewer/edit_attrib_dlg.h b/nel/tools/3d/object_viewer/edit_attrib_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_attrib_dlg.h
rename to nel/tools/3d/object_viewer/edit_attrib_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/edit_ex.cpp b/nel/tools/3d/object_viewer/edit_ex.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ex.cpp
rename to nel/tools/3d/object_viewer/edit_ex.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_ex.h b/nel/tools/3d/object_viewer/edit_ex.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ex.h
rename to nel/tools/3d/object_viewer/edit_ex.h
diff --git a/code/nel/tools/3d/object_viewer/edit_follow_path.cpp b/nel/tools/3d/object_viewer/edit_follow_path.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_follow_path.cpp
rename to nel/tools/3d/object_viewer/edit_follow_path.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_follow_path.h b/nel/tools/3d/object_viewer/edit_follow_path.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_follow_path.h
rename to nel/tools/3d/object_viewer/edit_follow_path.h
diff --git a/code/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.cpp b/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.cpp
rename to nel/tools/3d/object_viewer/edit_morph_mesh_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.h b/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_morph_mesh_dlg.h
rename to nel/tools/3d/object_viewer/edit_morph_mesh_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/edit_ps_light.cpp b/nel/tools/3d/object_viewer/edit_ps_light.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ps_light.cpp
rename to nel/tools/3d/object_viewer/edit_ps_light.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_ps_light.h b/nel/tools/3d/object_viewer/edit_ps_light.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ps_light.h
rename to nel/tools/3d/object_viewer/edit_ps_light.h
diff --git a/code/nel/tools/3d/object_viewer/edit_ps_sound.cpp b/nel/tools/3d/object_viewer/edit_ps_sound.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ps_sound.cpp
rename to nel/tools/3d/object_viewer/edit_ps_sound.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_ps_sound.h b/nel/tools/3d/object_viewer/edit_ps_sound.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_ps_sound.h
rename to nel/tools/3d/object_viewer/edit_ps_sound.h
diff --git a/code/nel/tools/3d/object_viewer/edit_spinner.cpp b/nel/tools/3d/object_viewer/edit_spinner.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_spinner.cpp
rename to nel/tools/3d/object_viewer/edit_spinner.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_spinner.h b/nel/tools/3d/object_viewer/edit_spinner.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_spinner.h
rename to nel/tools/3d/object_viewer/edit_spinner.h
diff --git a/code/nel/tools/3d/object_viewer/edit_user_param.cpp b/nel/tools/3d/object_viewer/edit_user_param.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_user_param.cpp
rename to nel/tools/3d/object_viewer/edit_user_param.cpp
diff --git a/code/nel/tools/3d/object_viewer/edit_user_param.h b/nel/tools/3d/object_viewer/edit_user_param.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/edit_user_param.h
rename to nel/tools/3d/object_viewer/edit_user_param.h
diff --git a/code/nel/tools/3d/object_viewer/editable_range.cpp b/nel/tools/3d/object_viewer/editable_range.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/editable_range.cpp
rename to nel/tools/3d/object_viewer/editable_range.cpp
diff --git a/code/nel/tools/3d/object_viewer/editable_range.h b/nel/tools/3d/object_viewer/editable_range.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/editable_range.h
rename to nel/tools/3d/object_viewer/editable_range.h
diff --git a/code/nel/tools/3d/object_viewer/emitter_dlg.cpp b/nel/tools/3d/object_viewer/emitter_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/emitter_dlg.cpp
rename to nel/tools/3d/object_viewer/emitter_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/emitter_dlg.h b/nel/tools/3d/object_viewer/emitter_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/emitter_dlg.h
rename to nel/tools/3d/object_viewer/emitter_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/fire.tga b/nel/tools/3d/object_viewer/fire.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/fire.tga
rename to nel/tools/3d/object_viewer/fire.tga
diff --git a/code/nel/tools/3d/object_viewer/fog_dlg.cpp b/nel/tools/3d/object_viewer/fog_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/fog_dlg.cpp
rename to nel/tools/3d/object_viewer/fog_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/fog_dlg.h b/nel/tools/3d/object_viewer/fog_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/fog_dlg.h
rename to nel/tools/3d/object_viewer/fog_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/global_wind_dlg.cpp b/nel/tools/3d/object_viewer/global_wind_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/global_wind_dlg.cpp
rename to nel/tools/3d/object_viewer/global_wind_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/global_wind_dlg.h b/nel/tools/3d/object_viewer/global_wind_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/global_wind_dlg.h
rename to nel/tools/3d/object_viewer/global_wind_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/graph.cpp b/nel/tools/3d/object_viewer/graph.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/graph.cpp
rename to nel/tools/3d/object_viewer/graph.cpp
diff --git a/code/nel/tools/3d/object_viewer/graph.h b/nel/tools/3d/object_viewer/graph.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/graph.h
rename to nel/tools/3d/object_viewer/graph.h
diff --git a/code/nel/tools/3d/object_viewer/halo.tga b/nel/tools/3d/object_viewer/halo.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/halo.tga
rename to nel/tools/3d/object_viewer/halo.tga
diff --git a/code/nel/tools/3d/object_viewer/i1.tga b/nel/tools/3d/object_viewer/i1.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/i1.tga
rename to nel/tools/3d/object_viewer/i1.tga
diff --git a/code/nel/tools/3d/object_viewer/i2.tga b/nel/tools/3d/object_viewer/i2.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/i2.tga
rename to nel/tools/3d/object_viewer/i2.tga
diff --git a/code/nel/tools/3d/object_viewer/i3.tga b/nel/tools/3d/object_viewer/i3.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/i3.tga
rename to nel/tools/3d/object_viewer/i3.tga
diff --git a/code/nel/tools/3d/object_viewer/lb_extern_id_dlg.cpp b/nel/tools/3d/object_viewer/lb_extern_id_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/lb_extern_id_dlg.cpp
rename to nel/tools/3d/object_viewer/lb_extern_id_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/lb_extern_id_dlg.h b/nel/tools/3d/object_viewer/lb_extern_id_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/lb_extern_id_dlg.h
rename to nel/tools/3d/object_viewer/lb_extern_id_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/light_at.bmp b/nel/tools/3d/object_viewer/light_at.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/light_at.bmp
rename to nel/tools/3d/object_viewer/light_at.bmp
diff --git a/code/nel/tools/3d/object_viewer/light_group_factor.cpp b/nel/tools/3d/object_viewer/light_group_factor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/light_group_factor.cpp
rename to nel/tools/3d/object_viewer/light_group_factor.cpp
diff --git a/code/nel/tools/3d/object_viewer/light_group_factor.h b/nel/tools/3d/object_viewer/light_group_factor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/light_group_factor.h
rename to nel/tools/3d/object_viewer/light_group_factor.h
diff --git a/code/nel/tools/3d/object_viewer/located_bindable_dialog.cpp b/nel/tools/3d/object_viewer/located_bindable_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_bindable_dialog.cpp
rename to nel/tools/3d/object_viewer/located_bindable_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer/located_bindable_dialog.h b/nel/tools/3d/object_viewer/located_bindable_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_bindable_dialog.h
rename to nel/tools/3d/object_viewer/located_bindable_dialog.h
diff --git a/code/nel/tools/3d/object_viewer/located_properties.cpp b/nel/tools/3d/object_viewer/located_properties.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_properties.cpp
rename to nel/tools/3d/object_viewer/located_properties.cpp
diff --git a/code/nel/tools/3d/object_viewer/located_properties.h b/nel/tools/3d/object_viewer/located_properties.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_properties.h
rename to nel/tools/3d/object_viewer/located_properties.h
diff --git a/code/nel/tools/3d/object_viewer/located_target_dlg.cpp b/nel/tools/3d/object_viewer/located_target_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_target_dlg.cpp
rename to nel/tools/3d/object_viewer/located_target_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/located_target_dlg.h b/nel/tools/3d/object_viewer/located_target_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/located_target_dlg.h
rename to nel/tools/3d/object_viewer/located_target_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/main_dlg.cpp b/nel/tools/3d/object_viewer/main_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/main_dlg.cpp
rename to nel/tools/3d/object_viewer/main_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/main_dlg.h b/nel/tools/3d/object_viewer/main_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/main_dlg.h
rename to nel/tools/3d/object_viewer/main_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/main_frame.cpp b/nel/tools/3d/object_viewer/main_frame.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/main_frame.cpp
rename to nel/tools/3d/object_viewer/main_frame.cpp
diff --git a/code/nel/tools/3d/object_viewer/main_frame.h b/nel/tools/3d/object_viewer/main_frame.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/main_frame.h
rename to nel/tools/3d/object_viewer/main_frame.h
diff --git a/code/nel/tools/3d/object_viewer/mesh_dlg.cpp b/nel/tools/3d/object_viewer/mesh_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/mesh_dlg.cpp
rename to nel/tools/3d/object_viewer/mesh_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/mesh_dlg.h b/nel/tools/3d/object_viewer/mesh_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/mesh_dlg.h
rename to nel/tools/3d/object_viewer/mesh_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/multi_tex_dlg.cpp b/nel/tools/3d/object_viewer/multi_tex_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/multi_tex_dlg.cpp
rename to nel/tools/3d/object_viewer/multi_tex_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/multi_tex_dlg.h b/nel/tools/3d/object_viewer/multi_tex_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/multi_tex_dlg.h
rename to nel/tools/3d/object_viewer/multi_tex_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/nevraxpill.ico b/nel/tools/3d/object_viewer/nevraxpill.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer/nevraxpill.ico
rename to nel/tools/3d/object_viewer/nevraxpill.ico
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cfg b/nel/tools/3d/object_viewer/object_viewer.cfg
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer.cfg
rename to nel/tools/3d/object_viewer/object_viewer.cfg
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cpp b/nel/tools/3d/object_viewer/object_viewer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer.cpp
rename to nel/tools/3d/object_viewer/object_viewer.cpp
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.def b/nel/tools/3d/object_viewer/object_viewer.def
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer.def
rename to nel/tools/3d/object_viewer/object_viewer.def
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.h b/nel/tools/3d/object_viewer/object_viewer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer.h
rename to nel/tools/3d/object_viewer/object_viewer.h
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.rc b/nel/tools/3d/object_viewer/object_viewer.rc
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer.rc
rename to nel/tools/3d/object_viewer/object_viewer.rc
diff --git a/code/nel/tools/3d/object_viewer/object_viewer_debug.def b/nel/tools/3d/object_viewer/object_viewer_debug.def
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer_debug.def
rename to nel/tools/3d/object_viewer/object_viewer_debug.def
diff --git a/code/nel/tools/3d/object_viewer/object_viewer_interface.h b/nel/tools/3d/object_viewer/object_viewer_interface.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/object_viewer_interface.h
rename to nel/tools/3d/object_viewer/object_viewer_interface.h
diff --git a/code/nel/tools/3d/object_viewer/particle.bmp b/nel/tools/3d/object_viewer/particle.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle.bmp
rename to nel/tools/3d/object_viewer/particle.bmp
diff --git a/code/nel/tools/3d/object_viewer/particle_dlg.cpp b/nel/tools/3d/object_viewer/particle_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_dlg.cpp
rename to nel/tools/3d/object_viewer/particle_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/particle_dlg.h b/nel/tools/3d/object_viewer/particle_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_dlg.h
rename to nel/tools/3d/object_viewer/particle_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/particle_system_edit.cpp b/nel/tools/3d/object_viewer/particle_system_edit.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_system_edit.cpp
rename to nel/tools/3d/object_viewer/particle_system_edit.cpp
diff --git a/code/nel/tools/3d/object_viewer/particle_system_edit.h b/nel/tools/3d/object_viewer/particle_system_edit.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_system_edit.h
rename to nel/tools/3d/object_viewer/particle_system_edit.h
diff --git a/code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp b/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp
rename to nel/tools/3d/object_viewer/particle_tree_ctrl.cpp
diff --git a/code/nel/tools/3d/object_viewer/particle_tree_ctrl.h b/nel/tools/3d/object_viewer/particle_tree_ctrl.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_tree_ctrl.h
rename to nel/tools/3d/object_viewer/particle_tree_ctrl.h
diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.cpp b/nel/tools/3d/object_viewer/particle_workspace.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_workspace.cpp
rename to nel/tools/3d/object_viewer/particle_workspace.cpp
diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.h b/nel/tools/3d/object_viewer/particle_workspace.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/particle_workspace.h
rename to nel/tools/3d/object_viewer/particle_workspace.h
diff --git a/code/nel/tools/3d/object_viewer/pick_sound.cpp b/nel/tools/3d/object_viewer/pick_sound.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pick_sound.cpp
rename to nel/tools/3d/object_viewer/pick_sound.cpp
diff --git a/code/nel/tools/3d/object_viewer/pick_sound.h b/nel/tools/3d/object_viewer/pick_sound.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pick_sound.h
rename to nel/tools/3d/object_viewer/pick_sound.h
diff --git a/code/nel/tools/3d/object_viewer/pingoo_back.tga b/nel/tools/3d/object_viewer/pingoo_back.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_back.tga
rename to nel/tools/3d/object_viewer/pingoo_back.tga
diff --git a/code/nel/tools/3d/object_viewer/pingoo_beak.tga b/nel/tools/3d/object_viewer/pingoo_beak.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_beak.tga
rename to nel/tools/3d/object_viewer/pingoo_beak.tga
diff --git a/code/nel/tools/3d/object_viewer/pingoo_face.tga b/nel/tools/3d/object_viewer/pingoo_face.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_face.tga
rename to nel/tools/3d/object_viewer/pingoo_face.tga
diff --git a/code/nel/tools/3d/object_viewer/pingoo_foot.tga b/nel/tools/3d/object_viewer/pingoo_foot.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_foot.tga
rename to nel/tools/3d/object_viewer/pingoo_foot.tga
diff --git a/code/nel/tools/3d/object_viewer/pingoo_snow.tga b/nel/tools/3d/object_viewer/pingoo_snow.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_snow.tga
rename to nel/tools/3d/object_viewer/pingoo_snow.tga
diff --git a/code/nel/tools/3d/object_viewer/pingoo_stick.tga b/nel/tools/3d/object_viewer/pingoo_stick.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/pingoo_stick.tga
rename to nel/tools/3d/object_viewer/pingoo_stick.tga
diff --git a/code/nel/tools/3d/object_viewer/popup_notify.h b/nel/tools/3d/object_viewer/popup_notify.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/popup_notify.h
rename to nel/tools/3d/object_viewer/popup_notify.h
diff --git a/code/nel/tools/3d/object_viewer/precomputed_rotations_dlg.cpp b/nel/tools/3d/object_viewer/precomputed_rotations_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/precomputed_rotations_dlg.cpp
rename to nel/tools/3d/object_viewer/precomputed_rotations_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/precomputed_rotations_dlg.h b/nel/tools/3d/object_viewer/precomputed_rotations_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/precomputed_rotations_dlg.h
rename to nel/tools/3d/object_viewer/precomputed_rotations_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/ps_global_color_dlg.cpp b/nel/tools/3d/object_viewer/ps_global_color_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_global_color_dlg.cpp
rename to nel/tools/3d/object_viewer/ps_global_color_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/ps_global_color_dlg.h b/nel/tools/3d/object_viewer/ps_global_color_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_global_color_dlg.h
rename to nel/tools/3d/object_viewer/ps_global_color_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/ps_initial_pos.cpp b/nel/tools/3d/object_viewer/ps_initial_pos.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_initial_pos.cpp
rename to nel/tools/3d/object_viewer/ps_initial_pos.cpp
diff --git a/code/nel/tools/3d/object_viewer/ps_initial_pos.h b/nel/tools/3d/object_viewer/ps_initial_pos.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_initial_pos.h
rename to nel/tools/3d/object_viewer/ps_initial_pos.h
diff --git a/code/nel/tools/3d/object_viewer/ps_mover_dlg.cpp b/nel/tools/3d/object_viewer/ps_mover_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_mover_dlg.cpp
rename to nel/tools/3d/object_viewer/ps_mover_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/ps_mover_dlg.h b/nel/tools/3d/object_viewer/ps_mover_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_mover_dlg.h
rename to nel/tools/3d/object_viewer/ps_mover_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/ps_wrapper.h b/nel/tools/3d/object_viewer/ps_wrapper.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ps_wrapper.h
rename to nel/tools/3d/object_viewer/ps_wrapper.h
diff --git a/code/nel/tools/3d/object_viewer/range_manager.cpp b/nel/tools/3d/object_viewer/range_manager.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/range_manager.cpp
rename to nel/tools/3d/object_viewer/range_manager.cpp
diff --git a/code/nel/tools/3d/object_viewer/range_manager.h b/nel/tools/3d/object_viewer/range_manager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/range_manager.h
rename to nel/tools/3d/object_viewer/range_manager.h
diff --git a/code/nel/tools/3d/object_viewer/range_selector.cpp b/nel/tools/3d/object_viewer/range_selector.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/range_selector.cpp
rename to nel/tools/3d/object_viewer/range_selector.cpp
diff --git a/code/nel/tools/3d/object_viewer/range_selector.h b/nel/tools/3d/object_viewer/range_selector.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/range_selector.h
rename to nel/tools/3d/object_viewer/range_selector.h
diff --git a/code/nel/tools/3d/object_viewer/res/object_viewer.rc2 b/nel/tools/3d/object_viewer/res/object_viewer.rc2
similarity index 100%
rename from code/nel/tools/3d/object_viewer/res/object_viewer.rc2
rename to nel/tools/3d/object_viewer/res/object_viewer.rc2
diff --git a/code/nel/tools/3d/object_viewer/resource.h b/nel/tools/3d/object_viewer/resource.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/resource.h
rename to nel/tools/3d/object_viewer/resource.h
diff --git a/code/nel/tools/3d/object_viewer/ribbon.tga b/nel/tools/3d/object_viewer/ribbon.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ribbon.tga
rename to nel/tools/3d/object_viewer/ribbon.tga
diff --git a/code/nel/tools/3d/object_viewer/ribbon_dlg.cpp b/nel/tools/3d/object_viewer/ribbon_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ribbon_dlg.cpp
rename to nel/tools/3d/object_viewer/ribbon_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/ribbon_dlg.h b/nel/tools/3d/object_viewer/ribbon_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/ribbon_dlg.h
rename to nel/tools/3d/object_viewer/ribbon_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/save_options_dlg.cpp b/nel/tools/3d/object_viewer/save_options_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/save_options_dlg.cpp
rename to nel/tools/3d/object_viewer/save_options_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/save_options_dlg.h b/nel/tools/3d/object_viewer/save_options_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/save_options_dlg.h
rename to nel/tools/3d/object_viewer/save_options_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/scene_rot_dlg.cpp b/nel/tools/3d/object_viewer/scene_rot_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scene_rot_dlg.cpp
rename to nel/tools/3d/object_viewer/scene_rot_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/scene_rot_dlg.h b/nel/tools/3d/object_viewer/scene_rot_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scene_rot_dlg.h
rename to nel/tools/3d/object_viewer/scene_rot_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/scheme_bank_dlg.cpp b/nel/tools/3d/object_viewer/scheme_bank_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scheme_bank_dlg.cpp
rename to nel/tools/3d/object_viewer/scheme_bank_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/scheme_bank_dlg.h b/nel/tools/3d/object_viewer/scheme_bank_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scheme_bank_dlg.h
rename to nel/tools/3d/object_viewer/scheme_bank_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/scheme_manager.cpp b/nel/tools/3d/object_viewer/scheme_manager.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scheme_manager.cpp
rename to nel/tools/3d/object_viewer/scheme_manager.cpp
diff --git a/code/nel/tools/3d/object_viewer/scheme_manager.h b/nel/tools/3d/object_viewer/scheme_manager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/scheme_manager.h
rename to nel/tools/3d/object_viewer/scheme_manager.h
diff --git a/code/nel/tools/3d/object_viewer/select_movie_size.cpp b/nel/tools/3d/object_viewer/select_movie_size.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/select_movie_size.cpp
rename to nel/tools/3d/object_viewer/select_movie_size.cpp
diff --git a/code/nel/tools/3d/object_viewer/select_movie_size.h b/nel/tools/3d/object_viewer/select_movie_size.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/select_movie_size.h
rename to nel/tools/3d/object_viewer/select_movie_size.h
diff --git a/code/nel/tools/3d/object_viewer/select_string.cpp b/nel/tools/3d/object_viewer/select_string.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/select_string.cpp
rename to nel/tools/3d/object_viewer/select_string.cpp
diff --git a/code/nel/tools/3d/object_viewer/select_string.h b/nel/tools/3d/object_viewer/select_string.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/select_string.h
rename to nel/tools/3d/object_viewer/select_string.h
diff --git a/code/nel/tools/3d/object_viewer/set_value_dlg.cpp b/nel/tools/3d/object_viewer/set_value_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/set_value_dlg.cpp
rename to nel/tools/3d/object_viewer/set_value_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/set_value_dlg.h b/nel/tools/3d/object_viewer/set_value_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/set_value_dlg.h
rename to nel/tools/3d/object_viewer/set_value_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/shock.tga b/nel/tools/3d/object_viewer/shock.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/shock.tga
rename to nel/tools/3d/object_viewer/shock.tga
diff --git a/code/nel/tools/3d/object_viewer/skeleton_scale_dlg.cpp b/nel/tools/3d/object_viewer/skeleton_scale_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/skeleton_scale_dlg.cpp
rename to nel/tools/3d/object_viewer/skeleton_scale_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/skeleton_scale_dlg.h b/nel/tools/3d/object_viewer/skeleton_scale_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/skeleton_scale_dlg.h
rename to nel/tools/3d/object_viewer/skeleton_scale_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/skippable_message_box.cpp b/nel/tools/3d/object_viewer/skippable_message_box.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/skippable_message_box.cpp
rename to nel/tools/3d/object_viewer/skippable_message_box.cpp
diff --git a/code/nel/tools/3d/object_viewer/skippable_message_box.h b/nel/tools/3d/object_viewer/skippable_message_box.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/skippable_message_box.h
rename to nel/tools/3d/object_viewer/skippable_message_box.h
diff --git a/code/nel/tools/3d/object_viewer/slot_dlg.cpp b/nel/tools/3d/object_viewer/slot_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/slot_dlg.cpp
rename to nel/tools/3d/object_viewer/slot_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/slot_dlg.h b/nel/tools/3d/object_viewer/slot_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/slot_dlg.h
rename to nel/tools/3d/object_viewer/slot_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/smiley.tga b/nel/tools/3d/object_viewer/smiley.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/smiley.tga
rename to nel/tools/3d/object_viewer/smiley.tga
diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
rename to nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h b/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
rename to nel/tools/3d/object_viewer/snapshot_tool_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/snow.tga b/nel/tools/3d/object_viewer/snow.tga
similarity index 100%
rename from code/nel/tools/3d/object_viewer/snow.tga
rename to nel/tools/3d/object_viewer/snow.tga
diff --git a/code/nel/tools/3d/object_viewer/sound_anim_dlg.cpp b/nel/tools/3d/object_viewer/sound_anim_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_anim_dlg.cpp
rename to nel/tools/3d/object_viewer/sound_anim_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/sound_anim_dlg.h b/nel/tools/3d/object_viewer/sound_anim_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_anim_dlg.h
rename to nel/tools/3d/object_viewer/sound_anim_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/sound_anim_view.cpp b/nel/tools/3d/object_viewer/sound_anim_view.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_anim_view.cpp
rename to nel/tools/3d/object_viewer/sound_anim_view.cpp
diff --git a/code/nel/tools/3d/object_viewer/sound_anim_view.h b/nel/tools/3d/object_viewer/sound_anim_view.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_anim_view.h
rename to nel/tools/3d/object_viewer/sound_anim_view.h
diff --git a/code/nel/tools/3d/object_viewer/sound_system.cpp b/nel/tools/3d/object_viewer/sound_system.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_system.cpp
rename to nel/tools/3d/object_viewer/sound_system.cpp
diff --git a/code/nel/tools/3d/object_viewer/sound_system.h b/nel/tools/3d/object_viewer/sound_system.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/sound_system.h
rename to nel/tools/3d/object_viewer/sound_system.h
diff --git a/code/nel/tools/3d/object_viewer/start_stop_particle_system.cpp b/nel/tools/3d/object_viewer/start_stop_particle_system.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/start_stop_particle_system.cpp
rename to nel/tools/3d/object_viewer/start_stop_particle_system.cpp
diff --git a/code/nel/tools/3d/object_viewer/start_stop_particle_system.h b/nel/tools/3d/object_viewer/start_stop_particle_system.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/start_stop_particle_system.h
rename to nel/tools/3d/object_viewer/start_stop_particle_system.h
diff --git a/code/nel/tools/3d/object_viewer/std_afx.cpp b/nel/tools/3d/object_viewer/std_afx.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/std_afx.cpp
rename to nel/tools/3d/object_viewer/std_afx.cpp
diff --git a/code/nel/tools/3d/object_viewer/std_afx.h b/nel/tools/3d/object_viewer/std_afx.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/std_afx.h
rename to nel/tools/3d/object_viewer/std_afx.h
diff --git a/code/nel/tools/3d/object_viewer/tail_particle_dlg.cpp b/nel/tools/3d/object_viewer/tail_particle_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/tail_particle_dlg.cpp
rename to nel/tools/3d/object_viewer/tail_particle_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/tail_particle_dlg.h b/nel/tools/3d/object_viewer/tail_particle_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/tail_particle_dlg.h
rename to nel/tools/3d/object_viewer/tail_particle_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/texture_anim_dlg.cpp b/nel/tools/3d/object_viewer/texture_anim_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/texture_anim_dlg.cpp
rename to nel/tools/3d/object_viewer/texture_anim_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/texture_anim_dlg.h b/nel/tools/3d/object_viewer/texture_anim_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/texture_anim_dlg.h
rename to nel/tools/3d/object_viewer/texture_anim_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/texture_chooser.cpp b/nel/tools/3d/object_viewer/texture_chooser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/texture_chooser.cpp
rename to nel/tools/3d/object_viewer/texture_chooser.cpp
diff --git a/code/nel/tools/3d/object_viewer/texture_chooser.h b/nel/tools/3d/object_viewer/texture_chooser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/texture_chooser.h
rename to nel/tools/3d/object_viewer/texture_chooser.h
diff --git a/code/nel/tools/3d/object_viewer/toolbar1.bmp b/nel/tools/3d/object_viewer/toolbar1.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/toolbar1.bmp
rename to nel/tools/3d/object_viewer/toolbar1.bmp
diff --git a/code/nel/tools/3d/object_viewer/tune_mrm_dlg.cpp b/nel/tools/3d/object_viewer/tune_mrm_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/tune_mrm_dlg.cpp
rename to nel/tools/3d/object_viewer/tune_mrm_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/tune_mrm_dlg.h b/nel/tools/3d/object_viewer/tune_mrm_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/tune_mrm_dlg.h
rename to nel/tools/3d/object_viewer/tune_mrm_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/value_blender_dlg.cpp b/nel/tools/3d/object_viewer/value_blender_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_blender_dlg.cpp
rename to nel/tools/3d/object_viewer/value_blender_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/value_blender_dlg.h b/nel/tools/3d/object_viewer/value_blender_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_blender_dlg.h
rename to nel/tools/3d/object_viewer/value_blender_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/value_from_emitter_dlg.cpp b/nel/tools/3d/object_viewer/value_from_emitter_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_from_emitter_dlg.cpp
rename to nel/tools/3d/object_viewer/value_from_emitter_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/value_from_emitter_dlg.h b/nel/tools/3d/object_viewer/value_from_emitter_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_from_emitter_dlg.h
rename to nel/tools/3d/object_viewer/value_from_emitter_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/value_gradient_dlg.cpp b/nel/tools/3d/object_viewer/value_gradient_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_gradient_dlg.cpp
rename to nel/tools/3d/object_viewer/value_gradient_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/value_gradient_dlg.h b/nel/tools/3d/object_viewer/value_gradient_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/value_gradient_dlg.h
rename to nel/tools/3d/object_viewer/value_gradient_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_apperance_page.cpp b/nel/tools/3d/object_viewer/vegetable_apperance_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_apperance_page.cpp
rename to nel/tools/3d/object_viewer/vegetable_apperance_page.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_apperance_page.h b/nel/tools/3d/object_viewer/vegetable_apperance_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_apperance_page.h
rename to nel/tools/3d/object_viewer/vegetable_apperance_page.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_copy_dlg.cpp b/nel/tools/3d/object_viewer/vegetable_copy_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_copy_dlg.cpp
rename to nel/tools/3d/object_viewer/vegetable_copy_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_copy_dlg.h b/nel/tools/3d/object_viewer/vegetable_copy_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_copy_dlg.h
rename to nel/tools/3d/object_viewer/vegetable_copy_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_density_page.cpp b/nel/tools/3d/object_viewer/vegetable_density_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_density_page.cpp
rename to nel/tools/3d/object_viewer/vegetable_density_page.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_density_page.h b/nel/tools/3d/object_viewer/vegetable_density_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_density_page.h
rename to nel/tools/3d/object_viewer/vegetable_density_page.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_dlg.cpp b/nel/tools/3d/object_viewer/vegetable_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_dlg.cpp
rename to nel/tools/3d/object_viewer/vegetable_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_dlg.h b/nel/tools/3d/object_viewer/vegetable_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_dlg.h
rename to nel/tools/3d/object_viewer/vegetable_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_edit_tools.cpp b/nel/tools/3d/object_viewer/vegetable_edit_tools.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_edit_tools.cpp
rename to nel/tools/3d/object_viewer/vegetable_edit_tools.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_edit_tools.h b/nel/tools/3d/object_viewer/vegetable_edit_tools.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_edit_tools.h
rename to nel/tools/3d/object_viewer/vegetable_edit_tools.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_list_box.cpp b/nel/tools/3d/object_viewer/vegetable_list_box.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_list_box.cpp
rename to nel/tools/3d/object_viewer/vegetable_list_box.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_list_box.h b/nel/tools/3d/object_viewer/vegetable_list_box.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_list_box.h
rename to nel/tools/3d/object_viewer/vegetable_list_box.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_list_color.cpp b/nel/tools/3d/object_viewer/vegetable_list_color.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_list_color.cpp
rename to nel/tools/3d/object_viewer/vegetable_list_color.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_list_color.h b/nel/tools/3d/object_viewer/vegetable_list_color.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_list_color.h
rename to nel/tools/3d/object_viewer/vegetable_list_color.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.cpp b/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.cpp
rename to nel/tools/3d/object_viewer/vegetable_noise_value_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.h b/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_noise_value_dlg.h
rename to nel/tools/3d/object_viewer/vegetable_noise_value_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_refresh.cpp b/nel/tools/3d/object_viewer/vegetable_refresh.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_refresh.cpp
rename to nel/tools/3d/object_viewer/vegetable_refresh.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_refresh.h b/nel/tools/3d/object_viewer/vegetable_refresh.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_refresh.h
rename to nel/tools/3d/object_viewer/vegetable_refresh.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_rotate_page.cpp b/nel/tools/3d/object_viewer/vegetable_rotate_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_rotate_page.cpp
rename to nel/tools/3d/object_viewer/vegetable_rotate_page.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_rotate_page.h b/nel/tools/3d/object_viewer/vegetable_rotate_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_rotate_page.h
rename to nel/tools/3d/object_viewer/vegetable_rotate_page.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_scale_page.cpp b/nel/tools/3d/object_viewer/vegetable_scale_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_scale_page.cpp
rename to nel/tools/3d/object_viewer/vegetable_scale_page.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_scale_page.h b/nel/tools/3d/object_viewer/vegetable_scale_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_scale_page.h
rename to nel/tools/3d/object_viewer/vegetable_scale_page.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_select_dlg.cpp b/nel/tools/3d/object_viewer/vegetable_select_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_select_dlg.cpp
rename to nel/tools/3d/object_viewer/vegetable_select_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_select_dlg.h b/nel/tools/3d/object_viewer/vegetable_select_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_select_dlg.h
rename to nel/tools/3d/object_viewer/vegetable_select_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/vegetable_wind_dlg.cpp b/nel/tools/3d/object_viewer/vegetable_wind_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_wind_dlg.cpp
rename to nel/tools/3d/object_viewer/vegetable_wind_dlg.cpp
diff --git a/code/nel/tools/3d/object_viewer/vegetable_wind_dlg.h b/nel/tools/3d/object_viewer/vegetable_wind_dlg.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/vegetable_wind_dlg.h
rename to nel/tools/3d/object_viewer/vegetable_wind_dlg.h
diff --git a/code/nel/tools/3d/object_viewer/version.rc2 b/nel/tools/3d/object_viewer/version.rc2
similarity index 100%
rename from code/nel/tools/3d/object_viewer/version.rc2
rename to nel/tools/3d/object_viewer/version.rc2
diff --git a/code/nel/tools/3d/object_viewer/version.ver b/nel/tools/3d/object_viewer/version.ver
similarity index 100%
rename from code/nel/tools/3d/object_viewer/version.ver
rename to nel/tools/3d/object_viewer/version.ver
diff --git a/code/nel/tools/3d/object_viewer/water_pool_editor.cpp b/nel/tools/3d/object_viewer/water_pool_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/water_pool_editor.cpp
rename to nel/tools/3d/object_viewer/water_pool_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer/water_pool_editor.h b/nel/tools/3d/object_viewer/water_pool_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer/water_pool_editor.h
rename to nel/tools/3d/object_viewer/water_pool_editor.h
diff --git a/code/nel/tools/3d/object_viewer/workspace.bmp b/nel/tools/3d/object_viewer/workspace.bmp
similarity index 100%
rename from code/nel/tools/3d/object_viewer/workspace.bmp
rename to nel/tools/3d/object_viewer/workspace.bmp
diff --git a/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt b/nel/tools/3d/object_viewer_exe/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/CMakeLists.txt
rename to nel/tools/3d/object_viewer_exe/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_exe/nevraxpill.ico b/nel/tools/3d/object_viewer_exe/nevraxpill.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/nevraxpill.ico
rename to nel/tools/3d/object_viewer_exe/nevraxpill.ico
diff --git a/code/nel/tools/3d/object_viewer_exe/object_viewer_exe.cpp b/nel/tools/3d/object_viewer_exe/object_viewer_exe.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/object_viewer_exe.cpp
rename to nel/tools/3d/object_viewer_exe/object_viewer_exe.cpp
diff --git a/code/nel/tools/3d/object_viewer_exe/object_viewer_exe.rc b/nel/tools/3d/object_viewer_exe/object_viewer_exe.rc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/object_viewer_exe.rc
rename to nel/tools/3d/object_viewer_exe/object_viewer_exe.rc
diff --git a/code/nel/tools/3d/object_viewer_exe/resource.h b/nel/tools/3d/object_viewer_exe/resource.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/resource.h
rename to nel/tools/3d/object_viewer_exe/resource.h
diff --git a/code/nel/tools/3d/object_viewer_exe/std_afx.cpp b/nel/tools/3d/object_viewer_exe/std_afx.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/std_afx.cpp
rename to nel/tools/3d/object_viewer_exe/std_afx.cpp
diff --git a/code/nel/tools/3d/object_viewer_exe/std_afx.h b/nel/tools/3d/object_viewer_exe/std_afx.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/std_afx.h
rename to nel/tools/3d/object_viewer_exe/std_afx.h
diff --git a/code/nel/tools/3d/object_viewer_exe/version.rc2 b/nel/tools/3d/object_viewer_exe/version.rc2
similarity index 100%
rename from code/nel/tools/3d/object_viewer_exe/version.rc2
rename to nel/tools/3d/object_viewer_exe/version.rc2
diff --git a/code/nel/tools/3d/object_viewer_widget/CMakeLists.txt b/nel/tools/3d/object_viewer_widget/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/CMakeLists.txt
rename to nel/tools/3d/object_viewer_widget/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt b/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
rename to nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_widget/src/entity.cpp b/nel/tools/3d/object_viewer_widget/src/entity.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/entity.cpp
rename to nel/tools/3d/object_viewer_widget/src/entity.cpp
diff --git a/code/nel/tools/3d/object_viewer_widget/src/entity.h b/nel/tools/3d/object_viewer_widget/src/entity.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/entity.h
rename to nel/tools/3d/object_viewer_widget/src/entity.h
diff --git a/code/nel/tools/3d/object_viewer_widget/src/interfaces.h b/nel/tools/3d/object_viewer_widget/src/interfaces.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/interfaces.h
rename to nel/tools/3d/object_viewer_widget/src/interfaces.h
diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp b/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
rename to nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h b/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
rename to nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
diff --git a/code/nel/tools/3d/object_viewer_widget/src/stdpch.cpp b/nel/tools/3d/object_viewer_widget/src/stdpch.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/stdpch.cpp
rename to nel/tools/3d/object_viewer_widget/src/stdpch.cpp
diff --git a/code/nel/tools/3d/object_viewer_widget/src/stdpch.h b/nel/tools/3d/object_viewer_widget/src/stdpch.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_widget/src/stdpch.h
rename to nel/tools/3d/object_viewer_widget/src/stdpch.h
diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/nel/tools/3d/panoply_maker/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/CMakeLists.txt
rename to nel/tools/3d/panoply_maker/CMakeLists.txt
diff --git a/code/nel/tools/3d/panoply_maker/blue_pill.ico b/nel/tools/3d/panoply_maker/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/blue_pill.ico
rename to nel/tools/3d/panoply_maker/blue_pill.ico
diff --git a/code/nel/tools/3d/panoply_maker/color_mask.h b/nel/tools/3d/panoply_maker/color_mask.h
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/color_mask.h
rename to nel/tools/3d/panoply_maker/color_mask.h
diff --git a/code/nel/tools/3d/panoply_maker/color_modifier.cpp b/nel/tools/3d/panoply_maker/color_modifier.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/color_modifier.cpp
rename to nel/tools/3d/panoply_maker/color_modifier.cpp
diff --git a/code/nel/tools/3d/panoply_maker/color_modifier.h b/nel/tools/3d/panoply_maker/color_modifier.h
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/color_modifier.h
rename to nel/tools/3d/panoply_maker/color_modifier.h
diff --git a/code/nel/tools/3d/panoply_maker/hls_bank_texture_info.cpp b/nel/tools/3d/panoply_maker/hls_bank_texture_info.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/hls_bank_texture_info.cpp
rename to nel/tools/3d/panoply_maker/hls_bank_texture_info.cpp
diff --git a/code/nel/tools/3d/panoply_maker/hls_bank_texture_info.h b/nel/tools/3d/panoply_maker/hls_bank_texture_info.h
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/hls_bank_texture_info.h
rename to nel/tools/3d/panoply_maker/hls_bank_texture_info.h
diff --git a/code/nel/tools/3d/panoply_maker/main.rc b/nel/tools/3d/panoply_maker/main.rc
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/main.rc
rename to nel/tools/3d/panoply_maker/main.rc
diff --git a/code/nel/tools/3d/panoply_maker/panoply.cfg b/nel/tools/3d/panoply_maker/panoply.cfg
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/panoply.cfg
rename to nel/tools/3d/panoply_maker/panoply.cfg
diff --git a/code/nel/tools/3d/panoply_maker/panoply_maker.cpp b/nel/tools/3d/panoply_maker/panoply_maker.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_maker/panoply_maker.cpp
rename to nel/tools/3d/panoply_maker/panoply_maker.cpp
diff --git a/code/nel/tools/3d/panoply_preview/CMakeLists.txt b/nel/tools/3d/panoply_preview/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/CMakeLists.txt
rename to nel/tools/3d/panoply_preview/CMakeLists.txt
diff --git a/code/nel/tools/3d/panoply_preview/green_pill.ico b/nel/tools/3d/panoply_preview/green_pill.ico
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/green_pill.ico
rename to nel/tools/3d/panoply_preview/green_pill.ico
diff --git a/code/nel/tools/3d/panoply_preview/main.rc b/nel/tools/3d/panoply_preview/main.rc
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/main.rc
rename to nel/tools/3d/panoply_preview/main.rc
diff --git a/code/nel/tools/3d/panoply_preview/main_window.cpp b/nel/tools/3d/panoply_preview/main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/main_window.cpp
rename to nel/tools/3d/panoply_preview/main_window.cpp
diff --git a/code/nel/tools/3d/panoply_preview/main_window.h b/nel/tools/3d/panoply_preview/main_window.h
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/main_window.h
rename to nel/tools/3d/panoply_preview/main_window.h
diff --git a/code/nel/tools/3d/panoply_preview/panoply_preview.cpp b/nel/tools/3d/panoply_preview/panoply_preview.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/panoply_preview.cpp
rename to nel/tools/3d/panoply_preview/panoply_preview.cpp
diff --git a/code/nel/tools/3d/panoply_preview/panoply_preview.h b/nel/tools/3d/panoply_preview/panoply_preview.h
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/panoply_preview.h
rename to nel/tools/3d/panoply_preview/panoply_preview.h
diff --git a/code/nel/tools/3d/panoply_preview/tool_config.h b/nel/tools/3d/panoply_preview/tool_config.h
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/tool_config.h
rename to nel/tools/3d/panoply_preview/tool_config.h
diff --git a/code/nel/tools/3d/panoply_preview/tool_main.cpp b/nel/tools/3d/panoply_preview/tool_main.cpp
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/tool_main.cpp
rename to nel/tools/3d/panoply_preview/tool_main.cpp
diff --git a/code/nel/tools/3d/panoply_preview/tool_main.h b/nel/tools/3d/panoply_preview/tool_main.h
similarity index 100%
rename from code/nel/tools/3d/panoply_preview/tool_main.h
rename to nel/tools/3d/panoply_preview/tool_main.h
diff --git a/code/nel/tools/3d/pipeline_max/CMakeLists.txt b/nel/tools/3d/pipeline_max/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/CMakeLists.txt
rename to nel/tools/3d/pipeline_max/CMakeLists.txt
diff --git a/code/nel/tools/3d/pipeline_max/builtin/animatable.cpp b/nel/tools/3d/pipeline_max/builtin/animatable.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/animatable.cpp
rename to nel/tools/3d/pipeline_max/builtin/animatable.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/animatable.h b/nel/tools/3d/pipeline_max/builtin/animatable.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/animatable.h
rename to nel/tools/3d/pipeline_max/builtin/animatable.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/base_object.cpp b/nel/tools/3d/pipeline_max/builtin/base_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/base_object.cpp
rename to nel/tools/3d/pipeline_max/builtin/base_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/base_object.h b/nel/tools/3d/pipeline_max/builtin/base_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/base_object.h
rename to nel/tools/3d/pipeline_max/builtin/base_object.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp b/nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp
rename to nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.h b/nel/tools/3d/pipeline_max/builtin/bitmap_tex.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.h
rename to nel/tools/3d/pipeline_max/builtin/bitmap_tex.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/builtin.cpp b/nel/tools/3d/pipeline_max/builtin/builtin.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/builtin.cpp
rename to nel/tools/3d/pipeline_max/builtin/builtin.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/builtin.h b/nel/tools/3d/pipeline_max/builtin/builtin.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/builtin.h
rename to nel/tools/3d/pipeline_max/builtin/builtin.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/editable_patch.cpp b/nel/tools/3d/pipeline_max/builtin/editable_patch.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/editable_patch.cpp
rename to nel/tools/3d/pipeline_max/builtin/editable_patch.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/editable_patch.h b/nel/tools/3d/pipeline_max/builtin/editable_patch.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/editable_patch.h
rename to nel/tools/3d/pipeline_max/builtin/editable_patch.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/geom_object.cpp b/nel/tools/3d/pipeline_max/builtin/geom_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/geom_object.cpp
rename to nel/tools/3d/pipeline_max/builtin/geom_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/geom_object.h b/nel/tools/3d/pipeline_max/builtin/geom_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/geom_object.h
rename to nel/tools/3d/pipeline_max/builtin/geom_object.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/i_node.cpp b/nel/tools/3d/pipeline_max/builtin/i_node.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/i_node.cpp
rename to nel/tools/3d/pipeline_max/builtin/i_node.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/i_node.h b/nel/tools/3d/pipeline_max/builtin/i_node.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/i_node.h
rename to nel/tools/3d/pipeline_max/builtin/i_node.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/modifier.cpp b/nel/tools/3d/pipeline_max/builtin/modifier.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/modifier.cpp
rename to nel/tools/3d/pipeline_max/builtin/modifier.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/modifier.h b/nel/tools/3d/pipeline_max/builtin/modifier.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/modifier.h
rename to nel/tools/3d/pipeline_max/builtin/modifier.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/mtl.cpp b/nel/tools/3d/pipeline_max/builtin/mtl.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/mtl.cpp
rename to nel/tools/3d/pipeline_max/builtin/mtl.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/mtl.h b/nel/tools/3d/pipeline_max/builtin/mtl.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/mtl.h
rename to nel/tools/3d/pipeline_max/builtin/mtl.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/mtl_base.cpp b/nel/tools/3d/pipeline_max/builtin/mtl_base.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/mtl_base.cpp
rename to nel/tools/3d/pipeline_max/builtin/mtl_base.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/mtl_base.h b/nel/tools/3d/pipeline_max/builtin/mtl_base.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/mtl_base.h
rename to nel/tools/3d/pipeline_max/builtin/mtl_base.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp b/nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp
rename to nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/multi_mtl.h b/nel/tools/3d/pipeline_max/builtin/multi_mtl.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/multi_mtl.h
rename to nel/tools/3d/pipeline_max/builtin/multi_mtl.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/node_impl.cpp b/nel/tools/3d/pipeline_max/builtin/node_impl.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/node_impl.cpp
rename to nel/tools/3d/pipeline_max/builtin/node_impl.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/node_impl.h b/nel/tools/3d/pipeline_max/builtin/node_impl.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/node_impl.h
rename to nel/tools/3d/pipeline_max/builtin/node_impl.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/object.cpp b/nel/tools/3d/pipeline_max/builtin/object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/object.cpp
rename to nel/tools/3d/pipeline_max/builtin/object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/object.h b/nel/tools/3d/pipeline_max/builtin/object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/object.h
rename to nel/tools/3d/pipeline_max/builtin/object.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/param_block.cpp b/nel/tools/3d/pipeline_max/builtin/param_block.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/param_block.cpp
rename to nel/tools/3d/pipeline_max/builtin/param_block.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/param_block.h b/nel/tools/3d/pipeline_max/builtin/param_block.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/param_block.h
rename to nel/tools/3d/pipeline_max/builtin/param_block.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/param_block_2.cpp b/nel/tools/3d/pipeline_max/builtin/param_block_2.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/param_block_2.cpp
rename to nel/tools/3d/pipeline_max/builtin/param_block_2.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/param_block_2.h b/nel/tools/3d/pipeline_max/builtin/param_block_2.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/param_block_2.h
rename to nel/tools/3d/pipeline_max/builtin/param_block_2.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/patch_object.cpp b/nel/tools/3d/pipeline_max/builtin/patch_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/patch_object.cpp
rename to nel/tools/3d/pipeline_max/builtin/patch_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/patch_object.h b/nel/tools/3d/pipeline_max/builtin/patch_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/patch_object.h
rename to nel/tools/3d/pipeline_max/builtin/patch_object.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/poly_object.cpp b/nel/tools/3d/pipeline_max/builtin/poly_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/poly_object.cpp
rename to nel/tools/3d/pipeline_max/builtin/poly_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/poly_object.h b/nel/tools/3d/pipeline_max/builtin/poly_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/poly_object.h
rename to nel/tools/3d/pipeline_max/builtin/poly_object.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/reference_maker.cpp b/nel/tools/3d/pipeline_max/builtin/reference_maker.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/reference_maker.cpp
rename to nel/tools/3d/pipeline_max/builtin/reference_maker.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/reference_maker.h b/nel/tools/3d/pipeline_max/builtin/reference_maker.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/reference_maker.h
rename to nel/tools/3d/pipeline_max/builtin/reference_maker.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/reference_target.cpp b/nel/tools/3d/pipeline_max/builtin/reference_target.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/reference_target.cpp
rename to nel/tools/3d/pipeline_max/builtin/reference_target.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/reference_target.h b/nel/tools/3d/pipeline_max/builtin/reference_target.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/reference_target.h
rename to nel/tools/3d/pipeline_max/builtin/reference_target.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/root_node.cpp b/nel/tools/3d/pipeline_max/builtin/root_node.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/root_node.cpp
rename to nel/tools/3d/pipeline_max/builtin/root_node.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/root_node.h b/nel/tools/3d/pipeline_max/builtin/root_node.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/root_node.h
rename to nel/tools/3d/pipeline_max/builtin/root_node.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/scene_impl.cpp b/nel/tools/3d/pipeline_max/builtin/scene_impl.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/scene_impl.cpp
rename to nel/tools/3d/pipeline_max/builtin/scene_impl.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/scene_impl.h b/nel/tools/3d/pipeline_max/builtin/scene_impl.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/scene_impl.h
rename to nel/tools/3d/pipeline_max/builtin/scene_impl.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/std_mat.cpp b/nel/tools/3d/pipeline_max/builtin/std_mat.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/std_mat.cpp
rename to nel/tools/3d/pipeline_max/builtin/std_mat.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/std_mat.h b/nel/tools/3d/pipeline_max/builtin/std_mat.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/std_mat.h
rename to nel/tools/3d/pipeline_max/builtin/std_mat.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp b/nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp
rename to nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/std_mat_2.h b/nel/tools/3d/pipeline_max/builtin/std_mat_2.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/std_mat_2.h
rename to nel/tools/3d/pipeline_max/builtin/std_mat_2.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp b/nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp
rename to nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/storage/app_data.h b/nel/tools/3d/pipeline_max/builtin/storage/app_data.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/storage/app_data.h
rename to nel/tools/3d/pipeline_max/builtin/storage/app_data.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp b/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp
rename to nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h b/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h
rename to nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp b/nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp
rename to nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.h b/nel/tools/3d/pipeline_max/builtin/super_class_unknown.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.h
rename to nel/tools/3d/pipeline_max/builtin/super_class_unknown.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/texmap.cpp b/nel/tools/3d/pipeline_max/builtin/texmap.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/texmap.cpp
rename to nel/tools/3d/pipeline_max/builtin/texmap.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/texmap.h b/nel/tools/3d/pipeline_max/builtin/texmap.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/texmap.h
rename to nel/tools/3d/pipeline_max/builtin/texmap.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/track_view_node.cpp b/nel/tools/3d/pipeline_max/builtin/track_view_node.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/track_view_node.cpp
rename to nel/tools/3d/pipeline_max/builtin/track_view_node.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/track_view_node.h b/nel/tools/3d/pipeline_max/builtin/track_view_node.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/track_view_node.h
rename to nel/tools/3d/pipeline_max/builtin/track_view_node.h
diff --git a/code/nel/tools/3d/pipeline_max/builtin/tri_object.cpp b/nel/tools/3d/pipeline_max/builtin/tri_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/tri_object.cpp
rename to nel/tools/3d/pipeline_max/builtin/tri_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/builtin/tri_object.h b/nel/tools/3d/pipeline_max/builtin/tri_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/builtin/tri_object.h
rename to nel/tools/3d/pipeline_max/builtin/tri_object.h
diff --git a/code/nel/tools/3d/pipeline_max/class_data.cpp b/nel/tools/3d/pipeline_max/class_data.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/class_data.cpp
rename to nel/tools/3d/pipeline_max/class_data.cpp
diff --git a/code/nel/tools/3d/pipeline_max/class_data.h b/nel/tools/3d/pipeline_max/class_data.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/class_data.h
rename to nel/tools/3d/pipeline_max/class_data.h
diff --git a/code/nel/tools/3d/pipeline_max/class_directory_3.cpp b/nel/tools/3d/pipeline_max/class_directory_3.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/class_directory_3.cpp
rename to nel/tools/3d/pipeline_max/class_directory_3.cpp
diff --git a/code/nel/tools/3d/pipeline_max/class_directory_3.h b/nel/tools/3d/pipeline_max/class_directory_3.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/class_directory_3.h
rename to nel/tools/3d/pipeline_max/class_directory_3.h
diff --git a/code/nel/tools/3d/pipeline_max/config.cpp b/nel/tools/3d/pipeline_max/config.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/config.cpp
rename to nel/tools/3d/pipeline_max/config.cpp
diff --git a/code/nel/tools/3d/pipeline_max/config.h b/nel/tools/3d/pipeline_max/config.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/config.h
rename to nel/tools/3d/pipeline_max/config.h
diff --git a/code/nel/tools/3d/pipeline_max/derived_object.cpp b/nel/tools/3d/pipeline_max/derived_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/derived_object.cpp
rename to nel/tools/3d/pipeline_max/derived_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/derived_object.h b/nel/tools/3d/pipeline_max/derived_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/derived_object.h
rename to nel/tools/3d/pipeline_max/derived_object.h
diff --git a/code/nel/tools/3d/pipeline_max/dll_directory.cpp b/nel/tools/3d/pipeline_max/dll_directory.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/dll_directory.cpp
rename to nel/tools/3d/pipeline_max/dll_directory.cpp
diff --git a/code/nel/tools/3d/pipeline_max/dll_directory.h b/nel/tools/3d/pipeline_max/dll_directory.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/dll_directory.h
rename to nel/tools/3d/pipeline_max/dll_directory.h
diff --git a/code/nel/tools/3d/pipeline_max/dll_plugin_desc.cpp b/nel/tools/3d/pipeline_max/dll_plugin_desc.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/dll_plugin_desc.cpp
rename to nel/tools/3d/pipeline_max/dll_plugin_desc.cpp
diff --git a/code/nel/tools/3d/pipeline_max/dll_plugin_desc.h b/nel/tools/3d/pipeline_max/dll_plugin_desc.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/dll_plugin_desc.h
rename to nel/tools/3d/pipeline_max/dll_plugin_desc.h
diff --git a/code/nel/tools/3d/pipeline_max/epoly/editable_poly.cpp b/nel/tools/3d/pipeline_max/epoly/editable_poly.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/epoly/editable_poly.cpp
rename to nel/tools/3d/pipeline_max/epoly/editable_poly.cpp
diff --git a/code/nel/tools/3d/pipeline_max/epoly/editable_poly.h b/nel/tools/3d/pipeline_max/epoly/editable_poly.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/epoly/editable_poly.h
rename to nel/tools/3d/pipeline_max/epoly/editable_poly.h
diff --git a/code/nel/tools/3d/pipeline_max/epoly/epoly.cpp b/nel/tools/3d/pipeline_max/epoly/epoly.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/epoly/epoly.cpp
rename to nel/tools/3d/pipeline_max/epoly/epoly.cpp
diff --git a/code/nel/tools/3d/pipeline_max/epoly/epoly.h b/nel/tools/3d/pipeline_max/epoly/epoly.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/epoly/epoly.h
rename to nel/tools/3d/pipeline_max/epoly/epoly.h
diff --git a/code/nel/tools/3d/pipeline_max/scene.cpp b/nel/tools/3d/pipeline_max/scene.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene.cpp
rename to nel/tools/3d/pipeline_max/scene.cpp
diff --git a/code/nel/tools/3d/pipeline_max/scene.h b/nel/tools/3d/pipeline_max/scene.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene.h
rename to nel/tools/3d/pipeline_max/scene.h
diff --git a/code/nel/tools/3d/pipeline_max/scene_class.cpp b/nel/tools/3d/pipeline_max/scene_class.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class.cpp
rename to nel/tools/3d/pipeline_max/scene_class.cpp
diff --git a/code/nel/tools/3d/pipeline_max/scene_class.h b/nel/tools/3d/pipeline_max/scene_class.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class.h
rename to nel/tools/3d/pipeline_max/scene_class.h
diff --git a/code/nel/tools/3d/pipeline_max/scene_class_registry.cpp b/nel/tools/3d/pipeline_max/scene_class_registry.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class_registry.cpp
rename to nel/tools/3d/pipeline_max/scene_class_registry.cpp
diff --git a/code/nel/tools/3d/pipeline_max/scene_class_registry.h b/nel/tools/3d/pipeline_max/scene_class_registry.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class_registry.h
rename to nel/tools/3d/pipeline_max/scene_class_registry.h
diff --git a/code/nel/tools/3d/pipeline_max/scene_class_unknown.cpp b/nel/tools/3d/pipeline_max/scene_class_unknown.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class_unknown.cpp
rename to nel/tools/3d/pipeline_max/scene_class_unknown.cpp
diff --git a/code/nel/tools/3d/pipeline_max/scene_class_unknown.h b/nel/tools/3d/pipeline_max/scene_class_unknown.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/scene_class_unknown.h
rename to nel/tools/3d/pipeline_max/scene_class_unknown.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_array.cpp b/nel/tools/3d/pipeline_max/storage_array.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_array.cpp
rename to nel/tools/3d/pipeline_max/storage_array.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_array.h b/nel/tools/3d/pipeline_max/storage_array.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_array.h
rename to nel/tools/3d/pipeline_max/storage_array.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_chunks.cpp b/nel/tools/3d/pipeline_max/storage_chunks.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_chunks.cpp
rename to nel/tools/3d/pipeline_max/storage_chunks.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_chunks.h b/nel/tools/3d/pipeline_max/storage_chunks.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_chunks.h
rename to nel/tools/3d/pipeline_max/storage_chunks.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_file.cpp b/nel/tools/3d/pipeline_max/storage_file.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_file.cpp
rename to nel/tools/3d/pipeline_max/storage_file.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_file.h b/nel/tools/3d/pipeline_max/storage_file.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_file.h
rename to nel/tools/3d/pipeline_max/storage_file.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_object.cpp b/nel/tools/3d/pipeline_max/storage_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_object.cpp
rename to nel/tools/3d/pipeline_max/storage_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_object.h b/nel/tools/3d/pipeline_max/storage_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_object.h
rename to nel/tools/3d/pipeline_max/storage_object.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_stream.cpp b/nel/tools/3d/pipeline_max/storage_stream.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_stream.cpp
rename to nel/tools/3d/pipeline_max/storage_stream.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_stream.h b/nel/tools/3d/pipeline_max/storage_stream.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_stream.h
rename to nel/tools/3d/pipeline_max/storage_stream.h
diff --git a/code/nel/tools/3d/pipeline_max/storage_value.cpp b/nel/tools/3d/pipeline_max/storage_value.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_value.cpp
rename to nel/tools/3d/pipeline_max/storage_value.cpp
diff --git a/code/nel/tools/3d/pipeline_max/storage_value.h b/nel/tools/3d/pipeline_max/storage_value.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/storage_value.h
rename to nel/tools/3d/pipeline_max/storage_value.h
diff --git a/code/nel/tools/3d/pipeline_max/super_class_desc.cpp b/nel/tools/3d/pipeline_max/super_class_desc.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/super_class_desc.cpp
rename to nel/tools/3d/pipeline_max/super_class_desc.cpp
diff --git a/code/nel/tools/3d/pipeline_max/super_class_desc.h b/nel/tools/3d/pipeline_max/super_class_desc.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/super_class_desc.h
rename to nel/tools/3d/pipeline_max/super_class_desc.h
diff --git a/code/nel/tools/3d/pipeline_max/typedefs.cpp b/nel/tools/3d/pipeline_max/typedefs.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/typedefs.cpp
rename to nel/tools/3d/pipeline_max/typedefs.cpp
diff --git a/code/nel/tools/3d/pipeline_max/typedefs.h b/nel/tools/3d/pipeline_max/typedefs.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/typedefs.h
rename to nel/tools/3d/pipeline_max/typedefs.h
diff --git a/code/nel/tools/3d/pipeline_max/update1/editable_mesh.cpp b/nel/tools/3d/pipeline_max/update1/editable_mesh.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/update1/editable_mesh.cpp
rename to nel/tools/3d/pipeline_max/update1/editable_mesh.cpp
diff --git a/code/nel/tools/3d/pipeline_max/update1/editable_mesh.h b/nel/tools/3d/pipeline_max/update1/editable_mesh.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/update1/editable_mesh.h
rename to nel/tools/3d/pipeline_max/update1/editable_mesh.h
diff --git a/code/nel/tools/3d/pipeline_max/update1/update1.cpp b/nel/tools/3d/pipeline_max/update1/update1.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/update1/update1.cpp
rename to nel/tools/3d/pipeline_max/update1/update1.cpp
diff --git a/code/nel/tools/3d/pipeline_max/update1/update1.h b/nel/tools/3d/pipeline_max/update1/update1.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/update1/update1.h
rename to nel/tools/3d/pipeline_max/update1/update1.h
diff --git a/code/nel/tools/3d/pipeline_max/wsm_derived_object.cpp b/nel/tools/3d/pipeline_max/wsm_derived_object.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/wsm_derived_object.cpp
rename to nel/tools/3d/pipeline_max/wsm_derived_object.cpp
diff --git a/code/nel/tools/3d/pipeline_max/wsm_derived_object.h b/nel/tools/3d/pipeline_max/wsm_derived_object.h
similarity index 100%
rename from code/nel/tools/3d/pipeline_max/wsm_derived_object.h
rename to nel/tools/3d/pipeline_max/wsm_derived_object.h
diff --git a/code/nel/tools/3d/pipeline_max_dump/CMakeLists.txt b/nel/tools/3d/pipeline_max_dump/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/CMakeLists.txt
rename to nel/tools/3d/pipeline_max_dump/CMakeLists.txt
diff --git a/code/nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c b/nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c
rename to nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c
diff --git a/code/nel/tools/3d/pipeline_max_dump/class_directory_3_3.c b/nel/tools/3d/pipeline_max_dump/class_directory_3_3.c
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/class_directory_3_3.c
rename to nel/tools/3d/pipeline_max_dump/class_directory_3_3.c
diff --git a/code/nel/tools/3d/pipeline_max_dump/config_2010.c b/nel/tools/3d/pipeline_max_dump/config_2010.c
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/config_2010.c
rename to nel/tools/3d/pipeline_max_dump/config_2010.c
diff --git a/code/nel/tools/3d/pipeline_max_dump/config_2010.txt b/nel/tools/3d/pipeline_max_dump/config_2010.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/config_2010.txt
rename to nel/tools/3d/pipeline_max_dump/config_2010.txt
diff --git a/code/nel/tools/3d/pipeline_max_dump/config_3.c b/nel/tools/3d/pipeline_max_dump/config_3.c
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/config_3.c
rename to nel/tools/3d/pipeline_max_dump/config_3.c
diff --git a/code/nel/tools/3d/pipeline_max_dump/info.txt b/nel/tools/3d/pipeline_max_dump/info.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/info.txt
rename to nel/tools/3d/pipeline_max_dump/info.txt
diff --git a/code/nel/tools/3d/pipeline_max_dump/main.cpp b/nel/tools/3d/pipeline_max_dump/main.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/main.cpp
rename to nel/tools/3d/pipeline_max_dump/main.cpp
diff --git a/code/nel/tools/3d/pipeline_max_dump/scene_2010.c b/nel/tools/3d/pipeline_max_dump/scene_2010.c
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/scene_2010.c
rename to nel/tools/3d/pipeline_max_dump/scene_2010.c
diff --git a/code/nel/tools/3d/pipeline_max_dump/scene_graph_5.txt b/nel/tools/3d/pipeline_max_dump/scene_graph_5.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_dump/scene_graph_5.txt
rename to nel/tools/3d/pipeline_max_dump/scene_graph_5.txt
diff --git a/code/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt b/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
rename to nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
diff --git a/code/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp b/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
similarity index 100%
rename from code/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
rename to nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
diff --git a/code/nel/tools/3d/plugin_max/CMakeLists.txt b/nel/tools/3d/plugin_max/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/CMakeLists.txt
rename to nel/tools/3d/plugin_max/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/compilation_notes.txt b/nel/tools/3d/plugin_max/compilation_notes.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/compilation_notes.txt
rename to nel/tools/3d/plugin_max/compilation_notes.txt
diff --git a/code/nel/tools/3d/plugin_max/compilation_notes_vc7.txt b/nel/tools/3d/plugin_max/compilation_notes_vc7.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/compilation_notes_vc7.txt
rename to nel/tools/3d/plugin_max/compilation_notes_vc7.txt
diff --git a/code/nel/tools/3d/plugin_max/install_plugin_max.txt b/nel/tools/3d/plugin_max/install_plugin_max.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/install_plugin_max.txt
rename to nel/tools/3d/plugin_max/install_plugin_max.txt
diff --git a/code/nel/tools/3d/plugin_max/macroscripts/nel_mirror_weights.mcr b/nel/tools/3d/plugin_max/macroscripts/nel_mirror_weights.mcr
similarity index 100%
rename from code/nel/tools/3d/plugin_max/macroscripts/nel_mirror_weights.mcr
rename to nel/tools/3d/plugin_max/macroscripts/nel_mirror_weights.mcr
diff --git a/code/nel/tools/3d/plugin_max/macroscripts/nel_node_properties.mcr b/nel/tools/3d/plugin_max/macroscripts/nel_node_properties.mcr
similarity index 100%
rename from code/nel/tools/3d/plugin_max/macroscripts/nel_node_properties.mcr
rename to nel/tools/3d/plugin_max/macroscripts/nel_node_properties.mcr
diff --git a/code/nel/tools/3d/plugin_max/macroscripts/nel_xref_building.mcr b/nel/tools/3d/plugin_max/macroscripts/nel_xref_building.mcr
similarity index 100%
rename from code/nel/tools/3d/plugin_max/macroscripts/nel_xref_building.mcr
rename to nel/tools/3d/plugin_max/macroscripts/nel_xref_building.mcr
diff --git a/code/nel/tools/3d/plugin_max/max_animation_support.txt b/nel/tools/3d/plugin_max/max_animation_support.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/max_animation_support.txt
rename to nel/tools/3d/plugin_max/max_animation_support.txt
diff --git a/code/nel/tools/3d/plugin_max/max_light_support.txt b/nel/tools/3d/plugin_max/max_light_support.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/max_light_support.txt
rename to nel/tools/3d/plugin_max/max_light_support.txt
diff --git a/code/nel/tools/3d/plugin_max/max_lightmap_support.txt b/nel/tools/3d/plugin_max/max_lightmap_support.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/max_lightmap_support.txt
rename to nel/tools/3d/plugin_max/max_lightmap_support.txt
diff --git a/code/nel/tools/3d/plugin_max/max_material_support.txt b/nel/tools/3d/plugin_max/max_material_support.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/max_material_support.txt
rename to nel/tools/3d/plugin_max/max_material_support.txt
diff --git a/code/nel/tools/3d/plugin_max/max_skinning_support.txt b/nel/tools/3d/plugin_max/max_skinning_support.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/max_skinning_support.txt
rename to nel/tools/3d/plugin_max/max_skinning_support.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp b/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.h
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.cpp b/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.cpp
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.h
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.h
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc b/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h
diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2 b/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
rename to nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp b/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp
rename to nel/tools/3d/plugin_max/nel_export/DllEntry.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/last_lightmap.cpp b/nel/tools/3d/plugin_max/nel_export/last_lightmap.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/last_lightmap.cpp
rename to nel/tools/3d/plugin_max/nel_export/last_lightmap.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.def b/nel/tools/3d/plugin_max/nel_export/nel_export.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export.def
rename to nel/tools/3d/plugin_max/nel_export/nel_export.def
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.h b/nel/tools/3d/plugin_max/nel_export/nel_export.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export.h
rename to nel/tools/3d/plugin_max/nel_export/nel_export.h
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/nel/tools/3d/plugin_max/nel_export/nel_export.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
rename to nel/tools/3d/plugin_max/nel_export/nel_export.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v1.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v1.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v1.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v1.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v2.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v2.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v2.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_lightmap_v2.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_scene.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_scene.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_scene.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_scene.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_scene.h b/nel/tools/3d/plugin_max/nel_export/nel_export_scene.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_scene.h
rename to nel/tools/3d/plugin_max/nel_export/nel_export_scene.h
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_swt.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_swt.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_swt.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_swt.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_zone.cpp b/nel/tools/3d/plugin_max/nel_export/nel_export_zone.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/nel_export_zone.cpp
rename to nel/tools/3d/plugin_max/nel_export/nel_export_zone.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/progress.cpp b/nel/tools/3d/plugin_max/nel_export/progress.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/progress.cpp
rename to nel/tools/3d/plugin_max/nel_export/progress.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/progress.h b/nel/tools/3d/plugin_max/nel_export/progress.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/progress.h
rename to nel/tools/3d/plugin_max/nel_export/progress.h
diff --git a/code/nel/tools/3d/plugin_max/nel_export/resource.h b/nel/tools/3d/plugin_max/nel_export/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/resource.h
rename to nel/tools/3d/plugin_max/nel_export/resource.h
diff --git a/code/nel/tools/3d/plugin_max/nel_export/std_afx.cpp b/nel/tools/3d/plugin_max/nel_export/std_afx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/std_afx.cpp
rename to nel/tools/3d/plugin_max/nel_export/std_afx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_export/std_afx.h b/nel/tools/3d/plugin_max/nel_export/std_afx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/std_afx.h
rename to nel/tools/3d/plugin_max/nel_export/std_afx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_export/version.rc2 b/nel/tools/3d/plugin_max/nel_export/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/version.rc2
rename to nel/tools/3d/plugin_max/nel_export/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_export/version.ver b/nel/tools/3d/plugin_max/nel_export/version.ver
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_export/version.ver
rename to nel/tools/3d/plugin_max/nel_export/version.ver
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h b/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.h b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.h b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_plane.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rad.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rad.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rad.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rad.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h b/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm_rt.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_anim.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_anim.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_anim.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_anim.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_appdata.h b/nel/tools/3d/plugin_max/nel_mesh_lib/export_appdata.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_appdata.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_appdata.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_flare.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_flare.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_flare.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_flare.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_light.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_light.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_light.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_light.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_lod_character.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_lod_character.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_lod_character.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_lod_character.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_material.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_material.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_material.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_material.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh_interface.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh_interface.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh_interface.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh_interface.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h b/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_particle_system.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_particle_system.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_particle_system.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_particle_system.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.h b/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.h
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.h
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_remanence.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_remanence.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_remanence.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_remanence.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_scene.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_scene.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_scene.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_scene.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_vegetable.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/export_vegetable.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_mesh_lib/export_vegetable.cpp
rename to nel/tools/3d/plugin_max/nel_mesh_lib/export_vegetable.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp b/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp
rename to nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/PO2RPO.h b/nel/tools/3d/plugin_max/nel_patch_converter/PO2RPO.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/PO2RPO.h
rename to nel/tools/3d/plugin_max/nel_patch_converter/PO2RPO.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.cpp b/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.cpp
rename to nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.def b/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.def
rename to nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.def
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.h b/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.h
rename to nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
rename to nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/resource.h b/nel/tools/3d/plugin_max/nel_patch_converter/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/resource.h
rename to nel/tools/3d/plugin_max/nel_patch_converter/resource.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt b/nel/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt
rename to nel/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
rename to nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
rename to nel/tools/3d/plugin_max/nel_patch_converter/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/version.ver b/nel/tools/3d/plugin_max/nel_patch_converter/version.ver
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_converter/version.ver
rename to nel/tools/3d/plugin_max/nel_patch_converter/version.ver
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/addvertc.cur b/nel/tools/3d/plugin_max/nel_patch_edit/addvertc.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/addvertc.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/addvertc.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/attach.cur b/nel/tools/3d/plugin_max/nel_patch_edit/attach.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/attach.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/attach.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bevel.cur b/nel/tools/3d/plugin_max/nel_patch_edit/bevel.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bevel.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/bevel.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bin00001.tga b/nel/tools/3d/plugin_max/nel_patch_edit/bin00001.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bin00001.tga
rename to nel/tools/3d/plugin_max/nel_patch_edit/bin00001.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00001.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/bmp00001.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00001.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/bmp00001.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00002.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/bmp00002.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00002.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/bmp00002.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00003.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/bmp00003.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bmp00003.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/bmp00003.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/booleant.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/booleant.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/booleant.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/booleant.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/boolinte.cur b/nel/tools/3d/plugin_max/nel_patch_edit/boolinte.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/boolinte.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/boolinte.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/boolsubt.cur b/nel/tools/3d/plugin_max/nel_patch_edit/boolsubt.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/boolsubt.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/boolsubt.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/boolunio.cur b/nel/tools/3d/plugin_max/nel_patch_edit/boolunio.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/boolunio.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/boolunio.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bulbmask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/bulbmask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bulbmask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/bulbmask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/bulbs.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/bulbs.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/bulbs.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/bulbs.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/chamfer.cur b/nel/tools/3d/plugin_max/nel_patch_edit/chamfer.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/chamfer.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/chamfer.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/crosshr.cur b/nel/tools/3d/plugin_max/nel_patch_edit/crosshr.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/crosshr.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/crosshr.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/crossins.cur b/nel/tools/3d/plugin_max/nel_patch_edit/crossins.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/crossins.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/crossins.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/cur00001.cur b/nel/tools/3d/plugin_max/nel_patch_edit/cur00001.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/cur00001.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/cur00001.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/cur00002.cur b/nel/tools/3d/plugin_max/nel_patch_edit/cur00002.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/cur00002.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/cur00002.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/cursor1.cur b/nel/tools/3d/plugin_max/nel_patch_edit/cursor1.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/cursor1.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/cursor1.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/echamfer.cur b/nel/tools/3d/plugin_max/nel_patch_edit/echamfer.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/echamfer.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/echamfer.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h b/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
rename to nel/tools/3d/plugin_max/nel_patch_edit/editpat.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/extrudec.cur b/nel/tools/3d/plugin_max/nel_patch_edit/extrudec.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/extrudec.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/extrudec.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/faceselt.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/faceselt.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/faceselt.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/faceselt.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/fillet.cur b/nel/tools/3d/plugin_max/nel_patch_edit/fillet.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/fillet.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/fillet.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/icon1.ico b/nel/tools/3d/plugin_max/nel_patch_edit/icon1.ico
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/icon1.ico
rename to nel/tools/3d/plugin_max/nel_patch_edit/icon1.ico
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/icon2.ico b/nel/tools/3d/plugin_max/nel_patch_edit/icon2.ico
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/icon2.ico
rename to nel/tools/3d/plugin_max/nel_patch_edit/icon2.ico
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/icon3.ico b/nel/tools/3d/plugin_max/nel_patch_edit/icon3.ico
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/icon3.ico
rename to nel/tools/3d/plugin_max/nel_patch_edit/icon3.ico
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/large.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/large.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/large.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/large.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/large.tga b/nel/tools/3d/plugin_max/nel_patch_edit/large.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/large.tga
rename to nel/tools/3d/plugin_max/nel_patch_edit/large.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/light.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/light.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/light.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/light.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/light.tga b/nel/tools/3d/plugin_max/nel_patch_edit/light.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/light.tga
rename to nel/tools/3d/plugin_max/nel_patch_edit/light.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/magnify.cur b/nel/tools/3d/plugin_max/nel_patch_edit/magnify.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/magnify.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/magnify.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mask_boo.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/mask_boo.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/mask_boo.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/mask_boo.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mask_fac.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/mask_fac.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/mask_fac.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/mask_fac.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mask_unw.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/mask_unw.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/mask_unw.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/mask_unw.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/medium.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/medium.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/medium.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/medium.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/medium.tga b/nel/tools/3d/plugin_max/nel_patch_edit/medium.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/medium.tga
rename to nel/tools/3d/plugin_max/nel_patch_edit/medium.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.h b/nel/tools/3d/plugin_max/nel_patch_edit/mods.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/mods.h
rename to nel/tools/3d/plugin_max/nel_patch_edit/mods.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
rename to nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/modsres.h b/nel/tools/3d/plugin_max/nel_patch_edit/modsres.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/modsres.h
rename to nel/tools/3d/plugin_max/nel_patch_edit/modsres.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/move_x.cur b/nel/tools/3d/plugin_max/nel_patch_edit/move_x.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/move_x.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/move_x.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/move_y.cur b/nel/tools/3d/plugin_max/nel_patch_edit/move_y.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/move_y.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/move_y.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/nel_patch_edit.def b/nel/tools/3d/plugin_max/nel_patch_edit/nel_patch_edit.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/nel_patch_edit.def
rename to nel/tools/3d/plugin_max/nel_patch_edit/nel_patch_edit.def
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_data.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_data.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_data.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_data.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_mod.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_mod.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_mod.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_edit_patch_mod.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_editpops.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_editpops.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_editpops.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_editpops.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_ep_vert_mapper.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_ep_vert_mapper.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_ep_vert_mapper.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_ep_vert_mapper.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_add_patches.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_add_patches.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_add_patches.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_add_patches.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_attach.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_bevel.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_bevel.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_bevel.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_bevel.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_del.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_del.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_del.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_del.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_detach.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_detach.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_detach.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_detach.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_extrude.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_extrude.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_extrude.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_extrude.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_file.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_file.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_file.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_file.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_gui.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_gui.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_gui.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_gui.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hide.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hide.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hide.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hide.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hook.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hook.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hook.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_hook.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_material.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_material.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_material.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_material.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_remember.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_remember.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_remember.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_remember.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_subdivide.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_subdivide.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_subdivide.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_subdivide.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_gui_bind.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_gui_bind.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_gui_bind.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_gui_bind.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_main.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_main.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_main.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_main.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_point_tab.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_point_tab.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_point_tab.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_patch_point_tab.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_restore.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_restore.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_restore.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_patch_restore.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_sel_restore.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_sel_restore.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_sel_restore.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_patch_sel_restore.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_vertex_delta.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_vertex_delta.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_patch_vertex_delta.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_patch_vertex_delta.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_pick_patch_attach.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_pick_patch_attach.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_pick_patch_attach.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_pick_patch_attach.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_record.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_record.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_record.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_record.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/outline.cur b/nel/tools/3d/plugin_max/nel_patch_edit/outline.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/outline.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/outline.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/panhand.cur b/nel/tools/3d/plugin_max/nel_patch_edit/panhand.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/panhand.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/panhand.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/patselm.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/patselm.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/patselm.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/patselm.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/patselt.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/patselt.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/patselt.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/patselt.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/pick_color.cur b/nel/tools/3d/plugin_max/nel_patch_edit/pick_color.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/pick_color.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/pick_color.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/region.cur b/nel/tools/3d/plugin_max/nel_patch_edit/region.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/region.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/region.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/scale_x.cur b/nel/tools/3d/plugin_max/nel_patch_edit/scale_x.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/scale_x.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/scale_x.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/scale_y.cur b/nel/tools/3d/plugin_max/nel_patch_edit/scale_y.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/scale_y.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/scale_y.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/segbreak.cur b/nel/tools/3d/plugin_max/nel_patch_edit/segbreak.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/segbreak.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/segbreak.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/segrefin.cur b/nel/tools/3d/plugin_max/nel_patch_edit/segrefin.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/segrefin.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/segrefin.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/selmask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/selmask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/selmask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/selmask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/splinese.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/splinese.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/splinese.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/splinese.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/splselm.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/splselm.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/splselm.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/splselm.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp
rename to nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.h b/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.h
rename to nel/tools/3d/plugin_max/nel_patch_edit/stdafx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/thselcur.cur b/nel/tools/3d/plugin_max/nel_patch_edit/thselcur.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/thselcur.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/thselcur.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/trim.cur b/nel/tools/3d/plugin_max/nel_patch_edit/trim.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/trim.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/trim.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option_mask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option_mask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option_mask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_option_mask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform_mask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform_mask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform_mask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_transform_mask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts_mask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts_mask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts_mask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_verts_mask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view_mask.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view_mask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view_mask.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrap_view_mask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/unwrapto.bmp b/nel/tools/3d/plugin_max/nel_patch_edit/unwrapto.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/unwrapto.bmp
rename to nel/tools/3d/plugin_max/nel_patch_edit/unwrapto.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/vchamfer.cur b/nel/tools/3d/plugin_max/nel_patch_edit/vchamfer.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/vchamfer.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/vchamfer.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
rename to nel/tools/3d/plugin_max/nel_patch_edit/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/vertconn.cur b/nel/tools/3d/plugin_max/nel_patch_edit/vertconn.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/vertconn.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/vertconn.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/vinsert.cur b/nel/tools/3d/plugin_max/nel_patch_edit/vinsert.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/vinsert.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/vinsert.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/weld.cur b/nel/tools/3d/plugin_max/nel_patch_edit/weld.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_edit/weld.cur
rename to nel/tools/3d/plugin_max/nel_patch_edit/weld.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.h b/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.h
rename to nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.h b/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.h
rename to nel/tools/3d/plugin_max/nel_patch_lib/path_mesh_alloc.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/rpo.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/rpo.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/rpo.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/rpo.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/rpo.h b/nel/tools/3d/plugin_max/nel_patch_lib/rpo.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/rpo.h
rename to nel/tools/3d/plugin_max/nel_patch_lib/rpo.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.h b/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.h
rename to nel/tools/3d/plugin_max/nel_patch_lib/stdafx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.cpp
rename to nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.h b/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.h
rename to nel/tools/3d/plugin_max/nel_patch_lib/vertex_neighborhood.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.h b/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_0.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_0.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_0.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_0.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_0.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_0.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_0.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_0.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_1.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_1.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_1.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_1.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_1.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_1.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_1.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_1.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_10.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_10.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_10.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_10.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_10.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_10.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_10.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_10.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_11.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_11.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_11.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_11.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_11.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_11.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_11.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_11.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_128.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_128.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_128.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_128.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_128.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_128.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_128.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_128.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_2.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_2.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_2.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_2.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_2.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_2.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_2.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_2.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_256.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_256.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_256.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_256.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_256.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_256.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_256.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_256.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_3.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_3.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_3.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_3.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_3.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_3.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_3.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_3.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_4.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_4.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_4.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_4.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_4.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_4.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_4.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_4.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_5.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_5.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_5.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_5.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_5.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_5.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_5.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_5.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_6.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_6.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_6.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_6.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_6.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_6.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_6.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_6.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_7.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_7.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_7.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_7.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_7.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_7.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_7.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_7.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_8.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_8.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_8.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_8.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_8.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_8.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_8.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_8.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_9.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_9.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_9.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_9.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_9.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_9.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_9.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_9.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_small.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/_small.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_small.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/_small.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/_small.tga b/nel/tools/3d/plugin_max/nel_patch_paint/_small.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/_small.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/_small.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/all.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/all.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/all.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/all.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/all.tga b/nel/tools/3d/plugin_max/nel_patch_paint/all.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/all.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/all.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/cur00001.cur b/nel/tools/3d/plugin_max/nel_patch_paint/cur00001.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/cur00001.cur
rename to nel/tools/3d/plugin_max/nel_patch_paint/cur00001.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/cursor1.cur b/nel/tools/3d/plugin_max/nel_patch_paint/cursor1.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/cursor1.cur
rename to nel/tools/3d/plugin_max/nel_patch_paint/cursor1.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/goofy.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/goofy.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/goofy.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/goofy.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/goofy.tga b/nel/tools/3d/plugin_max/nel_patch_paint/goofy.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/goofy.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/goofy.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg b/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
rename to nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/large.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/large.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/large.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/large.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/large.tga b/nel/tools/3d/plugin_max/nel_patch_paint/large.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/large.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/large.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/light.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/light.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/light.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/light.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/light.tga b/nel/tools/3d/plugin_max/nel_patch_paint/light.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/light.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/light.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/lock.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/lock.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/lock.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/lock.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/lock.tga b/nel/tools/3d/plugin_max/nel_patch_paint/lock.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/lock.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/lock.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/medium.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/medium.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/medium.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/medium.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/medium.tga b/nel/tools/3d/plugin_max/nel_patch_paint/medium.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/medium.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/medium.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_paint.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/nel_paint.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nel_paint.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/nel_paint.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.def b/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.def
rename to nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.def
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h b/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
rename to nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nothing.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/nothing.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nothing.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/nothing.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nothing.tga b/nel/tools/3d/plugin_max/nel_patch_paint/nothing.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/nothing.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/nothing.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/oriented.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/oriented.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/oriented.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/oriented.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/oriented.tga b/nel/tools/3d/plugin_max/nel_patch_paint/oriented.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/oriented.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/oriented.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_data.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_data.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_data.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_data.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_file.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_file.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_file.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_file.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_fill.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_light.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_light.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_light.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_main.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_main.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_main.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_main.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_mod.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_mod.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_mod.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_mod.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_pops.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_pops.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_pops.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_pops.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_record.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_record.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_record.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_record.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_restore.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_restore.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_restore.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_restore.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_tileset.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_to_nel.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_undo.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.h b/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/paint_vcolor.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/pick_col.cur b/nel/tools/3d/plugin_max/nel_patch_paint/pick_col.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/pick_col.cur
rename to nel/tools/3d/plugin_max/nel_patch_paint/pick_col.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/pick_color.cur b/nel/tools/3d/plugin_max/nel_patch_paint/pick_color.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/pick_color.cur
rename to nel/tools/3d/plugin_max/nel_patch_paint/pick_color.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/regular.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/regular.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/regular.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/regular.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/regular.tga b/nel/tools/3d/plugin_max/nel_patch_paint/regular.tga
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/regular.tga
rename to nel/tools/3d/plugin_max/nel_patch_paint/regular.tga
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/resource.h b/nel/tools/3d/plugin_max/nel_patch_paint/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/resource.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/resource.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp
rename to nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.h b/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.h
rename to nel/tools/3d/plugin_max/nel_patch_paint/stdafx.h
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/user_guide.txt b/nel/tools/3d/plugin_max/nel_patch_paint/user_guide.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/user_guide.txt
rename to nel/tools/3d/plugin_max/nel_patch_paint/user_guide.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2 b/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
rename to nel/tools/3d/plugin_max/nel_patch_paint/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/version.ver b/nel/tools/3d/plugin_max/nel_patch_paint/version.ver
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_patch_paint/version.ver
rename to nel/tools/3d/plugin_max/nel_patch_paint/version.ver
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Buttons.bmp b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Buttons.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Buttons.bmp
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/Buttons.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Paint.cpp b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Paint.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/Paint.cpp
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/Paint.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/buttonmask.bmp b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/buttonmask.bmp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/buttonmask.bmp
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/buttonmask.bmp
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dropcurs.cur b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dropcurs.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dropcurs.cur
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/dropcurs.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/paintcur.cur b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/paintcur.cur
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/paintcur.cur
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/paintcur.cur
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/resource.h b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/resource.h
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/resource.h
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2 b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.def b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.def
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.def
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.h b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.h
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.h
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
rename to nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
diff --git a/code/nel/tools/3d/plugin_max/nel_water_material.txt b/nel/tools/3d/plugin_max/nel_water_material.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/nel_water_material.txt
rename to nel/tools/3d/plugin_max/nel_water_material.txt
diff --git a/code/nel/tools/3d/plugin_max/resolve_troubles.txt b/nel/tools/3d/plugin_max/resolve_troubles.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/resolve_troubles.txt
rename to nel/tools/3d/plugin_max/resolve_troubles.txt
diff --git a/code/nel/tools/3d/plugin_max/scripts/db_cleaner.ms b/nel/tools/3d/plugin_max/scripts/db_cleaner.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/db_cleaner.ms
rename to nel/tools/3d/plugin_max/scripts/db_cleaner.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/db_erase_mesh.ms b/nel/tools/3d/plugin_max/scripts/db_erase_mesh.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/db_erase_mesh.ms
rename to nel/tools/3d/plugin_max/scripts/db_erase_mesh.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/db_shooter.ms b/nel/tools/3d/plugin_max/scripts/db_shooter.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/db_shooter.ms
rename to nel/tools/3d/plugin_max/scripts/db_shooter.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/extrude_water.ms b/nel/tools/3d/plugin_max/scripts/extrude_water.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/extrude_water.ms
rename to nel/tools/3d/plugin_max/scripts/extrude_water.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_add_name_ref_scale.ms b/nel/tools/3d/plugin_max/scripts/nel_add_name_ref_scale.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_add_name_ref_scale.ms
rename to nel/tools/3d/plugin_max/scripts/nel_add_name_ref_scale.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_png.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_png.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_png.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_png.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_database.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_png_database.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_png_database.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_png_database.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms
rename to nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms b/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms
rename to nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms b/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms
rename to nel/tools/3d/plugin_max/scripts/nel_batched_script.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_copy_biped_figure_mode.ms b/nel/tools/3d/plugin_max/scripts/nel_copy_biped_figure_mode.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_copy_biped_figure_mode.ms
rename to nel/tools/3d/plugin_max/scripts/nel_copy_biped_figure_mode.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_create_matrix.ms b/nel/tools/3d/plugin_max/scripts/nel_create_matrix.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_create_matrix.ms
rename to nel/tools/3d/plugin_max/scripts/nel_create_matrix.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_mat_converter.ms b/nel/tools/3d/plugin_max/scripts/nel_mat_converter.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_mat_converter.ms
rename to nel/tools/3d/plugin_max/scripts/nel_mat_converter.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_mirror_weights.ms b/nel/tools/3d/plugin_max/scripts/nel_mirror_weights.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_mirror_weights.ms
rename to nel/tools/3d/plugin_max/scripts/nel_mirror_weights.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_move_animation.ms b/nel/tools/3d/plugin_max/scripts/nel_move_animation.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_move_animation.ms
rename to nel/tools/3d/plugin_max/scripts/nel_move_animation.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_node_properties.ms b/nel/tools/3d/plugin_max/scripts/nel_node_properties.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_node_properties.ms
rename to nel/tools/3d/plugin_max/scripts/nel_node_properties.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms b/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms
rename to nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms b/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms
rename to nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_rename.ms b/nel/tools/3d/plugin_max/scripts/nel_rename.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_rename.ms
rename to nel/tools/3d/plugin_max/scripts/nel_rename.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_repair_xref.ms b/nel/tools/3d/plugin_max/scripts/nel_repair_xref.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_repair_xref.ms
rename to nel/tools/3d/plugin_max/scripts/nel_repair_xref.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_select.ms b/nel/tools/3d/plugin_max/scripts/nel_select.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_select.ms
rename to nel/tools/3d/plugin_max/scripts/nel_select.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_select_ig.ms b/nel/tools/3d/plugin_max/scripts/nel_select_ig.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_select_ig.ms
rename to nel/tools/3d/plugin_max/scripts/nel_select_ig.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_utility.ms b/nel/tools/3d/plugin_max/scripts/nel_utility.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_utility.ms
rename to nel/tools/3d/plugin_max/scripts/nel_utility.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_xref_building.ms b/nel/tools/3d/plugin_max/scripts/nel_xref_building.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_xref_building.ms
rename to nel/tools/3d/plugin_max/scripts/nel_xref_building.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms b/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms
rename to nel/tools/3d/plugin_max/scripts/nel_zone_namer.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms b/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms
rename to nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/reload_textures.ms b/nel/tools/3d/plugin_max/scripts/reload_textures.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/reload_textures.ms
rename to nel/tools/3d/plugin_max/scripts/reload_textures.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_flare.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_flare.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_flare.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_flare.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_light.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_light.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_light.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_light.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v1 b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v1
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v1
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v1
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v11 b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v11
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v11
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v11
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v2 b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v2
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v2
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v3 b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v3
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v3
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v3
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v5 b/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v5
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v5
rename to nel/tools/3d/plugin_max/scripts/startup/nel_material.ms.v5
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_multi_set.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_multi_set.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_multi_set.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_multi_set.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_box.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_box.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_box.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_pacs_box.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_cylinder.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_cylinder.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_pacs_cylinder.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_pacs_cylinder.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_ps.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_ps.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_ps.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_ps.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_swt.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_swt.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_swt.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_swt.ms
diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_wave_maker.ms b/nel/tools/3d/plugin_max/scripts/startup/nel_wave_maker.ms
similarity index 100%
rename from code/nel/tools/3d/plugin_max/scripts/startup/nel_wave_maker.ms
rename to nel/tools/3d/plugin_max/scripts/startup/nel_wave_maker.ms
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt b/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt
rename to nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp b/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp
rename to nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/resource.h b/nel/tools/3d/plugin_max/tile_utility/resource.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/resource.h
rename to nel/tools/3d/plugin_max/tile_utility/resource.h
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/rgbadd.cpp b/nel/tools/3d/plugin_max/tile_utility/rgbadd.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/rgbadd.cpp
rename to nel/tools/3d/plugin_max/tile_utility/rgbadd.cpp
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp b/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
rename to nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.def b/nel/tools/3d/plugin_max/tile_utility/tile_utility.def
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/tile_utility.def
rename to nel/tools/3d/plugin_max/tile_utility/tile_utility.def
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.h b/nel/tools/3d/plugin_max/tile_utility/tile_utility.h
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/tile_utility.h
rename to nel/tools/3d/plugin_max/tile_utility/tile_utility.h
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
rename to nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/version.rc2 b/nel/tools/3d/plugin_max/tile_utility/version.rc2
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/version.rc2
rename to nel/tools/3d/plugin_max/tile_utility/version.rc2
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/version.ver b/nel/tools/3d/plugin_max/tile_utility/version.ver
similarity index 100%
rename from code/nel/tools/3d/plugin_max/tile_utility/version.ver
rename to nel/tools/3d/plugin_max/tile_utility/version.ver
diff --git a/code/nel/tools/3d/s3tc_compressor_lib/CMakeLists.txt b/nel/tools/3d/s3tc_compressor_lib/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/s3tc_compressor_lib/CMakeLists.txt
rename to nel/tools/3d/s3tc_compressor_lib/CMakeLists.txt
diff --git a/code/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.cpp b/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.cpp
similarity index 100%
rename from code/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.cpp
rename to nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.cpp
diff --git a/code/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.h b/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.h
similarity index 100%
rename from code/nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.h
rename to nel/tools/3d/s3tc_compressor_lib/s3tc_compressor.h
diff --git a/code/nel/tools/3d/shape2obj/CMakeLists.txt b/nel/tools/3d/shape2obj/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/shape2obj/CMakeLists.txt
rename to nel/tools/3d/shape2obj/CMakeLists.txt
diff --git a/code/nel/tools/3d/shape2obj/main.cpp b/nel/tools/3d/shape2obj/main.cpp
similarity index 100%
rename from code/nel/tools/3d/shape2obj/main.cpp
rename to nel/tools/3d/shape2obj/main.cpp
diff --git a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt b/nel/tools/3d/shapes_exporter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/CMakeLists.txt
rename to nel/tools/3d/shapes_exporter/CMakeLists.txt
diff --git a/code/nel/tools/3d/shapes_exporter/gold_pill.ico b/nel/tools/3d/shapes_exporter/gold_pill.ico
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/gold_pill.ico
rename to nel/tools/3d/shapes_exporter/gold_pill.ico
diff --git a/code/nel/tools/3d/shapes_exporter/main.cpp b/nel/tools/3d/shapes_exporter/main.cpp
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/main.cpp
rename to nel/tools/3d/shapes_exporter/main.cpp
diff --git a/code/nel/tools/3d/shapes_exporter/main.rc b/nel/tools/3d/shapes_exporter/main.rc
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/main.rc
rename to nel/tools/3d/shapes_exporter/main.rc
diff --git a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cfg b/nel/tools/3d/shapes_exporter/shapes_exporter.cfg
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/shapes_exporter.cfg
rename to nel/tools/3d/shapes_exporter/shapes_exporter.cfg
diff --git a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp b/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
rename to nel/tools/3d/shapes_exporter/shapes_exporter.cpp
diff --git a/code/nel/tools/3d/shapes_exporter/shapes_exporter.h b/nel/tools/3d/shapes_exporter/shapes_exporter.h
similarity index 100%
rename from code/nel/tools/3d/shapes_exporter/shapes_exporter.h
rename to nel/tools/3d/shapes_exporter/shapes_exporter.h
diff --git a/code/nel/tools/3d/shared_widgets/CMakeLists.txt b/nel/tools/3d/shared_widgets/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/shared_widgets/CMakeLists.txt
rename to nel/tools/3d/shared_widgets/CMakeLists.txt
diff --git a/code/nel/tools/3d/shared_widgets/command_log.cpp b/nel/tools/3d/shared_widgets/command_log.cpp
similarity index 100%
rename from code/nel/tools/3d/shared_widgets/command_log.cpp
rename to nel/tools/3d/shared_widgets/command_log.cpp
diff --git a/code/nel/tools/3d/shared_widgets/command_log.h b/nel/tools/3d/shared_widgets/command_log.h
similarity index 100%
rename from code/nel/tools/3d/shared_widgets/command_log.h
rename to nel/tools/3d/shared_widgets/command_log.h
diff --git a/code/nel/tools/3d/shared_widgets/common.h b/nel/tools/3d/shared_widgets/common.h
similarity index 100%
rename from code/nel/tools/3d/shared_widgets/common.h
rename to nel/tools/3d/shared_widgets/common.h
diff --git a/code/nel/tools/3d/textures_optimizer/CMakeLists.txt b/nel/tools/3d/textures_optimizer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/textures_optimizer/CMakeLists.txt
rename to nel/tools/3d/textures_optimizer/CMakeLists.txt
diff --git a/code/nel/tools/3d/textures_optimizer/main.cpp b/nel/tools/3d/textures_optimizer/main.cpp
similarity index 100%
rename from code/nel/tools/3d/textures_optimizer/main.cpp
rename to nel/tools/3d/textures_optimizer/main.cpp
diff --git a/code/nel/tools/3d/textures_tool/CMakeLists.txt b/nel/tools/3d/textures_tool/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/textures_tool/CMakeLists.txt
rename to nel/tools/3d/textures_tool/CMakeLists.txt
diff --git a/code/nel/tools/3d/textures_tool/main.cpp b/nel/tools/3d/textures_tool/main.cpp
similarity index 100%
rename from code/nel/tools/3d/textures_tool/main.cpp
rename to nel/tools/3d/textures_tool/main.cpp
diff --git a/code/nel/tools/3d/tga_2_dds/CMakeLists.txt b/nel/tools/3d/tga_2_dds/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/tga_2_dds/CMakeLists.txt
rename to nel/tools/3d/tga_2_dds/CMakeLists.txt
diff --git a/code/nel/tools/3d/tga_2_dds/blue_pill.ico b/nel/tools/3d/tga_2_dds/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/tga_2_dds/blue_pill.ico
rename to nel/tools/3d/tga_2_dds/blue_pill.ico
diff --git a/code/nel/tools/3d/tga_2_dds/main.rc b/nel/tools/3d/tga_2_dds/main.rc
similarity index 100%
rename from code/nel/tools/3d/tga_2_dds/main.rc
rename to nel/tools/3d/tga_2_dds/main.rc
diff --git a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp b/nel/tools/3d/tga_2_dds/tga2dds.cpp
similarity index 100%
rename from code/nel/tools/3d/tga_2_dds/tga2dds.cpp
rename to nel/tools/3d/tga_2_dds/tga2dds.cpp
diff --git a/code/nel/tools/3d/tga_cut/CMakeLists.txt b/nel/tools/3d/tga_cut/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/tga_cut/CMakeLists.txt
rename to nel/tools/3d/tga_cut/CMakeLists.txt
diff --git a/code/nel/tools/3d/tga_cut/blue_pill.ico b/nel/tools/3d/tga_cut/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/tga_cut/blue_pill.ico
rename to nel/tools/3d/tga_cut/blue_pill.ico
diff --git a/code/nel/tools/3d/tga_cut/main.rc b/nel/tools/3d/tga_cut/main.rc
similarity index 100%
rename from code/nel/tools/3d/tga_cut/main.rc
rename to nel/tools/3d/tga_cut/main.rc
diff --git a/code/nel/tools/3d/tga_cut/tga_cut.cpp b/nel/tools/3d/tga_cut/tga_cut.cpp
similarity index 100%
rename from code/nel/tools/3d/tga_cut/tga_cut.cpp
rename to nel/tools/3d/tga_cut/tga_cut.cpp
diff --git a/code/nel/tools/3d/tga_resize/CMakeLists.txt b/nel/tools/3d/tga_resize/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/tga_resize/CMakeLists.txt
rename to nel/tools/3d/tga_resize/CMakeLists.txt
diff --git a/code/nel/tools/3d/tga_resize/main.cpp b/nel/tools/3d/tga_resize/main.cpp
similarity index 100%
rename from code/nel/tools/3d/tga_resize/main.cpp
rename to nel/tools/3d/tga_resize/main.cpp
diff --git a/code/nel/tools/3d/tile_edit/Browse.cpp b/nel/tools/3d/tile_edit/Browse.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/Browse.cpp
rename to nel/tools/3d/tile_edit/Browse.cpp
diff --git a/code/nel/tools/3d/tile_edit/Browse.h b/nel/tools/3d/tile_edit/Browse.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/Browse.h
rename to nel/tools/3d/tile_edit/Browse.h
diff --git a/code/nel/tools/3d/tile_edit/CMakeLists.txt b/nel/tools/3d/tile_edit/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/tile_edit/CMakeLists.txt
rename to nel/tools/3d/tile_edit/CMakeLists.txt
diff --git a/code/nel/tools/3d/tile_edit/DialogEditList.cpp b/nel/tools/3d/tile_edit/DialogEditList.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/DialogEditList.cpp
rename to nel/tools/3d/tile_edit/DialogEditList.cpp
diff --git a/code/nel/tools/3d/tile_edit/DialogEditList.h b/nel/tools/3d/tile_edit/DialogEditList.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/DialogEditList.h
rename to nel/tools/3d/tile_edit/DialogEditList.h
diff --git a/code/nel/tools/3d/tile_edit/DllEntry.cpp b/nel/tools/3d/tile_edit/DllEntry.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/DllEntry.cpp
rename to nel/tools/3d/tile_edit/DllEntry.cpp
diff --git a/code/nel/tools/3d/tile_edit/GetVal.cpp b/nel/tools/3d/tile_edit/GetVal.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/GetVal.cpp
rename to nel/tools/3d/tile_edit/GetVal.cpp
diff --git a/code/nel/tools/3d/tile_edit/GetVal.h b/nel/tools/3d/tile_edit/GetVal.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/GetVal.h
rename to nel/tools/3d/tile_edit/GetVal.h
diff --git a/code/nel/tools/3d/tile_edit/Popup.cpp b/nel/tools/3d/tile_edit/Popup.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/Popup.cpp
rename to nel/tools/3d/tile_edit/Popup.cpp
diff --git a/code/nel/tools/3d/tile_edit/Popup.h b/nel/tools/3d/tile_edit/Popup.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/Popup.h
rename to nel/tools/3d/tile_edit/Popup.h
diff --git a/code/nel/tools/3d/tile_edit/ReadMe.txt b/nel/tools/3d/tile_edit/ReadMe.txt
similarity index 100%
rename from code/nel/tools/3d/tile_edit/ReadMe.txt
rename to nel/tools/3d/tile_edit/ReadMe.txt
diff --git a/code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp b/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
rename to nel/tools/3d/tile_edit/SelectionTerritoire.cpp
diff --git a/code/nel/tools/3d/tile_edit/SelectionTerritoire.h b/nel/tools/3d/tile_edit/SelectionTerritoire.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/SelectionTerritoire.h
rename to nel/tools/3d/tile_edit/SelectionTerritoire.h
diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.cpp b/nel/tools/3d/tile_edit/TileCtrl.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileCtrl.cpp
rename to nel/tools/3d/tile_edit/TileCtrl.cpp
diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.h b/nel/tools/3d/tile_edit/TileCtrl.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileCtrl.h
rename to nel/tools/3d/tile_edit/TileCtrl.h
diff --git a/code/nel/tools/3d/tile_edit/TileList.cpp b/nel/tools/3d/tile_edit/TileList.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileList.cpp
rename to nel/tools/3d/tile_edit/TileList.cpp
diff --git a/code/nel/tools/3d/tile_edit/TileList.h b/nel/tools/3d/tile_edit/TileList.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileList.h
rename to nel/tools/3d/tile_edit/TileList.h
diff --git a/code/nel/tools/3d/tile_edit/TileView.cpp b/nel/tools/3d/tile_edit/TileView.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileView.cpp
rename to nel/tools/3d/tile_edit/TileView.cpp
diff --git a/code/nel/tools/3d/tile_edit/TileView.h b/nel/tools/3d/tile_edit/TileView.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/TileView.h
rename to nel/tools/3d/tile_edit/TileView.h
diff --git a/code/nel/tools/3d/tile_edit/View.cpp b/nel/tools/3d/tile_edit/View.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/View.cpp
rename to nel/tools/3d/tile_edit/View.cpp
diff --git a/code/nel/tools/3d/tile_edit/View.h b/nel/tools/3d/tile_edit/View.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/View.h
rename to nel/tools/3d/tile_edit/View.h
diff --git a/code/nel/tools/3d/tile_edit/ViewColumn.cpp b/nel/tools/3d/tile_edit/ViewColumn.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/ViewColumn.cpp
rename to nel/tools/3d/tile_edit/ViewColumn.cpp
diff --git a/code/nel/tools/3d/tile_edit/ViewColumn.h b/nel/tools/3d/tile_edit/ViewColumn.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/ViewColumn.h
rename to nel/tools/3d/tile_edit/ViewColumn.h
diff --git a/code/nel/tools/3d/tile_edit/choose_veget_set.cpp b/nel/tools/3d/tile_edit/choose_veget_set.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/choose_veget_set.cpp
rename to nel/tools/3d/tile_edit/choose_veget_set.cpp
diff --git a/code/nel/tools/3d/tile_edit/choose_veget_set.h b/nel/tools/3d/tile_edit/choose_veget_set.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/choose_veget_set.h
rename to nel/tools/3d/tile_edit/choose_veget_set.h
diff --git a/code/nel/tools/3d/tile_edit/cpu.cpp b/nel/tools/3d/tile_edit/cpu.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/cpu.cpp
rename to nel/tools/3d/tile_edit/cpu.cpp
diff --git a/code/nel/tools/3d/tile_edit/cursor1.cur b/nel/tools/3d/tile_edit/cursor1.cur
similarity index 100%
rename from code/nel/tools/3d/tile_edit/cursor1.cur
rename to nel/tools/3d/tile_edit/cursor1.cur
diff --git a/code/nel/tools/3d/tile_edit/custom.cpp b/nel/tools/3d/tile_edit/custom.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/custom.cpp
rename to nel/tools/3d/tile_edit/custom.cpp
diff --git a/code/nel/tools/3d/tile_edit/custom.h b/nel/tools/3d/tile_edit/custom.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/custom.h
rename to nel/tools/3d/tile_edit/custom.h
diff --git a/code/nel/tools/3d/tile_edit/nevraxpill.ico b/nel/tools/3d/tile_edit/nevraxpill.ico
similarity index 100%
rename from code/nel/tools/3d/tile_edit/nevraxpill.ico
rename to nel/tools/3d/tile_edit/nevraxpill.ico
diff --git a/code/nel/tools/3d/tile_edit/resource.h b/nel/tools/3d/tile_edit/resource.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/resource.h
rename to nel/tools/3d/tile_edit/resource.h
diff --git a/code/nel/tools/3d/tile_edit/rot0.bmp b/nel/tools/3d/tile_edit/rot0.bmp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/rot0.bmp
rename to nel/tools/3d/tile_edit/rot0.bmp
diff --git a/code/nel/tools/3d/tile_edit/rot1.bmp b/nel/tools/3d/tile_edit/rot1.bmp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/rot1.bmp
rename to nel/tools/3d/tile_edit/rot1.bmp
diff --git a/code/nel/tools/3d/tile_edit/rot2.bmp b/nel/tools/3d/tile_edit/rot2.bmp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/rot2.bmp
rename to nel/tools/3d/tile_edit/rot2.bmp
diff --git a/code/nel/tools/3d/tile_edit/rot3.bmp b/nel/tools/3d/tile_edit/rot3.bmp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/rot3.bmp
rename to nel/tools/3d/tile_edit/rot3.bmp
diff --git a/code/nel/tools/3d/tile_edit/select_rotation.cpp b/nel/tools/3d/tile_edit/select_rotation.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/select_rotation.cpp
rename to nel/tools/3d/tile_edit/select_rotation.cpp
diff --git a/code/nel/tools/3d/tile_edit/select_rotation.h b/nel/tools/3d/tile_edit/select_rotation.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/select_rotation.h
rename to nel/tools/3d/tile_edit/select_rotation.h
diff --git a/code/nel/tools/3d/tile_edit/stdafx.cpp b/nel/tools/3d/tile_edit/stdafx.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/stdafx.cpp
rename to nel/tools/3d/tile_edit/stdafx.cpp
diff --git a/code/nel/tools/3d/tile_edit/stdafx.h b/nel/tools/3d/tile_edit/stdafx.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/stdafx.h
rename to nel/tools/3d/tile_edit/stdafx.h
diff --git a/code/nel/tools/3d/tile_edit/thread.h b/nel/tools/3d/tile_edit/thread.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/thread.h
rename to nel/tools/3d/tile_edit/thread.h
diff --git a/code/nel/tools/3d/tile_edit/thread_win32.cpp b/nel/tools/3d/tile_edit/thread_win32.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/thread_win32.cpp
rename to nel/tools/3d/tile_edit/thread_win32.cpp
diff --git a/code/nel/tools/3d/tile_edit/thread_win32.h b/nel/tools/3d/tile_edit/thread_win32.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/thread_win32.h
rename to nel/tools/3d/tile_edit/thread_win32.h
diff --git a/code/nel/tools/3d/tile_edit/tile32_32.bmp b/nel/tools/3d/tile_edit/tile32_32.bmp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/tile32_32.bmp
rename to nel/tools/3d/tile_edit/tile32_32.bmp
diff --git a/code/nel/tools/3d/tile_edit/tile_edit_exe.cpp b/nel/tools/3d/tile_edit/tile_edit_exe.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit/tile_edit_exe.cpp
rename to nel/tools/3d/tile_edit/tile_edit_exe.cpp
diff --git a/code/nel/tools/3d/tile_edit/tile_edit_exe.h b/nel/tools/3d/tile_edit/tile_edit_exe.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit/tile_edit_exe.h
rename to nel/tools/3d/tile_edit/tile_edit_exe.h
diff --git a/code/nel/tools/3d/tile_edit/tile_edit_exe.rc b/nel/tools/3d/tile_edit/tile_edit_exe.rc
similarity index 100%
rename from code/nel/tools/3d/tile_edit/tile_edit_exe.rc
rename to nel/tools/3d/tile_edit/tile_edit_exe.rc
diff --git a/code/nel/tools/3d/tile_edit/version.rc2 b/nel/tools/3d/tile_edit/version.rc2
similarity index 100%
rename from code/nel/tools/3d/tile_edit/version.rc2
rename to nel/tools/3d/tile_edit/version.rc2
diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/nel/tools/3d/tile_edit_qt/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/CMakeLists.txt
rename to nel/tools/3d/tile_edit_qt/CMakeLists.txt
diff --git a/code/nel/tools/3d/tile_edit_qt/add_tile.png b/nel/tools/3d/tile_edit_qt/add_tile.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/add_tile.png
rename to nel/tools/3d/tile_edit_qt/add_tile.png
diff --git a/code/nel/tools/3d/tile_edit_qt/browser_model.cpp b/nel/tools/3d/tile_edit_qt/browser_model.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/browser_model.cpp
rename to nel/tools/3d/tile_edit_qt/browser_model.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/browser_model.h b/nel/tools/3d/tile_edit_qt/browser_model.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/browser_model.h
rename to nel/tools/3d/tile_edit_qt/browser_model.h
diff --git a/code/nel/tools/3d/tile_edit_qt/common.cpp b/nel/tools/3d/tile_edit_qt/common.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/common.cpp
rename to nel/tools/3d/tile_edit_qt/common.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/common.h b/nel/tools/3d/tile_edit_qt/common.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/common.h
rename to nel/tools/3d/tile_edit_qt/common.h
diff --git a/code/nel/tools/3d/tile_edit_qt/delete_image.png b/nel/tools/3d/tile_edit_qt/delete_image.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/delete_image.png
rename to nel/tools/3d/tile_edit_qt/delete_image.png
diff --git a/code/nel/tools/3d/tile_edit_qt/delete_tile.png b/nel/tools/3d/tile_edit_qt/delete_tile.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/delete_tile.png
rename to nel/tools/3d/tile_edit_qt/delete_tile.png
diff --git a/code/nel/tools/3d/tile_edit_qt/down.png b/nel/tools/3d/tile_edit_qt/down.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/down.png
rename to nel/tools/3d/tile_edit_qt/down.png
diff --git a/code/nel/tools/3d/tile_edit_qt/empty_image.png b/nel/tools/3d/tile_edit_qt/empty_image.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/empty_image.png
rename to nel/tools/3d/tile_edit_qt/empty_image.png
diff --git a/code/nel/tools/3d/tile_edit_qt/items_edit_dlg.cpp b/nel/tools/3d/tile_edit_qt/items_edit_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/items_edit_dlg.cpp
rename to nel/tools/3d/tile_edit_qt/items_edit_dlg.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/items_edit_dlg.h b/nel/tools/3d/tile_edit_qt/items_edit_dlg.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/items_edit_dlg.h
rename to nel/tools/3d/tile_edit_qt/items_edit_dlg.h
diff --git a/code/nel/tools/3d/tile_edit_qt/items_edit_qt.ui b/nel/tools/3d/tile_edit_qt/items_edit_qt.ui
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/items_edit_qt.ui
rename to nel/tools/3d/tile_edit_qt/items_edit_qt.ui
diff --git a/code/nel/tools/3d/tile_edit_qt/left.png b/nel/tools/3d/tile_edit_qt/left.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/left.png
rename to nel/tools/3d/tile_edit_qt/left.png
diff --git a/code/nel/tools/3d/tile_edit_qt/main.cpp b/nel/tools/3d/tile_edit_qt/main.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/main.cpp
rename to nel/tools/3d/tile_edit_qt/main.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/nel.png b/nel/tools/3d/tile_edit_qt/nel.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/nel.png
rename to nel/tools/3d/tile_edit_qt/nel.png
diff --git a/code/nel/tools/3d/tile_edit_qt/replace_image.png b/nel/tools/3d/tile_edit_qt/replace_image.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/replace_image.png
rename to nel/tools/3d/tile_edit_qt/replace_image.png
diff --git a/code/nel/tools/3d/tile_edit_qt/reset.png b/nel/tools/3d/tile_edit_qt/reset.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/reset.png
rename to nel/tools/3d/tile_edit_qt/reset.png
diff --git a/code/nel/tools/3d/tile_edit_qt/right.png b/nel/tools/3d/tile_edit_qt/right.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/right.png
rename to nel/tools/3d/tile_edit_qt/right.png
diff --git a/code/nel/tools/3d/tile_edit_qt/rotation0.png b/nel/tools/3d/tile_edit_qt/rotation0.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/rotation0.png
rename to nel/tools/3d/tile_edit_qt/rotation0.png
diff --git a/code/nel/tools/3d/tile_edit_qt/rotation180.png b/nel/tools/3d/tile_edit_qt/rotation180.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/rotation180.png
rename to nel/tools/3d/tile_edit_qt/rotation180.png
diff --git a/code/nel/tools/3d/tile_edit_qt/rotation270.png b/nel/tools/3d/tile_edit_qt/rotation270.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/rotation270.png
rename to nel/tools/3d/tile_edit_qt/rotation270.png
diff --git a/code/nel/tools/3d/tile_edit_qt/rotation90.png b/nel/tools/3d/tile_edit_qt/rotation90.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/rotation90.png
rename to nel/tools/3d/tile_edit_qt/rotation90.png
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_browser_dlg.cpp b/nel/tools/3d/tile_edit_qt/tile_browser_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_browser_dlg.cpp
rename to nel/tools/3d/tile_edit_qt/tile_browser_dlg.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_browser_dlg.h b/nel/tools/3d/tile_edit_qt/tile_browser_dlg.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_browser_dlg.h
rename to nel/tools/3d/tile_edit_qt/tile_browser_dlg.h
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_browser_qt.ui b/nel/tools/3d/tile_edit_qt/tile_browser_qt.ui
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_browser_qt.ui
rename to nel/tools/3d/tile_edit_qt/tile_browser_qt.ui
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.cpp b/nel/tools/3d/tile_edit_qt/tile_edit_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.cpp
rename to nel/tools/3d/tile_edit_qt/tile_edit_dlg.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h b/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
rename to nel/tools/3d/tile_edit_qt/tile_edit_dlg.h
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_edit_qt.qrc b/nel/tools/3d/tile_edit_qt/tile_edit_qt.qrc
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_edit_qt.qrc
rename to nel/tools/3d/tile_edit_qt/tile_edit_qt.qrc
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_edit_qt.ui b/nel/tools/3d/tile_edit_qt/tile_edit_qt.ui
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_edit_qt.ui
rename to nel/tools/3d/tile_edit_qt/tile_edit_qt.ui
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.cpp b/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.cpp
rename to nel/tools/3d/tile_edit_qt/tile_listwidgetitem.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h b/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
rename to nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.cpp b/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.cpp
rename to nel/tools/3d/tile_edit_qt/tile_rotation_dlg.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.h b/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_rotation_dlg.h
rename to nel/tools/3d/tile_edit_qt/tile_rotation_dlg.h
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_rotation_qt.ui b/nel/tools/3d/tile_edit_qt/tile_rotation_qt.ui
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_rotation_qt.ui
rename to nel/tools/3d/tile_edit_qt/tile_rotation_qt.ui
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_widget.cpp b/nel/tools/3d/tile_edit_qt/tile_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_widget.cpp
rename to nel/tools/3d/tile_edit_qt/tile_widget.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_widget.h b/nel/tools/3d/tile_edit_qt/tile_widget.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_widget.h
rename to nel/tools/3d/tile_edit_qt/tile_widget.h
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_widget_qt.ui b/nel/tools/3d/tile_edit_qt/tile_widget_qt.ui
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tile_widget_qt.ui
rename to nel/tools/3d/tile_edit_qt/tile_widget_qt.ui
diff --git a/code/nel/tools/3d/tile_edit_qt/tiles_model.cpp b/nel/tools/3d/tile_edit_qt/tiles_model.cpp
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tiles_model.cpp
rename to nel/tools/3d/tile_edit_qt/tiles_model.cpp
diff --git a/code/nel/tools/3d/tile_edit_qt/tiles_model.h b/nel/tools/3d/tile_edit_qt/tiles_model.h
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/tiles_model.h
rename to nel/tools/3d/tile_edit_qt/tiles_model.h
diff --git a/code/nel/tools/3d/tile_edit_qt/up.png b/nel/tools/3d/tile_edit_qt/up.png
similarity index 100%
rename from code/nel/tools/3d/tile_edit_qt/up.png
rename to nel/tools/3d/tile_edit_qt/up.png
diff --git a/code/nel/tools/3d/unbuild_interface/CMakeLists.txt b/nel/tools/3d/unbuild_interface/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/unbuild_interface/CMakeLists.txt
rename to nel/tools/3d/unbuild_interface/CMakeLists.txt
diff --git a/code/nel/tools/3d/unbuild_interface/gold_pill.ico b/nel/tools/3d/unbuild_interface/gold_pill.ico
similarity index 100%
rename from code/nel/tools/3d/unbuild_interface/gold_pill.ico
rename to nel/tools/3d/unbuild_interface/gold_pill.ico
diff --git a/code/nel/tools/3d/unbuild_interface/main.rc b/nel/tools/3d/unbuild_interface/main.rc
similarity index 100%
rename from code/nel/tools/3d/unbuild_interface/main.rc
rename to nel/tools/3d/unbuild_interface/main.rc
diff --git a/code/nel/tools/3d/unbuild_interface/unbuild_interface.cpp b/nel/tools/3d/unbuild_interface/unbuild_interface.cpp
similarity index 100%
rename from code/nel/tools/3d/unbuild_interface/unbuild_interface.cpp
rename to nel/tools/3d/unbuild_interface/unbuild_interface.cpp
diff --git a/code/nel/tools/3d/zone_check_bind/CMakeLists.txt b/nel/tools/3d/zone_check_bind/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_check_bind/CMakeLists.txt
rename to nel/tools/3d/zone_check_bind/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp b/nel/tools/3d/zone_check_bind/zone_check_bind.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp
rename to nel/tools/3d/zone_check_bind/zone_check_bind.cpp
diff --git a/code/nel/tools/3d/zone_check_bind/zone_utility.cpp b/nel/tools/3d/zone_check_bind/zone_utility.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_check_bind/zone_utility.cpp
rename to nel/tools/3d/zone_check_bind/zone_utility.cpp
diff --git a/code/nel/tools/3d/zone_check_bind/zone_utility.h b/nel/tools/3d/zone_check_bind/zone_utility.h
similarity index 100%
rename from code/nel/tools/3d/zone_check_bind/zone_utility.h
rename to nel/tools/3d/zone_check_bind/zone_utility.h
diff --git a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt b/nel/tools/3d/zone_dependencies/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_dependencies/CMakeLists.txt
rename to nel/tools/3d/zone_dependencies/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_dependencies/blue_pill.ico b/nel/tools/3d/zone_dependencies/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/zone_dependencies/blue_pill.ico
rename to nel/tools/3d/zone_dependencies/blue_pill.ico
diff --git a/code/nel/tools/3d/zone_dependencies/main.rc b/nel/tools/3d/zone_dependencies/main.rc
similarity index 100%
rename from code/nel/tools/3d/zone_dependencies/main.rc
rename to nel/tools/3d/zone_dependencies/main.rc
diff --git a/code/nel/tools/3d/zone_dependencies/zone_dependencies.cpp b/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
rename to nel/tools/3d/zone_dependencies/zone_dependencies.cpp
diff --git a/code/nel/tools/3d/zone_dump/CMakeLists.txt b/nel/tools/3d/zone_dump/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_dump/CMakeLists.txt
rename to nel/tools/3d/zone_dump/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_dump/zone_dump.cpp b/nel/tools/3d/zone_dump/zone_dump.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_dump/zone_dump.cpp
rename to nel/tools/3d/zone_dump/zone_dump.cpp
diff --git a/code/nel/tools/3d/zone_elevation/CMakeLists.txt b/nel/tools/3d/zone_elevation/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_elevation/CMakeLists.txt
rename to nel/tools/3d/zone_elevation/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_elevation/blue_pill.ico b/nel/tools/3d/zone_elevation/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/zone_elevation/blue_pill.ico
rename to nel/tools/3d/zone_elevation/blue_pill.ico
diff --git a/code/nel/tools/3d/zone_elevation/main.rc b/nel/tools/3d/zone_elevation/main.rc
similarity index 100%
rename from code/nel/tools/3d/zone_elevation/main.rc
rename to nel/tools/3d/zone_elevation/main.rc
diff --git a/code/nel/tools/3d/zone_elevation/zone_elevation.cpp b/nel/tools/3d/zone_elevation/zone_elevation.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_elevation/zone_elevation.cpp
rename to nel/tools/3d/zone_elevation/zone_elevation.cpp
diff --git a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt b/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
rename to nel/tools/3d/zone_ig_lighter/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_ig_lighter/blue_pill.ico b/nel/tools/3d/zone_ig_lighter/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/zone_ig_lighter/blue_pill.ico
rename to nel/tools/3d/zone_ig_lighter/blue_pill.ico
diff --git a/code/nel/tools/3d/zone_ig_lighter/main.rc b/nel/tools/3d/zone_ig_lighter/main.rc
similarity index 100%
rename from code/nel/tools/3d/zone_ig_lighter/main.rc
rename to nel/tools/3d/zone_ig_lighter/main.rc
diff --git a/code/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp b/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
rename to nel/tools/3d/zone_ig_lighter/zone_ig_lighter.cpp
diff --git a/code/nel/tools/3d/zone_lib/zone_utility.cpp b/nel/tools/3d/zone_lib/zone_utility.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_lib/zone_utility.cpp
rename to nel/tools/3d/zone_lib/zone_utility.cpp
diff --git a/code/nel/tools/3d/zone_lib/zone_utility.h b/nel/tools/3d/zone_lib/zone_utility.h
similarity index 100%
rename from code/nel/tools/3d/zone_lib/zone_utility.h
rename to nel/tools/3d/zone_lib/zone_utility.h
diff --git a/code/nel/tools/3d/zone_lighter/CMakeLists.txt b/nel/tools/3d/zone_lighter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_lighter/CMakeLists.txt
rename to nel/tools/3d/zone_lighter/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_lighter/blue_pill.ico b/nel/tools/3d/zone_lighter/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/zone_lighter/blue_pill.ico
rename to nel/tools/3d/zone_lighter/blue_pill.ico
diff --git a/code/nel/tools/3d/zone_lighter/main.rc b/nel/tools/3d/zone_lighter/main.rc
similarity index 100%
rename from code/nel/tools/3d/zone_lighter/main.rc
rename to nel/tools/3d/zone_lighter/main.rc
diff --git a/code/nel/tools/3d/zone_lighter/zone_lighter.cfg b/nel/tools/3d/zone_lighter/zone_lighter.cfg
similarity index 100%
rename from code/nel/tools/3d/zone_lighter/zone_lighter.cfg
rename to nel/tools/3d/zone_lighter/zone_lighter.cfg
diff --git a/code/nel/tools/3d/zone_lighter/zone_lighter.cpp b/nel/tools/3d/zone_lighter/zone_lighter.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_lighter/zone_lighter.cpp
rename to nel/tools/3d/zone_lighter/zone_lighter.cpp
diff --git a/code/nel/tools/3d/zone_welder/CMakeLists.txt b/nel/tools/3d/zone_welder/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zone_welder/CMakeLists.txt
rename to nel/tools/3d/zone_welder/CMakeLists.txt
diff --git a/code/nel/tools/3d/zone_welder/blue_pill.ico b/nel/tools/3d/zone_welder/blue_pill.ico
similarity index 100%
rename from code/nel/tools/3d/zone_welder/blue_pill.ico
rename to nel/tools/3d/zone_welder/blue_pill.ico
diff --git a/code/nel/tools/3d/zone_welder/internal_weld.cpp b/nel/tools/3d/zone_welder/internal_weld.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_welder/internal_weld.cpp
rename to nel/tools/3d/zone_welder/internal_weld.cpp
diff --git a/code/nel/tools/3d/zone_welder/main.rc b/nel/tools/3d/zone_welder/main.rc
similarity index 100%
rename from code/nel/tools/3d/zone_welder/main.rc
rename to nel/tools/3d/zone_welder/main.rc
diff --git a/code/nel/tools/3d/zone_welder/zone_welder.cpp b/nel/tools/3d/zone_welder/zone_welder.cpp
similarity index 100%
rename from code/nel/tools/3d/zone_welder/zone_welder.cpp
rename to nel/tools/3d/zone_welder/zone_welder.cpp
diff --git a/code/nel/tools/3d/zone_welder/zwelder.cfg b/nel/tools/3d/zone_welder/zwelder.cfg
similarity index 100%
rename from code/nel/tools/3d/zone_welder/zwelder.cfg
rename to nel/tools/3d/zone_welder/zwelder.cfg
diff --git a/code/nel/tools/3d/zviewer/CMakeLists.txt b/nel/tools/3d/zviewer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/zviewer/CMakeLists.txt
rename to nel/tools/3d/zviewer/CMakeLists.txt
diff --git a/code/nel/tools/3d/zviewer/heightmap.tga b/nel/tools/3d/zviewer/heightmap.tga
similarity index 100%
rename from code/nel/tools/3d/zviewer/heightmap.tga
rename to nel/tools/3d/zviewer/heightmap.tga
diff --git a/code/nel/tools/3d/zviewer/move_listener.cpp b/nel/tools/3d/zviewer/move_listener.cpp
similarity index 100%
rename from code/nel/tools/3d/zviewer/move_listener.cpp
rename to nel/tools/3d/zviewer/move_listener.cpp
diff --git a/code/nel/tools/3d/zviewer/move_listener.h b/nel/tools/3d/zviewer/move_listener.h
similarity index 100%
rename from code/nel/tools/3d/zviewer/move_listener.h
rename to nel/tools/3d/zviewer/move_listener.h
diff --git a/code/nel/tools/3d/zviewer/nevraxpill.ico b/nel/tools/3d/zviewer/nevraxpill.ico
similarity index 100%
rename from code/nel/tools/3d/zviewer/nevraxpill.ico
rename to nel/tools/3d/zviewer/nevraxpill.ico
diff --git a/code/nel/tools/3d/zviewer/readme.txt b/nel/tools/3d/zviewer/readme.txt
similarity index 100%
rename from code/nel/tools/3d/zviewer/readme.txt
rename to nel/tools/3d/zviewer/readme.txt
diff --git a/code/nel/tools/3d/zviewer/resource.h b/nel/tools/3d/zviewer/resource.h
similarity index 100%
rename from code/nel/tools/3d/zviewer/resource.h
rename to nel/tools/3d/zviewer/resource.h
diff --git a/code/nel/tools/3d/zviewer/zviewer.cfg b/nel/tools/3d/zviewer/zviewer.cfg
similarity index 100%
rename from code/nel/tools/3d/zviewer/zviewer.cfg
rename to nel/tools/3d/zviewer/zviewer.cfg
diff --git a/code/nel/tools/3d/zviewer/zviewer.cpp b/nel/tools/3d/zviewer/zviewer.cpp
similarity index 100%
rename from code/nel/tools/3d/zviewer/zviewer.cpp
rename to nel/tools/3d/zviewer/zviewer.cpp
diff --git a/code/nel/tools/3d/zviewer/zviewer.rc b/nel/tools/3d/zviewer/zviewer.rc
similarity index 100%
rename from code/nel/tools/3d/zviewer/zviewer.rc
rename to nel/tools/3d/zviewer/zviewer.rc
diff --git a/code/nel/tools/CMakeLists.txt b/nel/tools/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/CMakeLists.txt
rename to nel/tools/CMakeLists.txt
diff --git a/code/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/0_setup.py
rename to nel/tools/build_gamedata/0_setup.py
diff --git a/code/nel/tools/build_gamedata/1_export.py b/nel/tools/build_gamedata/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/1_export.py
rename to nel/tools/build_gamedata/1_export.py
diff --git a/code/nel/tools/build_gamedata/2_build.py b/nel/tools/build_gamedata/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/2_build.py
rename to nel/tools/build_gamedata/2_build.py
diff --git a/code/nel/tools/build_gamedata/3_install.py b/nel/tools/build_gamedata/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/3_install.py
rename to nel/tools/build_gamedata/3_install.py
diff --git a/code/nel/tools/build_gamedata/9_upload.py b/nel/tools/build_gamedata/9_upload.py
similarity index 100%
rename from code/nel/tools/build_gamedata/9_upload.py
rename to nel/tools/build_gamedata/9_upload.py
diff --git a/code/nel/tools/build_gamedata/a1_worldedit_data.py b/nel/tools/build_gamedata/a1_worldedit_data.py
similarity index 100%
rename from code/nel/tools/build_gamedata/a1_worldedit_data.py
rename to nel/tools/build_gamedata/a1_worldedit_data.py
diff --git a/code/nel/tools/build_gamedata/all_dev.bat b/nel/tools/build_gamedata/all_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/all_dev.bat
rename to nel/tools/build_gamedata/all_dev.bat
diff --git a/code/nel/tools/build_gamedata/all_install_dev.bat b/nel/tools/build_gamedata/all_install_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/all_install_dev.bat
rename to nel/tools/build_gamedata/all_install_dev.bat
diff --git a/code/nel/tools/build_gamedata/b1_client_dev.py b/nel/tools/build_gamedata/b1_client_dev.py
similarity index 100%
rename from code/nel/tools/build_gamedata/b1_client_dev.py
rename to nel/tools/build_gamedata/b1_client_dev.py
diff --git a/code/nel/tools/build_gamedata/b2_shard_data.py b/nel/tools/build_gamedata/b2_shard_data.py
similarity index 100%
rename from code/nel/tools/build_gamedata/b2_shard_data.py
rename to nel/tools/build_gamedata/b2_shard_data.py
diff --git a/code/nel/tools/build_gamedata/c1_shard_patch.py b/nel/tools/build_gamedata/c1_shard_patch.py
similarity index 100%
rename from code/nel/tools/build_gamedata/c1_shard_patch.py
rename to nel/tools/build_gamedata/c1_shard_patch.py
diff --git a/code/nel/tools/build_gamedata/characters_dev.bat b/nel/tools/build_gamedata/characters_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/characters_dev.bat
rename to nel/tools/build_gamedata/characters_dev.bat
diff --git a/code/nel/tools/build_gamedata/configuration/scripts.py b/nel/tools/build_gamedata/configuration/scripts.py
similarity index 100%
rename from code/nel/tools/build_gamedata/configuration/scripts.py
rename to nel/tools/build_gamedata/configuration/scripts.py
diff --git a/code/nel/tools/build_gamedata/configuration/tools.py b/nel/tools/build_gamedata/configuration/tools.py
similarity index 100%
rename from code/nel/tools/build_gamedata/configuration/tools.py
rename to nel/tools/build_gamedata/configuration/tools.py
diff --git a/code/nel/tools/build_gamedata/d1_client_patch.py b/nel/tools/build_gamedata/d1_client_patch.py
similarity index 100%
rename from code/nel/tools/build_gamedata/d1_client_patch.py
rename to nel/tools/build_gamedata/d1_client_patch.py
diff --git a/code/nel/tools/build_gamedata/d2_client_install.py b/nel/tools/build_gamedata/d2_client_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/d2_client_install.py
rename to nel/tools/build_gamedata/d2_client_install.py
diff --git a/code/nel/tools/build_gamedata/executables_dev.bat b/nel/tools/build_gamedata/executables_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/executables_dev.bat
rename to nel/tools/build_gamedata/executables_dev.bat
diff --git a/code/nel/tools/build_gamedata/export_build_install.py b/nel/tools/build_gamedata/export_build_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/export_build_install.py
rename to nel/tools/build_gamedata/export_build_install.py
diff --git a/code/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py b/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
rename to nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
diff --git a/code/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py b/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py
rename to nel/tools/build_gamedata/generators/ecosystem_project_template/process.py
diff --git a/code/nel/tools/build_gamedata/generators/generate_all.py b/nel/tools/build_gamedata/generators/generate_all.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/generate_all.py
rename to nel/tools/build_gamedata/generators/generate_all.py
diff --git a/code/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py b/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py
rename to nel/tools/build_gamedata/generators/generate_ecosystem_projects.py
diff --git a/code/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py b/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py
rename to nel/tools/build_gamedata/generators/generate_simple_max_exporters.py
diff --git a/code/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py b/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py
rename to nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms
diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py
rename to nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py b/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py b/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py b/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py b/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py b/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms
diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
rename to nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms
diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
rename to nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms
diff --git a/code/nel/tools/build_gamedata/interface_dev.bat b/nel/tools/build_gamedata/interface_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/interface_dev.bat
rename to nel/tools/build_gamedata/interface_dev.bat
diff --git a/code/nel/tools/build_gamedata/leveldesign_dev.bat b/nel/tools/build_gamedata/leveldesign_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/leveldesign_dev.bat
rename to nel/tools/build_gamedata/leveldesign_dev.bat
diff --git a/code/nel/tools/build_gamedata/panoply_dev.bat b/nel/tools/build_gamedata/panoply_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/panoply_dev.bat
rename to nel/tools/build_gamedata/panoply_dev.bat
diff --git a/code/nel/tools/build_gamedata/processes/0_setup.py b/nel/tools/build_gamedata/processes/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/0_setup.py
rename to nel/tools/build_gamedata/processes/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/1_export.py b/nel/tools/build_gamedata/processes/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/1_export.py
rename to nel/tools/build_gamedata/processes/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/2_build.py b/nel/tools/build_gamedata/processes/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/2_build.py
rename to nel/tools/build_gamedata/processes/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/3_install.py b/nel/tools/build_gamedata/processes/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/3_install.py
rename to nel/tools/build_gamedata/processes/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/_dummy/0_setup.py b/nel/tools/build_gamedata/processes/_dummy/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/_dummy/0_setup.py
rename to nel/tools/build_gamedata/processes/_dummy/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/_dummy/1_export.py b/nel/tools/build_gamedata/processes/_dummy/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/_dummy/1_export.py
rename to nel/tools/build_gamedata/processes/_dummy/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/_dummy/2_build.py b/nel/tools/build_gamedata/processes/_dummy/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/_dummy/2_build.py
rename to nel/tools/build_gamedata/processes/_dummy/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/_dummy/3_install.py b/nel/tools/build_gamedata/processes/_dummy/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/_dummy/3_install.py
rename to nel/tools/build_gamedata/processes/_dummy/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/0_setup.py b/nel/tools/build_gamedata/processes/ai_wmap/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ai_wmap/0_setup.py
rename to nel/tools/build_gamedata/processes/ai_wmap/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/1_export.py b/nel/tools/build_gamedata/processes/ai_wmap/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ai_wmap/1_export.py
rename to nel/tools/build_gamedata/processes/ai_wmap/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py b/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
rename to nel/tools/build_gamedata/processes/ai_wmap/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/3_install.py b/nel/tools/build_gamedata/processes/ai_wmap/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ai_wmap/3_install.py
rename to nel/tools/build_gamedata/processes/ai_wmap/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/anim/0_setup.py b/nel/tools/build_gamedata/processes/anim/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/anim/0_setup.py
rename to nel/tools/build_gamedata/processes/anim/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/anim/1_export.py b/nel/tools/build_gamedata/processes/anim/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/anim/1_export.py
rename to nel/tools/build_gamedata/processes/anim/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/anim/2_build.py b/nel/tools/build_gamedata/processes/anim/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/anim/2_build.py
rename to nel/tools/build_gamedata/processes/anim/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/anim/3_install.py b/nel/tools/build_gamedata/processes/anim/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/anim/3_install.py
rename to nel/tools/build_gamedata/processes/anim/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms b/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
rename to nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/cartographer/0_setup.py b/nel/tools/build_gamedata/processes/cartographer/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cartographer/0_setup.py
rename to nel/tools/build_gamedata/processes/cartographer/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/cartographer/1_export.py b/nel/tools/build_gamedata/processes/cartographer/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cartographer/1_export.py
rename to nel/tools/build_gamedata/processes/cartographer/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/cartographer/2_build.py b/nel/tools/build_gamedata/processes/cartographer/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cartographer/2_build.py
rename to nel/tools/build_gamedata/processes/cartographer/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/cartographer/3_install.py b/nel/tools/build_gamedata/processes/cartographer/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cartographer/3_install.py
rename to nel/tools/build_gamedata/processes/cartographer/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/cegui/0_setup.py b/nel/tools/build_gamedata/processes/cegui/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cegui/0_setup.py
rename to nel/tools/build_gamedata/processes/cegui/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/cegui/1_export.py b/nel/tools/build_gamedata/processes/cegui/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cegui/1_export.py
rename to nel/tools/build_gamedata/processes/cegui/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/cegui/2_build.py b/nel/tools/build_gamedata/processes/cegui/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cegui/2_build.py
rename to nel/tools/build_gamedata/processes/cegui/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/cegui/3_install.py b/nel/tools/build_gamedata/processes/cegui/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/cegui/3_install.py
rename to nel/tools/build_gamedata/processes/cegui/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py b/nel/tools/build_gamedata/processes/clodbank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/clodbank/0_setup.py
rename to nel/tools/build_gamedata/processes/clodbank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/1_export.py b/nel/tools/build_gamedata/processes/clodbank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/clodbank/1_export.py
rename to nel/tools/build_gamedata/processes/clodbank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/2_build.py b/nel/tools/build_gamedata/processes/clodbank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/clodbank/2_build.py
rename to nel/tools/build_gamedata/processes/clodbank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/3_install.py b/nel/tools/build_gamedata/processes/clodbank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/clodbank/3_install.py
rename to nel/tools/build_gamedata/processes/clodbank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
rename to nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/copy/0_setup.py b/nel/tools/build_gamedata/processes/copy/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/copy/0_setup.py
rename to nel/tools/build_gamedata/processes/copy/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/copy/1_export.py b/nel/tools/build_gamedata/processes/copy/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/copy/1_export.py
rename to nel/tools/build_gamedata/processes/copy/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/copy/2_build.py b/nel/tools/build_gamedata/processes/copy/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/copy/2_build.py
rename to nel/tools/build_gamedata/processes/copy/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/copy/3_install.py b/nel/tools/build_gamedata/processes/copy/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/copy/3_install.py
rename to nel/tools/build_gamedata/processes/copy/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/displace/0_setup.py b/nel/tools/build_gamedata/processes/displace/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/displace/0_setup.py
rename to nel/tools/build_gamedata/processes/displace/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/displace/1_export.py b/nel/tools/build_gamedata/processes/displace/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/displace/1_export.py
rename to nel/tools/build_gamedata/processes/displace/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/displace/2_build.py b/nel/tools/build_gamedata/processes/displace/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/displace/2_build.py
rename to nel/tools/build_gamedata/processes/displace/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/displace/3_install.py b/nel/tools/build_gamedata/processes/displace/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/displace/3_install.py
rename to nel/tools/build_gamedata/processes/displace/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/farbank/0_setup.py b/nel/tools/build_gamedata/processes/farbank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/farbank/0_setup.py
rename to nel/tools/build_gamedata/processes/farbank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/farbank/1_export.py b/nel/tools/build_gamedata/processes/farbank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/farbank/1_export.py
rename to nel/tools/build_gamedata/processes/farbank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/farbank/2_build.py b/nel/tools/build_gamedata/processes/farbank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/farbank/2_build.py
rename to nel/tools/build_gamedata/processes/farbank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/farbank/3_install.py b/nel/tools/build_gamedata/processes/farbank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/farbank/3_install.py
rename to nel/tools/build_gamedata/processes/farbank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/font/0_setup.py b/nel/tools/build_gamedata/processes/font/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/font/0_setup.py
rename to nel/tools/build_gamedata/processes/font/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/font/1_export.py b/nel/tools/build_gamedata/processes/font/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/font/1_export.py
rename to nel/tools/build_gamedata/processes/font/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/font/2_build.py b/nel/tools/build_gamedata/processes/font/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/font/2_build.py
rename to nel/tools/build_gamedata/processes/font/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/font/3_install.py b/nel/tools/build_gamedata/processes/font/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/font/3_install.py
rename to nel/tools/build_gamedata/processes/font/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ig/0_setup.py b/nel/tools/build_gamedata/processes/ig/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig/0_setup.py
rename to nel/tools/build_gamedata/processes/ig/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/ig/1_export.py b/nel/tools/build_gamedata/processes/ig/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig/1_export.py
rename to nel/tools/build_gamedata/processes/ig/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/ig/2_build.py b/nel/tools/build_gamedata/processes/ig/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig/2_build.py
rename to nel/tools/build_gamedata/processes/ig/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/ig/3_install.py b/nel/tools/build_gamedata/processes/ig/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig/3_install.py
rename to nel/tools/build_gamedata/processes/ig/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms b/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
rename to nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/ig_light/0_setup.py b/nel/tools/build_gamedata/processes/ig_light/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig_light/0_setup.py
rename to nel/tools/build_gamedata/processes/ig_light/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/ig_light/1_export.py b/nel/tools/build_gamedata/processes/ig_light/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig_light/1_export.py
rename to nel/tools/build_gamedata/processes/ig_light/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/ig_light/2_build.py b/nel/tools/build_gamedata/processes/ig_light/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig_light/2_build.py
rename to nel/tools/build_gamedata/processes/ig_light/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/ig_light/3_install.py b/nel/tools/build_gamedata/processes/ig_light/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ig_light/3_install.py
rename to nel/tools/build_gamedata/processes/ig_light/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/interface/0_setup.py b/nel/tools/build_gamedata/processes/interface/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/interface/0_setup.py
rename to nel/tools/build_gamedata/processes/interface/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/interface/1_export.py b/nel/tools/build_gamedata/processes/interface/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/interface/1_export.py
rename to nel/tools/build_gamedata/processes/interface/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/interface/2_build.py b/nel/tools/build_gamedata/processes/interface/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/interface/2_build.py
rename to nel/tools/build_gamedata/processes/interface/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/interface/3_install.py b/nel/tools/build_gamedata/processes/interface/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/interface/3_install.py
rename to nel/tools/build_gamedata/processes/interface/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py b/nel/tools/build_gamedata/processes/ligo/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ligo/0_setup.py
rename to nel/tools/build_gamedata/processes/ligo/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/ligo/1_export.py b/nel/tools/build_gamedata/processes/ligo/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ligo/1_export.py
rename to nel/tools/build_gamedata/processes/ligo/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/ligo/2_build.py b/nel/tools/build_gamedata/processes/ligo/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ligo/2_build.py
rename to nel/tools/build_gamedata/processes/ligo/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/ligo/3_install.py b/nel/tools/build_gamedata/processes/ligo/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ligo/3_install.py
rename to nel/tools/build_gamedata/processes/ligo/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
rename to nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/map/0_setup.py b/nel/tools/build_gamedata/processes/map/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/map/0_setup.py
rename to nel/tools/build_gamedata/processes/map/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/map/1_export.py b/nel/tools/build_gamedata/processes/map/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/map/1_export.py
rename to nel/tools/build_gamedata/processes/map/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/map/2_build.py b/nel/tools/build_gamedata/processes/map/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/map/2_build.py
rename to nel/tools/build_gamedata/processes/map/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/map/3_install.py b/nel/tools/build_gamedata/processes/map/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/map/3_install.py
rename to nel/tools/build_gamedata/processes/map/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/0_setup.py b/nel/tools/build_gamedata/processes/pacs_prim/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim/0_setup.py
rename to nel/tools/build_gamedata/processes/pacs_prim/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py b/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
rename to nel/tools/build_gamedata/processes/pacs_prim/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/2_build.py b/nel/tools/build_gamedata/processes/pacs_prim/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim/2_build.py
rename to nel/tools/build_gamedata/processes/pacs_prim/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/3_install.py b/nel/tools/build_gamedata/processes/pacs_prim/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim/3_install.py
rename to nel/tools/build_gamedata/processes/pacs_prim/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
rename to nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py b/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py
rename to nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py b/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py
rename to nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py b/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py
rename to nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py b/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py
rename to nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/properties/0_setup.py b/nel/tools/build_gamedata/processes/properties/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/properties/0_setup.py
rename to nel/tools/build_gamedata/processes/properties/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/properties/1_export.py b/nel/tools/build_gamedata/processes/properties/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/properties/1_export.py
rename to nel/tools/build_gamedata/processes/properties/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/properties/2_build.py b/nel/tools/build_gamedata/processes/properties/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/properties/2_build.py
rename to nel/tools/build_gamedata/processes/properties/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/properties/3_install.py b/nel/tools/build_gamedata/processes/properties/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/properties/3_install.py
rename to nel/tools/build_gamedata/processes/properties/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/ps/0_setup.py b/nel/tools/build_gamedata/processes/ps/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ps/0_setup.py
rename to nel/tools/build_gamedata/processes/ps/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/ps/1_export.py b/nel/tools/build_gamedata/processes/ps/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ps/1_export.py
rename to nel/tools/build_gamedata/processes/ps/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/ps/2_build.py b/nel/tools/build_gamedata/processes/ps/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ps/2_build.py
rename to nel/tools/build_gamedata/processes/ps/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/ps/3_install.py b/nel/tools/build_gamedata/processes/ps/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/ps/3_install.py
rename to nel/tools/build_gamedata/processes/ps/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/pz/0_setup.py b/nel/tools/build_gamedata/processes/pz/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pz/0_setup.py
rename to nel/tools/build_gamedata/processes/pz/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/pz/1_export.py b/nel/tools/build_gamedata/processes/pz/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pz/1_export.py
rename to nel/tools/build_gamedata/processes/pz/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/pz/2_build.py b/nel/tools/build_gamedata/processes/pz/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pz/2_build.py
rename to nel/tools/build_gamedata/processes/pz/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/pz/3_install.py b/nel/tools/build_gamedata/processes/pz/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/pz/3_install.py
rename to nel/tools/build_gamedata/processes/pz/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/rbank/0_setup.py b/nel/tools/build_gamedata/processes/rbank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/rbank/0_setup.py
rename to nel/tools/build_gamedata/processes/rbank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/rbank/1_export.py b/nel/tools/build_gamedata/processes/rbank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/rbank/1_export.py
rename to nel/tools/build_gamedata/processes/rbank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/rbank/2_build.py b/nel/tools/build_gamedata/processes/rbank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/rbank/2_build.py
rename to nel/tools/build_gamedata/processes/rbank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/rbank/3_install.py b/nel/tools/build_gamedata/processes/rbank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/rbank/3_install.py
rename to nel/tools/build_gamedata/processes/rbank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms b/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
rename to nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/samplebank/0_setup.py b/nel/tools/build_gamedata/processes/samplebank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/samplebank/0_setup.py
rename to nel/tools/build_gamedata/processes/samplebank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/samplebank/1_export.py b/nel/tools/build_gamedata/processes/samplebank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/samplebank/1_export.py
rename to nel/tools/build_gamedata/processes/samplebank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/samplebank/2_build.py b/nel/tools/build_gamedata/processes/samplebank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/samplebank/2_build.py
rename to nel/tools/build_gamedata/processes/samplebank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/samplebank/3_install.py b/nel/tools/build_gamedata/processes/samplebank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/samplebank/3_install.py
rename to nel/tools/build_gamedata/processes/samplebank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/shape/0_setup.py b/nel/tools/build_gamedata/processes/shape/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/shape/0_setup.py
rename to nel/tools/build_gamedata/processes/shape/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/shape/1_export.py b/nel/tools/build_gamedata/processes/shape/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/shape/1_export.py
rename to nel/tools/build_gamedata/processes/shape/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/shape/2_build.py b/nel/tools/build_gamedata/processes/shape/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/shape/2_build.py
rename to nel/tools/build_gamedata/processes/shape/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/shape/3_install.py b/nel/tools/build_gamedata/processes/shape/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/shape/3_install.py
rename to nel/tools/build_gamedata/processes/shape/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms b/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
rename to nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/0_setup.py b/nel/tools/build_gamedata/processes/sheet_id/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheet_id/0_setup.py
rename to nel/tools/build_gamedata/processes/sheet_id/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/1_export.py b/nel/tools/build_gamedata/processes/sheet_id/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheet_id/1_export.py
rename to nel/tools/build_gamedata/processes/sheet_id/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/2_build.py b/nel/tools/build_gamedata/processes/sheet_id/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheet_id/2_build.py
rename to nel/tools/build_gamedata/processes/sheet_id/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/3_install.py b/nel/tools/build_gamedata/processes/sheet_id/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheet_id/3_install.py
rename to nel/tools/build_gamedata/processes/sheet_id/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets/0_setup.py b/nel/tools/build_gamedata/processes/sheets/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets/0_setup.py
rename to nel/tools/build_gamedata/processes/sheets/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets/1_export.py b/nel/tools/build_gamedata/processes/sheets/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets/1_export.py
rename to nel/tools/build_gamedata/processes/sheets/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets/2_build.py b/nel/tools/build_gamedata/processes/sheets/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets/2_build.py
rename to nel/tools/build_gamedata/processes/sheets/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets/3_install.py b/nel/tools/build_gamedata/processes/sheets/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets/3_install.py
rename to nel/tools/build_gamedata/processes/sheets/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/0_setup.py b/nel/tools/build_gamedata/processes/sheets_shard/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets_shard/0_setup.py
rename to nel/tools/build_gamedata/processes/sheets_shard/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/1_export.py b/nel/tools/build_gamedata/processes/sheets_shard/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets_shard/1_export.py
rename to nel/tools/build_gamedata/processes/sheets_shard/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/2_build.py b/nel/tools/build_gamedata/processes/sheets_shard/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets_shard/2_build.py
rename to nel/tools/build_gamedata/processes/sheets_shard/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/3_install.py b/nel/tools/build_gamedata/processes/sheets_shard/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sheets_shard/3_install.py
rename to nel/tools/build_gamedata/processes/sheets_shard/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/sign/0_setup.py b/nel/tools/build_gamedata/processes/sign/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sign/0_setup.py
rename to nel/tools/build_gamedata/processes/sign/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/sign/1_export.py b/nel/tools/build_gamedata/processes/sign/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sign/1_export.py
rename to nel/tools/build_gamedata/processes/sign/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/sign/2_build.py b/nel/tools/build_gamedata/processes/sign/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sign/2_build.py
rename to nel/tools/build_gamedata/processes/sign/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/sign/3_install.py b/nel/tools/build_gamedata/processes/sign/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sign/3_install.py
rename to nel/tools/build_gamedata/processes/sign/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/skel/0_setup.py b/nel/tools/build_gamedata/processes/skel/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/skel/0_setup.py
rename to nel/tools/build_gamedata/processes/skel/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/skel/1_export.py b/nel/tools/build_gamedata/processes/skel/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/skel/1_export.py
rename to nel/tools/build_gamedata/processes/skel/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/skel/2_build.py b/nel/tools/build_gamedata/processes/skel/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/skel/2_build.py
rename to nel/tools/build_gamedata/processes/skel/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/skel/3_install.py b/nel/tools/build_gamedata/processes/skel/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/skel/3_install.py
rename to nel/tools/build_gamedata/processes/skel/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms b/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
rename to nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/smallbank/0_setup.py b/nel/tools/build_gamedata/processes/smallbank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/smallbank/0_setup.py
rename to nel/tools/build_gamedata/processes/smallbank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/smallbank/1_export.py b/nel/tools/build_gamedata/processes/smallbank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/smallbank/1_export.py
rename to nel/tools/build_gamedata/processes/smallbank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/smallbank/2_build.py b/nel/tools/build_gamedata/processes/smallbank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/smallbank/2_build.py
rename to nel/tools/build_gamedata/processes/smallbank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/smallbank/3_install.py b/nel/tools/build_gamedata/processes/smallbank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/smallbank/3_install.py
rename to nel/tools/build_gamedata/processes/smallbank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/sound/0_setup.py b/nel/tools/build_gamedata/processes/sound/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sound/0_setup.py
rename to nel/tools/build_gamedata/processes/sound/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/sound/1_export.py b/nel/tools/build_gamedata/processes/sound/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sound/1_export.py
rename to nel/tools/build_gamedata/processes/sound/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/sound/2_build.py b/nel/tools/build_gamedata/processes/sound/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sound/2_build.py
rename to nel/tools/build_gamedata/processes/sound/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/sound/3_install.py b/nel/tools/build_gamedata/processes/sound/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/sound/3_install.py
rename to nel/tools/build_gamedata/processes/sound/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/soundbank/0_setup.py b/nel/tools/build_gamedata/processes/soundbank/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/soundbank/0_setup.py
rename to nel/tools/build_gamedata/processes/soundbank/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/soundbank/1_export.py b/nel/tools/build_gamedata/processes/soundbank/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/soundbank/1_export.py
rename to nel/tools/build_gamedata/processes/soundbank/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/soundbank/2_build.py b/nel/tools/build_gamedata/processes/soundbank/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/soundbank/2_build.py
rename to nel/tools/build_gamedata/processes/soundbank/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/soundbank/3_install.py b/nel/tools/build_gamedata/processes/soundbank/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/soundbank/3_install.py
rename to nel/tools/build_gamedata/processes/soundbank/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/swt/0_setup.py b/nel/tools/build_gamedata/processes/swt/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/swt/0_setup.py
rename to nel/tools/build_gamedata/processes/swt/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/swt/1_export.py b/nel/tools/build_gamedata/processes/swt/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/swt/1_export.py
rename to nel/tools/build_gamedata/processes/swt/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/swt/2_build.py b/nel/tools/build_gamedata/processes/swt/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/swt/2_build.py
rename to nel/tools/build_gamedata/processes/swt/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/swt/3_install.py b/nel/tools/build_gamedata/processes/swt/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/swt/3_install.py
rename to nel/tools/build_gamedata/processes/swt/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms b/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
rename to nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/tiles/0_setup.py b/nel/tools/build_gamedata/processes/tiles/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/tiles/0_setup.py
rename to nel/tools/build_gamedata/processes/tiles/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/tiles/1_export.py b/nel/tools/build_gamedata/processes/tiles/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/tiles/1_export.py
rename to nel/tools/build_gamedata/processes/tiles/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/tiles/2_build.py b/nel/tools/build_gamedata/processes/tiles/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/tiles/2_build.py
rename to nel/tools/build_gamedata/processes/tiles/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/tiles/3_install.py b/nel/tools/build_gamedata/processes/tiles/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/tiles/3_install.py
rename to nel/tools/build_gamedata/processes/tiles/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/veget/0_setup.py b/nel/tools/build_gamedata/processes/veget/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/veget/0_setup.py
rename to nel/tools/build_gamedata/processes/veget/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/veget/1_export.py b/nel/tools/build_gamedata/processes/veget/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/veget/1_export.py
rename to nel/tools/build_gamedata/processes/veget/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/veget/2_build.py b/nel/tools/build_gamedata/processes/veget/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/veget/2_build.py
rename to nel/tools/build_gamedata/processes/veget/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/veget/3_install.py b/nel/tools/build_gamedata/processes/veget/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/veget/3_install.py
rename to nel/tools/build_gamedata/processes/veget/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms b/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
rename to nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/vegetset/0_setup.py b/nel/tools/build_gamedata/processes/vegetset/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/vegetset/0_setup.py
rename to nel/tools/build_gamedata/processes/vegetset/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/vegetset/1_export.py b/nel/tools/build_gamedata/processes/vegetset/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/vegetset/1_export.py
rename to nel/tools/build_gamedata/processes/vegetset/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/vegetset/2_build.py b/nel/tools/build_gamedata/processes/vegetset/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/vegetset/2_build.py
rename to nel/tools/build_gamedata/processes/vegetset/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/vegetset/3_install.py b/nel/tools/build_gamedata/processes/vegetset/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/vegetset/3_install.py
rename to nel/tools/build_gamedata/processes/vegetset/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/zone/0_setup.py b/nel/tools/build_gamedata/processes/zone/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/0_setup.py
rename to nel/tools/build_gamedata/processes/zone/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/zone/1_export.py b/nel/tools/build_gamedata/processes/zone/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/1_export.py
rename to nel/tools/build_gamedata/processes/zone/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/zone/2_build.py b/nel/tools/build_gamedata/processes/zone/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/2_build.py
rename to nel/tools/build_gamedata/processes/zone/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/zone/3_install.py b/nel/tools/build_gamedata/processes/zone/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/3_install.py
rename to nel/tools/build_gamedata/processes/zone/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms b/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
rename to nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms
diff --git a/code/nel/tools/build_gamedata/processes/zone/todo_build_dependencies b/nel/tools/build_gamedata/processes/zone/todo_build_dependencies
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/todo_build_dependencies
rename to nel/tools/build_gamedata/processes/zone/todo_build_dependencies
diff --git a/code/nel/tools/build_gamedata/processes/zone/todo_export_maxscript b/nel/tools/build_gamedata/processes/zone/todo_export_maxscript
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone/todo_export_maxscript
rename to nel/tools/build_gamedata/processes/zone/todo_export_maxscript
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/0_setup.py b/nel/tools/build_gamedata/processes/zone_light/0_setup.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone_light/0_setup.py
rename to nel/tools/build_gamedata/processes/zone_light/0_setup.py
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/1_export.py b/nel/tools/build_gamedata/processes/zone_light/1_export.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone_light/1_export.py
rename to nel/tools/build_gamedata/processes/zone_light/1_export.py
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/2_build.py b/nel/tools/build_gamedata/processes/zone_light/2_build.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone_light/2_build.py
rename to nel/tools/build_gamedata/processes/zone_light/2_build.py
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/3_install.py b/nel/tools/build_gamedata/processes/zone_light/3_install.py
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone_light/3_install.py
rename to nel/tools/build_gamedata/processes/zone_light/3_install.py
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/todo_patch_tile_water b/nel/tools/build_gamedata/processes/zone_light/todo_patch_tile_water
similarity index 100%
rename from code/nel/tools/build_gamedata/processes/zone_light/todo_patch_tile_water
rename to nel/tools/build_gamedata/processes/zone_light/todo_patch_tile_water
diff --git a/code/nel/tools/build_gamedata/sky_dev.bat b/nel/tools/build_gamedata/sky_dev.bat
similarity index 100%
rename from code/nel/tools/build_gamedata/sky_dev.bat
rename to nel/tools/build_gamedata/sky_dev.bat
diff --git a/code/nel/tools/build_gamedata/translation/README.md b/nel/tools/build_gamedata/translation/README.md
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/README.md
rename to nel/tools/build_gamedata/translation/README.md
diff --git a/code/nel/tools/build_gamedata/translation/a1_make_phrase_diff.py b/nel/tools/build_gamedata/translation/a1_make_phrase_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/a1_make_phrase_diff.py
rename to nel/tools/build_gamedata/translation/a1_make_phrase_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py b/nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py
rename to nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/a3_make_clause_diff.py b/nel/tools/build_gamedata/translation/a3_make_clause_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/a3_make_clause_diff.py
rename to nel/tools/build_gamedata/translation/a3_make_clause_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/a4_merge_clause_diff.py b/nel/tools/build_gamedata/translation/a4_merge_clause_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/a4_merge_clause_diff.py
rename to nel/tools/build_gamedata/translation/a4_merge_clause_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/b1_make_words_diff.py b/nel/tools/build_gamedata/translation/b1_make_words_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/b1_make_words_diff.py
rename to nel/tools/build_gamedata/translation/b1_make_words_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/b2_merge_words_diff.py b/nel/tools/build_gamedata/translation/b2_merge_words_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/b2_merge_words_diff.py
rename to nel/tools/build_gamedata/translation/b2_merge_words_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/c1_make_string_diff.py b/nel/tools/build_gamedata/translation/c1_make_string_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/c1_make_string_diff.py
rename to nel/tools/build_gamedata/translation/c1_make_string_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/c2_merge_string_diff.py b/nel/tools/build_gamedata/translation/c2_merge_string_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/c2_merge_string_diff.py
rename to nel/tools/build_gamedata/translation/c2_merge_string_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/d1_make_botnames_diff.py b/nel/tools/build_gamedata/translation/d1_make_botnames_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/d1_make_botnames_diff.py
rename to nel/tools/build_gamedata/translation/d1_make_botnames_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py b/nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py
rename to nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/e1_clean_string_diff.py b/nel/tools/build_gamedata/translation/e1_clean_string_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/e1_clean_string_diff.py
rename to nel/tools/build_gamedata/translation/e1_clean_string_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/e2_clean_words_diff.py b/nel/tools/build_gamedata/translation/e2_clean_words_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/e2_clean_words_diff.py
rename to nel/tools/build_gamedata/translation/e2_clean_words_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/e3_clean_clause_diff.py b/nel/tools/build_gamedata/translation/e3_clean_clause_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/e3_clean_clause_diff.py
rename to nel/tools/build_gamedata/translation/e3_clean_clause_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py b/nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py
rename to nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py
diff --git a/code/nel/tools/build_gamedata/translation/make_merge_all.py b/nel/tools/build_gamedata/translation/make_merge_all.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/make_merge_all.py
rename to nel/tools/build_gamedata/translation/make_merge_all.py
diff --git a/code/nel/tools/build_gamedata/translation/make_merge_wk.py b/nel/tools/build_gamedata/translation/make_merge_wk.py
similarity index 100%
rename from code/nel/tools/build_gamedata/translation/make_merge_wk.py
rename to nel/tools/build_gamedata/translation/make_merge_wk.py
diff --git a/code/nel/tools/georges/CMakeLists.txt b/nel/tools/georges/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/georges/CMakeLists.txt
rename to nel/tools/georges/CMakeLists.txt
diff --git a/code/nel/tools/georges/georges2csv/CMakeLists.txt b/nel/tools/georges/georges2csv/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/georges/georges2csv/CMakeLists.txt
rename to nel/tools/georges/georges2csv/CMakeLists.txt
diff --git a/code/nel/tools/georges/georges2csv/georges2csv.cpp b/nel/tools/georges/georges2csv/georges2csv.cpp
similarity index 100%
rename from code/nel/tools/georges/georges2csv/georges2csv.cpp
rename to nel/tools/georges/georges2csv/georges2csv.cpp
diff --git a/code/nel/tools/georges/georges2csv/test.script b/nel/tools/georges/georges2csv/test.script
similarity index 100%
rename from code/nel/tools/georges/georges2csv/test.script
rename to nel/tools/georges/georges2csv/test.script
diff --git a/code/nel/tools/ligo/CMakeLists.txt b/nel/tools/ligo/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/ligo/CMakeLists.txt
rename to nel/tools/ligo/CMakeLists.txt
diff --git a/code/nel/tools/ligo/unbuild_land/CMakeLists.txt b/nel/tools/ligo/unbuild_land/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/ligo/unbuild_land/CMakeLists.txt
rename to nel/tools/ligo/unbuild_land/CMakeLists.txt
diff --git a/code/nel/tools/ligo/unbuild_land/gold_pill.ico b/nel/tools/ligo/unbuild_land/gold_pill.ico
similarity index 100%
rename from code/nel/tools/ligo/unbuild_land/gold_pill.ico
rename to nel/tools/ligo/unbuild_land/gold_pill.ico
diff --git a/code/nel/tools/ligo/unbuild_land/main.rc b/nel/tools/ligo/unbuild_land/main.rc
similarity index 100%
rename from code/nel/tools/ligo/unbuild_land/main.rc
rename to nel/tools/ligo/unbuild_land/main.rc
diff --git a/code/nel/tools/ligo/unbuild_land/unbuild_land.cpp b/nel/tools/ligo/unbuild_land/unbuild_land.cpp
similarity index 100%
rename from code/nel/tools/ligo/unbuild_land/unbuild_land.cpp
rename to nel/tools/ligo/unbuild_land/unbuild_land.cpp
diff --git a/code/nel/tools/logic/CMakeLists.txt b/nel/tools/logic/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/logic/CMakeLists.txt
rename to nel/tools/logic/CMakeLists.txt
diff --git a/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt b/nel/tools/logic/logic_editor_dll/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/CMakeLists.txt
rename to nel/tools/logic/logic_editor_dll/CMakeLists.txt
diff --git a/code/nel/tools/logic/logic_editor_dll/ChildFrm.cpp b/nel/tools/logic/logic_editor_dll/ChildFrm.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ChildFrm.cpp
rename to nel/tools/logic/logic_editor_dll/ChildFrm.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/ChildFrm.h b/nel/tools/logic/logic_editor_dll/ChildFrm.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ChildFrm.h
rename to nel/tools/logic/logic_editor_dll/ChildFrm.h
diff --git a/code/nel/tools/logic/logic_editor_dll/Condition.cpp b/nel/tools/logic/logic_editor_dll/Condition.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/Condition.cpp
rename to nel/tools/logic/logic_editor_dll/Condition.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/Condition.h b/nel/tools/logic/logic_editor_dll/Condition.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/Condition.h
rename to nel/tools/logic/logic_editor_dll/Condition.h
diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp b/nel/tools/logic/logic_editor_dll/ConditionPage.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp
rename to nel/tools/logic/logic_editor_dll/ConditionPage.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionPage.h b/nel/tools/logic/logic_editor_dll/ConditionPage.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ConditionPage.h
rename to nel/tools/logic/logic_editor_dll/ConditionPage.h
diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp b/nel/tools/logic/logic_editor_dll/ConditionsView.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp
rename to nel/tools/logic/logic_editor_dll/ConditionsView.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionsView.h b/nel/tools/logic/logic_editor_dll/ConditionsView.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ConditionsView.h
rename to nel/tools/logic/logic_editor_dll/ConditionsView.h
diff --git a/code/nel/tools/logic/logic_editor_dll/Counter.cpp b/nel/tools/logic/logic_editor_dll/Counter.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/Counter.cpp
rename to nel/tools/logic/logic_editor_dll/Counter.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/Counter.h b/nel/tools/logic/logic_editor_dll/Counter.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/Counter.h
rename to nel/tools/logic/logic_editor_dll/Counter.h
diff --git a/code/nel/tools/logic/logic_editor_dll/CounterPage.cpp b/nel/tools/logic/logic_editor_dll/CounterPage.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/CounterPage.cpp
rename to nel/tools/logic/logic_editor_dll/CounterPage.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/CounterPage.h b/nel/tools/logic/logic_editor_dll/CounterPage.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/CounterPage.h
rename to nel/tools/logic/logic_editor_dll/CounterPage.h
diff --git a/code/nel/tools/logic/logic_editor_dll/EditorFormView.cpp b/nel/tools/logic/logic_editor_dll/EditorFormView.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/EditorFormView.cpp
rename to nel/tools/logic/logic_editor_dll/EditorFormView.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/EditorFormView.h b/nel/tools/logic/logic_editor_dll/EditorFormView.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/EditorFormView.h
rename to nel/tools/logic/logic_editor_dll/EditorFormView.h
diff --git a/code/nel/tools/logic/logic_editor_dll/EditorPropertySheet.cpp b/nel/tools/logic/logic_editor_dll/EditorPropertySheet.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/EditorPropertySheet.cpp
rename to nel/tools/logic/logic_editor_dll/EditorPropertySheet.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/EditorPropertySheet.h b/nel/tools/logic/logic_editor_dll/EditorPropertySheet.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/EditorPropertySheet.h
rename to nel/tools/logic/logic_editor_dll/EditorPropertySheet.h
diff --git a/code/nel/tools/logic/logic_editor_dll/LogicTreeView.cpp b/nel/tools/logic/logic_editor_dll/LogicTreeView.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/LogicTreeView.cpp
rename to nel/tools/logic/logic_editor_dll/LogicTreeView.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/LogicTreeView.h b/nel/tools/logic/logic_editor_dll/LogicTreeView.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/LogicTreeView.h
rename to nel/tools/logic/logic_editor_dll/LogicTreeView.h
diff --git a/code/nel/tools/logic/logic_editor_dll/MainFrm.cpp b/nel/tools/logic/logic_editor_dll/MainFrm.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/MainFrm.cpp
rename to nel/tools/logic/logic_editor_dll/MainFrm.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/MainFrm.h b/nel/tools/logic/logic_editor_dll/MainFrm.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/MainFrm.h
rename to nel/tools/logic/logic_editor_dll/MainFrm.h
diff --git a/code/nel/tools/logic/logic_editor_dll/NumEdit.cpp b/nel/tools/logic/logic_editor_dll/NumEdit.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/NumEdit.cpp
rename to nel/tools/logic/logic_editor_dll/NumEdit.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/NumEdit.h b/nel/tools/logic/logic_editor_dll/NumEdit.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/NumEdit.h
rename to nel/tools/logic/logic_editor_dll/NumEdit.h
diff --git a/code/nel/tools/logic/logic_editor_dll/ResizablePage.cpp b/nel/tools/logic/logic_editor_dll/ResizablePage.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ResizablePage.cpp
rename to nel/tools/logic/logic_editor_dll/ResizablePage.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/ResizablePage.h b/nel/tools/logic/logic_editor_dll/ResizablePage.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ResizablePage.h
rename to nel/tools/logic/logic_editor_dll/ResizablePage.h
diff --git a/code/nel/tools/logic/logic_editor_dll/ResizableSheet.cpp b/nel/tools/logic/logic_editor_dll/ResizableSheet.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ResizableSheet.cpp
rename to nel/tools/logic/logic_editor_dll/ResizableSheet.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/ResizableSheet.h b/nel/tools/logic/logic_editor_dll/ResizableSheet.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/ResizableSheet.h
rename to nel/tools/logic/logic_editor_dll/ResizableSheet.h
diff --git a/code/nel/tools/logic/logic_editor_dll/State.cpp b/nel/tools/logic/logic_editor_dll/State.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/State.cpp
rename to nel/tools/logic/logic_editor_dll/State.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/State.h b/nel/tools/logic/logic_editor_dll/State.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/State.h
rename to nel/tools/logic/logic_editor_dll/State.h
diff --git a/code/nel/tools/logic/logic_editor_dll/StatePage.cpp b/nel/tools/logic/logic_editor_dll/StatePage.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StatePage.cpp
rename to nel/tools/logic/logic_editor_dll/StatePage.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/StatePage.h b/nel/tools/logic/logic_editor_dll/StatePage.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StatePage.h
rename to nel/tools/logic/logic_editor_dll/StatePage.h
diff --git a/code/nel/tools/logic/logic_editor_dll/StatesView.cpp b/nel/tools/logic/logic_editor_dll/StatesView.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StatesView.cpp
rename to nel/tools/logic/logic_editor_dll/StatesView.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/StatesView.h b/nel/tools/logic/logic_editor_dll/StatesView.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StatesView.h
rename to nel/tools/logic/logic_editor_dll/StatesView.h
diff --git a/code/nel/tools/logic/logic_editor_dll/StdAfx.cpp b/nel/tools/logic/logic_editor_dll/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StdAfx.cpp
rename to nel/tools/logic/logic_editor_dll/StdAfx.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/StdAfx.h b/nel/tools/logic/logic_editor_dll/StdAfx.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/StdAfx.h
rename to nel/tools/logic/logic_editor_dll/StdAfx.h
diff --git a/code/nel/tools/logic/logic_editor_dll/TMenu.cpp b/nel/tools/logic/logic_editor_dll/TMenu.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/TMenu.cpp
rename to nel/tools/logic/logic_editor_dll/TMenu.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/TMenu.h b/nel/tools/logic/logic_editor_dll/TMenu.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/TMenu.h
rename to nel/tools/logic/logic_editor_dll/TMenu.h
diff --git a/code/nel/tools/logic/logic_editor_dll/VariablePage.cpp b/nel/tools/logic/logic_editor_dll/VariablePage.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/VariablePage.cpp
rename to nel/tools/logic/logic_editor_dll/VariablePage.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/VariablePage.h b/nel/tools/logic/logic_editor_dll/VariablePage.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/VariablePage.h
rename to nel/tools/logic/logic_editor_dll/VariablePage.h
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor.cpp b/nel/tools/logic/logic_editor_dll/logic_editor.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor.cpp
rename to nel/tools/logic/logic_editor_dll/logic_editor.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor.h b/nel/tools/logic/logic_editor_dll/logic_editor.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor.h
rename to nel/tools/logic/logic_editor_dll/logic_editor.h
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor.rc b/nel/tools/logic/logic_editor_dll/logic_editor.rc
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor.rc
rename to nel/tools/logic/logic_editor_dll/logic_editor.rc
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editorDoc.cpp b/nel/tools/logic/logic_editor_dll/logic_editorDoc.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editorDoc.cpp
rename to nel/tools/logic/logic_editor_dll/logic_editorDoc.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editorDoc.h b/nel/tools/logic/logic_editor_dll/logic_editorDoc.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editorDoc.h
rename to nel/tools/logic/logic_editor_dll/logic_editorDoc.h
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editorView.cpp b/nel/tools/logic/logic_editor_dll/logic_editorView.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editorView.cpp
rename to nel/tools/logic/logic_editor_dll/logic_editorView.cpp
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editorView.h b/nel/tools/logic/logic_editor_dll/logic_editorView.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editorView.h
rename to nel/tools/logic/logic_editor_dll/logic_editorView.h
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_debug.def b/nel/tools/logic/logic_editor_dll/logic_editor_debug.def
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor_debug.def
rename to nel/tools/logic/logic_editor_dll/logic_editor_debug.def
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_debug_fast.def b/nel/tools/logic/logic_editor_dll/logic_editor_debug_fast.def
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor_debug_fast.def
rename to nel/tools/logic/logic_editor_dll/logic_editor_debug_fast.def
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h b/nel/tools/logic/logic_editor_dll/logic_editor_interface.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h
rename to nel/tools/logic/logic_editor_dll/logic_editor_interface.h
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_release.def b/nel/tools/logic/logic_editor_dll/logic_editor_release.def
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor_release.def
rename to nel/tools/logic/logic_editor_dll/logic_editor_release.def
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_release_debug.def b/nel/tools/logic/logic_editor_dll/logic_editor_release_debug.def
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/logic_editor_release_debug.def
rename to nel/tools/logic/logic_editor_dll/logic_editor_release_debug.def
diff --git a/code/nel/tools/logic/logic_editor_dll/res/Toolbar.bmp b/nel/tools/logic/logic_editor_dll/res/Toolbar.bmp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/res/Toolbar.bmp
rename to nel/tools/logic/logic_editor_dll/res/Toolbar.bmp
diff --git a/code/nel/tools/logic/logic_editor_dll/res/logic_editor.ico b/nel/tools/logic/logic_editor_dll/res/logic_editor.ico
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/res/logic_editor.ico
rename to nel/tools/logic/logic_editor_dll/res/logic_editor.ico
diff --git a/code/nel/tools/logic/logic_editor_dll/res/logic_editor.rc2 b/nel/tools/logic/logic_editor_dll/res/logic_editor.rc2
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/res/logic_editor.rc2
rename to nel/tools/logic/logic_editor_dll/res/logic_editor.rc2
diff --git a/code/nel/tools/logic/logic_editor_dll/res/logic_editorDoc.ico b/nel/tools/logic/logic_editor_dll/res/logic_editorDoc.ico
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/res/logic_editorDoc.ico
rename to nel/tools/logic/logic_editor_dll/res/logic_editorDoc.ico
diff --git a/code/nel/tools/logic/logic_editor_dll/resource.h b/nel/tools/logic/logic_editor_dll/resource.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_dll/resource.h
rename to nel/tools/logic/logic_editor_dll/resource.h
diff --git a/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt b/nel/tools/logic/logic_editor_exe/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/CMakeLists.txt
rename to nel/tools/logic/logic_editor_exe/CMakeLists.txt
diff --git a/code/nel/tools/logic/logic_editor_exe/StdAfx.cpp b/nel/tools/logic/logic_editor_exe/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/StdAfx.cpp
rename to nel/tools/logic/logic_editor_exe/StdAfx.cpp
diff --git a/code/nel/tools/logic/logic_editor_exe/StdAfx.h b/nel/tools/logic/logic_editor_exe/StdAfx.h
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/StdAfx.h
rename to nel/tools/logic/logic_editor_exe/StdAfx.h
diff --git a/code/nel/tools/logic/logic_editor_exe/logic_editor_exe.cpp b/nel/tools/logic/logic_editor_exe/logic_editor_exe.cpp
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/logic_editor_exe.cpp
rename to nel/tools/logic/logic_editor_exe/logic_editor_exe.cpp
diff --git a/code/nel/tools/logic/logic_editor_exe/main.rc b/nel/tools/logic/logic_editor_exe/main.rc
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/main.rc
rename to nel/tools/logic/logic_editor_exe/main.rc
diff --git a/code/nel/tools/logic/logic_editor_exe/red_pill.ico b/nel/tools/logic/logic_editor_exe/red_pill.ico
similarity index 100%
rename from code/nel/tools/logic/logic_editor_exe/red_pill.ico
rename to nel/tools/logic/logic_editor_exe/red_pill.ico
diff --git a/code/nel/tools/memory/CMakeLists.txt b/nel/tools/memory/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/memory/CMakeLists.txt
rename to nel/tools/memory/CMakeLists.txt
diff --git a/code/nel/tools/memory/memlog/CMakeLists.txt b/nel/tools/memory/memlog/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/memory/memlog/CMakeLists.txt
rename to nel/tools/memory/memlog/CMakeLists.txt
diff --git a/code/nel/tools/memory/memlog/memlog.cpp b/nel/tools/memory/memlog/memlog.cpp
similarity index 100%
rename from code/nel/tools/memory/memlog/memlog.cpp
rename to nel/tools/memory/memlog/memlog.cpp
diff --git a/code/nel/tools/misc/CMakeLists.txt b/nel/tools/misc/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/CMakeLists.txt
rename to nel/tools/misc/CMakeLists.txt
diff --git a/code/nel/tools/misc/bnp_make/CMakeLists.txt b/nel/tools/misc/bnp_make/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/bnp_make/CMakeLists.txt
rename to nel/tools/misc/bnp_make/CMakeLists.txt
diff --git a/code/nel/tools/misc/bnp_make/blue_pill.ico b/nel/tools/misc/bnp_make/blue_pill.ico
similarity index 100%
rename from code/nel/tools/misc/bnp_make/blue_pill.ico
rename to nel/tools/misc/bnp_make/blue_pill.ico
diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/nel/tools/misc/bnp_make/main.cpp
similarity index 100%
rename from code/nel/tools/misc/bnp_make/main.cpp
rename to nel/tools/misc/bnp_make/main.cpp
diff --git a/code/nel/tools/misc/bnp_make/main.rc b/nel/tools/misc/bnp_make/main.rc
similarity index 100%
rename from code/nel/tools/misc/bnp_make/main.rc
rename to nel/tools/misc/bnp_make/main.rc
diff --git a/code/nel/tools/misc/bnp_make_qt/main.cpp b/nel/tools/misc/bnp_make_qt/main.cpp
similarity index 100%
rename from code/nel/tools/misc/bnp_make_qt/main.cpp
rename to nel/tools/misc/bnp_make_qt/main.cpp
diff --git a/code/nel/tools/misc/bnp_make_qt/main.h b/nel/tools/misc/bnp_make_qt/main.h
similarity index 100%
rename from code/nel/tools/misc/bnp_make_qt/main.h
rename to nel/tools/misc/bnp_make_qt/main.h
diff --git a/code/nel/tools/misc/bnp_make_qt/mainwindow.cpp b/nel/tools/misc/bnp_make_qt/mainwindow.cpp
similarity index 100%
rename from code/nel/tools/misc/bnp_make_qt/mainwindow.cpp
rename to nel/tools/misc/bnp_make_qt/mainwindow.cpp
diff --git a/code/nel/tools/misc/bnp_make_qt/mainwindow.h b/nel/tools/misc/bnp_make_qt/mainwindow.h
similarity index 100%
rename from code/nel/tools/misc/bnp_make_qt/mainwindow.h
rename to nel/tools/misc/bnp_make_qt/mainwindow.h
diff --git a/code/nel/tools/misc/bnp_make_qt/mainwindow.ui b/nel/tools/misc/bnp_make_qt/mainwindow.ui
similarity index 100%
rename from code/nel/tools/misc/bnp_make_qt/mainwindow.ui
rename to nel/tools/misc/bnp_make_qt/mainwindow.ui
diff --git a/code/nel/tools/misc/branch_patcher/CMakeLists.txt b/nel/tools/misc/branch_patcher/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/CMakeLists.txt
rename to nel/tools/misc/branch_patcher/CMakeLists.txt
diff --git a/code/nel/tools/misc/branch_patcher/StdAfx.cpp b/nel/tools/misc/branch_patcher/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/StdAfx.cpp
rename to nel/tools/misc/branch_patcher/StdAfx.cpp
diff --git a/code/nel/tools/misc/branch_patcher/StdAfx.h b/nel/tools/misc/branch_patcher/StdAfx.h
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/StdAfx.h
rename to nel/tools/misc/branch_patcher/StdAfx.h
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcher.cpp b/nel/tools/misc/branch_patcher/branch_patcher.cpp
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcher.cpp
rename to nel/tools/misc/branch_patcher/branch_patcher.cpp
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcher.h b/nel/tools/misc/branch_patcher/branch_patcher.h
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcher.h
rename to nel/tools/misc/branch_patcher/branch_patcher.h
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcher.rc b/nel/tools/misc/branch_patcher/branch_patcher.rc
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcher.rc
rename to nel/tools/misc/branch_patcher/branch_patcher.rc
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp b/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
rename to nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcherDlg.h b/nel/tools/misc/branch_patcher/branch_patcherDlg.h
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcherDlg.h
rename to nel/tools/misc/branch_patcher/branch_patcherDlg.h
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcher_install.reg b/nel/tools/misc/branch_patcher/branch_patcher_install.reg
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/branch_patcher_install.reg
rename to nel/tools/misc/branch_patcher/branch_patcher_install.reg
diff --git a/code/nel/tools/misc/branch_patcher/res/branch_patcher.rc2 b/nel/tools/misc/branch_patcher/res/branch_patcher.rc2
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/res/branch_patcher.rc2
rename to nel/tools/misc/branch_patcher/res/branch_patcher.rc2
diff --git a/code/nel/tools/misc/branch_patcher/res/nevrax_pill_3d_rgba.ico b/nel/tools/misc/branch_patcher/res/nevrax_pill_3d_rgba.ico
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/res/nevrax_pill_3d_rgba.ico
rename to nel/tools/misc/branch_patcher/res/nevrax_pill_3d_rgba.ico
diff --git a/code/nel/tools/misc/branch_patcher/resource.h b/nel/tools/misc/branch_patcher/resource.h
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/resource.h
rename to nel/tools/misc/branch_patcher/resource.h
diff --git a/code/nel/tools/misc/branch_patcher/version.rc2 b/nel/tools/misc/branch_patcher/version.rc2
similarity index 100%
rename from code/nel/tools/misc/branch_patcher/version.rc2
rename to nel/tools/misc/branch_patcher/version.rc2
diff --git a/code/nel/tools/misc/crash_report/CMakeLists.txt b/nel/tools/misc/crash_report/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/crash_report/CMakeLists.txt
rename to nel/tools/misc/crash_report/CMakeLists.txt
diff --git a/code/nel/tools/misc/crash_report/crash_report.cpp b/nel/tools/misc/crash_report/crash_report.cpp
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report.cpp
rename to nel/tools/misc/crash_report/crash_report.cpp
diff --git a/code/nel/tools/misc/crash_report/crash_report.rc b/nel/tools/misc/crash_report/crash_report.rc
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report.rc
rename to nel/tools/misc/crash_report/crash_report.rc
diff --git a/code/nel/tools/misc/crash_report/crash_report_data.h b/nel/tools/misc/crash_report/crash_report_data.h
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_data.h
rename to nel/tools/misc/crash_report/crash_report_data.h
diff --git a/code/nel/tools/misc/crash_report/crash_report_socket.cpp b/nel/tools/misc/crash_report/crash_report_socket.cpp
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_socket.cpp
rename to nel/tools/misc/crash_report/crash_report_socket.cpp
diff --git a/code/nel/tools/misc/crash_report/crash_report_socket.h b/nel/tools/misc/crash_report/crash_report_socket.h
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_socket.h
rename to nel/tools/misc/crash_report/crash_report_socket.h
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.cpp b/nel/tools/misc/crash_report/crash_report_widget.cpp
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_widget.cpp
rename to nel/tools/misc/crash_report/crash_report_widget.cpp
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.h b/nel/tools/misc/crash_report/crash_report_widget.h
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_widget.h
rename to nel/tools/misc/crash_report/crash_report_widget.h
diff --git a/code/nel/tools/misc/crash_report/crash_report_widget.ui b/nel/tools/misc/crash_report/crash_report_widget.ui
similarity index 100%
rename from code/nel/tools/misc/crash_report/crash_report_widget.ui
rename to nel/tools/misc/crash_report/crash_report_widget.ui
diff --git a/code/nel/tools/misc/crash_report/nevraxpill.ico b/nel/tools/misc/crash_report/nevraxpill.ico
similarity index 100%
rename from code/nel/tools/misc/crash_report/nevraxpill.ico
rename to nel/tools/misc/crash_report/nevraxpill.ico
diff --git a/code/nel/tools/misc/crash_report/resources.qrc b/nel/tools/misc/crash_report/resources.qrc
similarity index 100%
rename from code/nel/tools/misc/crash_report/resources.qrc
rename to nel/tools/misc/crash_report/resources.qrc
diff --git a/code/nel/tools/misc/data_mirror/CMakeLists.txt b/nel/tools/misc/data_mirror/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/data_mirror/CMakeLists.txt
rename to nel/tools/misc/data_mirror/CMakeLists.txt
diff --git a/code/nel/tools/misc/data_mirror/Resource.h b/nel/tools/misc/data_mirror/Resource.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/Resource.h
rename to nel/tools/misc/data_mirror/Resource.h
diff --git a/code/nel/tools/misc/data_mirror/StdAfx.cpp b/nel/tools/misc/data_mirror/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/misc/data_mirror/StdAfx.cpp
rename to nel/tools/misc/data_mirror/StdAfx.cpp
diff --git a/code/nel/tools/misc/data_mirror/StdAfx.h b/nel/tools/misc/data_mirror/StdAfx.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/StdAfx.h
rename to nel/tools/misc/data_mirror/StdAfx.h
diff --git a/code/nel/tools/misc/data_mirror/config.cfg b/nel/tools/misc/data_mirror/config.cfg
similarity index 100%
rename from code/nel/tools/misc/data_mirror/config.cfg
rename to nel/tools/misc/data_mirror/config.cfg
diff --git a/code/nel/tools/misc/data_mirror/data_mirror.cpp b/nel/tools/misc/data_mirror/data_mirror.cpp
similarity index 100%
rename from code/nel/tools/misc/data_mirror/data_mirror.cpp
rename to nel/tools/misc/data_mirror/data_mirror.cpp
diff --git a/code/nel/tools/misc/data_mirror/data_mirror.h b/nel/tools/misc/data_mirror/data_mirror.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/data_mirror.h
rename to nel/tools/misc/data_mirror/data_mirror.h
diff --git a/code/nel/tools/misc/data_mirror/data_mirror.rc b/nel/tools/misc/data_mirror/data_mirror.rc
similarity index 100%
rename from code/nel/tools/misc/data_mirror/data_mirror.rc
rename to nel/tools/misc/data_mirror/data_mirror.rc
diff --git a/code/nel/tools/misc/data_mirror/data_mirrorDlg.cpp b/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
similarity index 100%
rename from code/nel/tools/misc/data_mirror/data_mirrorDlg.cpp
rename to nel/tools/misc/data_mirror/data_mirrorDlg.cpp
diff --git a/code/nel/tools/misc/data_mirror/data_mirrorDlg.h b/nel/tools/misc/data_mirror/data_mirrorDlg.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/data_mirrorDlg.h
rename to nel/tools/misc/data_mirror/data_mirrorDlg.h
diff --git a/code/nel/tools/misc/data_mirror/my_list_ctrl.cpp b/nel/tools/misc/data_mirror/my_list_ctrl.cpp
similarity index 100%
rename from code/nel/tools/misc/data_mirror/my_list_ctrl.cpp
rename to nel/tools/misc/data_mirror/my_list_ctrl.cpp
diff --git a/code/nel/tools/misc/data_mirror/my_list_ctrl.h b/nel/tools/misc/data_mirror/my_list_ctrl.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/my_list_ctrl.h
rename to nel/tools/misc/data_mirror/my_list_ctrl.h
diff --git a/code/nel/tools/misc/data_mirror/progress_dialog.cpp b/nel/tools/misc/data_mirror/progress_dialog.cpp
similarity index 100%
rename from code/nel/tools/misc/data_mirror/progress_dialog.cpp
rename to nel/tools/misc/data_mirror/progress_dialog.cpp
diff --git a/code/nel/tools/misc/data_mirror/progress_dialog.h b/nel/tools/misc/data_mirror/progress_dialog.h
similarity index 100%
rename from code/nel/tools/misc/data_mirror/progress_dialog.h
rename to nel/tools/misc/data_mirror/progress_dialog.h
diff --git a/code/nel/tools/misc/data_mirror/res/data_mirror.ico b/nel/tools/misc/data_mirror/res/data_mirror.ico
similarity index 100%
rename from code/nel/tools/misc/data_mirror/res/data_mirror.ico
rename to nel/tools/misc/data_mirror/res/data_mirror.ico
diff --git a/code/nel/tools/misc/data_mirror/res/data_mirror.rc2 b/nel/tools/misc/data_mirror/res/data_mirror.rc2
similarity index 100%
rename from code/nel/tools/misc/data_mirror/res/data_mirror.rc2
rename to nel/tools/misc/data_mirror/res/data_mirror.rc2
diff --git a/code/nel/tools/misc/data_mirror/version.rc2 b/nel/tools/misc/data_mirror/version.rc2
similarity index 100%
rename from code/nel/tools/misc/data_mirror/version.rc2
rename to nel/tools/misc/data_mirror/version.rc2
diff --git a/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt b/nel/tools/misc/disp_sheet_id/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/disp_sheet_id/CMakeLists.txt
rename to nel/tools/misc/disp_sheet_id/CMakeLists.txt
diff --git a/code/nel/tools/misc/disp_sheet_id/main.cpp b/nel/tools/misc/disp_sheet_id/main.cpp
similarity index 100%
rename from code/nel/tools/misc/disp_sheet_id/main.cpp
rename to nel/tools/misc/disp_sheet_id/main.cpp
diff --git a/code/nel/tools/misc/exec_timeout/CMakeLists.txt b/nel/tools/misc/exec_timeout/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/exec_timeout/CMakeLists.txt
rename to nel/tools/misc/exec_timeout/CMakeLists.txt
diff --git a/code/nel/tools/misc/exec_timeout/exec_timeout.cpp b/nel/tools/misc/exec_timeout/exec_timeout.cpp
similarity index 100%
rename from code/nel/tools/misc/exec_timeout/exec_timeout.cpp
rename to nel/tools/misc/exec_timeout/exec_timeout.cpp
diff --git a/code/nel/tools/misc/exec_timeout/main.rc b/nel/tools/misc/exec_timeout/main.rc
similarity index 100%
rename from code/nel/tools/misc/exec_timeout/main.rc
rename to nel/tools/misc/exec_timeout/main.rc
diff --git a/code/nel/tools/misc/exec_timeout/yellow_pill.ico b/nel/tools/misc/exec_timeout/yellow_pill.ico
similarity index 100%
rename from code/nel/tools/misc/exec_timeout/yellow_pill.ico
rename to nel/tools/misc/exec_timeout/yellow_pill.ico
diff --git a/code/nel/tools/misc/extract_filename/CMakeLists.txt b/nel/tools/misc/extract_filename/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/extract_filename/CMakeLists.txt
rename to nel/tools/misc/extract_filename/CMakeLists.txt
diff --git a/code/nel/tools/misc/extract_filename/extract_filename.cpp b/nel/tools/misc/extract_filename/extract_filename.cpp
similarity index 100%
rename from code/nel/tools/misc/extract_filename/extract_filename.cpp
rename to nel/tools/misc/extract_filename/extract_filename.cpp
diff --git a/code/nel/tools/misc/lock/CMakeLists.txt b/nel/tools/misc/lock/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/lock/CMakeLists.txt
rename to nel/tools/misc/lock/CMakeLists.txt
diff --git a/code/nel/tools/misc/lock/lock.cpp b/nel/tools/misc/lock/lock.cpp
similarity index 100%
rename from code/nel/tools/misc/lock/lock.cpp
rename to nel/tools/misc/lock/lock.cpp
diff --git a/code/nel/tools/misc/log_analyser/CMakeLists.txt b/nel/tools/misc/log_analyser/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/log_analyser/CMakeLists.txt
rename to nel/tools/misc/log_analyser/CMakeLists.txt
diff --git a/code/nel/tools/misc/log_analyser/FilterDialog.cpp b/nel/tools/misc/log_analyser/FilterDialog.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/FilterDialog.cpp
rename to nel/tools/misc/log_analyser/FilterDialog.cpp
diff --git a/code/nel/tools/misc/log_analyser/FilterDialog.h b/nel/tools/misc/log_analyser/FilterDialog.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/FilterDialog.h
rename to nel/tools/misc/log_analyser/FilterDialog.h
diff --git a/code/nel/tools/misc/log_analyser/LogSessions.cpp b/nel/tools/misc/log_analyser/LogSessions.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/LogSessions.cpp
rename to nel/tools/misc/log_analyser/LogSessions.cpp
diff --git a/code/nel/tools/misc/log_analyser/LogSessions.h b/nel/tools/misc/log_analyser/LogSessions.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/LogSessions.h
rename to nel/tools/misc/log_analyser/LogSessions.h
diff --git a/code/nel/tools/misc/log_analyser/PlugInSelector.cpp b/nel/tools/misc/log_analyser/PlugInSelector.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/PlugInSelector.cpp
rename to nel/tools/misc/log_analyser/PlugInSelector.cpp
diff --git a/code/nel/tools/misc/log_analyser/PlugInSelector.h b/nel/tools/misc/log_analyser/PlugInSelector.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/PlugInSelector.h
rename to nel/tools/misc/log_analyser/PlugInSelector.h
diff --git a/code/nel/tools/misc/log_analyser/StdAfx.cpp b/nel/tools/misc/log_analyser/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/StdAfx.cpp
rename to nel/tools/misc/log_analyser/StdAfx.cpp
diff --git a/code/nel/tools/misc/log_analyser/StdAfx.h b/nel/tools/misc/log_analyser/StdAfx.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/StdAfx.h
rename to nel/tools/misc/log_analyser/StdAfx.h
diff --git a/code/nel/tools/misc/log_analyser/ViewDialog.cpp b/nel/tools/misc/log_analyser/ViewDialog.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/ViewDialog.cpp
rename to nel/tools/misc/log_analyser/ViewDialog.cpp
diff --git a/code/nel/tools/misc/log_analyser/ViewDialog.h b/nel/tools/misc/log_analyser/ViewDialog.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/ViewDialog.h
rename to nel/tools/misc/log_analyser/ViewDialog.h
diff --git a/code/nel/tools/misc/log_analyser/log_analyser.cpp b/nel/tools/misc/log_analyser/log_analyser.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/log_analyser.cpp
rename to nel/tools/misc/log_analyser/log_analyser.cpp
diff --git a/code/nel/tools/misc/log_analyser/log_analyser.h b/nel/tools/misc/log_analyser/log_analyser.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/log_analyser.h
rename to nel/tools/misc/log_analyser/log_analyser.h
diff --git a/code/nel/tools/misc/log_analyser/log_analyser.rc b/nel/tools/misc/log_analyser/log_analyser.rc
similarity index 100%
rename from code/nel/tools/misc/log_analyser/log_analyser.rc
rename to nel/tools/misc/log_analyser/log_analyser.rc
diff --git a/code/nel/tools/misc/log_analyser/log_analyserDlg.cpp b/nel/tools/misc/log_analyser/log_analyserDlg.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser/log_analyserDlg.cpp
rename to nel/tools/misc/log_analyser/log_analyserDlg.cpp
diff --git a/code/nel/tools/misc/log_analyser/log_analyserDlg.h b/nel/tools/misc/log_analyser/log_analyserDlg.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/log_analyserDlg.h
rename to nel/tools/misc/log_analyser/log_analyserDlg.h
diff --git a/code/nel/tools/misc/log_analyser/res/log_analyser.ico b/nel/tools/misc/log_analyser/res/log_analyser.ico
similarity index 100%
rename from code/nel/tools/misc/log_analyser/res/log_analyser.ico
rename to nel/tools/misc/log_analyser/res/log_analyser.ico
diff --git a/code/nel/tools/misc/log_analyser/res/log_analyser.rc2 b/nel/tools/misc/log_analyser/res/log_analyser.rc2
similarity index 100%
rename from code/nel/tools/misc/log_analyser/res/log_analyser.rc2
rename to nel/tools/misc/log_analyser/res/log_analyser.rc2
diff --git a/code/nel/tools/misc/log_analyser/resource.h b/nel/tools/misc/log_analyser/resource.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser/resource.h
rename to nel/tools/misc/log_analyser/resource.h
diff --git a/code/nel/tools/misc/log_analyser/version.rc2 b/nel/tools/misc/log_analyser/version.rc2
similarity index 100%
rename from code/nel/tools/misc/log_analyser/version.rc2
rename to nel/tools/misc/log_analyser/version.rc2
diff --git a/code/nel/tools/misc/log_analyser_plug_ins/CMakeLists.txt b/nel/tools/misc/log_analyser_plug_ins/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/log_analyser_plug_ins/CMakeLists.txt
rename to nel/tools/misc/log_analyser_plug_ins/CMakeLists.txt
diff --git a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/CMakeLists.txt b/nel/tools/misc/log_analyser_plug_ins/extract_warnings/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/CMakeLists.txt
rename to nel/tools/misc/log_analyser_plug_ins/extract_warnings/CMakeLists.txt
diff --git a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp b/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp
similarity index 100%
rename from code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp
rename to nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp
diff --git a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.def b/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.def
similarity index 100%
rename from code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.def
rename to nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.def
diff --git a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h b/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h
similarity index 100%
rename from code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h
rename to nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h
diff --git a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt b/nel/tools/misc/make_sheet_id/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/make_sheet_id/CMakeLists.txt
rename to nel/tools/misc/make_sheet_id/CMakeLists.txt
diff --git a/code/nel/tools/misc/make_sheet_id/blue_pill.ico b/nel/tools/misc/make_sheet_id/blue_pill.ico
similarity index 100%
rename from code/nel/tools/misc/make_sheet_id/blue_pill.ico
rename to nel/tools/misc/make_sheet_id/blue_pill.ico
diff --git a/code/nel/tools/misc/make_sheet_id/main.rc b/nel/tools/misc/make_sheet_id/main.rc
similarity index 100%
rename from code/nel/tools/misc/make_sheet_id/main.rc
rename to nel/tools/misc/make_sheet_id/main.rc
diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cfg b/nel/tools/misc/make_sheet_id/make_sheet_id.cfg
similarity index 100%
rename from code/nel/tools/misc/make_sheet_id/make_sheet_id.cfg
rename to nel/tools/misc/make_sheet_id/make_sheet_id.cfg
diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
similarity index 100%
rename from code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
rename to nel/tools/misc/make_sheet_id/make_sheet_id.cpp
diff --git a/code/nel/tools/misc/message_box/CMakeLists.txt b/nel/tools/misc/message_box/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/message_box/CMakeLists.txt
rename to nel/tools/misc/message_box/CMakeLists.txt
diff --git a/code/nel/tools/misc/message_box/main.rc b/nel/tools/misc/message_box/main.rc
similarity index 100%
rename from code/nel/tools/misc/message_box/main.rc
rename to nel/tools/misc/message_box/main.rc
diff --git a/code/nel/tools/misc/message_box/message_box.cpp b/nel/tools/misc/message_box/message_box.cpp
similarity index 100%
rename from code/nel/tools/misc/message_box/message_box.cpp
rename to nel/tools/misc/message_box/message_box.cpp
diff --git a/code/nel/tools/misc/message_box/message_box.h b/nel/tools/misc/message_box/message_box.h
similarity index 100%
rename from code/nel/tools/misc/message_box/message_box.h
rename to nel/tools/misc/message_box/message_box.h
diff --git a/code/nel/tools/misc/message_box/yellow_pill.ico b/nel/tools/misc/message_box/yellow_pill.ico
similarity index 100%
rename from code/nel/tools/misc/message_box/yellow_pill.ico
rename to nel/tools/misc/message_box/yellow_pill.ico
diff --git a/code/nel/tools/misc/message_box_qt/CMakeLists.txt b/nel/tools/misc/message_box_qt/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/message_box_qt/CMakeLists.txt
rename to nel/tools/misc/message_box_qt/CMakeLists.txt
diff --git a/code/nel/tools/misc/message_box_qt/main.cpp b/nel/tools/misc/message_box_qt/main.cpp
similarity index 100%
rename from code/nel/tools/misc/message_box_qt/main.cpp
rename to nel/tools/misc/message_box_qt/main.cpp
diff --git a/code/nel/tools/misc/message_box_qt/main.rc b/nel/tools/misc/message_box_qt/main.rc
similarity index 100%
rename from code/nel/tools/misc/message_box_qt/main.rc
rename to nel/tools/misc/message_box_qt/main.rc
diff --git a/code/nel/tools/misc/message_box_qt/yellow_pill.ico b/nel/tools/misc/message_box_qt/yellow_pill.ico
similarity index 100%
rename from code/nel/tools/misc/message_box_qt/yellow_pill.ico
rename to nel/tools/misc/message_box_qt/yellow_pill.ico
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt b/nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt
rename to nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp b/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp
rename to nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc b/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc
rename to nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/resource.h b/nel/tools/misc/multi_cd_setup_fix/resource.h
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/resource.h
rename to nel/tools/misc/multi_cd_setup_fix/resource.h
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/setup.ico b/nel/tools/misc/multi_cd_setup_fix/setup.ico
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/setup.ico
rename to nel/tools/misc/multi_cd_setup_fix/setup.ico
diff --git a/code/nel/tools/misc/multi_cd_setup_fix/version.rc2 b/nel/tools/misc/multi_cd_setup_fix/version.rc2
similarity index 100%
rename from code/nel/tools/misc/multi_cd_setup_fix/version.rc2
rename to nel/tools/misc/multi_cd_setup_fix/version.rc2
diff --git a/code/nel/tools/misc/probe_timers/CMakeLists.txt b/nel/tools/misc/probe_timers/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/probe_timers/CMakeLists.txt
rename to nel/tools/misc/probe_timers/CMakeLists.txt
diff --git a/code/nel/tools/misc/probe_timers/gold_pill.ico b/nel/tools/misc/probe_timers/gold_pill.ico
similarity index 100%
rename from code/nel/tools/misc/probe_timers/gold_pill.ico
rename to nel/tools/misc/probe_timers/gold_pill.ico
diff --git a/code/nel/tools/misc/probe_timers/main.cpp b/nel/tools/misc/probe_timers/main.cpp
similarity index 100%
rename from code/nel/tools/misc/probe_timers/main.cpp
rename to nel/tools/misc/probe_timers/main.cpp
diff --git a/code/nel/tools/misc/probe_timers/main.rc b/nel/tools/misc/probe_timers/main.rc
similarity index 100%
rename from code/nel/tools/misc/probe_timers/main.rc
rename to nel/tools/misc/probe_timers/main.rc
diff --git a/code/nel/tools/misc/snp_make/CMakeLists.txt b/nel/tools/misc/snp_make/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/snp_make/CMakeLists.txt
rename to nel/tools/misc/snp_make/CMakeLists.txt
diff --git a/code/nel/tools/misc/snp_make/main.cpp b/nel/tools/misc/snp_make/main.cpp
similarity index 100%
rename from code/nel/tools/misc/snp_make/main.cpp
rename to nel/tools/misc/snp_make/main.cpp
diff --git a/code/nel/tools/misc/words_dic/CMakeLists.txt b/nel/tools/misc/words_dic/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/words_dic/CMakeLists.txt
rename to nel/tools/misc/words_dic/CMakeLists.txt
diff --git a/code/nel/tools/misc/words_dic/DicSplashScreen.cpp b/nel/tools/misc/words_dic/DicSplashScreen.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic/DicSplashScreen.cpp
rename to nel/tools/misc/words_dic/DicSplashScreen.cpp
diff --git a/code/nel/tools/misc/words_dic/DicSplashScreen.h b/nel/tools/misc/words_dic/DicSplashScreen.h
similarity index 100%
rename from code/nel/tools/misc/words_dic/DicSplashScreen.h
rename to nel/tools/misc/words_dic/DicSplashScreen.h
diff --git a/code/nel/tools/misc/words_dic/StdAfx.cpp b/nel/tools/misc/words_dic/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic/StdAfx.cpp
rename to nel/tools/misc/words_dic/StdAfx.cpp
diff --git a/code/nel/tools/misc/words_dic/StdAfx.h b/nel/tools/misc/words_dic/StdAfx.h
similarity index 100%
rename from code/nel/tools/misc/words_dic/StdAfx.h
rename to nel/tools/misc/words_dic/StdAfx.h
diff --git a/code/nel/tools/misc/words_dic/res/words_dic.ico b/nel/tools/misc/words_dic/res/words_dic.ico
similarity index 100%
rename from code/nel/tools/misc/words_dic/res/words_dic.ico
rename to nel/tools/misc/words_dic/res/words_dic.ico
diff --git a/code/nel/tools/misc/words_dic/res/words_dic.rc2 b/nel/tools/misc/words_dic/res/words_dic.rc2
similarity index 100%
rename from code/nel/tools/misc/words_dic/res/words_dic.rc2
rename to nel/tools/misc/words_dic/res/words_dic.rc2
diff --git a/code/nel/tools/misc/words_dic/resource.h b/nel/tools/misc/words_dic/resource.h
similarity index 100%
rename from code/nel/tools/misc/words_dic/resource.h
rename to nel/tools/misc/words_dic/resource.h
diff --git a/code/nel/tools/misc/words_dic/version.rc2 b/nel/tools/misc/words_dic/version.rc2
similarity index 100%
rename from code/nel/tools/misc/words_dic/version.rc2
rename to nel/tools/misc/words_dic/version.rc2
diff --git a/code/nel/tools/misc/words_dic/words_dic.cfg b/nel/tools/misc/words_dic/words_dic.cfg
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dic.cfg
rename to nel/tools/misc/words_dic/words_dic.cfg
diff --git a/code/nel/tools/misc/words_dic/words_dic.cpp b/nel/tools/misc/words_dic/words_dic.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dic.cpp
rename to nel/tools/misc/words_dic/words_dic.cpp
diff --git a/code/nel/tools/misc/words_dic/words_dic.h b/nel/tools/misc/words_dic/words_dic.h
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dic.h
rename to nel/tools/misc/words_dic/words_dic.h
diff --git a/code/nel/tools/misc/words_dic/words_dic.rc b/nel/tools/misc/words_dic/words_dic.rc
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dic.rc
rename to nel/tools/misc/words_dic/words_dic.rc
diff --git a/code/nel/tools/misc/words_dic/words_dicDlg.cpp b/nel/tools/misc/words_dic/words_dicDlg.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dicDlg.cpp
rename to nel/tools/misc/words_dic/words_dicDlg.cpp
diff --git a/code/nel/tools/misc/words_dic/words_dicDlg.h b/nel/tools/misc/words_dic/words_dicDlg.h
similarity index 100%
rename from code/nel/tools/misc/words_dic/words_dicDlg.h
rename to nel/tools/misc/words_dic/words_dicDlg.h
diff --git a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt b/nel/tools/misc/words_dic_qt/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/CMakeLists.txt
rename to nel/tools/misc/words_dic_qt/CMakeLists.txt
diff --git a/code/nel/tools/misc/words_dic_qt/main.cpp b/nel/tools/misc/words_dic_qt/main.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/main.cpp
rename to nel/tools/misc/words_dic_qt/main.cpp
diff --git a/code/nel/tools/misc/words_dic_qt/nel.png b/nel/tools/misc/words_dic_qt/nel.png
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/nel.png
rename to nel/tools/misc/words_dic_qt/nel.png
diff --git a/code/nel/tools/misc/words_dic_qt/resource.h b/nel/tools/misc/words_dic_qt/resource.h
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/resource.h
rename to nel/tools/misc/words_dic_qt/resource.h
diff --git a/code/nel/tools/misc/words_dic_qt/words_dic.cfg b/nel/tools/misc/words_dic_qt/words_dic.cfg
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dic.cfg
rename to nel/tools/misc/words_dic_qt/words_dic.cfg
diff --git a/code/nel/tools/misc/words_dic_qt/words_dic.ico b/nel/tools/misc/words_dic_qt/words_dic.ico
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dic.ico
rename to nel/tools/misc/words_dic_qt/words_dic.ico
diff --git a/code/nel/tools/misc/words_dic_qt/words_dic.rc b/nel/tools/misc/words_dic_qt/words_dic.rc
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dic.rc
rename to nel/tools/misc/words_dic_qt/words_dic.rc
diff --git a/code/nel/tools/misc/words_dic_qt/words_dicDlg.cpp b/nel/tools/misc/words_dic_qt/words_dicDlg.cpp
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dicDlg.cpp
rename to nel/tools/misc/words_dic_qt/words_dicDlg.cpp
diff --git a/code/nel/tools/misc/words_dic_qt/words_dicDlg.h b/nel/tools/misc/words_dic_qt/words_dicDlg.h
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dicDlg.h
rename to nel/tools/misc/words_dic_qt/words_dicDlg.h
diff --git a/code/nel/tools/misc/words_dic_qt/words_dic_Qt.qrc b/nel/tools/misc/words_dic_qt/words_dic_Qt.qrc
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dic_Qt.qrc
rename to nel/tools/misc/words_dic_qt/words_dic_Qt.qrc
diff --git a/code/nel/tools/misc/words_dic_qt/words_dic_Qt.ui b/nel/tools/misc/words_dic_qt/words_dic_Qt.ui
similarity index 100%
rename from code/nel/tools/misc/words_dic_qt/words_dic_Qt.ui
rename to nel/tools/misc/words_dic_qt/words_dic_Qt.ui
diff --git a/code/nel/tools/misc/xml_packer/CMakeLists.txt b/nel/tools/misc/xml_packer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/misc/xml_packer/CMakeLists.txt
rename to nel/tools/misc/xml_packer/CMakeLists.txt
diff --git a/code/nel/tools/misc/xml_packer/xml_packer.cpp b/nel/tools/misc/xml_packer/xml_packer.cpp
similarity index 100%
rename from code/nel/tools/misc/xml_packer/xml_packer.cpp
rename to nel/tools/misc/xml_packer/xml_packer.cpp
diff --git a/code/nel/tools/nel_unit_test/CMakeLists.txt b/nel/tools/nel_unit_test/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/nel_unit_test/CMakeLists.txt
rename to nel/tools/nel_unit_test/CMakeLists.txt
diff --git a/code/nel/tools/nel_unit_test/nel_unit_test.cpp b/nel/tools/nel_unit_test/nel_unit_test.cpp
similarity index 100%
rename from code/nel/tools/nel_unit_test/nel_unit_test.cpp
rename to nel/tools/nel_unit_test/nel_unit_test.cpp
diff --git a/code/nel/tools/nel_unit_test/run_test.bat b/nel/tools/nel_unit_test/run_test.bat
similarity index 100%
rename from code/nel/tools/nel_unit_test/run_test.bat
rename to nel/tools/nel_unit_test/run_test.bat
diff --git a/code/nel/tools/nel_unit_test/ut_ligo.h b/nel/tools/nel_unit_test/ut_ligo.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_ligo.h
rename to nel/tools/nel_unit_test/ut_ligo.h
diff --git a/code/nel/tools/nel_unit_test/ut_ligo_primitive.h b/nel/tools/nel_unit_test/ut_ligo_primitive.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_ligo_primitive.h
rename to nel/tools/nel_unit_test/ut_ligo_primitive.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc.h b/nel/tools/nel_unit_test/ut_misc.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc.h
rename to nel/tools/nel_unit_test/ut_misc.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_base64.h b/nel/tools/nel_unit_test/ut_misc_base64.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_base64.h
rename to nel/tools/nel_unit_test/ut_misc_base64.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_co_task.h b/nel/tools/nel_unit_test/ut_misc_co_task.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_co_task.h
rename to nel/tools/nel_unit_test/ut_misc_co_task.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_command.h b/nel/tools/nel_unit_test/ut_misc_command.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_command.h
rename to nel/tools/nel_unit_test/ut_misc_command.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_common.h b/nel/tools/nel_unit_test/ut_misc_common.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_common.h
rename to nel/tools/nel_unit_test/ut_misc_common.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_config_file.h b/nel/tools/nel_unit_test/ut_misc_config_file.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_config_file.h
rename to nel/tools/nel_unit_test/ut_misc_config_file.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_debug.h b/nel/tools/nel_unit_test/ut_misc_debug.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_debug.h
rename to nel/tools/nel_unit_test/ut_misc_debug.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_dynlibload.h b/nel/tools/nel_unit_test/ut_misc_dynlibload.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_dynlibload.h
rename to nel/tools/nel_unit_test/ut_misc_dynlibload.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_file.h b/nel/tools/nel_unit_test/ut_misc_file.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_file.h
rename to nel/tools/nel_unit_test/ut_misc_file.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_bad_test.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_bad_test.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_bad_test.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_bad_test.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_define.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_define.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_define.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_define.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_error.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error_main.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error_main.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_error_main.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_error_main.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_include.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include_and_optional.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include_and_optional.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_include_and_optional.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_include_and_optional.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_optional.cfg b/nel/tools/nel_unit_test/ut_misc_files/cfg_with_optional.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/cfg_with_optional.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/cfg_with_optional.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/file1_in_bnp.txt b/nel/tools/nel_unit_test/ut_misc_files/file1_in_bnp.txt
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/file1_in_bnp.txt
rename to nel/tools/nel_unit_test/ut_misc_files/file1_in_bnp.txt
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/file2_in_bnp.txt b/nel/tools/nel_unit_test/ut_misc_files/file2_in_bnp.txt
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/file2_in_bnp.txt
rename to nel/tools/nel_unit_test/ut_misc_files/file2_in_bnp.txt
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files.bnp b/nel/tools/nel_unit_test/ut_misc_files/files.bnp
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files.bnp
rename to nel/tools/nel_unit_test/ut_misc_files/files.bnp
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/files.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/files.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/.xml_pack_index b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/.xml_pack_index
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/.xml_pack_index
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/.xml_pack_index
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file1_in_sub_1.xml b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file1_in_sub_1.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file1_in_sub_1.xml
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file1_in_sub_1.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file2_in_sub_1.xml b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file2_in_sub_1.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file2_in_sub_1.xml
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/file2_in_sub_1.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/samename.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/samename.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/samename.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_1/samename/samename.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/.xml_pack_index b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/.xml_pack_index
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/.xml_pack_index
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/.xml_pack_index
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file1_in_sub_2.xml b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file1_in_sub_2.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file1_in_sub_2.xml
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file1_in_sub_2.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file2_in_sub_2.xml b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file2_in_sub_2.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file2_in_sub_2.xml
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/file2_in_sub_2.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/samename.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/samename.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/samename.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/files_for_xml_subpack/same_subfolder_2/samename/samename.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/included_cfg.cfg b/nel/tools/nel_unit_test/ut_misc_files/included_cfg.cfg
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/included_cfg.cfg
rename to nel/tools/nel_unit_test/ut_misc_files/included_cfg.cfg
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/xml_files/file1_in_xml_pack.xml b/nel/tools/nel_unit_test/ut_misc_files/xml_files/file1_in_xml_pack.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/xml_files/file1_in_xml_pack.xml
rename to nel/tools/nel_unit_test/ut_misc_files/xml_files/file1_in_xml_pack.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/xml_files/file2_in_xml_pack.xml b/nel/tools/nel_unit_test/ut_misc_files/xml_files/file2_in_xml_pack.xml
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/xml_files/file2_in_xml_pack.xml
rename to nel/tools/nel_unit_test/ut_misc_files/xml_files/file2_in_xml_pack.xml
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_1/samename/samename.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_1/samename/samename.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_1/samename/samename.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_1/samename/samename.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_2/samename/samename.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_2/samename/samename.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_2/samename/samename.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/xml_files/same_subfolder_2/samename/samename.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_files/xml_files/xml_files.xml_pack b/nel/tools/nel_unit_test/ut_misc_files/xml_files/xml_files.xml_pack
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_files/xml_files/xml_files.xml_pack
rename to nel/tools/nel_unit_test/ut_misc_files/xml_files/xml_files.xml_pack
diff --git a/code/nel/tools/nel_unit_test/ut_misc_pack_file.h b/nel/tools/nel_unit_test/ut_misc_pack_file.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_pack_file.h
rename to nel/tools/nel_unit_test/ut_misc_pack_file.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_singleton.h b/nel/tools/nel_unit_test/ut_misc_singleton.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_singleton.h
rename to nel/tools/nel_unit_test/ut_misc_singleton.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_sstring.h b/nel/tools/nel_unit_test/ut_misc_sstring.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_sstring.h
rename to nel/tools/nel_unit_test/ut_misc_sstring.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_stream.h b/nel/tools/nel_unit_test/ut_misc_stream.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_stream.h
rename to nel/tools/nel_unit_test/ut_misc_stream.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_string_common.h b/nel/tools/nel_unit_test/ut_misc_string_common.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_string_common.h
rename to nel/tools/nel_unit_test/ut_misc_string_common.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_types.h b/nel/tools/nel_unit_test/ut_misc_types.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_types.h
rename to nel/tools/nel_unit_test/ut_misc_types.h
diff --git a/code/nel/tools/nel_unit_test/ut_misc_variable.h b/nel/tools/nel_unit_test/ut_misc_variable.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_misc_variable.h
rename to nel/tools/nel_unit_test/ut_misc_variable.h
diff --git a/code/nel/tools/nel_unit_test/ut_net.h b/nel/tools/nel_unit_test/ut_net.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_net.h
rename to nel/tools/nel_unit_test/ut_net.h
diff --git a/code/nel/tools/nel_unit_test/ut_net_layer3.h b/nel/tools/nel_unit_test/ut_net_layer3.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_net_layer3.h
rename to nel/tools/nel_unit_test/ut_net_layer3.h
diff --git a/code/nel/tools/nel_unit_test/ut_net_message.h b/nel/tools/nel_unit_test/ut_net_message.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_net_message.h
rename to nel/tools/nel_unit_test/ut_net_message.h
diff --git a/code/nel/tools/nel_unit_test/ut_net_module.h b/nel/tools/nel_unit_test/ut_net_module.h
similarity index 100%
rename from code/nel/tools/nel_unit_test/ut_net_module.h
rename to nel/tools/nel_unit_test/ut_net_module.h
diff --git a/code/nel/tools/pacs/CMakeLists.txt b/nel/tools/pacs/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/pacs/CMakeLists.txt
rename to nel/tools/pacs/CMakeLists.txt
diff --git a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt b/nel/tools/pacs/build_ig_boxes/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt
rename to nel/tools/pacs/build_ig_boxes/CMakeLists.txt
diff --git a/code/nel/tools/pacs/build_ig_boxes/blue_pill.ico b/nel/tools/pacs/build_ig_boxes/blue_pill.ico
similarity index 100%
rename from code/nel/tools/pacs/build_ig_boxes/blue_pill.ico
rename to nel/tools/pacs/build_ig_boxes/blue_pill.ico
diff --git a/code/nel/tools/pacs/build_ig_boxes/build_ig_boxes.cfg b/nel/tools/pacs/build_ig_boxes/build_ig_boxes.cfg
similarity index 100%
rename from code/nel/tools/pacs/build_ig_boxes/build_ig_boxes.cfg
rename to nel/tools/pacs/build_ig_boxes/build_ig_boxes.cfg
diff --git a/code/nel/tools/pacs/build_ig_boxes/main.cpp b/nel/tools/pacs/build_ig_boxes/main.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_ig_boxes/main.cpp
rename to nel/tools/pacs/build_ig_boxes/main.cpp
diff --git a/code/nel/tools/pacs/build_ig_boxes/main.rc b/nel/tools/pacs/build_ig_boxes/main.rc
similarity index 100%
rename from code/nel/tools/pacs/build_ig_boxes/main.rc
rename to nel/tools/pacs/build_ig_boxes/main.rc
diff --git a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt b/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
rename to nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
diff --git a/code/nel/tools/pacs/build_indoor_rbank/blue_pill.ico b/nel/tools/pacs/build_indoor_rbank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/blue_pill.ico
rename to nel/tools/pacs/build_indoor_rbank/blue_pill.ico
diff --git a/code/nel/tools/pacs/build_indoor_rbank/build_indoor_rbank.cfg b/nel/tools/pacs/build_indoor_rbank/build_indoor_rbank.cfg
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/build_indoor_rbank.cfg
rename to nel/tools/pacs/build_indoor_rbank/build_indoor_rbank.cfg
diff --git a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp b/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp
rename to nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp
diff --git a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h b/nel/tools/pacs/build_indoor_rbank/build_surfaces.h
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h
rename to nel/tools/pacs/build_indoor_rbank/build_surfaces.h
diff --git a/code/nel/tools/pacs/build_indoor_rbank/main.cpp b/nel/tools/pacs/build_indoor_rbank/main.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/main.cpp
rename to nel/tools/pacs/build_indoor_rbank/main.cpp
diff --git a/code/nel/tools/pacs/build_indoor_rbank/main.rc b/nel/tools/pacs/build_indoor_rbank/main.rc
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/main.rc
rename to nel/tools/pacs/build_indoor_rbank/main.rc
diff --git a/code/nel/tools/pacs/build_indoor_rbank/mouline.cpp b/nel/tools/pacs/build_indoor_rbank/mouline.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/mouline.cpp
rename to nel/tools/pacs/build_indoor_rbank/mouline.cpp
diff --git a/code/nel/tools/pacs/build_indoor_rbank/mouline.h b/nel/tools/pacs/build_indoor_rbank/mouline.h
similarity index 100%
rename from code/nel/tools/pacs/build_indoor_rbank/mouline.h
rename to nel/tools/pacs/build_indoor_rbank/mouline.h
diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/nel/tools/pacs/build_rbank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/CMakeLists.txt
rename to nel/tools/pacs/build_rbank/CMakeLists.txt
diff --git a/code/nel/tools/pacs/build_rbank/blue_pill.ico b/nel/tools/pacs/build_rbank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/blue_pill.ico
rename to nel/tools/pacs/build_rbank/blue_pill.ico
diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.cfg b/nel/tools/pacs/build_rbank/build_rbank.cfg
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/build_rbank.cfg
rename to nel/tools/pacs/build_rbank/build_rbank.cfg
diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.cpp b/nel/tools/pacs/build_rbank/build_rbank.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/build_rbank.cpp
rename to nel/tools/pacs/build_rbank/build_rbank.cpp
diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.h b/nel/tools/pacs/build_rbank/build_rbank.h
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/build_rbank.h
rename to nel/tools/pacs/build_rbank/build_rbank.h
diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/nel/tools/pacs/build_rbank/build_surf.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/build_surf.cpp
rename to nel/tools/pacs/build_rbank/build_surf.cpp
diff --git a/code/nel/tools/pacs/build_rbank/build_surf.h b/nel/tools/pacs/build_rbank/build_surf.h
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/build_surf.h
rename to nel/tools/pacs/build_rbank/build_surf.h
diff --git a/code/nel/tools/pacs/build_rbank/main.cpp b/nel/tools/pacs/build_rbank/main.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/main.cpp
rename to nel/tools/pacs/build_rbank/main.cpp
diff --git a/code/nel/tools/pacs/build_rbank/main.rc b/nel/tools/pacs/build_rbank/main.rc
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/main.rc
rename to nel/tools/pacs/build_rbank/main.rc
diff --git a/code/nel/tools/pacs/build_rbank/prim_checker.cpp b/nel/tools/pacs/build_rbank/prim_checker.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/prim_checker.cpp
rename to nel/tools/pacs/build_rbank/prim_checker.cpp
diff --git a/code/nel/tools/pacs/build_rbank/prim_checker.h b/nel/tools/pacs/build_rbank/prim_checker.h
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/prim_checker.h
rename to nel/tools/pacs/build_rbank/prim_checker.h
diff --git a/code/nel/tools/pacs/build_rbank/surface_splitter.cpp b/nel/tools/pacs/build_rbank/surface_splitter.cpp
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/surface_splitter.cpp
rename to nel/tools/pacs/build_rbank/surface_splitter.cpp
diff --git a/code/nel/tools/pacs/build_rbank/surface_splitter.h b/nel/tools/pacs/build_rbank/surface_splitter.h
similarity index 100%
rename from code/nel/tools/pacs/build_rbank/surface_splitter.h
rename to nel/tools/pacs/build_rbank/surface_splitter.h
diff --git a/code/nel/tools/sound/CMakeLists.txt b/nel/tools/sound/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/sound/CMakeLists.txt
rename to nel/tools/sound/CMakeLists.txt
diff --git a/code/nel/tools/sound/build_samplebank/CMakeLists.txt b/nel/tools/sound/build_samplebank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/CMakeLists.txt
rename to nel/tools/sound/build_samplebank/CMakeLists.txt
diff --git a/code/nel/tools/sound/build_samplebank/blue_pill.ico b/nel/tools/sound/build_samplebank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/blue_pill.ico
rename to nel/tools/sound/build_samplebank/blue_pill.ico
diff --git a/code/nel/tools/sound/build_samplebank/build_samplebank.cpp b/nel/tools/sound/build_samplebank/build_samplebank.cpp
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/build_samplebank.cpp
rename to nel/tools/sound/build_samplebank/build_samplebank.cpp
diff --git a/code/nel/tools/sound/build_samplebank/build_samplebank_readme.txt b/nel/tools/sound/build_samplebank/build_samplebank_readme.txt
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/build_samplebank_readme.txt
rename to nel/tools/sound/build_samplebank/build_samplebank_readme.txt
diff --git a/code/nel/tools/sound/build_samplebank/build_samplebank_script.bat b/nel/tools/sound/build_samplebank/build_samplebank_script.bat
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/build_samplebank_script.bat
rename to nel/tools/sound/build_samplebank/build_samplebank_script.bat
diff --git a/code/nel/tools/sound/build_samplebank/main.rc b/nel/tools/sound/build_samplebank/main.rc
similarity index 100%
rename from code/nel/tools/sound/build_samplebank/main.rc
rename to nel/tools/sound/build_samplebank/main.rc
diff --git a/code/nel/tools/sound/build_sound/CMakeLists.txt b/nel/tools/sound/build_sound/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/sound/build_sound/CMakeLists.txt
rename to nel/tools/sound/build_sound/CMakeLists.txt
diff --git a/code/nel/tools/sound/build_sound/blue_pill.ico b/nel/tools/sound/build_sound/blue_pill.ico
similarity index 100%
rename from code/nel/tools/sound/build_sound/blue_pill.ico
rename to nel/tools/sound/build_sound/blue_pill.ico
diff --git a/code/nel/tools/sound/build_sound/build_sound.cpp b/nel/tools/sound/build_sound/build_sound.cpp
similarity index 100%
rename from code/nel/tools/sound/build_sound/build_sound.cpp
rename to nel/tools/sound/build_sound/build_sound.cpp
diff --git a/code/nel/tools/sound/build_sound/build_sound_readme.txt b/nel/tools/sound/build_sound/build_sound_readme.txt
similarity index 100%
rename from code/nel/tools/sound/build_sound/build_sound_readme.txt
rename to nel/tools/sound/build_sound/build_sound_readme.txt
diff --git a/code/nel/tools/sound/build_sound/build_sound_script.bat b/nel/tools/sound/build_sound/build_sound_script.bat
similarity index 100%
rename from code/nel/tools/sound/build_sound/build_sound_script.bat
rename to nel/tools/sound/build_sound/build_sound_script.bat
diff --git a/code/nel/tools/sound/build_sound/main.rc b/nel/tools/sound/build_sound/main.rc
similarity index 100%
rename from code/nel/tools/sound/build_sound/main.rc
rename to nel/tools/sound/build_sound/main.rc
diff --git a/code/nel/tools/sound/build_soundbank/CMakeLists.txt b/nel/tools/sound/build_soundbank/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/CMakeLists.txt
rename to nel/tools/sound/build_soundbank/CMakeLists.txt
diff --git a/code/nel/tools/sound/build_soundbank/blue_pill.ico b/nel/tools/sound/build_soundbank/blue_pill.ico
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/blue_pill.ico
rename to nel/tools/sound/build_soundbank/blue_pill.ico
diff --git a/code/nel/tools/sound/build_soundbank/build_soundbank.cpp b/nel/tools/sound/build_soundbank/build_soundbank.cpp
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/build_soundbank.cpp
rename to nel/tools/sound/build_soundbank/build_soundbank.cpp
diff --git a/code/nel/tools/sound/build_soundbank/build_soundbank_readme.txt b/nel/tools/sound/build_soundbank/build_soundbank_readme.txt
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/build_soundbank_readme.txt
rename to nel/tools/sound/build_soundbank/build_soundbank_readme.txt
diff --git a/code/nel/tools/sound/build_soundbank/build_soundbank_script.bat b/nel/tools/sound/build_soundbank/build_soundbank_script.bat
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/build_soundbank_script.bat
rename to nel/tools/sound/build_soundbank/build_soundbank_script.bat
diff --git a/code/nel/tools/sound/build_soundbank/main.rc b/nel/tools/sound/build_soundbank/main.rc
similarity index 100%
rename from code/nel/tools/sound/build_soundbank/main.rc
rename to nel/tools/sound/build_soundbank/main.rc
diff --git a/code/nel/tools/sound/source_sounds_builder/SoundPage.cpp b/nel/tools/sound/source_sounds_builder/SoundPage.cpp
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/SoundPage.cpp
rename to nel/tools/sound/source_sounds_builder/SoundPage.cpp
diff --git a/code/nel/tools/sound/source_sounds_builder/SoundPage.h b/nel/tools/sound/source_sounds_builder/SoundPage.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/SoundPage.h
rename to nel/tools/sound/source_sounds_builder/SoundPage.h
diff --git a/code/nel/tools/sound/source_sounds_builder/StdAfx.cpp b/nel/tools/sound/source_sounds_builder/StdAfx.cpp
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/StdAfx.cpp
rename to nel/tools/sound/source_sounds_builder/StdAfx.cpp
diff --git a/code/nel/tools/sound/source_sounds_builder/StdAfx.h b/nel/tools/sound/source_sounds_builder/StdAfx.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/StdAfx.h
rename to nel/tools/sound/source_sounds_builder/StdAfx.h
diff --git a/code/nel/tools/sound/source_sounds_builder/file_dialog.cpp b/nel/tools/sound/source_sounds_builder/file_dialog.cpp
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/file_dialog.cpp
rename to nel/tools/sound/source_sounds_builder/file_dialog.cpp
diff --git a/code/nel/tools/sound/source_sounds_builder/file_dialog.h b/nel/tools/sound/source_sounds_builder/file_dialog.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/file_dialog.h
rename to nel/tools/sound/source_sounds_builder/file_dialog.h
diff --git a/code/nel/tools/sound/source_sounds_builder/resource.h b/nel/tools/sound/source_sounds_builder/resource.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/resource.h
rename to nel/tools/sound/source_sounds_builder/resource.h
diff --git a/code/nel/tools/sound/source_sounds_builder/source_sounds_builder.cpp b/nel/tools/sound/source_sounds_builder/source_sounds_builder.cpp
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/source_sounds_builder.cpp
rename to nel/tools/sound/source_sounds_builder/source_sounds_builder.cpp
diff --git a/code/nel/tools/sound/source_sounds_builder/source_sounds_builder.h b/nel/tools/sound/source_sounds_builder/source_sounds_builder.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/source_sounds_builder.h
rename to nel/tools/sound/source_sounds_builder/source_sounds_builder.h
diff --git a/code/nel/tools/sound/source_sounds_builder/source_sounds_builder.rc b/nel/tools/sound/source_sounds_builder/source_sounds_builder.rc
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/source_sounds_builder.rc
rename to nel/tools/sound/source_sounds_builder/source_sounds_builder.rc
diff --git a/code/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.cpp b/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.cpp
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.cpp
rename to nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.cpp
diff --git a/code/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.h b/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.h
similarity index 100%
rename from code/nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.h
rename to nel/tools/sound/source_sounds_builder/source_sounds_builderDlg.h
diff --git a/code/nelDashBuild.cmd b/nelDashBuild.cmd
similarity index 100%
rename from code/nelDashBuild.cmd
rename to nelDashBuild.cmd
diff --git a/code/nelDashBuild.sh b/nelDashBuild.sh
similarity index 100%
rename from code/nelDashBuild.sh
rename to nelDashBuild.sh
diff --git a/code/nelns/AUTHORS b/nelns/AUTHORS
similarity index 100%
rename from code/nelns/AUTHORS
rename to nelns/AUTHORS
diff --git a/code/nelns/CMakeLists.txt b/nelns/CMakeLists.txt
similarity index 100%
rename from code/nelns/CMakeLists.txt
rename to nelns/CMakeLists.txt
diff --git a/code/nelns/CMakePackaging.txt b/nelns/CMakePackaging.txt
similarity index 100%
rename from code/nelns/CMakePackaging.txt
rename to nelns/CMakePackaging.txt
diff --git a/code/nelns/COPYING b/nelns/COPYING
similarity index 100%
rename from code/nelns/COPYING
rename to nelns/COPYING
diff --git a/code/nelns/ChangeLog b/nelns/ChangeLog
similarity index 100%
rename from code/nelns/ChangeLog
rename to nelns/ChangeLog
diff --git a/code/nelns/INSTALL b/nelns/INSTALL
similarity index 100%
rename from code/nelns/INSTALL
rename to nelns/INSTALL
diff --git a/code/nelns/NEWS b/nelns/NEWS
similarity index 100%
rename from code/nelns/NEWS
rename to nelns/NEWS
diff --git a/code/nelns/README b/nelns/README
similarity index 100%
rename from code/nelns/README
rename to nelns/README
diff --git a/code/nelns/admin/config.php b/nelns/admin/config.php
similarity index 100%
rename from code/nelns/admin/config.php
rename to nelns/admin/config.php
diff --git a/code/nelns/admin/public_html/admin.php b/nelns/admin/public_html/admin.php
similarity index 100%
rename from code/nelns/admin/public_html/admin.php
rename to nelns/admin/public_html/admin.php
diff --git a/code/nelns/admin/public_html/authenticate.php b/nelns/admin/public_html/authenticate.php
similarity index 100%
rename from code/nelns/admin/public_html/authenticate.php
rename to nelns/admin/public_html/authenticate.php
diff --git a/code/nelns/admin/public_html/backup_interface.php b/nelns/admin/public_html/backup_interface.php
similarity index 100%
rename from code/nelns/admin/public_html/backup_interface.php
rename to nelns/admin/public_html/backup_interface.php
diff --git a/code/nelns/admin/public_html/commands.php b/nelns/admin/public_html/commands.php
similarity index 100%
rename from code/nelns/admin/public_html/commands.php
rename to nelns/admin/public_html/commands.php
diff --git a/code/nelns/admin/public_html/custom_view.php b/nelns/admin/public_html/custom_view.php
similarity index 100%
rename from code/nelns/admin/public_html/custom_view.php
rename to nelns/admin/public_html/custom_view.php
diff --git a/code/nelns/admin/public_html/disp_vars.php b/nelns/admin/public_html/disp_vars.php
similarity index 100%
rename from code/nelns/admin/public_html/disp_vars.php
rename to nelns/admin/public_html/disp_vars.php
diff --git a/code/nelns/admin/public_html/display_view.php b/nelns/admin/public_html/display_view.php
similarity index 100%
rename from code/nelns/admin/public_html/display_view.php
rename to nelns/admin/public_html/display_view.php
diff --git a/code/nelns/admin/public_html/foo.php b/nelns/admin/public_html/foo.php
similarity index 100%
rename from code/nelns/admin/public_html/foo.php
rename to nelns/admin/public_html/foo.php
diff --git a/code/nelns/admin/public_html/help.php b/nelns/admin/public_html/help.php
similarity index 100%
rename from code/nelns/admin/public_html/help.php
rename to nelns/admin/public_html/help.php
diff --git a/code/nelns/admin/public_html/html_headers.php b/nelns/admin/public_html/html_headers.php
similarity index 100%
rename from code/nelns/admin/public_html/html_headers.php
rename to nelns/admin/public_html/html_headers.php
diff --git a/code/nelns/admin/public_html/index.php b/nelns/admin/public_html/index.php
similarity index 100%
rename from code/nelns/admin/public_html/index.php
rename to nelns/admin/public_html/index.php
diff --git a/code/nelns/admin/public_html/init.php b/nelns/admin/public_html/init.php
similarity index 100%
rename from code/nelns/admin/public_html/init.php
rename to nelns/admin/public_html/init.php
diff --git a/code/nelns/admin/public_html/las_connection.php b/nelns/admin/public_html/las_connection.php
similarity index 100%
rename from code/nelns/admin/public_html/las_connection.php
rename to nelns/admin/public_html/las_connection.php
diff --git a/code/nelns/admin/public_html/las_interface.php b/nelns/admin/public_html/las_interface.php
similarity index 100%
rename from code/nelns/admin/public_html/las_interface.php
rename to nelns/admin/public_html/las_interface.php
diff --git a/code/nelns/admin/public_html/login_form.php b/nelns/admin/public_html/login_form.php
similarity index 100%
rename from code/nelns/admin/public_html/login_form.php
rename to nelns/admin/public_html/login_form.php
diff --git a/code/nelns/admin/public_html/nel.gif b/nelns/admin/public_html/nel.gif
similarity index 100%
rename from code/nelns/admin/public_html/nel.gif
rename to nelns/admin/public_html/nel.gif
diff --git a/code/nelns/admin/public_html/player_locator.php b/nelns/admin/public_html/player_locator.php
similarity index 100%
rename from code/nelns/admin/public_html/player_locator.php
rename to nelns/admin/public_html/player_locator.php
diff --git a/code/nelns/admin/public_html/prefs.php b/nelns/admin/public_html/prefs.php
similarity index 100%
rename from code/nelns/admin/public_html/prefs.php
rename to nelns/admin/public_html/prefs.php
diff --git a/code/nelns/admin/public_html/request_interface.php b/nelns/admin/public_html/request_interface.php
similarity index 100%
rename from code/nelns/admin/public_html/request_interface.php
rename to nelns/admin/public_html/request_interface.php
diff --git a/code/nelns/admin/public_html/session_auth.php b/nelns/admin/public_html/session_auth.php
similarity index 100%
rename from code/nelns/admin/public_html/session_auth.php
rename to nelns/admin/public_html/session_auth.php
diff --git a/code/nelns/admin/public_html/sql_connection.php b/nelns/admin/public_html/sql_connection.php
similarity index 100%
rename from code/nelns/admin/public_html/sql_connection.php
rename to nelns/admin/public_html/sql_connection.php
diff --git a/code/nelns/admin/public_html/update_daily.php b/nelns/admin/public_html/update_daily.php
similarity index 100%
rename from code/nelns/admin/public_html/update_daily.php
rename to nelns/admin/public_html/update_daily.php
diff --git a/code/nelns/admin_executor_service/CMakeLists.txt b/nelns/admin_executor_service/CMakeLists.txt
similarity index 100%
rename from code/nelns/admin_executor_service/CMakeLists.txt
rename to nelns/admin_executor_service/CMakeLists.txt
diff --git a/code/nelns/admin_executor_service/admin_executor_service.cfg b/nelns/admin_executor_service/admin_executor_service.cfg
similarity index 100%
rename from code/nelns/admin_executor_service/admin_executor_service.cfg
rename to nelns/admin_executor_service/admin_executor_service.cfg
diff --git a/code/nelns/admin_executor_service/admin_executor_service.cpp b/nelns/admin_executor_service/admin_executor_service.cpp
similarity index 100%
rename from code/nelns/admin_executor_service/admin_executor_service.cpp
rename to nelns/admin_executor_service/admin_executor_service.cpp
diff --git a/code/nelns/admin_executor_service/common.cfg b/nelns/admin_executor_service/common.cfg
similarity index 100%
rename from code/nelns/admin_executor_service/common.cfg
rename to nelns/admin_executor_service/common.cfg
diff --git a/code/nelns/admin_executor_service/log_report.cpp b/nelns/admin_executor_service/log_report.cpp
similarity index 100%
rename from code/nelns/admin_executor_service/log_report.cpp
rename to nelns/admin_executor_service/log_report.cpp
diff --git a/code/nelns/admin_executor_service/log_report.h b/nelns/admin_executor_service/log_report.h
similarity index 100%
rename from code/nelns/admin_executor_service/log_report.h
rename to nelns/admin_executor_service/log_report.h
diff --git a/code/nelns/admin_service/CMakeLists.txt b/nelns/admin_service/CMakeLists.txt
similarity index 100%
rename from code/nelns/admin_service/CMakeLists.txt
rename to nelns/admin_service/CMakeLists.txt
diff --git a/code/nelns/admin_service/admin_service.cfg b/nelns/admin_service/admin_service.cfg
similarity index 100%
rename from code/nelns/admin_service/admin_service.cfg
rename to nelns/admin_service/admin_service.cfg
diff --git a/code/nelns/admin_service/admin_service.cpp b/nelns/admin_service/admin_service.cpp
similarity index 100%
rename from code/nelns/admin_service/admin_service.cpp
rename to nelns/admin_service/admin_service.cpp
diff --git a/code/nelns/admin_service/admin_service.h b/nelns/admin_service/admin_service.h
similarity index 100%
rename from code/nelns/admin_service/admin_service.h
rename to nelns/admin_service/admin_service.h
diff --git a/code/nelns/admin_service/common.cfg b/nelns/admin_service/common.cfg
similarity index 100%
rename from code/nelns/admin_service/common.cfg
rename to nelns/admin_service/common.cfg
diff --git a/code/nelns/admin_service/connection_web.cpp b/nelns/admin_service/connection_web.cpp
similarity index 100%
rename from code/nelns/admin_service/connection_web.cpp
rename to nelns/admin_service/connection_web.cpp
diff --git a/code/nelns/admin_service/connection_web.h b/nelns/admin_service/connection_web.h
similarity index 100%
rename from code/nelns/admin_service/connection_web.h
rename to nelns/admin_service/connection_web.h
diff --git a/code/nelns/login_service/CMakeLists.txt b/nelns/login_service/CMakeLists.txt
similarity index 100%
rename from code/nelns/login_service/CMakeLists.txt
rename to nelns/login_service/CMakeLists.txt
diff --git a/code/nelns/login_service/common.cfg b/nelns/login_service/common.cfg
similarity index 100%
rename from code/nelns/login_service/common.cfg
rename to nelns/login_service/common.cfg
diff --git a/code/nelns/login_service/connection_client.cpp b/nelns/login_service/connection_client.cpp
similarity index 100%
rename from code/nelns/login_service/connection_client.cpp
rename to nelns/login_service/connection_client.cpp
diff --git a/code/nelns/login_service/connection_client.h b/nelns/login_service/connection_client.h
similarity index 100%
rename from code/nelns/login_service/connection_client.h
rename to nelns/login_service/connection_client.h
diff --git a/code/nelns/login_service/connection_web.cpp b/nelns/login_service/connection_web.cpp
similarity index 100%
rename from code/nelns/login_service/connection_web.cpp
rename to nelns/login_service/connection_web.cpp
diff --git a/code/nelns/login_service/connection_web.h b/nelns/login_service/connection_web.h
similarity index 100%
rename from code/nelns/login_service/connection_web.h
rename to nelns/login_service/connection_web.h
diff --git a/code/nelns/login_service/connection_ws.cpp b/nelns/login_service/connection_ws.cpp
similarity index 100%
rename from code/nelns/login_service/connection_ws.cpp
rename to nelns/login_service/connection_ws.cpp
diff --git a/code/nelns/login_service/connection_ws.h b/nelns/login_service/connection_ws.h
similarity index 100%
rename from code/nelns/login_service/connection_ws.h
rename to nelns/login_service/connection_ws.h
diff --git a/code/nelns/login_service/login_service.cfg b/nelns/login_service/login_service.cfg
similarity index 100%
rename from code/nelns/login_service/login_service.cfg
rename to nelns/login_service/login_service.cfg
diff --git a/code/nelns/login_service/login_service.cpp b/nelns/login_service/login_service.cpp
similarity index 100%
rename from code/nelns/login_service/login_service.cpp
rename to nelns/login_service/login_service.cpp
diff --git a/code/nelns/login_service/login_service.h b/nelns/login_service/login_service.h
similarity index 100%
rename from code/nelns/login_service/login_service.h
rename to nelns/login_service/login_service.h
diff --git a/code/nelns/login_service/mysql_helper.cpp b/nelns/login_service/mysql_helper.cpp
similarity index 100%
rename from code/nelns/login_service/mysql_helper.cpp
rename to nelns/login_service/mysql_helper.cpp
diff --git a/code/nelns/login_service/mysql_helper.h b/nelns/login_service/mysql_helper.h
similarity index 100%
rename from code/nelns/login_service/mysql_helper.h
rename to nelns/login_service/mysql_helper.h
diff --git a/code/nelns/login_system/CMakeLists.txt b/nelns/login_system/CMakeLists.txt
similarity index 100%
rename from code/nelns/login_system/CMakeLists.txt
rename to nelns/login_system/CMakeLists.txt
diff --git a/code/nelns/login_system/nel_launcher_qt/CMakeLists.txt b/nelns/login_system/nel_launcher_qt/CMakeLists.txt
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/CMakeLists.txt
rename to nelns/login_system/nel_launcher_qt/CMakeLists.txt
diff --git a/code/nelns/login_system/nel_launcher_qt/connection.cpp b/nelns/login_system/nel_launcher_qt/connection.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/connection.cpp
rename to nelns/login_system/nel_launcher_qt/connection.cpp
diff --git a/code/nelns/login_system/nel_launcher_qt/connection.h b/nelns/login_system/nel_launcher_qt/connection.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/connection.h
rename to nelns/login_system/nel_launcher_qt/connection.h
diff --git a/code/nelns/login_system/nel_launcher_qt/main.cpp b/nelns/login_system/nel_launcher_qt/main.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/main.cpp
rename to nelns/login_system/nel_launcher_qt/main.cpp
diff --git a/code/nelns/login_system/nel_launcher_qt/nel_launcher.cfg b/nelns/login_system/nel_launcher_qt/nel_launcher.cfg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/nel_launcher.cfg
rename to nelns/login_system/nel_launcher_qt/nel_launcher.cfg
diff --git a/code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.cpp b/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.cpp
rename to nelns/login_system/nel_launcher_qt/nel_launcher_dlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.h b/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.h
rename to nelns/login_system/nel_launcher_qt/nel_launcher_dlg.h
diff --git a/code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.ui b/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.ui
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/nel_launcher_dlg.ui
rename to nelns/login_system/nel_launcher_qt/nel_launcher_dlg.ui
diff --git a/code/nelns/login_system/nel_launcher_qt/shard.h b/nelns/login_system/nel_launcher_qt/shard.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_qt/shard.h
rename to nelns/login_system/nel_launcher_qt/shard.h
diff --git a/code/nelns/login_system/nel_launcher_windows/StdAfx.cpp b/nelns/login_system/nel_launcher_windows/StdAfx.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/StdAfx.cpp
rename to nelns/login_system/nel_launcher_windows/StdAfx.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows/StdAfx.h b/nelns/login_system/nel_launcher_windows/StdAfx.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/StdAfx.h
rename to nelns/login_system/nel_launcher_windows/StdAfx.h
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcher.cfg b/nelns/login_system/nel_launcher_windows/nel_launcher.cfg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcher.cfg
rename to nelns/login_system/nel_launcher_windows/nel_launcher.cfg
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcher.clw b/nelns/login_system/nel_launcher_windows/nel_launcher.clw
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcher.clw
rename to nelns/login_system/nel_launcher_windows/nel_launcher.clw
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcher.cpp b/nelns/login_system/nel_launcher_windows/nel_launcher.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcher.cpp
rename to nelns/login_system/nel_launcher_windows/nel_launcher.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcher.h b/nelns/login_system/nel_launcher_windows/nel_launcher.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcher.h
rename to nelns/login_system/nel_launcher_windows/nel_launcher.h
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcher.rc b/nelns/login_system/nel_launcher_windows/nel_launcher.rc
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcher.rc
rename to nelns/login_system/nel_launcher_windows/nel_launcher.rc
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcherDlg.cpp b/nelns/login_system/nel_launcher_windows/nel_launcherDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcherDlg.cpp
rename to nelns/login_system/nel_launcher_windows/nel_launcherDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows/nel_launcherDlg.h b/nelns/login_system/nel_launcher_windows/nel_launcherDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/nel_launcherDlg.h
rename to nelns/login_system/nel_launcher_windows/nel_launcherDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows/patch.cpp b/nelns/login_system/nel_launcher_windows/patch.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/patch.cpp
rename to nelns/login_system/nel_launcher_windows/patch.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows/patch.h b/nelns/login_system/nel_launcher_windows/patch.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/patch.h
rename to nelns/login_system/nel_launcher_windows/patch.h
diff --git a/code/nelns/login_system/nel_launcher_windows/pleasewait.html b/nelns/login_system/nel_launcher_windows/pleasewait.html
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/pleasewait.html
rename to nelns/login_system/nel_launcher_windows/pleasewait.html
diff --git a/code/nelns/login_system/nel_launcher_windows/res/nel_launcher.ico b/nelns/login_system/nel_launcher_windows/res/nel_launcher.ico
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/res/nel_launcher.ico
rename to nelns/login_system/nel_launcher_windows/res/nel_launcher.ico
diff --git a/code/nelns/login_system/nel_launcher_windows/res/nel_launcher.rc2 b/nelns/login_system/nel_launcher_windows/res/nel_launcher.rc2
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/res/nel_launcher.rc2
rename to nelns/login_system/nel_launcher_windows/res/nel_launcher.rc2
diff --git a/code/nelns/login_system/nel_launcher_windows/resource.h b/nelns/login_system/nel_launcher_windows/resource.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/resource.h
rename to nelns/login_system/nel_launcher_windows/resource.h
diff --git a/code/nelns/login_system/nel_launcher_windows/webbrowser2.cpp b/nelns/login_system/nel_launcher_windows/webbrowser2.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/webbrowser2.cpp
rename to nelns/login_system/nel_launcher_windows/webbrowser2.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows/webbrowser2.h b/nelns/login_system/nel_launcher_windows/webbrowser2.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows/webbrowser2.h
rename to nelns/login_system/nel_launcher_windows/webbrowser2.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.cpp b/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.cpp
rename to nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h b/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
rename to nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarWnd.cpp b/nelns/login_system/nel_launcher_windows_ext/BarWnd.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/BarWnd.cpp
rename to nelns/login_system/nel_launcher_windows_ext/BarWnd.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarWnd.h b/nelns/login_system/nel_launcher_windows_ext/BarWnd.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/BarWnd.h
rename to nelns/login_system/nel_launcher_windows_ext/BarWnd.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp b/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
rename to nelns/login_system/nel_launcher_windows_ext/Configuration.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/Configuration.h b/nelns/login_system/nel_launcher_windows_ext/Configuration.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/Configuration.h
rename to nelns/login_system/nel_launcher_windows_ext/Configuration.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.h b/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/LoadingPageDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/LoginDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/LoginDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/LoginDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/LoginDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/LoginDlg.h b/nelns/login_system/nel_launcher_windows_ext/LoginDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/LoginDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/LoginDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/Md5.cpp b/nelns/login_system/nel_launcher_windows_ext/Md5.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/Md5.cpp
rename to nelns/login_system/nel_launcher_windows_ext/Md5.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/Md5.h b/nelns/login_system/nel_launcher_windows_ext/Md5.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/Md5.h
rename to nelns/login_system/nel_launcher_windows_ext/Md5.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/MsgDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/MsgDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/MsgDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/MsgDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/MsgDlg.h b/nelns/login_system/nel_launcher_windows_ext/MsgDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/MsgDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/MsgDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/PictureHlp.cpp b/nelns/login_system/nel_launcher_windows_ext/PictureHlp.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/PictureHlp.cpp
rename to nelns/login_system/nel_launcher_windows_ext/PictureHlp.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/PictureHlp.h b/nelns/login_system/nel_launcher_windows_ext/PictureHlp.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/PictureHlp.h
rename to nelns/login_system/nel_launcher_windows_ext/PictureHlp.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/ProgressDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.h b/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/ProgressDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/ProgressDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/StdAfx.cpp b/nelns/login_system/nel_launcher_windows_ext/StdAfx.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/StdAfx.cpp
rename to nelns/login_system/nel_launcher_windows_ext/StdAfx.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/StdAfx.h b/nelns/login_system/nel_launcher_windows_ext/StdAfx.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/StdAfx.h
rename to nelns/login_system/nel_launcher_windows_ext/StdAfx.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/WebDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/WebDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/WebDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/WebDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/WebDlg.h b/nelns/login_system/nel_launcher_windows_ext/WebDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/WebDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/WebDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cfg b/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cfg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cfg
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcher.cfg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.clw b/nelns/login_system/nel_launcher_windows_ext/nel_launcher.clw
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.clw
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcher.clw
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp b/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcher.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.h b/nelns/login_system/nel_launcher_windows_ext/nel_launcher.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.h
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcher.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.rc b/nelns/login_system/nel_launcher_windows_ext/nel_launcher.rc
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcher.rc
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcher.rc
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.cpp b/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.h b/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.h
rename to nelns/login_system/nel_launcher_windows_ext/nel_launcherDlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/patch.cpp b/nelns/login_system/nel_launcher_windows_ext/patch.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/patch.cpp
rename to nelns/login_system/nel_launcher_windows_ext/patch.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/patch.h b/nelns/login_system/nel_launcher_windows_ext/patch.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/patch.h
rename to nelns/login_system/nel_launcher_windows_ext/patch.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/background.jpg b/nelns/login_system/nel_launcher_windows_ext/res/background.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/background.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/background.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/barre_top.bmp b/nelns/login_system/nel_launcher_windows_ext/res/barre_top.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/barre_top.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/barre_top.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bg_login.jpg b/nelns/login_system/nel_launcher_windows_ext/res/bg_login.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bg_login.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/bg_login.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bitmap1.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bitmap1.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bitmap1.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bitmap1.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bitmap2.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bitmap2.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bitmap2.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bitmap2.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bitmap3.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bitmap3.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bitmap3.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bitmap3.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bmp00001.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bmp00001.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bmp00001.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bmp00001.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bmp00002.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bmp00002.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bmp00002.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bmp00002.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/bmp00003.bmp b/nelns/login_system/nel_launcher_windows_ext/res/bmp00003.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/bmp00003.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/bmp00003.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/btn_login_down.bmp b/nelns/login_system/nel_launcher_windows_ext/res/btn_login_down.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/btn_login_down.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/btn_login_down.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/btn_login_up.bmp b/nelns/login_system/nel_launcher_windows_ext/res/btn_login_up.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/btn_login_up.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/btn_login_up.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_down.bmp b/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_down.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_down.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/btn_quit_down.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_up.bmp b/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_up.bmp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/btn_quit_up.bmp
rename to nelns/login_system/nel_launcher_windows_ext/res/btn_quit_up.bmp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/cursor1.cur b/nelns/login_system/nel_launcher_windows_ext/res/cursor1.cur
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/cursor1.cur
rename to nelns/login_system/nel_launcher_windows_ext/res/cursor1.cur
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/nel_launcher.rc2 b/nelns/login_system/nel_launcher_windows_ext/res/nel_launcher.rc2
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/nel_launcher.rc2
rename to nelns/login_system/nel_launcher_windows_ext/res/nel_launcher.rc2
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/progress.jpg b/nelns/login_system/nel_launcher_windows_ext/res/progress.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/progress.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/progress.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/ryzom.ico b/nelns/login_system/nel_launcher_windows_ext/res/ryzom.ico
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/ryzom.ico
rename to nelns/login_system/nel_launcher_windows_ext/res/ryzom.ico
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_news.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_news.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_news.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_news.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_news_focus.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_news_focus.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_news_focus.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_news_focus.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_rn.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_rn.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_rn.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_rn.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_rn_focus.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_rn_focus.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_rn_focus.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_rn_focus.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_servers.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_servers.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_servers.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_servers.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/res/tab_servers_focus.jpg b/nelns/login_system/nel_launcher_windows_ext/res/tab_servers_focus.jpg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/res/tab_servers_focus.jpg
rename to nelns/login_system/nel_launcher_windows_ext/res/tab_servers_focus.jpg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/resource.h b/nelns/login_system/nel_launcher_windows_ext/resource.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/resource.h
rename to nelns/login_system/nel_launcher_windows_ext/resource.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/webbrowser2.cpp b/nelns/login_system/nel_launcher_windows_ext/webbrowser2.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/webbrowser2.cpp
rename to nelns/login_system/nel_launcher_windows_ext/webbrowser2.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/webbrowser2.h b/nelns/login_system/nel_launcher_windows_ext/webbrowser2.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext/webbrowser2.h
rename to nelns/login_system/nel_launcher_windows_ext/webbrowser2.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt b/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt
rename to nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/connection.cpp b/nelns/login_system/nel_launcher_windows_ext2/connection.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/connection.cpp
rename to nelns/login_system/nel_launcher_windows_ext2/connection.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/connection.h b/nelns/login_system/nel_launcher_windows_ext2/connection.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/connection.h
rename to nelns/login_system/nel_launcher_windows_ext2/connection.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cfg b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cfg
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cfg
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cfg
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cpp b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cpp
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.h b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.h
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.rc b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.rc
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.rc
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher.rc
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.cpp b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.cpp
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.h b/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.h
rename to nelns/login_system/nel_launcher_windows_ext2/nel_launcher_dlg.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/patch.cpp b/nelns/login_system/nel_launcher_windows_ext2/patch.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/patch.cpp
rename to nelns/login_system/nel_launcher_windows_ext2/patch.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/patch.h b/nelns/login_system/nel_launcher_windows_ext2/patch.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/patch.h
rename to nelns/login_system/nel_launcher_windows_ext2/patch.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.ico b/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.ico
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.ico
rename to nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.ico
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.rc2 b/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.rc2
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.rc2
rename to nelns/login_system/nel_launcher_windows_ext2/res/nel_launcher.rc2
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/resource.h b/nelns/login_system/nel_launcher_windows_ext2/resource.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/resource.h
rename to nelns/login_system/nel_launcher_windows_ext2/resource.h
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/std_afx.cpp b/nelns/login_system/nel_launcher_windows_ext2/std_afx.cpp
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/std_afx.cpp
rename to nelns/login_system/nel_launcher_windows_ext2/std_afx.cpp
diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/std_afx.h b/nelns/login_system/nel_launcher_windows_ext2/std_afx.h
similarity index 100%
rename from code/nelns/login_system/nel_launcher_windows_ext2/std_afx.h
rename to nelns/login_system/nel_launcher_windows_ext2/std_afx.h
diff --git a/code/nelns/login_system/www/config.php b/nelns/login_system/www/config.php
similarity index 100%
rename from code/nelns/login_system/www/config.php
rename to nelns/login_system/www/config.php
diff --git a/code/nelns/login_system/www/public_html/index.php b/nelns/login_system/www/public_html/index.php
similarity index 100%
rename from code/nelns/login_system/www/public_html/index.php
rename to nelns/login_system/www/public_html/index.php
diff --git a/code/nelns/login_system/www/public_html/service_connection.php b/nelns/login_system/www/public_html/service_connection.php
similarity index 100%
rename from code/nelns/login_system/www/public_html/service_connection.php
rename to nelns/login_system/www/public_html/service_connection.php
diff --git a/code/nelns/naming_service/CMakeLists.txt b/nelns/naming_service/CMakeLists.txt
similarity index 100%
rename from code/nelns/naming_service/CMakeLists.txt
rename to nelns/naming_service/CMakeLists.txt
diff --git a/code/nelns/naming_service/common.cfg b/nelns/naming_service/common.cfg
similarity index 100%
rename from code/nelns/naming_service/common.cfg
rename to nelns/naming_service/common.cfg
diff --git a/code/nelns/naming_service/naming_service.cfg b/nelns/naming_service/naming_service.cfg
similarity index 100%
rename from code/nelns/naming_service/naming_service.cfg
rename to nelns/naming_service/naming_service.cfg
diff --git a/code/nelns/naming_service/naming_service.cpp b/nelns/naming_service/naming_service.cpp
similarity index 100%
rename from code/nelns/naming_service/naming_service.cpp
rename to nelns/naming_service/naming_service.cpp
diff --git a/code/nelns/resources/custom.ini b/nelns/resources/custom.ini
similarity index 100%
rename from code/nelns/resources/custom.ini
rename to nelns/resources/custom.ini
diff --git a/code/nelns/resources/nel.bmp b/nelns/resources/nel.bmp
similarity index 100%
rename from code/nelns/resources/nel.bmp
rename to nelns/resources/nel.bmp
diff --git a/code/nelns/resources/nel.png b/nelns/resources/nel.png
similarity index 100%
rename from code/nelns/resources/nel.png
rename to nelns/resources/nel.png
diff --git a/code/nelns/resources/nevraxpill.ico b/nelns/resources/nevraxpill.ico
similarity index 100%
rename from code/nelns/resources/nevraxpill.ico
rename to nelns/resources/nevraxpill.ico
diff --git a/code/nelns/welcome_service/CMakeLists.txt b/nelns/welcome_service/CMakeLists.txt
similarity index 100%
rename from code/nelns/welcome_service/CMakeLists.txt
rename to nelns/welcome_service/CMakeLists.txt
diff --git a/code/nelns/welcome_service/common.cfg b/nelns/welcome_service/common.cfg
similarity index 100%
rename from code/nelns/welcome_service/common.cfg
rename to nelns/welcome_service/common.cfg
diff --git a/code/nelns/welcome_service/welcome_service.cfg b/nelns/welcome_service/welcome_service.cfg
similarity index 100%
rename from code/nelns/welcome_service/welcome_service.cfg
rename to nelns/welcome_service/welcome_service.cfg
diff --git a/code/nelns/welcome_service/welcome_service.cpp b/nelns/welcome_service/welcome_service.cpp
similarity index 100%
rename from code/nelns/welcome_service/welcome_service.cpp
rename to nelns/welcome_service/welcome_service.cpp
diff --git a/code/nelns/welcome_service/welcome_service.h b/nelns/welcome_service/welcome_service.h
similarity index 100%
rename from code/nelns/welcome_service/welcome_service.h
rename to nelns/welcome_service/welcome_service.h
diff --git a/code/nelns/welcome_service/welcome_service_itf.cpp b/nelns/welcome_service/welcome_service_itf.cpp
similarity index 100%
rename from code/nelns/welcome_service/welcome_service_itf.cpp
rename to nelns/welcome_service/welcome_service_itf.cpp
diff --git a/code/nelns/welcome_service/welcome_service_itf.h b/nelns/welcome_service/welcome_service_itf.h
similarity index 100%
rename from code/nelns/welcome_service/welcome_service_itf.h
rename to nelns/welcome_service/welcome_service_itf.h
diff --git a/code/personal/README.md b/personal/README.md
similarity index 100%
rename from code/personal/README.md
rename to personal/README.md
diff --git a/code/ryzom/CMakeLists.txt b/ryzom/CMakeLists.txt
similarity index 100%
rename from code/ryzom/CMakeLists.txt
rename to ryzom/CMakeLists.txt
diff --git a/code/ryzom/COPYING b/ryzom/COPYING
similarity index 100%
rename from code/ryzom/COPYING
rename to ryzom/COPYING
diff --git a/code/ryzom/client/CMakeLists.txt b/ryzom/client/CMakeLists.txt
similarity index 100%
rename from code/ryzom/client/CMakeLists.txt
rename to ryzom/client/CMakeLists.txt
diff --git a/code/ryzom/client/macosx/Info.plist b/ryzom/client/macosx/Info.plist
similarity index 100%
rename from code/ryzom/client/macosx/Info.plist
rename to ryzom/client/macosx/Info.plist
diff --git a/code/ryzom/client/macosx/PkgInfo b/ryzom/client/macosx/PkgInfo
similarity index 100%
rename from code/ryzom/client/macosx/PkgInfo
rename to ryzom/client/macosx/PkgInfo
diff --git a/code/ryzom/client/macosx/ryzom.entitlements b/ryzom/client/macosx/ryzom.entitlements
similarity index 100%
rename from code/ryzom/client/macosx/ryzom.entitlements
rename to ryzom/client/macosx/ryzom.entitlements
diff --git a/code/ryzom/client/macosx/ryzom.icns b/ryzom/client/macosx/ryzom.icns
similarity index 100%
rename from code/ryzom/client/macosx/ryzom.icns
rename to ryzom/client/macosx/ryzom.icns
diff --git a/code/ryzom/client/src/3d_notes.cpp b/ryzom/client/src/3d_notes.cpp
similarity index 100%
rename from code/ryzom/client/src/3d_notes.cpp
rename to ryzom/client/src/3d_notes.cpp
diff --git a/code/ryzom/client/src/3d_notes.h b/ryzom/client/src/3d_notes.h
similarity index 100%
rename from code/ryzom/client/src/3d_notes.h
rename to ryzom/client/src/3d_notes.h
diff --git a/code/ryzom/client/src/CMakeLists.txt b/ryzom/client/src/CMakeLists.txt
similarity index 100%
rename from code/ryzom/client/src/CMakeLists.txt
rename to ryzom/client/src/CMakeLists.txt
diff --git a/code/ryzom/client/src/actions.cpp b/ryzom/client/src/actions.cpp
similarity index 100%
rename from code/ryzom/client/src/actions.cpp
rename to ryzom/client/src/actions.cpp
diff --git a/code/ryzom/client/src/actions.h b/ryzom/client/src/actions.h
similarity index 100%
rename from code/ryzom/client/src/actions.h
rename to ryzom/client/src/actions.h
diff --git a/code/ryzom/client/src/actions_client.cpp b/ryzom/client/src/actions_client.cpp
similarity index 100%
rename from code/ryzom/client/src/actions_client.cpp
rename to ryzom/client/src/actions_client.cpp
diff --git a/code/ryzom/client/src/actions_client.h b/ryzom/client/src/actions_client.h
similarity index 100%
rename from code/ryzom/client/src/actions_client.h
rename to ryzom/client/src/actions_client.h
diff --git a/code/ryzom/client/src/animated_scene_object.cpp b/ryzom/client/src/animated_scene_object.cpp
similarity index 100%
rename from code/ryzom/client/src/animated_scene_object.cpp
rename to ryzom/client/src/animated_scene_object.cpp
diff --git a/code/ryzom/client/src/animated_scene_object.h b/ryzom/client/src/animated_scene_object.h
similarity index 100%
rename from code/ryzom/client/src/animated_scene_object.h
rename to ryzom/client/src/animated_scene_object.h
diff --git a/code/ryzom/client/src/animation.cpp b/ryzom/client/src/animation.cpp
similarity index 100%
rename from code/ryzom/client/src/animation.cpp
rename to ryzom/client/src/animation.cpp
diff --git a/code/ryzom/client/src/animation.h b/ryzom/client/src/animation.h
similarity index 100%
rename from code/ryzom/client/src/animation.h
rename to ryzom/client/src/animation.h
diff --git a/code/ryzom/client/src/animation_fx.cpp b/ryzom/client/src/animation_fx.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_fx.cpp
rename to ryzom/client/src/animation_fx.cpp
diff --git a/code/ryzom/client/src/animation_fx.h b/ryzom/client/src/animation_fx.h
similarity index 100%
rename from code/ryzom/client/src/animation_fx.h
rename to ryzom/client/src/animation_fx.h
diff --git a/code/ryzom/client/src/animation_fx_id_array.cpp b/ryzom/client/src/animation_fx_id_array.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_fx_id_array.cpp
rename to ryzom/client/src/animation_fx_id_array.cpp
diff --git a/code/ryzom/client/src/animation_fx_id_array.h b/ryzom/client/src/animation_fx_id_array.h
similarity index 100%
rename from code/ryzom/client/src/animation_fx_id_array.h
rename to ryzom/client/src/animation_fx_id_array.h
diff --git a/code/ryzom/client/src/animation_fx_misc.cpp b/ryzom/client/src/animation_fx_misc.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_fx_misc.cpp
rename to ryzom/client/src/animation_fx_misc.cpp
diff --git a/code/ryzom/client/src/animation_fx_misc.h b/ryzom/client/src/animation_fx_misc.h
similarity index 100%
rename from code/ryzom/client/src/animation_fx_misc.h
rename to ryzom/client/src/animation_fx_misc.h
diff --git a/code/ryzom/client/src/animation_fx_sheet.cpp b/ryzom/client/src/animation_fx_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_fx_sheet.cpp
rename to ryzom/client/src/animation_fx_sheet.cpp
diff --git a/code/ryzom/client/src/animation_fx_sheet.h b/ryzom/client/src/animation_fx_sheet.h
similarity index 100%
rename from code/ryzom/client/src/animation_fx_sheet.h
rename to ryzom/client/src/animation_fx_sheet.h
diff --git a/code/ryzom/client/src/animation_misc.cpp b/ryzom/client/src/animation_misc.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_misc.cpp
rename to ryzom/client/src/animation_misc.cpp
diff --git a/code/ryzom/client/src/animation_misc.h b/ryzom/client/src/animation_misc.h
similarity index 100%
rename from code/ryzom/client/src/animation_misc.h
rename to ryzom/client/src/animation_misc.h
diff --git a/code/ryzom/client/src/animation_set.cpp b/ryzom/client/src/animation_set.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_set.cpp
rename to ryzom/client/src/animation_set.cpp
diff --git a/code/ryzom/client/src/animation_set.h b/ryzom/client/src/animation_set.h
similarity index 100%
rename from code/ryzom/client/src/animation_set.h
rename to ryzom/client/src/animation_set.h
diff --git a/code/ryzom/client/src/animation_state.cpp b/ryzom/client/src/animation_state.cpp
similarity index 100%
rename from code/ryzom/client/src/animation_state.cpp
rename to ryzom/client/src/animation_state.cpp
diff --git a/code/ryzom/client/src/animation_state.h b/ryzom/client/src/animation_state.h
similarity index 100%
rename from code/ryzom/client/src/animation_state.h
rename to ryzom/client/src/animation_state.h
diff --git a/code/ryzom/client/src/animation_type.h b/ryzom/client/src/animation_type.h
similarity index 100%
rename from code/ryzom/client/src/animation_type.h
rename to ryzom/client/src/animation_type.h
diff --git a/code/ryzom/client/src/app_bundle_utils.cpp b/ryzom/client/src/app_bundle_utils.cpp
similarity index 100%
rename from code/ryzom/client/src/app_bundle_utils.cpp
rename to ryzom/client/src/app_bundle_utils.cpp
diff --git a/code/ryzom/client/src/app_bundle_utils.h b/ryzom/client/src/app_bundle_utils.h
similarity index 100%
rename from code/ryzom/client/src/app_bundle_utils.h
rename to ryzom/client/src/app_bundle_utils.h
diff --git a/code/ryzom/client/src/attached_fx.cpp b/ryzom/client/src/attached_fx.cpp
similarity index 100%
rename from code/ryzom/client/src/attached_fx.cpp
rename to ryzom/client/src/attached_fx.cpp
diff --git a/code/ryzom/client/src/attached_fx.h b/ryzom/client/src/attached_fx.h
similarity index 100%
rename from code/ryzom/client/src/attached_fx.h
rename to ryzom/client/src/attached_fx.h
diff --git a/code/ryzom/client/src/attack.h b/ryzom/client/src/attack.h
similarity index 100%
rename from code/ryzom/client/src/attack.h
rename to ryzom/client/src/attack.h
diff --git a/code/ryzom/client/src/attack_info.h b/ryzom/client/src/attack_info.h
similarity index 100%
rename from code/ryzom/client/src/attack_info.h
rename to ryzom/client/src/attack_info.h
diff --git a/code/ryzom/client/src/attack_list.cpp b/ryzom/client/src/attack_list.cpp
similarity index 100%
rename from code/ryzom/client/src/attack_list.cpp
rename to ryzom/client/src/attack_list.cpp
diff --git a/code/ryzom/client/src/attack_list.h b/ryzom/client/src/attack_list.h
similarity index 100%
rename from code/ryzom/client/src/attack_list.h
rename to ryzom/client/src/attack_list.h
diff --git a/code/ryzom/client/src/auto_anim.cpp b/ryzom/client/src/auto_anim.cpp
similarity index 100%
rename from code/ryzom/client/src/auto_anim.cpp
rename to ryzom/client/src/auto_anim.cpp
diff --git a/code/ryzom/client/src/auto_anim.h b/ryzom/client/src/auto_anim.h
similarity index 100%
rename from code/ryzom/client/src/auto_anim.h
rename to ryzom/client/src/auto_anim.h
diff --git a/code/ryzom/client/src/behaviour_context.cpp b/ryzom/client/src/behaviour_context.cpp
similarity index 100%
rename from code/ryzom/client/src/behaviour_context.cpp
rename to ryzom/client/src/behaviour_context.cpp
diff --git a/code/ryzom/client/src/behaviour_context.h b/ryzom/client/src/behaviour_context.h
similarity index 100%
rename from code/ryzom/client/src/behaviour_context.h
rename to ryzom/client/src/behaviour_context.h
diff --git a/code/ryzom/client/src/bg_downloader_access.cpp b/ryzom/client/src/bg_downloader_access.cpp
similarity index 100%
rename from code/ryzom/client/src/bg_downloader_access.cpp
rename to ryzom/client/src/bg_downloader_access.cpp
diff --git a/code/ryzom/client/src/bg_downloader_access.h b/ryzom/client/src/bg_downloader_access.h
similarity index 100%
rename from code/ryzom/client/src/bg_downloader_access.h
rename to ryzom/client/src/bg_downloader_access.h
diff --git a/code/ryzom/client/src/browse_faq.cpp b/ryzom/client/src/browse_faq.cpp
similarity index 100%
rename from code/ryzom/client/src/browse_faq.cpp
rename to ryzom/client/src/browse_faq.cpp
diff --git a/code/ryzom/client/src/browse_faq.h b/ryzom/client/src/browse_faq.h
similarity index 100%
rename from code/ryzom/client/src/browse_faq.h
rename to ryzom/client/src/browse_faq.h
diff --git a/code/ryzom/client/src/bug_report/EmailDlg.cpp b/ryzom/client/src/bug_report/EmailDlg.cpp
similarity index 100%
rename from code/ryzom/client/src/bug_report/EmailDlg.cpp
rename to ryzom/client/src/bug_report/EmailDlg.cpp
diff --git a/code/ryzom/client/src/bug_report/EmailDlg.h b/ryzom/client/src/bug_report/EmailDlg.h
similarity index 100%
rename from code/ryzom/client/src/bug_report/EmailDlg.h
rename to ryzom/client/src/bug_report/EmailDlg.h
diff --git a/code/ryzom/client/src/bug_report/StdAfx.cpp b/ryzom/client/src/bug_report/StdAfx.cpp
similarity index 100%
rename from code/ryzom/client/src/bug_report/StdAfx.cpp
rename to ryzom/client/src/bug_report/StdAfx.cpp
diff --git a/code/ryzom/client/src/bug_report/StdAfx.h b/ryzom/client/src/bug_report/StdAfx.h
similarity index 100%
rename from code/ryzom/client/src/bug_report/StdAfx.h
rename to ryzom/client/src/bug_report/StdAfx.h
diff --git a/code/ryzom/client/src/bug_report/bug_report.cpp b/ryzom/client/src/bug_report/bug_report.cpp
similarity index 100%
rename from code/ryzom/client/src/bug_report/bug_report.cpp
rename to ryzom/client/src/bug_report/bug_report.cpp
diff --git a/code/ryzom/client/src/bug_report/bug_report.h b/ryzom/client/src/bug_report/bug_report.h
similarity index 100%
rename from code/ryzom/client/src/bug_report/bug_report.h
rename to ryzom/client/src/bug_report/bug_report.h
diff --git a/code/ryzom/client/src/bug_report/bug_report.rc b/ryzom/client/src/bug_report/bug_report.rc
similarity index 100%
rename from code/ryzom/client/src/bug_report/bug_report.rc
rename to ryzom/client/src/bug_report/bug_report.rc
diff --git a/code/ryzom/client/src/bug_report/bug_reportDlg.cpp b/ryzom/client/src/bug_report/bug_reportDlg.cpp
similarity index 100%
rename from code/ryzom/client/src/bug_report/bug_reportDlg.cpp
rename to ryzom/client/src/bug_report/bug_reportDlg.cpp
diff --git a/code/ryzom/client/src/bug_report/bug_reportDlg.h b/ryzom/client/src/bug_report/bug_reportDlg.h
similarity index 100%
rename from code/ryzom/client/src/bug_report/bug_reportDlg.h
rename to ryzom/client/src/bug_report/bug_reportDlg.h
diff --git a/code/ryzom/client/src/bug_report/res/bug_report.ico b/ryzom/client/src/bug_report/res/bug_report.ico
similarity index 100%
rename from code/ryzom/client/src/bug_report/res/bug_report.ico
rename to ryzom/client/src/bug_report/res/bug_report.ico
diff --git a/code/ryzom/client/src/bug_report/res/bug_report.rc2 b/ryzom/client/src/bug_report/res/bug_report.rc2
similarity index 100%
rename from code/ryzom/client/src/bug_report/res/bug_report.rc2
rename to ryzom/client/src/bug_report/res/bug_report.rc2
diff --git a/code/ryzom/client/src/bug_report/resource.h b/ryzom/client/src/bug_report/resource.h
similarity index 100%
rename from code/ryzom/client/src/bug_report/resource.h
rename to ryzom/client/src/bug_report/resource.h
diff --git a/code/ryzom/client/src/camera.cpp b/ryzom/client/src/camera.cpp
similarity index 100%
rename from code/ryzom/client/src/camera.cpp
rename to ryzom/client/src/camera.cpp
diff --git a/code/ryzom/client/src/camera.h b/ryzom/client/src/camera.h
similarity index 100%
rename from code/ryzom/client/src/camera.h
rename to ryzom/client/src/camera.h
diff --git a/code/ryzom/client/src/camera_recorder.cpp b/ryzom/client/src/camera_recorder.cpp
similarity index 100%
rename from code/ryzom/client/src/camera_recorder.cpp
rename to ryzom/client/src/camera_recorder.cpp
diff --git a/code/ryzom/client/src/camera_recorder.h b/ryzom/client/src/camera_recorder.h
similarity index 100%
rename from code/ryzom/client/src/camera_recorder.h
rename to ryzom/client/src/camera_recorder.h
diff --git a/code/ryzom/client/src/candidate.h b/ryzom/client/src/candidate.h
similarity index 100%
rename from code/ryzom/client/src/candidate.h
rename to ryzom/client/src/candidate.h
diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/ryzom/client/src/cdb_synchronised.cpp
similarity index 100%
rename from code/ryzom/client/src/cdb_synchronised.cpp
rename to ryzom/client/src/cdb_synchronised.cpp
diff --git a/code/ryzom/client/src/cdb_synchronised.h b/ryzom/client/src/cdb_synchronised.h
similarity index 100%
rename from code/ryzom/client/src/cdb_synchronised.h
rename to ryzom/client/src/cdb_synchronised.h
diff --git a/code/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/character_cl.cpp
rename to ryzom/client/src/character_cl.cpp
diff --git a/code/ryzom/client/src/character_cl.h b/ryzom/client/src/character_cl.h
similarity index 100%
rename from code/ryzom/client/src/character_cl.h
rename to ryzom/client/src/character_cl.h
diff --git a/code/ryzom/client/src/client.cpp b/ryzom/client/src/client.cpp
similarity index 100%
rename from code/ryzom/client/src/client.cpp
rename to ryzom/client/src/client.cpp
diff --git a/code/ryzom/client/src/client.rc b/ryzom/client/src/client.rc
similarity index 100%
rename from code/ryzom/client/src/client.rc
rename to ryzom/client/src/client.rc
diff --git a/code/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp
similarity index 100%
rename from code/ryzom/client/src/client_cfg.cpp
rename to ryzom/client/src/client_cfg.cpp
diff --git a/code/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h
similarity index 100%
rename from code/ryzom/client/src/client_cfg.h
rename to ryzom/client/src/client_cfg.h
diff --git a/code/ryzom/client/src/client_chat_manager.cpp b/ryzom/client/src/client_chat_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/client_chat_manager.cpp
rename to ryzom/client/src/client_chat_manager.cpp
diff --git a/code/ryzom/client/src/client_chat_manager.h b/ryzom/client/src/client_chat_manager.h
similarity index 100%
rename from code/ryzom/client/src/client_chat_manager.h
rename to ryzom/client/src/client_chat_manager.h
diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/ryzom/client/src/client_sheets/CMakeLists.txt
similarity index 100%
rename from code/ryzom/client/src/client_sheets/CMakeLists.txt
rename to ryzom/client/src/client_sheets/CMakeLists.txt
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp b/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
rename to ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h b/ryzom/client/src/client_sheets/animation_fx_set_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h
rename to ryzom/client/src/client_sheets/animation_fx_set_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp b/ryzom/client/src/client_sheets/animation_fx_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp
rename to ryzom/client/src/client_sheets/animation_fx_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.h b/ryzom/client/src/client_sheets/animation_fx_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_fx_sheet.h
rename to ryzom/client/src/client_sheets/animation_fx_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp b/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
rename to ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h b/ryzom/client/src/client_sheets/animation_set_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/animation_set_list_sheet.h
rename to ryzom/client/src/client_sheets/animation_set_list_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp b/ryzom/client/src/client_sheets/attack_id_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_id_sheet.cpp
rename to ryzom/client/src/client_sheets/attack_id_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.h b/ryzom/client/src/client_sheets/attack_id_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_id_sheet.h
rename to ryzom/client/src/client_sheets/attack_id_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp b/ryzom/client/src/client_sheets/attack_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_list_sheet.cpp
rename to ryzom/client/src/client_sheets/attack_list_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.h b/ryzom/client/src/client_sheets/attack_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_list_sheet.h
rename to ryzom/client/src/client_sheets/attack_list_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.cpp b/ryzom/client/src/client_sheets/attack_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_sheet.cpp
rename to ryzom/client/src/client_sheets/attack_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.h b/ryzom/client/src/client_sheets/attack_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/attack_sheet.h
rename to ryzom/client/src/client_sheets/attack_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
rename to ryzom/client/src/client_sheets/automaton_list_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h b/ryzom/client/src/client_sheets/automaton_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/automaton_list_sheet.h
rename to ryzom/client/src/client_sheets/automaton_list_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
rename to ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h b/ryzom/client/src/client_sheets/body_to_bone_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
rename to ryzom/client/src/client_sheets/body_to_bone_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/building_sheet.cpp b/ryzom/client/src/client_sheets/building_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/building_sheet.cpp
rename to ryzom/client/src/client_sheets/building_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/building_sheet.h b/ryzom/client/src/client_sheets/building_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/building_sheet.h
rename to ryzom/client/src/client_sheets/building_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/character_sheet.cpp b/ryzom/client/src/client_sheets/character_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/character_sheet.cpp
rename to ryzom/client/src/client_sheets/character_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/character_sheet.h b/ryzom/client/src/client_sheets/character_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/character_sheet.h
rename to ryzom/client/src/client_sheets/character_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/client_sheets.cpp b/ryzom/client/src/client_sheets/client_sheets.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/client_sheets.cpp
rename to ryzom/client/src/client_sheets/client_sheets.cpp
diff --git a/code/ryzom/client/src/client_sheets/client_sheets.h b/ryzom/client/src/client_sheets/client_sheets.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/client_sheets.h
rename to ryzom/client/src/client_sheets/client_sheets.h
diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.cpp b/ryzom/client/src/client_sheets/continent_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/continent_sheet.cpp
rename to ryzom/client/src/client_sheets/continent_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.h b/ryzom/client/src/client_sheets/continent_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/continent_sheet.h
rename to ryzom/client/src/client_sheets/continent_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp b/ryzom/client/src/client_sheets/emot_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/emot_list_sheet.cpp
rename to ryzom/client/src/client_sheets/emot_list_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.h b/ryzom/client/src/client_sheets/emot_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/emot_list_sheet.h
rename to ryzom/client/src/client_sheets/emot_list_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/entity_sheet.cpp b/ryzom/client/src/client_sheets/entity_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/entity_sheet.cpp
rename to ryzom/client/src/client_sheets/entity_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/entity_sheet.h b/ryzom/client/src/client_sheets/entity_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/entity_sheet.h
rename to ryzom/client/src/client_sheets/entity_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.cpp b/ryzom/client/src/client_sheets/faction_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/faction_sheet.cpp
rename to ryzom/client/src/client_sheets/faction_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.h b/ryzom/client/src/client_sheets/faction_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/faction_sheet.h
rename to ryzom/client/src/client_sheets/faction_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.cpp b/ryzom/client/src/client_sheets/flora_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/flora_sheet.cpp
rename to ryzom/client/src/client_sheets/flora_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.h b/ryzom/client/src/client_sheets/flora_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/flora_sheet.h
rename to ryzom/client/src/client_sheets/flora_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp b/ryzom/client/src/client_sheets/forage_source_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/forage_source_sheet.cpp
rename to ryzom/client/src/client_sheets/forage_source_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.h b/ryzom/client/src/client_sheets/forage_source_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/forage_source_sheet.h
rename to ryzom/client/src/client_sheets/forage_source_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.cpp b/ryzom/client/src/client_sheets/fx_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/fx_sheet.cpp
rename to ryzom/client/src/client_sheets/fx_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.h b/ryzom/client/src/client_sheets/fx_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/fx_sheet.h
rename to ryzom/client/src/client_sheets/fx_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp b/ryzom/client/src/client_sheets/fx_stick_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/fx_stick_mode.cpp
rename to ryzom/client/src/client_sheets/fx_stick_mode.cpp
diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.h b/ryzom/client/src/client_sheets/fx_stick_mode.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/fx_stick_mode.h
rename to ryzom/client/src/client_sheets/fx_stick_mode.h
diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp b/ryzom/client/src/client_sheets/ground_fx_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp
rename to ryzom/client/src/client_sheets/ground_fx_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.h b/ryzom/client/src/client_sheets/ground_fx_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/ground_fx_sheet.h
rename to ryzom/client/src/client_sheets/ground_fx_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp b/ryzom/client/src/client_sheets/id_to_string_array.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/id_to_string_array.cpp
rename to ryzom/client/src/client_sheets/id_to_string_array.cpp
diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.h b/ryzom/client/src/client_sheets/id_to_string_array.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/id_to_string_array.h
rename to ryzom/client/src/client_sheets/id_to_string_array.h
diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/ryzom/client/src/client_sheets/item_fx_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
rename to ryzom/client/src/client_sheets/item_fx_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.h b/ryzom/client/src/client_sheets/item_fx_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/item_fx_sheet.h
rename to ryzom/client/src/client_sheets/item_fx_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/ryzom/client/src/client_sheets/item_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/item_sheet.cpp
rename to ryzom/client/src/client_sheets/item_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/ryzom/client/src/client_sheets/item_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/item_sheet.h
rename to ryzom/client/src/client_sheets/item_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp b/ryzom/client/src/client_sheets/light_cycle_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp
rename to ryzom/client/src/client_sheets/light_cycle_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/light_cycle_sheet.h b/ryzom/client/src/client_sheets/light_cycle_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/light_cycle_sheet.h
rename to ryzom/client/src/client_sheets/light_cycle_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp b/ryzom/client/src/client_sheets/mission_icon_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp
rename to ryzom/client/src/client_sheets/mission_icon_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/mission_icon_sheet.h b/ryzom/client/src/client_sheets/mission_icon_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/mission_icon_sheet.h
rename to ryzom/client/src/client_sheets/mission_icon_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/mission_sheet.cpp b/ryzom/client/src/client_sheets/mission_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/mission_sheet.cpp
rename to ryzom/client/src/client_sheets/mission_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/mission_sheet.h b/ryzom/client/src/client_sheets/mission_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/mission_sheet.h
rename to ryzom/client/src/client_sheets/mission_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp b/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
rename to ryzom/client/src/client_sheets/outpost_building_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h b/ryzom/client/src/client_sheets/outpost_building_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_building_sheet.h
rename to ryzom/client/src/client_sheets/outpost_building_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/outpost_sheet.cpp b/ryzom/client/src/client_sheets/outpost_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_sheet.cpp
rename to ryzom/client/src/client_sheets/outpost_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/outpost_sheet.h b/ryzom/client/src/client_sheets/outpost_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_sheet.h
rename to ryzom/client/src/client_sheets/outpost_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp b/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
rename to ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.h b/ryzom/client/src/client_sheets/outpost_squad_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/outpost_squad_sheet.h
rename to ryzom/client/src/client_sheets/outpost_squad_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/pact_sheet.cpp b/ryzom/client/src/client_sheets/pact_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/pact_sheet.cpp
rename to ryzom/client/src/client_sheets/pact_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/pact_sheet.h b/ryzom/client/src/client_sheets/pact_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/pact_sheet.h
rename to ryzom/client/src/client_sheets/pact_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/plant_sheet.cpp b/ryzom/client/src/client_sheets/plant_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/plant_sheet.cpp
rename to ryzom/client/src/client_sheets/plant_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/plant_sheet.h b/ryzom/client/src/client_sheets/plant_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/plant_sheet.h
rename to ryzom/client/src/client_sheets/plant_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/player_sheet.cpp b/ryzom/client/src/client_sheets/player_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/player_sheet.cpp
rename to ryzom/client/src/client_sheets/player_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/player_sheet.h b/ryzom/client/src/client_sheets/player_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/player_sheet.h
rename to ryzom/client/src/client_sheets/player_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/race_stats_sheet.cpp b/ryzom/client/src/client_sheets/race_stats_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/race_stats_sheet.cpp
rename to ryzom/client/src/client_sheets/race_stats_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/race_stats_sheet.h b/ryzom/client/src/client_sheets/race_stats_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/race_stats_sheet.h
rename to ryzom/client/src/client_sheets/race_stats_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sbrick_sheet.cpp
rename to ryzom/client/src/client_sheets/sbrick_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.h b/ryzom/client/src/client_sheets/sbrick_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sbrick_sheet.h
rename to ryzom/client/src/client_sheets/sbrick_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/skills_tree_sheet.cpp b/ryzom/client/src/client_sheets/skills_tree_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/skills_tree_sheet.cpp
rename to ryzom/client/src/client_sheets/skills_tree_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/skills_tree_sheet.h b/ryzom/client/src/client_sheets/skills_tree_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/skills_tree_sheet.h
rename to ryzom/client/src/client_sheets/skills_tree_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp b/ryzom/client/src/client_sheets/sky_object_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sky_object_sheet.cpp
rename to ryzom/client/src/client_sheets/sky_object_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.h b/ryzom/client/src/client_sheets/sky_object_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sky_object_sheet.h
rename to ryzom/client/src/client_sheets/sky_object_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.cpp b/ryzom/client/src/client_sheets/sky_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sky_sheet.cpp
rename to ryzom/client/src/client_sheets/sky_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.h b/ryzom/client/src/client_sheets/sky_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sky_sheet.h
rename to ryzom/client/src/client_sheets/sky_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/sphrase_sheet.cpp b/ryzom/client/src/client_sheets/sphrase_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sphrase_sheet.cpp
rename to ryzom/client/src/client_sheets/sphrase_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/sphrase_sheet.h b/ryzom/client/src/client_sheets/sphrase_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/sphrase_sheet.h
rename to ryzom/client/src/client_sheets/sphrase_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/stdpch.cpp b/ryzom/client/src/client_sheets/stdpch.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/stdpch.cpp
rename to ryzom/client/src/client_sheets/stdpch.cpp
diff --git a/code/ryzom/client/src/client_sheets/stdpch.h b/ryzom/client/src/client_sheets/stdpch.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/stdpch.h
rename to ryzom/client/src/client_sheets/stdpch.h
diff --git a/code/ryzom/client/src/client_sheets/success_table_sheet.cpp b/ryzom/client/src/client_sheets/success_table_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/success_table_sheet.cpp
rename to ryzom/client/src/client_sheets/success_table_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/success_table_sheet.h b/ryzom/client/src/client_sheets/success_table_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/success_table_sheet.h
rename to ryzom/client/src/client_sheets/success_table_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp b/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
rename to ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h b/ryzom/client/src/client_sheets/text_emot_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
rename to ryzom/client/src/client_sheets/text_emot_list_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.cpp b/ryzom/client/src/client_sheets/unblock_titles_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/unblock_titles_sheet.cpp
rename to ryzom/client/src/client_sheets/unblock_titles_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h b/ryzom/client/src/client_sheets/unblock_titles_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/unblock_titles_sheet.h
rename to ryzom/client/src/client_sheets/unblock_titles_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/village_sheet.cpp b/ryzom/client/src/client_sheets/village_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/village_sheet.cpp
rename to ryzom/client/src/client_sheets/village_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/village_sheet.h b/ryzom/client/src/client_sheets/village_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/village_sheet.h
rename to ryzom/client/src/client_sheets/village_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp b/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
rename to ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h b/ryzom/client/src/client_sheets/weather_function_params_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/weather_function_params_sheet.h
rename to ryzom/client/src/client_sheets/weather_function_params_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp b/ryzom/client/src/client_sheets/weather_setup_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp
rename to ryzom/client/src/client_sheets/weather_setup_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.h b/ryzom/client/src/client_sheets/weather_setup_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/weather_setup_sheet.h
rename to ryzom/client/src/client_sheets/weather_setup_sheet.h
diff --git a/code/ryzom/client/src/client_sheets/world_sheet.cpp b/ryzom/client/src/client_sheets/world_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/client_sheets/world_sheet.cpp
rename to ryzom/client/src/client_sheets/world_sheet.cpp
diff --git a/code/ryzom/client/src/client_sheets/world_sheet.h b/ryzom/client/src/client_sheets/world_sheet.h
similarity index 100%
rename from code/ryzom/client/src/client_sheets/world_sheet.h
rename to ryzom/client/src/client_sheets/world_sheet.h
diff --git a/code/ryzom/client/src/color_slot_manager.cpp b/ryzom/client/src/color_slot_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/color_slot_manager.cpp
rename to ryzom/client/src/color_slot_manager.cpp
diff --git a/code/ryzom/client/src/color_slot_manager.h b/ryzom/client/src/color_slot_manager.h
similarity index 100%
rename from code/ryzom/client/src/color_slot_manager.h
rename to ryzom/client/src/color_slot_manager.h
diff --git a/code/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
similarity index 100%
rename from code/ryzom/client/src/commands.cpp
rename to ryzom/client/src/commands.cpp
diff --git a/code/ryzom/client/src/commands.h b/ryzom/client/src/commands.h
similarity index 100%
rename from code/ryzom/client/src/commands.h
rename to ryzom/client/src/commands.h
diff --git a/code/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
similarity index 100%
rename from code/ryzom/client/src/connection.cpp
rename to ryzom/client/src/connection.cpp
diff --git a/code/ryzom/client/src/connection.h b/ryzom/client/src/connection.h
similarity index 100%
rename from code/ryzom/client/src/connection.h
rename to ryzom/client/src/connection.h
diff --git a/code/ryzom/client/src/contextual_cursor.cpp b/ryzom/client/src/contextual_cursor.cpp
similarity index 100%
rename from code/ryzom/client/src/contextual_cursor.cpp
rename to ryzom/client/src/contextual_cursor.cpp
diff --git a/code/ryzom/client/src/contextual_cursor.h b/ryzom/client/src/contextual_cursor.h
similarity index 100%
rename from code/ryzom/client/src/contextual_cursor.h
rename to ryzom/client/src/contextual_cursor.h
diff --git a/code/ryzom/client/src/continent.cpp b/ryzom/client/src/continent.cpp
similarity index 100%
rename from code/ryzom/client/src/continent.cpp
rename to ryzom/client/src/continent.cpp
diff --git a/code/ryzom/client/src/continent.h b/ryzom/client/src/continent.h
similarity index 100%
rename from code/ryzom/client/src/continent.h
rename to ryzom/client/src/continent.h
diff --git a/code/ryzom/client/src/continent_manager.cpp b/ryzom/client/src/continent_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/continent_manager.cpp
rename to ryzom/client/src/continent_manager.cpp
diff --git a/code/ryzom/client/src/continent_manager.h b/ryzom/client/src/continent_manager.h
similarity index 100%
rename from code/ryzom/client/src/continent_manager.h
rename to ryzom/client/src/continent_manager.h
diff --git a/code/ryzom/client/src/continent_manager_build.cpp b/ryzom/client/src/continent_manager_build.cpp
similarity index 100%
rename from code/ryzom/client/src/continent_manager_build.cpp
rename to ryzom/client/src/continent_manager_build.cpp
diff --git a/code/ryzom/client/src/continent_manager_build.h b/ryzom/client/src/continent_manager_build.h
similarity index 100%
rename from code/ryzom/client/src/continent_manager_build.h
rename to ryzom/client/src/continent_manager_build.h
diff --git a/code/ryzom/client/src/cursor_functions.cpp b/ryzom/client/src/cursor_functions.cpp
similarity index 100%
rename from code/ryzom/client/src/cursor_functions.cpp
rename to ryzom/client/src/cursor_functions.cpp
diff --git a/code/ryzom/client/src/cursor_functions.h b/ryzom/client/src/cursor_functions.h
similarity index 100%
rename from code/ryzom/client/src/cursor_functions.h
rename to ryzom/client/src/cursor_functions.h
diff --git a/code/ryzom/client/src/custom_matrix.cpp b/ryzom/client/src/custom_matrix.cpp
similarity index 100%
rename from code/ryzom/client/src/custom_matrix.cpp
rename to ryzom/client/src/custom_matrix.cpp
diff --git a/code/ryzom/client/src/custom_matrix.h b/ryzom/client/src/custom_matrix.h
similarity index 100%
rename from code/ryzom/client/src/custom_matrix.h
rename to ryzom/client/src/custom_matrix.h
diff --git a/code/ryzom/client/src/debug_client.cpp b/ryzom/client/src/debug_client.cpp
similarity index 100%
rename from code/ryzom/client/src/debug_client.cpp
rename to ryzom/client/src/debug_client.cpp
diff --git a/code/ryzom/client/src/debug_client.h b/ryzom/client/src/debug_client.h
similarity index 100%
rename from code/ryzom/client/src/debug_client.h
rename to ryzom/client/src/debug_client.h
diff --git a/code/ryzom/client/src/decal.cpp b/ryzom/client/src/decal.cpp
similarity index 100%
rename from code/ryzom/client/src/decal.cpp
rename to ryzom/client/src/decal.cpp
diff --git a/code/ryzom/client/src/decal.h b/ryzom/client/src/decal.h
similarity index 100%
rename from code/ryzom/client/src/decal.h
rename to ryzom/client/src/decal.h
diff --git a/code/ryzom/client/src/decal_anim.cpp b/ryzom/client/src/decal_anim.cpp
similarity index 100%
rename from code/ryzom/client/src/decal_anim.cpp
rename to ryzom/client/src/decal_anim.cpp
diff --git a/code/ryzom/client/src/decal_anim.h b/ryzom/client/src/decal_anim.h
similarity index 100%
rename from code/ryzom/client/src/decal_anim.h
rename to ryzom/client/src/decal_anim.h
diff --git a/code/ryzom/client/src/demo.cpp b/ryzom/client/src/demo.cpp
similarity index 100%
rename from code/ryzom/client/src/demo.cpp
rename to ryzom/client/src/demo.cpp
diff --git a/code/ryzom/client/src/demo.h b/ryzom/client/src/demo.h
similarity index 100%
rename from code/ryzom/client/src/demo.h
rename to ryzom/client/src/demo.h
diff --git a/code/ryzom/client/src/door_manager.cpp b/ryzom/client/src/door_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/door_manager.cpp
rename to ryzom/client/src/door_manager.cpp
diff --git a/code/ryzom/client/src/door_manager.h b/ryzom/client/src/door_manager.h
similarity index 100%
rename from code/ryzom/client/src/door_manager.h
rename to ryzom/client/src/door_manager.h
diff --git a/code/ryzom/client/src/dummy_progress.h b/ryzom/client/src/dummy_progress.h
similarity index 100%
rename from code/ryzom/client/src/dummy_progress.h
rename to ryzom/client/src/dummy_progress.h
diff --git a/code/ryzom/client/src/entities.cpp b/ryzom/client/src/entities.cpp
similarity index 100%
rename from code/ryzom/client/src/entities.cpp
rename to ryzom/client/src/entities.cpp
diff --git a/code/ryzom/client/src/entities.h b/ryzom/client/src/entities.h
similarity index 100%
rename from code/ryzom/client/src/entities.h
rename to ryzom/client/src/entities.h
diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/ryzom/client/src/entity_animation_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/entity_animation_manager.cpp
rename to ryzom/client/src/entity_animation_manager.cpp
diff --git a/code/ryzom/client/src/entity_animation_manager.h b/ryzom/client/src/entity_animation_manager.h
similarity index 100%
rename from code/ryzom/client/src/entity_animation_manager.h
rename to ryzom/client/src/entity_animation_manager.h
diff --git a/code/ryzom/client/src/entity_cl.cpp b/ryzom/client/src/entity_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/entity_cl.cpp
rename to ryzom/client/src/entity_cl.cpp
diff --git a/code/ryzom/client/src/entity_cl.h b/ryzom/client/src/entity_cl.h
similarity index 100%
rename from code/ryzom/client/src/entity_cl.h
rename to ryzom/client/src/entity_cl.h
diff --git a/code/ryzom/client/src/entity_fx.cpp b/ryzom/client/src/entity_fx.cpp
similarity index 100%
rename from code/ryzom/client/src/entity_fx.cpp
rename to ryzom/client/src/entity_fx.cpp
diff --git a/code/ryzom/client/src/entity_fx.h b/ryzom/client/src/entity_fx.h
similarity index 100%
rename from code/ryzom/client/src/entity_fx.h
rename to ryzom/client/src/entity_fx.h
diff --git a/code/ryzom/client/src/error_logo.bmp b/ryzom/client/src/error_logo.bmp
similarity index 100%
rename from code/ryzom/client/src/error_logo.bmp
rename to ryzom/client/src/error_logo.bmp
diff --git a/code/ryzom/client/src/events_listener.cpp b/ryzom/client/src/events_listener.cpp
similarity index 100%
rename from code/ryzom/client/src/events_listener.cpp
rename to ryzom/client/src/events_listener.cpp
diff --git a/code/ryzom/client/src/events_listener.h b/ryzom/client/src/events_listener.h
similarity index 100%
rename from code/ryzom/client/src/events_listener.h
rename to ryzom/client/src/events_listener.h
diff --git a/code/ryzom/client/src/faction_war_manager.cpp b/ryzom/client/src/faction_war_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/faction_war_manager.cpp
rename to ryzom/client/src/faction_war_manager.cpp
diff --git a/code/ryzom/client/src/faction_war_manager.h b/ryzom/client/src/faction_war_manager.h
similarity index 100%
rename from code/ryzom/client/src/faction_war_manager.h
rename to ryzom/client/src/faction_war_manager.h
diff --git a/code/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
similarity index 100%
rename from code/ryzom/client/src/far_tp.cpp
rename to ryzom/client/src/far_tp.cpp
diff --git a/code/ryzom/client/src/far_tp.h b/ryzom/client/src/far_tp.h
similarity index 100%
rename from code/ryzom/client/src/far_tp.h
rename to ryzom/client/src/far_tp.h
diff --git a/code/ryzom/client/src/fix_season_data.cpp b/ryzom/client/src/fix_season_data.cpp
similarity index 100%
rename from code/ryzom/client/src/fix_season_data.cpp
rename to ryzom/client/src/fix_season_data.cpp
diff --git a/code/ryzom/client/src/fix_season_data.h b/ryzom/client/src/fix_season_data.h
similarity index 100%
rename from code/ryzom/client/src/fix_season_data.h
rename to ryzom/client/src/fix_season_data.h
diff --git a/code/ryzom/client/src/fog_map.cpp b/ryzom/client/src/fog_map.cpp
similarity index 100%
rename from code/ryzom/client/src/fog_map.cpp
rename to ryzom/client/src/fog_map.cpp
diff --git a/code/ryzom/client/src/fog_map.h b/ryzom/client/src/fog_map.h
similarity index 100%
rename from code/ryzom/client/src/fog_map.h
rename to ryzom/client/src/fog_map.h
diff --git a/code/ryzom/client/src/forage_source_cl.cpp b/ryzom/client/src/forage_source_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/forage_source_cl.cpp
rename to ryzom/client/src/forage_source_cl.cpp
diff --git a/code/ryzom/client/src/forage_source_cl.h b/ryzom/client/src/forage_source_cl.h
similarity index 100%
rename from code/ryzom/client/src/forage_source_cl.h
rename to ryzom/client/src/forage_source_cl.h
diff --git a/code/ryzom/client/src/fx_cl.cpp b/ryzom/client/src/fx_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/fx_cl.cpp
rename to ryzom/client/src/fx_cl.cpp
diff --git a/code/ryzom/client/src/fx_cl.h b/ryzom/client/src/fx_cl.h
similarity index 100%
rename from code/ryzom/client/src/fx_cl.h
rename to ryzom/client/src/fx_cl.h
diff --git a/code/ryzom/client/src/fx_manager.cpp b/ryzom/client/src/fx_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/fx_manager.cpp
rename to ryzom/client/src/fx_manager.cpp
diff --git a/code/ryzom/client/src/fx_manager.h b/ryzom/client/src/fx_manager.h
similarity index 100%
rename from code/ryzom/client/src/fx_manager.h
rename to ryzom/client/src/fx_manager.h
diff --git a/code/ryzom/client/src/gabarit.cpp b/ryzom/client/src/gabarit.cpp
similarity index 100%
rename from code/ryzom/client/src/gabarit.cpp
rename to ryzom/client/src/gabarit.cpp
diff --git a/code/ryzom/client/src/gabarit.h b/ryzom/client/src/gabarit.h
similarity index 100%
rename from code/ryzom/client/src/gabarit.h
rename to ryzom/client/src/gabarit.h
diff --git a/code/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
similarity index 100%
rename from code/ryzom/client/src/game_context_menu.cpp
rename to ryzom/client/src/game_context_menu.cpp
diff --git a/code/ryzom/client/src/game_context_menu.h b/ryzom/client/src/game_context_menu.h
similarity index 100%
rename from code/ryzom/client/src/game_context_menu.h
rename to ryzom/client/src/game_context_menu.h
diff --git a/code/ryzom/client/src/gateway_fec_transport.cpp b/ryzom/client/src/gateway_fec_transport.cpp
similarity index 100%
rename from code/ryzom/client/src/gateway_fec_transport.cpp
rename to ryzom/client/src/gateway_fec_transport.cpp
diff --git a/code/ryzom/client/src/global.cpp b/ryzom/client/src/global.cpp
similarity index 100%
rename from code/ryzom/client/src/global.cpp
rename to ryzom/client/src/global.cpp
diff --git a/code/ryzom/client/src/global.h b/ryzom/client/src/global.h
similarity index 100%
rename from code/ryzom/client/src/global.h
rename to ryzom/client/src/global.h
diff --git a/code/ryzom/client/src/graph.cpp b/ryzom/client/src/graph.cpp
similarity index 100%
rename from code/ryzom/client/src/graph.cpp
rename to ryzom/client/src/graph.cpp
diff --git a/code/ryzom/client/src/graph.h b/ryzom/client/src/graph.h
similarity index 100%
rename from code/ryzom/client/src/graph.h
rename to ryzom/client/src/graph.h
diff --git a/code/ryzom/client/src/graphic.cpp b/ryzom/client/src/graphic.cpp
similarity index 100%
rename from code/ryzom/client/src/graphic.cpp
rename to ryzom/client/src/graphic.cpp
diff --git a/code/ryzom/client/src/graphic.h b/ryzom/client/src/graphic.h
similarity index 100%
rename from code/ryzom/client/src/graphic.h
rename to ryzom/client/src/graphic.h
diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/ryzom/client/src/ground_fx_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/ground_fx_manager.cpp
rename to ryzom/client/src/ground_fx_manager.cpp
diff --git a/code/ryzom/client/src/ground_fx_manager.h b/ryzom/client/src/ground_fx_manager.h
similarity index 100%
rename from code/ryzom/client/src/ground_fx_manager.h
rename to ryzom/client/src/ground_fx_manager.h
diff --git a/code/ryzom/client/src/hair_set.cpp b/ryzom/client/src/hair_set.cpp
similarity index 100%
rename from code/ryzom/client/src/hair_set.cpp
rename to ryzom/client/src/hair_set.cpp
diff --git a/code/ryzom/client/src/hair_set.h b/ryzom/client/src/hair_set.h
similarity index 100%
rename from code/ryzom/client/src/hair_set.h
rename to ryzom/client/src/hair_set.h
diff --git a/code/ryzom/client/src/ig_callback.cpp b/ryzom/client/src/ig_callback.cpp
similarity index 100%
rename from code/ryzom/client/src/ig_callback.cpp
rename to ryzom/client/src/ig_callback.cpp
diff --git a/code/ryzom/client/src/ig_callback.h b/ryzom/client/src/ig_callback.h
similarity index 100%
rename from code/ryzom/client/src/ig_callback.h
rename to ryzom/client/src/ig_callback.h
diff --git a/code/ryzom/client/src/ig_client.cpp b/ryzom/client/src/ig_client.cpp
similarity index 100%
rename from code/ryzom/client/src/ig_client.cpp
rename to ryzom/client/src/ig_client.cpp
diff --git a/code/ryzom/client/src/ig_client.h b/ryzom/client/src/ig_client.h
similarity index 100%
rename from code/ryzom/client/src/ig_client.h
rename to ryzom/client/src/ig_client.h
diff --git a/code/ryzom/client/src/ig_enum.cpp b/ryzom/client/src/ig_enum.cpp
similarity index 100%
rename from code/ryzom/client/src/ig_enum.cpp
rename to ryzom/client/src/ig_enum.cpp
diff --git a/code/ryzom/client/src/ig_enum.h b/ryzom/client/src/ig_enum.h
similarity index 100%
rename from code/ryzom/client/src/ig_enum.h
rename to ryzom/client/src/ig_enum.h
diff --git a/code/ryzom/client/src/ig_season_callback.cpp b/ryzom/client/src/ig_season_callback.cpp
similarity index 100%
rename from code/ryzom/client/src/ig_season_callback.cpp
rename to ryzom/client/src/ig_season_callback.cpp
diff --git a/code/ryzom/client/src/ig_season_callback.h b/ryzom/client/src/ig_season_callback.h
similarity index 100%
rename from code/ryzom/client/src/ig_season_callback.h
rename to ryzom/client/src/ig_season_callback.h
diff --git a/code/ryzom/client/src/impulse_decoder.cpp b/ryzom/client/src/impulse_decoder.cpp
similarity index 100%
rename from code/ryzom/client/src/impulse_decoder.cpp
rename to ryzom/client/src/impulse_decoder.cpp
diff --git a/code/ryzom/client/src/impulse_decoder.h b/ryzom/client/src/impulse_decoder.h
similarity index 100%
rename from code/ryzom/client/src/impulse_decoder.h
rename to ryzom/client/src/impulse_decoder.h
diff --git a/code/ryzom/client/src/ingame_database_manager.cpp b/ryzom/client/src/ingame_database_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/ingame_database_manager.cpp
rename to ryzom/client/src/ingame_database_manager.cpp
diff --git a/code/ryzom/client/src/ingame_database_manager.h b/ryzom/client/src/ingame_database_manager.h
similarity index 100%
rename from code/ryzom/client/src/ingame_database_manager.h
rename to ryzom/client/src/ingame_database_manager.h
diff --git a/code/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp
similarity index 100%
rename from code/ryzom/client/src/init.cpp
rename to ryzom/client/src/init.cpp
diff --git a/code/ryzom/client/src/init.h b/ryzom/client/src/init.h
similarity index 100%
rename from code/ryzom/client/src/init.h
rename to ryzom/client/src/init.h
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
similarity index 100%
rename from code/ryzom/client/src/init_main_loop.cpp
rename to ryzom/client/src/init_main_loop.cpp
diff --git a/code/ryzom/client/src/init_main_loop.h b/ryzom/client/src/init_main_loop.h
similarity index 100%
rename from code/ryzom/client/src/init_main_loop.h
rename to ryzom/client/src/init_main_loop.h
diff --git a/code/ryzom/client/src/input.cpp b/ryzom/client/src/input.cpp
similarity index 100%
rename from code/ryzom/client/src/input.cpp
rename to ryzom/client/src/input.cpp
diff --git a/code/ryzom/client/src/input.h b/ryzom/client/src/input.h
similarity index 100%
rename from code/ryzom/client/src/input.h
rename to ryzom/client/src/input.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_base.cpp b/ryzom/client/src/interface_v3/action_handler_base.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_base.cpp
rename to ryzom/client/src/interface_v3/action_handler_base.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_base.h b/ryzom/client/src/interface_v3/action_handler_base.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_base.h
rename to ryzom/client/src/interface_v3/action_handler_base.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_debug.cpp b/ryzom/client/src/interface_v3/action_handler_debug.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_debug.cpp
rename to ryzom/client/src/interface_v3/action_handler_debug.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_edit.cpp b/ryzom/client/src/interface_v3/action_handler_edit.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_edit.cpp
rename to ryzom/client/src/interface_v3/action_handler_edit.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_game.cpp
rename to ryzom/client/src/interface_v3/action_handler_game.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_help.cpp
rename to ryzom/client/src/interface_v3/action_handler_help.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.h b/ryzom/client/src/interface_v3/action_handler_help.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_help.h
rename to ryzom/client/src/interface_v3/action_handler_help.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_item.cpp
rename to ryzom/client/src/interface_v3/action_handler_item.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.h b/ryzom/client/src/interface_v3/action_handler_item.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_item.h
rename to ryzom/client/src/interface_v3/action_handler_item.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp b/ryzom/client/src/interface_v3/action_handler_misc.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_misc.cpp
rename to ryzom/client/src/interface_v3/action_handler_misc.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_misc.h b/ryzom/client/src/interface_v3/action_handler_misc.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_misc.h
rename to ryzom/client/src/interface_v3/action_handler_misc.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_move.cpp b/ryzom/client/src/interface_v3/action_handler_move.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_move.cpp
rename to ryzom/client/src/interface_v3/action_handler_move.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_outpost.cpp b/ryzom/client/src/interface_v3/action_handler_outpost.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_outpost.cpp
rename to ryzom/client/src/interface_v3/action_handler_outpost.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/ryzom/client/src/interface_v3/action_handler_phrase.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
rename to ryzom/client/src/interface_v3/action_handler_phrase.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_tools.cpp b/ryzom/client/src/interface_v3/action_handler_tools.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_tools.cpp
rename to ryzom/client/src/interface_v3/action_handler_tools.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_handler_tools.h b/ryzom/client/src/interface_v3/action_handler_tools.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_tools.h
rename to ryzom/client/src/interface_v3/action_handler_tools.h
diff --git a/code/ryzom/client/src/interface_v3/action_handler_ui.cpp b/ryzom/client/src/interface_v3/action_handler_ui.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_handler_ui.cpp
rename to ryzom/client/src/interface_v3/action_handler_ui.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
rename to ryzom/client/src/interface_v3/action_phrase_faber.cpp
diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.h b/ryzom/client/src/interface_v3/action_phrase_faber.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/action_phrase_faber.h
rename to ryzom/client/src/interface_v3/action_phrase_faber.h
diff --git a/code/ryzom/client/src/interface_v3/add_on_manager.cpp b/ryzom/client/src/interface_v3/add_on_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/add_on_manager.cpp
rename to ryzom/client/src/interface_v3/add_on_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/add_on_manager.h b/ryzom/client/src/interface_v3/add_on_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/add_on_manager.h
rename to ryzom/client/src/interface_v3/add_on_manager.h
diff --git a/code/ryzom/client/src/interface_v3/animal_position_state.cpp b/ryzom/client/src/interface_v3/animal_position_state.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/animal_position_state.cpp
rename to ryzom/client/src/interface_v3/animal_position_state.cpp
diff --git a/code/ryzom/client/src/interface_v3/animal_position_state.h b/ryzom/client/src/interface_v3/animal_position_state.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/animal_position_state.h
rename to ryzom/client/src/interface_v3/animal_position_state.h
diff --git a/code/ryzom/client/src/interface_v3/bar_manager.cpp b/ryzom/client/src/interface_v3/bar_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bar_manager.cpp
rename to ryzom/client/src/interface_v3/bar_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/bar_manager.h b/ryzom/client/src/interface_v3/bar_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bar_manager.h
rename to ryzom/client/src/interface_v3/bar_manager.h
diff --git a/code/ryzom/client/src/interface_v3/bonus_malus.cpp b/ryzom/client/src/interface_v3/bonus_malus.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bonus_malus.cpp
rename to ryzom/client/src/interface_v3/bonus_malus.cpp
diff --git a/code/ryzom/client/src/interface_v3/bonus_malus.h b/ryzom/client/src/interface_v3/bonus_malus.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bonus_malus.h
rename to ryzom/client/src/interface_v3/bonus_malus.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp b/ryzom/client/src/interface_v3/bot_chat_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_manager.cpp
rename to ryzom/client/src/interface_v3/bot_chat_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_manager.h b/ryzom/client/src/interface_v3/bot_chat_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_manager.h
rename to ryzom/client/src/interface_v3/bot_chat_manager.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page.cpp b/ryzom/client/src/interface_v3/bot_chat_page.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page.h b/ryzom/client/src/interface_v3/bot_chat_page.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page.h
rename to ryzom/client/src/interface_v3/bot_chat_page.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp b/ryzom/client/src/interface_v3/bot_chat_page_all.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_all.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_all.h b/ryzom/client/src/interface_v3/bot_chat_page_all.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_all.h
rename to ryzom/client/src/interface_v3/bot_chat_page_all.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.h b/ryzom/client/src/interface_v3/bot_chat_page_create_guild.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.h
rename to ryzom/client/src/interface_v3/bot_chat_page_create_guild.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.h b/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.h
rename to ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp b/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.h b/ryzom/client/src/interface_v3/bot_chat_page_mission.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_mission.h
rename to ryzom/client/src/interface_v3/bot_chat_page_mission.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp b/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.h b/ryzom/client/src/interface_v3/bot_chat_page_mission_end.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.h
rename to ryzom/client/src/interface_v3/bot_chat_page_mission_end.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp b/ryzom/client/src/interface_v3/bot_chat_page_news.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_news.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_news.h b/ryzom/client/src/interface_v3/bot_chat_page_news.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_news.h
rename to ryzom/client/src/interface_v3/bot_chat_page_news.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp b/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.h b/ryzom/client/src/interface_v3/bot_chat_page_player_gift.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.h
rename to ryzom/client/src/interface_v3/bot_chat_page_player_gift.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp b/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.h b/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.h
rename to ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.h
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
rename to ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.h b/ryzom/client/src/interface_v3/bot_chat_page_trade.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/bot_chat_page_trade.h
rename to ryzom/client/src/interface_v3/bot_chat_page_trade.h
diff --git a/code/ryzom/client/src/interface_v3/brick_learned_callback.cpp b/ryzom/client/src/interface_v3/brick_learned_callback.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/brick_learned_callback.cpp
rename to ryzom/client/src/interface_v3/brick_learned_callback.cpp
diff --git a/code/ryzom/client/src/interface_v3/brick_learned_callback.h b/ryzom/client/src/interface_v3/brick_learned_callback.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/brick_learned_callback.h
rename to ryzom/client/src/interface_v3/brick_learned_callback.h
diff --git a/code/ryzom/client/src/interface_v3/character_3d.cpp b/ryzom/client/src/interface_v3/character_3d.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/character_3d.cpp
rename to ryzom/client/src/interface_v3/character_3d.cpp
diff --git a/code/ryzom/client/src/interface_v3/character_3d.h b/ryzom/client/src/interface_v3/character_3d.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/character_3d.h
rename to ryzom/client/src/interface_v3/character_3d.h
diff --git a/code/ryzom/client/src/interface_v3/chat_displayer.cpp b/ryzom/client/src/interface_v3/chat_displayer.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_displayer.cpp
rename to ryzom/client/src/interface_v3/chat_displayer.cpp
diff --git a/code/ryzom/client/src/interface_v3/chat_displayer.h b/ryzom/client/src/interface_v3/chat_displayer.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_displayer.h
rename to ryzom/client/src/interface_v3/chat_displayer.h
diff --git a/code/ryzom/client/src/interface_v3/chat_filter.cpp b/ryzom/client/src/interface_v3/chat_filter.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_filter.cpp
rename to ryzom/client/src/interface_v3/chat_filter.cpp
diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/ryzom/client/src/interface_v3/chat_filter.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_filter.h
rename to ryzom/client/src/interface_v3/chat_filter.h
diff --git a/code/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_text_manager.cpp
rename to ryzom/client/src/interface_v3/chat_text_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/chat_text_manager.h b/ryzom/client/src/interface_v3/chat_text_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_text_manager.h
rename to ryzom/client/src/interface_v3/chat_text_manager.h
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_window.cpp
rename to ryzom/client/src/interface_v3/chat_window.cpp
diff --git a/code/ryzom/client/src/interface_v3/chat_window.h b/ryzom/client/src/interface_v3/chat_window.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/chat_window.h
rename to ryzom/client/src/interface_v3/chat_window.h
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
rename to ryzom/client/src/interface_v3/dbctrl_sheet.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/ryzom/client/src/interface_v3/dbctrl_sheet.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbctrl_sheet.h
rename to ryzom/client/src/interface_v3/dbctrl_sheet.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
rename to ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h b/ryzom/client/src/interface_v3/dbgroup_build_phrase.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h
rename to ryzom/client/src/interface_v3/dbgroup_build_phrase.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase_id.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.h
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h b/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
rename to ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
diff --git a/code/ryzom/client/src/interface_v3/encyclopedia_manager.cpp b/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/encyclopedia_manager.cpp
rename to ryzom/client/src/interface_v3/encyclopedia_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/encyclopedia_manager.h b/ryzom/client/src/interface_v3/encyclopedia_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/encyclopedia_manager.h
rename to ryzom/client/src/interface_v3/encyclopedia_manager.h
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp b/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
rename to ryzom/client/src/interface_v3/filtered_chat_summary.cpp
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h b/ryzom/client/src/interface_v3/filtered_chat_summary.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/filtered_chat_summary.h
rename to ryzom/client/src/interface_v3/filtered_chat_summary.h
diff --git a/code/ryzom/client/src/interface_v3/flying_text_manager.cpp b/ryzom/client/src/interface_v3/flying_text_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/flying_text_manager.cpp
rename to ryzom/client/src/interface_v3/flying_text_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/flying_text_manager.h b/ryzom/client/src/interface_v3/flying_text_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/flying_text_manager.h
rename to ryzom/client/src/interface_v3/flying_text_manager.h
diff --git a/code/ryzom/client/src/interface_v3/group_career.cpp b/ryzom/client/src/interface_v3/group_career.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_career.cpp
rename to ryzom/client/src/interface_v3/group_career.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_career.h b/ryzom/client/src/interface_v3/group_career.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_career.h
rename to ryzom/client/src/interface_v3/group_career.h
diff --git a/code/ryzom/client/src/interface_v3/group_compas.cpp b/ryzom/client/src/interface_v3/group_compas.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_compas.cpp
rename to ryzom/client/src/interface_v3/group_compas.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_compas.h b/ryzom/client/src/interface_v3/group_compas.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_compas.h
rename to ryzom/client/src/interface_v3/group_compas.h
diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.cpp b/ryzom/client/src/interface_v3/group_html_cs.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_cs.cpp
rename to ryzom/client/src/interface_v3/group_html_cs.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.h b/ryzom/client/src/interface_v3/group_html_cs.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_cs.h
rename to ryzom/client/src/interface_v3/group_html_cs.h
diff --git a/code/ryzom/client/src/interface_v3/group_html_forum.cpp b/ryzom/client/src/interface_v3/group_html_forum.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_forum.cpp
rename to ryzom/client/src/interface_v3/group_html_forum.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_html_forum.h b/ryzom/client/src/interface_v3/group_html_forum.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_forum.h
rename to ryzom/client/src/interface_v3/group_html_forum.h
diff --git a/code/ryzom/client/src/interface_v3/group_html_mail.cpp b/ryzom/client/src/interface_v3/group_html_mail.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_mail.cpp
rename to ryzom/client/src/interface_v3/group_html_mail.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_html_mail.h b/ryzom/client/src/interface_v3/group_html_mail.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_mail.h
rename to ryzom/client/src/interface_v3/group_html_mail.h
diff --git a/code/ryzom/client/src/interface_v3/group_html_qcm.cpp b/ryzom/client/src/interface_v3/group_html_qcm.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_qcm.cpp
rename to ryzom/client/src/interface_v3/group_html_qcm.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_html_qcm.h b/ryzom/client/src/interface_v3/group_html_qcm.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_qcm.h
rename to ryzom/client/src/interface_v3/group_html_qcm.h
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/ryzom/client/src/interface_v3/group_html_webig.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_webig.cpp
rename to ryzom/client/src/interface_v3/group_html_webig.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.h b/ryzom/client/src/interface_v3/group_html_webig.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_html_webig.h
rename to ryzom/client/src/interface_v3/group_html_webig.h
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene.cpp b/ryzom/client/src/interface_v3/group_in_scene.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene.cpp
rename to ryzom/client/src/interface_v3/group_in_scene.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene.h b/ryzom/client/src/interface_v3/group_in_scene.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene.h
rename to ryzom/client/src/interface_v3/group_in_scene.h
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
rename to ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.h b/ryzom/client/src/interface_v3/group_in_scene_bubble.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene_bubble.h
rename to ryzom/client/src/interface_v3/group_in_scene_bubble.h
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
rename to ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.h b/ryzom/client/src/interface_v3/group_in_scene_user_info.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_in_scene_user_info.h
rename to ryzom/client/src/interface_v3/group_in_scene_user_info.h
diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_map.cpp
rename to ryzom/client/src/interface_v3/group_map.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_map.h b/ryzom/client/src/interface_v3/group_map.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_map.h
rename to ryzom/client/src/interface_v3/group_map.h
diff --git a/code/ryzom/client/src/interface_v3/group_modal_get_key.cpp b/ryzom/client/src/interface_v3/group_modal_get_key.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_modal_get_key.cpp
rename to ryzom/client/src/interface_v3/group_modal_get_key.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_modal_get_key.h b/ryzom/client/src/interface_v3/group_modal_get_key.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_modal_get_key.h
rename to ryzom/client/src/interface_v3/group_modal_get_key.h
diff --git a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
rename to ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h b/ryzom/client/src/interface_v3/group_phrase_skill_filter.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h
rename to ryzom/client/src/interface_v3/group_phrase_skill_filter.h
diff --git a/code/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_quick_help.cpp
rename to ryzom/client/src/interface_v3/group_quick_help.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_quick_help.h b/ryzom/client/src/interface_v3/group_quick_help.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_quick_help.h
rename to ryzom/client/src/interface_v3/group_quick_help.h
diff --git a/code/ryzom/client/src/interface_v3/group_skills.cpp b/ryzom/client/src/interface_v3/group_skills.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_skills.cpp
rename to ryzom/client/src/interface_v3/group_skills.cpp
diff --git a/code/ryzom/client/src/interface_v3/group_skills.h b/ryzom/client/src/interface_v3/group_skills.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/group_skills.h
rename to ryzom/client/src/interface_v3/group_skills.h
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/guild_manager.cpp
rename to ryzom/client/src/interface_v3/guild_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.h b/ryzom/client/src/interface_v3/guild_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/guild_manager.h
rename to ryzom/client/src/interface_v3/guild_manager.h
diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp b/ryzom/client/src/interface_v3/input_handler_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/input_handler_manager.cpp
rename to ryzom/client/src/interface_v3/input_handler_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.h b/ryzom/client/src/interface_v3/input_handler_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/input_handler_manager.h
rename to ryzom/client/src/interface_v3/input_handler_manager.h
diff --git a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/ryzom/client/src/interface_v3/interface_3d_scene.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_3d_scene.cpp
rename to ryzom/client/src/interface_v3/interface_3d_scene.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_3d_scene.h b/ryzom/client/src/interface_v3/interface_3d_scene.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_3d_scene.h
rename to ryzom/client/src/interface_v3/interface_3d_scene.h
diff --git a/code/ryzom/client/src/interface_v3/interface_config.cpp b/ryzom/client/src/interface_v3/interface_config.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_config.cpp
rename to ryzom/client/src/interface_v3/interface_config.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_config.h b/ryzom/client/src/interface_v3/interface_config.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_config.h
rename to ryzom/client/src/interface_v3/interface_config.h
diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.cpp b/ryzom/client/src/interface_v3/interface_ddx.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_ddx.cpp
rename to ryzom/client/src/interface_v3/interface_ddx.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.h b/ryzom/client/src/interface_v3/interface_ddx.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_ddx.h
rename to ryzom/client/src/interface_v3/interface_ddx.h
diff --git a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
rename to ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp b/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
rename to ryzom/client/src/interface_v3/interface_expr_user_fct_items.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_manager.cpp
rename to ryzom/client/src/interface_v3/interface_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.h b/ryzom/client/src/interface_v3/interface_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_manager.h
rename to ryzom/client/src/interface_v3/interface_manager.h
diff --git a/code/ryzom/client/src/interface_v3/interface_observer.cpp b/ryzom/client/src/interface_v3/interface_observer.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_observer.cpp
rename to ryzom/client/src/interface_v3/interface_observer.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_observer.h b/ryzom/client/src/interface_v3/interface_observer.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_observer.h
rename to ryzom/client/src/interface_v3/interface_observer.h
diff --git a/code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp b/ryzom/client/src/interface_v3/interface_options_ryzom.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp
rename to ryzom/client/src/interface_v3/interface_options_ryzom.cpp
diff --git a/code/ryzom/client/src/interface_v3/interface_options_ryzom.h b/ryzom/client/src/interface_v3/interface_options_ryzom.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_options_ryzom.h
rename to ryzom/client/src/interface_v3/interface_options_ryzom.h
diff --git a/code/ryzom/client/src/interface_v3/interface_pointer.h b/ryzom/client/src/interface_v3/interface_pointer.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/interface_pointer.h
rename to ryzom/client/src/interface_v3/interface_pointer.h
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/inventory_manager.cpp
rename to ryzom/client/src/interface_v3/inventory_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.h b/ryzom/client/src/interface_v3/inventory_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/inventory_manager.h
rename to ryzom/client/src/interface_v3/inventory_manager.h
diff --git a/code/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/ryzom/client/src/interface_v3/item_consumable_effect.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/item_consumable_effect.cpp
rename to ryzom/client/src/interface_v3/item_consumable_effect.cpp
diff --git a/code/ryzom/client/src/interface_v3/item_consumable_effect.h b/ryzom/client/src/interface_v3/item_consumable_effect.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/item_consumable_effect.h
rename to ryzom/client/src/interface_v3/item_consumable_effect.h
diff --git a/code/ryzom/client/src/interface_v3/item_info_waiter.h b/ryzom/client/src/interface_v3/item_info_waiter.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/item_info_waiter.h
rename to ryzom/client/src/interface_v3/item_info_waiter.h
diff --git a/code/ryzom/client/src/interface_v3/item_special_effect.cpp b/ryzom/client/src/interface_v3/item_special_effect.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/item_special_effect.cpp
rename to ryzom/client/src/interface_v3/item_special_effect.cpp
diff --git a/code/ryzom/client/src/interface_v3/item_special_effect.h b/ryzom/client/src/interface_v3/item_special_effect.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/item_special_effect.h
rename to ryzom/client/src/interface_v3/item_special_effect.h
diff --git a/code/ryzom/client/src/interface_v3/list_sheet_base.cpp b/ryzom/client/src/interface_v3/list_sheet_base.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/list_sheet_base.cpp
rename to ryzom/client/src/interface_v3/list_sheet_base.cpp
diff --git a/code/ryzom/client/src/interface_v3/list_sheet_base.h b/ryzom/client/src/interface_v3/list_sheet_base.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/list_sheet_base.h
rename to ryzom/client/src/interface_v3/list_sheet_base.h
diff --git a/code/ryzom/client/src/interface_v3/lua_dll.cpp b/ryzom/client/src/interface_v3/lua_dll.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/lua_dll.cpp
rename to ryzom/client/src/interface_v3/lua_dll.cpp
diff --git a/code/ryzom/client/src/interface_v3/lua_dll.h b/ryzom/client/src/interface_v3/lua_dll.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/lua_dll.h
rename to ryzom/client/src/interface_v3/lua_dll.h
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
rename to ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
rename to ryzom/client/src/interface_v3/lua_ihm_ryzom.h
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp b/ryzom/client/src/interface_v3/macrocmd_key.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/macrocmd_key.cpp
rename to ryzom/client/src/interface_v3/macrocmd_key.cpp
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_key.h b/ryzom/client/src/interface_v3/macrocmd_key.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/macrocmd_key.h
rename to ryzom/client/src/interface_v3/macrocmd_key.h
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/ryzom/client/src/interface_v3/macrocmd_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/macrocmd_manager.cpp
rename to ryzom/client/src/interface_v3/macrocmd_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.h b/ryzom/client/src/interface_v3/macrocmd_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/macrocmd_manager.h
rename to ryzom/client/src/interface_v3/macrocmd_manager.h
diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/music_player.cpp
rename to ryzom/client/src/interface_v3/music_player.cpp
diff --git a/code/ryzom/client/src/interface_v3/music_player.h b/ryzom/client/src/interface_v3/music_player.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/music_player.h
rename to ryzom/client/src/interface_v3/music_player.h
diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.cpp b/ryzom/client/src/interface_v3/obs_huge_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/obs_huge_list.cpp
rename to ryzom/client/src/interface_v3/obs_huge_list.cpp
diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.h b/ryzom/client/src/interface_v3/obs_huge_list.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/obs_huge_list.h
rename to ryzom/client/src/interface_v3/obs_huge_list.h
diff --git a/code/ryzom/client/src/interface_v3/parser_modules.cpp b/ryzom/client/src/interface_v3/parser_modules.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/parser_modules.cpp
rename to ryzom/client/src/interface_v3/parser_modules.cpp
diff --git a/code/ryzom/client/src/interface_v3/parser_modules.h b/ryzom/client/src/interface_v3/parser_modules.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/parser_modules.h
rename to ryzom/client/src/interface_v3/parser_modules.h
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/people_interraction.cpp
rename to ryzom/client/src/interface_v3/people_interraction.cpp
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.h b/ryzom/client/src/interface_v3/people_interraction.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/people_interraction.h
rename to ryzom/client/src/interface_v3/people_interraction.h
diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/ryzom/client/src/interface_v3/people_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/people_list.cpp
rename to ryzom/client/src/interface_v3/people_list.cpp
diff --git a/code/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/people_list.h
rename to ryzom/client/src/interface_v3/people_list.h
diff --git a/code/ryzom/client/src/interface_v3/player_trade.cpp b/ryzom/client/src/interface_v3/player_trade.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/player_trade.cpp
rename to ryzom/client/src/interface_v3/player_trade.cpp
diff --git a/code/ryzom/client/src/interface_v3/player_trade.h b/ryzom/client/src/interface_v3/player_trade.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/player_trade.h
rename to ryzom/client/src/interface_v3/player_trade.h
diff --git a/code/ryzom/client/src/interface_v3/register_interface_elements.cpp b/ryzom/client/src/interface_v3/register_interface_elements.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/register_interface_elements.cpp
rename to ryzom/client/src/interface_v3/register_interface_elements.cpp
diff --git a/code/ryzom/client/src/interface_v3/register_interface_elements.h b/ryzom/client/src/interface_v3/register_interface_elements.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/register_interface_elements.h
rename to ryzom/client/src/interface_v3/register_interface_elements.h
diff --git a/code/ryzom/client/src/interface_v3/req_skill_formula.cpp b/ryzom/client/src/interface_v3/req_skill_formula.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/req_skill_formula.cpp
rename to ryzom/client/src/interface_v3/req_skill_formula.cpp
diff --git a/code/ryzom/client/src/interface_v3/req_skill_formula.h b/ryzom/client/src/interface_v3/req_skill_formula.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/req_skill_formula.h
rename to ryzom/client/src/interface_v3/req_skill_formula.h
diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.cpp b/ryzom/client/src/interface_v3/sbrick_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/sbrick_manager.cpp
rename to ryzom/client/src/interface_v3/sbrick_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.h b/ryzom/client/src/interface_v3/sbrick_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/sbrick_manager.h
rename to ryzom/client/src/interface_v3/sbrick_manager.h
diff --git a/code/ryzom/client/src/interface_v3/skill_change_callback.cpp b/ryzom/client/src/interface_v3/skill_change_callback.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/skill_change_callback.cpp
rename to ryzom/client/src/interface_v3/skill_change_callback.cpp
diff --git a/code/ryzom/client/src/interface_v3/skill_change_callback.h b/ryzom/client/src/interface_v3/skill_change_callback.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/skill_change_callback.h
rename to ryzom/client/src/interface_v3/skill_change_callback.h
diff --git a/code/ryzom/client/src/interface_v3/skill_manager.cpp b/ryzom/client/src/interface_v3/skill_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/skill_manager.cpp
rename to ryzom/client/src/interface_v3/skill_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/skill_manager.h b/ryzom/client/src/interface_v3/skill_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/skill_manager.h
rename to ryzom/client/src/interface_v3/skill_manager.h
diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp b/ryzom/client/src/interface_v3/sphrase_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/sphrase_manager.cpp
rename to ryzom/client/src/interface_v3/sphrase_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.h b/ryzom/client/src/interface_v3/sphrase_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/sphrase_manager.h
rename to ryzom/client/src/interface_v3/sphrase_manager.h
diff --git a/code/ryzom/client/src/interface_v3/task_bar_manager.cpp b/ryzom/client/src/interface_v3/task_bar_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/task_bar_manager.cpp
rename to ryzom/client/src/interface_v3/task_bar_manager.cpp
diff --git a/code/ryzom/client/src/interface_v3/task_bar_manager.h b/ryzom/client/src/interface_v3/task_bar_manager.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/task_bar_manager.h
rename to ryzom/client/src/interface_v3/task_bar_manager.h
diff --git a/code/ryzom/client/src/interface_v3/trade_common.cpp b/ryzom/client/src/interface_v3/trade_common.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/trade_common.cpp
rename to ryzom/client/src/interface_v3/trade_common.cpp
diff --git a/code/ryzom/client/src/interface_v3/trade_common.h b/ryzom/client/src/interface_v3/trade_common.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/trade_common.h
rename to ryzom/client/src/interface_v3/trade_common.h
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
rename to ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.h b/ryzom/client/src/interface_v3/view_bitmap_faber_mp.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.h
rename to ryzom/client/src/interface_v3/view_bitmap_faber_mp.h
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_progress.cpp b/ryzom/client/src/interface_v3/view_bitmap_progress.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_bitmap_progress.cpp
rename to ryzom/client/src/interface_v3/view_bitmap_progress.cpp
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_progress.h b/ryzom/client/src/interface_v3/view_bitmap_progress.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_bitmap_progress.h
rename to ryzom/client/src/interface_v3/view_bitmap_progress.h
diff --git a/code/ryzom/client/src/interface_v3/view_pointer_ryzom.cpp b/ryzom/client/src/interface_v3/view_pointer_ryzom.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_pointer_ryzom.cpp
rename to ryzom/client/src/interface_v3/view_pointer_ryzom.cpp
diff --git a/code/ryzom/client/src/interface_v3/view_pointer_ryzom.h b/ryzom/client/src/interface_v3/view_pointer_ryzom.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_pointer_ryzom.h
rename to ryzom/client/src/interface_v3/view_pointer_ryzom.h
diff --git a/code/ryzom/client/src/interface_v3/view_radar.cpp b/ryzom/client/src/interface_v3/view_radar.cpp
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_radar.cpp
rename to ryzom/client/src/interface_v3/view_radar.cpp
diff --git a/code/ryzom/client/src/interface_v3/view_radar.h b/ryzom/client/src/interface_v3/view_radar.h
similarity index 100%
rename from code/ryzom/client/src/interface_v3/view_radar.h
rename to ryzom/client/src/interface_v3/view_radar.h
diff --git a/code/ryzom/client/src/interfaces_manager/bitmap.cpp b/ryzom/client/src/interfaces_manager/bitmap.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/bitmap.cpp
rename to ryzom/client/src/interfaces_manager/bitmap.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/bitmap.h b/ryzom/client/src/interfaces_manager/bitmap.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/bitmap.h
rename to ryzom/client/src/interfaces_manager/bitmap.h
diff --git a/code/ryzom/client/src/interfaces_manager/bitmap_base.cpp b/ryzom/client/src/interfaces_manager/bitmap_base.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/bitmap_base.cpp
rename to ryzom/client/src/interfaces_manager/bitmap_base.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/bitmap_base.h b/ryzom/client/src/interfaces_manager/bitmap_base.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/bitmap_base.h
rename to ryzom/client/src/interfaces_manager/bitmap_base.h
diff --git a/code/ryzom/client/src/interfaces_manager/brick_control.cpp b/ryzom/client/src/interfaces_manager/brick_control.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/brick_control.cpp
rename to ryzom/client/src/interfaces_manager/brick_control.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/brick_control.h b/ryzom/client/src/interfaces_manager/brick_control.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/brick_control.h
rename to ryzom/client/src/interfaces_manager/brick_control.h
diff --git a/code/ryzom/client/src/interfaces_manager/brick_receptacle.cpp b/ryzom/client/src/interfaces_manager/brick_receptacle.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/brick_receptacle.cpp
rename to ryzom/client/src/interfaces_manager/brick_receptacle.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/brick_receptacle.h b/ryzom/client/src/interfaces_manager/brick_receptacle.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/brick_receptacle.h
rename to ryzom/client/src/interfaces_manager/brick_receptacle.h
diff --git a/code/ryzom/client/src/interfaces_manager/button.cpp b/ryzom/client/src/interfaces_manager/button.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/button.cpp
rename to ryzom/client/src/interfaces_manager/button.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/button.h b/ryzom/client/src/interfaces_manager/button.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/button.h
rename to ryzom/client/src/interfaces_manager/button.h
diff --git a/code/ryzom/client/src/interfaces_manager/button_base.cpp b/ryzom/client/src/interfaces_manager/button_base.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/button_base.cpp
rename to ryzom/client/src/interfaces_manager/button_base.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/button_base.h b/ryzom/client/src/interfaces_manager/button_base.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/button_base.h
rename to ryzom/client/src/interfaces_manager/button_base.h
diff --git a/code/ryzom/client/src/interfaces_manager/candidate_list.cpp b/ryzom/client/src/interfaces_manager/candidate_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/candidate_list.cpp
rename to ryzom/client/src/interfaces_manager/candidate_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/candidate_list.h b/ryzom/client/src/interfaces_manager/candidate_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/candidate_list.h
rename to ryzom/client/src/interfaces_manager/candidate_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/capture.cpp b/ryzom/client/src/interfaces_manager/capture.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/capture.cpp
rename to ryzom/client/src/interfaces_manager/capture.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/capture.h b/ryzom/client/src/interfaces_manager/capture.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/capture.h
rename to ryzom/client/src/interfaces_manager/capture.h
diff --git a/code/ryzom/client/src/interfaces_manager/casting_bar.cpp b/ryzom/client/src/interfaces_manager/casting_bar.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/casting_bar.cpp
rename to ryzom/client/src/interfaces_manager/casting_bar.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/casting_bar.h b/ryzom/client/src/interfaces_manager/casting_bar.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/casting_bar.h
rename to ryzom/client/src/interfaces_manager/casting_bar.h
diff --git a/code/ryzom/client/src/interfaces_manager/chat_control.cpp b/ryzom/client/src/interfaces_manager/chat_control.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/chat_control.cpp
rename to ryzom/client/src/interfaces_manager/chat_control.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/chat_control.h b/ryzom/client/src/interfaces_manager/chat_control.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/chat_control.h
rename to ryzom/client/src/interfaces_manager/chat_control.h
diff --git a/code/ryzom/client/src/interfaces_manager/chat_input.cpp b/ryzom/client/src/interfaces_manager/chat_input.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/chat_input.cpp
rename to ryzom/client/src/interfaces_manager/chat_input.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/chat_input.h b/ryzom/client/src/interfaces_manager/chat_input.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/chat_input.h
rename to ryzom/client/src/interfaces_manager/chat_input.h
diff --git a/code/ryzom/client/src/interfaces_manager/choice_list.cpp b/ryzom/client/src/interfaces_manager/choice_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/choice_list.cpp
rename to ryzom/client/src/interfaces_manager/choice_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/choice_list.h b/ryzom/client/src/interfaces_manager/choice_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/choice_list.h
rename to ryzom/client/src/interfaces_manager/choice_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/control.cpp b/ryzom/client/src/interfaces_manager/control.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/control.cpp
rename to ryzom/client/src/interfaces_manager/control.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/control.h b/ryzom/client/src/interfaces_manager/control.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/control.h
rename to ryzom/client/src/interfaces_manager/control.h
diff --git a/code/ryzom/client/src/interfaces_manager/control_list.cpp b/ryzom/client/src/interfaces_manager/control_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/control_list.cpp
rename to ryzom/client/src/interfaces_manager/control_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/control_list.h b/ryzom/client/src/interfaces_manager/control_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/control_list.h
rename to ryzom/client/src/interfaces_manager/control_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/horizontal_list.cpp b/ryzom/client/src/interfaces_manager/horizontal_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/horizontal_list.cpp
rename to ryzom/client/src/interfaces_manager/horizontal_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/horizontal_list.h b/ryzom/client/src/interfaces_manager/horizontal_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/horizontal_list.h
rename to ryzom/client/src/interfaces_manager/horizontal_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/interf_list.cpp b/ryzom/client/src/interfaces_manager/interf_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interf_list.cpp
rename to ryzom/client/src/interfaces_manager/interf_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/interf_list.h b/ryzom/client/src/interfaces_manager/interf_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interf_list.h
rename to ryzom/client/src/interfaces_manager/interf_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/interf_script.cpp b/ryzom/client/src/interfaces_manager/interf_script.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interf_script.cpp
rename to ryzom/client/src/interfaces_manager/interf_script.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/interf_script.h b/ryzom/client/src/interfaces_manager/interf_script.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interf_script.h
rename to ryzom/client/src/interfaces_manager/interf_script.h
diff --git a/code/ryzom/client/src/interfaces_manager/interfaces_manager.cpp b/ryzom/client/src/interfaces_manager/interfaces_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interfaces_manager.cpp
rename to ryzom/client/src/interfaces_manager/interfaces_manager.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/interfaces_manager.h b/ryzom/client/src/interfaces_manager/interfaces_manager.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/interfaces_manager.h
rename to ryzom/client/src/interfaces_manager/interfaces_manager.h
diff --git a/code/ryzom/client/src/interfaces_manager/multi_list.cpp b/ryzom/client/src/interfaces_manager/multi_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/multi_list.cpp
rename to ryzom/client/src/interfaces_manager/multi_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/multi_list.h b/ryzom/client/src/interfaces_manager/multi_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/multi_list.h
rename to ryzom/client/src/interfaces_manager/multi_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/osd.cpp b/ryzom/client/src/interfaces_manager/osd.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/osd.cpp
rename to ryzom/client/src/interfaces_manager/osd.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/osd.h b/ryzom/client/src/interfaces_manager/osd.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/osd.h
rename to ryzom/client/src/interfaces_manager/osd.h
diff --git a/code/ryzom/client/src/interfaces_manager/osd_base.cpp b/ryzom/client/src/interfaces_manager/osd_base.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/osd_base.cpp
rename to ryzom/client/src/interfaces_manager/osd_base.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/osd_base.h b/ryzom/client/src/interfaces_manager/osd_base.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/osd_base.h
rename to ryzom/client/src/interfaces_manager/osd_base.h
diff --git a/code/ryzom/client/src/interfaces_manager/pen.cpp b/ryzom/client/src/interfaces_manager/pen.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/pen.cpp
rename to ryzom/client/src/interfaces_manager/pen.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/pen.h b/ryzom/client/src/interfaces_manager/pen.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/pen.h
rename to ryzom/client/src/interfaces_manager/pen.h
diff --git a/code/ryzom/client/src/interfaces_manager/progress_bar.cpp b/ryzom/client/src/interfaces_manager/progress_bar.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/progress_bar.cpp
rename to ryzom/client/src/interfaces_manager/progress_bar.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/progress_bar.h b/ryzom/client/src/interfaces_manager/progress_bar.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/progress_bar.h
rename to ryzom/client/src/interfaces_manager/progress_bar.h
diff --git a/code/ryzom/client/src/interfaces_manager/radio_button.cpp b/ryzom/client/src/interfaces_manager/radio_button.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/radio_button.cpp
rename to ryzom/client/src/interfaces_manager/radio_button.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/radio_button.h b/ryzom/client/src/interfaces_manager/radio_button.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/radio_button.h
rename to ryzom/client/src/interfaces_manager/radio_button.h
diff --git a/code/ryzom/client/src/interfaces_manager/radio_controller.cpp b/ryzom/client/src/interfaces_manager/radio_controller.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/radio_controller.cpp
rename to ryzom/client/src/interfaces_manager/radio_controller.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/radio_controller.h b/ryzom/client/src/interfaces_manager/radio_controller.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/radio_controller.h
rename to ryzom/client/src/interfaces_manager/radio_controller.h
diff --git a/code/ryzom/client/src/interfaces_manager/scroll_bar.cpp b/ryzom/client/src/interfaces_manager/scroll_bar.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/scroll_bar.cpp
rename to ryzom/client/src/interfaces_manager/scroll_bar.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/scroll_bar.h b/ryzom/client/src/interfaces_manager/scroll_bar.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/scroll_bar.h
rename to ryzom/client/src/interfaces_manager/scroll_bar.h
diff --git a/code/ryzom/client/src/interfaces_manager/scrollable_control.cpp b/ryzom/client/src/interfaces_manager/scrollable_control.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/scrollable_control.cpp
rename to ryzom/client/src/interfaces_manager/scrollable_control.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/scrollable_control.h b/ryzom/client/src/interfaces_manager/scrollable_control.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/scrollable_control.h
rename to ryzom/client/src/interfaces_manager/scrollable_control.h
diff --git a/code/ryzom/client/src/interfaces_manager/spell_control.cpp b/ryzom/client/src/interfaces_manager/spell_control.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/spell_control.cpp
rename to ryzom/client/src/interfaces_manager/spell_control.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/spell_control.h b/ryzom/client/src/interfaces_manager/spell_control.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/spell_control.h
rename to ryzom/client/src/interfaces_manager/spell_control.h
diff --git a/code/ryzom/client/src/interfaces_manager/spell_list.cpp b/ryzom/client/src/interfaces_manager/spell_list.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/spell_list.cpp
rename to ryzom/client/src/interfaces_manager/spell_list.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/spell_list.h b/ryzom/client/src/interfaces_manager/spell_list.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/spell_list.h
rename to ryzom/client/src/interfaces_manager/spell_list.h
diff --git a/code/ryzom/client/src/interfaces_manager/text.cpp b/ryzom/client/src/interfaces_manager/text.cpp
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/text.cpp
rename to ryzom/client/src/interfaces_manager/text.cpp
diff --git a/code/ryzom/client/src/interfaces_manager/text.h b/ryzom/client/src/interfaces_manager/text.h
similarity index 100%
rename from code/ryzom/client/src/interfaces_manager/text.h
rename to ryzom/client/src/interfaces_manager/text.h
diff --git a/code/ryzom/client/src/item_cl.cpp b/ryzom/client/src/item_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/item_cl.cpp
rename to ryzom/client/src/item_cl.cpp
diff --git a/code/ryzom/client/src/item_cl.h b/ryzom/client/src/item_cl.h
similarity index 100%
rename from code/ryzom/client/src/item_cl.h
rename to ryzom/client/src/item_cl.h
diff --git a/code/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/item_group_manager.cpp
rename to ryzom/client/src/item_group_manager.cpp
diff --git a/code/ryzom/client/src/item_group_manager.h b/ryzom/client/src/item_group_manager.h
similarity index 100%
rename from code/ryzom/client/src/item_group_manager.h
rename to ryzom/client/src/item_group_manager.h
diff --git a/code/ryzom/client/src/landscape_poly_drawer.cpp b/ryzom/client/src/landscape_poly_drawer.cpp
similarity index 100%
rename from code/ryzom/client/src/landscape_poly_drawer.cpp
rename to ryzom/client/src/landscape_poly_drawer.cpp
diff --git a/code/ryzom/client/src/landscape_poly_drawer.h b/ryzom/client/src/landscape_poly_drawer.h
similarity index 100%
rename from code/ryzom/client/src/landscape_poly_drawer.h
rename to ryzom/client/src/landscape_poly_drawer.h
diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/ryzom/client/src/light_cycle_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/light_cycle_manager.cpp
rename to ryzom/client/src/light_cycle_manager.cpp
diff --git a/code/ryzom/client/src/light_cycle_manager.h b/ryzom/client/src/light_cycle_manager.h
similarity index 100%
rename from code/ryzom/client/src/light_cycle_manager.h
rename to ryzom/client/src/light_cycle_manager.h
diff --git a/code/ryzom/client/src/lod_character_user_manager.cpp b/ryzom/client/src/lod_character_user_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/lod_character_user_manager.cpp
rename to ryzom/client/src/lod_character_user_manager.cpp
diff --git a/code/ryzom/client/src/lod_character_user_manager.h b/ryzom/client/src/lod_character_user_manager.h
similarity index 100%
rename from code/ryzom/client/src/lod_character_user_manager.h
rename to ryzom/client/src/lod_character_user_manager.h
diff --git a/code/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp
similarity index 100%
rename from code/ryzom/client/src/login.cpp
rename to ryzom/client/src/login.cpp
diff --git a/code/ryzom/client/src/login.h b/ryzom/client/src/login.h
similarity index 100%
rename from code/ryzom/client/src/login.h
rename to ryzom/client/src/login.h
diff --git a/code/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
similarity index 100%
rename from code/ryzom/client/src/login_patch.cpp
rename to ryzom/client/src/login_patch.cpp
diff --git a/code/ryzom/client/src/login_patch.h b/ryzom/client/src/login_patch.h
similarity index 100%
rename from code/ryzom/client/src/login_patch.h
rename to ryzom/client/src/login_patch.h
diff --git a/code/ryzom/client/src/login_progress_post_thread.cpp b/ryzom/client/src/login_progress_post_thread.cpp
similarity index 100%
rename from code/ryzom/client/src/login_progress_post_thread.cpp
rename to ryzom/client/src/login_progress_post_thread.cpp
diff --git a/code/ryzom/client/src/login_progress_post_thread.h b/ryzom/client/src/login_progress_post_thread.h
similarity index 100%
rename from code/ryzom/client/src/login_progress_post_thread.h
rename to ryzom/client/src/login_progress_post_thread.h
diff --git a/code/ryzom/client/src/login_xdelta.cpp b/ryzom/client/src/login_xdelta.cpp
similarity index 100%
rename from code/ryzom/client/src/login_xdelta.cpp
rename to ryzom/client/src/login_xdelta.cpp
diff --git a/code/ryzom/client/src/login_xdelta.h b/ryzom/client/src/login_xdelta.h
similarity index 100%
rename from code/ryzom/client/src/login_xdelta.h
rename to ryzom/client/src/login_xdelta.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolMenu.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolMenu.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolMenu.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CoolMenu.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FixTB.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FixTB.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FixTB.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FixTB.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FlatBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FlatBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FlatBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/FlatBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/MenuBar.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/MenuBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/MenuBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/MenuBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ModulVer.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ModulVer.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ModulVer.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ModulVer.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellPidl.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellPidl.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellPidl.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellPidl.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellTree.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellTree.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellTree.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/ShellTree.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/Subclass.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/Subclass.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/Subclass.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/Subclass.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/hyperlink.h b/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/hyperlink.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/hyperlink.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/cj60/hyperlink.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h b/ryzom/client/src/lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Accessor.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Accessor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Accessor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Accessor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/KeyWords.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/KeyWords.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/KeyWords.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/KeyWords.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/PropSet.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/PropSet.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/PropSet.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/PropSet.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SString.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SString.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SString.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SString.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SciLexer.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SciLexer.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SciLexer.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/SciLexer.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Scintilla.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Scintilla.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Scintilla.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Scintilla.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/ScintillaWidget.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/ScintillaWidget.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/ScintillaWidget.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/ScintillaWidget.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/WindowAccessor.h b/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/WindowAccessor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/WindowAccessor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/WindowAccessor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60Lib.rc b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60Lib.rc
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60Lib.rc
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60Lib.rc
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.def b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.def
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.def
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.def
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolMenu.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolMenu.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolMenu.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CoolMenu.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FixTB.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FixTB.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FixTB.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FixTB.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FlatBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FlatBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FlatBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/FlatBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.h b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Globals.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/MenuBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/MenuBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/MenuBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/MenuBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ModulVer.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ModulVer.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ModulVer.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ModulVer.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellPidl.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellPidl.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellPidl.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellPidl.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellTree.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellTree.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellTree.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/ShellTree.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Subclass.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Subclass.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Subclass.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/Subclass.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/readme.txt b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/readme.txt
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/readme.txt
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/readme.txt
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_arro.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_arro.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_arro.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_arro.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_explorer.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_explorer.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_explorer.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/btn_explorer.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/button_images.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/button_images.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/button_images.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/button_images.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj60lib.rc2 b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj60lib.rc2
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj60lib.rc2
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj60lib.rc2
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj_logo.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj_logo.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj_logo.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/cj_logo.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/hsplitba.cur b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/hsplitba.cur
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/hsplitba.cur
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/hsplitba.cur
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/vsplitba.cur b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/vsplitba.cur
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/vsplitba.cur
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/res/vsplitba.cur
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/resource.h b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/resource.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/resource.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/resource.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.h b/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/stdafx.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointCondition.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/BreakPointWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/CallStack.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeCtrl.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeCtrl.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeCtrl.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeCtrl.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ColumnTreeWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Debugger.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/DebuggerMessages.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/DebuggerMessages.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/DebuggerMessages.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/DebuggerMessages.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Executor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/FindText.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/GotoLine.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/HelloWorld.lua b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/HelloWorld.lua
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/HelloWorld.lua
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/HelloWorld.lua
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaDoc.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaEditor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaFrame.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaHelper.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/LuaView.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MDIClientWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/MainFrame.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/OutputWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/Project.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectFile.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectNew.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ProjectProperties.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ReadMe.txt b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ReadMe.txt
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ReadMe.txt
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ReadMe.txt
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ScintillaView.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/StdAfx.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/TreeViewFiles.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/VariablesBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchBar.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WatchList_old.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/WorkspaceWnd.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/columntreectrl.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/columntreectrl.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/columntreectrl.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/columntreectrl.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.rc b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.rc
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.rc
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/ide2.rc
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/HelloWorld.lua b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/HelloWorld.lua
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/HelloWorld.lua
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/HelloWorld.lua
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/LuaDoc.ico b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/LuaDoc.ico
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/LuaDoc.ico
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/LuaDoc.ico
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/Toolbar.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/Toolbar.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/Toolbar.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/Toolbar.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.ico b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.ico
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.ico
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.ico
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.rc2 b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.rc2
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.rc2
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/ide2.rc2
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_file.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_file.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_file.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_file.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_tab.bmp b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_tab.bmp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_tab.bmp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/res/il_tab.bmp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/resource.h b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/resource.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/resource.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/resource.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/test.lpr b/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/test.lpr
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/test.lpr
rename to ryzom/client/src/lua_ide_dll_nevrax/source/Ide2/test.lpr
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide2_dll.def b/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide2_dll.def
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide2_dll.def
rename to ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide2_dll.def
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide_interface.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide_interface.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide_interface.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/ide2_dll/ide_interface.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/Readme.txt b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/Readme.txt
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/Readme.txt
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/Readme.txt
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.h b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/StdAfx.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.c b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.h b/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/libapi/libapi.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/AutoComplete.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CallTip.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/CellBuffer.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ContractionState.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Document.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/DocumentAccessor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Editor.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Indicator.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyMap.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyWords.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyWords.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyWords.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/KeyWords.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAVE.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAVE.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAVE.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAVE.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAda.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAda.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAda.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexAda.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBullant.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBullant.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBullant.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBullant.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexConf.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexConf.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexConf.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexConf.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCrontab.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCrontab.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCrontab.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCrontab.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexEiffel.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexEiffel.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexEiffel.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexEiffel.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexHTML.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexHTML.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexHTML.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexHTML.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLisp.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLisp.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLisp.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLisp.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLua.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLua.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLua.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexLua.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexMatlab.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexMatlab.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexMatlab.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexMatlab.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexOthers.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexOthers.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexOthers.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexOthers.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPascal.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPascal.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPascal.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPascal.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPerl.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPerl.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPerl.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPerl.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPython.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPython.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPython.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexPython.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexRuby.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexRuby.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexRuby.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexRuby.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexSQL.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexSQL.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexSQL.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexSQL.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexVB.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexVB.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexVB.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexVB.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LineMarker.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Margin.cur b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Margin.cur
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Margin.cur
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Margin.cur
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/PropSet.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/PropSet.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/PropSet.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/PropSet.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/RESearch.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/SVector.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/SVector.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/SVector.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/SVector.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintRes.rc b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintRes.rc
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintRes.rc
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintRes.rc
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ScintillaBase.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/Style.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/StyleContext.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/UniConversion.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/ViewStyle.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/WindowAccessor.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/WindowAccessor.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/WindowAccessor.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/WindowAccessor.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ExternalLexer.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/Margin.cur b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/Margin.cur
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/Margin.cur
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/Margin.cur
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatWin.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatWin.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatWin.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatWin.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatformRes.h b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatformRes.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatformRes.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/PlatformRes.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintRes.rc b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintRes.rc
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintRes.rc
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintRes.rc
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintillaWin.cxx b/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintillaWin.cxx
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintillaWin.cxx
rename to ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/win32/ScintillaWin.cxx
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lauxlib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lauxlib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lauxlib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/lauxlib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lbaselib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lbaselib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lbaselib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/lbaselib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ldblib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ldblib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ldblib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/ldblib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/liolib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/liolib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/liolib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/liolib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lmathlib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lmathlib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lmathlib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/lmathlib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/loadlib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/loadlib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/loadlib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/loadlib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lstrlib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lstrlib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/lstrlib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/lstrlib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ltablib.c b/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ltablib.c
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/standard/ltablib.c
rename to ryzom/client/src/lua_ide_dll_nevrax/source/standard/ltablib.c
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/ReadMe.txt b/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/ReadMe.txt
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/ReadMe.txt
rename to ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/ReadMe.txt
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.h b/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/StdAfx.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.cpp b/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.h b/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.h
rename to ryzom/client/src/lua_ide_dll_nevrax/source/stdlib/stdlib.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test.lua b/ryzom/client/src/lua_ide_dll_nevrax/test.lua
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test.lua
rename to ryzom/client/src/lua_ide_dll_nevrax/test.lua
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test2.lua b/ryzom/client/src/lua_ide_dll_nevrax/test2.lua
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test2.lua
rename to ryzom/client/src/lua_ide_dll_nevrax/test2.lua
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/ReadMe.txt b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/ReadMe.txt
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/ReadMe.txt
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/ReadMe.txt
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.cpp b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.h b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.h
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/StdAfx.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/resource.h b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/resource.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/resource.h
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/resource.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/small.ico b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/small.ico
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/small.ico
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/small.ico
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.cpp b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.cpp
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.cpp
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.cpp
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.h b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.h
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.h
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.h
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.ico b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.ico
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.ico
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.ico
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.rc b/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.rc
similarity index 100%
rename from code/ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.rc
rename to ryzom/client/src/lua_ide_dll_nevrax/test_ide_dll_2/test_ide_dll_2.rc
diff --git a/code/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
similarity index 100%
rename from code/ryzom/client/src/main_loop.cpp
rename to ryzom/client/src/main_loop.cpp
diff --git a/code/ryzom/client/src/main_loop.h b/ryzom/client/src/main_loop.h
similarity index 100%
rename from code/ryzom/client/src/main_loop.h
rename to ryzom/client/src/main_loop.h
diff --git a/code/ryzom/client/src/main_loop_debug.cpp b/ryzom/client/src/main_loop_debug.cpp
similarity index 100%
rename from code/ryzom/client/src/main_loop_debug.cpp
rename to ryzom/client/src/main_loop_debug.cpp
diff --git a/code/ryzom/client/src/main_loop_debug.h b/ryzom/client/src/main_loop_debug.h
similarity index 100%
rename from code/ryzom/client/src/main_loop_debug.h
rename to ryzom/client/src/main_loop_debug.h
diff --git a/code/ryzom/client/src/main_loop_temp.cpp b/ryzom/client/src/main_loop_temp.cpp
similarity index 100%
rename from code/ryzom/client/src/main_loop_temp.cpp
rename to ryzom/client/src/main_loop_temp.cpp
diff --git a/code/ryzom/client/src/main_loop_temp.h b/ryzom/client/src/main_loop_temp.h
similarity index 100%
rename from code/ryzom/client/src/main_loop_temp.h
rename to ryzom/client/src/main_loop_temp.h
diff --git a/code/ryzom/client/src/main_loop_utilities.cpp b/ryzom/client/src/main_loop_utilities.cpp
similarity index 100%
rename from code/ryzom/client/src/main_loop_utilities.cpp
rename to ryzom/client/src/main_loop_utilities.cpp
diff --git a/code/ryzom/client/src/main_loop_utilities.h b/ryzom/client/src/main_loop_utilities.h
similarity index 100%
rename from code/ryzom/client/src/main_loop_utilities.h
rename to ryzom/client/src/main_loop_utilities.h
diff --git a/code/ryzom/client/src/mesh_camera_col_manager.cpp b/ryzom/client/src/mesh_camera_col_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/mesh_camera_col_manager.cpp
rename to ryzom/client/src/mesh_camera_col_manager.cpp
diff --git a/code/ryzom/client/src/mesh_camera_col_manager.h b/ryzom/client/src/mesh_camera_col_manager.h
similarity index 100%
rename from code/ryzom/client/src/mesh_camera_col_manager.h
rename to ryzom/client/src/mesh_camera_col_manager.h
diff --git a/code/ryzom/client/src/micro_life_manager.cpp b/ryzom/client/src/micro_life_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/micro_life_manager.cpp
rename to ryzom/client/src/micro_life_manager.cpp
diff --git a/code/ryzom/client/src/micro_life_manager.h b/ryzom/client/src/micro_life_manager.h
similarity index 100%
rename from code/ryzom/client/src/micro_life_manager.h
rename to ryzom/client/src/micro_life_manager.h
diff --git a/code/ryzom/client/src/misc.cpp b/ryzom/client/src/misc.cpp
similarity index 100%
rename from code/ryzom/client/src/misc.cpp
rename to ryzom/client/src/misc.cpp
diff --git a/code/ryzom/client/src/misc.h b/ryzom/client/src/misc.h
similarity index 100%
rename from code/ryzom/client/src/misc.h
rename to ryzom/client/src/misc.h
diff --git a/code/ryzom/client/src/motion/modes/ai_mode.cpp b/ryzom/client/src/motion/modes/ai_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/ai_mode.cpp
rename to ryzom/client/src/motion/modes/ai_mode.cpp
diff --git a/code/ryzom/client/src/motion/modes/death_mode.cpp b/ryzom/client/src/motion/modes/death_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/death_mode.cpp
rename to ryzom/client/src/motion/modes/death_mode.cpp
diff --git a/code/ryzom/client/src/motion/modes/free_head.cpp b/ryzom/client/src/motion/modes/free_head.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/free_head.cpp
rename to ryzom/client/src/motion/modes/free_head.cpp
diff --git a/code/ryzom/client/src/motion/modes/interface_mode.cpp b/ryzom/client/src/motion/modes/interface_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/interface_mode.cpp
rename to ryzom/client/src/motion/modes/interface_mode.cpp
diff --git a/code/ryzom/client/src/motion/modes/mount_mode.cpp b/ryzom/client/src/motion/modes/mount_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/mount_mode.cpp
rename to ryzom/client/src/motion/modes/mount_mode.cpp
diff --git a/code/ryzom/client/src/motion/modes/third_mode.cpp b/ryzom/client/src/motion/modes/third_mode.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/modes/third_mode.cpp
rename to ryzom/client/src/motion/modes/third_mode.cpp
diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/ryzom/client/src/motion/user_controls.cpp
similarity index 100%
rename from code/ryzom/client/src/motion/user_controls.cpp
rename to ryzom/client/src/motion/user_controls.cpp
diff --git a/code/ryzom/client/src/motion/user_controls.h b/ryzom/client/src/motion/user_controls.h
similarity index 100%
rename from code/ryzom/client/src/motion/user_controls.h
rename to ryzom/client/src/motion/user_controls.h
diff --git a/code/ryzom/client/src/movie_shooter.cpp b/ryzom/client/src/movie_shooter.cpp
similarity index 100%
rename from code/ryzom/client/src/movie_shooter.cpp
rename to ryzom/client/src/movie_shooter.cpp
diff --git a/code/ryzom/client/src/movie_shooter.h b/ryzom/client/src/movie_shooter.h
similarity index 100%
rename from code/ryzom/client/src/movie_shooter.h
rename to ryzom/client/src/movie_shooter.h
diff --git a/code/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/net_manager.cpp
rename to ryzom/client/src/net_manager.cpp
diff --git a/code/ryzom/client/src/net_manager.h b/ryzom/client/src/net_manager.h
similarity index 100%
rename from code/ryzom/client/src/net_manager.h
rename to ryzom/client/src/net_manager.h
diff --git a/code/ryzom/client/src/network_connection.cpp b/ryzom/client/src/network_connection.cpp
similarity index 100%
rename from code/ryzom/client/src/network_connection.cpp
rename to ryzom/client/src/network_connection.cpp
diff --git a/code/ryzom/client/src/network_connection.h b/ryzom/client/src/network_connection.h
similarity index 100%
rename from code/ryzom/client/src/network_connection.h
rename to ryzom/client/src/network_connection.h
diff --git a/code/ryzom/client/src/npc_icon.cpp b/ryzom/client/src/npc_icon.cpp
similarity index 100%
rename from code/ryzom/client/src/npc_icon.cpp
rename to ryzom/client/src/npc_icon.cpp
diff --git a/code/ryzom/client/src/npc_icon.h b/ryzom/client/src/npc_icon.h
similarity index 100%
rename from code/ryzom/client/src/npc_icon.h
rename to ryzom/client/src/npc_icon.h
diff --git a/code/ryzom/client/src/outpost.cpp b/ryzom/client/src/outpost.cpp
similarity index 100%
rename from code/ryzom/client/src/outpost.cpp
rename to ryzom/client/src/outpost.cpp
diff --git a/code/ryzom/client/src/outpost.h b/ryzom/client/src/outpost.h
similarity index 100%
rename from code/ryzom/client/src/outpost.h
rename to ryzom/client/src/outpost.h
diff --git a/code/ryzom/client/src/outpost_manager.cpp b/ryzom/client/src/outpost_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/outpost_manager.cpp
rename to ryzom/client/src/outpost_manager.cpp
diff --git a/code/ryzom/client/src/outpost_manager.h b/ryzom/client/src/outpost_manager.h
similarity index 100%
rename from code/ryzom/client/src/outpost_manager.h
rename to ryzom/client/src/outpost_manager.h
diff --git a/code/ryzom/client/src/pacs_client.cpp b/ryzom/client/src/pacs_client.cpp
similarity index 100%
rename from code/ryzom/client/src/pacs_client.cpp
rename to ryzom/client/src/pacs_client.cpp
diff --git a/code/ryzom/client/src/pacs_client.h b/ryzom/client/src/pacs_client.h
similarity index 100%
rename from code/ryzom/client/src/pacs_client.h
rename to ryzom/client/src/pacs_client.h
diff --git a/code/ryzom/client/src/permanent_ban.cpp b/ryzom/client/src/permanent_ban.cpp
similarity index 100%
rename from code/ryzom/client/src/permanent_ban.cpp
rename to ryzom/client/src/permanent_ban.cpp
diff --git a/code/ryzom/client/src/permanent_ban.h b/ryzom/client/src/permanent_ban.h
similarity index 100%
rename from code/ryzom/client/src/permanent_ban.h
rename to ryzom/client/src/permanent_ban.h
diff --git a/code/ryzom/client/src/ping.cpp b/ryzom/client/src/ping.cpp
similarity index 100%
rename from code/ryzom/client/src/ping.cpp
rename to ryzom/client/src/ping.cpp
diff --git a/code/ryzom/client/src/ping.h b/ryzom/client/src/ping.h
similarity index 100%
rename from code/ryzom/client/src/ping.h
rename to ryzom/client/src/ping.h
diff --git a/code/ryzom/client/src/player_cl.cpp b/ryzom/client/src/player_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/player_cl.cpp
rename to ryzom/client/src/player_cl.cpp
diff --git a/code/ryzom/client/src/player_cl.h b/ryzom/client/src/player_cl.h
similarity index 100%
rename from code/ryzom/client/src/player_cl.h
rename to ryzom/client/src/player_cl.h
diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/ryzom/client/src/player_r2_cl.cpp
similarity index 100%
rename from code/ryzom/client/src/player_r2_cl.cpp
rename to ryzom/client/src/player_r2_cl.cpp
diff --git a/code/ryzom/client/src/player_r2_cl.h b/ryzom/client/src/player_r2_cl.h
similarity index 100%
rename from code/ryzom/client/src/player_r2_cl.h
rename to ryzom/client/src/player_r2_cl.h
diff --git a/code/ryzom/client/src/precipitation.cpp b/ryzom/client/src/precipitation.cpp
similarity index 100%
rename from code/ryzom/client/src/precipitation.cpp
rename to ryzom/client/src/precipitation.cpp
diff --git a/code/ryzom/client/src/precipitation.h b/ryzom/client/src/precipitation.h
similarity index 100%
rename from code/ryzom/client/src/precipitation.h
rename to ryzom/client/src/precipitation.h
diff --git a/code/ryzom/client/src/precipitation_clip_grid.cpp b/ryzom/client/src/precipitation_clip_grid.cpp
similarity index 100%
rename from code/ryzom/client/src/precipitation_clip_grid.cpp
rename to ryzom/client/src/precipitation_clip_grid.cpp
diff --git a/code/ryzom/client/src/precipitation_clip_grid.h b/ryzom/client/src/precipitation_clip_grid.h
similarity index 100%
rename from code/ryzom/client/src/precipitation_clip_grid.h
rename to ryzom/client/src/precipitation_clip_grid.h
diff --git a/code/ryzom/client/src/prim_file.cpp b/ryzom/client/src/prim_file.cpp
similarity index 100%
rename from code/ryzom/client/src/prim_file.cpp
rename to ryzom/client/src/prim_file.cpp
diff --git a/code/ryzom/client/src/prim_file.h b/ryzom/client/src/prim_file.h
similarity index 100%
rename from code/ryzom/client/src/prim_file.h
rename to ryzom/client/src/prim_file.h
diff --git a/code/ryzom/client/src/profiling.cpp b/ryzom/client/src/profiling.cpp
similarity index 100%
rename from code/ryzom/client/src/profiling.cpp
rename to ryzom/client/src/profiling.cpp
diff --git a/code/ryzom/client/src/profiling.h b/ryzom/client/src/profiling.h
similarity index 100%
rename from code/ryzom/client/src/profiling.h
rename to ryzom/client/src/profiling.h
diff --git a/code/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
similarity index 100%
rename from code/ryzom/client/src/progress.cpp
rename to ryzom/client/src/progress.cpp
diff --git a/code/ryzom/client/src/progress.h b/ryzom/client/src/progress.h
similarity index 100%
rename from code/ryzom/client/src/progress.h
rename to ryzom/client/src/progress.h
diff --git a/code/ryzom/client/src/projectile_desc.h b/ryzom/client/src/projectile_desc.h
similarity index 100%
rename from code/ryzom/client/src/projectile_desc.h
rename to ryzom/client/src/projectile_desc.h
diff --git a/code/ryzom/client/src/projectile_manager.cpp b/ryzom/client/src/projectile_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/projectile_manager.cpp
rename to ryzom/client/src/projectile_manager.cpp
diff --git a/code/ryzom/client/src/projectile_manager.h b/ryzom/client/src/projectile_manager.h
similarity index 100%
rename from code/ryzom/client/src/projectile_manager.h
rename to ryzom/client/src/projectile_manager.h
diff --git a/code/ryzom/client/src/property_decoder.cpp b/ryzom/client/src/property_decoder.cpp
similarity index 100%
rename from code/ryzom/client/src/property_decoder.cpp
rename to ryzom/client/src/property_decoder.cpp
diff --git a/code/ryzom/client/src/property_decoder.h b/ryzom/client/src/property_decoder.h
similarity index 100%
rename from code/ryzom/client/src/property_decoder.h
rename to ryzom/client/src/property_decoder.h
diff --git a/code/ryzom/client/src/r2/auto_group.cpp b/ryzom/client/src/r2/auto_group.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/auto_group.cpp
rename to ryzom/client/src/r2/auto_group.cpp
diff --git a/code/ryzom/client/src/r2/auto_group.h b/ryzom/client/src/r2/auto_group.h
similarity index 100%
rename from code/ryzom/client/src/r2/auto_group.h
rename to ryzom/client/src/r2/auto_group.h
diff --git a/code/ryzom/client/src/r2/config_var.cpp b/ryzom/client/src/r2/config_var.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/config_var.cpp
rename to ryzom/client/src/r2/config_var.cpp
diff --git a/code/ryzom/client/src/r2/config_var.h b/ryzom/client/src/r2/config_var.h
similarity index 100%
rename from code/ryzom/client/src/r2/config_var.h
rename to ryzom/client/src/r2/config_var.h
diff --git a/code/ryzom/client/src/r2/displayer_base.cpp b/ryzom/client/src/r2/displayer_base.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_base.cpp
rename to ryzom/client/src/r2/displayer_base.cpp
diff --git a/code/ryzom/client/src/r2/displayer_base.h b/ryzom/client/src/r2/displayer_base.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_base.h
rename to ryzom/client/src/r2/displayer_base.h
diff --git a/code/ryzom/client/src/r2/displayer_lua.cpp b/ryzom/client/src/r2/displayer_lua.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_lua.cpp
rename to ryzom/client/src/r2/displayer_lua.cpp
diff --git a/code/ryzom/client/src/r2/displayer_lua.h b/ryzom/client/src/r2/displayer_lua.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_lua.h
rename to ryzom/client/src/r2/displayer_lua.h
diff --git a/code/ryzom/client/src/r2/displayer_property.h b/ryzom/client/src/r2/displayer_property.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_property.h
rename to ryzom/client/src/r2/displayer_property.h
diff --git a/code/ryzom/client/src/r2/displayer_visual.cpp b/ryzom/client/src/r2/displayer_visual.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual.cpp
rename to ryzom/client/src/r2/displayer_visual.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual.h b/ryzom/client/src/r2/displayer_visual.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual.h
rename to ryzom/client/src/r2/displayer_visual.h
diff --git a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp b/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp
rename to ryzom/client/src/r2/displayer_visual_activity_sequence.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.h b/ryzom/client/src/r2/displayer_visual_activity_sequence.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_activity_sequence.h
rename to ryzom/client/src/r2/displayer_visual_activity_sequence.h
diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.cpp b/ryzom/client/src/r2/displayer_visual_entity.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_entity.cpp
rename to ryzom/client/src/r2/displayer_visual_entity.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.h b/ryzom/client/src/r2/displayer_visual_entity.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_entity.h
rename to ryzom/client/src/r2/displayer_visual_entity.h
diff --git a/code/ryzom/client/src/r2/displayer_visual_group.cpp b/ryzom/client/src/r2/displayer_visual_group.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_group.cpp
rename to ryzom/client/src/r2/displayer_visual_group.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual_group.h b/ryzom/client/src/r2/displayer_visual_group.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_group.h
rename to ryzom/client/src/r2/displayer_visual_group.h
diff --git a/code/ryzom/client/src/r2/displayer_visual_road.cpp b/ryzom/client/src/r2/displayer_visual_road.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_road.cpp
rename to ryzom/client/src/r2/displayer_visual_road.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual_road.h b/ryzom/client/src/r2/displayer_visual_road.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_road.h
rename to ryzom/client/src/r2/displayer_visual_road.h
diff --git a/code/ryzom/client/src/r2/displayer_visual_shape.cpp b/ryzom/client/src/r2/displayer_visual_shape.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_shape.cpp
rename to ryzom/client/src/r2/displayer_visual_shape.cpp
diff --git a/code/ryzom/client/src/r2/displayer_visual_shape.h b/ryzom/client/src/r2/displayer_visual_shape.h
similarity index 100%
rename from code/ryzom/client/src/r2/displayer_visual_shape.h
rename to ryzom/client/src/r2/displayer_visual_shape.h
diff --git a/code/ryzom/client/src/r2/dmc/action_historic.cpp b/ryzom/client/src/r2/dmc/action_historic.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/action_historic.cpp
rename to ryzom/client/src/r2/dmc/action_historic.cpp
diff --git a/code/ryzom/client/src/r2/dmc/action_historic.h b/ryzom/client/src/r2/dmc/action_historic.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/action_historic.h
rename to ryzom/client/src/r2/dmc/action_historic.h
diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/ryzom/client/src/r2/dmc/client_edition_module.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/client_edition_module.cpp
rename to ryzom/client/src/r2/dmc/client_edition_module.cpp
diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.h b/ryzom/client/src/r2/dmc/client_edition_module.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/client_edition_module.h
rename to ryzom/client/src/r2/dmc/client_edition_module.h
diff --git a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp b/ryzom/client/src/r2/dmc/com_lua_module.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/com_lua_module.cpp
rename to ryzom/client/src/r2/dmc/com_lua_module.cpp
diff --git a/code/ryzom/client/src/r2/dmc/com_lua_module.h b/ryzom/client/src/r2/dmc/com_lua_module.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/com_lua_module.h
rename to ryzom/client/src/r2/dmc/com_lua_module.h
diff --git a/code/ryzom/client/src/r2/dmc/dmc.cpp b/ryzom/client/src/r2/dmc/dmc.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/dmc.cpp
rename to ryzom/client/src/r2/dmc/dmc.cpp
diff --git a/code/ryzom/client/src/r2/dmc/dmc.h b/ryzom/client/src/r2/dmc/dmc.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/dmc.h
rename to ryzom/client/src/r2/dmc/dmc.h
diff --git a/code/ryzom/client/src/r2/dmc/idmc.h b/ryzom/client/src/r2/dmc/idmc.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/idmc.h
rename to ryzom/client/src/r2/dmc/idmc.h
diff --git a/code/ryzom/client/src/r2/dmc/palette.cpp b/ryzom/client/src/r2/dmc/palette.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/palette.cpp
rename to ryzom/client/src/r2/dmc/palette.cpp
diff --git a/code/ryzom/client/src/r2/dmc/palette.h b/ryzom/client/src/r2/dmc/palette.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/palette.h
rename to ryzom/client/src/r2/dmc/palette.h
diff --git a/code/ryzom/client/src/r2/dmc/property_accessor.cpp b/ryzom/client/src/r2/dmc/property_accessor.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/property_accessor.cpp
rename to ryzom/client/src/r2/dmc/property_accessor.cpp
diff --git a/code/ryzom/client/src/r2/dmc/property_accessor.h b/ryzom/client/src/r2/dmc/property_accessor.h
similarity index 100%
rename from code/ryzom/client/src/r2/dmc/property_accessor.h
rename to ryzom/client/src/r2/dmc/property_accessor.h
diff --git a/code/ryzom/client/src/r2/ed_command.h b/ryzom/client/src/r2/ed_command.h
similarity index 100%
rename from code/ryzom/client/src/r2/ed_command.h
rename to ryzom/client/src/r2/ed_command.h
diff --git a/code/ryzom/client/src/r2/editor.cpp b/ryzom/client/src/r2/editor.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/editor.cpp
rename to ryzom/client/src/r2/editor.cpp
diff --git a/code/ryzom/client/src/r2/editor.h b/ryzom/client/src/r2/editor.h
similarity index 100%
rename from code/ryzom/client/src/r2/editor.h
rename to ryzom/client/src/r2/editor.h
diff --git a/code/ryzom/client/src/r2/entity_custom_select_box.cpp b/ryzom/client/src/r2/entity_custom_select_box.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/entity_custom_select_box.cpp
rename to ryzom/client/src/r2/entity_custom_select_box.cpp
diff --git a/code/ryzom/client/src/r2/entity_custom_select_box.h b/ryzom/client/src/r2/entity_custom_select_box.h
similarity index 100%
rename from code/ryzom/client/src/r2/entity_custom_select_box.h
rename to ryzom/client/src/r2/entity_custom_select_box.h
diff --git a/code/ryzom/client/src/r2/entity_sorter.cpp b/ryzom/client/src/r2/entity_sorter.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/entity_sorter.cpp
rename to ryzom/client/src/r2/entity_sorter.cpp
diff --git a/code/ryzom/client/src/r2/entity_sorter.h b/ryzom/client/src/r2/entity_sorter.h
similarity index 100%
rename from code/ryzom/client/src/r2/entity_sorter.h
rename to ryzom/client/src/r2/entity_sorter.h
diff --git a/code/ryzom/client/src/r2/instance.cpp b/ryzom/client/src/r2/instance.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/instance.cpp
rename to ryzom/client/src/r2/instance.cpp
diff --git a/code/ryzom/client/src/r2/instance.h b/ryzom/client/src/r2/instance.h
similarity index 100%
rename from code/ryzom/client/src/r2/instance.h
rename to ryzom/client/src/r2/instance.h
diff --git a/code/ryzom/client/src/r2/instance_map_deco.cpp b/ryzom/client/src/r2/instance_map_deco.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/instance_map_deco.cpp
rename to ryzom/client/src/r2/instance_map_deco.cpp
diff --git a/code/ryzom/client/src/r2/instance_map_deco.h b/ryzom/client/src/r2/instance_map_deco.h
similarity index 100%
rename from code/ryzom/client/src/r2/instance_map_deco.h
rename to ryzom/client/src/r2/instance_map_deco.h
diff --git a/code/ryzom/client/src/r2/island_collision.cpp b/ryzom/client/src/r2/island_collision.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/island_collision.cpp
rename to ryzom/client/src/r2/island_collision.cpp
diff --git a/code/ryzom/client/src/r2/island_collision.h b/ryzom/client/src/r2/island_collision.h
similarity index 100%
rename from code/ryzom/client/src/r2/island_collision.h
rename to ryzom/client/src/r2/island_collision.h
diff --git a/code/ryzom/client/src/r2/lua_event_forwarder.cpp b/ryzom/client/src/r2/lua_event_forwarder.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/lua_event_forwarder.cpp
rename to ryzom/client/src/r2/lua_event_forwarder.cpp
diff --git a/code/ryzom/client/src/r2/lua_event_forwarder.h b/ryzom/client/src/r2/lua_event_forwarder.h
similarity index 100%
rename from code/ryzom/client/src/r2/lua_event_forwarder.h
rename to ryzom/client/src/r2/lua_event_forwarder.h
diff --git a/code/ryzom/client/src/r2/mesh_array.cpp b/ryzom/client/src/r2/mesh_array.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/mesh_array.cpp
rename to ryzom/client/src/r2/mesh_array.cpp
diff --git a/code/ryzom/client/src/r2/mesh_array.h b/ryzom/client/src/r2/mesh_array.h
similarity index 100%
rename from code/ryzom/client/src/r2/mesh_array.h
rename to ryzom/client/src/r2/mesh_array.h
diff --git a/code/ryzom/client/src/r2/npc_editor.cpp b/ryzom/client/src/r2/npc_editor.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/npc_editor.cpp
rename to ryzom/client/src/r2/npc_editor.cpp
diff --git a/code/ryzom/client/src/r2/npc_editor.h b/ryzom/client/src/r2/npc_editor.h
similarity index 100%
rename from code/ryzom/client/src/r2/npc_editor.h
rename to ryzom/client/src/r2/npc_editor.h
diff --git a/code/ryzom/client/src/r2/object_factory_client.cpp b/ryzom/client/src/r2/object_factory_client.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/object_factory_client.cpp
rename to ryzom/client/src/r2/object_factory_client.cpp
diff --git a/code/ryzom/client/src/r2/object_factory_client.h b/ryzom/client/src/r2/object_factory_client.h
similarity index 100%
rename from code/ryzom/client/src/r2/object_factory_client.h
rename to ryzom/client/src/r2/object_factory_client.h
diff --git a/code/ryzom/client/src/r2/palette_node.cpp b/ryzom/client/src/r2/palette_node.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/palette_node.cpp
rename to ryzom/client/src/r2/palette_node.cpp
diff --git a/code/ryzom/client/src/r2/palette_node.h b/ryzom/client/src/r2/palette_node.h
similarity index 100%
rename from code/ryzom/client/src/r2/palette_node.h
rename to ryzom/client/src/r2/palette_node.h
diff --git a/code/ryzom/client/src/r2/prim_render.cpp b/ryzom/client/src/r2/prim_render.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/prim_render.cpp
rename to ryzom/client/src/r2/prim_render.cpp
diff --git a/code/ryzom/client/src/r2/prim_render.h b/ryzom/client/src/r2/prim_render.h
similarity index 100%
rename from code/ryzom/client/src/r2/prim_render.h
rename to ryzom/client/src/r2/prim_render.h
diff --git a/code/ryzom/client/src/r2/r2_config.cpp b/ryzom/client/src/r2/r2_config.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/r2_config.cpp
rename to ryzom/client/src/r2/r2_config.cpp
diff --git a/code/ryzom/client/src/r2/r2_config.h b/ryzom/client/src/r2/r2_config.h
similarity index 100%
rename from code/ryzom/client/src/r2/r2_config.h
rename to ryzom/client/src/r2/r2_config.h
diff --git a/code/ryzom/client/src/r2/r2_lua.cpp b/ryzom/client/src/r2/r2_lua.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/r2_lua.cpp
rename to ryzom/client/src/r2/r2_lua.cpp
diff --git a/code/ryzom/client/src/r2/r2_lua.h b/ryzom/client/src/r2/r2_lua.h
similarity index 100%
rename from code/ryzom/client/src/r2/r2_lua.h
rename to ryzom/client/src/r2/r2_lua.h
diff --git a/code/ryzom/client/src/r2/tool.cpp b/ryzom/client/src/r2/tool.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool.cpp
rename to ryzom/client/src/r2/tool.cpp
diff --git a/code/ryzom/client/src/r2/tool.h b/ryzom/client/src/r2/tool.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool.h
rename to ryzom/client/src/r2/tool.h
diff --git a/code/ryzom/client/src/r2/tool_choose_pos.cpp b/ryzom/client/src/r2/tool_choose_pos.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_choose_pos.cpp
rename to ryzom/client/src/r2/tool_choose_pos.cpp
diff --git a/code/ryzom/client/src/r2/tool_choose_pos.h b/ryzom/client/src/r2/tool_choose_pos.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_choose_pos.h
rename to ryzom/client/src/r2/tool_choose_pos.h
diff --git a/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp b/ryzom/client/src/r2/tool_choose_pos_lua.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_choose_pos_lua.cpp
rename to ryzom/client/src/r2/tool_choose_pos_lua.cpp
diff --git a/code/ryzom/client/src/r2/tool_choose_pos_lua.h b/ryzom/client/src/r2/tool_choose_pos_lua.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_choose_pos_lua.h
rename to ryzom/client/src/r2/tool_choose_pos_lua.h
diff --git a/code/ryzom/client/src/r2/tool_create_entity.cpp b/ryzom/client/src/r2/tool_create_entity.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_create_entity.cpp
rename to ryzom/client/src/r2/tool_create_entity.cpp
diff --git a/code/ryzom/client/src/r2/tool_create_entity.h b/ryzom/client/src/r2/tool_create_entity.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_create_entity.h
rename to ryzom/client/src/r2/tool_create_entity.h
diff --git a/code/ryzom/client/src/r2/tool_draw_prim.cpp b/ryzom/client/src/r2/tool_draw_prim.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_draw_prim.cpp
rename to ryzom/client/src/r2/tool_draw_prim.cpp
diff --git a/code/ryzom/client/src/r2/tool_draw_prim.h b/ryzom/client/src/r2/tool_draw_prim.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_draw_prim.h
rename to ryzom/client/src/r2/tool_draw_prim.h
diff --git a/code/ryzom/client/src/r2/tool_draw_road.cpp b/ryzom/client/src/r2/tool_draw_road.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_draw_road.cpp
rename to ryzom/client/src/r2/tool_draw_road.cpp
diff --git a/code/ryzom/client/src/r2/tool_draw_road.h b/ryzom/client/src/r2/tool_draw_road.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_draw_road.h
rename to ryzom/client/src/r2/tool_draw_road.h
diff --git a/code/ryzom/client/src/r2/tool_maintained_action.cpp b/ryzom/client/src/r2/tool_maintained_action.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_maintained_action.cpp
rename to ryzom/client/src/r2/tool_maintained_action.cpp
diff --git a/code/ryzom/client/src/r2/tool_maintained_action.h b/ryzom/client/src/r2/tool_maintained_action.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_maintained_action.h
rename to ryzom/client/src/r2/tool_maintained_action.h
diff --git a/code/ryzom/client/src/r2/tool_new_vertex.cpp b/ryzom/client/src/r2/tool_new_vertex.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_new_vertex.cpp
rename to ryzom/client/src/r2/tool_new_vertex.cpp
diff --git a/code/ryzom/client/src/r2/tool_new_vertex.h b/ryzom/client/src/r2/tool_new_vertex.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_new_vertex.h
rename to ryzom/client/src/r2/tool_new_vertex.h
diff --git a/code/ryzom/client/src/r2/tool_pick.cpp b/ryzom/client/src/r2/tool_pick.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_pick.cpp
rename to ryzom/client/src/r2/tool_pick.cpp
diff --git a/code/ryzom/client/src/r2/tool_pick.h b/ryzom/client/src/r2/tool_pick.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_pick.h
rename to ryzom/client/src/r2/tool_pick.h
diff --git a/code/ryzom/client/src/r2/tool_select_move.cpp b/ryzom/client/src/r2/tool_select_move.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_select_move.cpp
rename to ryzom/client/src/r2/tool_select_move.cpp
diff --git a/code/ryzom/client/src/r2/tool_select_move.h b/ryzom/client/src/r2/tool_select_move.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_select_move.h
rename to ryzom/client/src/r2/tool_select_move.h
diff --git a/code/ryzom/client/src/r2/tool_select_rotate.cpp b/ryzom/client/src/r2/tool_select_rotate.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/tool_select_rotate.cpp
rename to ryzom/client/src/r2/tool_select_rotate.cpp
diff --git a/code/ryzom/client/src/r2/tool_select_rotate.h b/ryzom/client/src/r2/tool_select_rotate.h
similarity index 100%
rename from code/ryzom/client/src/r2/tool_select_rotate.h
rename to ryzom/client/src/r2/tool_select_rotate.h
diff --git a/code/ryzom/client/src/r2/verbose_clock.cpp b/ryzom/client/src/r2/verbose_clock.cpp
similarity index 100%
rename from code/ryzom/client/src/r2/verbose_clock.cpp
rename to ryzom/client/src/r2/verbose_clock.cpp
diff --git a/code/ryzom/client/src/r2/verbose_clock.h b/ryzom/client/src/r2/verbose_clock.h
similarity index 100%
rename from code/ryzom/client/src/r2/verbose_clock.h
rename to ryzom/client/src/r2/verbose_clock.h
diff --git a/code/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
similarity index 100%
rename from code/ryzom/client/src/release.cpp
rename to ryzom/client/src/release.cpp
diff --git a/code/ryzom/client/src/release.h b/ryzom/client/src/release.h
similarity index 100%
rename from code/ryzom/client/src/release.h
rename to ryzom/client/src/release.h
diff --git a/code/ryzom/client/src/resource.h b/ryzom/client/src/resource.h
similarity index 100%
rename from code/ryzom/client/src/resource.h
rename to ryzom/client/src/resource.h
diff --git a/code/ryzom/client/src/rosace.cpp b/ryzom/client/src/rosace.cpp
similarity index 100%
rename from code/ryzom/client/src/rosace.cpp
rename to ryzom/client/src/rosace.cpp
diff --git a/code/ryzom/client/src/rosace.h b/ryzom/client/src/rosace.h
similarity index 100%
rename from code/ryzom/client/src/rosace.h
rename to ryzom/client/src/rosace.h
diff --git a/code/ryzom/client/src/rosace_functions.cpp b/ryzom/client/src/rosace_functions.cpp
similarity index 100%
rename from code/ryzom/client/src/rosace_functions.cpp
rename to ryzom/client/src/rosace_functions.cpp
diff --git a/code/ryzom/client/src/rosace_functions.h b/ryzom/client/src/rosace_functions.h
similarity index 100%
rename from code/ryzom/client/src/rosace_functions.h
rename to ryzom/client/src/rosace_functions.h
diff --git a/code/ryzom/client/src/ryzom.ico b/ryzom/client/src/ryzom.ico
similarity index 100%
rename from code/ryzom/client/src/ryzom.ico
rename to ryzom/client/src/ryzom.ico
diff --git a/code/ryzom/client/src/ryzom_small.ico b/ryzom/client/src/ryzom_small.ico
similarity index 100%
rename from code/ryzom/client/src/ryzom_small.ico
rename to ryzom/client/src/ryzom_small.ico
diff --git a/code/ryzom/client/src/scalable_time.cpp b/ryzom/client/src/scalable_time.cpp
similarity index 100%
rename from code/ryzom/client/src/scalable_time.cpp
rename to ryzom/client/src/scalable_time.cpp
diff --git a/code/ryzom/client/src/scalable_time.h b/ryzom/client/src/scalable_time.h
similarity index 100%
rename from code/ryzom/client/src/scalable_time.h
rename to ryzom/client/src/scalable_time.h
diff --git a/code/ryzom/client/src/scene_parser.cpp b/ryzom/client/src/scene_parser.cpp
similarity index 100%
rename from code/ryzom/client/src/scene_parser.cpp
rename to ryzom/client/src/scene_parser.cpp
diff --git a/code/ryzom/client/src/scene_parser.h b/ryzom/client/src/scene_parser.h
similarity index 100%
rename from code/ryzom/client/src/scene_parser.h
rename to ryzom/client/src/scene_parser.h
diff --git a/code/ryzom/client/src/session_browser.cpp b/ryzom/client/src/session_browser.cpp
similarity index 100%
rename from code/ryzom/client/src/session_browser.cpp
rename to ryzom/client/src/session_browser.cpp
diff --git a/code/ryzom/client/src/session_browser.h b/ryzom/client/src/session_browser.h
similarity index 100%
rename from code/ryzom/client/src/session_browser.h
rename to ryzom/client/src/session_browser.h
diff --git a/code/ryzom/client/src/session_browser_impl.cpp b/ryzom/client/src/session_browser_impl.cpp
similarity index 100%
rename from code/ryzom/client/src/session_browser_impl.cpp
rename to ryzom/client/src/session_browser_impl.cpp
diff --git a/code/ryzom/client/src/session_browser_impl.h b/ryzom/client/src/session_browser_impl.h
similarity index 100%
rename from code/ryzom/client/src/session_browser_impl.h
rename to ryzom/client/src/session_browser_impl.h
diff --git a/code/ryzom/client/src/sheet_manager.cpp b/ryzom/client/src/sheet_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/sheet_manager.cpp
rename to ryzom/client/src/sheet_manager.cpp
diff --git a/code/ryzom/client/src/sheet_manager.h b/ryzom/client/src/sheet_manager.h
similarity index 100%
rename from code/ryzom/client/src/sheet_manager.h
rename to ryzom/client/src/sheet_manager.h
diff --git a/code/ryzom/client/src/sky.cpp b/ryzom/client/src/sky.cpp
similarity index 100%
rename from code/ryzom/client/src/sky.cpp
rename to ryzom/client/src/sky.cpp
diff --git a/code/ryzom/client/src/sky.h b/ryzom/client/src/sky.h
similarity index 100%
rename from code/ryzom/client/src/sky.h
rename to ryzom/client/src/sky.h
diff --git a/code/ryzom/client/src/sky_material_setup.cpp b/ryzom/client/src/sky_material_setup.cpp
similarity index 100%
rename from code/ryzom/client/src/sky_material_setup.cpp
rename to ryzom/client/src/sky_material_setup.cpp
diff --git a/code/ryzom/client/src/sky_material_setup.h b/ryzom/client/src/sky_material_setup.h
similarity index 100%
rename from code/ryzom/client/src/sky_material_setup.h
rename to ryzom/client/src/sky_material_setup.h
diff --git a/code/ryzom/client/src/sky_object.cpp b/ryzom/client/src/sky_object.cpp
similarity index 100%
rename from code/ryzom/client/src/sky_object.cpp
rename to ryzom/client/src/sky_object.cpp
diff --git a/code/ryzom/client/src/sky_object.h b/ryzom/client/src/sky_object.h
similarity index 100%
rename from code/ryzom/client/src/sky_object.h
rename to ryzom/client/src/sky_object.h
diff --git a/code/ryzom/client/src/sky_render.cpp b/ryzom/client/src/sky_render.cpp
similarity index 100%
rename from code/ryzom/client/src/sky_render.cpp
rename to ryzom/client/src/sky_render.cpp
diff --git a/code/ryzom/client/src/sky_render.h b/ryzom/client/src/sky_render.h
similarity index 100%
rename from code/ryzom/client/src/sky_render.h
rename to ryzom/client/src/sky_render.h
diff --git a/code/ryzom/client/src/sound_manager.cpp b/ryzom/client/src/sound_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/sound_manager.cpp
rename to ryzom/client/src/sound_manager.cpp
diff --git a/code/ryzom/client/src/sound_manager.h b/ryzom/client/src/sound_manager.h
similarity index 100%
rename from code/ryzom/client/src/sound_manager.h
rename to ryzom/client/src/sound_manager.h
diff --git a/code/ryzom/client/src/splash_screen.bmp b/ryzom/client/src/splash_screen.bmp
similarity index 100%
rename from code/ryzom/client/src/splash_screen.bmp
rename to ryzom/client/src/splash_screen.bmp
diff --git a/code/ryzom/client/src/stage.cpp b/ryzom/client/src/stage.cpp
similarity index 100%
rename from code/ryzom/client/src/stage.cpp
rename to ryzom/client/src/stage.cpp
diff --git a/code/ryzom/client/src/stage.h b/ryzom/client/src/stage.h
similarity index 100%
rename from code/ryzom/client/src/stage.h
rename to ryzom/client/src/stage.h
diff --git a/code/ryzom/client/src/starting_roles.cpp b/ryzom/client/src/starting_roles.cpp
similarity index 100%
rename from code/ryzom/client/src/starting_roles.cpp
rename to ryzom/client/src/starting_roles.cpp
diff --git a/code/ryzom/client/src/starting_roles.h b/ryzom/client/src/starting_roles.h
similarity index 100%
rename from code/ryzom/client/src/starting_roles.h
rename to ryzom/client/src/starting_roles.h
diff --git a/code/ryzom/client/src/stdpch.cpp b/ryzom/client/src/stdpch.cpp
similarity index 100%
rename from code/ryzom/client/src/stdpch.cpp
rename to ryzom/client/src/stdpch.cpp
diff --git a/code/ryzom/client/src/stdpch.h b/ryzom/client/src/stdpch.h
similarity index 100%
rename from code/ryzom/client/src/stdpch.h
rename to ryzom/client/src/stdpch.h
diff --git a/code/ryzom/client/src/steam_client.cpp b/ryzom/client/src/steam_client.cpp
similarity index 100%
rename from code/ryzom/client/src/steam_client.cpp
rename to ryzom/client/src/steam_client.cpp
diff --git a/code/ryzom/client/src/steam_client.h b/ryzom/client/src/steam_client.h
similarity index 100%
rename from code/ryzom/client/src/steam_client.h
rename to ryzom/client/src/steam_client.h
diff --git a/code/ryzom/client/src/streamable_entity.cpp b/ryzom/client/src/streamable_entity.cpp
similarity index 100%
rename from code/ryzom/client/src/streamable_entity.cpp
rename to ryzom/client/src/streamable_entity.cpp
diff --git a/code/ryzom/client/src/streamable_entity.h b/ryzom/client/src/streamable_entity.h
similarity index 100%
rename from code/ryzom/client/src/streamable_entity.h
rename to ryzom/client/src/streamable_entity.h
diff --git a/code/ryzom/client/src/streamable_entity_composite.cpp b/ryzom/client/src/streamable_entity_composite.cpp
similarity index 100%
rename from code/ryzom/client/src/streamable_entity_composite.cpp
rename to ryzom/client/src/streamable_entity_composite.cpp
diff --git a/code/ryzom/client/src/streamable_entity_composite.h b/ryzom/client/src/streamable_entity_composite.h
similarity index 100%
rename from code/ryzom/client/src/streamable_entity_composite.h
rename to ryzom/client/src/streamable_entity_composite.h
diff --git a/code/ryzom/client/src/streamable_ig.cpp b/ryzom/client/src/streamable_ig.cpp
similarity index 100%
rename from code/ryzom/client/src/streamable_ig.cpp
rename to ryzom/client/src/streamable_ig.cpp
diff --git a/code/ryzom/client/src/streamable_ig.h b/ryzom/client/src/streamable_ig.h
similarity index 100%
rename from code/ryzom/client/src/streamable_ig.h
rename to ryzom/client/src/streamable_ig.h
diff --git a/code/ryzom/client/src/stremable_ig.cpp b/ryzom/client/src/stremable_ig.cpp
similarity index 100%
rename from code/ryzom/client/src/stremable_ig.cpp
rename to ryzom/client/src/stremable_ig.cpp
diff --git a/code/ryzom/client/src/string_manager_client.cpp b/ryzom/client/src/string_manager_client.cpp
similarity index 100%
rename from code/ryzom/client/src/string_manager_client.cpp
rename to ryzom/client/src/string_manager_client.cpp
diff --git a/code/ryzom/client/src/string_manager_client.h b/ryzom/client/src/string_manager_client.h
similarity index 100%
rename from code/ryzom/client/src/string_manager_client.h
rename to ryzom/client/src/string_manager_client.h
diff --git a/code/ryzom/client/src/teleport.cpp b/ryzom/client/src/teleport.cpp
similarity index 100%
rename from code/ryzom/client/src/teleport.cpp
rename to ryzom/client/src/teleport.cpp
diff --git a/code/ryzom/client/src/teleport.h b/ryzom/client/src/teleport.h
similarity index 100%
rename from code/ryzom/client/src/teleport.h
rename to ryzom/client/src/teleport.h
diff --git a/code/ryzom/client/src/text_manager.cpp b/ryzom/client/src/text_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/text_manager.cpp
rename to ryzom/client/src/text_manager.cpp
diff --git a/code/ryzom/client/src/text_manager.h b/ryzom/client/src/text_manager.h
similarity index 100%
rename from code/ryzom/client/src/text_manager.h
rename to ryzom/client/src/text_manager.h
diff --git a/code/ryzom/client/src/time_client.cpp b/ryzom/client/src/time_client.cpp
similarity index 100%
rename from code/ryzom/client/src/time_client.cpp
rename to ryzom/client/src/time_client.cpp
diff --git a/code/ryzom/client/src/time_client.h b/ryzom/client/src/time_client.h
similarity index 100%
rename from code/ryzom/client/src/time_client.h
rename to ryzom/client/src/time_client.h
diff --git a/code/ryzom/client/src/timed_fx_manager.cpp b/ryzom/client/src/timed_fx_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/timed_fx_manager.cpp
rename to ryzom/client/src/timed_fx_manager.cpp
diff --git a/code/ryzom/client/src/timed_fx_manager.h b/ryzom/client/src/timed_fx_manager.h
similarity index 100%
rename from code/ryzom/client/src/timed_fx_manager.h
rename to ryzom/client/src/timed_fx_manager.h
diff --git a/code/ryzom/client/src/user_agent.cpp b/ryzom/client/src/user_agent.cpp
similarity index 100%
rename from code/ryzom/client/src/user_agent.cpp
rename to ryzom/client/src/user_agent.cpp
diff --git a/code/ryzom/client/src/user_agent.h b/ryzom/client/src/user_agent.h
similarity index 100%
rename from code/ryzom/client/src/user_agent.h
rename to ryzom/client/src/user_agent.h
diff --git a/code/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
similarity index 100%
rename from code/ryzom/client/src/user_entity.cpp
rename to ryzom/client/src/user_entity.cpp
diff --git a/code/ryzom/client/src/user_entity.h b/ryzom/client/src/user_entity.h
similarity index 100%
rename from code/ryzom/client/src/user_entity.h
rename to ryzom/client/src/user_entity.h
diff --git a/code/ryzom/client/src/view.cpp b/ryzom/client/src/view.cpp
similarity index 100%
rename from code/ryzom/client/src/view.cpp
rename to ryzom/client/src/view.cpp
diff --git a/code/ryzom/client/src/view.h b/ryzom/client/src/view.h
similarity index 100%
rename from code/ryzom/client/src/view.h
rename to ryzom/client/src/view.h
diff --git a/code/ryzom/client/src/village.cpp b/ryzom/client/src/village.cpp
similarity index 100%
rename from code/ryzom/client/src/village.cpp
rename to ryzom/client/src/village.cpp
diff --git a/code/ryzom/client/src/village.h b/ryzom/client/src/village.h
similarity index 100%
rename from code/ryzom/client/src/village.h
rename to ryzom/client/src/village.h
diff --git a/code/ryzom/client/src/water_env_map_rdr.cpp b/ryzom/client/src/water_env_map_rdr.cpp
similarity index 100%
rename from code/ryzom/client/src/water_env_map_rdr.cpp
rename to ryzom/client/src/water_env_map_rdr.cpp
diff --git a/code/ryzom/client/src/water_env_map_rdr.h b/ryzom/client/src/water_env_map_rdr.h
similarity index 100%
rename from code/ryzom/client/src/water_env_map_rdr.h
rename to ryzom/client/src/water_env_map_rdr.h
diff --git a/code/ryzom/client/src/water_map.cpp b/ryzom/client/src/water_map.cpp
similarity index 100%
rename from code/ryzom/client/src/water_map.cpp
rename to ryzom/client/src/water_map.cpp
diff --git a/code/ryzom/client/src/water_map.h b/ryzom/client/src/water_map.h
similarity index 100%
rename from code/ryzom/client/src/water_map.h
rename to ryzom/client/src/water_map.h
diff --git a/code/ryzom/client/src/weather.cpp b/ryzom/client/src/weather.cpp
similarity index 100%
rename from code/ryzom/client/src/weather.cpp
rename to ryzom/client/src/weather.cpp
diff --git a/code/ryzom/client/src/weather.h b/ryzom/client/src/weather.h
similarity index 100%
rename from code/ryzom/client/src/weather.h
rename to ryzom/client/src/weather.h
diff --git a/code/ryzom/client/src/weather_manager_client.cpp b/ryzom/client/src/weather_manager_client.cpp
similarity index 100%
rename from code/ryzom/client/src/weather_manager_client.cpp
rename to ryzom/client/src/weather_manager_client.cpp
diff --git a/code/ryzom/client/src/weather_manager_client.h b/ryzom/client/src/weather_manager_client.h
similarity index 100%
rename from code/ryzom/client/src/weather_manager_client.h
rename to ryzom/client/src/weather_manager_client.h
diff --git a/code/ryzom/client/src/weather_setup_client.cpp b/ryzom/client/src/weather_setup_client.cpp
similarity index 100%
rename from code/ryzom/client/src/weather_setup_client.cpp
rename to ryzom/client/src/weather_setup_client.cpp
diff --git a/code/ryzom/client/src/weather_setup_client.h b/ryzom/client/src/weather_setup_client.h
similarity index 100%
rename from code/ryzom/client/src/weather_setup_client.h
rename to ryzom/client/src/weather_setup_client.h
diff --git a/code/ryzom/client/src/world_database_manager.cpp b/ryzom/client/src/world_database_manager.cpp
similarity index 100%
rename from code/ryzom/client/src/world_database_manager.cpp
rename to ryzom/client/src/world_database_manager.cpp
diff --git a/code/ryzom/client/src/world_database_manager.h b/ryzom/client/src/world_database_manager.h
similarity index 100%
rename from code/ryzom/client/src/world_database_manager.h
rename to ryzom/client/src/world_database_manager.h
diff --git a/code/ryzom/client/src/zone_util.cpp b/ryzom/client/src/zone_util.cpp
similarity index 100%
rename from code/ryzom/client/src/zone_util.cpp
rename to ryzom/client/src/zone_util.cpp
diff --git a/code/ryzom/client/src/zone_util.h b/ryzom/client/src/zone_util.h
similarity index 100%
rename from code/ryzom/client/src/zone_util.h
rename to ryzom/client/src/zone_util.h
diff --git a/code/ryzom/client/unix/CMakeLists.txt b/ryzom/client/unix/CMakeLists.txt
similarity index 100%
rename from code/ryzom/client/unix/CMakeLists.txt
rename to ryzom/client/unix/CMakeLists.txt
diff --git a/code/ryzom/client/unix/ryzom_128x128.png b/ryzom/client/unix/ryzom_128x128.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_128x128.png
rename to ryzom/client/unix/ryzom_128x128.png
diff --git a/code/ryzom/client/unix/ryzom_16x16.png b/ryzom/client/unix/ryzom_16x16.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_16x16.png
rename to ryzom/client/unix/ryzom_16x16.png
diff --git a/code/ryzom/client/unix/ryzom_22x22.png b/ryzom/client/unix/ryzom_22x22.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_22x22.png
rename to ryzom/client/unix/ryzom_22x22.png
diff --git a/code/ryzom/client/unix/ryzom_24x24.png b/ryzom/client/unix/ryzom_24x24.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_24x24.png
rename to ryzom/client/unix/ryzom_24x24.png
diff --git a/code/ryzom/client/unix/ryzom_256x256.png b/ryzom/client/unix/ryzom_256x256.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_256x256.png
rename to ryzom/client/unix/ryzom_256x256.png
diff --git a/code/ryzom/client/unix/ryzom_32x32.png b/ryzom/client/unix/ryzom_32x32.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_32x32.png
rename to ryzom/client/unix/ryzom_32x32.png
diff --git a/code/ryzom/client/unix/ryzom_48x48.png b/ryzom/client/unix/ryzom_48x48.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_48x48.png
rename to ryzom/client/unix/ryzom_48x48.png
diff --git a/code/ryzom/client/unix/ryzom_64x64.png b/ryzom/client/unix/ryzom_64x64.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_64x64.png
rename to ryzom/client/unix/ryzom_64x64.png
diff --git a/code/ryzom/client/unix/ryzom_client.desktop.in b/ryzom/client/unix/ryzom_client.desktop.in
similarity index 100%
rename from code/ryzom/client/unix/ryzom_client.desktop.in
rename to ryzom/client/unix/ryzom_client.desktop.in
diff --git a/code/ryzom/client/unix/ryzom_client.png b/ryzom/client/unix/ryzom_client.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom_client.png
rename to ryzom/client/unix/ryzom_client.png
diff --git a/code/ryzom/client/unix/ryzom_client.xpm b/ryzom/client/unix/ryzom_client.xpm
similarity index 100%
rename from code/ryzom/client/unix/ryzom_client.xpm
rename to ryzom/client/unix/ryzom_client.xpm
diff --git a/code/ryzom/common/CMakeLists.txt b/ryzom/common/CMakeLists.txt
similarity index 100%
rename from code/ryzom/common/CMakeLists.txt
rename to ryzom/common/CMakeLists.txt
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/add_compass.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/add_compass.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/add_compass.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/add_compass.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/ai_event.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/ai_event.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/ai_event.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/ai_event.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/bot_chat.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/bot_chat.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/bot_chat.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/bot_chat.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/buy.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/buy.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/buy.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/buy.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/cast.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/cast.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/cast.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/cast.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/craft.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/craft.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/craft.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/craft.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_set.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_set.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_set.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_set.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_table.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_table.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_table.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/custom_loot_table.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/depositzone.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/depositzone.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/depositzone.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/depositzone.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/destroy_item.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/destroy_item.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/destroy_item.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/destroy_item.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/do_mission.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/do_mission.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/do_mission.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/do_mission.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/dyn_answer.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/dyn_answer.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/dyn_answer.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/dyn_answer.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/escort.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/escort.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/escort.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/escort.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/fail.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/fail.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/fail.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/fail.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/forage.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/forage.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/forage.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/forage.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_item.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_item.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_item.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_item.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_money.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_money.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_money.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/give_money.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/group_fauna.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/group_fauna.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/group_fauna.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/group_fauna.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/item_guidelines.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/item_guidelines.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/item_guidelines.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/item_guidelines.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/jump_to.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/jump_to.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/jump_to.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/jump_to.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/keywords.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/keywords.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/keywords.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/keywords.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/kill.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/kill.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/kill.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/kill.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/learn_action.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/learn_action.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/learn_action.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/learn_action.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_continue.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_continue.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_continue.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_continue.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_fail.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_fail.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_fail.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_fail.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_retry.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_retry.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_retry.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/linear_dyn_chat_retry.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/loot.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/loot.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/loot.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/loot.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/mission_tree.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/mission_tree.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/mission_tree.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/mission_tree.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/no_answer.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/no_answer.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/no_answer.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/no_answer.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_bot.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_bot.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_bot.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_bot.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_event_handler_action.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_event_handler_action.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_event_handler_action.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_event_handler_action.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group_parameters.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group_parameters.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group_parameters.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/npc_group_parameters.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/people.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/people.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/people.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/people.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/population.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/population.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/population.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/population.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/popup_msg.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/popup_msg.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/popup_msg.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/popup_msg.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/pre_requisite.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/pre_requisite.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/pre_requisite.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/pre_requisite.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_faction_point.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_faction_point.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_faction_point.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_faction_point.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_fame.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_fame.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_fame.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_fame.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_item.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_item.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_item.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_item.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_money.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_money.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_money.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_money.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_xp.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_xp.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_xp.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/recv_xp.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/rite_nomenclature_guidelines.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/rite_nomenclature_guidelines.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/rite_nomenclature_guidelines.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/rite_nomenclature_guidelines.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/script_guidelines.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/script_guidelines.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/script_guidelines.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/script_guidelines.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/sell.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/sell.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/sell.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/sell.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/set_constrains.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/set_constrains.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/set_constrains.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/set_constrains.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/skill.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/skill.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/skill.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/skill.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/spawn_mission.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/spawn_mission.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/spawn_mission.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/spawn_mission.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_any.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_any.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_any.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_any.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_dyn_chat.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_dyn_chat.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_dyn_chat.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_dyn_chat.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_failure.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_failure.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_failure.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_failure.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_if.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_if.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_if.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_if.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_ooo.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_ooo.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_ooo.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/step_ooo.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/system_msg.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/system_msg.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/system_msg.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/system_msg.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/talk_to.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/talk_to.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/talk_to.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/talk_to.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/target.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/target.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/target.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/target.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_destination.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_destination.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_destination.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_destination.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_spawn_zone.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_spawn_zone.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_spawn_zone.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_spawn_zone.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_trigger.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_trigger.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_trigger.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/teleport_trigger.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/text_guidelines.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/text_guidelines.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/text_guidelines.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/text_guidelines.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/user_model.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/user_model.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/user_model.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/user_model.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_creature.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_creature.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_creature.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_creature.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_faction.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_faction.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_faction.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_faction.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_group.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_group.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_group.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_group.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_item.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_item.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_item.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_item.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_npc.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_npc.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_npc.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_npc.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_place.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_place.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_place.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_place.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quality.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quality.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quality.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quality.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quantity.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quantity.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quantity.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_quantity.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_text.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_text.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_text.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/var_text.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/visit.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/visit.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/visit.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/class_doc/visit.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/fyros.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/fyros.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/fyros.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/fyros.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/matis.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/matis.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/matis.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/matis.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/nexus.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/nexus.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/nexus.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/nexus.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/prime_root.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/prime_root.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/prime_root.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/prime_root.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/tryker.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/tryker.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/tryker.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/tryker.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/zorai.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/zorai.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/zorai.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/continents/zorai.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/bandit.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/bandit.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/bandit.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/bandit.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/civil.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/civil.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/civil.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/civil.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/degen.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/degen.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/degen.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/degen.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_carnivore.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_carnivore.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_carnivore.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_carnivore.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_herbivore.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_herbivore.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_herbivore.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/fauna_herbivore.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/flora.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/flora.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/flora.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/flora.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/goo.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/goo.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/goo.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/goo.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kami.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kami.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kami.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kami.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/karavan.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/karavan.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/karavan.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/karavan.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin_invasion.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin_invasion.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin_invasion.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/kitin_invasion.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/mp.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/mp.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/mp.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/mp.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ancient_dryads.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ancient_dryads.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ancient_dryads.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ancient_dryads.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_antikamis.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_antikamis.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_antikamis.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_antikamis.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_barkers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_barkers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_barkers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_barkers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_beachcombers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_beachcombers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_beachcombers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_beachcombers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_black_circle.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_black_circle.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_black_circle.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_black_circle.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cholorogoos.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cholorogoos.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cholorogoos.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cholorogoos.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cockroaches.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cockroaches.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cockroaches.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cockroaches.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_company_of_the_eternal_tree.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_company_of_the_eternal_tree.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_company_of_the_eternal_tree.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_company_of_the_eternal_tree.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_corsair.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_corsair.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_corsair.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_corsair.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cute.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cute.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cute.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_cute.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_darkening_sap.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_darkening_sap.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_darkening_sap.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_darkening_sap.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_dune_riders.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_dune_riders.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_dune_riders.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_dune_riders.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ecowarriors.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ecowarriors.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ecowarriors.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_ecowarriors.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_firebrands.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_firebrands.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_firebrands.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_firebrands.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_first_deserter.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_first_deserter.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_first_deserter.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_first_deserter.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar_hunters.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar_hunters.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar_hunters.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_frahar_hunters.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_gibbay.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_gibbay.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_gibbay.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_gibbay.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_goo_heads.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_goo_heads.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_goo_heads.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_goo_heads.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_green_seed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_green_seed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_green_seed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_green_seed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_hamazans_of_the_dead_seed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_hamazans_of_the_dead_seed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_hamazans_of_the_dead_seed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_hamazans_of_the_dead_seed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_icon_workshipers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_icon_workshipers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_icon_workshipers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_icon_workshipers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_keepers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_keepers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_keepers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_keepers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_kitin_gatheres.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_kitin_gatheres.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_kitin_gatheres.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_kitin_gatheres.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lagoon_brothers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lagoon_brothers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lagoon_brothers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lagoon_brothers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lawless.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lawless.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lawless.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_lawless.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_leviers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_leviers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_leviers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_leviers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_master_of_the_goo.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_master_of_the_goo.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_master_of_the_goo.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_master_of_the_goo.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_matisian_border_guards.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_matisian_border_guards.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_matisian_border_guards.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_matisian_border_guards.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_night_turners.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_night_turners.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_night_turners.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_night_turners.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_oasis_diggers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_oasis_diggers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_oasis_diggers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_oasis_diggers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_pyromancers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_pyromancers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_pyromancers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_pyromancers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_recoverers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_recoverers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_recoverers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_recoverers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_renegades.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_renegades.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_renegades.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_renegades.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_restorers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_restorers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_restorers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_restorers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_root_tappers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_root_tappers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_root_tappers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_root_tappers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sacred_sap.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sacred_sap.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sacred_sap.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sacred_sap.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_gleaners.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_gleaners.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_gleaners.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_gleaners.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_slaves.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_slaves.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_slaves.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_sap_slaves.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_scorchers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_scorchers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_scorchers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_scorchers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_shadow_runners.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_shadow_runners.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_shadow_runners.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_shadow_runners.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_siblings_of_the_weeds.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_siblings_of_the_weeds.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_siblings_of_the_weeds.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_siblings_of_the_weeds.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_silt_sculptors.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_silt_sculptors.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_silt_sculptors.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_silt_sculptors.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_slavers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_slavers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_slavers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_slavers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_smuglers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_smuglers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_smuglers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_smuglers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_arid_matis.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_arid_matis.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_arid_matis.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_arid_matis.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_kuilde.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_kuilde.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_kuilde.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_kuilde.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_slash_and_burn.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_slash_and_burn.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_slash_and_burn.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_the_slash_and_burn.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_tutors.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_tutors.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_tutors.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_tutors.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_water_breakers.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_water_breakers.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_water_breakers.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_water_breakers.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_woven_bridles.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_woven_bridles.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_woven_bridles.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/families/tribe_woven_bridles.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_carn.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_carn.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_carn.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_carn.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_cute_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_cute_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_cute_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_cute_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_degen.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_degen.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_degen.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_degen.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_frahar_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_frahar_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_frahar_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_frahar_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_gibbai_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_gibbai_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_gibbai_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_gibbai_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_goo_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_goo_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_goo_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_goo_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_herb.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_herb.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_herb.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_herb.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_food_kitin_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_plant.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_plant.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_plant.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_plant.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_carn.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_carn.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_carn.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_carn.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_cute_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_cute_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_cute_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_cute_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_degen.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_degen.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_degen.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_degen.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_frahar_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_frahar_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_frahar_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_frahar_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_gibbai_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_gibbai_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_gibbai_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_gibbai_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_goo_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_goo_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_goo_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_goo_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_herb.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_herb.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_herb.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_herb.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin_invasion.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin_invasion.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin_invasion.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_rest_kitin_invasion.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_spawn.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_spawn.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_spawn.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/fauna_zone_properties/activity_spawn.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/begin_state.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/begin_state.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/begin_state.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/begin_state.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/code.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/code.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/code.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/code.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if_else.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if_else.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if_else.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/condition_if_else.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/despawn.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/despawn.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/despawn.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/despawn.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/doxygen.css b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/doxygen.css
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/doxygen.css
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/doxygen.css
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/emot.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/emot.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/emot.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/emot.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/modify_variable.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/modify_variable.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/modify_variable.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/modify_variable.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/multi_actions.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/multi_actions.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/multi_actions.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/multi_actions.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/null_action.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/null_action.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/null_action.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/null_action.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/outpost_giver_ready.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/outpost_giver_ready.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/outpost_giver_ready.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/outpost_giver_ready.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/punctual_state_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select_state.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select_state.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select_state.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/random_select_state.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/say.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/say.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/say.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/say.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/send_message.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/send_message.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/send_message.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/send_message.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_fauna_activity.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_fauna_activity.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_fauna_activity.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_fauna_activity.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_flags_on_dyn_zones.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_flags_on_dyn_zones.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_flags_on_dyn_zones.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_flags_on_dyn_zones.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_state_timeout.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_state_timeout.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_state_timeout.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_state_timeout.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t0.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t0.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t0.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t0.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t1.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t1.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t1.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t1.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t2.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t2.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t2.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t2.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t3.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t3.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t3.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/set_timer_t3.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/sit_down.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/sit_down.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/sit_down.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/sit_down.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/spawn.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/spawn.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/spawn.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/spawn.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/stand_up.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/stand_up.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/stand_up.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/stand_up.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_0.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_0.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_0.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_0.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_1.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_1.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_1.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_1.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_2.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_2.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_2.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_2.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_3.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_3.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_3.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_3.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_4.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_4.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_4.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_4.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_5.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_5.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_5.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_5.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_6.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_6.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_6.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_6.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_7.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_7.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_7.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_7.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_8.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_8.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_8.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_8.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_9.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_9.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_9.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/action_type/trigger_event_9.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/bandit.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/bandit.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/bandit.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/bandit.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/escorted.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/escorted.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/escorted.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/escorted.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard_escorted.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard_escorted.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard_escorted.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/guard_escorted.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/no_change.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/no_change.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/no_change.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/no_change.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/normal.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/normal.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/normal.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_activity/normal.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/follow_route.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/follow_route.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/follow_route.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/follow_route.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/idle.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/idle.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/idle.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/idle.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_start_point.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_start_point.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_start_point.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_start_point.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_vertices.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_vertices.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_vertices.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/stand_on_vertices.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wait.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wait.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wait.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wait.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wander.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wander.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wander.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_movement/wander.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_leader.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_leader.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_leader.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_leader.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_escorted.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_escorted.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_escorted.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_escorted.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_with_team.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_with_team.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_with_team.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/follow_route_with_team.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_place.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_place.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_place.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_place.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_team.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_team.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_team.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/guard_team.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/unspawned.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/unspawned.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/unspawned.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/ai_profile/unspawned.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_arrived_from_stable.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_arrived_from_stable.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_arrived_from_stable.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_arrived_from_stable.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_gone_to_stable.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_gone_to_stable.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_gone_to_stable.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_pets_gone_to_stable.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_npcs_present.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_npcs_present.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_npcs_present.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_npcs_present.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_players_present.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_players_present.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_players_present.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/all_team_players_present.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_begin_fight.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_begin_fight.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_begin_fight.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_begin_fight.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_killed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_killed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_killed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_killed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_target_killed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_target_killed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_target_killed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/bot_target_killed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_all.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_all.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_all.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_all.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_first.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_first.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_first.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/destination_reached_first.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/egs_up.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/egs_up.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/egs_up.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/egs_up.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/end_of_state.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/end_of_state.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/end_of_state.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/end_of_state.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_away.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_away.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_away.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_away.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_back.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_back.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_back.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/escort_back.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_attack_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_attack_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_attack_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_attack_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_despawned.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_despawned.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_despawned.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_despawned.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_eliminated.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_eliminated.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_eliminated.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_eliminated.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_under_attack.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_under_attack.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_under_attack.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/group_under_attack.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_enters_view.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_enters_view.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_enters_view.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_enters_view.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_meets_team.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_meets_team.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_meets_team.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/other_team_meets_team.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_attacker_changed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_attacker_changed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_attacker_changed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_attacker_changed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_begin.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_begin.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_begin.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_begin.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_guild_ownership_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_owner_changed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_owner_changed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_owner_changed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_owner_changed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_begin.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_begin.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_begin.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_begin.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_peace_state_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_state_changed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_state_changed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_state_changed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_state_changed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_begin.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_begin.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_begin.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_begin.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/outpost_tribe_ownership_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_follow_npc.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_follow_npc.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_follow_npc.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_follow_npc.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_request_pause_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_target_npc.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_target_npc.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_target_npc.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/player_target_npc.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/punctual_state_timeout.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/punctual_state_timeout.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/punctual_state_timeout.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/punctual_state_timeout.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/route_blocked_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/set_flags_on_dyn_zones.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/set_flags_on_dyn_zones.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/set_flags_on_dyn_zones.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/set_flags_on_dyn_zones.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/start_of_state.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/start_of_state.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/start_of_state.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/start_of_state.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/state_timeout.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/state_timeout.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/state_timeout.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/state_timeout.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked_end.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked_end.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked_end.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_attacked_end.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_LD.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_LD.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_LD.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_LD.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_badly_hurt.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_badly_hurt.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_badly_hurt.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_badly_hurt.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_killed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_killed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_killed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_killed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_logout.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_logout.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_logout.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_member_logout.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_hurt.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_hurt.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_hurt.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_hurt.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_killed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_killed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_killed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/team_pack_animal_killed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t0_triggered.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t0_triggered.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t0_triggered.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t0_triggered.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t1_triggered.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t1_triggered.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t1_triggered.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t1_triggered.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t2_triggered.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t2_triggered.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t2_triggered.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t2_triggered.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t3_triggered.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t3_triggered.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t3_triggered.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/timer_t3_triggered.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_0.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_0.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_0.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_0.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_1.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_1.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_1.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_1.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_2.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_2.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_2.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_2.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_3.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_3.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_3.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_3.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_4.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_4.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_4.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_4.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_5.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_5.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_5.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_5.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_6.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_6.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_6.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_6.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_7.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_7.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_7.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_7.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_8.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_8.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_8.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_8.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_9.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_9.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_9.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/user_event_9.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/variable_changed.html b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/variable_changed.html
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/variable_changed.html
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc/event_type/variable_changed.html
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_ambush.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_ambush.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_ambush.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_ambush.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_harvest.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_harvest.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_harvest.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_harvest.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_kami_wander.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_kami_wander.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_kami_wander.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_kami_wander.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_attack.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_attack.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_attack.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_attack.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_def.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_def.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_def.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_outpost_def.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_rest.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_rest.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_rest.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_rest.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_spawn.zone b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_spawn.zone
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_spawn.zone
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/npc_zone_properties/activity_spawn.zone
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_primitive_configuration.xml b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_primitive_configuration.xml
similarity index 100%
rename from code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_primitive_configuration.xml
rename to ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_primitive_configuration.xml
diff --git a/code/ryzom/common/src/CMakeLists.txt b/ryzom/common/src/CMakeLists.txt
similarity index 100%
rename from code/ryzom/common/src/CMakeLists.txt
rename to ryzom/common/src/CMakeLists.txt
diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/ryzom/common/src/game_share/CMakeLists.txt
similarity index 100%
rename from code/ryzom/common/src/game_share/CMakeLists.txt
rename to ryzom/common/src/game_share/CMakeLists.txt
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_implementation.h b/ryzom/common/src/game_share/_backup_service_interface_implementation.h
similarity index 100%
rename from code/ryzom/common/src/game_share/_backup_service_interface_implementation.h
rename to ryzom/common/src/game_share/_backup_service_interface_implementation.h
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp b/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
rename to ryzom/common/src/game_share/_backup_service_interface_non_module.cpp
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp b/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
rename to ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.h b/ryzom/common/src/game_share/_backup_service_interface_singleton.h
similarity index 100%
rename from code/ryzom/common/src/game_share/_backup_service_interface_singleton.h
rename to ryzom/common/src/game_share/_backup_service_interface_singleton.h
diff --git a/code/ryzom/common/src/game_share/action.cpp b/ryzom/common/src/game_share/action.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action.cpp
rename to ryzom/common/src/game_share/action.cpp
diff --git a/code/ryzom/common/src/game_share/action.h b/ryzom/common/src/game_share/action.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action.h
rename to ryzom/common/src/game_share/action.h
diff --git a/code/ryzom/common/src/game_share/action_association.h b/ryzom/common/src/game_share/action_association.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_association.h
rename to ryzom/common/src/game_share/action_association.h
diff --git a/code/ryzom/common/src/game_share/action_block.cpp b/ryzom/common/src/game_share/action_block.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_block.cpp
rename to ryzom/common/src/game_share/action_block.cpp
diff --git a/code/ryzom/common/src/game_share/action_block.h b/ryzom/common/src/game_share/action_block.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_block.h
rename to ryzom/common/src/game_share/action_block.h
diff --git a/code/ryzom/common/src/game_share/action_disconnection.h b/ryzom/common/src/game_share/action_disconnection.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_disconnection.h
rename to ryzom/common/src/game_share/action_disconnection.h
diff --git a/code/ryzom/common/src/game_share/action_dummy.h b/ryzom/common/src/game_share/action_dummy.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_dummy.h
rename to ryzom/common/src/game_share/action_dummy.h
diff --git a/code/ryzom/common/src/game_share/action_factory.cpp b/ryzom/common/src/game_share/action_factory.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_factory.cpp
rename to ryzom/common/src/game_share/action_factory.cpp
diff --git a/code/ryzom/common/src/game_share/action_factory.h b/ryzom/common/src/game_share/action_factory.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_factory.h
rename to ryzom/common/src/game_share/action_factory.h
diff --git a/code/ryzom/common/src/game_share/action_generic.cpp b/ryzom/common/src/game_share/action_generic.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_generic.cpp
rename to ryzom/common/src/game_share/action_generic.cpp
diff --git a/code/ryzom/common/src/game_share/action_generic.h b/ryzom/common/src/game_share/action_generic.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_generic.h
rename to ryzom/common/src/game_share/action_generic.h
diff --git a/code/ryzom/common/src/game_share/action_generic_multi_part.h b/ryzom/common/src/game_share/action_generic_multi_part.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_generic_multi_part.h
rename to ryzom/common/src/game_share/action_generic_multi_part.h
diff --git a/code/ryzom/common/src/game_share/action_login.h b/ryzom/common/src/game_share/action_login.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_login.h
rename to ryzom/common/src/game_share/action_login.h
diff --git a/code/ryzom/common/src/game_share/action_nature.cpp b/ryzom/common/src/game_share/action_nature.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_nature.cpp
rename to ryzom/common/src/game_share/action_nature.cpp
diff --git a/code/ryzom/common/src/game_share/action_nature.h b/ryzom/common/src/game_share/action_nature.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_nature.h
rename to ryzom/common/src/game_share/action_nature.h
diff --git a/code/ryzom/common/src/game_share/action_position.cpp b/ryzom/common/src/game_share/action_position.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_position.cpp
rename to ryzom/common/src/game_share/action_position.cpp
diff --git a/code/ryzom/common/src/game_share/action_position.h b/ryzom/common/src/game_share/action_position.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_position.h
rename to ryzom/common/src/game_share/action_position.h
diff --git a/code/ryzom/common/src/game_share/action_sint64.cpp b/ryzom/common/src/game_share/action_sint64.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_sint64.cpp
rename to ryzom/common/src/game_share/action_sint64.cpp
diff --git a/code/ryzom/common/src/game_share/action_sint64.h b/ryzom/common/src/game_share/action_sint64.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_sint64.h
rename to ryzom/common/src/game_share/action_sint64.h
diff --git a/code/ryzom/common/src/game_share/action_sync.cpp b/ryzom/common/src/game_share/action_sync.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/action_sync.cpp
rename to ryzom/common/src/game_share/action_sync.cpp
diff --git a/code/ryzom/common/src/game_share/action_sync.h b/ryzom/common/src/game_share/action_sync.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_sync.h
rename to ryzom/common/src/game_share/action_sync.h
diff --git a/code/ryzom/common/src/game_share/action_target_slot.h b/ryzom/common/src/game_share/action_target_slot.h
similarity index 100%
rename from code/ryzom/common/src/game_share/action_target_slot.h
rename to ryzom/common/src/game_share/action_target_slot.h
diff --git a/code/ryzom/common/src/game_share/ai_wrapper.h b/ryzom/common/src/game_share/ai_wrapper.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ai_wrapper.h
rename to ryzom/common/src/game_share/ai_wrapper.h
diff --git a/code/ryzom/common/src/game_share/animal_status.cpp b/ryzom/common/src/game_share/animal_status.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/animal_status.cpp
rename to ryzom/common/src/game_share/animal_status.cpp
diff --git a/code/ryzom/common/src/game_share/animal_status.h b/ryzom/common/src/game_share/animal_status.h
similarity index 100%
rename from code/ryzom/common/src/game_share/animal_status.h
rename to ryzom/common/src/game_share/animal_status.h
diff --git a/code/ryzom/common/src/game_share/animal_type.h b/ryzom/common/src/game_share/animal_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/animal_type.h
rename to ryzom/common/src/game_share/animal_type.h
diff --git a/code/ryzom/common/src/game_share/animals_orders.cpp b/ryzom/common/src/game_share/animals_orders.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/animals_orders.cpp
rename to ryzom/common/src/game_share/animals_orders.cpp
diff --git a/code/ryzom/common/src/game_share/animals_orders.h b/ryzom/common/src/game_share/animals_orders.h
similarity index 100%
rename from code/ryzom/common/src/game_share/animals_orders.h
rename to ryzom/common/src/game_share/animals_orders.h
diff --git a/code/ryzom/common/src/game_share/armor_types.cpp b/ryzom/common/src/game_share/armor_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/armor_types.cpp
rename to ryzom/common/src/game_share/armor_types.cpp
diff --git a/code/ryzom/common/src/game_share/armor_types.h b/ryzom/common/src/game_share/armor_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/armor_types.h
rename to ryzom/common/src/game_share/armor_types.h
diff --git a/code/ryzom/common/src/game_share/backup_service_interface.cpp b/ryzom/common/src/game_share/backup_service_interface.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/backup_service_interface.cpp
rename to ryzom/common/src/game_share/backup_service_interface.cpp
diff --git a/code/ryzom/common/src/game_share/backup_service_interface.h b/ryzom/common/src/game_share/backup_service_interface.h
similarity index 100%
rename from code/ryzom/common/src/game_share/backup_service_interface.h
rename to ryzom/common/src/game_share/backup_service_interface.h
diff --git a/code/ryzom/common/src/game_share/backup_service_messages.h b/ryzom/common/src/game_share/backup_service_messages.h
similarity index 100%
rename from code/ryzom/common/src/game_share/backup_service_messages.h
rename to ryzom/common/src/game_share/backup_service_messages.h
diff --git a/code/ryzom/common/src/game_share/base_types.h b/ryzom/common/src/game_share/base_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/base_types.h
rename to ryzom/common/src/game_share/base_types.h
diff --git a/code/ryzom/common/src/game_share/bg_downloader_msg.cpp b/ryzom/common/src/game_share/bg_downloader_msg.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/bg_downloader_msg.cpp
rename to ryzom/common/src/game_share/bg_downloader_msg.cpp
diff --git a/code/ryzom/common/src/game_share/bg_downloader_msg.h b/ryzom/common/src/game_share/bg_downloader_msg.h
similarity index 100%
rename from code/ryzom/common/src/game_share/bg_downloader_msg.h
rename to ryzom/common/src/game_share/bg_downloader_msg.h
diff --git a/code/ryzom/common/src/game_share/bmp4image.h b/ryzom/common/src/game_share/bmp4image.h
similarity index 100%
rename from code/ryzom/common/src/game_share/bmp4image.h
rename to ryzom/common/src/game_share/bmp4image.h
diff --git a/code/ryzom/common/src/game_share/bnp_patch.cpp b/ryzom/common/src/game_share/bnp_patch.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/bnp_patch.cpp
rename to ryzom/common/src/game_share/bnp_patch.cpp
diff --git a/code/ryzom/common/src/game_share/bnp_patch.h b/ryzom/common/src/game_share/bnp_patch.h
similarity index 100%
rename from code/ryzom/common/src/game_share/bnp_patch.h
rename to ryzom/common/src/game_share/bnp_patch.h
diff --git a/code/ryzom/common/src/game_share/body.cpp b/ryzom/common/src/game_share/body.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/body.cpp
rename to ryzom/common/src/game_share/body.cpp
diff --git a/code/ryzom/common/src/game_share/body.h b/ryzom/common/src/game_share/body.h
similarity index 100%
rename from code/ryzom/common/src/game_share/body.h
rename to ryzom/common/src/game_share/body.h
diff --git a/code/ryzom/common/src/game_share/bot_chat_types.cpp b/ryzom/common/src/game_share/bot_chat_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/bot_chat_types.cpp
rename to ryzom/common/src/game_share/bot_chat_types.cpp
diff --git a/code/ryzom/common/src/game_share/bot_chat_types.h b/ryzom/common/src/game_share/bot_chat_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/bot_chat_types.h
rename to ryzom/common/src/game_share/bot_chat_types.h
diff --git a/code/ryzom/common/src/game_share/brick_families.cpp b/ryzom/common/src/game_share/brick_families.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_families.cpp
rename to ryzom/common/src/game_share/brick_families.cpp
diff --git a/code/ryzom/common/src/game_share/brick_families.h b/ryzom/common/src/game_share/brick_families.h
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_families.h
rename to ryzom/common/src/game_share/brick_families.h
diff --git a/code/ryzom/common/src/game_share/brick_flags.cpp b/ryzom/common/src/game_share/brick_flags.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_flags.cpp
rename to ryzom/common/src/game_share/brick_flags.cpp
diff --git a/code/ryzom/common/src/game_share/brick_flags.h b/ryzom/common/src/game_share/brick_flags.h
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_flags.h
rename to ryzom/common/src/game_share/brick_flags.h
diff --git a/code/ryzom/common/src/game_share/brick_types.cpp b/ryzom/common/src/game_share/brick_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_types.cpp
rename to ryzom/common/src/game_share/brick_types.cpp
diff --git a/code/ryzom/common/src/game_share/brick_types.h b/ryzom/common/src/game_share/brick_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/brick_types.h
rename to ryzom/common/src/game_share/brick_types.h
diff --git a/code/ryzom/common/src/game_share/callback_adaptor.h b/ryzom/common/src/game_share/callback_adaptor.h
similarity index 100%
rename from code/ryzom/common/src/game_share/callback_adaptor.h
rename to ryzom/common/src/game_share/callback_adaptor.h
diff --git a/code/ryzom/common/src/game_share/change_tracker_base.cpp b/ryzom/common/src/game_share/change_tracker_base.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/change_tracker_base.cpp
rename to ryzom/common/src/game_share/change_tracker_base.cpp
diff --git a/code/ryzom/common/src/game_share/change_tracker_base.h b/ryzom/common/src/game_share/change_tracker_base.h
similarity index 100%
rename from code/ryzom/common/src/game_share/change_tracker_base.h
rename to ryzom/common/src/game_share/change_tracker_base.h
diff --git a/code/ryzom/common/src/game_share/change_tracker_client.cpp b/ryzom/common/src/game_share/change_tracker_client.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/change_tracker_client.cpp
rename to ryzom/common/src/game_share/change_tracker_client.cpp
diff --git a/code/ryzom/common/src/game_share/change_tracker_client.h b/ryzom/common/src/game_share/change_tracker_client.h
similarity index 100%
rename from code/ryzom/common/src/game_share/change_tracker_client.h
rename to ryzom/common/src/game_share/change_tracker_client.h
diff --git a/code/ryzom/common/src/game_share/characs_build.cpp b/ryzom/common/src/game_share/characs_build.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/characs_build.cpp
rename to ryzom/common/src/game_share/characs_build.cpp
diff --git a/code/ryzom/common/src/game_share/characs_build.h b/ryzom/common/src/game_share/characs_build.h
similarity index 100%
rename from code/ryzom/common/src/game_share/characs_build.h
rename to ryzom/common/src/game_share/characs_build.h
diff --git a/code/ryzom/common/src/game_share/character_summary.cpp b/ryzom/common/src/game_share/character_summary.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/character_summary.cpp
rename to ryzom/common/src/game_share/character_summary.cpp
diff --git a/code/ryzom/common/src/game_share/character_summary.h b/ryzom/common/src/game_share/character_summary.h
similarity index 100%
rename from code/ryzom/common/src/game_share/character_summary.h
rename to ryzom/common/src/game_share/character_summary.h
diff --git a/code/ryzom/common/src/game_share/character_sync_itf.cpp b/ryzom/common/src/game_share/character_sync_itf.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/character_sync_itf.cpp
rename to ryzom/common/src/game_share/character_sync_itf.cpp
diff --git a/code/ryzom/common/src/game_share/character_sync_itf.h b/ryzom/common/src/game_share/character_sync_itf.h
similarity index 100%
rename from code/ryzom/common/src/game_share/character_sync_itf.h
rename to ryzom/common/src/game_share/character_sync_itf.h
diff --git a/code/ryzom/common/src/game_share/character_sync_itf.xml b/ryzom/common/src/game_share/character_sync_itf.xml
similarity index 100%
rename from code/ryzom/common/src/game_share/character_sync_itf.xml
rename to ryzom/common/src/game_share/character_sync_itf.xml
diff --git a/code/ryzom/common/src/game_share/character_title.cpp b/ryzom/common/src/game_share/character_title.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/character_title.cpp
rename to ryzom/common/src/game_share/character_title.cpp
diff --git a/code/ryzom/common/src/game_share/character_title.h b/ryzom/common/src/game_share/character_title.h
similarity index 100%
rename from code/ryzom/common/src/game_share/character_title.h
rename to ryzom/common/src/game_share/character_title.h
diff --git a/code/ryzom/common/src/game_share/characteristics.cpp b/ryzom/common/src/game_share/characteristics.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/characteristics.cpp
rename to ryzom/common/src/game_share/characteristics.cpp
diff --git a/code/ryzom/common/src/game_share/characteristics.h b/ryzom/common/src/game_share/characteristics.h
similarity index 100%
rename from code/ryzom/common/src/game_share/characteristics.h
rename to ryzom/common/src/game_share/characteristics.h
diff --git a/code/ryzom/common/src/game_share/chat_group.cpp b/ryzom/common/src/game_share/chat_group.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/chat_group.cpp
rename to ryzom/common/src/game_share/chat_group.cpp
diff --git a/code/ryzom/common/src/game_share/chat_group.h b/ryzom/common/src/game_share/chat_group.h
similarity index 100%
rename from code/ryzom/common/src/game_share/chat_group.h
rename to ryzom/common/src/game_share/chat_group.h
diff --git a/code/ryzom/common/src/game_share/client_action_type.cpp b/ryzom/common/src/game_share/client_action_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/client_action_type.cpp
rename to ryzom/common/src/game_share/client_action_type.cpp
diff --git a/code/ryzom/common/src/game_share/client_action_type.h b/ryzom/common/src/game_share/client_action_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/client_action_type.h
rename to ryzom/common/src/game_share/client_action_type.h
diff --git a/code/ryzom/common/src/game_share/combat_flying_text.h b/ryzom/common/src/game_share/combat_flying_text.h
similarity index 100%
rename from code/ryzom/common/src/game_share/combat_flying_text.h
rename to ryzom/common/src/game_share/combat_flying_text.h
diff --git a/code/ryzom/common/src/game_share/constants.h b/ryzom/common/src/game_share/constants.h
similarity index 100%
rename from code/ryzom/common/src/game_share/constants.h
rename to ryzom/common/src/game_share/constants.h
diff --git a/code/ryzom/common/src/game_share/continent.cpp b/ryzom/common/src/game_share/continent.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/continent.cpp
rename to ryzom/common/src/game_share/continent.cpp
diff --git a/code/ryzom/common/src/game_share/continent.h b/ryzom/common/src/game_share/continent.h
similarity index 100%
rename from code/ryzom/common/src/game_share/continent.h
rename to ryzom/common/src/game_share/continent.h
diff --git a/code/ryzom/common/src/game_share/continuous_action.cpp b/ryzom/common/src/game_share/continuous_action.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/continuous_action.cpp
rename to ryzom/common/src/game_share/continuous_action.cpp
diff --git a/code/ryzom/common/src/game_share/continuous_action.h b/ryzom/common/src/game_share/continuous_action.h
similarity index 100%
rename from code/ryzom/common/src/game_share/continuous_action.h
rename to ryzom/common/src/game_share/continuous_action.h
diff --git a/code/ryzom/common/src/game_share/crafting_tool_type.cpp b/ryzom/common/src/game_share/crafting_tool_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/crafting_tool_type.cpp
rename to ryzom/common/src/game_share/crafting_tool_type.cpp
diff --git a/code/ryzom/common/src/game_share/crafting_tool_type.h b/ryzom/common/src/game_share/crafting_tool_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/crafting_tool_type.h
rename to ryzom/common/src/game_share/crafting_tool_type.h
diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/ryzom/common/src/game_share/crypt.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/crypt.cpp
rename to ryzom/common/src/game_share/crypt.cpp
diff --git a/code/ryzom/common/src/game_share/crypt.h b/ryzom/common/src/game_share/crypt.h
similarity index 100%
rename from code/ryzom/common/src/game_share/crypt.h
rename to ryzom/common/src/game_share/crypt.h
diff --git a/code/ryzom/common/src/game_share/crypt_sha512.cpp b/ryzom/common/src/game_share/crypt_sha512.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/crypt_sha512.cpp
rename to ryzom/common/src/game_share/crypt_sha512.cpp
diff --git a/code/ryzom/common/src/game_share/cst_loader.cpp b/ryzom/common/src/game_share/cst_loader.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/cst_loader.cpp
rename to ryzom/common/src/game_share/cst_loader.cpp
diff --git a/code/ryzom/common/src/game_share/cst_loader.h b/ryzom/common/src/game_share/cst_loader.h
similarity index 100%
rename from code/ryzom/common/src/game_share/cst_loader.h
rename to ryzom/common/src/game_share/cst_loader.h
diff --git a/code/ryzom/common/src/game_share/damage_types.cpp b/ryzom/common/src/game_share/damage_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/damage_types.cpp
rename to ryzom/common/src/game_share/damage_types.cpp
diff --git a/code/ryzom/common/src/game_share/damage_types.h b/ryzom/common/src/game_share/damage_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/damage_types.h
rename to ryzom/common/src/game_share/damage_types.h
diff --git a/code/ryzom/common/src/game_share/data_set_base.cpp b/ryzom/common/src/game_share/data_set_base.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/data_set_base.cpp
rename to ryzom/common/src/game_share/data_set_base.cpp
diff --git a/code/ryzom/common/src/game_share/data_set_base.h b/ryzom/common/src/game_share/data_set_base.h
similarity index 100%
rename from code/ryzom/common/src/game_share/data_set_base.h
rename to ryzom/common/src/game_share/data_set_base.h
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.cpp b/ryzom/common/src/game_share/deployment_configuration.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/deployment_configuration.cpp
rename to ryzom/common/src/game_share/deployment_configuration.cpp
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.h b/ryzom/common/src/game_share/deployment_configuration.h
similarity index 100%
rename from code/ryzom/common/src/game_share/deployment_configuration.h
rename to ryzom/common/src/game_share/deployment_configuration.h
diff --git a/code/ryzom/common/src/game_share/dir_light_setup.cpp b/ryzom/common/src/game_share/dir_light_setup.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/dir_light_setup.cpp
rename to ryzom/common/src/game_share/dir_light_setup.cpp
diff --git a/code/ryzom/common/src/game_share/dir_light_setup.h b/ryzom/common/src/game_share/dir_light_setup.h
similarity index 100%
rename from code/ryzom/common/src/game_share/dir_light_setup.h
rename to ryzom/common/src/game_share/dir_light_setup.h
diff --git a/code/ryzom/common/src/game_share/dms.cpp b/ryzom/common/src/game_share/dms.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/dms.cpp
rename to ryzom/common/src/game_share/dms.cpp
diff --git a/code/ryzom/common/src/game_share/dms.h b/ryzom/common/src/game_share/dms.h
similarity index 100%
rename from code/ryzom/common/src/game_share/dms.h
rename to ryzom/common/src/game_share/dms.h
diff --git a/code/ryzom/common/src/game_share/dyn_chat.cpp b/ryzom/common/src/game_share/dyn_chat.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/dyn_chat.cpp
rename to ryzom/common/src/game_share/dyn_chat.cpp
diff --git a/code/ryzom/common/src/game_share/dyn_chat.h b/ryzom/common/src/game_share/dyn_chat.h
similarity index 100%
rename from code/ryzom/common/src/game_share/dyn_chat.h
rename to ryzom/common/src/game_share/dyn_chat.h
diff --git a/code/ryzom/common/src/game_share/ecosystem.cpp b/ryzom/common/src/game_share/ecosystem.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ecosystem.cpp
rename to ryzom/common/src/game_share/ecosystem.cpp
diff --git a/code/ryzom/common/src/game_share/ecosystem.h b/ryzom/common/src/game_share/ecosystem.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ecosystem.h
rename to ryzom/common/src/game_share/ecosystem.h
diff --git a/code/ryzom/common/src/game_share/effect_families.cpp b/ryzom/common/src/game_share/effect_families.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/effect_families.cpp
rename to ryzom/common/src/game_share/effect_families.cpp
diff --git a/code/ryzom/common/src/game_share/effect_families.h b/ryzom/common/src/game_share/effect_families.h
similarity index 100%
rename from code/ryzom/common/src/game_share/effect_families.h
rename to ryzom/common/src/game_share/effect_families.h
diff --git a/code/ryzom/common/src/game_share/emote_list_parser.cpp b/ryzom/common/src/game_share/emote_list_parser.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/emote_list_parser.cpp
rename to ryzom/common/src/game_share/emote_list_parser.cpp
diff --git a/code/ryzom/common/src/game_share/emote_list_parser.h b/ryzom/common/src/game_share/emote_list_parser.h
similarity index 100%
rename from code/ryzom/common/src/game_share/emote_list_parser.h
rename to ryzom/common/src/game_share/emote_list_parser.h
diff --git a/code/ryzom/common/src/game_share/entity_types.h b/ryzom/common/src/game_share/entity_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/entity_types.h
rename to ryzom/common/src/game_share/entity_types.h
diff --git a/code/ryzom/common/src/game_share/enum_generator.lua b/ryzom/common/src/game_share/enum_generator.lua
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_generator.lua
rename to ryzom/common/src/game_share/enum_generator.lua
diff --git a/code/ryzom/common/src/game_share/enum_generator_template_cpp.lua b/ryzom/common/src/game_share/enum_generator_template_cpp.lua
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_generator_template_cpp.lua
rename to ryzom/common/src/game_share/enum_generator_template_cpp.lua
diff --git a/code/ryzom/common/src/game_share/enum_generator_template_h.lua b/ryzom/common/src/game_share/enum_generator_template_h.lua
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_generator_template_h.lua
rename to ryzom/common/src/game_share/enum_generator_template_h.lua
diff --git a/code/ryzom/common/src/game_share/enum_template.cpp b/ryzom/common/src/game_share/enum_template.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_template.cpp
rename to ryzom/common/src/game_share/enum_template.cpp
diff --git a/code/ryzom/common/src/game_share/enum_template.h b/ryzom/common/src/game_share/enum_template.h
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_template.h
rename to ryzom/common/src/game_share/enum_template.h
diff --git a/code/ryzom/common/src/game_share/enum_template.txt b/ryzom/common/src/game_share/enum_template.txt
similarity index 100%
rename from code/ryzom/common/src/game_share/enum_template.txt
rename to ryzom/common/src/game_share/enum_template.txt
diff --git a/code/ryzom/common/src/game_share/fame.cpp b/ryzom/common/src/game_share/fame.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/fame.cpp
rename to ryzom/common/src/game_share/fame.cpp
diff --git a/code/ryzom/common/src/game_share/fame.h b/ryzom/common/src/game_share/fame.h
similarity index 100%
rename from code/ryzom/common/src/game_share/fame.h
rename to ryzom/common/src/game_share/fame.h
diff --git a/code/ryzom/common/src/game_share/far_position.cpp b/ryzom/common/src/game_share/far_position.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/far_position.cpp
rename to ryzom/common/src/game_share/far_position.cpp
diff --git a/code/ryzom/common/src/game_share/far_position.h b/ryzom/common/src/game_share/far_position.h
similarity index 100%
rename from code/ryzom/common/src/game_share/far_position.h
rename to ryzom/common/src/game_share/far_position.h
diff --git a/code/ryzom/common/src/game_share/file_description_container.cpp b/ryzom/common/src/game_share/file_description_container.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/file_description_container.cpp
rename to ryzom/common/src/game_share/file_description_container.cpp
diff --git a/code/ryzom/common/src/game_share/file_description_container.h b/ryzom/common/src/game_share/file_description_container.h
similarity index 100%
rename from code/ryzom/common/src/game_share/file_description_container.h
rename to ryzom/common/src/game_share/file_description_container.h
diff --git a/code/ryzom/common/src/game_share/fog_map_build.cpp b/ryzom/common/src/game_share/fog_map_build.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/fog_map_build.cpp
rename to ryzom/common/src/game_share/fog_map_build.cpp
diff --git a/code/ryzom/common/src/game_share/fog_map_build.h b/ryzom/common/src/game_share/fog_map_build.h
similarity index 100%
rename from code/ryzom/common/src/game_share/fog_map_build.h
rename to ryzom/common/src/game_share/fog_map_build.h
diff --git a/code/ryzom/common/src/game_share/fog_of_war.cpp b/ryzom/common/src/game_share/fog_of_war.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/fog_of_war.cpp
rename to ryzom/common/src/game_share/fog_of_war.cpp
diff --git a/code/ryzom/common/src/game_share/fog_of_war.h b/ryzom/common/src/game_share/fog_of_war.h
similarity index 100%
rename from code/ryzom/common/src/game_share/fog_of_war.h
rename to ryzom/common/src/game_share/fog_of_war.h
diff --git a/code/ryzom/common/src/game_share/fog_type.h b/ryzom/common/src/game_share/fog_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/fog_type.h
rename to ryzom/common/src/game_share/fog_type.h
diff --git a/code/ryzom/common/src/game_share/gender.h b/ryzom/common/src/game_share/gender.h
similarity index 100%
rename from code/ryzom/common/src/game_share/gender.h
rename to ryzom/common/src/game_share/gender.h
diff --git a/code/ryzom/common/src/game_share/generate_client_db.xslt b/ryzom/common/src/game_share/generate_client_db.xslt
similarity index 100%
rename from code/ryzom/common/src/game_share/generate_client_db.xslt
rename to ryzom/common/src/game_share/generate_client_db.xslt
diff --git a/code/ryzom/common/src/game_share/generate_logs.tmpl b/ryzom/common/src/game_share/generate_logs.tmpl
similarity index 100%
rename from code/ryzom/common/src/game_share/generate_logs.tmpl
rename to ryzom/common/src/game_share/generate_logs.tmpl
diff --git a/code/ryzom/common/src/game_share/generate_module_interface.xslt b/ryzom/common/src/game_share/generate_module_interface.xslt
similarity index 100%
rename from code/ryzom/common/src/game_share/generate_module_interface.xslt
rename to ryzom/common/src/game_share/generate_module_interface.xslt
diff --git a/code/ryzom/common/src/game_share/generate_module_interface_doc.txt b/ryzom/common/src/game_share/generate_module_interface_doc.txt
similarity index 100%
rename from code/ryzom/common/src/game_share/generate_module_interface_doc.txt
rename to ryzom/common/src/game_share/generate_module_interface_doc.txt
diff --git a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp b/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
rename to ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
diff --git a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.h b/ryzom/common/src/game_share/generic_xml_msg_mngr.h
similarity index 100%
rename from code/ryzom/common/src/game_share/generic_xml_msg_mngr.h
rename to ryzom/common/src/game_share/generic_xml_msg_mngr.h
diff --git a/code/ryzom/common/src/game_share/georges_helper.cpp b/ryzom/common/src/game_share/georges_helper.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/georges_helper.cpp
rename to ryzom/common/src/game_share/georges_helper.cpp
diff --git a/code/ryzom/common/src/game_share/georges_helper.h b/ryzom/common/src/game_share/georges_helper.h
similarity index 100%
rename from code/ryzom/common/src/game_share/georges_helper.h
rename to ryzom/common/src/game_share/georges_helper.h
diff --git a/code/ryzom/common/src/game_share/guild_grade.cpp b/ryzom/common/src/game_share/guild_grade.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/guild_grade.cpp
rename to ryzom/common/src/game_share/guild_grade.cpp
diff --git a/code/ryzom/common/src/game_share/guild_grade.h b/ryzom/common/src/game_share/guild_grade.h
similarity index 100%
rename from code/ryzom/common/src/game_share/guild_grade.h
rename to ryzom/common/src/game_share/guild_grade.h
diff --git a/code/ryzom/common/src/game_share/guild_grade_inline.h b/ryzom/common/src/game_share/guild_grade_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/guild_grade_inline.h
rename to ryzom/common/src/game_share/guild_grade_inline.h
diff --git a/code/ryzom/common/src/game_share/hit_type.h b/ryzom/common/src/game_share/hit_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/hit_type.h
rename to ryzom/common/src/game_share/hit_type.h
diff --git a/code/ryzom/common/src/game_share/http_client.cpp b/ryzom/common/src/game_share/http_client.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/http_client.cpp
rename to ryzom/common/src/game_share/http_client.cpp
diff --git a/code/ryzom/common/src/game_share/http_client.h b/ryzom/common/src/game_share/http_client.h
similarity index 100%
rename from code/ryzom/common/src/game_share/http_client.h
rename to ryzom/common/src/game_share/http_client.h
diff --git a/code/ryzom/common/src/game_share/intensity_types.cpp b/ryzom/common/src/game_share/intensity_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/intensity_types.cpp
rename to ryzom/common/src/game_share/intensity_types.cpp
diff --git a/code/ryzom/common/src/game_share/intensity_types.h b/ryzom/common/src/game_share/intensity_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/intensity_types.h
rename to ryzom/common/src/game_share/intensity_types.h
diff --git a/code/ryzom/common/src/game_share/interface_flags.cpp b/ryzom/common/src/game_share/interface_flags.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/interface_flags.cpp
rename to ryzom/common/src/game_share/interface_flags.cpp
diff --git a/code/ryzom/common/src/game_share/interface_flags.h b/ryzom/common/src/game_share/interface_flags.h
similarity index 100%
rename from code/ryzom/common/src/game_share/interface_flags.h
rename to ryzom/common/src/game_share/interface_flags.h
diff --git a/code/ryzom/common/src/game_share/inventories.cpp b/ryzom/common/src/game_share/inventories.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/inventories.cpp
rename to ryzom/common/src/game_share/inventories.cpp
diff --git a/code/ryzom/common/src/game_share/inventories.h b/ryzom/common/src/game_share/inventories.h
similarity index 100%
rename from code/ryzom/common/src/game_share/inventories.h
rename to ryzom/common/src/game_share/inventories.h
diff --git a/code/ryzom/common/src/game_share/ios_interface.h b/ryzom/common/src/game_share/ios_interface.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ios_interface.h
rename to ryzom/common/src/game_share/ios_interface.h
diff --git a/code/ryzom/common/src/game_share/item_family.cpp b/ryzom/common/src/game_share/item_family.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/item_family.cpp
rename to ryzom/common/src/game_share/item_family.cpp
diff --git a/code/ryzom/common/src/game_share/item_family.h b/ryzom/common/src/game_share/item_family.h
similarity index 100%
rename from code/ryzom/common/src/game_share/item_family.h
rename to ryzom/common/src/game_share/item_family.h
diff --git a/code/ryzom/common/src/game_share/item_infos.cpp b/ryzom/common/src/game_share/item_infos.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/item_infos.cpp
rename to ryzom/common/src/game_share/item_infos.cpp
diff --git a/code/ryzom/common/src/game_share/item_infos.h b/ryzom/common/src/game_share/item_infos.h
similarity index 100%
rename from code/ryzom/common/src/game_share/item_infos.h
rename to ryzom/common/src/game_share/item_infos.h
diff --git a/code/ryzom/common/src/game_share/item_origin.cpp b/ryzom/common/src/game_share/item_origin.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/item_origin.cpp
rename to ryzom/common/src/game_share/item_origin.cpp
diff --git a/code/ryzom/common/src/game_share/item_origin.h b/ryzom/common/src/game_share/item_origin.h
similarity index 100%
rename from code/ryzom/common/src/game_share/item_origin.h
rename to ryzom/common/src/game_share/item_origin.h
diff --git a/code/ryzom/common/src/game_share/item_special_effect.cpp b/ryzom/common/src/game_share/item_special_effect.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/item_special_effect.cpp
rename to ryzom/common/src/game_share/item_special_effect.cpp
diff --git a/code/ryzom/common/src/game_share/item_special_effect.h b/ryzom/common/src/game_share/item_special_effect.h
similarity index 100%
rename from code/ryzom/common/src/game_share/item_special_effect.h
rename to ryzom/common/src/game_share/item_special_effect.h
diff --git a/code/ryzom/common/src/game_share/item_special_effect.lua b/ryzom/common/src/game_share/item_special_effect.lua
similarity index 100%
rename from code/ryzom/common/src/game_share/item_special_effect.lua
rename to ryzom/common/src/game_share/item_special_effect.lua
diff --git a/code/ryzom/common/src/game_share/item_type.cpp b/ryzom/common/src/game_share/item_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/item_type.cpp
rename to ryzom/common/src/game_share/item_type.cpp
diff --git a/code/ryzom/common/src/game_share/item_type.h b/ryzom/common/src/game_share/item_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/item_type.h
rename to ryzom/common/src/game_share/item_type.h
diff --git a/code/ryzom/common/src/game_share/lift_icons.cpp b/ryzom/common/src/game_share/lift_icons.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/lift_icons.cpp
rename to ryzom/common/src/game_share/lift_icons.cpp
diff --git a/code/ryzom/common/src/game_share/lift_icons.h b/ryzom/common/src/game_share/lift_icons.h
similarity index 100%
rename from code/ryzom/common/src/game_share/lift_icons.h
rename to ryzom/common/src/game_share/lift_icons.h
diff --git a/code/ryzom/common/src/game_share/light_cycle.cpp b/ryzom/common/src/game_share/light_cycle.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/light_cycle.cpp
rename to ryzom/common/src/game_share/light_cycle.cpp
diff --git a/code/ryzom/common/src/game_share/light_cycle.h b/ryzom/common/src/game_share/light_cycle.h
similarity index 100%
rename from code/ryzom/common/src/game_share/light_cycle.h
rename to ryzom/common/src/game_share/light_cycle.h
diff --git a/code/ryzom/common/src/game_share/login_registry.cpp b/ryzom/common/src/game_share/login_registry.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/login_registry.cpp
rename to ryzom/common/src/game_share/login_registry.cpp
diff --git a/code/ryzom/common/src/game_share/login_registry.h b/ryzom/common/src/game_share/login_registry.h
similarity index 100%
rename from code/ryzom/common/src/game_share/login_registry.h
rename to ryzom/common/src/game_share/login_registry.h
diff --git a/code/ryzom/common/src/game_share/loot_harvest_state.cpp b/ryzom/common/src/game_share/loot_harvest_state.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/loot_harvest_state.cpp
rename to ryzom/common/src/game_share/loot_harvest_state.cpp
diff --git a/code/ryzom/common/src/game_share/loot_harvest_state.h b/ryzom/common/src/game_share/loot_harvest_state.h
similarity index 100%
rename from code/ryzom/common/src/game_share/loot_harvest_state.h
rename to ryzom/common/src/game_share/loot_harvest_state.h
diff --git a/code/ryzom/common/src/game_share/magic_fx.cpp b/ryzom/common/src/game_share/magic_fx.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/magic_fx.cpp
rename to ryzom/common/src/game_share/magic_fx.cpp
diff --git a/code/ryzom/common/src/game_share/magic_fx.h b/ryzom/common/src/game_share/magic_fx.h
similarity index 100%
rename from code/ryzom/common/src/game_share/magic_fx.h
rename to ryzom/common/src/game_share/magic_fx.h
diff --git a/code/ryzom/common/src/game_share/mainland_summary.h b/ryzom/common/src/game_share/mainland_summary.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mainland_summary.h
rename to ryzom/common/src/game_share/mainland_summary.h
diff --git a/code/ryzom/common/src/game_share/memorization_set_types.cpp b/ryzom/common/src/game_share/memorization_set_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/memorization_set_types.cpp
rename to ryzom/common/src/game_share/memorization_set_types.cpp
diff --git a/code/ryzom/common/src/game_share/memorization_set_types.h b/ryzom/common/src/game_share/memorization_set_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/memorization_set_types.h
rename to ryzom/common/src/game_share/memorization_set_types.h
diff --git a/code/ryzom/common/src/game_share/mirror.cpp b/ryzom/common/src/game_share/mirror.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror.cpp
rename to ryzom/common/src/game_share/mirror.cpp
diff --git a/code/ryzom/common/src/game_share/mirror.h b/ryzom/common/src/game_share/mirror.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror.h
rename to ryzom/common/src/game_share/mirror.h
diff --git a/code/ryzom/common/src/game_share/mirror_misc_types.h b/ryzom/common/src/game_share/mirror_misc_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror_misc_types.h
rename to ryzom/common/src/game_share/mirror_misc_types.h
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.cpp b/ryzom/common/src/game_share/mirror_prop_value.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror_prop_value.cpp
rename to ryzom/common/src/game_share/mirror_prop_value.cpp
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.h b/ryzom/common/src/game_share/mirror_prop_value.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror_prop_value.h
rename to ryzom/common/src/game_share/mirror_prop_value.h
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value_inline.h b/ryzom/common/src/game_share/mirror_prop_value_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirror_prop_value_inline.h
rename to ryzom/common/src/game_share/mirror_prop_value_inline.h
diff --git a/code/ryzom/common/src/game_share/mirrored_data_set.cpp b/ryzom/common/src/game_share/mirrored_data_set.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mirrored_data_set.cpp
rename to ryzom/common/src/game_share/mirrored_data_set.cpp
diff --git a/code/ryzom/common/src/game_share/mirrored_data_set.h b/ryzom/common/src/game_share/mirrored_data_set.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirrored_data_set.h
rename to ryzom/common/src/game_share/mirrored_data_set.h
diff --git a/code/ryzom/common/src/game_share/mirrored_data_set_inline.h b/ryzom/common/src/game_share/mirrored_data_set_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirrored_data_set_inline.h
rename to ryzom/common/src/game_share/mirrored_data_set_inline.h
diff --git a/code/ryzom/common/src/game_share/mirrored_data_set_types.h b/ryzom/common/src/game_share/mirrored_data_set_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mirrored_data_set_types.h
rename to ryzom/common/src/game_share/mirrored_data_set_types.h
diff --git a/code/ryzom/common/src/game_share/misc_const.h b/ryzom/common/src/game_share/misc_const.h
similarity index 100%
rename from code/ryzom/common/src/game_share/misc_const.h
rename to ryzom/common/src/game_share/misc_const.h
diff --git a/code/ryzom/common/src/game_share/mission_desc.cpp b/ryzom/common/src/game_share/mission_desc.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mission_desc.cpp
rename to ryzom/common/src/game_share/mission_desc.cpp
diff --git a/code/ryzom/common/src/game_share/mission_desc.h b/ryzom/common/src/game_share/mission_desc.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mission_desc.h
rename to ryzom/common/src/game_share/mission_desc.h
diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.cpp b/ryzom/common/src/game_share/mode_and_behaviour.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mode_and_behaviour.cpp
rename to ryzom/common/src/game_share/mode_and_behaviour.cpp
diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/ryzom/common/src/game_share/mode_and_behaviour.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mode_and_behaviour.h
rename to ryzom/common/src/game_share/mode_and_behaviour.h
diff --git a/code/ryzom/common/src/game_share/module_security.h b/ryzom/common/src/game_share/module_security.h
similarity index 100%
rename from code/ryzom/common/src/game_share/module_security.h
rename to ryzom/common/src/game_share/module_security.h
diff --git a/code/ryzom/common/src/game_share/mount_people.cpp b/ryzom/common/src/game_share/mount_people.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mount_people.cpp
rename to ryzom/common/src/game_share/mount_people.cpp
diff --git a/code/ryzom/common/src/game_share/mount_people.h b/ryzom/common/src/game_share/mount_people.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mount_people.h
rename to ryzom/common/src/game_share/mount_people.h
diff --git a/code/ryzom/common/src/game_share/mp_category.cpp b/ryzom/common/src/game_share/mp_category.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/mp_category.cpp
rename to ryzom/common/src/game_share/mp_category.cpp
diff --git a/code/ryzom/common/src/game_share/mp_category.h b/ryzom/common/src/game_share/mp_category.h
similarity index 100%
rename from code/ryzom/common/src/game_share/mp_category.h
rename to ryzom/common/src/game_share/mp_category.h
diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h b/ryzom/common/src/game_share/msg_ais_egs_gen.h
similarity index 100%
rename from code/ryzom/common/src/game_share/msg_ais_egs_gen.h
rename to ryzom/common/src/game_share/msg_ais_egs_gen.h
diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.xml b/ryzom/common/src/game_share/msg_ais_egs_gen.xml
similarity index 100%
rename from code/ryzom/common/src/game_share/msg_ais_egs_gen.xml
rename to ryzom/common/src/game_share/msg_ais_egs_gen.xml
diff --git a/code/ryzom/common/src/game_share/msg_client_server.h b/ryzom/common/src/game_share/msg_client_server.h
similarity index 100%
rename from code/ryzom/common/src/game_share/msg_client_server.h
rename to ryzom/common/src/game_share/msg_client_server.h
diff --git a/code/ryzom/common/src/game_share/msg_encyclopedia.h b/ryzom/common/src/game_share/msg_encyclopedia.h
similarity index 100%
rename from code/ryzom/common/src/game_share/msg_encyclopedia.h
rename to ryzom/common/src/game_share/msg_encyclopedia.h
diff --git a/code/ryzom/common/src/game_share/multi_target.cpp b/ryzom/common/src/game_share/multi_target.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/multi_target.cpp
rename to ryzom/common/src/game_share/multi_target.cpp
diff --git a/code/ryzom/common/src/game_share/multi_target.h b/ryzom/common/src/game_share/multi_target.h
similarity index 100%
rename from code/ryzom/common/src/game_share/multi_target.h
rename to ryzom/common/src/game_share/multi_target.h
diff --git a/code/ryzom/common/src/game_share/object.cpp b/ryzom/common/src/game_share/object.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/object.cpp
rename to ryzom/common/src/game_share/object.cpp
diff --git a/code/ryzom/common/src/game_share/object.h b/ryzom/common/src/game_share/object.h
similarity index 100%
rename from code/ryzom/common/src/game_share/object.h
rename to ryzom/common/src/game_share/object.h
diff --git a/code/ryzom/common/src/game_share/outpost.cpp b/ryzom/common/src/game_share/outpost.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/outpost.cpp
rename to ryzom/common/src/game_share/outpost.cpp
diff --git a/code/ryzom/common/src/game_share/outpost.h b/ryzom/common/src/game_share/outpost.h
similarity index 100%
rename from code/ryzom/common/src/game_share/outpost.h
rename to ryzom/common/src/game_share/outpost.h
diff --git a/code/ryzom/common/src/game_share/pact.cpp b/ryzom/common/src/game_share/pact.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/pact.cpp
rename to ryzom/common/src/game_share/pact.cpp
diff --git a/code/ryzom/common/src/game_share/pact.h b/ryzom/common/src/game_share/pact.h
similarity index 100%
rename from code/ryzom/common/src/game_share/pact.h
rename to ryzom/common/src/game_share/pact.h
diff --git a/code/ryzom/common/src/game_share/people.cpp b/ryzom/common/src/game_share/people.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/people.cpp
rename to ryzom/common/src/game_share/people.cpp
diff --git a/code/ryzom/common/src/game_share/people.h b/ryzom/common/src/game_share/people.h
similarity index 100%
rename from code/ryzom/common/src/game_share/people.h
rename to ryzom/common/src/game_share/people.h
diff --git a/code/ryzom/common/src/game_share/people_pd.cpp b/ryzom/common/src/game_share/people_pd.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/people_pd.cpp
rename to ryzom/common/src/game_share/people_pd.cpp
diff --git a/code/ryzom/common/src/game_share/people_pd.h b/ryzom/common/src/game_share/people_pd.h
similarity index 100%
rename from code/ryzom/common/src/game_share/people_pd.h
rename to ryzom/common/src/game_share/people_pd.h
diff --git a/code/ryzom/common/src/game_share/people_pd_inline.h b/ryzom/common/src/game_share/people_pd_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/people_pd_inline.h
rename to ryzom/common/src/game_share/people_pd_inline.h
diff --git a/code/ryzom/common/src/game_share/permanent_ban_magic_number.h b/ryzom/common/src/game_share/permanent_ban_magic_number.h
similarity index 100%
rename from code/ryzom/common/src/game_share/permanent_ban_magic_number.h
rename to ryzom/common/src/game_share/permanent_ban_magic_number.h
diff --git a/code/ryzom/common/src/game_share/persistent_data.cpp b/ryzom/common/src/game_share/persistent_data.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data.cpp
rename to ryzom/common/src/game_share/persistent_data.cpp
diff --git a/code/ryzom/common/src/game_share/persistent_data.h b/ryzom/common/src/game_share/persistent_data.h
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data.h
rename to ryzom/common/src/game_share/persistent_data.h
diff --git a/code/ryzom/common/src/game_share/persistent_data_inline.h b/ryzom/common/src/game_share/persistent_data_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data_inline.h
rename to ryzom/common/src/game_share/persistent_data_inline.h
diff --git a/code/ryzom/common/src/game_share/persistent_data_template.h b/ryzom/common/src/game_share/persistent_data_template.h
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data_template.h
rename to ryzom/common/src/game_share/persistent_data_template.h
diff --git a/code/ryzom/common/src/game_share/persistent_data_tree.cpp b/ryzom/common/src/game_share/persistent_data_tree.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data_tree.cpp
rename to ryzom/common/src/game_share/persistent_data_tree.cpp
diff --git a/code/ryzom/common/src/game_share/persistent_data_tree.h b/ryzom/common/src/game_share/persistent_data_tree.h
similarity index 100%
rename from code/ryzom/common/src/game_share/persistent_data_tree.h
rename to ryzom/common/src/game_share/persistent_data_tree.h
diff --git a/code/ryzom/common/src/game_share/player_vision_delta.h b/ryzom/common/src/game_share/player_vision_delta.h
similarity index 100%
rename from code/ryzom/common/src/game_share/player_vision_delta.h
rename to ryzom/common/src/game_share/player_vision_delta.h
diff --git a/code/ryzom/common/src/game_share/player_visual_properties.cpp b/ryzom/common/src/game_share/player_visual_properties.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/player_visual_properties.cpp
rename to ryzom/common/src/game_share/player_visual_properties.cpp
diff --git a/code/ryzom/common/src/game_share/player_visual_properties.h b/ryzom/common/src/game_share/player_visual_properties.h
similarity index 100%
rename from code/ryzom/common/src/game_share/player_visual_properties.h
rename to ryzom/common/src/game_share/player_visual_properties.h
diff --git a/code/ryzom/common/src/game_share/power_types.cpp b/ryzom/common/src/game_share/power_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/power_types.cpp
rename to ryzom/common/src/game_share/power_types.cpp
diff --git a/code/ryzom/common/src/game_share/power_types.h b/ryzom/common/src/game_share/power_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/power_types.h
rename to ryzom/common/src/game_share/power_types.h
diff --git a/code/ryzom/common/src/game_share/prerequisit_infos.h b/ryzom/common/src/game_share/prerequisit_infos.h
similarity index 100%
rename from code/ryzom/common/src/game_share/prerequisit_infos.h
rename to ryzom/common/src/game_share/prerequisit_infos.h
diff --git a/code/ryzom/common/src/game_share/properties.h b/ryzom/common/src/game_share/properties.h
similarity index 100%
rename from code/ryzom/common/src/game_share/properties.h
rename to ryzom/common/src/game_share/properties.h
diff --git a/code/ryzom/common/src/game_share/property_allocator.cpp b/ryzom/common/src/game_share/property_allocator.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/property_allocator.cpp
rename to ryzom/common/src/game_share/property_allocator.cpp
diff --git a/code/ryzom/common/src/game_share/property_allocator.h b/ryzom/common/src/game_share/property_allocator.h
similarity index 100%
rename from code/ryzom/common/src/game_share/property_allocator.h
rename to ryzom/common/src/game_share/property_allocator.h
diff --git a/code/ryzom/common/src/game_share/property_allocator_client.cpp b/ryzom/common/src/game_share/property_allocator_client.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/property_allocator_client.cpp
rename to ryzom/common/src/game_share/property_allocator_client.cpp
diff --git a/code/ryzom/common/src/game_share/property_allocator_client.h b/ryzom/common/src/game_share/property_allocator_client.h
similarity index 100%
rename from code/ryzom/common/src/game_share/property_allocator_client.h
rename to ryzom/common/src/game_share/property_allocator_client.h
diff --git a/code/ryzom/common/src/game_share/protection_type.cpp b/ryzom/common/src/game_share/protection_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/protection_type.cpp
rename to ryzom/common/src/game_share/protection_type.cpp
diff --git a/code/ryzom/common/src/game_share/protection_type.h b/ryzom/common/src/game_share/protection_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/protection_type.h
rename to ryzom/common/src/game_share/protection_type.h
diff --git a/code/ryzom/common/src/game_share/pvp_clan.cpp b/ryzom/common/src/game_share/pvp_clan.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/pvp_clan.cpp
rename to ryzom/common/src/game_share/pvp_clan.cpp
diff --git a/code/ryzom/common/src/game_share/pvp_clan.h b/ryzom/common/src/game_share/pvp_clan.h
similarity index 100%
rename from code/ryzom/common/src/game_share/pvp_clan.h
rename to ryzom/common/src/game_share/pvp_clan.h
diff --git a/code/ryzom/common/src/game_share/pvp_mode.cpp b/ryzom/common/src/game_share/pvp_mode.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/pvp_mode.cpp
rename to ryzom/common/src/game_share/pvp_mode.cpp
diff --git a/code/ryzom/common/src/game_share/pvp_mode.h b/ryzom/common/src/game_share/pvp_mode.h
similarity index 100%
rename from code/ryzom/common/src/game_share/pvp_mode.h
rename to ryzom/common/src/game_share/pvp_mode.h
diff --git a/code/ryzom/common/src/game_share/r2_basic_types.h b/ryzom/common/src/game_share/r2_basic_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_basic_types.h
rename to ryzom/common/src/game_share/r2_basic_types.h
diff --git a/code/ryzom/common/src/game_share/r2_ligo_config.cpp b/ryzom/common/src/game_share/r2_ligo_config.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_ligo_config.cpp
rename to ryzom/common/src/game_share/r2_ligo_config.cpp
diff --git a/code/ryzom/common/src/game_share/r2_ligo_config.h b/ryzom/common/src/game_share/r2_ligo_config.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_ligo_config.h
rename to ryzom/common/src/game_share/r2_ligo_config.h
diff --git a/code/ryzom/common/src/game_share/r2_messages.h b/ryzom/common/src/game_share/r2_messages.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_messages.h
rename to ryzom/common/src/game_share/r2_messages.h
diff --git a/code/ryzom/common/src/game_share/r2_modules_itf.cpp b/ryzom/common/src/game_share/r2_modules_itf.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_modules_itf.cpp
rename to ryzom/common/src/game_share/r2_modules_itf.cpp
diff --git a/code/ryzom/common/src/game_share/r2_modules_itf.h b/ryzom/common/src/game_share/r2_modules_itf.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_modules_itf.h
rename to ryzom/common/src/game_share/r2_modules_itf.h
diff --git a/code/ryzom/common/src/game_share/r2_modules_itf.xml b/ryzom/common/src/game_share/r2_modules_itf.xml
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_modules_itf.xml
rename to ryzom/common/src/game_share/r2_modules_itf.xml
diff --git a/code/ryzom/common/src/game_share/r2_share_itf.cpp b/ryzom/common/src/game_share/r2_share_itf.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_share_itf.cpp
rename to ryzom/common/src/game_share/r2_share_itf.cpp
diff --git a/code/ryzom/common/src/game_share/r2_share_itf.h b/ryzom/common/src/game_share/r2_share_itf.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_share_itf.h
rename to ryzom/common/src/game_share/r2_share_itf.h
diff --git a/code/ryzom/common/src/game_share/r2_share_itf.xml b/ryzom/common/src/game_share/r2_share_itf.xml
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_share_itf.xml
rename to ryzom/common/src/game_share/r2_share_itf.xml
diff --git a/code/ryzom/common/src/game_share/r2_types.h b/ryzom/common/src/game_share/r2_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/r2_types.h
rename to ryzom/common/src/game_share/r2_types.h
diff --git a/code/ryzom/common/src/game_share/range_weapon_type.cpp b/ryzom/common/src/game_share/range_weapon_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/range_weapon_type.cpp
rename to ryzom/common/src/game_share/range_weapon_type.cpp
diff --git a/code/ryzom/common/src/game_share/range_weapon_type.h b/ryzom/common/src/game_share/range_weapon_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/range_weapon_type.h
rename to ryzom/common/src/game_share/range_weapon_type.h
diff --git a/code/ryzom/common/src/game_share/resistance_type.cpp b/ryzom/common/src/game_share/resistance_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/resistance_type.cpp
rename to ryzom/common/src/game_share/resistance_type.cpp
diff --git a/code/ryzom/common/src/game_share/resistance_type.h b/ryzom/common/src/game_share/resistance_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/resistance_type.h
rename to ryzom/common/src/game_share/resistance_type.h
diff --git a/code/ryzom/common/src/game_share/ring_access.cpp b/ryzom/common/src/game_share/ring_access.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_access.cpp
rename to ryzom/common/src/game_share/ring_access.cpp
diff --git a/code/ryzom/common/src/game_share/ring_access.h b/ryzom/common/src/game_share/ring_access.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_access.h
rename to ryzom/common/src/game_share/ring_access.h
diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.cpp b/ryzom/common/src/game_share/ring_session_manager_itf.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_session_manager_itf.cpp
rename to ryzom/common/src/game_share/ring_session_manager_itf.cpp
diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.h b/ryzom/common/src/game_share/ring_session_manager_itf.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_session_manager_itf.h
rename to ryzom/common/src/game_share/ring_session_manager_itf.h
diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.php b/ryzom/common/src/game_share/ring_session_manager_itf.php
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_session_manager_itf.php
rename to ryzom/common/src/game_share/ring_session_manager_itf.php
diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.xml b/ryzom/common/src/game_share/ring_session_manager_itf.xml
similarity index 100%
rename from code/ryzom/common/src/game_share/ring_session_manager_itf.xml
rename to ryzom/common/src/game_share/ring_session_manager_itf.xml
diff --git a/code/ryzom/common/src/game_share/rm_family.cpp b/ryzom/common/src/game_share/rm_family.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/rm_family.cpp
rename to ryzom/common/src/game_share/rm_family.cpp
diff --git a/code/ryzom/common/src/game_share/rm_family.h b/ryzom/common/src/game_share/rm_family.h
similarity index 100%
rename from code/ryzom/common/src/game_share/rm_family.h
rename to ryzom/common/src/game_share/rm_family.h
diff --git a/code/ryzom/common/src/game_share/rolemaster_flags.cpp b/ryzom/common/src/game_share/rolemaster_flags.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/rolemaster_flags.cpp
rename to ryzom/common/src/game_share/rolemaster_flags.cpp
diff --git a/code/ryzom/common/src/game_share/rolemaster_flags.h b/ryzom/common/src/game_share/rolemaster_flags.h
similarity index 100%
rename from code/ryzom/common/src/game_share/rolemaster_flags.h
rename to ryzom/common/src/game_share/rolemaster_flags.h
diff --git a/code/ryzom/common/src/game_share/roles.cpp b/ryzom/common/src/game_share/roles.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/roles.cpp
rename to ryzom/common/src/game_share/roles.cpp
diff --git a/code/ryzom/common/src/game_share/roles.h b/ryzom/common/src/game_share/roles.h
similarity index 100%
rename from code/ryzom/common/src/game_share/roles.h
rename to ryzom/common/src/game_share/roles.h
diff --git a/code/ryzom/common/src/game_share/ryzom_database_banks.cpp b/ryzom/common/src/game_share/ryzom_database_banks.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_database_banks.cpp
rename to ryzom/common/src/game_share/ryzom_database_banks.cpp
diff --git a/code/ryzom/common/src/game_share/ryzom_database_banks.h b/ryzom/common/src/game_share/ryzom_database_banks.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_database_banks.h
rename to ryzom/common/src/game_share/ryzom_database_banks.h
diff --git a/code/ryzom/common/src/game_share/ryzom_entity_id.cpp b/ryzom/common/src/game_share/ryzom_entity_id.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_entity_id.cpp
rename to ryzom/common/src/game_share/ryzom_entity_id.cpp
diff --git a/code/ryzom/common/src/game_share/ryzom_entity_id.h b/ryzom/common/src/game_share/ryzom_entity_id.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_entity_id.h
rename to ryzom/common/src/game_share/ryzom_entity_id.h
diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.cpp b/ryzom/common/src/game_share/ryzom_mirror_properties.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_mirror_properties.cpp
rename to ryzom/common/src/game_share/ryzom_mirror_properties.cpp
diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h b/ryzom/common/src/game_share/ryzom_mirror_properties.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_mirror_properties.h
rename to ryzom/common/src/game_share/ryzom_mirror_properties.h
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/ryzom/common/src/game_share/ryzom_version.h
similarity index 100%
rename from code/ryzom/common/src/game_share/ryzom_version.h
rename to ryzom/common/src/game_share/ryzom_version.h
diff --git a/code/ryzom/common/src/game_share/sabrina_com.cpp b/ryzom/common/src/game_share/sabrina_com.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/sabrina_com.cpp
rename to ryzom/common/src/game_share/sabrina_com.cpp
diff --git a/code/ryzom/common/src/game_share/sabrina_com.h b/ryzom/common/src/game_share/sabrina_com.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sabrina_com.h
rename to ryzom/common/src/game_share/sabrina_com.h
diff --git a/code/ryzom/common/src/game_share/sadge_tests.h b/ryzom/common/src/game_share/sadge_tests.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sadge_tests.h
rename to ryzom/common/src/game_share/sadge_tests.h
diff --git a/code/ryzom/common/src/game_share/scenario.cpp b/ryzom/common/src/game_share/scenario.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/scenario.cpp
rename to ryzom/common/src/game_share/scenario.cpp
diff --git a/code/ryzom/common/src/game_share/scenario.h b/ryzom/common/src/game_share/scenario.h
similarity index 100%
rename from code/ryzom/common/src/game_share/scenario.h
rename to ryzom/common/src/game_share/scenario.h
diff --git a/code/ryzom/common/src/game_share/scenario_entry_points.cpp b/ryzom/common/src/game_share/scenario_entry_points.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/scenario_entry_points.cpp
rename to ryzom/common/src/game_share/scenario_entry_points.cpp
diff --git a/code/ryzom/common/src/game_share/scenario_entry_points.h b/ryzom/common/src/game_share/scenario_entry_points.h
similarity index 100%
rename from code/ryzom/common/src/game_share/scenario_entry_points.h
rename to ryzom/common/src/game_share/scenario_entry_points.h
diff --git a/code/ryzom/common/src/game_share/scores.cpp b/ryzom/common/src/game_share/scores.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/scores.cpp
rename to ryzom/common/src/game_share/scores.cpp
diff --git a/code/ryzom/common/src/game_share/scores.h b/ryzom/common/src/game_share/scores.h
similarity index 100%
rename from code/ryzom/common/src/game_share/scores.h
rename to ryzom/common/src/game_share/scores.h
diff --git a/code/ryzom/common/src/game_share/season.cpp b/ryzom/common/src/game_share/season.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/season.cpp
rename to ryzom/common/src/game_share/season.cpp
diff --git a/code/ryzom/common/src/game_share/season.h b/ryzom/common/src/game_share/season.h
similarity index 100%
rename from code/ryzom/common/src/game_share/season.h
rename to ryzom/common/src/game_share/season.h
diff --git a/code/ryzom/common/src/game_share/season_file_ext.h b/ryzom/common/src/game_share/season_file_ext.h
similarity index 100%
rename from code/ryzom/common/src/game_share/season_file_ext.h
rename to ryzom/common/src/game_share/season_file_ext.h
diff --git a/code/ryzom/common/src/game_share/season_inline.h b/ryzom/common/src/game_share/season_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/season_inline.h
rename to ryzom/common/src/game_share/season_inline.h
diff --git a/code/ryzom/common/src/game_share/security_check.cpp b/ryzom/common/src/game_share/security_check.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/security_check.cpp
rename to ryzom/common/src/game_share/security_check.cpp
diff --git a/code/ryzom/common/src/game_share/security_check.h b/ryzom/common/src/game_share/security_check.h
similarity index 100%
rename from code/ryzom/common/src/game_share/security_check.h
rename to ryzom/common/src/game_share/security_check.h
diff --git a/code/ryzom/common/src/game_share/seeds.cpp b/ryzom/common/src/game_share/seeds.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/seeds.cpp
rename to ryzom/common/src/game_share/seeds.cpp
diff --git a/code/ryzom/common/src/game_share/seeds.h b/ryzom/common/src/game_share/seeds.h
similarity index 100%
rename from code/ryzom/common/src/game_share/seeds.h
rename to ryzom/common/src/game_share/seeds.h
diff --git a/code/ryzom/common/src/game_share/send_chat.cpp b/ryzom/common/src/game_share/send_chat.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/send_chat.cpp
rename to ryzom/common/src/game_share/send_chat.cpp
diff --git a/code/ryzom/common/src/game_share/send_chat.h b/ryzom/common/src/game_share/send_chat.h
similarity index 100%
rename from code/ryzom/common/src/game_share/send_chat.h
rename to ryzom/common/src/game_share/send_chat.h
diff --git a/code/ryzom/common/src/game_share/sentence_appraisal.cpp b/ryzom/common/src/game_share/sentence_appraisal.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/sentence_appraisal.cpp
rename to ryzom/common/src/game_share/sentence_appraisal.cpp
diff --git a/code/ryzom/common/src/game_share/sentence_appraisal.h b/ryzom/common/src/game_share/sentence_appraisal.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sentence_appraisal.h
rename to ryzom/common/src/game_share/sentence_appraisal.h
diff --git a/code/ryzom/common/src/game_share/server_admin_module.cpp b/ryzom/common/src/game_share/server_admin_module.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/server_admin_module.cpp
rename to ryzom/common/src/game_share/server_admin_module.cpp
diff --git a/code/ryzom/common/src/game_share/server_admin_module.h b/ryzom/common/src/game_share/server_admin_module.h
similarity index 100%
rename from code/ryzom/common/src/game_share/server_admin_module.h
rename to ryzom/common/src/game_share/server_admin_module.h
diff --git a/code/ryzom/common/src/game_share/server_animation_module.cpp b/ryzom/common/src/game_share/server_animation_module.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/server_animation_module.cpp
rename to ryzom/common/src/game_share/server_animation_module.cpp
diff --git a/code/ryzom/common/src/game_share/server_animation_module.h b/ryzom/common/src/game_share/server_animation_module.h
similarity index 100%
rename from code/ryzom/common/src/game_share/server_animation_module.h
rename to ryzom/common/src/game_share/server_animation_module.h
diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/ryzom/common/src/game_share/server_edition_module.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/server_edition_module.cpp
rename to ryzom/common/src/game_share/server_edition_module.cpp
diff --git a/code/ryzom/common/src/game_share/server_edition_module.h b/ryzom/common/src/game_share/server_edition_module.h
similarity index 100%
rename from code/ryzom/common/src/game_share/server_edition_module.h
rename to ryzom/common/src/game_share/server_edition_module.h
diff --git a/code/ryzom/common/src/game_share/shard_names.cpp b/ryzom/common/src/game_share/shard_names.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/shard_names.cpp
rename to ryzom/common/src/game_share/shard_names.cpp
diff --git a/code/ryzom/common/src/game_share/shard_names.h b/ryzom/common/src/game_share/shard_names.h
similarity index 100%
rename from code/ryzom/common/src/game_share/shard_names.h
rename to ryzom/common/src/game_share/shard_names.h
diff --git a/code/ryzom/common/src/game_share/shield_types.cpp b/ryzom/common/src/game_share/shield_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/shield_types.cpp
rename to ryzom/common/src/game_share/shield_types.cpp
diff --git a/code/ryzom/common/src/game_share/shield_types.h b/ryzom/common/src/game_share/shield_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/shield_types.h
rename to ryzom/common/src/game_share/shield_types.h
diff --git a/code/ryzom/common/src/game_share/simlag.cpp b/ryzom/common/src/game_share/simlag.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/simlag.cpp
rename to ryzom/common/src/game_share/simlag.cpp
diff --git a/code/ryzom/common/src/game_share/simlag.h b/ryzom/common/src/game_share/simlag.h
similarity index 100%
rename from code/ryzom/common/src/game_share/simlag.h
rename to ryzom/common/src/game_share/simlag.h
diff --git a/code/ryzom/common/src/game_share/singleton_registry.h b/ryzom/common/src/game_share/singleton_registry.h
similarity index 100%
rename from code/ryzom/common/src/game_share/singleton_registry.h
rename to ryzom/common/src/game_share/singleton_registry.h
diff --git a/code/ryzom/common/src/game_share/skills.cpp b/ryzom/common/src/game_share/skills.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/skills.cpp
rename to ryzom/common/src/game_share/skills.cpp
diff --git a/code/ryzom/common/src/game_share/skills.h b/ryzom/common/src/game_share/skills.h
similarity index 100%
rename from code/ryzom/common/src/game_share/skills.h
rename to ryzom/common/src/game_share/skills.h
diff --git a/code/ryzom/common/src/game_share/skills_build.cpp b/ryzom/common/src/game_share/skills_build.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/skills_build.cpp
rename to ryzom/common/src/game_share/skills_build.cpp
diff --git a/code/ryzom/common/src/game_share/skills_build.h b/ryzom/common/src/game_share/skills_build.h
similarity index 100%
rename from code/ryzom/common/src/game_share/skills_build.h
rename to ryzom/common/src/game_share/skills_build.h
diff --git a/code/ryzom/common/src/game_share/slot_equipment.cpp b/ryzom/common/src/game_share/slot_equipment.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/slot_equipment.cpp
rename to ryzom/common/src/game_share/slot_equipment.cpp
diff --git a/code/ryzom/common/src/game_share/slot_equipment.h b/ryzom/common/src/game_share/slot_equipment.h
similarity index 100%
rename from code/ryzom/common/src/game_share/slot_equipment.h
rename to ryzom/common/src/game_share/slot_equipment.h
diff --git a/code/ryzom/common/src/game_share/slot_types.cpp b/ryzom/common/src/game_share/slot_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/slot_types.cpp
rename to ryzom/common/src/game_share/slot_types.cpp
diff --git a/code/ryzom/common/src/game_share/slot_types.h b/ryzom/common/src/game_share/slot_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/slot_types.h
rename to ryzom/common/src/game_share/slot_types.h
diff --git a/code/ryzom/common/src/game_share/small_string_manager.cpp b/ryzom/common/src/game_share/small_string_manager.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/small_string_manager.cpp
rename to ryzom/common/src/game_share/small_string_manager.cpp
diff --git a/code/ryzom/common/src/game_share/small_string_manager.h b/ryzom/common/src/game_share/small_string_manager.h
similarity index 100%
rename from code/ryzom/common/src/game_share/small_string_manager.h
rename to ryzom/common/src/game_share/small_string_manager.h
diff --git a/code/ryzom/common/src/game_share/sp_type.cpp b/ryzom/common/src/game_share/sp_type.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/sp_type.cpp
rename to ryzom/common/src/game_share/sp_type.cpp
diff --git a/code/ryzom/common/src/game_share/sp_type.h b/ryzom/common/src/game_share/sp_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sp_type.h
rename to ryzom/common/src/game_share/sp_type.h
diff --git a/code/ryzom/common/src/game_share/sp_type_inline.h b/ryzom/common/src/game_share/sp_type_inline.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sp_type_inline.h
rename to ryzom/common/src/game_share/sp_type_inline.h
diff --git a/code/ryzom/common/src/game_share/sphrase_com.cpp b/ryzom/common/src/game_share/sphrase_com.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/sphrase_com.cpp
rename to ryzom/common/src/game_share/sphrase_com.cpp
diff --git a/code/ryzom/common/src/game_share/sphrase_com.h b/ryzom/common/src/game_share/sphrase_com.h
similarity index 100%
rename from code/ryzom/common/src/game_share/sphrase_com.h
rename to ryzom/common/src/game_share/sphrase_com.h
diff --git a/code/ryzom/common/src/game_share/starting_point.cpp b/ryzom/common/src/game_share/starting_point.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/starting_point.cpp
rename to ryzom/common/src/game_share/starting_point.cpp
diff --git a/code/ryzom/common/src/game_share/starting_point.h b/ryzom/common/src/game_share/starting_point.h
similarity index 100%
rename from code/ryzom/common/src/game_share/starting_point.h
rename to ryzom/common/src/game_share/starting_point.h
diff --git a/code/ryzom/common/src/game_share/stdpch.cpp b/ryzom/common/src/game_share/stdpch.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/stdpch.cpp
rename to ryzom/common/src/game_share/stdpch.cpp
diff --git a/code/ryzom/common/src/game_share/stdpch.h b/ryzom/common/src/game_share/stdpch.h
similarity index 100%
rename from code/ryzom/common/src/game_share/stdpch.h
rename to ryzom/common/src/game_share/stdpch.h
diff --git a/code/ryzom/common/src/game_share/string_manager_sender.cpp b/ryzom/common/src/game_share/string_manager_sender.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/string_manager_sender.cpp
rename to ryzom/common/src/game_share/string_manager_sender.cpp
diff --git a/code/ryzom/common/src/game_share/string_manager_sender.h b/ryzom/common/src/game_share/string_manager_sender.h
similarity index 100%
rename from code/ryzom/common/src/game_share/string_manager_sender.h
rename to ryzom/common/src/game_share/string_manager_sender.h
diff --git a/code/ryzom/common/src/game_share/string_mgr_module.cpp b/ryzom/common/src/game_share/string_mgr_module.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/string_mgr_module.cpp
rename to ryzom/common/src/game_share/string_mgr_module.cpp
diff --git a/code/ryzom/common/src/game_share/string_mgr_module.h b/ryzom/common/src/game_share/string_mgr_module.h
similarity index 100%
rename from code/ryzom/common/src/game_share/string_mgr_module.h
rename to ryzom/common/src/game_share/string_mgr_module.h
diff --git a/code/ryzom/common/src/game_share/synchronised_message.h b/ryzom/common/src/game_share/synchronised_message.h
similarity index 100%
rename from code/ryzom/common/src/game_share/synchronised_message.h
rename to ryzom/common/src/game_share/synchronised_message.h
diff --git a/code/ryzom/common/src/game_share/system_message.h b/ryzom/common/src/game_share/system_message.h
similarity index 100%
rename from code/ryzom/common/src/game_share/system_message.h
rename to ryzom/common/src/game_share/system_message.h
diff --git a/code/ryzom/common/src/game_share/task_list.h b/ryzom/common/src/game_share/task_list.h
similarity index 100%
rename from code/ryzom/common/src/game_share/task_list.h
rename to ryzom/common/src/game_share/task_list.h
diff --git a/code/ryzom/common/src/game_share/teleport_types.cpp b/ryzom/common/src/game_share/teleport_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/teleport_types.cpp
rename to ryzom/common/src/game_share/teleport_types.cpp
diff --git a/code/ryzom/common/src/game_share/teleport_types.h b/ryzom/common/src/game_share/teleport_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/teleport_types.h
rename to ryzom/common/src/game_share/teleport_types.h
diff --git a/code/ryzom/common/src/game_share/temp_inventory_mode.cpp b/ryzom/common/src/game_share/temp_inventory_mode.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/temp_inventory_mode.cpp
rename to ryzom/common/src/game_share/temp_inventory_mode.cpp
diff --git a/code/ryzom/common/src/game_share/temp_inventory_mode.h b/ryzom/common/src/game_share/temp_inventory_mode.h
similarity index 100%
rename from code/ryzom/common/src/game_share/temp_inventory_mode.h
rename to ryzom/common/src/game_share/temp_inventory_mode.h
diff --git a/code/ryzom/common/src/game_share/tick_event_handler.cpp b/ryzom/common/src/game_share/tick_event_handler.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/tick_event_handler.cpp
rename to ryzom/common/src/game_share/tick_event_handler.cpp
diff --git a/code/ryzom/common/src/game_share/tick_event_handler.h b/ryzom/common/src/game_share/tick_event_handler.h
similarity index 100%
rename from code/ryzom/common/src/game_share/tick_event_handler.h
rename to ryzom/common/src/game_share/tick_event_handler.h
diff --git a/code/ryzom/common/src/game_share/tick_proxy_time_measure.h b/ryzom/common/src/game_share/tick_proxy_time_measure.h
similarity index 100%
rename from code/ryzom/common/src/game_share/tick_proxy_time_measure.h
rename to ryzom/common/src/game_share/tick_proxy_time_measure.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.cpp b/ryzom/common/src/game_share/time_weather_season/static_light_cycle.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.cpp
rename to ryzom/common/src/game_share/time_weather_season/static_light_cycle.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h b/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
rename to ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/time_and_season.cpp b/ryzom/common/src/game_share/time_weather_season/time_and_season.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/time_and_season.cpp
rename to ryzom/common/src/game_share/time_weather_season/time_and_season.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/time_and_season.h b/ryzom/common/src/game_share/time_weather_season/time_and_season.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/time_and_season.h
rename to ryzom/common/src/game_share/time_weather_season/time_and_season.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.cpp b/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.cpp
rename to ryzom/common/src/game_share/time_weather_season/time_date_season_manager.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.h b/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/time_date_season_manager.h
rename to ryzom/common/src/game_share/time_weather_season/time_date_season_manager.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function.cpp b/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_function.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function.h b/ryzom/common/src/game_share/time_weather_season/weather_function.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function.h
rename to ryzom/common/src/game_share/time_weather_season/weather_function.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp b/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h b/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
rename to ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp b/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h b/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
rename to ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp b/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_manager.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_manager.h b/ryzom/common/src/game_share/time_weather_season/weather_manager.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_manager.h
rename to ryzom/common/src/game_share/time_weather_season/weather_manager.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp b/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_predict.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_predict.h b/ryzom/common/src/game_share/time_weather_season/weather_predict.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_predict.h
rename to ryzom/common/src/game_share/time_weather_season/weather_predict.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup.cpp b/ryzom/common/src/game_share/time_weather_season/weather_setup.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_setup.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_setup.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup.h b/ryzom/common/src/game_share/time_weather_season/weather_setup.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_setup.h
rename to ryzom/common/src/game_share/time_weather_season/weather_setup.h
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
rename to ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h b/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
similarity index 100%
rename from code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
rename to ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
diff --git a/code/ryzom/common/src/game_share/timer.cpp b/ryzom/common/src/game_share/timer.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/timer.cpp
rename to ryzom/common/src/game_share/timer.cpp
diff --git a/code/ryzom/common/src/game_share/timer.h b/ryzom/common/src/game_share/timer.h
similarity index 100%
rename from code/ryzom/common/src/game_share/timer.h
rename to ryzom/common/src/game_share/timer.h
diff --git a/code/ryzom/common/src/game_share/trade_slot_type.h b/ryzom/common/src/game_share/trade_slot_type.h
similarity index 100%
rename from code/ryzom/common/src/game_share/trade_slot_type.h
rename to ryzom/common/src/game_share/trade_slot_type.h
diff --git a/code/ryzom/common/src/game_share/txt_command.h b/ryzom/common/src/game_share/txt_command.h
similarity index 100%
rename from code/ryzom/common/src/game_share/txt_command.h
rename to ryzom/common/src/game_share/txt_command.h
diff --git a/code/ryzom/common/src/game_share/type_skill_mod.cpp b/ryzom/common/src/game_share/type_skill_mod.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/type_skill_mod.cpp
rename to ryzom/common/src/game_share/type_skill_mod.cpp
diff --git a/code/ryzom/common/src/game_share/type_skill_mod.h b/ryzom/common/src/game_share/type_skill_mod.h
similarity index 100%
rename from code/ryzom/common/src/game_share/type_skill_mod.h
rename to ryzom/common/src/game_share/type_skill_mod.h
diff --git a/code/ryzom/common/src/game_share/user_connection_mgr.h b/ryzom/common/src/game_share/user_connection_mgr.h
similarity index 100%
rename from code/ryzom/common/src/game_share/user_connection_mgr.h
rename to ryzom/common/src/game_share/user_connection_mgr.h
diff --git a/code/ryzom/common/src/game_share/utils.cpp b/ryzom/common/src/game_share/utils.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/utils.cpp
rename to ryzom/common/src/game_share/utils.cpp
diff --git a/code/ryzom/common/src/game_share/utils.h b/ryzom/common/src/game_share/utils.h
similarity index 100%
rename from code/ryzom/common/src/game_share/utils.h
rename to ryzom/common/src/game_share/utils.h
diff --git a/code/ryzom/common/src/game_share/visual_fx.h b/ryzom/common/src/game_share/visual_fx.h
similarity index 100%
rename from code/ryzom/common/src/game_share/visual_fx.h
rename to ryzom/common/src/game_share/visual_fx.h
diff --git a/code/ryzom/common/src/game_share/visual_slot_manager.cpp b/ryzom/common/src/game_share/visual_slot_manager.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/visual_slot_manager.cpp
rename to ryzom/common/src/game_share/visual_slot_manager.cpp
diff --git a/code/ryzom/common/src/game_share/visual_slot_manager.h b/ryzom/common/src/game_share/visual_slot_manager.h
similarity index 100%
rename from code/ryzom/common/src/game_share/visual_slot_manager.h
rename to ryzom/common/src/game_share/visual_slot_manager.h
diff --git a/code/ryzom/common/src/game_share/weapon_types.cpp b/ryzom/common/src/game_share/weapon_types.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/weapon_types.cpp
rename to ryzom/common/src/game_share/weapon_types.cpp
diff --git a/code/ryzom/common/src/game_share/weapon_types.h b/ryzom/common/src/game_share/weapon_types.h
similarity index 100%
rename from code/ryzom/common/src/game_share/weapon_types.h
rename to ryzom/common/src/game_share/weapon_types.h
diff --git a/code/ryzom/common/src/game_share/welcome_service_itf.cpp b/ryzom/common/src/game_share/welcome_service_itf.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/welcome_service_itf.cpp
rename to ryzom/common/src/game_share/welcome_service_itf.cpp
diff --git a/code/ryzom/common/src/game_share/welcome_service_itf.h b/ryzom/common/src/game_share/welcome_service_itf.h
similarity index 100%
rename from code/ryzom/common/src/game_share/welcome_service_itf.h
rename to ryzom/common/src/game_share/welcome_service_itf.h
diff --git a/code/ryzom/common/src/game_share/zc_shard_common.cpp b/ryzom/common/src/game_share/zc_shard_common.cpp
similarity index 100%
rename from code/ryzom/common/src/game_share/zc_shard_common.cpp
rename to ryzom/common/src/game_share/zc_shard_common.cpp
diff --git a/code/ryzom/common/src/game_share/zc_shard_common.h b/ryzom/common/src/game_share/zc_shard_common.h
similarity index 100%
rename from code/ryzom/common/src/game_share/zc_shard_common.h
rename to ryzom/common/src/game_share/zc_shard_common.h
diff --git a/code/ryzom/server/CMakeLists.txt b/ryzom/server/CMakeLists.txt
similarity index 100%
rename from code/ryzom/server/CMakeLists.txt
rename to ryzom/server/CMakeLists.txt
diff --git a/code/ryzom/server/data_shard/egs/client_commands_privileges.txt b/ryzom/server/data_shard/egs/client_commands_privileges.txt
similarity index 100%
rename from code/ryzom/server/data_shard/egs/client_commands_privileges.txt
rename to ryzom/server/data_shard/egs/client_commands_privileges.txt
diff --git a/code/ryzom/server/data_shard/egs/shop_category.cfg b/ryzom/server/data_shard/egs/shop_category.cfg
similarity index 100%
rename from code/ryzom/server/data_shard/egs/shop_category.cfg
rename to ryzom/server/data_shard/egs/shop_category.cfg
diff --git a/code/ryzom/server/data_shard/mirror_sheets/fame.dataset b/ryzom/server/data_shard/mirror_sheets/fame.dataset
similarity index 100%
rename from code/ryzom/server/data_shard/mirror_sheets/fame.dataset
rename to ryzom/server/data_shard/mirror_sheets/fame.dataset
diff --git a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset b/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
similarity index 100%
rename from code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
rename to ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
diff --git a/code/ryzom/server/patchman_cfg/README.md b/ryzom/server/patchman_cfg/README.md
similarity index 100%
rename from code/ryzom/server/patchman_cfg/README.md
rename to ryzom/server/patchman_cfg/README.md
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/admin b/ryzom/server/patchman_cfg/admin_install/bin/admin
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/admin
rename to ryzom/server/patchman_cfg/admin_install/bin/admin
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc b/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc
rename to ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/ps_services b/ryzom/server/patchman_cfg/admin_install/bin/ps_services
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/ps_services
rename to ryzom/server/patchman_cfg/admin_install/bin/ps_services
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/run_forever b/ryzom/server/patchman_cfg/admin_install/bin/run_forever
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/run_forever
rename to ryzom/server/patchman_cfg/admin_install/bin/run_forever
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/ryzom_domain_screen_wrapper.sh b/ryzom/server/patchman_cfg/admin_install/bin/ryzom_domain_screen_wrapper.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/ryzom_domain_screen_wrapper.sh
rename to ryzom/server/patchman_cfg/admin_install/bin/ryzom_domain_screen_wrapper.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/shard b/ryzom/server/patchman_cfg/admin_install/bin/shard
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/shard
rename to ryzom/server/patchman_cfg/admin_install/bin/shard
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/startup b/ryzom/server/patchman_cfg/admin_install/bin/startup
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/startup
rename to ryzom/server/patchman_cfg/admin_install/bin/startup
diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh b/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
rename to ryzom/server/patchman_cfg/admin_install/bin/sync_rrd_graphs.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/dont_keep_cores b/ryzom/server/patchman_cfg/admin_install/patchman/dont_keep_cores
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/dont_keep_cores
rename to ryzom/server/patchman_cfg/admin_install/patchman/dont_keep_cores
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_aes.sh b/ryzom/server/patchman_cfg/admin_install/patchman/loop_aes.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/loop_aes.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/loop_aes.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh b/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh b/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/loop_patchman_once.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh b/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/loop_special_patchman.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh b/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/make_next_live.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.default.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg b/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman/patchman_service_base_linux.cfg
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/screen.rc.default b/ryzom/server/patchman_cfg/admin_install/patchman/screen.rc.default
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/screen.rc.default
rename to ryzom/server/patchman_cfg/admin_install/patchman/screen.rc.default
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh b/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
rename to ryzom/server/patchman_cfg/admin_install/patchman/service_launcher.sh
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list b/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
rename to ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg b/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
rename to ryzom/server/patchman_cfg/admin_install/patchman_service_local.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/00_base.cfg b/ryzom/server/patchman_cfg/cfg/00_base.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/00_base.cfg
rename to ryzom/server/patchman_cfg/cfg/00_base.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/01_domain_mini01.cfg b/ryzom/server/patchman_cfg/cfg/01_domain_mini01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/01_domain_mini01.cfg
rename to ryzom/server/patchman_cfg/cfg/01_domain_mini01.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg b/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg
rename to ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_mainland.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_mainland.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_mainland.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_mini_mainland.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_ring.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_ring.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_ring.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_mini_ring.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_unifier.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_unifier.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_mini_unifier.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_mini_unifier.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_mainland.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_std_mainland.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_mainland.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_std_mainland.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_ring.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_std_ring.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_ring.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_std_ring.cfg
diff --git a/code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_unifier.cfg b/ryzom/server/patchman_cfg/cfg/02_shard_type_std_unifier.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/cfg/02_shard_type_std_unifier.cfg
rename to ryzom/server/patchman_cfg/cfg/02_shard_type_std_unifier.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/ai_service.cfg b/ryzom/server/patchman_cfg/default/ai_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/ai_service.cfg
rename to ryzom/server/patchman_cfg/default/ai_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/backup_service.cfg b/ryzom/server/patchman_cfg/default/backup_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/backup_service.cfg
rename to ryzom/server/patchman_cfg/default/backup_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg b/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg
rename to ryzom/server/patchman_cfg/default/dynamic_scenario_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/entities_game_service.cfg b/ryzom/server/patchman_cfg/default/entities_game_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/entities_game_service.cfg
rename to ryzom/server/patchman_cfg/default/entities_game_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/frontend_service.cfg b/ryzom/server/patchman_cfg/default/frontend_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/frontend_service.cfg
rename to ryzom/server/patchman_cfg/default/frontend_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/gpm_service.cfg b/ryzom/server/patchman_cfg/default/gpm_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/gpm_service.cfg
rename to ryzom/server/patchman_cfg/default/gpm_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/input_output_service.cfg b/ryzom/server/patchman_cfg/default/input_output_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/input_output_service.cfg
rename to ryzom/server/patchman_cfg/default/input_output_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/log_analyser_service.cfg b/ryzom/server/patchman_cfg/default/log_analyser_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/log_analyser_service.cfg
rename to ryzom/server/patchman_cfg/default/log_analyser_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/logger_service.cfg b/ryzom/server/patchman_cfg/default/logger_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/logger_service.cfg
rename to ryzom/server/patchman_cfg/default/logger_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/mail_forum_service.cfg b/ryzom/server/patchman_cfg/default/mail_forum_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/mail_forum_service.cfg
rename to ryzom/server/patchman_cfg/default/mail_forum_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/mirror_service.cfg b/ryzom/server/patchman_cfg/default/mirror_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/mirror_service.cfg
rename to ryzom/server/patchman_cfg/default/mirror_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/naming_service.cfg b/ryzom/server/patchman_cfg/default/naming_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/naming_service.cfg
rename to ryzom/server/patchman_cfg/default/naming_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/ryzom_as.cfg b/ryzom/server/patchman_cfg/default/ryzom_as.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/ryzom_as.cfg
rename to ryzom/server/patchman_cfg/default/ryzom_as.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/shard_unifier_service.cfg b/ryzom/server/patchman_cfg/default/shard_unifier_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/shard_unifier_service.cfg
rename to ryzom/server/patchman_cfg/default/shard_unifier_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/tick_service.cfg b/ryzom/server/patchman_cfg/default/tick_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/tick_service.cfg
rename to ryzom/server/patchman_cfg/default/tick_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/default/welcome_service.cfg b/ryzom/server/patchman_cfg/default/welcome_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/default/welcome_service.cfg
rename to ryzom/server/patchman_cfg/default/welcome_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt b/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
similarity index 100%
rename from code/ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
rename to ryzom/server/patchman_cfg/shard_ctrl_definitions.txt
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt b/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
similarity index 100%
rename from code/ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
rename to ryzom/server/patchman_cfg/shard_ctrl_mini01.txt
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt b/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
similarity index 100%
rename from code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
rename to ryzom/server/patchman_cfg/shard_ctrl_std01.txt
diff --git a/code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg b/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
rename to ryzom/server/patchman_cfg/terminal_mini01/patchman_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/terminal_mini01/server_park_database.txt b/ryzom/server/patchman_cfg/terminal_mini01/server_park_database.txt
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_mini01/server_park_database.txt
rename to ryzom/server/patchman_cfg/terminal_mini01/server_park_database.txt
diff --git a/code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat b/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
rename to ryzom/server/patchman_cfg/terminal_mini01/terminal_mini01.bat
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg b/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg
rename to ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt b/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt
rename to ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat b/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat
similarity index 100%
rename from code/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat
rename to ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat
diff --git a/code/ryzom/server/shard_start.bat b/ryzom/server/shard_start.bat
similarity index 100%
rename from code/ryzom/server/shard_start.bat
rename to ryzom/server/shard_start.bat
diff --git a/code/ryzom/server/shard_start_cmake.bat b/ryzom/server/shard_start_cmake.bat
similarity index 100%
rename from code/ryzom/server/shard_start_cmake.bat
rename to ryzom/server/shard_start_cmake.bat
diff --git a/code/ryzom/server/shard_stop.bat b/ryzom/server/shard_stop.bat
similarity index 100%
rename from code/ryzom/server/shard_stop.bat
rename to ryzom/server/shard_stop.bat
diff --git a/code/ryzom/server/shard_stop_cmake.bat b/ryzom/server/shard_stop_cmake.bat
similarity index 100%
rename from code/ryzom/server/shard_stop_cmake.bat
rename to ryzom/server/shard_stop_cmake.bat
diff --git a/code/ryzom/tools/CMakeLists.txt b/ryzom/tools/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/CMakeLists.txt
rename to ryzom/tools/CMakeLists.txt
diff --git a/code/ryzom/tools/assoc_mem/CMakeLists.txt b/ryzom/tools/assoc_mem/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/assoc_mem/CMakeLists.txt
rename to ryzom/tools/assoc_mem/CMakeLists.txt
diff --git a/code/ryzom/tools/assoc_mem/att_tree.h b/ryzom/tools/assoc_mem/att_tree.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/att_tree.h
rename to ryzom/tools/assoc_mem/att_tree.h
diff --git a/code/ryzom/tools/assoc_mem/attribute.cpp b/ryzom/tools/assoc_mem/attribute.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/attribute.cpp
rename to ryzom/tools/assoc_mem/attribute.cpp
diff --git a/code/ryzom/tools/assoc_mem/attribute.h b/ryzom/tools/assoc_mem/attribute.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/attribute.h
rename to ryzom/tools/assoc_mem/attribute.h
diff --git a/code/ryzom/tools/assoc_mem/brain.cpp b/ryzom/tools/assoc_mem/brain.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/brain.cpp
rename to ryzom/tools/assoc_mem/brain.cpp
diff --git a/code/ryzom/tools/assoc_mem/brain.h b/ryzom/tools/assoc_mem/brain.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/brain.h
rename to ryzom/tools/assoc_mem/brain.h
diff --git a/code/ryzom/tools/assoc_mem/cond_node.cpp b/ryzom/tools/assoc_mem/cond_node.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/cond_node.cpp
rename to ryzom/tools/assoc_mem/cond_node.cpp
diff --git a/code/ryzom/tools/assoc_mem/cond_node.h b/ryzom/tools/assoc_mem/cond_node.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/cond_node.h
rename to ryzom/tools/assoc_mem/cond_node.h
diff --git a/code/ryzom/tools/assoc_mem/field.cpp b/ryzom/tools/assoc_mem/field.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/field.cpp
rename to ryzom/tools/assoc_mem/field.cpp
diff --git a/code/ryzom/tools/assoc_mem/field.h b/ryzom/tools/assoc_mem/field.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/field.h
rename to ryzom/tools/assoc_mem/field.h
diff --git a/code/ryzom/tools/assoc_mem/mode7.txt b/ryzom/tools/assoc_mem/mode7.txt
similarity index 100%
rename from code/ryzom/tools/assoc_mem/mode7.txt
rename to ryzom/tools/assoc_mem/mode7.txt
diff --git a/code/ryzom/tools/assoc_mem/mood.cpp b/ryzom/tools/assoc_mem/mood.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/mood.cpp
rename to ryzom/tools/assoc_mem/mood.cpp
diff --git a/code/ryzom/tools/assoc_mem/mood.h b/ryzom/tools/assoc_mem/mood.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/mood.h
rename to ryzom/tools/assoc_mem/mood.h
diff --git a/code/ryzom/tools/assoc_mem/node.cpp b/ryzom/tools/assoc_mem/node.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/node.cpp
rename to ryzom/tools/assoc_mem/node.cpp
diff --git a/code/ryzom/tools/assoc_mem/node.h b/ryzom/tools/assoc_mem/node.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/node.h
rename to ryzom/tools/assoc_mem/node.h
diff --git a/code/ryzom/tools/assoc_mem/record.cpp b/ryzom/tools/assoc_mem/record.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/record.cpp
rename to ryzom/tools/assoc_mem/record.cpp
diff --git a/code/ryzom/tools/assoc_mem/record.h b/ryzom/tools/assoc_mem/record.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/record.h
rename to ryzom/tools/assoc_mem/record.h
diff --git a/code/ryzom/tools/assoc_mem/result_node.cpp b/ryzom/tools/assoc_mem/result_node.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/result_node.cpp
rename to ryzom/tools/assoc_mem/result_node.cpp
diff --git a/code/ryzom/tools/assoc_mem/result_node.h b/ryzom/tools/assoc_mem/result_node.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/result_node.h
rename to ryzom/tools/assoc_mem/result_node.h
diff --git a/code/ryzom/tools/assoc_mem/test.cpp b/ryzom/tools/assoc_mem/test.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/test.cpp
rename to ryzom/tools/assoc_mem/test.cpp
diff --git a/code/ryzom/tools/assoc_mem/tree.cpp b/ryzom/tools/assoc_mem/tree.cpp
similarity index 100%
rename from code/ryzom/tools/assoc_mem/tree.cpp
rename to ryzom/tools/assoc_mem/tree.cpp
diff --git a/code/ryzom/tools/assoc_mem/tree.h b/ryzom/tools/assoc_mem/tree.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/tree.h
rename to ryzom/tools/assoc_mem/tree.h
diff --git a/code/ryzom/tools/assoc_mem/val_nodes.h b/ryzom/tools/assoc_mem/val_nodes.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/val_nodes.h
rename to ryzom/tools/assoc_mem/val_nodes.h
diff --git a/code/ryzom/tools/assoc_mem/value.h b/ryzom/tools/assoc_mem/value.h
similarity index 100%
rename from code/ryzom/tools/assoc_mem/value.h
rename to ryzom/tools/assoc_mem/value.h
diff --git a/code/ryzom/tools/client/CMakeLists.txt b/ryzom/tools/client/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/client/CMakeLists.txt
rename to ryzom/tools/client/CMakeLists.txt
diff --git a/code/ryzom/tools/client/client_config/StdAfx.cpp b/ryzom/tools/client/client_config/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/StdAfx.cpp
rename to ryzom/tools/client/client_config/StdAfx.cpp
diff --git a/code/ryzom/tools/client/client_config/StdAfx.h b/ryzom/tools/client/client_config/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/StdAfx.h
rename to ryzom/tools/client/client_config/StdAfx.h
diff --git a/code/ryzom/tools/client/client_config/bar.cpp b/ryzom/tools/client/client_config/bar.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/bar.cpp
rename to ryzom/tools/client/client_config/bar.cpp
diff --git a/code/ryzom/tools/client/client_config/bar.h b/ryzom/tools/client/client_config/bar.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/bar.h
rename to ryzom/tools/client/client_config/bar.h
diff --git a/code/ryzom/tools/client/client_config/base_dialog.cpp b/ryzom/tools/client/client_config/base_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/base_dialog.cpp
rename to ryzom/tools/client/client_config/base_dialog.cpp
diff --git a/code/ryzom/tools/client/client_config/base_dialog.h b/ryzom/tools/client/client_config/base_dialog.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/base_dialog.h
rename to ryzom/tools/client/client_config/base_dialog.h
diff --git a/code/ryzom/tools/client/client_config/cfg_file.cpp b/ryzom/tools/client/client_config/cfg_file.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/cfg_file.cpp
rename to ryzom/tools/client/client_config/cfg_file.cpp
diff --git a/code/ryzom/tools/client/client_config/cfg_file.h b/ryzom/tools/client/client_config/cfg_file.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/cfg_file.h
rename to ryzom/tools/client/client_config/cfg_file.h
diff --git a/code/ryzom/tools/client/client_config/client_config.cpp b/ryzom/tools/client/client_config/client_config.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/client_config.cpp
rename to ryzom/tools/client/client_config/client_config.cpp
diff --git a/code/ryzom/tools/client/client_config/client_config.h b/ryzom/tools/client/client_config/client_config.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/client_config.h
rename to ryzom/tools/client/client_config/client_config.h
diff --git a/code/ryzom/tools/client/client_config/client_config.rc b/ryzom/tools/client/client_config/client_config.rc
similarity index 100%
rename from code/ryzom/tools/client/client_config/client_config.rc
rename to ryzom/tools/client/client_config/client_config.rc
diff --git a/code/ryzom/tools/client/client_config/client_configDlg.cpp b/ryzom/tools/client/client_config/client_configDlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/client_configDlg.cpp
rename to ryzom/tools/client/client_config/client_configDlg.cpp
diff --git a/code/ryzom/tools/client/client_config/client_configDlg.h b/ryzom/tools/client/client_config/client_configDlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/client_configDlg.h
rename to ryzom/tools/client/client_config/client_configDlg.h
diff --git a/code/ryzom/tools/client/client_config/database.cpp b/ryzom/tools/client/client_config/database.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/database.cpp
rename to ryzom/tools/client/client_config/database.cpp
diff --git a/code/ryzom/tools/client/client_config/database.h b/ryzom/tools/client/client_config/database.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/database.h
rename to ryzom/tools/client/client_config/database.h
diff --git a/code/ryzom/tools/client/client_config/display_advanced_dlg.cpp b/ryzom/tools/client/client_config/display_advanced_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_advanced_dlg.cpp
rename to ryzom/tools/client/client_config/display_advanced_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/display_advanced_dlg.h b/ryzom/tools/client/client_config/display_advanced_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_advanced_dlg.h
rename to ryzom/tools/client/client_config/display_advanced_dlg.h
diff --git a/code/ryzom/tools/client/client_config/display_details_dlg.cpp b/ryzom/tools/client/client_config/display_details_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_details_dlg.cpp
rename to ryzom/tools/client/client_config/display_details_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/display_details_dlg.h b/ryzom/tools/client/client_config/display_details_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_details_dlg.h
rename to ryzom/tools/client/client_config/display_details_dlg.h
diff --git a/code/ryzom/tools/client/client_config/display_dlg.cpp b/ryzom/tools/client/client_config/display_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_dlg.cpp
rename to ryzom/tools/client/client_config/display_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/display_dlg.h b/ryzom/tools/client/client_config/display_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_dlg.h
rename to ryzom/tools/client/client_config/display_dlg.h
diff --git a/code/ryzom/tools/client/client_config/display_information_d3d_dlg.cpp b/ryzom/tools/client/client_config/display_information_d3d_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_information_d3d_dlg.cpp
rename to ryzom/tools/client/client_config/display_information_d3d_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/display_information_d3d_dlg.h b/ryzom/tools/client/client_config/display_information_d3d_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_information_d3d_dlg.h
rename to ryzom/tools/client/client_config/display_information_d3d_dlg.h
diff --git a/code/ryzom/tools/client/client_config/display_information_gl_dlg.cpp b/ryzom/tools/client/client_config/display_information_gl_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_information_gl_dlg.cpp
rename to ryzom/tools/client/client_config/display_information_gl_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/display_information_gl_dlg.h b/ryzom/tools/client/client_config/display_information_gl_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/display_information_gl_dlg.h
rename to ryzom/tools/client/client_config/display_information_gl_dlg.h
diff --git a/code/ryzom/tools/client/client_config/general_dlg.cpp b/ryzom/tools/client/client_config/general_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/general_dlg.cpp
rename to ryzom/tools/client/client_config/general_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/general_dlg.h b/ryzom/tools/client/client_config/general_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/general_dlg.h
rename to ryzom/tools/client/client_config/general_dlg.h
diff --git a/code/ryzom/tools/client/client_config/preset_dlg.cpp b/ryzom/tools/client/client_config/preset_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/preset_dlg.cpp
rename to ryzom/tools/client/client_config/preset_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/preset_dlg.h b/ryzom/tools/client/client_config/preset_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/preset_dlg.h
rename to ryzom/tools/client/client_config/preset_dlg.h
diff --git a/code/ryzom/tools/client/client_config/res/card_icon.bmp b/ryzom/tools/client/client_config/res/card_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/card_icon.bmp
rename to ryzom/tools/client/client_config/res/card_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/client_config.ico b/ryzom/tools/client/client_config/res/client_config.ico
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/client_config.ico
rename to ryzom/tools/client/client_config/res/client_config.ico
diff --git a/code/ryzom/tools/client/client_config/res/client_config.rc2 b/ryzom/tools/client/client_config/res/client_config.rc2
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/client_config.rc2
rename to ryzom/tools/client/client_config/res/client_config.rc2
diff --git a/code/ryzom/tools/client/client_config/res/display_config_icon.bmp b/ryzom/tools/client/client_config/res/display_config_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/display_config_icon.bmp
rename to ryzom/tools/client/client_config/res/display_config_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/display_icon.bmp b/ryzom/tools/client/client_config/res/display_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/display_icon.bmp
rename to ryzom/tools/client/client_config/res/display_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/display_properties_icon.bmp b/ryzom/tools/client/client_config/res/display_properties_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/display_properties_icon.bmp
rename to ryzom/tools/client/client_config/res/display_properties_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/general_icon.bmp b/ryzom/tools/client/client_config/res/general_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/general_icon.bmp
rename to ryzom/tools/client/client_config/res/general_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/left_bitmap_0.bmp b/ryzom/tools/client/client_config/res/left_bitmap_0.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/left_bitmap_0.bmp
rename to ryzom/tools/client/client_config/res/left_bitmap_0.bmp
diff --git a/code/ryzom/tools/client/client_config/res/network_icon.bmp b/ryzom/tools/client/client_config/res/network_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/network_icon.bmp
rename to ryzom/tools/client/client_config/res/network_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/sound_icon.bmp b/ryzom/tools/client/client_config/res/sound_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/sound_icon.bmp
rename to ryzom/tools/client/client_config/res/sound_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/splash_screen.bmp b/ryzom/tools/client/client_config/res/splash_screen.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/splash_screen.bmp
rename to ryzom/tools/client/client_config/res/splash_screen.bmp
diff --git a/code/ryzom/tools/client/client_config/res/top_right.bmp b/ryzom/tools/client/client_config/res/top_right.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/top_right.bmp
rename to ryzom/tools/client/client_config/res/top_right.bmp
diff --git a/code/ryzom/tools/client/client_config/res/update_icon.bmp b/ryzom/tools/client/client_config/res/update_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/update_icon.bmp
rename to ryzom/tools/client/client_config/res/update_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/res/welcome_icon.bmp b/ryzom/tools/client/client_config/res/welcome_icon.bmp
similarity index 100%
rename from code/ryzom/tools/client/client_config/res/welcome_icon.bmp
rename to ryzom/tools/client/client_config/res/welcome_icon.bmp
diff --git a/code/ryzom/tools/client/client_config/resource.h b/ryzom/tools/client/client_config/resource.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/resource.h
rename to ryzom/tools/client/client_config/resource.h
diff --git a/code/ryzom/tools/client/client_config/sound_dlg.cpp b/ryzom/tools/client/client_config/sound_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/sound_dlg.cpp
rename to ryzom/tools/client/client_config/sound_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/sound_dlg.h b/ryzom/tools/client/client_config/sound_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/sound_dlg.h
rename to ryzom/tools/client/client_config/sound_dlg.h
diff --git a/code/ryzom/tools/client/client_config/system_information_dlg.cpp b/ryzom/tools/client/client_config/system_information_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config/system_information_dlg.cpp
rename to ryzom/tools/client/client_config/system_information_dlg.cpp
diff --git a/code/ryzom/tools/client/client_config/system_information_dlg.h b/ryzom/tools/client/client_config/system_information_dlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_config/system_information_dlg.h
rename to ryzom/tools/client/client_config/system_information_dlg.h
diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/ryzom/tools/client/client_config_qt/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/CMakeLists.txt
rename to ryzom/tools/client/client_config_qt/CMakeLists.txt
diff --git a/code/ryzom/tools/client/client_config_qt/resources/card_icon.png b/ryzom/tools/client/client_config_qt/resources/card_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/card_icon.png
rename to ryzom/tools/client/client_config_qt/resources/card_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/client_config.ico b/ryzom/tools/client/client_config_qt/resources/client_config.ico
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/client_config.ico
rename to ryzom/tools/client/client_config_qt/resources/client_config.ico
diff --git a/code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc b/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc
rename to ryzom/tools/client/client_config_qt/resources/client_config_qt.rc
diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.png b/ryzom/tools/client/client_config_qt/resources/display_config_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/display_config_icon.png
rename to ryzom/tools/client/client_config_qt/resources/display_config_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_icon.png b/ryzom/tools/client/client_config_qt/resources/display_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/display_icon.png
rename to ryzom/tools/client/client_config_qt/resources/display_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png b/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png
rename to ryzom/tools/client/client_config_qt/resources/display_properties_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/general_icon.png b/ryzom/tools/client/client_config_qt/resources/general_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/general_icon.png
rename to ryzom/tools/client/client_config_qt/resources/general_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png b/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png
rename to ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/network_icon.png b/ryzom/tools/client/client_config_qt/resources/network_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/network_icon.png
rename to ryzom/tools/client/client_config_qt/resources/network_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/resources.qrc b/ryzom/tools/client/client_config_qt/resources/resources.qrc
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/resources.qrc
rename to ryzom/tools/client/client_config_qt/resources/resources.qrc
diff --git a/code/ryzom/tools/client/client_config_qt/resources/sound_icon.png b/ryzom/tools/client/client_config_qt/resources/sound_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/sound_icon.png
rename to ryzom/tools/client/client_config_qt/resources/sound_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/splash_screen.png b/ryzom/tools/client/client_config_qt/resources/splash_screen.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/splash_screen.png
rename to ryzom/tools/client/client_config_qt/resources/splash_screen.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/top_right.png b/ryzom/tools/client/client_config_qt/resources/top_right.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/top_right.png
rename to ryzom/tools/client/client_config_qt/resources/top_right.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/update_icon.png b/ryzom/tools/client/client_config_qt/resources/update_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/update_icon.png
rename to ryzom/tools/client/client_config_qt/resources/update_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.png b/ryzom/tools/client/client_config_qt/resources/welcome_icon.png
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/resources/welcome_icon.png
rename to ryzom/tools/client/client_config_qt/resources/welcome_icon.png
diff --git a/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp b/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
rename to ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h b/ryzom/tools/client/client_config_qt/src/client_config_dialog.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h
rename to ryzom/tools/client/client_config_qt/src/client_config_dialog.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/config.cpp b/ryzom/tools/client/client_config_qt/src/config.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/config.cpp
rename to ryzom/tools/client/client_config_qt/src/config.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/config.h b/ryzom/tools/client/client_config_qt/src/config.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/config.h
rename to ryzom/tools/client/client_config_qt/src/config.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp b/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h b/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
rename to ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp b/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h b/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
rename to ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp b/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h b/ryzom/tools/client/client_config_qt/src/display_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h
rename to ryzom/tools/client/client_config_qt/src/display_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp b/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h b/ryzom/tools/client/client_config_qt/src/general_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h
rename to ryzom/tools/client/client_config_qt/src/general_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/main.cpp b/ryzom/tools/client/client_config_qt/src/main.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/main.cpp
rename to ryzom/tools/client/client_config_qt/src/main.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp b/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h b/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
rename to ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/stdpch.cpp b/ryzom/tools/client/client_config_qt/src/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/stdpch.cpp
rename to ryzom/tools/client/client_config_qt/src/stdpch.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/stdpch.h b/ryzom/tools/client/client_config_qt/src/stdpch.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/stdpch.h
rename to ryzom/tools/client/client_config_qt/src/stdpch.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp b/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h b/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
rename to ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp b/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h b/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
rename to ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp b/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
rename to ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h b/ryzom/tools/client/client_config_qt/src/sys_info_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h
rename to ryzom/tools/client/client_config_qt/src/sys_info_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/system.cpp b/ryzom/tools/client/client_config_qt/src/system.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/system.cpp
rename to ryzom/tools/client/client_config_qt/src/system.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/src/system.h b/ryzom/tools/client/client_config_qt/src/system.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/system.h
rename to ryzom/tools/client/client_config_qt/src/system.h
diff --git a/code/ryzom/tools/client/client_config_qt/src/widget_base.h b/ryzom/tools/client/client_config_qt/src/widget_base.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/src/widget_base.h
rename to ryzom/tools/client/client_config_qt/src/widget_base.h
diff --git a/code/ryzom/tools/client/client_config_qt/translations/qtbase_de.ts b/ryzom/tools/client/client_config_qt/translations/qtbase_de.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/qtbase_de.ts
rename to ryzom/tools/client/client_config_qt/translations/qtbase_de.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/qtbase_es.ts b/ryzom/tools/client/client_config_qt/translations/qtbase_es.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/qtbase_es.ts
rename to ryzom/tools/client/client_config_qt/translations/qtbase_es.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/qtbase_fr.ts b/ryzom/tools/client/client_config_qt/translations/qtbase_fr.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/qtbase_fr.ts
rename to ryzom/tools/client/client_config_qt/translations/qtbase_fr.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/qtbase_ru.ts b/ryzom/tools/client/client_config_qt/translations/qtbase_ru.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/qtbase_ru.ts
rename to ryzom/tools/client/client_config_qt/translations/qtbase_ru.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts b/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts
rename to ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts b/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts
rename to ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts b/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts
rename to ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts b/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts
rename to ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts b/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts
rename to ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts
diff --git a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc b/ryzom/tools/client/client_config_qt/translations/translations.qrc
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/translations/translations.qrc
rename to ryzom/tools/client/client_config_qt/translations/translations.qrc
diff --git a/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui b/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
rename to ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui b/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui b/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui b/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui b/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui b/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui b/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui b/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui b/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui
rename to ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui
diff --git a/code/ryzom/tools/client/client_data_check/StdAfx.cpp b/ryzom/tools/client/client_data_check/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/StdAfx.cpp
rename to ryzom/tools/client/client_data_check/StdAfx.cpp
diff --git a/code/ryzom/tools/client/client_data_check/StdAfx.h b/ryzom/tools/client/client_data_check/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/StdAfx.h
rename to ryzom/tools/client/client_data_check/StdAfx.h
diff --git a/code/ryzom/tools/client/client_data_check/client_data_check.cpp b/ryzom/tools/client/client_data_check/client_data_check.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/client_data_check.cpp
rename to ryzom/tools/client/client_data_check/client_data_check.cpp
diff --git a/code/ryzom/tools/client/client_data_check/client_data_check.h b/ryzom/tools/client/client_data_check/client_data_check.h
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/client_data_check.h
rename to ryzom/tools/client/client_data_check/client_data_check.h
diff --git a/code/ryzom/tools/client/client_data_check/client_data_check.rc b/ryzom/tools/client/client_data_check/client_data_check.rc
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/client_data_check.rc
rename to ryzom/tools/client/client_data_check/client_data_check.rc
diff --git a/code/ryzom/tools/client/client_data_check/client_data_checkDlg.cpp b/ryzom/tools/client/client_data_check/client_data_checkDlg.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/client_data_checkDlg.cpp
rename to ryzom/tools/client/client_data_check/client_data_checkDlg.cpp
diff --git a/code/ryzom/tools/client/client_data_check/client_data_checkDlg.h b/ryzom/tools/client/client_data_check/client_data_checkDlg.h
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/client_data_checkDlg.h
rename to ryzom/tools/client/client_data_check/client_data_checkDlg.h
diff --git a/code/ryzom/tools/client/client_data_check/data_scan.cpp b/ryzom/tools/client/client_data_check/data_scan.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/data_scan.cpp
rename to ryzom/tools/client/client_data_check/data_scan.cpp
diff --git a/code/ryzom/tools/client/client_data_check/data_scan.h b/ryzom/tools/client/client_data_check/data_scan.h
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/data_scan.h
rename to ryzom/tools/client/client_data_check/data_scan.h
diff --git a/code/ryzom/tools/client/client_data_check/res/client_data_check.ico b/ryzom/tools/client/client_data_check/res/client_data_check.ico
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/res/client_data_check.ico
rename to ryzom/tools/client/client_data_check/res/client_data_check.ico
diff --git a/code/ryzom/tools/client/client_data_check/res/client_data_check.rc2 b/ryzom/tools/client/client_data_check/res/client_data_check.rc2
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/res/client_data_check.rc2
rename to ryzom/tools/client/client_data_check/res/client_data_check.rc2
diff --git a/code/ryzom/tools/client/client_data_check/resource.h b/ryzom/tools/client/client_data_check/resource.h
similarity index 100%
rename from code/ryzom/tools/client/client_data_check/resource.h
rename to ryzom/tools/client/client_data_check/resource.h
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/ryzom/tools/client/client_patcher/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/client/client_patcher/CMakeLists.txt
rename to ryzom/tools/client/client_patcher/CMakeLists.txt
diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_patcher/main.cpp
rename to ryzom/tools/client/client_patcher/main.cpp
diff --git a/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt b/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
rename to ryzom/tools/client/r2_islands_textures/CMakeLists.txt
diff --git a/code/ryzom/tools/client/r2_islands_textures/blue_pill.ico b/ryzom/tools/client/r2_islands_textures/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/blue_pill.ico
rename to ryzom/tools/client/r2_islands_textures/blue_pill.ico
diff --git a/code/ryzom/tools/client/r2_islands_textures/main.cpp b/ryzom/tools/client/r2_islands_textures/main.cpp
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/main.cpp
rename to ryzom/tools/client/r2_islands_textures/main.cpp
diff --git a/code/ryzom/tools/client/r2_islands_textures/main.rc b/ryzom/tools/client/r2_islands_textures/main.rc
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/main.rc
rename to ryzom/tools/client/r2_islands_textures/main.rc
diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
rename to ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.h b/ryzom/tools/client/r2_islands_textures/screenshot_islands.h
similarity index 100%
rename from code/ryzom/tools/client/r2_islands_textures/screenshot_islands.h
rename to ryzom/tools/client/r2_islands_textures/screenshot_islands.h
diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/ryzom/tools/client/ryzom_installer/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/CMakeLists.txt
rename to ryzom/tools/client/ryzom_installer/CMakeLists.txt
diff --git a/code/ryzom/tools/client/ryzom_installer/res/Info.plist b/ryzom/tools/client/ryzom_installer/res/Info.plist
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/Info.plist
rename to ryzom/tools/client/ryzom_installer/res/Info.plist
diff --git a/code/ryzom/tools/client/ryzom_installer/res/PkgInfo b/ryzom/tools/client/ryzom_installer/res/PkgInfo
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/PkgInfo
rename to ryzom/tools/client/ryzom_installer/res/PkgInfo
diff --git a/code/ryzom/tools/client/ryzom_installer/res/background.png b/ryzom/tools/client/ryzom_installer/res/background.png
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/background.png
rename to ryzom/tools/client/ryzom_installer/res/background.png
diff --git a/code/ryzom/tools/client/ryzom_installer/res/resources.qrc b/ryzom/tools/client/ryzom_installer/res/resources.qrc
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/resources.qrc
rename to ryzom/tools/client/ryzom_installer/res/resources.qrc
diff --git a/code/ryzom/tools/client/ryzom_installer/res/resources.rc b/ryzom/tools/client/ryzom_installer/res/resources.rc
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/resources.rc
rename to ryzom/tools/client/ryzom_installer/res/resources.rc
diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom.icns b/ryzom/tools/client/ryzom_installer/res/ryzom.icns
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/ryzom.icns
rename to ryzom/tools/client/ryzom_installer/res/ryzom.icns
diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom.ico b/ryzom/tools/client/ryzom_installer/res/ryzom.ico
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/ryzom.ico
rename to ryzom/tools/client/ryzom_installer/res/ryzom.ico
diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom.png b/ryzom/tools/client/ryzom_installer/res/ryzom.png
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/ryzom.png
rename to ryzom/tools/client/ryzom_installer/res/ryzom.png
diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini b/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini
rename to ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini
diff --git a/code/ryzom/tools/client/ryzom_installer/res/shortcut.sh b/ryzom/tools/client/ryzom_installer/res/shortcut.sh
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/shortcut.sh
rename to ryzom/tools/client/ryzom_installer/res/shortcut.sh
diff --git a/code/ryzom/tools/client/ryzom_installer/res/template.desktop b/ryzom/tools/client/ryzom_installer/res/template.desktop
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/res/template.desktop
rename to ryzom/tools/client/ryzom_installer/res/template.desktop
diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/ryzom/tools/client/ryzom_installer/src/configfile.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
rename to ryzom/tools/client/ryzom_installer/src/configfile.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.h b/ryzom/tools/client/ryzom_installer/src/configfile.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/configfile.h
rename to ryzom/tools/client/ryzom_installer/src/configfile.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/ryzom/tools/client/ryzom_installer/src/downloader.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
rename to ryzom/tools/client/ryzom_installer/src/downloader.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.h b/ryzom/tools/client/ryzom_installer/src/downloader.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/downloader.h
rename to ryzom/tools/client/ryzom_installer/src/downloader.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp b/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
rename to ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.h b/ryzom/tools/client/ryzom_installer/src/filescleaner.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filescleaner.h
rename to ryzom/tools/client/ryzom_installer/src/filescleaner.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp b/ryzom/tools/client/ryzom_installer/src/filescopier.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp
rename to ryzom/tools/client/ryzom_installer/src/filescopier.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescopier.h b/ryzom/tools/client/ryzom_installer/src/filescopier.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filescopier.h
rename to ryzom/tools/client/ryzom_installer/src/filescopier.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp b/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
rename to ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.h b/ryzom/tools/client/ryzom_installer/src/filesextractor.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/filesextractor.h
rename to ryzom/tools/client/ryzom_installer/src/filesextractor.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/installdialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.h b/ryzom/tools/client/ryzom_installer/src/installdialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/installdialog.h
rename to ryzom/tools/client/ryzom_installer/src/installdialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/ryzom/tools/client/ryzom_installer/src/main.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/main.cpp
rename to ryzom/tools/client/ryzom_installer/src/main.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
rename to ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.h b/ryzom/tools/client/ryzom_installer/src/mainwindow.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/mainwindow.h
rename to ryzom/tools/client/ryzom_installer/src/mainwindow.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h b/ryzom/tools/client/ryzom_installer/src/migratedialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/migratedialog.h
rename to ryzom/tools/client/ryzom_installer/src/migratedialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operation.cpp b/ryzom/tools/client/ryzom_installer/src/operation.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/operation.cpp
rename to ryzom/tools/client/ryzom_installer/src/operation.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operation.h b/ryzom/tools/client/ryzom_installer/src/operation.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/operation.h
rename to ryzom/tools/client/ryzom_installer/src/operation.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/ryzom/tools/client/ryzom_installer/src/operationdialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
rename to ryzom/tools/client/ryzom_installer/src/operationdialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/ryzom/tools/client/ryzom_installer/src/profile.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profile.cpp
rename to ryzom/tools/client/ryzom_installer/src/profile.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.h b/ryzom/tools/client/ryzom_installer/src/profile.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profile.h
rename to ryzom/tools/client/ryzom_installer/src/profile.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp b/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h b/ryzom/tools/client/ryzom_installer/src/profilesdialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h
rename to ryzom/tools/client/ryzom_installer/src/profilesdialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesmodel.cpp b/ryzom/tools/client/ryzom_installer/src/profilesmodel.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profilesmodel.cpp
rename to ryzom/tools/client/ryzom_installer/src/profilesmodel.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesmodel.h b/ryzom/tools/client/ryzom_installer/src/profilesmodel.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/profilesmodel.h
rename to ryzom/tools/client/ryzom_installer/src/profilesmodel.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/qzip.cpp b/ryzom/tools/client/ryzom_installer/src/qzip.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/qzip.cpp
rename to ryzom/tools/client/ryzom_installer/src/qzip.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/qzipreader.h b/ryzom/tools/client/ryzom_installer/src/qzipreader.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/qzipreader.h
rename to ryzom/tools/client/ryzom_installer/src/qzipreader.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/qzipwriter.h b/ryzom/tools/client/ryzom_installer/src/qzipwriter.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/qzipwriter.h
rename to ryzom/tools/client/ryzom_installer/src/qzipwriter.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.cpp b/ryzom/tools/client/ryzom_installer/src/server.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/server.cpp
rename to ryzom/tools/client/ryzom_installer/src/server.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.h b/ryzom/tools/client/ryzom_installer/src/server.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/server.h
rename to ryzom/tools/client/ryzom_installer/src/server.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/serversmodel.cpp b/ryzom/tools/client/ryzom_installer/src/serversmodel.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/serversmodel.cpp
rename to ryzom/tools/client/ryzom_installer/src/serversmodel.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/serversmodel.h b/ryzom/tools/client/ryzom_installer/src/serversmodel.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/serversmodel.h
rename to ryzom/tools/client/ryzom_installer/src/serversmodel.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp b/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h b/ryzom/tools/client/ryzom_installer/src/settingsdialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h
rename to ryzom/tools/client/ryzom_installer/src/settingsdialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/stdpch.cpp b/ryzom/tools/client/ryzom_installer/src/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/stdpch.cpp
rename to ryzom/tools/client/ryzom_installer/src/stdpch.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/stdpch.h b/ryzom/tools/client/ryzom_installer/src/stdpch.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/stdpch.h
rename to ryzom/tools/client/ryzom_installer/src/stdpch.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp b/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp
rename to ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h b/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h
rename to ryzom/tools/client/ryzom_installer/src/uninstalldialog.h
diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp b/ryzom/tools/client/ryzom_installer/src/utils.cpp
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/utils.cpp
rename to ryzom/tools/client/ryzom_installer/src/utils.cpp
diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.h b/ryzom/tools/client/ryzom_installer/src/utils.h
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/src/utils.h
rename to ryzom/tools/client/ryzom_installer/src/utils.h
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/qtbase_de.ts b/ryzom/tools/client/ryzom_installer/translations/qtbase_de.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/qtbase_de.ts
rename to ryzom/tools/client/ryzom_installer/translations/qtbase_de.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/qtbase_es.ts b/ryzom/tools/client/ryzom_installer/translations/qtbase_es.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/qtbase_es.ts
rename to ryzom/tools/client/ryzom_installer/translations/qtbase_es.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/qtbase_fr.ts b/ryzom/tools/client/ryzom_installer/translations/qtbase_fr.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/qtbase_fr.ts
rename to ryzom/tools/client/ryzom_installer/translations/qtbase_fr.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/qtbase_ru.ts b/ryzom/tools/client/ryzom_installer/translations/qtbase_ru.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/qtbase_ru.ts
rename to ryzom/tools/client/ryzom_installer/translations/qtbase_ru.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
rename to ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts b/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts
rename to ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts b/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts
rename to ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts b/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts
rename to ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc b/ryzom/tools/client/ryzom_installer/translations/translations.qrc
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/translations/translations.qrc
rename to ryzom/tools/client/ryzom_installer/translations/translations.qrc
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui b/ryzom/tools/client/ryzom_installer/ui/installdialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/installdialog.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui b/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
rename to ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui b/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/migratedialog.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui b/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/operationdialog.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui b/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui b/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui
similarity index 100%
rename from code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui
rename to ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui
diff --git a/code/ryzom/tools/connection_stats/StdAfx.cpp b/ryzom/tools/connection_stats/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/connection_stats/StdAfx.cpp
rename to ryzom/tools/connection_stats/StdAfx.cpp
diff --git a/code/ryzom/tools/connection_stats/StdAfx.h b/ryzom/tools/connection_stats/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/connection_stats/StdAfx.h
rename to ryzom/tools/connection_stats/StdAfx.h
diff --git a/code/ryzom/tools/connection_stats/connection_stats.cpp b/ryzom/tools/connection_stats/connection_stats.cpp
similarity index 100%
rename from code/ryzom/tools/connection_stats/connection_stats.cpp
rename to ryzom/tools/connection_stats/connection_stats.cpp
diff --git a/code/ryzom/tools/connection_stats/connection_stats.def b/ryzom/tools/connection_stats/connection_stats.def
similarity index 100%
rename from code/ryzom/tools/connection_stats/connection_stats.def
rename to ryzom/tools/connection_stats/connection_stats.def
diff --git a/code/ryzom/tools/connection_stats/connection_stats.h b/ryzom/tools/connection_stats/connection_stats.h
similarity index 100%
rename from code/ryzom/tools/connection_stats/connection_stats.h
rename to ryzom/tools/connection_stats/connection_stats.h
diff --git a/code/ryzom/tools/leveldesign/CMakeLists.txt b/ryzom/tools/leveldesign/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/CMakeLists.txt
rename to ryzom/tools/leveldesign/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt b/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
rename to ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cfg b/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cfg
rename to ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cfg
diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp b/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp
rename to ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp
diff --git a/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt b/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt
rename to ryzom/tools/leveldesign/csv_transform/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp b/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp
rename to ryzom/tools/leveldesign/csv_transform/csv_transform.cpp
diff --git a/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h b/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h
rename to ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h
diff --git a/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h b/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h
rename to ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h
diff --git a/code/ryzom/tools/leveldesign/csv_transform/test.scr b/ryzom/tools/leveldesign/csv_transform/test.scr
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/test.scr
rename to ryzom/tools/leveldesign/csv_transform/test.scr
diff --git a/code/ryzom/tools/leveldesign/csv_transform/test1.scr b/ryzom/tools/leveldesign/csv_transform/test1.scr
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/test1.scr
rename to ryzom/tools/leveldesign/csv_transform/test1.scr
diff --git a/code/ryzom/tools/leveldesign/csv_transform/test2.scr b/ryzom/tools/leveldesign/csv_transform/test2.scr
similarity index 100%
rename from code/ryzom/tools/leveldesign/csv_transform/test2.scr
rename to ryzom/tools/leveldesign/csv_transform/test2.scr
diff --git a/code/ryzom/tools/leveldesign/export/CMakeLists.txt b/ryzom/tools/leveldesign/export/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/CMakeLists.txt
rename to ryzom/tools/leveldesign/export/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/export/export.cpp b/ryzom/tools/leveldesign/export/export.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/export.cpp
rename to ryzom/tools/leveldesign/export/export.cpp
diff --git a/code/ryzom/tools/leveldesign/export/export.h b/ryzom/tools/leveldesign/export/export.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/export.h
rename to ryzom/tools/leveldesign/export/export.h
diff --git a/code/ryzom/tools/leveldesign/export/formFlora.cpp b/ryzom/tools/leveldesign/export/formFlora.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/formFlora.cpp
rename to ryzom/tools/leveldesign/export/formFlora.cpp
diff --git a/code/ryzom/tools/leveldesign/export/formFlora.h b/ryzom/tools/leveldesign/export/formFlora.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/formFlora.h
rename to ryzom/tools/leveldesign/export/formFlora.h
diff --git a/code/ryzom/tools/leveldesign/export/formPlant.cpp b/ryzom/tools/leveldesign/export/formPlant.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/formPlant.cpp
rename to ryzom/tools/leveldesign/export/formPlant.cpp
diff --git a/code/ryzom/tools/leveldesign/export/formPlant.h b/ryzom/tools/leveldesign/export/formPlant.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/formPlant.h
rename to ryzom/tools/leveldesign/export/formPlant.h
diff --git a/code/ryzom/tools/leveldesign/export/tools.cpp b/ryzom/tools/leveldesign/export/tools.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/tools.cpp
rename to ryzom/tools/leveldesign/export/tools.cpp
diff --git a/code/ryzom/tools/leveldesign/export/tools.h b/ryzom/tools/leveldesign/export/tools.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/export/tools.h
rename to ryzom/tools/leveldesign/export/tools.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/common.h b/ryzom/tools/leveldesign/georges_convert/common.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/common.h
rename to ryzom/tools/leveldesign/georges_convert/common.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form.cpp b/ryzom/tools/leveldesign/georges_convert/form.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form.cpp
rename to ryzom/tools/leveldesign/georges_convert/form.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form.h b/ryzom/tools/leveldesign/georges_convert/form.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form.h
rename to ryzom/tools/leveldesign/georges_convert/form.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt.cpp b/ryzom/tools/leveldesign/georges_convert/form_body_elt.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt.h b/ryzom/tools/leveldesign/georges_convert/form_body_elt.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt.h
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.cpp b/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h b/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.cpp b/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_list.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h b/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.cpp b/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h b/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h
rename to ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_file.cpp b/ryzom/tools/leveldesign/georges_convert/form_file.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_file.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_file.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_file.h b/ryzom/tools/leveldesign/georges_convert/form_file.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_file.h
rename to ryzom/tools/leveldesign/georges_convert/form_file.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_head.cpp b/ryzom/tools/leveldesign/georges_convert/form_head.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_head.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_head.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_head.h b/ryzom/tools/leveldesign/georges_convert/form_head.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_head.h
rename to ryzom/tools/leveldesign/georges_convert/form_head.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_loader.cpp b/ryzom/tools/leveldesign/georges_convert/form_loader.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_loader.cpp
rename to ryzom/tools/leveldesign/georges_convert/form_loader.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_loader.h b/ryzom/tools/leveldesign/georges_convert/form_loader.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/form_loader.h
rename to ryzom/tools/leveldesign/georges_convert/form_loader.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/georges_convert.cpp b/ryzom/tools/leveldesign/georges_convert/georges_convert.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/georges_convert.cpp
rename to ryzom/tools/leveldesign/georges_convert/georges_convert.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/georges_loader.cpp b/ryzom/tools/leveldesign/georges_convert/georges_loader.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/georges_loader.cpp
rename to ryzom/tools/leveldesign/georges_convert/georges_loader.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/georges_loader.h b/ryzom/tools/leveldesign/georges_convert/georges_loader.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/georges_loader.h
rename to ryzom/tools/leveldesign/georges_convert/georges_loader.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item.cpp b/ryzom/tools/leveldesign/georges_convert/item.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item.cpp
rename to ryzom/tools/leveldesign/georges_convert/item.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item.h b/ryzom/tools/leveldesign/georges_convert/item.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item.h
rename to ryzom/tools/leveldesign/georges_convert/item.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt.cpp b/ryzom/tools/leveldesign/georges_convert/item_elt.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt.cpp
rename to ryzom/tools/leveldesign/georges_convert/item_elt.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt.h b/ryzom/tools/leveldesign/georges_convert/item_elt.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt.h
rename to ryzom/tools/leveldesign/georges_convert/item_elt.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_atom.cpp b/ryzom/tools/leveldesign/georges_convert/item_elt_atom.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_atom.cpp
rename to ryzom/tools/leveldesign/georges_convert/item_elt_atom.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_atom.h b/ryzom/tools/leveldesign/georges_convert/item_elt_atom.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_atom.h
rename to ryzom/tools/leveldesign/georges_convert/item_elt_atom.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_list.cpp b/ryzom/tools/leveldesign/georges_convert/item_elt_list.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_list.cpp
rename to ryzom/tools/leveldesign/georges_convert/item_elt_list.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_list.h b/ryzom/tools/leveldesign/georges_convert/item_elt_list.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_list.h
rename to ryzom/tools/leveldesign/georges_convert/item_elt_list.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_struct.cpp b/ryzom/tools/leveldesign/georges_convert/item_elt_struct.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_struct.cpp
rename to ryzom/tools/leveldesign/georges_convert/item_elt_struct.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_elt_struct.h b/ryzom/tools/leveldesign/georges_convert/item_elt_struct.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_elt_struct.h
rename to ryzom/tools/leveldesign/georges_convert/item_elt_struct.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_loader.cpp b/ryzom/tools/leveldesign/georges_convert/item_loader.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_loader.cpp
rename to ryzom/tools/leveldesign/georges_convert/item_loader.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/item_loader.h b/ryzom/tools/leveldesign/georges_convert/item_loader.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/item_loader.h
rename to ryzom/tools/leveldesign/georges_convert/item_loader.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt.cpp b/ryzom/tools/leveldesign/georges_convert/mold_elt.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_elt.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt.h b/ryzom/tools/leveldesign/georges_convert/mold_elt.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt.h
rename to ryzom/tools/leveldesign/georges_convert/mold_elt.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_define.cpp b/ryzom/tools/leveldesign/georges_convert/mold_elt_define.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_define.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_define.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_define.h b/ryzom/tools/leveldesign/georges_convert/mold_elt_define.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_define.h
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_define.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.cpp b/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.h b/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.h
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_define_list.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_type.cpp b/ryzom/tools/leveldesign/georges_convert/mold_elt_type.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_type.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_type.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_type.h b/ryzom/tools/leveldesign/georges_convert/mold_elt_type.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_type.h
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_type.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.cpp b/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.h b/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.h
rename to ryzom/tools/leveldesign/georges_convert/mold_elt_type_list.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_loader.cpp b/ryzom/tools/leveldesign/georges_convert/mold_loader.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_loader.cpp
rename to ryzom/tools/leveldesign/georges_convert/mold_loader.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/mold_loader.h b/ryzom/tools/leveldesign/georges_convert/mold_loader.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/mold_loader.h
rename to ryzom/tools/leveldesign/georges_convert/mold_loader.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.cpp b/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.cpp
rename to ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.h b/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.h
rename to ryzom/tools/leveldesign/georges_convert/stdgeorgesconvert.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp b/ryzom/tools/leveldesign/georges_convert/string_ex.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp
rename to ryzom/tools/leveldesign/georges_convert/string_ex.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h b/ryzom/tools/leveldesign/georges_convert/string_ex.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/string_ex.h
rename to ryzom/tools/leveldesign/georges_convert/string_ex.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit.h b/ryzom/tools/leveldesign/georges_convert/type_unit.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit_double.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_double.h b/ryzom/tools/leveldesign/georges_convert/type_unit_double.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_double.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit_double.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit_file_name.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.h b/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_file_name.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit_file_name.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.h b/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit_int_signed.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.h b/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit_int_unsigned.h
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_string.cpp b/ryzom/tools/leveldesign/georges_convert/type_unit_string.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_string.cpp
rename to ryzom/tools/leveldesign/georges_convert/type_unit_string.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_convert/type_unit_string.h b/ryzom/tools/leveldesign/georges_convert/type_unit_string.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_convert/type_unit_string.h
rename to ryzom/tools/leveldesign/georges_convert/type_unit_string.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt b/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt
rename to ryzom/tools/leveldesign/georges_dll/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/georges_dll/Resource.h b/ryzom/tools/leveldesign/georges_dll/Resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/Resource.h
rename to ryzom/tools/leveldesign/georges_dll/Resource.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/action.cpp b/ryzom/tools/leveldesign/georges_dll/action.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/action.cpp
rename to ryzom/tools/leveldesign/georges_dll/action.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/action.h b/ryzom/tools/leveldesign/georges_dll/action.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/action.h
rename to ryzom/tools/leveldesign/georges_dll/action.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.h b/ryzom/tools/leveldesign/georges_dll/base_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/base_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/base_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/child_frm.cpp b/ryzom/tools/leveldesign/georges_dll/child_frm.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/child_frm.cpp
rename to ryzom/tools/leveldesign/georges_dll/child_frm.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/child_frm.h b/ryzom/tools/leveldesign/georges_dll/child_frm.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/child_frm.h
rename to ryzom/tools/leveldesign/georges_dll/child_frm.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/color_wnd.cpp b/ryzom/tools/leveldesign/georges_dll/color_wnd.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/color_wnd.cpp
rename to ryzom/tools/leveldesign/georges_dll/color_wnd.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/color_wnd.h b/ryzom/tools/leveldesign/georges_dll/color_wnd.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/color_wnd.h
rename to ryzom/tools/leveldesign/georges_dll/color_wnd.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp b/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp
rename to ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.h b/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.h
rename to ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/dfn_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/dfn_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/dfn_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/dfn_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/dfn_dialog.h b/ryzom/tools/leveldesign/georges_dll/dfn_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/dfn_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/dfn_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/displayer.cpp b/ryzom/tools/leveldesign/georges_dll/displayer.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/displayer.cpp
rename to ryzom/tools/leveldesign/georges_dll/displayer.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/displayer.h b/ryzom/tools/leveldesign/georges_dll/displayer.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/displayer.h
rename to ryzom/tools/leveldesign/georges_dll/displayer.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.cpp b/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.cpp
rename to ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h b/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
rename to ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/file_browser_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.h b/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/file_browser_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/file_browser_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp b/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
rename to ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/file_tree_view.h b/ryzom/tools/leveldesign/georges_dll/file_tree_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/file_tree_view.h
rename to ryzom/tools/leveldesign/georges_dll/file_tree_view.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h b/ryzom/tools/leveldesign/georges_dll/form_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/form_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/form_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_debug.def b/ryzom/tools/leveldesign/georges_dll/georges_debug.def
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_debug.def
rename to ryzom/tools/leveldesign/georges_dll/georges_debug.def
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_dll_d.exp b/ryzom/tools/leveldesign/georges_dll/georges_dll_d.exp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_dll_d.exp
rename to ryzom/tools/leveldesign/georges_dll/georges_dll_d.exp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_dll_r.exp b/ryzom/tools/leveldesign/georges_dll/georges_dll_r.exp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_dll_r.exp
rename to ryzom/tools/leveldesign/georges_dll/georges_dll_r.exp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit.cpp b/ryzom/tools/leveldesign/georges_dll/georges_edit.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit.cpp
rename to ryzom/tools/leveldesign/georges_dll/georges_edit.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit.h b/ryzom/tools/leveldesign/georges_dll/georges_edit.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit.h
rename to ryzom/tools/leveldesign/georges_dll/georges_edit.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit.html b/ryzom/tools/leveldesign/georges_dll/georges_edit.html
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit.html
rename to ryzom/tools/leveldesign/georges_dll/georges_edit.html
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit.rc b/ryzom/tools/leveldesign/georges_dll/georges_edit.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit.rc
rename to ryzom/tools/leveldesign/georges_dll/georges_edit.rc
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.def b/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.def
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.def
rename to ryzom/tools/leveldesign/georges_dll/georges_edit_dll.def
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
rename to ryzom/tools/leveldesign/georges_dll/georges_edit_doc.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h b/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
rename to ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp b/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp
rename to ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.h b/ryzom/tools/leveldesign/georges_dll/georges_edit_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.h
rename to ryzom/tools/leveldesign/georges_dll/georges_edit_view.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp b/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp
rename to ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h b/ryzom/tools/leveldesign/georges_dll/georges_interface.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_interface.h
rename to ryzom/tools/leveldesign/georges_dll/georges_interface.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_release.def b/ryzom/tools/leveldesign/georges_dll/georges_release.def
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/georges_release.def
rename to ryzom/tools/leveldesign/georges_dll/georges_release.def
diff --git a/code/ryzom/tools/leveldesign/georges_dll/header_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/header_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/header_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/header_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/header_dialog.h b/ryzom/tools/leveldesign/georges_dll/header_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/header_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/header_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/icon_wnd.cpp b/ryzom/tools/leveldesign/georges_dll/icon_wnd.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/icon_wnd.cpp
rename to ryzom/tools/leveldesign/georges_dll/icon_wnd.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/icon_wnd.h b/ryzom/tools/leveldesign/georges_dll/icon_wnd.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/icon_wnd.h
rename to ryzom/tools/leveldesign/georges_dll/icon_wnd.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
rename to ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/imagelist_ex.h b/ryzom/tools/leveldesign/georges_dll/imagelist_ex.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/imagelist_ex.h
rename to ryzom/tools/leveldesign/georges_dll/imagelist_ex.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/left_view.cpp b/ryzom/tools/leveldesign/georges_dll/left_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/left_view.cpp
rename to ryzom/tools/leveldesign/georges_dll/left_view.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/left_view.h b/ryzom/tools/leveldesign/georges_dll/left_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/left_view.h
rename to ryzom/tools/leveldesign/georges_dll/left_view.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/main_frm.cpp b/ryzom/tools/leveldesign/georges_dll/main_frm.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/main_frm.cpp
rename to ryzom/tools/leveldesign/georges_dll/main_frm.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/main_frm.h b/ryzom/tools/leveldesign/georges_dll/main_frm.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/main_frm.h
rename to ryzom/tools/leveldesign/georges_dll/main_frm.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/memory_combo_box.cpp b/ryzom/tools/leveldesign/georges_dll/memory_combo_box.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/memory_combo_box.cpp
rename to ryzom/tools/leveldesign/georges_dll/memory_combo_box.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/memory_combo_box.h b/ryzom/tools/leveldesign/georges_dll/memory_combo_box.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/memory_combo_box.h
rename to ryzom/tools/leveldesign/georges_dll/memory_combo_box.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.cpp b/ryzom/tools/leveldesign/georges_dll/output_console_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.cpp
rename to ryzom/tools/leveldesign/georges_dll/output_console_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h b/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
rename to ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h b/ryzom/tools/leveldesign/georges_dll/plugin_interface.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h
rename to ryzom/tools/leveldesign/georges_dll/plugin_interface.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.cpp b/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.cpp
rename to ryzom/tools/leveldesign/georges_dll/reg_shell_ext.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.h b/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/reg_shell_ext.h
rename to ryzom/tools/leveldesign/georges_dll/reg_shell_ext.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/Toolbar.bmp b/ryzom/tools/leveldesign/georges_dll/res/Toolbar.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/Toolbar.bmp
rename to ryzom/tools/leveldesign/georges_dll/res/Toolbar.bmp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/array.ico b/ryzom/tools/leveldesign/georges_dll/res/array.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/array.ico
rename to ryzom/tools/leveldesign/georges_dll/res/array.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/georges_edit.rc2 b/ryzom/tools/leveldesign/georges_dll/res/georges_edit.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/georges_edit.rc2
rename to ryzom/tools/leveldesign/georges_dll/res/georges_edit.rc2
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/header.ico b/ryzom/tools/leveldesign/georges_dll/res/header.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/header.ico
rename to ryzom/tools/leveldesign/georges_dll/res/header.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/hold.ico b/ryzom/tools/leveldesign/georges_dll/res/hold.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/hold.ico
rename to ryzom/tools/leveldesign/georges_dll/res/hold.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/root.ico b/ryzom/tools/leveldesign/georges_dll/res/root.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/root.ico
rename to ryzom/tools/leveldesign/georges_dll/res/root.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/struct.ico b/ryzom/tools/leveldesign/georges_dll/res/struct.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/struct.ico
rename to ryzom/tools/leveldesign/georges_dll/res/struct.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/vstruct.ico b/ryzom/tools/leveldesign/georges_dll/res/vstruct.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/vstruct.ico
rename to ryzom/tools/leveldesign/georges_dll/res/vstruct.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/worldbuilder.ico b/ryzom/tools/leveldesign/georges_dll/res/worldbuilder.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/worldbuilder.ico
rename to ryzom/tools/leveldesign/georges_dll/res/worldbuilder.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/zen.ico b/ryzom/tools/leveldesign/georges_dll/res/zen.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/zen.ico
rename to ryzom/tools/leveldesign/georges_dll/res/zen.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/res/zfee51.ico b/ryzom/tools/leveldesign/georges_dll/res/zfee51.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/res/zfee51.ico
rename to ryzom/tools/leveldesign/georges_dll/res/zfee51.ico
diff --git a/code/ryzom/tools/leveldesign/georges_dll/settings_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/settings_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/settings_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/settings_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/settings_dialog.h b/ryzom/tools/leveldesign/georges_dll/settings_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/settings_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/settings_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/splash_screen.cpp b/ryzom/tools/leveldesign/georges_dll/splash_screen.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/splash_screen.cpp
rename to ryzom/tools/leveldesign/georges_dll/splash_screen.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/splash_screen.h b/ryzom/tools/leveldesign/georges_dll/splash_screen.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/splash_screen.h
rename to ryzom/tools/leveldesign/georges_dll/splash_screen.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp b/ryzom/tools/leveldesign/georges_dll/stdafx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp
rename to ryzom/tools/leveldesign/georges_dll/stdafx.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/stdafx.h b/ryzom/tools/leveldesign/georges_dll/stdafx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/stdafx.h
rename to ryzom/tools/leveldesign/georges_dll/stdafx.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp b/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp
rename to ryzom/tools/leveldesign/georges_dll/type_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_dll/type_dialog.h b/ryzom/tools/leveldesign/georges_dll/type_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/type_dialog.h
rename to ryzom/tools/leveldesign/georges_dll/type_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_dll/version.rc2 b/ryzom/tools/leveldesign/georges_dll/version.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_dll/version.rc2
rename to ryzom/tools/leveldesign/georges_dll/version.rc2
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt b/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt
rename to ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor.cfg b/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor.cfg
rename to ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor.cfg
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor_default.cfg b/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor_default.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor_default.cfg
rename to ryzom/tools/leveldesign/georges_editor_qt/data/georges_editor_default.cfg
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/geqt_config.h.cmake b/ryzom/tools/leveldesign/georges_editor_qt/geqt_config.h.cmake
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/geqt_config.h.cmake
rename to ryzom/tools/leveldesign/georges_editor_qt/geqt_config.h.cmake
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt b/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
rename to ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.h b/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/completer_line_edit.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.h b/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/configuration.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/entity.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/entity.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/entity.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/entity.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/entity.h b/ryzom/tools/leveldesign/georges_editor_qt/src/entity.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/entity.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/entity.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.h b/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.h b/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/formitem.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h b/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georges.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georges.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_editor_qt.qrc b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_editor_qt.qrc
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_editor_qt.qrc
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_editor_qt.qrc
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_splash.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.h b/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_proxy_model.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/.directory b/ryzom/tools/leveldesign/georges_editor_qt/src/images/.directory
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/.directory
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/.directory
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns b/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-down.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-down.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-down.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/go-down.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-up.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-up.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/go-up.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/go-up.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/khead.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/khead.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/khead.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/khead.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-add.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-add.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-add.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/list-add.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-remove.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-remove.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/list-remove.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/list-remove.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/mp_generic.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/mp_generic.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/mp_generic.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/mp_generic.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/nel.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/nel.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/nel.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/nel.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/open-file.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/open-file.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/open-file.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/open-file.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/pqrticles.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/pqrticles.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/pqrticles.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/pqrticles.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/preferences.png b/ryzom/tools/leveldesign/georges_editor_qt/src/images/preferences.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/images/preferences.png
rename to ryzom/tools/leveldesign/georges_editor_qt/src/images/preferences.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/log_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/log_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/log_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/log_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/log_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.h b/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/main_window.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/modules.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/modules.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.h b/ryzom/tools/leveldesign/georges_editor_qt/src/modules.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/modules.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/new_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/new_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/new_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/progress_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.h b/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.h b/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_form.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/settings_form.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_form.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/settings_form.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/splash.ui b/ryzom/tools/leveldesign/georges_editor_qt/src/splash.ui
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/splash.ui
rename to ryzom/tools/leveldesign/georges_editor_qt/src/splash.ui
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.cpp b/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.cpp
rename to ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.h b/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.h
rename to ryzom/tools/leveldesign/georges_editor_qt/src/stdpch.h
diff --git a/code/ryzom/tools/leveldesign/georges_exe/CMakeLists.txt b/ryzom/tools/leveldesign/georges_exe/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/CMakeLists.txt
rename to ryzom/tools/leveldesign/georges_exe/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/_typ.dfn b/ryzom/tools/leveldesign/georges_exe/dfn/_typ.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/_typ.dfn
rename to ryzom/tools/leveldesign/georges_exe/dfn/_typ.dfn
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/_type.typ b/ryzom/tools/leveldesign/georges_exe/dfn/_type.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/_type.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/_type.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/boolean.typ b/ryzom/tools/leveldesign/georges_exe/dfn/boolean.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/boolean.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/boolean.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/filename.typ b/ryzom/tools/leveldesign/georges_exe/dfn/filename.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/filename.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/filename.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/float.typ b/ryzom/tools/leveldesign/georges_exe/dfn/float.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/float.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/float.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/sint16.typ b/ryzom/tools/leveldesign/georges_exe/dfn/sint16.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/sint16.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/sint16.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/sint32.typ b/ryzom/tools/leveldesign/georges_exe/dfn/sint32.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/sint32.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/sint32.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/sint64.typ b/ryzom/tools/leveldesign/georges_exe/dfn/sint64.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/sint64.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/sint64.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/sint8.typ b/ryzom/tools/leveldesign/georges_exe/dfn/sint8.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/sint8.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/sint8.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/string.typ b/ryzom/tools/leveldesign/georges_exe/dfn/string.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/string.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/string.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/typ.dfn b/ryzom/tools/leveldesign/georges_exe/dfn/typ.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/typ.dfn
rename to ryzom/tools/leveldesign/georges_exe/dfn/typ.dfn
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/uint16.typ b/ryzom/tools/leveldesign/georges_exe/dfn/uint16.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/uint16.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/uint16.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/uint32.typ b/ryzom/tools/leveldesign/georges_exe/dfn/uint32.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/uint32.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/uint32.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/uint64.typ b/ryzom/tools/leveldesign/georges_exe/dfn/uint64.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/uint64.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/uint64.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/dfn/uint8.typ b/ryzom/tools/leveldesign/georges_exe/dfn/uint8.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/dfn/uint8.typ
rename to ryzom/tools/leveldesign/georges_exe/dfn/uint8.typ
diff --git a/code/ryzom/tools/leveldesign/georges_exe/georges_exe.cpp b/ryzom/tools/leveldesign/georges_exe/georges_exe.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/georges_exe.cpp
rename to ryzom/tools/leveldesign/georges_exe/georges_exe.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc b/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc
rename to ryzom/tools/leveldesign/georges_exe/georges_exe.rc
diff --git a/code/ryzom/tools/leveldesign/georges_exe/resource.h b/ryzom/tools/leveldesign/georges_exe/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/resource.h
rename to ryzom/tools/leveldesign/georges_exe/resource.h
diff --git a/code/ryzom/tools/leveldesign/georges_exe/version.rc2 b/ryzom/tools/leveldesign/georges_exe/version.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_exe/version.rc2
rename to ryzom/tools/leveldesign/georges_exe/version.rc2
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt b/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt
rename to ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBase.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h b/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h b/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/bitmap1.bmp b/ryzom/tools/leveldesign/georges_plugin_sound/bitmap1.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/bitmap1.bmp
rename to ryzom/tools/leveldesign/georges_plugin_sound/bitmap1.bmp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/bmp00001.bmp b/ryzom/tools/leveldesign/georges_plugin_sound/bmp00001.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/bmp00001.bmp
rename to ryzom/tools/leveldesign/georges_plugin_sound/bmp00001.bmp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.clw b/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.clw
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.clw
rename to ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.clw
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.def b/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.def
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.def
rename to ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.def
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.h b/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.rc b/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.rc
rename to ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.rc
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.h b/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/listener_view.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.h b/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/loading_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/res/georges_plugin_sound.rc2 b/ryzom/tools/leveldesign/georges_plugin_sound/res/georges_plugin_sound.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/res/georges_plugin_sound.rc2
rename to ryzom/tools/leveldesign/georges_plugin_sound/res/georges_plugin_sound.rc2
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/resource.h b/ryzom/tools/leveldesign/georges_plugin_sound/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/resource.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/resource.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/resource.hm b/ryzom/tools/leveldesign/georges_plugin_sound/resource.hm
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/resource.hm
rename to ryzom/tools/leveldesign/georges_plugin_sound/resource.hm
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.h b/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.h b/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_document_plugin.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp b/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.h b/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/start.bmp b/ryzom/tools/leveldesign/georges_plugin_sound/start.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/start.bmp
rename to ryzom/tools/leveldesign/georges_plugin_sound/start.bmp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h b/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
rename to ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/stop.bmp b/ryzom/tools/leveldesign/georges_plugin_sound/stop.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_sound/stop.bmp
rename to ryzom/tools/leveldesign/georges_plugin_sound/stop.bmp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/Resource.h b/ryzom/tools/leveldesign/georges_plugin_test/Resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/Resource.h
rename to ryzom/tools/leveldesign/georges_plugin_test/Resource.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.cpp b/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.cpp
rename to ryzom/tools/leveldesign/georges_plugin_test/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.h b/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/StdAfx.h
rename to ryzom/tools/leveldesign/georges_plugin_test/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.cpp b/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.cpp
rename to ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.def b/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.def
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.def
rename to ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.def
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.h b/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.h
rename to ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.rc b/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.rc
rename to ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.rc
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/res/georges_plugin_test.rc2 b/ryzom/tools/leveldesign/georges_plugin_test/res/georges_plugin_test.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/res/georges_plugin_test.rc2
rename to ryzom/tools/leveldesign/georges_plugin_test/res/georges_plugin_test.rc2
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.cpp b/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.cpp
rename to ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.h b/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.h
rename to ryzom/tools/leveldesign/georges_plugin_test/test_global_dialog.h
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.cpp b/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.cpp
rename to ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.h b/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.h
rename to ryzom/tools/leveldesign/georges_plugin_test/test_local_dialog.h
diff --git a/code/ryzom/tools/leveldesign/icon_search/CMakeLists.txt b/ryzom/tools/leveldesign/icon_search/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/icon_search/CMakeLists.txt
rename to ryzom/tools/leveldesign/icon_search/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/icon_search/icon_search.cpp b/ryzom/tools/leveldesign/icon_search/icon_search.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/icon_search/icon_search.cpp
rename to ryzom/tools/leveldesign/icon_search/icon_search.cpp
diff --git a/code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg b/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg
rename to ryzom/tools/leveldesign/icon_search/icon_search_default.cfg
diff --git a/code/ryzom/tools/leveldesign/install/create_levedesign_archive.bat b/ryzom/tools/leveldesign/install/create_levedesign_archive.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/create_levedesign_archive.bat
rename to ryzom/tools/leveldesign/install/create_levedesign_archive.bat
diff --git a/code/ryzom/tools/leveldesign/install/create_levedesign_data_archive.bat b/ryzom/tools/leveldesign/install/create_levedesign_data_archive.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/create_levedesign_data_archive.bat
rename to ryzom/tools/leveldesign/install/create_levedesign_data_archive.bat
diff --git a/code/ryzom/tools/leveldesign/install/georges.cfg b/ryzom/tools/leveldesign/install/georges.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/georges.cfg
rename to ryzom/tools/leveldesign/install/georges.cfg
diff --git a/code/ryzom/tools/leveldesign/install/history.txt b/ryzom/tools/leveldesign/install/history.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/history.txt
rename to ryzom/tools/leveldesign/install/history.txt
diff --git a/code/ryzom/tools/leveldesign/install/ligoscape.cfg b/ryzom/tools/leveldesign/install/ligoscape.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ligoscape.cfg
rename to ryzom/tools/leveldesign/install/ligoscape.cfg
diff --git a/code/ryzom/tools/leveldesign/install/mission_compiler.cfg b/ryzom/tools/leveldesign/install/mission_compiler.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/mission_compiler.cfg
rename to ryzom/tools/leveldesign/install/mission_compiler.cfg
diff --git a/code/ryzom/tools/leveldesign/install/mount_l.bat b/ryzom/tools/leveldesign/install/mount_l.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/mount_l.bat
rename to ryzom/tools/leveldesign/install/mount_l.bat
diff --git a/code/ryzom/tools/leveldesign/install/ui/actions.ico b/ryzom/tools/leveldesign/install/ui/actions.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/actions.ico
rename to ryzom/tools/leveldesign/install/ui/actions.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/alias.ico b/ryzom/tools/leveldesign/install/ui/alias.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/alias.ico
rename to ryzom/tools/leveldesign/install/ui/alias.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/audio.ico b/ryzom/tools/leveldesign/install/ui/audio.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/audio.ico
rename to ryzom/tools/leveldesign/install/ui/audio.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/audio_hiden.ico b/ryzom/tools/leveldesign/install/ui/audio_hiden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/audio_hiden.ico
rename to ryzom/tools/leveldesign/install/ui/audio_hiden.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/bot_template_npc.ico b/ryzom/tools/leveldesign/install/ui/bot_template_npc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/bot_template_npc.ico
rename to ryzom/tools/leveldesign/install/ui/bot_template_npc.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/bot_template_npc_ml.ico b/ryzom/tools/leveldesign/install/ui/bot_template_npc_ml.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/bot_template_npc_ml.ico
rename to ryzom/tools/leveldesign/install/ui/bot_template_npc_ml.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/bot_template_outpost.ico b/ryzom/tools/leveldesign/install/ui/bot_template_outpost.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/bot_template_outpost.ico
rename to ryzom/tools/leveldesign/install/ui/bot_template_outpost.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/bot_template_outpost_ml.ico b/ryzom/tools/leveldesign/install/ui/bot_template_outpost_ml.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/bot_template_outpost_ml.ico
rename to ryzom/tools/leveldesign/install/ui/bot_template_outpost_ml.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/building_destination.ico b/ryzom/tools/leveldesign/install/ui/building_destination.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/building_destination.ico
rename to ryzom/tools/leveldesign/install/ui/building_destination.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/building_instance.ico b/ryzom/tools/leveldesign/install/ui/building_instance.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/building_instance.ico
rename to ryzom/tools/leveldesign/install/ui/building_instance.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/building_template.ico b/ryzom/tools/leveldesign/install/ui/building_template.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/building_template.ico
rename to ryzom/tools/leveldesign/install/ui/building_template.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/building_trigger.ico b/ryzom/tools/leveldesign/install/ui/building_trigger.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/building_trigger.ico
rename to ryzom/tools/leveldesign/install/ui/building_trigger.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/cell.ico b/ryzom/tools/leveldesign/install/ui/cell.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/cell.ico
rename to ryzom/tools/leveldesign/install/ui/cell.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/cell_zone.ico b/ryzom/tools/leveldesign/install/ui/cell_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/cell_zone.ico
rename to ryzom/tools/leveldesign/install/ui/cell_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/cell_zones.ico b/ryzom/tools/leveldesign/install/ui/cell_zones.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/cell_zones.ico
rename to ryzom/tools/leveldesign/install/ui/cell_zones.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/continent.ico b/ryzom/tools/leveldesign/install/ui/continent.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/continent.ico
rename to ryzom/tools/leveldesign/install/ui/continent.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/deposit.ico b/ryzom/tools/leveldesign/install/ui/deposit.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/deposit.ico
rename to ryzom/tools/leveldesign/install/ui/deposit.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/depositzone.ico b/ryzom/tools/leveldesign/install/ui/depositzone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/depositzone.ico
rename to ryzom/tools/leveldesign/install/ui/depositzone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dyn_answer.ico b/ryzom/tools/leveldesign/install/ui/dyn_answer.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dyn_answer.ico
rename to ryzom/tools/leveldesign/install/ui/dyn_answer.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dyn_fauna_zone.ico b/ryzom/tools/leveldesign/install/ui/dyn_fauna_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dyn_fauna_zone.ico
rename to ryzom/tools/leveldesign/install/ui/dyn_fauna_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dyn_npc_zone.ico b/ryzom/tools/leveldesign/install/ui/dyn_npc_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dyn_npc_zone.ico
rename to ryzom/tools/leveldesign/install/ui/dyn_npc_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dyn_road.ico b/ryzom/tools/leveldesign/install/ui/dyn_road.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dyn_road.ico
rename to ryzom/tools/leveldesign/install/ui/dyn_road.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dynamic_region.ico b/ryzom/tools/leveldesign/install/ui/dynamic_region.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dynamic_region.ico
rename to ryzom/tools/leveldesign/install/ui/dynamic_region.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/dynamic_system.ico b/ryzom/tools/leveldesign/install/ui/dynamic_system.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/dynamic_system.ico
rename to ryzom/tools/leveldesign/install/ui/dynamic_system.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/emissary.ico b/ryzom/tools/leveldesign/install/ui/emissary.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/emissary.ico
rename to ryzom/tools/leveldesign/install/ui/emissary.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/env_fx.ico b/ryzom/tools/leveldesign/install/ui/env_fx.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/env_fx.ico
rename to ryzom/tools/leveldesign/install/ui/env_fx.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/env_fx_zone.ico b/ryzom/tools/leveldesign/install/ui/env_fx_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/env_fx_zone.ico
rename to ryzom/tools/leveldesign/install/ui/env_fx_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/event.ico b/ryzom/tools/leveldesign/install/ui/event.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/event.ico
rename to ryzom/tools/leveldesign/install/ui/event.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/event_action.ico b/ryzom/tools/leveldesign/install/ui/event_action.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/event_action.ico
rename to ryzom/tools/leveldesign/install/ui/event_action.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/event_handler.ico b/ryzom/tools/leveldesign/install/ui/event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/event_handler_action.ico b/ryzom/tools/leveldesign/install/ui/event_handler_action.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/event_handler_action.ico
rename to ryzom/tools/leveldesign/install/ui/event_handler_action.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/exclude.ico b/ryzom/tools/leveldesign/install/ui/exclude.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/exclude.ico
rename to ryzom/tools/leveldesign/install/ui/exclude.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna.ico b/ryzom/tools/leveldesign/install/ui/fauna.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna.ico
rename to ryzom/tools/leveldesign/install/ui/fauna.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna_event_handler.ico b/ryzom/tools/leveldesign/install/ui/fauna_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/fauna_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna_event_handler_action.ico b/ryzom/tools/leveldesign/install/ui/fauna_event_handler_action.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna_event_handler_action.ico
rename to ryzom/tools/leveldesign/install/ui/fauna_event_handler_action.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna_generic_place.ico b/ryzom/tools/leveldesign/install/ui/fauna_generic_place.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna_generic_place.ico
rename to ryzom/tools/leveldesign/install/ui/fauna_generic_place.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna_state.ico b/ryzom/tools/leveldesign/install/ui/fauna_state.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna_state.ico
rename to ryzom/tools/leveldesign/install/ui/fauna_state.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/fauna_state_event_handler.ico b/ryzom/tools/leveldesign/install/ui/fauna_state_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/fauna_state_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/fauna_state_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_continue.ico b/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_continue.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_continue.ico
rename to ryzom/tools/leveldesign/install/ui/flat_dyn_chat_continue.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_fail.ico b/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_fail.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_fail.ico
rename to ryzom/tools/leveldesign/install/ui/flat_dyn_chat_fail.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_retry.ico b/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_retry.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_retry.ico
rename to ryzom/tools/leveldesign/install/ui/flat_dyn_chat_retry.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_skippable.ico b/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_skippable.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flat_dyn_chat_skippable.ico
rename to ryzom/tools/leveldesign/install/ui/flat_dyn_chat_skippable.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flora.ico b/ryzom/tools/leveldesign/install/ui/flora.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flora.ico
rename to ryzom/tools/leveldesign/install/ui/flora.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flora_exclude.ico b/ryzom/tools/leveldesign/install/ui/flora_exclude.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flora_exclude.ico
rename to ryzom/tools/leveldesign/install/ui/flora_exclude.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flora_path.ico b/ryzom/tools/leveldesign/install/ui/flora_path.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flora_path.ico
rename to ryzom/tools/leveldesign/install/ui/flora_path.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/flora_zone.ico b/ryzom/tools/leveldesign/install/ui/flora_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/flora_zone.ico
rename to ryzom/tools/leveldesign/install/ui/flora_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/food.ico b/ryzom/tools/leveldesign/install/ui/food.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/food.ico
rename to ryzom/tools/leveldesign/install/ui/food.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/gear.ico b/ryzom/tools/leveldesign/install/ui/gear.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/gear.ico
rename to ryzom/tools/leveldesign/install/ui/gear.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/geom_items.ico b/ryzom/tools/leveldesign/install/ui/geom_items.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/geom_items.ico
rename to ryzom/tools/leveldesign/install/ui/geom_items.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group.ico b/ryzom/tools/leveldesign/install/ui/group.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group.ico
rename to ryzom/tools/leveldesign/install/ui/group.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_descriptions.ico b/ryzom/tools/leveldesign/install/ui/group_descriptions.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_descriptions.ico
rename to ryzom/tools/leveldesign/install/ui/group_descriptions.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_fauna.ico b/ryzom/tools/leveldesign/install/ui/group_fauna.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_fauna.ico
rename to ryzom/tools/leveldesign/install/ui/group_fauna.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_fauna_ex.ico b/ryzom/tools/leveldesign/install/ui/group_fauna_ex.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_fauna_ex.ico
rename to ryzom/tools/leveldesign/install/ui/group_fauna_ex.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template.ico b/ryzom/tools/leveldesign/install/ui/group_template.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template.ico
rename to ryzom/tools/leveldesign/install/ui/group_template.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template_fauna.ico b/ryzom/tools/leveldesign/install/ui/group_template_fauna.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template_fauna.ico
rename to ryzom/tools/leveldesign/install/ui/group_template_fauna.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template_npc.ico b/ryzom/tools/leveldesign/install/ui/group_template_npc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template_npc.ico
rename to ryzom/tools/leveldesign/install/ui/group_template_npc.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template_npc_ml.ico b/ryzom/tools/leveldesign/install/ui/group_template_npc_ml.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template_npc_ml.ico
rename to ryzom/tools/leveldesign/install/ui/group_template_npc_ml.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template_outpost.ico b/ryzom/tools/leveldesign/install/ui/group_template_outpost.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template_outpost.ico
rename to ryzom/tools/leveldesign/install/ui/group_template_outpost.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/group_template_outpost_ml.ico b/ryzom/tools/leveldesign/install/ui/group_template_outpost_ml.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/group_template_outpost_ml.ico
rename to ryzom/tools/leveldesign/install/ui/group_template_outpost_ml.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/handon.ico b/ryzom/tools/leveldesign/install/ui/handon.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/handon.ico
rename to ryzom/tools/leveldesign/install/ui/handon.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/jump_to.ico b/ryzom/tools/leveldesign/install/ui/jump_to.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/jump_to.ico
rename to ryzom/tools/leveldesign/install/ui/jump_to.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_base.ico b/ryzom/tools/leveldesign/install/ui/kami_base.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_base.ico
rename to ryzom/tools/leveldesign/install/ui/kami_base.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_deposit.ico b/ryzom/tools/leveldesign/install/ui/kami_deposit.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_deposit.ico
rename to ryzom/tools/leveldesign/install/ui/kami_deposit.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_group.ico b/ryzom/tools/leveldesign/install/ui/kami_group.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_group.ico
rename to ryzom/tools/leveldesign/install/ui/kami_group.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_guardian.ico b/ryzom/tools/leveldesign/install/ui/kami_guardian.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_guardian.ico
rename to ryzom/tools/leveldesign/install/ui/kami_guardian.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_manager.ico b/ryzom/tools/leveldesign/install/ui/kami_manager.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_manager.ico
rename to ryzom/tools/leveldesign/install/ui/kami_manager.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/kami_preacher.ico b/ryzom/tools/leveldesign/install/ui/kami_preacher.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/kami_preacher.ico
rename to ryzom/tools/leveldesign/install/ui/kami_preacher.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/karavan_base.ico b/ryzom/tools/leveldesign/install/ui/karavan_base.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/karavan_base.ico
rename to ryzom/tools/leveldesign/install/ui/karavan_base.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/karavan_emissary.ico b/ryzom/tools/leveldesign/install/ui/karavan_emissary.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/karavan_emissary.ico
rename to ryzom/tools/leveldesign/install/ui/karavan_emissary.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/karavan_group.ico b/ryzom/tools/leveldesign/install/ui/karavan_group.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/karavan_group.ico
rename to ryzom/tools/leveldesign/install/ui/karavan_group.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/karavan_guard.ico b/ryzom/tools/leveldesign/install/ui/karavan_guard.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/karavan_guard.ico
rename to ryzom/tools/leveldesign/install/ui/karavan_guard.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/karavan_manager.ico b/ryzom/tools/leveldesign/install/ui/karavan_manager.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/karavan_manager.ico
rename to ryzom/tools/leveldesign/install/ui/karavan_manager.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_continue.ico b/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_continue.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_continue.ico
rename to ryzom/tools/leveldesign/install/ui/linear_dyn_chat_continue.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_fail.ico b/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_fail.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_fail.ico
rename to ryzom/tools/leveldesign/install/ui/linear_dyn_chat_fail.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_retry.ico b/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_retry.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_retry.ico
rename to ryzom/tools/leveldesign/install/ui/linear_dyn_chat_retry.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_skippable.ico b/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_skippable.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/linear_dyn_chat_skippable.ico
rename to ryzom/tools/leveldesign/install/ui/linear_dyn_chat_skippable.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/manager.ico b/ryzom/tools/leveldesign/install/ui/manager.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/manager.ico
rename to ryzom/tools/leveldesign/install/ui/manager.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission.ico b/ryzom/tools/leveldesign/install/ui/mission.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission.ico
rename to ryzom/tools/leveldesign/install/ui/mission.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_bot_chat_step.ico b/ryzom/tools/leveldesign/install/ui/mission_bot_chat_step.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_bot_chat_step.ico
rename to ryzom/tools/leveldesign/install/ui/mission_bot_chat_step.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_objectives.ico b/ryzom/tools/leveldesign/install/ui/mission_objectives.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_objectives.ico
rename to ryzom/tools/leveldesign/install/ui/mission_objectives.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_reward.ico b/ryzom/tools/leveldesign/install/ui/mission_reward.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_reward.ico
rename to ryzom/tools/leveldesign/install/ui/mission_reward.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_reward_group.ico b/ryzom/tools/leveldesign/install/ui/mission_reward_group.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_reward_group.ico
rename to ryzom/tools/leveldesign/install/ui/mission_reward_group.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_step.ico b/ryzom/tools/leveldesign/install/ui/mission_step.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_step.ico
rename to ryzom/tools/leveldesign/install/ui/mission_step.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/mission_tree.ico b/ryzom/tools/leveldesign/install/ui/mission_tree.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/mission_tree.ico
rename to ryzom/tools/leveldesign/install/ui/mission_tree.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/missions_editor.ico b/ryzom/tools/leveldesign/install/ui/missions_editor.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/missions_editor.ico
rename to ryzom/tools/leveldesign/install/ui/missions_editor.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/no_answer.ico b/ryzom/tools/leveldesign/install/ui/no_answer.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/no_answer.ico
rename to ryzom/tools/leveldesign/install/ui/no_answer.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/no_go.ico b/ryzom/tools/leveldesign/install/ui/no_go.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/no_go.ico
rename to ryzom/tools/leveldesign/install/ui/no_go.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc.ico b/ryzom/tools/leveldesign/install/ui/npc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc.ico
rename to ryzom/tools/leveldesign/install/ui/npc.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_bot.ico b/ryzom/tools/leveldesign/install/ui/npc_bot.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_bot.ico
rename to ryzom/tools/leveldesign/install/ui/npc_bot.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_event_handler.ico b/ryzom/tools/leveldesign/install/ui/npc_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/npc_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_event_handler_action.ico b/ryzom/tools/leveldesign/install/ui/npc_event_handler_action.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_event_handler_action.ico
rename to ryzom/tools/leveldesign/install/ui/npc_event_handler_action.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_folder.ico b/ryzom/tools/leveldesign/install/ui/npc_folder.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_folder.ico
rename to ryzom/tools/leveldesign/install/ui/npc_folder.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_group.ico b/ryzom/tools/leveldesign/install/ui/npc_group.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_group.ico
rename to ryzom/tools/leveldesign/install/ui/npc_group.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_group_event_handler.ico b/ryzom/tools/leveldesign/install/ui/npc_group_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_group_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/npc_group_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_manager.ico b/ryzom/tools/leveldesign/install/ui/npc_manager.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_manager.ico
rename to ryzom/tools/leveldesign/install/ui/npc_manager.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_punctual_state.ico b/ryzom/tools/leveldesign/install/ui/npc_punctual_state.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_punctual_state.ico
rename to ryzom/tools/leveldesign/install/ui/npc_punctual_state.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_route.ico b/ryzom/tools/leveldesign/install/ui/npc_route.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_route.ico
rename to ryzom/tools/leveldesign/install/ui/npc_route.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_state_chat.ico b/ryzom/tools/leveldesign/install/ui/npc_state_chat.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_state_chat.ico
rename to ryzom/tools/leveldesign/install/ui/npc_state_chat.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_state_event_handler.ico b/ryzom/tools/leveldesign/install/ui/npc_state_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_state_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/npc_state_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_state_profile.ico b/ryzom/tools/leveldesign/install/ui/npc_state_profile.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_state_profile.ico
rename to ryzom/tools/leveldesign/install/ui/npc_state_profile.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/npc_zone.ico b/ryzom/tools/leveldesign/install/ui/npc_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/npc_zone.ico
rename to ryzom/tools/leveldesign/install/ui/npc_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/outpost.ico b/ryzom/tools/leveldesign/install/ui/outpost.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/outpost.ico
rename to ryzom/tools/leveldesign/install/ui/outpost.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/outpost_manager.ico b/ryzom/tools/leveldesign/install/ui/outpost_manager.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/outpost_manager.ico
rename to ryzom/tools/leveldesign/install/ui/outpost_manager.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/outpost_spawn_zone.ico b/ryzom/tools/leveldesign/install/ui/outpost_spawn_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/outpost_spawn_zone.ico
rename to ryzom/tools/leveldesign/install/ui/outpost_spawn_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/path.ico b/ryzom/tools/leveldesign/install/ui/path.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/path.ico
rename to ryzom/tools/leveldesign/install/ui/path.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/people.ico b/ryzom/tools/leveldesign/install/ui/people.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/people.ico
rename to ryzom/tools/leveldesign/install/ui/people.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/place.ico b/ryzom/tools/leveldesign/install/ui/place.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/place.ico
rename to ryzom/tools/leveldesign/install/ui/place.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/point.ico b/ryzom/tools/leveldesign/install/ui/point.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/point.ico
rename to ryzom/tools/leveldesign/install/ui/point.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/population.ico b/ryzom/tools/leveldesign/install/ui/population.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/population.ico
rename to ryzom/tools/leveldesign/install/ui/population.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/preacher.ico b/ryzom/tools/leveldesign/install/ui/preacher.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/preacher.ico
rename to ryzom/tools/leveldesign/install/ui/preacher.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/raw_material_flora.ico b/ryzom/tools/leveldesign/install/ui/raw_material_flora.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/raw_material_flora.ico
rename to ryzom/tools/leveldesign/install/ui/raw_material_flora.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/raw_material_ground.ico b/ryzom/tools/leveldesign/install/ui/raw_material_ground.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/raw_material_ground.ico
rename to ryzom/tools/leveldesign/install/ui/raw_material_ground.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/raw_material_season.ico b/ryzom/tools/leveldesign/install/ui/raw_material_season.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/raw_material_season.ico
rename to ryzom/tools/leveldesign/install/ui/raw_material_season.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/region.ico b/ryzom/tools/leveldesign/install/ui/region.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/region.ico
rename to ryzom/tools/leveldesign/install/ui/region.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/respawn_point.ico b/ryzom/tools/leveldesign/install/ui/respawn_point.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/respawn_point.ico
rename to ryzom/tools/leveldesign/install/ui/respawn_point.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/respawn_points.ico b/ryzom/tools/leveldesign/install/ui/respawn_points.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/respawn_points.ico
rename to ryzom/tools/leveldesign/install/ui/respawn_points.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/rest.ico b/ryzom/tools/leveldesign/install/ui/rest.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/rest.ico
rename to ryzom/tools/leveldesign/install/ui/rest.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/result_no.ico b/ryzom/tools/leveldesign/install/ui/result_no.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/result_no.ico
rename to ryzom/tools/leveldesign/install/ui/result_no.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/result_yes.ico b/ryzom/tools/leveldesign/install/ui/result_yes.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/result_yes.ico
rename to ryzom/tools/leveldesign/install/ui/result_yes.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/room_destination.ico b/ryzom/tools/leveldesign/install/ui/room_destination.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/room_destination.ico
rename to ryzom/tools/leveldesign/install/ui/room_destination.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/room_template.ico b/ryzom/tools/leveldesign/install/ui/room_template.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/room_template.ico
rename to ryzom/tools/leveldesign/install/ui/room_template.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sample_bank_zone.ico b/ryzom/tools/leveldesign/install/ui/sample_bank_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sample_bank_zone.ico
rename to ryzom/tools/leveldesign/install/ui/sample_bank_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sample_banks.ico b/ryzom/tools/leveldesign/install/ui/sample_banks.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sample_banks.ico
rename to ryzom/tools/leveldesign/install/ui/sample_banks.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/shield.ico b/ryzom/tools/leveldesign/install/ui/shield.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/shield.ico
rename to ryzom/tools/leveldesign/install/ui/shield.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sound_path.ico b/ryzom/tools/leveldesign/install/ui/sound_path.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sound_path.ico
rename to ryzom/tools/leveldesign/install/ui/sound_path.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sound_point.ico b/ryzom/tools/leveldesign/install/ui/sound_point.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sound_point.ico
rename to ryzom/tools/leveldesign/install/ui/sound_point.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sound_zone.ico b/ryzom/tools/leveldesign/install/ui/sound_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sound_zone.ico
rename to ryzom/tools/leveldesign/install/ui/sound_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/sounds.ico b/ryzom/tools/leveldesign/install/ui/sounds.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/sounds.ico
rename to ryzom/tools/leveldesign/install/ui/sounds.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/spawn.ico b/ryzom/tools/leveldesign/install/ui/spawn.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/spawn.ico
rename to ryzom/tools/leveldesign/install/ui/spawn.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/spawn_base.ico b/ryzom/tools/leveldesign/install/ui/spawn_base.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/spawn_base.ico
rename to ryzom/tools/leveldesign/install/ui/spawn_base.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/stable.ico b/ryzom/tools/leveldesign/install/ui/stable.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/stable.ico
rename to ryzom/tools/leveldesign/install/ui/stable.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/stable_entry.ico b/ryzom/tools/leveldesign/install/ui/stable_entry.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/stable_entry.ico
rename to ryzom/tools/leveldesign/install/ui/stable_entry.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/stables.ico b/ryzom/tools/leveldesign/install/ui/stables.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/stables.ico
rename to ryzom/tools/leveldesign/install/ui/stables.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/state.ico b/ryzom/tools/leveldesign/install/ui/state.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/state.ico
rename to ryzom/tools/leveldesign/install/ui/state.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/state_event_handler.ico b/ryzom/tools/leveldesign/install/ui/state_event_handler.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/state_event_handler.ico
rename to ryzom/tools/leveldesign/install/ui/state_event_handler.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/state_machine.ico b/ryzom/tools/leveldesign/install/ui/state_machine.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/state_machine.ico
rename to ryzom/tools/leveldesign/install/ui/state_machine.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/state_machine_list.ico b/ryzom/tools/leveldesign/install/ui/state_machine_list.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/state_machine_list.ico
rename to ryzom/tools/leveldesign/install/ui/state_machine_list.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step.ico b/ryzom/tools/leveldesign/install/ui/step.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step.ico
rename to ryzom/tools/leveldesign/install/ui/step.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step_any.ico b/ryzom/tools/leveldesign/install/ui/step_any.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step_any.ico
rename to ryzom/tools/leveldesign/install/ui/step_any.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step_dyn_chat.ico b/ryzom/tools/leveldesign/install/ui/step_dyn_chat.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step_dyn_chat.ico
rename to ryzom/tools/leveldesign/install/ui/step_dyn_chat.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step_failure.ico b/ryzom/tools/leveldesign/install/ui/step_failure.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step_failure.ico
rename to ryzom/tools/leveldesign/install/ui/step_failure.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step_if.ico b/ryzom/tools/leveldesign/install/ui/step_if.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step_if.ico
rename to ryzom/tools/leveldesign/install/ui/step_if.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/step_ooo.ico b/ryzom/tools/leveldesign/install/ui/step_ooo.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/step_ooo.ico
rename to ryzom/tools/leveldesign/install/ui/step_ooo.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/teleport_dest.ico b/ryzom/tools/leveldesign/install/ui/teleport_dest.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/teleport_dest.ico
rename to ryzom/tools/leveldesign/install/ui/teleport_dest.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/teleport_destination.ico b/ryzom/tools/leveldesign/install/ui/teleport_destination.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/teleport_destination.ico
rename to ryzom/tools/leveldesign/install/ui/teleport_destination.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/teleport_dests.ico b/ryzom/tools/leveldesign/install/ui/teleport_dests.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/teleport_dests.ico
rename to ryzom/tools/leveldesign/install/ui/teleport_dests.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/teleport_spawn_zone.ico b/ryzom/tools/leveldesign/install/ui/teleport_spawn_zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/teleport_spawn_zone.ico
rename to ryzom/tools/leveldesign/install/ui/teleport_spawn_zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/teleport_trigger.ico b/ryzom/tools/leveldesign/install/ui/teleport_trigger.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/teleport_trigger.ico
rename to ryzom/tools/leveldesign/install/ui/teleport_trigger.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/temp.ico b/ryzom/tools/leveldesign/install/ui/temp.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/temp.ico
rename to ryzom/tools/leveldesign/install/ui/temp.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/time.ico b/ryzom/tools/leveldesign/install/ui/time.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/time.ico
rename to ryzom/tools/leveldesign/install/ui/time.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_creature.ico b/ryzom/tools/leveldesign/install/ui/var_creature.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_creature.ico
rename to ryzom/tools/leveldesign/install/ui/var_creature.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_faction.ico b/ryzom/tools/leveldesign/install/ui/var_faction.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_faction.ico
rename to ryzom/tools/leveldesign/install/ui/var_faction.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_item.ico b/ryzom/tools/leveldesign/install/ui/var_item.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_item.ico
rename to ryzom/tools/leveldesign/install/ui/var_item.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_npc.ico b/ryzom/tools/leveldesign/install/ui/var_npc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_npc.ico
rename to ryzom/tools/leveldesign/install/ui/var_npc.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_place.ico b/ryzom/tools/leveldesign/install/ui/var_place.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_place.ico
rename to ryzom/tools/leveldesign/install/ui/var_place.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_quality.ico b/ryzom/tools/leveldesign/install/ui/var_quality.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_quality.ico
rename to ryzom/tools/leveldesign/install/ui/var_quality.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_quantity.ico b/ryzom/tools/leveldesign/install/ui/var_quantity.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_quantity.ico
rename to ryzom/tools/leveldesign/install/ui/var_quantity.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/var_text.ico b/ryzom/tools/leveldesign/install/ui/var_text.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/var_text.ico
rename to ryzom/tools/leveldesign/install/ui/var_text.ico
diff --git a/code/ryzom/tools/leveldesign/install/ui/zone.ico b/ryzom/tools/leveldesign/install/ui/zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/ui/zone.ico
rename to ryzom/tools/leveldesign/install/ui/zone.ico
diff --git a/code/ryzom/tools/leveldesign/install/world_editor.html b/ryzom/tools/leveldesign/install/world_editor.html
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/world_editor.html
rename to ryzom/tools/leveldesign/install/world_editor.html
diff --git a/code/ryzom/tools/leveldesign/install/world_editor_plugin.cfg b/ryzom/tools/leveldesign/install/world_editor_plugin.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/world_editor_plugin.cfg
rename to ryzom/tools/leveldesign/install/world_editor_plugin.cfg
diff --git a/code/ryzom/tools/leveldesign/install/world_editor_script.xml b/ryzom/tools/leveldesign/install/world_editor_script.xml
similarity index 100%
rename from code/ryzom/tools/leveldesign/install/world_editor_script.xml
rename to ryzom/tools/leveldesign/install/world_editor_script.xml
diff --git a/code/ryzom/tools/leveldesign/ld_0_clean.bat b/ryzom/tools/leveldesign/ld_0_clean.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/ld_0_clean.bat
rename to ryzom/tools/leveldesign/ld_0_clean.bat
diff --git a/code/ryzom/tools/leveldesign/ld_1_get.bat b/ryzom/tools/leveldesign/ld_1_get.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/ld_1_get.bat
rename to ryzom/tools/leveldesign/ld_1_get.bat
diff --git a/code/ryzom/tools/leveldesign/ld_2_build.bat b/ryzom/tools/leveldesign/ld_2_build.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/ld_2_build.bat
rename to ryzom/tools/leveldesign/ld_2_build.bat
diff --git a/code/ryzom/tools/leveldesign/ld_3_make_distrib.bat b/ryzom/tools/leveldesign/ld_3_make_distrib.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/ld_3_make_distrib.bat
rename to ryzom/tools/leveldesign/ld_3_make_distrib.bat
diff --git a/code/ryzom/tools/leveldesign/master/ChooseDir.cpp b/ryzom/tools/leveldesign/master/ChooseDir.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ChooseDir.cpp
rename to ryzom/tools/leveldesign/master/ChooseDir.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ChooseDir.h b/ryzom/tools/leveldesign/master/ChooseDir.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ChooseDir.h
rename to ryzom/tools/leveldesign/master/ChooseDir.h
diff --git a/code/ryzom/tools/leveldesign/master/ChooseTag.cpp b/ryzom/tools/leveldesign/master/ChooseTag.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ChooseTag.cpp
rename to ryzom/tools/leveldesign/master/ChooseTag.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ChooseTag.h b/ryzom/tools/leveldesign/master/ChooseTag.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ChooseTag.h
rename to ryzom/tools/leveldesign/master/ChooseTag.h
diff --git a/code/ryzom/tools/leveldesign/master/ContinentCfg.cpp b/ryzom/tools/leveldesign/master/ContinentCfg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ContinentCfg.cpp
rename to ryzom/tools/leveldesign/master/ContinentCfg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ContinentCfg.h b/ryzom/tools/leveldesign/master/ContinentCfg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ContinentCfg.h
rename to ryzom/tools/leveldesign/master/ContinentCfg.h
diff --git a/code/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.cpp b/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.cpp
rename to ryzom/tools/leveldesign/master/ContinentPropertiesDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.h b/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ContinentPropertiesDlg.h
rename to ryzom/tools/leveldesign/master/ContinentPropertiesDlg.h
diff --git a/code/ryzom/tools/leveldesign/master/ExportCBDlg.cpp b/ryzom/tools/leveldesign/master/ExportCBDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ExportCBDlg.cpp
rename to ryzom/tools/leveldesign/master/ExportCBDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ExportCBDlg.h b/ryzom/tools/leveldesign/master/ExportCBDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ExportCBDlg.h
rename to ryzom/tools/leveldesign/master/ExportCBDlg.h
diff --git a/code/ryzom/tools/leveldesign/master/ExportDlg.cpp b/ryzom/tools/leveldesign/master/ExportDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ExportDlg.cpp
rename to ryzom/tools/leveldesign/master/ExportDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/ExportDlg.h b/ryzom/tools/leveldesign/master/ExportDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ExportDlg.h
rename to ryzom/tools/leveldesign/master/ExportDlg.h
diff --git a/code/ryzom/tools/leveldesign/master/MainFrm.cpp b/ryzom/tools/leveldesign/master/MainFrm.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/MainFrm.cpp
rename to ryzom/tools/leveldesign/master/MainFrm.cpp
diff --git a/code/ryzom/tools/leveldesign/master/MainFrm.h b/ryzom/tools/leveldesign/master/MainFrm.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/MainFrm.h
rename to ryzom/tools/leveldesign/master/MainFrm.h
diff --git a/code/ryzom/tools/leveldesign/master/MasterTree.cpp b/ryzom/tools/leveldesign/master/MasterTree.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/MasterTree.cpp
rename to ryzom/tools/leveldesign/master/MasterTree.cpp
diff --git a/code/ryzom/tools/leveldesign/master/MasterTree.h b/ryzom/tools/leveldesign/master/MasterTree.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/MasterTree.h
rename to ryzom/tools/leveldesign/master/MasterTree.h
diff --git a/code/ryzom/tools/leveldesign/master/NameEditDlg.cpp b/ryzom/tools/leveldesign/master/NameEditDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/NameEditDlg.cpp
rename to ryzom/tools/leveldesign/master/NameEditDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/NameEditDlg.h b/ryzom/tools/leveldesign/master/NameEditDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/NameEditDlg.h
rename to ryzom/tools/leveldesign/master/NameEditDlg.h
diff --git a/code/ryzom/tools/leveldesign/master/ReadMe.txt b/ryzom/tools/leveldesign/master/ReadMe.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/ReadMe.txt
rename to ryzom/tools/leveldesign/master/ReadMe.txt
diff --git a/code/ryzom/tools/leveldesign/master/StdAfx.cpp b/ryzom/tools/leveldesign/master/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/StdAfx.cpp
rename to ryzom/tools/leveldesign/master/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/master/StdAfx.h b/ryzom/tools/leveldesign/master/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/StdAfx.h
rename to ryzom/tools/leveldesign/master/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/master/easy_cfg.cpp b/ryzom/tools/leveldesign/master/easy_cfg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/easy_cfg.cpp
rename to ryzom/tools/leveldesign/master/easy_cfg.cpp
diff --git a/code/ryzom/tools/leveldesign/master/easy_cfg.h b/ryzom/tools/leveldesign/master/easy_cfg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/easy_cfg.h
rename to ryzom/tools/leveldesign/master/easy_cfg.h
diff --git a/code/ryzom/tools/leveldesign/master/master.cpp b/ryzom/tools/leveldesign/master/master.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/master.cpp
rename to ryzom/tools/leveldesign/master/master.cpp
diff --git a/code/ryzom/tools/leveldesign/master/master.h b/ryzom/tools/leveldesign/master/master.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/master.h
rename to ryzom/tools/leveldesign/master/master.h
diff --git a/code/ryzom/tools/leveldesign/master/master.rc b/ryzom/tools/leveldesign/master/master.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/master.rc
rename to ryzom/tools/leveldesign/master/master.rc
diff --git a/code/ryzom/tools/leveldesign/master/n019003l.pfb b/ryzom/tools/leveldesign/master/n019003l.pfb
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/n019003l.pfb
rename to ryzom/tools/leveldesign/master/n019003l.pfb
diff --git a/code/ryzom/tools/leveldesign/master/res/backup.ico b/ryzom/tools/leveldesign/master/res/backup.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/backup.ico
rename to ryzom/tools/leveldesign/master/res/backup.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/continents.ico b/ryzom/tools/leveldesign/master/res/continents.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/continents.ico
rename to ryzom/tools/leveldesign/master/res/continents.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/file.ico b/ryzom/tools/leveldesign/master/res/file.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/file.ico
rename to ryzom/tools/leveldesign/master/res/file.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/folder.ico b/ryzom/tools/leveldesign/master/res/folder.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/folder.ico
rename to ryzom/tools/leveldesign/master/res/folder.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/master.ico b/ryzom/tools/leveldesign/master/res/master.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/master.ico
rename to ryzom/tools/leveldesign/master/res/master.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/master.rc2 b/ryzom/tools/leveldesign/master/res/master.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/master.rc2
rename to ryzom/tools/leveldesign/master/res/master.rc2
diff --git a/code/ryzom/tools/leveldesign/master/res/masterDoc.ico b/ryzom/tools/leveldesign/master/res/masterDoc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/masterDoc.ico
rename to ryzom/tools/leveldesign/master/res/masterDoc.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/regions.ico b/ryzom/tools/leveldesign/master/res/regions.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/regions.ico
rename to ryzom/tools/leveldesign/master/res/regions.ico
diff --git a/code/ryzom/tools/leveldesign/master/res/trash.ico b/ryzom/tools/leveldesign/master/res/trash.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/res/trash.ico
rename to ryzom/tools/leveldesign/master/res/trash.ico
diff --git a/code/ryzom/tools/leveldesign/master/resource.h b/ryzom/tools/leveldesign/master/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/master/resource.h
rename to ryzom/tools/leveldesign/master/resource.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.h b/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/AddPathDlg.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/CMakeLists.txt b/ryzom/tools/leveldesign/mission_compiler_fe/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/CMakeLists.txt
rename to ryzom/tools/leveldesign/mission_compiler_fe/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.h b/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/CompilDialog.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/Resource.h b/ryzom/tools/leveldesign/mission_compiler_fe/Resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/Resource.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/Resource.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h b/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.h b/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/dialog_mode.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.h b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.rc b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.rc
rename to ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.rc
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
rename to ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.h b/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.h
rename to ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_feDlg.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/res/icon1.ico b/ryzom/tools/leveldesign/mission_compiler_fe/res/icon1.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/res/icon1.ico
rename to ryzom/tools/leveldesign/mission_compiler_fe/res/icon1.ico
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/res/icon_fil.ico b/ryzom/tools/leveldesign/mission_compiler_fe/res/icon_fil.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/res/icon_fil.ico
rename to ryzom/tools/leveldesign/mission_compiler_fe/res/icon_fil.ico
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/res/mission_compiler_fe.rc2 b/ryzom/tools/leveldesign/mission_compiler_fe/res/mission_compiler_fe.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/res/mission_compiler_fe.rc2
rename to ryzom/tools/leveldesign/mission_compiler_fe/res/mission_compiler_fe.rc2
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/res/red_pill.ico b/ryzom/tools/leveldesign/mission_compiler_fe/res/red_pill.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/res/red_pill.ico
rename to ryzom/tools/leveldesign/mission_compiler_fe/res/red_pill.ico
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.primitive b/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.primitive
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.primitive
rename to ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.primitive
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.script b/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.script
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.script
rename to ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur.script
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur_gn.primitive b/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur_gn.primitive
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur_gn.primitive
rename to ryzom/tools/leveldesign/mission_compiler_fe/test_compilateur_gn.primitive
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/version.rc2 b/ryzom/tools/leveldesign/mission_compiler_fe/version.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_fe/version.rc2
rename to ryzom/tools/leveldesign/mission_compiler_fe/version.rc2
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/CMakeLists.txt b/ryzom/tools/leveldesign/mission_compiler_lib/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/CMakeLists.txt
rename to ryzom/tools/leveldesign/mission_compiler_lib/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
rename to ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
rename to ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h
rename to ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h b/ryzom/tools/leveldesign/mission_compiler_lib/step.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
rename to ryzom/tools/leveldesign/mission_compiler_lib/step.h
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
rename to ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp
rename to ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp
rename to ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp
diff --git a/code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt b/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
rename to ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/mp_generator/creature_models.csv b/ryzom/tools/leveldesign/mp_generator/creature_models.csv
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/creature_models.csv
rename to ryzom/tools/leveldesign/mp_generator/creature_models.csv
diff --git a/code/ryzom/tools/leveldesign/mp_generator/main.cpp b/ryzom/tools/leveldesign/mp_generator/main.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/main.cpp
rename to ryzom/tools/leveldesign/mp_generator/main.cpp
diff --git a/code/ryzom/tools/leveldesign/mp_generator/moulinette.h b/ryzom/tools/leveldesign/mp_generator/moulinette.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/moulinette.h
rename to ryzom/tools/leveldesign/mp_generator/moulinette.h
diff --git a/code/ryzom/tools/leveldesign/mp_generator/mp_generator.doc b/ryzom/tools/leveldesign/mp_generator/mp_generator.doc
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/mp_generator.doc
rename to ryzom/tools/leveldesign/mp_generator/mp_generator.doc
diff --git a/code/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg b/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg
rename to ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg
diff --git a/code/ryzom/tools/leveldesign/mp_generator/rm_fam_prop.csv b/ryzom/tools/leveldesign/mp_generator/rm_fam_prop.csv
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/rm_fam_prop.csv
rename to ryzom/tools/leveldesign/mp_generator/rm_fam_prop.csv
diff --git a/code/ryzom/tools/leveldesign/mp_generator/rm_item_parts.csv b/ryzom/tools/leveldesign/mp_generator/rm_item_parts.csv
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/rm_item_parts.csv
rename to ryzom/tools/leveldesign/mp_generator/rm_item_parts.csv
diff --git a/code/ryzom/tools/leveldesign/mp_generator/utils.h b/ryzom/tools/leveldesign/mp_generator/utils.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/utils.h
rename to ryzom/tools/leveldesign/mp_generator/utils.h
diff --git a/code/ryzom/tools/leveldesign/mp_generator/v4_source_tables2.xls b/ryzom/tools/leveldesign/mp_generator/v4_source_tables2.xls
similarity index 100%
rename from code/ryzom/tools/leveldesign/mp_generator/v4_source_tables2.xls
rename to ryzom/tools/leveldesign/mp_generator/v4_source_tables2.xls
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt b/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
rename to ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_csv.bat b/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_csv.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_csv.bat
rename to ryzom/tools/leveldesign/named_items_2_csv/make_named_items_csv.bat
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_txt.bat b/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_txt.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/make_named_items_txt.bat
rename to ryzom/tools/leveldesign/named_items_2_csv/make_named_items_txt.bat
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/named_items.csv b/ryzom/tools/leveldesign/named_items_2_csv/named_items.csv
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/named_items.csv
rename to ryzom/tools/leveldesign/named_items_2_csv/named_items.csv
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/named_items.script b/ryzom/tools/leveldesign/named_items_2_csv/named_items.script
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/named_items.script
rename to ryzom/tools/leveldesign/named_items_2_csv/named_items.script
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp b/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp
rename to ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp
diff --git a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt b/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
rename to ryzom/tools/leveldesign/prim_export/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/prim_export/blue_pill.ico b/ryzom/tools/leveldesign/prim_export/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/prim_export/blue_pill.ico
rename to ryzom/tools/leveldesign/prim_export/blue_pill.ico
diff --git a/code/ryzom/tools/leveldesign/prim_export/main.cpp b/ryzom/tools/leveldesign/prim_export/main.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/prim_export/main.cpp
rename to ryzom/tools/leveldesign/prim_export/main.cpp
diff --git a/code/ryzom/tools/leveldesign/prim_export/main.rc b/ryzom/tools/leveldesign/prim_export/main.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/prim_export/main.rc
rename to ryzom/tools/leveldesign/prim_export/main.rc
diff --git a/code/ryzom/tools/leveldesign/prim_export/prim_export.cfg b/ryzom/tools/leveldesign/prim_export/prim_export.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/prim_export/prim_export.cfg
rename to ryzom/tools/leveldesign/prim_export/prim_export.cfg
diff --git a/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg b/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg
rename to ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg
diff --git a/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp b/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp
rename to ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp
diff --git a/code/ryzom/tools/leveldesign/test_root/ZoneBitmaps/_UNUSED_.TGA b/ryzom/tools/leveldesign/test_root/ZoneBitmaps/_UNUSED_.TGA
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/ZoneBitmaps/_UNUSED_.TGA
rename to ryzom/tools/leveldesign/test_root/ZoneBitmaps/_UNUSED_.TGA
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/_typ.dfn b/ryzom/tools/leveldesign/test_root/common/dfn/_typ.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/_typ.dfn
rename to ryzom/tools/leveldesign/test_root/common/dfn/_typ.dfn
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/_type.typ b/ryzom/tools/leveldesign/test_root/common/dfn/_type.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/_type.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/_type.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/boolean.typ b/ryzom/tools/leveldesign/test_root/common/dfn/boolean.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/boolean.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/boolean.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/filename.typ b/ryzom/tools/leveldesign/test_root/common/dfn/filename.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/filename.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/filename.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/float.typ b/ryzom/tools/leveldesign/test_root/common/dfn/float.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/float.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/float.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/plant.dfn b/ryzom/tools/leveldesign/test_root/common/dfn/plant.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/plant.dfn
rename to ryzom/tools/leveldesign/test_root/common/dfn/plant.dfn
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/plant_instance.dfn b/ryzom/tools/leveldesign/test_root/common/dfn/plant_instance.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/plant_instance.dfn
rename to ryzom/tools/leveldesign/test_root/common/dfn/plant_instance.dfn
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/sint16.typ b/ryzom/tools/leveldesign/test_root/common/dfn/sint16.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/sint16.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/sint16.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/sint32.typ b/ryzom/tools/leveldesign/test_root/common/dfn/sint32.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/sint32.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/sint32.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/sint64.typ b/ryzom/tools/leveldesign/test_root/common/dfn/sint64.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/sint64.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/sint64.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/sint8.typ b/ryzom/tools/leveldesign/test_root/common/dfn/sint8.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/sint8.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/sint8.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/string.typ b/ryzom/tools/leveldesign/test_root/common/dfn/string.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/string.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/string.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/typ.dfn b/ryzom/tools/leveldesign/test_root/common/dfn/typ.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/typ.dfn
rename to ryzom/tools/leveldesign/test_root/common/dfn/typ.dfn
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/uint16.typ b/ryzom/tools/leveldesign/test_root/common/dfn/uint16.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/uint16.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/uint16.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/uint32.typ b/ryzom/tools/leveldesign/test_root/common/dfn/uint32.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/uint32.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/uint32.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/uint64.typ b/ryzom/tools/leveldesign/test_root/common/dfn/uint64.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/uint64.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/uint64.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/uint8.typ b/ryzom/tools/leveldesign/test_root/common/dfn/uint8.typ
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/uint8.typ
rename to ryzom/tools/leveldesign/test_root/common/dfn/uint8.typ
diff --git a/code/ryzom/tools/leveldesign/test_root/common/dfn/vegetable.dfn b/ryzom/tools/leveldesign/test_root/common/dfn/vegetable.dfn
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/common/dfn/vegetable.dfn
rename to ryzom/tools/leveldesign/test_root/common/dfn/vegetable.dfn
diff --git a/code/ryzom/tools/leveldesign/test_root/ligoscape.cfg b/ryzom/tools/leveldesign/test_root/ligoscape.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/test_root/ligoscape.cfg
rename to ryzom/tools/leveldesign/test_root/ligoscape.cfg
diff --git a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt b/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
rename to ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp b/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
rename to ryzom/tools/leveldesign/uni_conv/uni_conv.cpp
diff --git a/code/ryzom/tools/leveldesign/update_tools.bat b/ryzom/tools/leveldesign/update_tools.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/update_tools.bat
rename to ryzom/tools/leveldesign/update_tools.bat
diff --git a/code/ryzom/tools/leveldesign/variable_parser/ReadMe.txt b/ryzom/tools/leveldesign/variable_parser/ReadMe.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/ReadMe.txt
rename to ryzom/tools/leveldesign/variable_parser/ReadMe.txt
diff --git a/code/ryzom/tools/leveldesign/variable_parser/StdAfx.cpp b/ryzom/tools/leveldesign/variable_parser/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/StdAfx.cpp
rename to ryzom/tools/leveldesign/variable_parser/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/variable_parser/StdAfx.h b/ryzom/tools/leveldesign/variable_parser/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/StdAfx.h
rename to ryzom/tools/leveldesign/variable_parser/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp b/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp
rename to ryzom/tools/leveldesign/variable_parser/lua_helper.cpp
diff --git a/code/ryzom/tools/leveldesign/variable_parser/lua_helper.h b/ryzom/tools/leveldesign/variable_parser/lua_helper.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/lua_helper.h
rename to ryzom/tools/leveldesign/variable_parser/lua_helper.h
diff --git a/code/ryzom/tools/leveldesign/variable_parser/lua_helper_inline.h b/ryzom/tools/leveldesign/variable_parser/lua_helper_inline.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/lua_helper_inline.h
rename to ryzom/tools/leveldesign/variable_parser/lua_helper_inline.h
diff --git a/code/ryzom/tools/leveldesign/variable_parser/res/variable_parser.ico b/ryzom/tools/leveldesign/variable_parser/res/variable_parser.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/res/variable_parser.ico
rename to ryzom/tools/leveldesign/variable_parser/res/variable_parser.ico
diff --git a/code/ryzom/tools/leveldesign/variable_parser/res/variable_parser.rc2 b/ryzom/tools/leveldesign/variable_parser/res/variable_parser.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/res/variable_parser.rc2
rename to ryzom/tools/leveldesign/variable_parser/res/variable_parser.rc2
diff --git a/code/ryzom/tools/leveldesign/variable_parser/resource.h b/ryzom/tools/leveldesign/variable_parser/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/resource.h
rename to ryzom/tools/leveldesign/variable_parser/resource.h
diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parser.cpp b/ryzom/tools/leveldesign/variable_parser/variable_parser.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/variable_parser.cpp
rename to ryzom/tools/leveldesign/variable_parser/variable_parser.cpp
diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parser.h b/ryzom/tools/leveldesign/variable_parser/variable_parser.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/variable_parser.h
rename to ryzom/tools/leveldesign/variable_parser/variable_parser.h
diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parser.rc b/ryzom/tools/leveldesign/variable_parser/variable_parser.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/variable_parser.rc
rename to ryzom/tools/leveldesign/variable_parser/variable_parser.rc
diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.cpp b/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.cpp
rename to ryzom/tools/leveldesign/variable_parser/variable_parserDlg.cpp
diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.h b/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/variable_parser/variable_parserDlg.h
rename to ryzom/tools/leveldesign/variable_parser/variable_parserDlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico b/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico
rename to ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/land_export.cfg b/ryzom/tools/leveldesign/world_editor/land_export/land_export.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export/land_export.cfg
rename to ryzom/tools/leveldesign/world_editor/land_export/land_export.cfg
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp b/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export/main.cpp
rename to ryzom/tools/leveldesign/world_editor/land_export/main.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/main.rc b/ryzom/tools/leveldesign/world_editor/land_export/main.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export/main.rc
rename to ryzom/tools/leveldesign/world_editor/land_export/main.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
rename to ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h b/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
rename to ryzom/tools/leveldesign/world_editor/land_export_lib/export.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/ligoscape.cfg b/ryzom/tools/leveldesign/world_editor/ligoscape.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/ligoscape.cfg
rename to ryzom/tools/leveldesign/world_editor/ligoscape.cfg
diff --git a/code/ryzom/tools/leveldesign/world_editor/ligoscape.txt b/ryzom/tools/leveldesign/world_editor/ligoscape.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/ligoscape.txt
rename to ryzom/tools/leveldesign/world_editor/ligoscape.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/action.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h b/ryzom/tools/leveldesign/world_editor/world_editor/action.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/action.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/action.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.h b/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.h b/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h b/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/color_button.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/color_button.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/color_button.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/color_button.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/color_button.h b/ryzom/tools/leveldesign/world_editor/world_editor/color_button.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/color_button.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/color_button.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.h b/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/custom_snapshot.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h b/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/display.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.h b/ryzom/tools/leveldesign/world_editor/world_editor/display.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/display.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/display.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.h b/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/editor_primitive.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/export_cb_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/export_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/external_editor.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.h b/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/external_editor.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/external_editor.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h b/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/find_primitive_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/generate_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.h b/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/generate_primitive.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.h b/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/goto_dialog.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.h b/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h b/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/move_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.h b/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/my_list_box.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/name_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/pacs.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/pacs.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/pacs.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/pacs.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/pacs.h b/ryzom/tools/leveldesign/world_editor/world_editor/pacs.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/pacs.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/pacs.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h b/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/primitive_configuration_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.h b/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/primitive_view.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/project_settings.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.h b/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/project_settings.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/project_settings.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/Toolbar.bmp b/ryzom/tools/leveldesign/world_editor/world_editor/res/Toolbar.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/Toolbar.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/Toolbar.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/WorldEditor.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/WorldEditor.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/WorldEditor.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/WorldEditor.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/_Legoscape edit.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/_Legoscape edit.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/_Legoscape edit.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/_Legoscape edit.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/_Selecteur de Zone.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/_Selecteur de Zone.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/_Selecteur de Zone.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/_Selecteur de Zone.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/_icon1.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/_icon1.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/_icon1.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/_icon1.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/_patatoid edit.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/_patatoid edit.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/_patatoid edit.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/_patatoid edit.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/add_point.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/add_point.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/add_point.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/add_point.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/copy.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/copy.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/copy.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/copy.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/erro.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/erro.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/erro.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/erro.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/folder_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_h.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_h.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_h.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/folder_h.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/folder_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/folder_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/folder_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/hand.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/hand.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/hand.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/hand.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/insert_point.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/insert_point.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/insert_point.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/insert_point.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/line_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/line_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/line_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/line_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/line_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/line_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/line_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/move.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/move.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/move.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/move.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/point_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/point_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/point_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/point_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/point_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/point_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/point_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/property.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/property.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/property.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/property.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/property_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/property_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/property_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/property_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/property_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/property_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/property_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/radius.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/radius.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/radius.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/radius.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/root.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/root.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/root.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/root.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/root_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/root_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/root_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/root_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/root_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/root_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/root_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/rotate.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/rotate.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/rotate.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/rotate.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/scale.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/scale.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/scale.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/scale.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/select.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/select.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/select.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/select.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/select_copy.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/select_copy.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/select_copy.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/select_copy.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/turn.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/turn.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/turn.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/turn.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.rc2 b/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.rc2
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor.rc2
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor_doc.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor_doc.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor_doc.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/world_editor_doc.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_closed.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_closed.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_closed.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/zone_closed.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_hidden.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_hidden.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_hidden.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/zone_hidden.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_opened.ico b/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_opened.ico
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/zone_opened.ico
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/zone_opened.ico
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/res/zoom.cur b/ryzom/tools/leveldesign/world_editor/world_editor/res/zoom.cur
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/res/zoom.cur
rename to ryzom/tools/leveldesign/world_editor/world_editor/res/zoom.cur
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/resource.h b/ryzom/tools/leveldesign/world_editor/world_editor/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.h b/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/select_by_location.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.h b/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/splash_screen.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/stdafx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h b/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h b/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h b/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_manager_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/type_sel_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/update_continents.bat b/ryzom/tools/leveldesign/world_editor/world_editor/update_continents.bat
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/update_continents.bat
rename to ryzom/tools/leveldesign/world_editor/world_editor/update_continents.bat
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/version.rc2 b/ryzom/tools/leveldesign/world_editor/world_editor/version.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/version.rc2
rename to ryzom/tools/leveldesign/world_editor/world_editor/version.rc2
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.h b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.rc b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_georges.cfg b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_georges.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_georges.cfg
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor_georges.cfg
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.h b/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.h
rename to ryzom/tools/leveldesign/world_editor/world_editor/world_editor_view.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.h b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/DialogFlags.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/ReadMe.txt b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/ReadMe.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/ReadMe.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/ReadMe.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/Resource.h b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/Resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/Resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/Resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/fauna_flags.tga b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/fauna_flags.tga
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/fauna_flags.tga
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/fauna_flags.tga
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/res/world_editor_fauna_graph_plugin.rc2 b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/res/world_editor_fauna_graph_plugin.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/res/world_editor_fauna_graph_plugin.rc2
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/res/world_editor_fauna_graph_plugin.rc2
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.rc b/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/graph_plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/res/world_editor_graph_plugin.rc2 b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/res/world_editor_graph_plugin.rc2
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/res/world_editor_graph_plugin.rc2
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/res/world_editor_graph_plugin.rc2
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/resource.h b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.rc b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.h b/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin_dlg.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.h b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/DialogFlags.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.h b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/LoadDialog.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.h b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/WorldEditorPlugin.cfg b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/WorldEditorPlugin.cfg
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/WorldEditorPlugin.cfg
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/WorldEditorPlugin.cfg
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/resource.h b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_plugin.rc b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_plugin.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_plugin.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_plugin.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_scriptPLAYER.xml b/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_scriptPLAYER.xml
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_scriptPLAYER.xml
rename to ryzom/tools/leveldesign/world_editor/world_editor_plugin/world_editor_scriptPLAYER.xml
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogFlags.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/DialogLogin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_display_info.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_display_info.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_display_info.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_display_info.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_icons.tga b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_icons.tga
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_icons.tga
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/entity_icons.tga
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/list_box_color.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/memory_combo_box.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/resource.h b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.rc b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.rc
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.xml b/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.xml
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.xml
rename to ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.xml
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.h b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/LoadDialog.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bitmap1.bmp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bitmap1.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bitmap1.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bitmap1.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00001.bmp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00001.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00001.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00001.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00002.bmp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00002.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00002.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00002.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00003.bmp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00003.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00003.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/bmp00003.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/toolbar1.bmp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/toolbar1.bmp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/toolbar1.bmp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/res/toolbar1.bmp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/resource.h b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/resource.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/resource.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/resource.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.rc b/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.rc
similarity index 100%
rename from code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.rc
rename to ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.rc
diff --git a/code/ryzom/tools/make_alias_file/CMakeLists.txt b/ryzom/tools/make_alias_file/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/make_alias_file/CMakeLists.txt
rename to ryzom/tools/make_alias_file/CMakeLists.txt
diff --git a/code/ryzom/tools/make_alias_file/make_alias_file.cfg b/ryzom/tools/make_alias_file/make_alias_file.cfg
similarity index 100%
rename from code/ryzom/tools/make_alias_file/make_alias_file.cfg
rename to ryzom/tools/make_alias_file/make_alias_file.cfg
diff --git a/code/ryzom/tools/make_alias_file/make_alias_file.cpp b/ryzom/tools/make_alias_file/make_alias_file.cpp
similarity index 100%
rename from code/ryzom/tools/make_alias_file/make_alias_file.cpp
rename to ryzom/tools/make_alias_file/make_alias_file.cpp
diff --git a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt b/ryzom/tools/make_anim_by_race/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/make_anim_by_race/CMakeLists.txt
rename to ryzom/tools/make_anim_by_race/CMakeLists.txt
diff --git a/code/ryzom/tools/make_anim_by_race/main.cpp b/ryzom/tools/make_anim_by_race/main.cpp
similarity index 100%
rename from code/ryzom/tools/make_anim_by_race/main.cpp
rename to ryzom/tools/make_anim_by_race/main.cpp
diff --git a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt b/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
rename to ryzom/tools/make_anim_melee_impact/CMakeLists.txt
diff --git a/code/ryzom/tools/make_anim_melee_impact/anim.txt b/ryzom/tools/make_anim_melee_impact/anim.txt
similarity index 100%
rename from code/ryzom/tools/make_anim_melee_impact/anim.txt
rename to ryzom/tools/make_anim_melee_impact/anim.txt
diff --git a/code/ryzom/tools/make_anim_melee_impact/main.cpp b/ryzom/tools/make_anim_melee_impact/main.cpp
similarity index 100%
rename from code/ryzom/tools/make_anim_melee_impact/main.cpp
rename to ryzom/tools/make_anim_melee_impact/main.cpp
diff --git a/code/ryzom/tools/occ2huff/CMakeLists.txt b/ryzom/tools/occ2huff/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/occ2huff/CMakeLists.txt
rename to ryzom/tools/occ2huff/CMakeLists.txt
diff --git a/code/ryzom/tools/occ2huff/occ2huff.cpp b/ryzom/tools/occ2huff/occ2huff.cpp
similarity index 100%
rename from code/ryzom/tools/occ2huff/occ2huff.cpp
rename to ryzom/tools/occ2huff/occ2huff.cpp
diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/ryzom/tools/patch_gen/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/patch_gen/CMakeLists.txt
rename to ryzom/tools/patch_gen/CMakeLists.txt
diff --git a/code/ryzom/tools/patch_gen/blue_pill.ico b/ryzom/tools/patch_gen/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/patch_gen/blue_pill.ico
rename to ryzom/tools/patch_gen/blue_pill.ico
diff --git a/code/ryzom/tools/patch_gen/patch_gen.rc b/ryzom/tools/patch_gen/patch_gen.rc
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen.rc
rename to ryzom/tools/patch_gen/patch_gen.rc
diff --git a/code/ryzom/tools/patch_gen/patch_gen_common.cpp b/ryzom/tools/patch_gen/patch_gen_common.cpp
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_common.cpp
rename to ryzom/tools/patch_gen/patch_gen_common.cpp
diff --git a/code/ryzom/tools/patch_gen/patch_gen_main.cpp b/ryzom/tools/patch_gen/patch_gen_main.cpp
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_main.cpp
rename to ryzom/tools/patch_gen/patch_gen_main.cpp
diff --git a/code/ryzom/tools/patch_gen/patch_gen_main.h b/ryzom/tools/patch_gen/patch_gen_main.h
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_main.h
rename to ryzom/tools/patch_gen/patch_gen_main.h
diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.cpp b/ryzom/tools/patch_gen/patch_gen_service.cpp
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_service.cpp
rename to ryzom/tools/patch_gen/patch_gen_service.cpp
diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.h b/ryzom/tools/patch_gen/patch_gen_service.h
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_service.h
rename to ryzom/tools/patch_gen/patch_gen_service.h
diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.rc b/ryzom/tools/patch_gen/patch_gen_service.rc
similarity index 100%
rename from code/ryzom/tools/patch_gen/patch_gen_service.rc
rename to ryzom/tools/patch_gen/patch_gen_service.rc
diff --git a/code/ryzom/tools/patch_gen/red_pill.ico b/ryzom/tools/patch_gen/red_pill.ico
similarity index 100%
rename from code/ryzom/tools/patch_gen/red_pill.ico
rename to ryzom/tools/patch_gen/red_pill.ico
diff --git a/code/ryzom/tools/pd_parser/CMakeLists.txt b/ryzom/tools/pd_parser/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/pd_parser/CMakeLists.txt
rename to ryzom/tools/pd_parser/CMakeLists.txt
diff --git a/code/ryzom/tools/pd_parser/cpp_output.h b/ryzom/tools/pd_parser/cpp_output.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/cpp_output.h
rename to ryzom/tools/pd_parser/cpp_output.h
diff --git a/code/ryzom/tools/pd_parser/main.cpp b/ryzom/tools/pd_parser/main.cpp
similarity index 100%
rename from code/ryzom/tools/pd_parser/main.cpp
rename to ryzom/tools/pd_parser/main.cpp
diff --git a/code/ryzom/tools/pd_parser/parse_node.h b/ryzom/tools/pd_parser/parse_node.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/parse_node.h
rename to ryzom/tools/pd_parser/parse_node.h
diff --git a/code/ryzom/tools/pd_parser/parser.cpp b/ryzom/tools/pd_parser/parser.cpp
similarity index 100%
rename from code/ryzom/tools/pd_parser/parser.cpp
rename to ryzom/tools/pd_parser/parser.cpp
diff --git a/code/ryzom/tools/pd_parser/parser.h b/ryzom/tools/pd_parser/parser.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/parser.h
rename to ryzom/tools/pd_parser/parser.h
diff --git a/code/ryzom/tools/pd_parser/parser_rules.cpp b/ryzom/tools/pd_parser/parser_rules.cpp
similarity index 100%
rename from code/ryzom/tools/pd_parser/parser_rules.cpp
rename to ryzom/tools/pd_parser/parser_rules.cpp
diff --git a/code/ryzom/tools/pd_parser/parser_rules.h b/ryzom/tools/pd_parser/parser_rules.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/parser_rules.h
rename to ryzom/tools/pd_parser/parser_rules.h
diff --git a/code/ryzom/tools/pd_parser/templatizer.cpp b/ryzom/tools/pd_parser/templatizer.cpp
similarity index 100%
rename from code/ryzom/tools/pd_parser/templatizer.cpp
rename to ryzom/tools/pd_parser/templatizer.cpp
diff --git a/code/ryzom/tools/pd_parser/templatizer.h b/ryzom/tools/pd_parser/templatizer.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/templatizer.h
rename to ryzom/tools/pd_parser/templatizer.h
diff --git a/code/ryzom/tools/pd_parser/tokenizer.h b/ryzom/tools/pd_parser/tokenizer.h
similarity index 100%
rename from code/ryzom/tools/pd_parser/tokenizer.h
rename to ryzom/tools/pd_parser/tokenizer.h
diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/ryzom/tools/pdr_util/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/pdr_util/CMakeLists.txt
rename to ryzom/tools/pdr_util/CMakeLists.txt
diff --git a/code/ryzom/tools/pdr_util/pdr_util.cpp b/ryzom/tools/pdr_util/pdr_util.cpp
similarity index 100%
rename from code/ryzom/tools/pdr_util/pdr_util.cpp
rename to ryzom/tools/pdr_util/pdr_util.cpp
diff --git a/code/ryzom/tools/phrase_generator/CMakeLists.txt b/ryzom/tools/phrase_generator/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/phrase_generator/CMakeLists.txt
rename to ryzom/tools/phrase_generator/CMakeLists.txt
diff --git a/code/ryzom/tools/phrase_generator/StdAfx.cpp b/ryzom/tools/phrase_generator/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/phrase_generator/StdAfx.cpp
rename to ryzom/tools/phrase_generator/StdAfx.cpp
diff --git a/code/ryzom/tools/phrase_generator/StdAfx.h b/ryzom/tools/phrase_generator/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/phrase_generator/StdAfx.h
rename to ryzom/tools/phrase_generator/StdAfx.h
diff --git a/code/ryzom/tools/phrase_generator/phrase_generator.cpp b/ryzom/tools/phrase_generator/phrase_generator.cpp
similarity index 100%
rename from code/ryzom/tools/phrase_generator/phrase_generator.cpp
rename to ryzom/tools/phrase_generator/phrase_generator.cpp
diff --git a/code/ryzom/tools/phrase_generator/skill_tree.cpp b/ryzom/tools/phrase_generator/skill_tree.cpp
similarity index 100%
rename from code/ryzom/tools/phrase_generator/skill_tree.cpp
rename to ryzom/tools/phrase_generator/skill_tree.cpp
diff --git a/code/ryzom/tools/phrase_generator/skill_tree.h b/ryzom/tools/phrase_generator/skill_tree.h
similarity index 100%
rename from code/ryzom/tools/phrase_generator/skill_tree.h
rename to ryzom/tools/phrase_generator/skill_tree.h
diff --git a/code/ryzom/tools/phrase_generator/sstring.h b/ryzom/tools/phrase_generator/sstring.h
similarity index 100%
rename from code/ryzom/tools/phrase_generator/sstring.h
rename to ryzom/tools/phrase_generator/sstring.h
diff --git a/code/ryzom/tools/reynolds/reynolds_manager.cpp b/ryzom/tools/reynolds/reynolds_manager.cpp
similarity index 100%
rename from code/ryzom/tools/reynolds/reynolds_manager.cpp
rename to ryzom/tools/reynolds/reynolds_manager.cpp
diff --git a/code/ryzom/tools/reynolds/reynolds_manager.h b/ryzom/tools/reynolds/reynolds_manager.h
similarity index 100%
rename from code/ryzom/tools/reynolds/reynolds_manager.h
rename to ryzom/tools/reynolds/reynolds_manager.h
diff --git a/code/ryzom/tools/reynolds/stdpch.cpp b/ryzom/tools/reynolds/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/reynolds/stdpch.cpp
rename to ryzom/tools/reynolds/stdpch.cpp
diff --git a/code/ryzom/tools/reynolds/stdpch.h b/ryzom/tools/reynolds/stdpch.h
similarity index 100%
rename from code/ryzom/tools/reynolds/stdpch.h
rename to ryzom/tools/reynolds/stdpch.h
diff --git a/code/ryzom/tools/reynolds/track.cpp b/ryzom/tools/reynolds/track.cpp
similarity index 100%
rename from code/ryzom/tools/reynolds/track.cpp
rename to ryzom/tools/reynolds/track.cpp
diff --git a/code/ryzom/tools/reynolds/track.h b/ryzom/tools/reynolds/track.h
similarity index 100%
rename from code/ryzom/tools/reynolds/track.h
rename to ryzom/tools/reynolds/track.h
diff --git a/code/ryzom/tools/scripts/linux/build b/ryzom/tools/scripts/linux/build
similarity index 100%
rename from code/ryzom/tools/scripts/linux/build
rename to ryzom/tools/scripts/linux/build
diff --git a/code/ryzom/tools/scripts/linux/buildmode b/ryzom/tools/scripts/linux/buildmode
similarity index 100%
rename from code/ryzom/tools/scripts/linux/buildmode
rename to ryzom/tools/scripts/linux/buildmode
diff --git a/code/ryzom/tools/scripts/linux/clean_log.sh b/ryzom/tools/scripts/linux/clean_log.sh
similarity index 100%
rename from code/ryzom/tools/scripts/linux/clean_log.sh
rename to ryzom/tools/scripts/linux/clean_log.sh
diff --git a/code/ryzom/tools/scripts/linux/generate_packed_sheets.sh b/ryzom/tools/scripts/linux/generate_packed_sheets.sh
similarity index 100%
rename from code/ryzom/tools/scripts/linux/generate_packed_sheets.sh
rename to ryzom/tools/scripts/linux/generate_packed_sheets.sh
diff --git a/code/ryzom/tools/scripts/linux/loop_aes.sh b/ryzom/tools/scripts/linux/loop_aes.sh
similarity index 100%
rename from code/ryzom/tools/scripts/linux/loop_aes.sh
rename to ryzom/tools/scripts/linux/loop_aes.sh
diff --git a/code/ryzom/tools/scripts/linux/make_all b/ryzom/tools/scripts/linux/make_all
similarity index 100%
rename from code/ryzom/tools/scripts/linux/make_all
rename to ryzom/tools/scripts/linux/make_all
diff --git a/code/ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh b/ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh
similarity index 100%
rename from code/ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh
rename to ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh
diff --git a/code/ryzom/tools/scripts/linux/service_launcher.sh b/ryzom/tools/scripts/linux/service_launcher.sh
similarity index 100%
rename from code/ryzom/tools/scripts/linux/service_launcher.sh
rename to ryzom/tools/scripts/linux/service_launcher.sh
diff --git a/code/ryzom/tools/scripts/linux/shard b/ryzom/tools/scripts/linux/shard
similarity index 100%
rename from code/ryzom/tools/scripts/linux/shard
rename to ryzom/tools/scripts/linux/shard
diff --git a/code/ryzom/tools/scripts/linux/utilities b/ryzom/tools/scripts/linux/utilities
similarity index 100%
rename from code/ryzom/tools/scripts/linux/utilities
rename to ryzom/tools/scripts/linux/utilities
diff --git a/code/ryzom/tools/scripts/windows/tools/replace_vista_icon.exe b/ryzom/tools/scripts/windows/tools/replace_vista_icon.exe
similarity index 100%
rename from code/ryzom/tools/scripts/windows/tools/replace_vista_icon.exe
rename to ryzom/tools/scripts/windows/tools/replace_vista_icon.exe
diff --git a/code/ryzom/tools/server/CMakeLists.txt b/ryzom/tools/server/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/server/CMakeLists.txt
rename to ryzom/tools/server/CMakeLists.txt
diff --git a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt b/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
rename to ryzom/tools/server/ai_build_wmap/CMakeLists.txt
diff --git a/code/ryzom/tools/server/ai_build_wmap/blue_pill.ico b/ryzom/tools/server/ai_build_wmap/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/server/ai_build_wmap/blue_pill.ico
rename to ryzom/tools/server/ai_build_wmap/blue_pill.ico
diff --git a/code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp b/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
similarity index 100%
rename from code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
rename to ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
diff --git a/code/ryzom/tools/server/ai_build_wmap/main.cpp b/ryzom/tools/server/ai_build_wmap/main.cpp
similarity index 100%
rename from code/ryzom/tools/server/ai_build_wmap/main.cpp
rename to ryzom/tools/server/ai_build_wmap/main.cpp
diff --git a/code/ryzom/tools/server/ai_build_wmap/main.rc b/ryzom/tools/server/ai_build_wmap/main.rc
similarity index 100%
rename from code/ryzom/tools/server/ai_build_wmap/main.rc
rename to ryzom/tools/server/ai_build_wmap/main.rc
diff --git a/code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp b/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
similarity index 100%
rename from code/ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
rename to ryzom/tools/server/brick_param_extractor/brick_param_extractor.cpp
diff --git a/code/ryzom/tools/server/build_spell_sheet/build_spell_sheet.cpp b/ryzom/tools/server/build_spell_sheet/build_spell_sheet.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_spell_sheet/build_spell_sheet.cpp
rename to ryzom/tools/server/build_spell_sheet/build_spell_sheet.cpp
diff --git a/code/ryzom/tools/server/build_spell_sheet/build_spells.cfg b/ryzom/tools/server/build_spell_sheet/build_spells.cfg
similarity index 100%
rename from code/ryzom/tools/server/build_spell_sheet/build_spells.cfg
rename to ryzom/tools/server/build_spell_sheet/build_spells.cfg
diff --git a/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt b/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
rename to ryzom/tools/server/build_world_packed_col/CMakeLists.txt
diff --git a/code/ryzom/tools/server/build_world_packed_col/blue_pill.ico b/ryzom/tools/server/build_world_packed_col/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/blue_pill.ico
rename to ryzom/tools/server/build_world_packed_col/blue_pill.ico
diff --git a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cfg b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cfg
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cfg
rename to ryzom/tools/server/build_world_packed_col/build_world_packed_col.cfg
diff --git a/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp b/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
rename to ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/builder_config.cpp b/ryzom/tools/server/build_world_packed_col/builder_config.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/builder_config.cpp
rename to ryzom/tools/server/build_world_packed_col/builder_config.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/builder_config.h b/ryzom/tools/server/build_world_packed_col/builder_config.h
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/builder_config.h
rename to ryzom/tools/server/build_world_packed_col/builder_config.h
diff --git a/code/ryzom/tools/server/build_world_packed_col/main.rc b/ryzom/tools/server/build_world_packed_col/main.rc
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/main.rc
rename to ryzom/tools/server/build_world_packed_col/main.rc
diff --git a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp b/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
rename to ryzom/tools/server/build_world_packed_col/packed_world_builder.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/packed_world_builder.h b/ryzom/tools/server/build_world_packed_col/packed_world_builder.h
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/packed_world_builder.h
rename to ryzom/tools/server/build_world_packed_col/packed_world_builder.h
diff --git a/code/ryzom/tools/server/build_world_packed_col/std_header.cpp b/ryzom/tools/server/build_world_packed_col/std_header.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/std_header.cpp
rename to ryzom/tools/server/build_world_packed_col/std_header.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/std_header.h b/ryzom/tools/server/build_world_packed_col/std_header.h
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/std_header.h
rename to ryzom/tools/server/build_world_packed_col/std_header.h
diff --git a/code/ryzom/tools/server/build_world_packed_col/test_col_world.cpp b/ryzom/tools/server/build_world_packed_col/test_col_world.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/test_col_world.cpp
rename to ryzom/tools/server/build_world_packed_col/test_col_world.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/village.cpp b/ryzom/tools/server/build_world_packed_col/village.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/village.cpp
rename to ryzom/tools/server/build_world_packed_col/village.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/village.h b/ryzom/tools/server/build_world_packed_col/village.h
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/village.h
rename to ryzom/tools/server/build_world_packed_col/village.h
diff --git a/code/ryzom/tools/server/build_world_packed_col/zone_util.cpp b/ryzom/tools/server/build_world_packed_col/zone_util.cpp
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/zone_util.cpp
rename to ryzom/tools/server/build_world_packed_col/zone_util.cpp
diff --git a/code/ryzom/tools/server/build_world_packed_col/zone_util.h b/ryzom/tools/server/build_world_packed_col/zone_util.h
similarity index 100%
rename from code/ryzom/tools/server/build_world_packed_col/zone_util.h
rename to ryzom/tools/server/build_world_packed_col/zone_util.h
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/.classpath b/ryzom/tools/server/ryzom_ams/android_app/.classpath
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/.classpath
rename to ryzom/tools/server/ryzom_ams/android_app/.classpath
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/.project b/ryzom/tools/server/ryzom_ams/android_app/.project
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/.project
rename to ryzom/tools/server/ryzom_ams/android_app/.project
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/.settings/org.eclipse.jdt.core.prefs b/ryzom/tools/server/ryzom_ams/android_app/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/.settings/org.eclipse.jdt.core.prefs
rename to ryzom/tools/server/ryzom_ams/android_app/.settings/org.eclipse.jdt.core.prefs
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/AndroidManifest.xml b/ryzom/tools/server/ryzom_ams/android_app/AndroidManifest.xml
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/AndroidManifest.xml
rename to ryzom/tools/server/ryzom_ams/android_app/AndroidManifest.xml
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/BuildConfig.java b/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/BuildConfig.java
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/BuildConfig.java
rename to ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/BuildConfig.java
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/R.java b/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/R.java
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/R.java
rename to ryzom/tools/server/ryzom_ams/android_app/gen/com/mkyong/android/R.java
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/info.txt b/ryzom/tools/server/ryzom_ams/android_app/info.txt
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/info.txt
rename to ryzom/tools/server/ryzom_ams/android_app/info.txt
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/proguard.cfg b/ryzom/tools/server/ryzom_ams/android_app/proguard.cfg
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/proguard.cfg
rename to ryzom/tools/server/ryzom_ams/android_app/proguard.cfg
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/project.properties b/ryzom/tools/server/ryzom_ams/android_app/project.properties
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/project.properties
rename to ryzom/tools/server/ryzom_ams/android_app/project.properties
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/res/drawable-hdpi/ic_launcher.png b/ryzom/tools/server/ryzom_ams/android_app/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/res/drawable-hdpi/ic_launcher.png
rename to ryzom/tools/server/ryzom_ams/android_app/res/drawable-hdpi/ic_launcher.png
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/res/drawable-ldpi/ic_launcher.png b/ryzom/tools/server/ryzom_ams/android_app/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/res/drawable-ldpi/ic_launcher.png
rename to ryzom/tools/server/ryzom_ams/android_app/res/drawable-ldpi/ic_launcher.png
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/res/drawable/ic_launcher.png b/ryzom/tools/server/ryzom_ams/android_app/res/drawable/ic_launcher.png
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/res/drawable/ic_launcher.png
rename to ryzom/tools/server/ryzom_ams/android_app/res/drawable/ic_launcher.png
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/res/layout/main.xml b/ryzom/tools/server/ryzom_ams/android_app/res/layout/main.xml
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/res/layout/main.xml
rename to ryzom/tools/server/ryzom_ams/android_app/res/layout/main.xml
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/res/values/strings.xml b/ryzom/tools/server/ryzom_ams/android_app/res/values/strings.xml
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/res/values/strings.xml
rename to ryzom/tools/server/ryzom_ams/android_app/res/values/strings.xml
diff --git a/code/ryzom/tools/server/ryzom_ams/android_app/src/com/mkyong/android/MainActivity.java b/ryzom/tools/server/ryzom_ams/android_app/src/com/mkyong/android/MainActivity.java
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/android_app/src/com/mkyong/android/MainActivity.java
rename to ryzom/tools/server/ryzom_ams/android_app/src/com/mkyong/android/MainActivity.java
diff --git a/code/ryzom/tools/server/ryzom_ams/credits.txt b/ryzom/tools/server/ryzom_ams/credits.txt
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/credits.txt
rename to ryzom/tools/server/ryzom_ams/credits.txt
diff --git a/code/ryzom/tools/server/ryzom_ams/doc.txt b/ryzom/tools/server/ryzom_ams/doc.txt
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/doc.txt
rename to ryzom/tools/server/ryzom_ams/doc.txt
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.info b/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.info
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.info
rename to ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.info
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.install b/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.install
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.install
rename to ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.install
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.module b/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.module
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.module
rename to ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/ryzommanage.module
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/templates/ingame_register.phtml b/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/templates/ingame_register.phtml
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/templates/ingame_register.phtml
rename to ryzom/tools/server/ryzom_ams/drupal_module/oldmodule/templates/ingame_register.phtml
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.default.php b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.default.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.default.php
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.default.php
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/logout.php b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/logout.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/logout.php
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/logout.php
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/settings.php b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/settings.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/settings.php
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/settings.php
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_user.php b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_user.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_user.php
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_user.php
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.info b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.info
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.info
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.info
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.install b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.install
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.install
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.install
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/createticket.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/createticket.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/createticket.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/createticket.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/dashboard.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/dashboard.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/dashboard.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/dashboard.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/ingame_register.phtml b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/ingame_register.phtml
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/ingame_register.phtml
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/ingame_register.phtml
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_admin.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_admin.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_admin.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_admin.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_mod.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_mod.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_mod.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_mod.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_user.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_user.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_user.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/layout_user.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/sgroup_list.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/sgroup_list.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/sgroup_list.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/sgroup_list.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_queue.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_queue.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_queue.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_queue.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_reply.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_reply.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_reply.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_reply.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_sgroup.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_sgroup.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_sgroup.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_sgroup.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_info.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_info.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_info.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_info.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_log.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_log.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_log.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_ticket_log.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_user.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_user.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_user.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/show_user.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl b/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl
rename to ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl
diff --git a/code/ryzom/tools/server/ryzom_ams/todo.txt b/ryzom/tools/server/ryzom_ams/todo.txt
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/todo.txt
rename to ryzom/tools/server/ryzom_ams/todo.txt
diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.php b/ryzom/tools/server/ryzom_ams/www/config.php
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/www/config.php
rename to ryzom/tools/server/ryzom_ams/www/config.php
diff --git a/code/ryzom/tools/server/ryzom_ams/www/is_installed b/ryzom/tools/server/ryzom_ams/www/is_installed
similarity index 100%
rename from code/ryzom/tools/server/ryzom_ams/www/is_installed
rename to ryzom/tools/server/ryzom_ams/www/is_installed
diff --git a/code/ryzom/tools/sheet_random_generator/CMakeLists.txt b/ryzom/tools/sheet_random_generator/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/CMakeLists.txt
rename to ryzom/tools/sheet_random_generator/CMakeLists.txt
diff --git a/code/ryzom/tools/sheet_random_generator/StdAfx.cpp b/ryzom/tools/sheet_random_generator/StdAfx.cpp
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/StdAfx.cpp
rename to ryzom/tools/sheet_random_generator/StdAfx.cpp
diff --git a/code/ryzom/tools/sheet_random_generator/StdAfx.h b/ryzom/tools/sheet_random_generator/StdAfx.h
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/StdAfx.h
rename to ryzom/tools/sheet_random_generator/StdAfx.h
diff --git a/code/ryzom/tools/sheet_random_generator/raw_material_generation.cfg b/ryzom/tools/sheet_random_generator/raw_material_generation.cfg
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/raw_material_generation.cfg
rename to ryzom/tools/sheet_random_generator/raw_material_generation.cfg
diff --git a/code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp b/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp
rename to ryzom/tools/sheet_random_generator/sheet_random_generator.cpp
diff --git a/code/ryzom/tools/sheet_random_generator/srg_utilities.cpp b/ryzom/tools/sheet_random_generator/srg_utilities.cpp
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/srg_utilities.cpp
rename to ryzom/tools/sheet_random_generator/srg_utilities.cpp
diff --git a/code/ryzom/tools/sheet_random_generator/srg_utilities.h b/ryzom/tools/sheet_random_generator/srg_utilities.h
similarity index 100%
rename from code/ryzom/tools/sheet_random_generator/srg_utilities.h
rename to ryzom/tools/sheet_random_generator/srg_utilities.h
diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/ryzom/tools/sheets_packer/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/sheets_packer/CMakeLists.txt
rename to ryzom/tools/sheets_packer/CMakeLists.txt
diff --git a/code/ryzom/tools/sheets_packer/blue_pill.ico b/ryzom/tools/sheets_packer/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/sheets_packer/blue_pill.ico
rename to ryzom/tools/sheets_packer/blue_pill.ico
diff --git a/code/ryzom/tools/sheets_packer/main.rc b/ryzom/tools/sheets_packer/main.rc
similarity index 100%
rename from code/ryzom/tools/sheets_packer/main.rc
rename to ryzom/tools/sheets_packer/main.rc
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cfg b/ryzom/tools/sheets_packer/sheets_packer.cfg
similarity index 100%
rename from code/ryzom/tools/sheets_packer/sheets_packer.cfg
rename to ryzom/tools/sheets_packer/sheets_packer.cfg
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cpp b/ryzom/tools/sheets_packer/sheets_packer.cpp
similarity index 100%
rename from code/ryzom/tools/sheets_packer/sheets_packer.cpp
rename to ryzom/tools/sheets_packer/sheets_packer.cpp
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp b/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
similarity index 100%
rename from code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
rename to ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h b/ryzom/tools/sheets_packer/sheets_packer_cfg.h
similarity index 100%
rename from code/ryzom/tools/sheets_packer/sheets_packer_cfg.h
rename to ryzom/tools/sheets_packer/sheets_packer_cfg.h
diff --git a/code/ryzom/tools/sheets_packer/stdpch.cpp b/ryzom/tools/sheets_packer/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/sheets_packer/stdpch.cpp
rename to ryzom/tools/sheets_packer/stdpch.cpp
diff --git a/code/ryzom/tools/sheets_packer/stdpch.h b/ryzom/tools/sheets_packer/stdpch.h
similarity index 100%
rename from code/ryzom/tools/sheets_packer/stdpch.h
rename to ryzom/tools/sheets_packer/stdpch.h
diff --git a/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt b/ryzom/tools/sheets_packer_shard/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
rename to ryzom/tools/sheets_packer_shard/CMakeLists.txt
diff --git a/code/ryzom/tools/sheets_packer_shard/blue_pill.ico b/ryzom/tools/sheets_packer_shard/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/sheets_packer_shard/blue_pill.ico
rename to ryzom/tools/sheets_packer_shard/blue_pill.ico
diff --git a/code/ryzom/tools/sheets_packer_shard/main.rc b/ryzom/tools/sheets_packer_shard/main.rc
similarity index 100%
rename from code/ryzom/tools/sheets_packer_shard/main.rc
rename to ryzom/tools/sheets_packer_shard/main.rc
diff --git a/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp b/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
similarity index 100%
rename from code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
rename to ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
diff --git a/code/ryzom/tools/skill_extractor/CMakeLists.txt b/ryzom/tools/skill_extractor/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/skill_extractor/CMakeLists.txt
rename to ryzom/tools/skill_extractor/CMakeLists.txt
diff --git a/code/ryzom/tools/skill_extractor/skill_extractor.cpp b/ryzom/tools/skill_extractor/skill_extractor.cpp
similarity index 100%
rename from code/ryzom/tools/skill_extractor/skill_extractor.cpp
rename to ryzom/tools/skill_extractor/skill_extractor.cpp
diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/ryzom/tools/stats_scan/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/stats_scan/CMakeLists.txt
rename to ryzom/tools/stats_scan/CMakeLists.txt
diff --git a/code/ryzom/tools/stats_scan/char_commands.cpp b/ryzom/tools/stats_scan/char_commands.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_commands.cpp
rename to ryzom/tools/stats_scan/char_commands.cpp
diff --git a/code/ryzom/tools/stats_scan/char_filter_factory.cpp b/ryzom/tools/stats_scan/char_filter_factory.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_filter_factory.cpp
rename to ryzom/tools/stats_scan/char_filter_factory.cpp
diff --git a/code/ryzom/tools/stats_scan/char_filter_factory.h b/ryzom/tools/stats_scan/char_filter_factory.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_filter_factory.h
rename to ryzom/tools/stats_scan/char_filter_factory.h
diff --git a/code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp b/ryzom/tools/stats_scan/char_info_extractor_factory.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp
rename to ryzom/tools/stats_scan/char_info_extractor_factory.cpp
diff --git a/code/ryzom/tools/stats_scan/char_info_extractor_factory.h b/ryzom/tools/stats_scan/char_info_extractor_factory.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_info_extractor_factory.h
rename to ryzom/tools/stats_scan/char_info_extractor_factory.h
diff --git a/code/ryzom/tools/stats_scan/char_scan_script.cpp b/ryzom/tools/stats_scan/char_scan_script.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_scan_script.cpp
rename to ryzom/tools/stats_scan/char_scan_script.cpp
diff --git a/code/ryzom/tools/stats_scan/char_scan_script.h b/ryzom/tools/stats_scan/char_scan_script.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/char_scan_script.h
rename to ryzom/tools/stats_scan/char_scan_script.h
diff --git a/code/ryzom/tools/stats_scan/character.cpp b/ryzom/tools/stats_scan/character.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/character.cpp
rename to ryzom/tools/stats_scan/character.cpp
diff --git a/code/ryzom/tools/stats_scan/character.h b/ryzom/tools/stats_scan/character.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/character.h
rename to ryzom/tools/stats_scan/character.h
diff --git a/code/ryzom/tools/stats_scan/character_scan_job.cpp b/ryzom/tools/stats_scan/character_scan_job.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/character_scan_job.cpp
rename to ryzom/tools/stats_scan/character_scan_job.cpp
diff --git a/code/ryzom/tools/stats_scan/character_scan_job.h b/ryzom/tools/stats_scan/character_scan_job.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/character_scan_job.h
rename to ryzom/tools/stats_scan/character_scan_job.h
diff --git a/code/ryzom/tools/stats_scan/job_manager.cpp b/ryzom/tools/stats_scan/job_manager.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/job_manager.cpp
rename to ryzom/tools/stats_scan/job_manager.cpp
diff --git a/code/ryzom/tools/stats_scan/job_manager.h b/ryzom/tools/stats_scan/job_manager.h
similarity index 100%
rename from code/ryzom/tools/stats_scan/job_manager.h
rename to ryzom/tools/stats_scan/job_manager.h
diff --git a/code/ryzom/tools/stats_scan/service_main.cpp b/ryzom/tools/stats_scan/service_main.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/service_main.cpp
rename to ryzom/tools/stats_scan/service_main.cpp
diff --git a/code/ryzom/tools/stats_scan/user_char_filters.cpp b/ryzom/tools/stats_scan/user_char_filters.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/user_char_filters.cpp
rename to ryzom/tools/stats_scan/user_char_filters.cpp
diff --git a/code/ryzom/tools/stats_scan/user_char_info_extractors.cpp b/ryzom/tools/stats_scan/user_char_info_extractors.cpp
similarity index 100%
rename from code/ryzom/tools/stats_scan/user_char_info_extractors.cpp
rename to ryzom/tools/stats_scan/user_char_info_extractors.cpp
diff --git a/code/ryzom/tools/translation/5_make_words_diff.bat b/ryzom/tools/translation/5_make_words_diff.bat
similarity index 100%
rename from code/ryzom/tools/translation/5_make_words_diff.bat
rename to ryzom/tools/translation/5_make_words_diff.bat
diff --git a/code/ryzom/tools/translation/6_merge_words_diff.bat b/ryzom/tools/translation/6_merge_words_diff.bat
similarity index 100%
rename from code/ryzom/tools/translation/6_merge_words_diff.bat
rename to ryzom/tools/translation/6_merge_words_diff.bat
diff --git a/code/ryzom/tools/translation/7_install_translation.bat b/ryzom/tools/translation/7_install_translation.bat
similarity index 100%
rename from code/ryzom/tools/translation/7_install_translation.bat
rename to ryzom/tools/translation/7_install_translation.bat
diff --git a/code/ryzom/tools/translation/AA_clean_string_diff.bat b/ryzom/tools/translation/AA_clean_string_diff.bat
similarity index 100%
rename from code/ryzom/tools/translation/AA_clean_string_diff.bat
rename to ryzom/tools/translation/AA_clean_string_diff.bat
diff --git a/code/ryzom/tools/translation/A_make_string_diff.bat b/ryzom/tools/translation/A_make_string_diff.bat
similarity index 100%
rename from code/ryzom/tools/translation/A_make_string_diff.bat
rename to ryzom/tools/translation/A_make_string_diff.bat
diff --git a/code/ryzom/tools/translation/B_merge_string_diff.bat b/ryzom/tools/translation/B_merge_string_diff.bat
similarity index 100%
rename from code/ryzom/tools/translation/B_merge_string_diff.bat
rename to ryzom/tools/translation/B_merge_string_diff.bat
diff --git a/code/ryzom/tools/translation/bin/put_translation_tools_here.tag b/ryzom/tools/translation/bin/put_translation_tools_here.tag
similarity index 100%
rename from code/ryzom/tools/translation/bin/put_translation_tools_here.tag
rename to ryzom/tools/translation/bin/put_translation_tools_here.tag
diff --git a/code/ryzom/tools/translation/diff/do_not_remove.tag b/ryzom/tools/translation/diff/do_not_remove.tag
similarity index 100%
rename from code/ryzom/tools/translation/diff/do_not_remove.tag
rename to ryzom/tools/translation/diff/do_not_remove.tag
diff --git a/code/ryzom/tools/translation/history/do_not_remove_this_file.txt b/ryzom/tools/translation/history/do_not_remove_this_file.txt
similarity index 100%
rename from code/ryzom/tools/translation/history/do_not_remove_this_file.txt
rename to ryzom/tools/translation/history/do_not_remove_this_file.txt
diff --git a/code/ryzom/tools/translation/languages.txt b/ryzom/tools/translation/languages.txt
similarity index 100%
rename from code/ryzom/tools/translation/languages.txt
rename to ryzom/tools/translation/languages.txt
diff --git a/code/ryzom/tools/translation/readme.txt b/ryzom/tools/translation/readme.txt
similarity index 100%
rename from code/ryzom/tools/translation/readme.txt
rename to ryzom/tools/translation/readme.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_de.txt b/ryzom/tools/translation/translated/bodypart_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_de.txt
rename to ryzom/tools/translation/translated/bodypart_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_en.txt b/ryzom/tools/translation/translated/bodypart_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_en.txt
rename to ryzom/tools/translation/translated/bodypart_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_es.txt b/ryzom/tools/translation/translated/bodypart_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_es.txt
rename to ryzom/tools/translation/translated/bodypart_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_fr.txt b/ryzom/tools/translation/translated/bodypart_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_fr.txt
rename to ryzom/tools/translation/translated/bodypart_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_ru.txt b/ryzom/tools/translation/translated/bodypart_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_ru.txt
rename to ryzom/tools/translation/translated/bodypart_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/bodypart_words_wk.txt b/ryzom/tools/translation/translated/bodypart_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/bodypart_words_wk.txt
rename to ryzom/tools/translation/translated/bodypart_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_de.txt b/ryzom/tools/translation/translated/career_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_de.txt
rename to ryzom/tools/translation/translated/career_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_en.txt b/ryzom/tools/translation/translated/career_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_en.txt
rename to ryzom/tools/translation/translated/career_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_es.txt b/ryzom/tools/translation/translated/career_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_es.txt
rename to ryzom/tools/translation/translated/career_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_fr.txt b/ryzom/tools/translation/translated/career_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_fr.txt
rename to ryzom/tools/translation/translated/career_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_ru.txt b/ryzom/tools/translation/translated/career_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_ru.txt
rename to ryzom/tools/translation/translated/career_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/career_words_wk.txt b/ryzom/tools/translation/translated/career_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/career_words_wk.txt
rename to ryzom/tools/translation/translated/career_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_de.txt b/ryzom/tools/translation/translated/characteristic_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_de.txt
rename to ryzom/tools/translation/translated/characteristic_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_en.txt b/ryzom/tools/translation/translated/characteristic_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_en.txt
rename to ryzom/tools/translation/translated/characteristic_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_es.txt b/ryzom/tools/translation/translated/characteristic_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_es.txt
rename to ryzom/tools/translation/translated/characteristic_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_fr.txt b/ryzom/tools/translation/translated/characteristic_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_fr.txt
rename to ryzom/tools/translation/translated/characteristic_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_ru.txt b/ryzom/tools/translation/translated/characteristic_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_ru.txt
rename to ryzom/tools/translation/translated/characteristic_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/characteristic_words_wk.txt b/ryzom/tools/translation/translated/characteristic_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/characteristic_words_wk.txt
rename to ryzom/tools/translation/translated/characteristic_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_de.txt b/ryzom/tools/translation/translated/classificationtype_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_de.txt
rename to ryzom/tools/translation/translated/classificationtype_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_en.txt b/ryzom/tools/translation/translated/classificationtype_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_en.txt
rename to ryzom/tools/translation/translated/classificationtype_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_es.txt b/ryzom/tools/translation/translated/classificationtype_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_es.txt
rename to ryzom/tools/translation/translated/classificationtype_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_fr.txt b/ryzom/tools/translation/translated/classificationtype_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_fr.txt
rename to ryzom/tools/translation/translated/classificationtype_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_ru.txt b/ryzom/tools/translation/translated/classificationtype_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_ru.txt
rename to ryzom/tools/translation/translated/classificationtype_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/classificationtype_words_wk.txt b/ryzom/tools/translation/translated/classificationtype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/classificationtype_words_wk.txt
rename to ryzom/tools/translation/translated/classificationtype_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_de.txt b/ryzom/tools/translation/translated/creature_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_de.txt
rename to ryzom/tools/translation/translated/creature_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_en.txt b/ryzom/tools/translation/translated/creature_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_en.txt
rename to ryzom/tools/translation/translated/creature_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_es.txt b/ryzom/tools/translation/translated/creature_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_es.txt
rename to ryzom/tools/translation/translated/creature_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_fr.txt b/ryzom/tools/translation/translated/creature_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_fr.txt
rename to ryzom/tools/translation/translated/creature_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_ru.txt b/ryzom/tools/translation/translated/creature_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_ru.txt
rename to ryzom/tools/translation/translated/creature_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/creature_words_wk.txt b/ryzom/tools/translation/translated/creature_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/creature_words_wk.txt
rename to ryzom/tools/translation/translated/creature_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/damage_words_de.txt b/ryzom/tools/translation/translated/damage_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damage_words_de.txt
rename to ryzom/tools/translation/translated/damage_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/damage_words_en.txt b/ryzom/tools/translation/translated/damage_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damage_words_en.txt
rename to ryzom/tools/translation/translated/damage_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/damage_words_fr.txt b/ryzom/tools/translation/translated/damage_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damage_words_fr.txt
rename to ryzom/tools/translation/translated/damage_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/damage_words_ru.txt b/ryzom/tools/translation/translated/damage_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damage_words_ru.txt
rename to ryzom/tools/translation/translated/damage_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_de.txt b/ryzom/tools/translation/translated/damagetype_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_de.txt
rename to ryzom/tools/translation/translated/damagetype_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_en.txt b/ryzom/tools/translation/translated/damagetype_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_en.txt
rename to ryzom/tools/translation/translated/damagetype_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_es.txt b/ryzom/tools/translation/translated/damagetype_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_es.txt
rename to ryzom/tools/translation/translated/damagetype_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_fr.txt b/ryzom/tools/translation/translated/damagetype_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_fr.txt
rename to ryzom/tools/translation/translated/damagetype_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_ru.txt b/ryzom/tools/translation/translated/damagetype_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_ru.txt
rename to ryzom/tools/translation/translated/damagetype_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/damagetype_words_wk.txt b/ryzom/tools/translation/translated/damagetype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/damagetype_words_wk.txt
rename to ryzom/tools/translation/translated/damagetype_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/de.uxt b/ryzom/tools/translation/translated/de.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/de.uxt
rename to ryzom/tools/translation/translated/de.uxt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_de.txt b/ryzom/tools/translation/translated/ecosystem_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_de.txt
rename to ryzom/tools/translation/translated/ecosystem_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_en.txt b/ryzom/tools/translation/translated/ecosystem_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_en.txt
rename to ryzom/tools/translation/translated/ecosystem_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_es.txt b/ryzom/tools/translation/translated/ecosystem_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_es.txt
rename to ryzom/tools/translation/translated/ecosystem_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_fr.txt b/ryzom/tools/translation/translated/ecosystem_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_fr.txt
rename to ryzom/tools/translation/translated/ecosystem_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_ru.txt b/ryzom/tools/translation/translated/ecosystem_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_ru.txt
rename to ryzom/tools/translation/translated/ecosystem_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/ecosystem_words_wk.txt b/ryzom/tools/translation/translated/ecosystem_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ecosystem_words_wk.txt
rename to ryzom/tools/translation/translated/ecosystem_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/en.uxt b/ryzom/tools/translation/translated/en.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/en.uxt
rename to ryzom/tools/translation/translated/en.uxt
diff --git a/code/ryzom/tools/translation/translated/es.uxt b/ryzom/tools/translation/translated/es.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/es.uxt
rename to ryzom/tools/translation/translated/es.uxt
diff --git a/code/ryzom/tools/translation/translated/faction_words_de.txt b/ryzom/tools/translation/translated/faction_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_de.txt
rename to ryzom/tools/translation/translated/faction_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/faction_words_en.txt b/ryzom/tools/translation/translated/faction_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_en.txt
rename to ryzom/tools/translation/translated/faction_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/faction_words_es.txt b/ryzom/tools/translation/translated/faction_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_es.txt
rename to ryzom/tools/translation/translated/faction_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/faction_words_fr.txt b/ryzom/tools/translation/translated/faction_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_fr.txt
rename to ryzom/tools/translation/translated/faction_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/faction_words_ru.txt b/ryzom/tools/translation/translated/faction_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_ru.txt
rename to ryzom/tools/translation/translated/faction_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/faction_words_wk.txt b/ryzom/tools/translation/translated/faction_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/faction_words_wk.txt
rename to ryzom/tools/translation/translated/faction_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/fr.uxt b/ryzom/tools/translation/translated/fr.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/fr.uxt
rename to ryzom/tools/translation/translated/fr.uxt
diff --git a/code/ryzom/tools/translation/translated/item_words_de.txt b/ryzom/tools/translation/translated/item_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_de.txt
rename to ryzom/tools/translation/translated/item_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/item_words_en.txt b/ryzom/tools/translation/translated/item_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_en.txt
rename to ryzom/tools/translation/translated/item_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/item_words_es.txt b/ryzom/tools/translation/translated/item_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_es.txt
rename to ryzom/tools/translation/translated/item_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/item_words_fr.txt b/ryzom/tools/translation/translated/item_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_fr.txt
rename to ryzom/tools/translation/translated/item_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/item_words_ru.txt b/ryzom/tools/translation/translated/item_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_ru.txt
rename to ryzom/tools/translation/translated/item_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/item_words_wk.txt b/ryzom/tools/translation/translated/item_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/item_words_wk.txt
rename to ryzom/tools/translation/translated/item_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_de.txt b/ryzom/tools/translation/translated/job_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_de.txt
rename to ryzom/tools/translation/translated/job_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_en.txt b/ryzom/tools/translation/translated/job_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_en.txt
rename to ryzom/tools/translation/translated/job_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_es.txt b/ryzom/tools/translation/translated/job_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_es.txt
rename to ryzom/tools/translation/translated/job_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_fr.txt b/ryzom/tools/translation/translated/job_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_fr.txt
rename to ryzom/tools/translation/translated/job_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_ru.txt b/ryzom/tools/translation/translated/job_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_ru.txt
rename to ryzom/tools/translation/translated/job_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/job_words_wk.txt b/ryzom/tools/translation/translated/job_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/job_words_wk.txt
rename to ryzom/tools/translation/translated/job_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_de.txt b/ryzom/tools/translation/translated/outpost_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_de.txt
rename to ryzom/tools/translation/translated/outpost_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_en.txt b/ryzom/tools/translation/translated/outpost_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_en.txt
rename to ryzom/tools/translation/translated/outpost_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_es.txt b/ryzom/tools/translation/translated/outpost_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_es.txt
rename to ryzom/tools/translation/translated/outpost_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_fr.txt b/ryzom/tools/translation/translated/outpost_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_fr.txt
rename to ryzom/tools/translation/translated/outpost_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_ru.txt b/ryzom/tools/translation/translated/outpost_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_ru.txt
rename to ryzom/tools/translation/translated/outpost_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/outpost_words_wk.txt b/ryzom/tools/translation/translated/outpost_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/outpost_words_wk.txt
rename to ryzom/tools/translation/translated/outpost_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_de.txt b/ryzom/tools/translation/translated/place_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_de.txt
rename to ryzom/tools/translation/translated/place_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_en.txt b/ryzom/tools/translation/translated/place_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_en.txt
rename to ryzom/tools/translation/translated/place_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_es.txt b/ryzom/tools/translation/translated/place_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_es.txt
rename to ryzom/tools/translation/translated/place_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_fr.txt b/ryzom/tools/translation/translated/place_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_fr.txt
rename to ryzom/tools/translation/translated/place_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_ru.txt b/ryzom/tools/translation/translated/place_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_ru.txt
rename to ryzom/tools/translation/translated/place_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/place_words_wk.txt b/ryzom/tools/translation/translated/place_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/place_words_wk.txt
rename to ryzom/tools/translation/translated/place_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_de.txt b/ryzom/tools/translation/translated/powertype_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_de.txt
rename to ryzom/tools/translation/translated/powertype_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_en.txt b/ryzom/tools/translation/translated/powertype_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_en.txt
rename to ryzom/tools/translation/translated/powertype_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_es.txt b/ryzom/tools/translation/translated/powertype_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_es.txt
rename to ryzom/tools/translation/translated/powertype_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_fr.txt b/ryzom/tools/translation/translated/powertype_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_fr.txt
rename to ryzom/tools/translation/translated/powertype_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_ru.txt b/ryzom/tools/translation/translated/powertype_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_ru.txt
rename to ryzom/tools/translation/translated/powertype_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/powertype_words_wk.txt b/ryzom/tools/translation/translated/powertype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/powertype_words_wk.txt
rename to ryzom/tools/translation/translated/powertype_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/r2_de.uxt b/ryzom/tools/translation/translated/r2_de.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/r2_de.uxt
rename to ryzom/tools/translation/translated/r2_de.uxt
diff --git a/code/ryzom/tools/translation/translated/r2_en.uxt b/ryzom/tools/translation/translated/r2_en.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/r2_en.uxt
rename to ryzom/tools/translation/translated/r2_en.uxt
diff --git a/code/ryzom/tools/translation/translated/r2_es.uxt b/ryzom/tools/translation/translated/r2_es.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/r2_es.uxt
rename to ryzom/tools/translation/translated/r2_es.uxt
diff --git a/code/ryzom/tools/translation/translated/r2_fr.uxt b/ryzom/tools/translation/translated/r2_fr.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/r2_fr.uxt
rename to ryzom/tools/translation/translated/r2_fr.uxt
diff --git a/code/ryzom/tools/translation/translated/r2_ru.uxt b/ryzom/tools/translation/translated/r2_ru.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/r2_ru.uxt
rename to ryzom/tools/translation/translated/r2_ru.uxt
diff --git a/code/ryzom/tools/translation/translated/race_words_de.txt b/ryzom/tools/translation/translated/race_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_de.txt
rename to ryzom/tools/translation/translated/race_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/race_words_en.txt b/ryzom/tools/translation/translated/race_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_en.txt
rename to ryzom/tools/translation/translated/race_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/race_words_es.txt b/ryzom/tools/translation/translated/race_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_es.txt
rename to ryzom/tools/translation/translated/race_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/race_words_fr.txt b/ryzom/tools/translation/translated/race_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_fr.txt
rename to ryzom/tools/translation/translated/race_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/race_words_ru.txt b/ryzom/tools/translation/translated/race_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_ru.txt
rename to ryzom/tools/translation/translated/race_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/race_words_wk.txt b/ryzom/tools/translation/translated/race_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/race_words_wk.txt
rename to ryzom/tools/translation/translated/race_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/ru.uxt b/ryzom/tools/translation/translated/ru.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/ru.uxt
rename to ryzom/tools/translation/translated/ru.uxt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_de.txt b/ryzom/tools/translation/translated/sbrick_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_de.txt
rename to ryzom/tools/translation/translated/sbrick_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_en.txt b/ryzom/tools/translation/translated/sbrick_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_en.txt
rename to ryzom/tools/translation/translated/sbrick_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_es.txt b/ryzom/tools/translation/translated/sbrick_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_es.txt
rename to ryzom/tools/translation/translated/sbrick_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_fr.txt b/ryzom/tools/translation/translated/sbrick_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_fr.txt
rename to ryzom/tools/translation/translated/sbrick_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_ru.txt b/ryzom/tools/translation/translated/sbrick_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_ru.txt
rename to ryzom/tools/translation/translated/sbrick_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/sbrick_words_wk.txt b/ryzom/tools/translation/translated/sbrick_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sbrick_words_wk.txt
rename to ryzom/tools/translation/translated/sbrick_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_de.txt b/ryzom/tools/translation/translated/score_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_de.txt
rename to ryzom/tools/translation/translated/score_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_en.txt b/ryzom/tools/translation/translated/score_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_en.txt
rename to ryzom/tools/translation/translated/score_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_es.txt b/ryzom/tools/translation/translated/score_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_es.txt
rename to ryzom/tools/translation/translated/score_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_fr.txt b/ryzom/tools/translation/translated/score_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_fr.txt
rename to ryzom/tools/translation/translated/score_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_ru.txt b/ryzom/tools/translation/translated/score_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_ru.txt
rename to ryzom/tools/translation/translated/score_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/score_words_wk.txt b/ryzom/tools/translation/translated/score_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/score_words_wk.txt
rename to ryzom/tools/translation/translated/score_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_de.txt b/ryzom/tools/translation/translated/skill_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_de.txt
rename to ryzom/tools/translation/translated/skill_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_en.txt b/ryzom/tools/translation/translated/skill_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_en.txt
rename to ryzom/tools/translation/translated/skill_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_es.txt b/ryzom/tools/translation/translated/skill_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_es.txt
rename to ryzom/tools/translation/translated/skill_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_fr.txt b/ryzom/tools/translation/translated/skill_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_fr.txt
rename to ryzom/tools/translation/translated/skill_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_ru.txt b/ryzom/tools/translation/translated/skill_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_ru.txt
rename to ryzom/tools/translation/translated/skill_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/skill_words_wk.txt b/ryzom/tools/translation/translated/skill_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/skill_words_wk.txt
rename to ryzom/tools/translation/translated/skill_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_de.txt b/ryzom/tools/translation/translated/sphrase_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_de.txt
rename to ryzom/tools/translation/translated/sphrase_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_en.txt b/ryzom/tools/translation/translated/sphrase_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_en.txt
rename to ryzom/tools/translation/translated/sphrase_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_es.txt b/ryzom/tools/translation/translated/sphrase_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_es.txt
rename to ryzom/tools/translation/translated/sphrase_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_fr.txt b/ryzom/tools/translation/translated/sphrase_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_fr.txt
rename to ryzom/tools/translation/translated/sphrase_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_ru.txt b/ryzom/tools/translation/translated/sphrase_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_ru.txt
rename to ryzom/tools/translation/translated/sphrase_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/sphrase_words_wk.txt b/ryzom/tools/translation/translated/sphrase_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/sphrase_words_wk.txt
rename to ryzom/tools/translation/translated/sphrase_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_de.txt b/ryzom/tools/translation/translated/title_words_de.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_de.txt
rename to ryzom/tools/translation/translated/title_words_de.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_en.txt b/ryzom/tools/translation/translated/title_words_en.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_en.txt
rename to ryzom/tools/translation/translated/title_words_en.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_es.txt b/ryzom/tools/translation/translated/title_words_es.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_es.txt
rename to ryzom/tools/translation/translated/title_words_es.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_fr.txt b/ryzom/tools/translation/translated/title_words_fr.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_fr.txt
rename to ryzom/tools/translation/translated/title_words_fr.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_ru.txt b/ryzom/tools/translation/translated/title_words_ru.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_ru.txt
rename to ryzom/tools/translation/translated/title_words_ru.txt
diff --git a/code/ryzom/tools/translation/translated/title_words_wk.txt b/ryzom/tools/translation/translated/title_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/translated/title_words_wk.txt
rename to ryzom/tools/translation/translated/title_words_wk.txt
diff --git a/code/ryzom/tools/translation/translated/wk.uxt b/ryzom/tools/translation/translated/wk.uxt
similarity index 100%
rename from code/ryzom/tools/translation/translated/wk.uxt
rename to ryzom/tools/translation/translated/wk.uxt
diff --git a/code/ryzom/tools/translation/work/bodypart_words_wk.txt b/ryzom/tools/translation/work/bodypart_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/bodypart_words_wk.txt
rename to ryzom/tools/translation/work/bodypart_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/career_words_wk.txt b/ryzom/tools/translation/work/career_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/career_words_wk.txt
rename to ryzom/tools/translation/work/career_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/characteristic_words_wk.txt b/ryzom/tools/translation/work/characteristic_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/characteristic_words_wk.txt
rename to ryzom/tools/translation/work/characteristic_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/classificationtype_words_wk.txt b/ryzom/tools/translation/work/classificationtype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/classificationtype_words_wk.txt
rename to ryzom/tools/translation/work/classificationtype_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/creature_words_wk.txt b/ryzom/tools/translation/work/creature_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/creature_words_wk.txt
rename to ryzom/tools/translation/work/creature_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/damagetype_words_wk.txt b/ryzom/tools/translation/work/damagetype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/damagetype_words_wk.txt
rename to ryzom/tools/translation/work/damagetype_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/ecosystem_words_wk.txt b/ryzom/tools/translation/work/ecosystem_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/ecosystem_words_wk.txt
rename to ryzom/tools/translation/work/ecosystem_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/faction_words_wk.txt b/ryzom/tools/translation/work/faction_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/faction_words_wk.txt
rename to ryzom/tools/translation/work/faction_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/item_words_wk.txt b/ryzom/tools/translation/work/item_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/item_words_wk.txt
rename to ryzom/tools/translation/work/item_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/job_words_wk.txt b/ryzom/tools/translation/work/job_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/job_words_wk.txt
rename to ryzom/tools/translation/work/job_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/outpost_words_wk.txt b/ryzom/tools/translation/work/outpost_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/outpost_words_wk.txt
rename to ryzom/tools/translation/work/outpost_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/place_words_wk.txt b/ryzom/tools/translation/work/place_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/place_words_wk.txt
rename to ryzom/tools/translation/work/place_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/powertype_words_wk.txt b/ryzom/tools/translation/work/powertype_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/powertype_words_wk.txt
rename to ryzom/tools/translation/work/powertype_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/race_words_wk.txt b/ryzom/tools/translation/work/race_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/race_words_wk.txt
rename to ryzom/tools/translation/work/race_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/sbrick_words_wk.txt b/ryzom/tools/translation/work/sbrick_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/sbrick_words_wk.txt
rename to ryzom/tools/translation/work/sbrick_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/score_words_wk.txt b/ryzom/tools/translation/work/score_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/score_words_wk.txt
rename to ryzom/tools/translation/work/score_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/skill_words_wk.txt b/ryzom/tools/translation/work/skill_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/skill_words_wk.txt
rename to ryzom/tools/translation/work/skill_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/sphrase_words_wk.txt b/ryzom/tools/translation/work/sphrase_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/sphrase_words_wk.txt
rename to ryzom/tools/translation/work/sphrase_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/title_words_wk.txt b/ryzom/tools/translation/work/title_words_wk.txt
similarity index 100%
rename from code/ryzom/tools/translation/work/title_words_wk.txt
rename to ryzom/tools/translation/work/title_words_wk.txt
diff --git a/code/ryzom/tools/translation/work/wk.uxt b/ryzom/tools/translation/work/wk.uxt
similarity index 100%
rename from code/ryzom/tools/translation/work/wk.uxt
rename to ryzom/tools/translation/work/wk.uxt
diff --git a/code/ryzom/tools/translation_tools/CMakeLists.txt b/ryzom/tools/translation_tools/CMakeLists.txt
similarity index 100%
rename from code/ryzom/tools/translation_tools/CMakeLists.txt
rename to ryzom/tools/translation_tools/CMakeLists.txt
diff --git a/code/ryzom/tools/translation_tools/blue_pill.ico b/ryzom/tools/translation_tools/blue_pill.ico
similarity index 100%
rename from code/ryzom/tools/translation_tools/blue_pill.ico
rename to ryzom/tools/translation_tools/blue_pill.ico
diff --git a/code/ryzom/tools/translation_tools/extract_bot_names.cpp b/ryzom/tools/translation_tools/extract_bot_names.cpp
similarity index 100%
rename from code/ryzom/tools/translation_tools/extract_bot_names.cpp
rename to ryzom/tools/translation_tools/extract_bot_names.cpp
diff --git a/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp b/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
similarity index 100%
rename from code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
rename to ryzom/tools/translation_tools/extract_new_sheet_names.cpp
diff --git a/code/ryzom/tools/translation_tools/main.cpp b/ryzom/tools/translation_tools/main.cpp
similarity index 100%
rename from code/ryzom/tools/translation_tools/main.cpp
rename to ryzom/tools/translation_tools/main.cpp
diff --git a/code/ryzom/tools/translation_tools/main.rc b/ryzom/tools/translation_tools/main.rc
similarity index 100%
rename from code/ryzom/tools/translation_tools/main.rc
rename to ryzom/tools/translation_tools/main.rc
diff --git a/code/ryzom/tools/translation_tools/translation_tools.cfg b/ryzom/tools/translation_tools/translation_tools.cfg
similarity index 100%
rename from code/ryzom/tools/translation_tools/translation_tools.cfg
rename to ryzom/tools/translation_tools/translation_tools.cfg
diff --git a/code/ryzom/tools/xml_packer/xml_packer.cpp b/ryzom/tools/xml_packer/xml_packer.cpp
similarity index 100%
rename from code/ryzom/tools/xml_packer/xml_packer.cpp
rename to ryzom/tools/xml_packer/xml_packer.cpp
diff --git a/code/snowballs2/AUTHORS b/snowballs2/AUTHORS
similarity index 100%
rename from code/snowballs2/AUTHORS
rename to snowballs2/AUTHORS
diff --git a/code/snowballs2/CMakeLists.txt b/snowballs2/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/CMakeLists.txt
rename to snowballs2/CMakeLists.txt
diff --git a/code/snowballs2/CMakePackaging.txt b/snowballs2/CMakePackaging.txt
similarity index 100%
rename from code/snowballs2/CMakePackaging.txt
rename to snowballs2/CMakePackaging.txt
diff --git a/code/snowballs2/COPYING b/snowballs2/COPYING
similarity index 100%
rename from code/snowballs2/COPYING
rename to snowballs2/COPYING
diff --git a/code/snowballs2/ChangeLog b/snowballs2/ChangeLog
similarity index 100%
rename from code/snowballs2/ChangeLog
rename to snowballs2/ChangeLog
diff --git a/code/snowballs2/INSTALL b/snowballs2/INSTALL
similarity index 100%
rename from code/snowballs2/INSTALL
rename to snowballs2/INSTALL
diff --git a/code/snowballs2/NEWS b/snowballs2/NEWS
similarity index 100%
rename from code/snowballs2/NEWS
rename to snowballs2/NEWS
diff --git a/code/snowballs2/README b/snowballs2/README
similarity index 100%
rename from code/snowballs2/README
rename to snowballs2/README
diff --git a/code/snowballs2/THANKS b/snowballs2/THANKS
similarity index 100%
rename from code/snowballs2/THANKS
rename to snowballs2/THANKS
diff --git a/code/snowballs2/bin/chat_service.cfg b/snowballs2/bin/chat_service.cfg
similarity index 100%
rename from code/snowballs2/bin/chat_service.cfg
rename to snowballs2/bin/chat_service.cfg
diff --git a/code/snowballs2/bin/collision_service.cfg b/snowballs2/bin/collision_service.cfg
similarity index 100%
rename from code/snowballs2/bin/collision_service.cfg
rename to snowballs2/bin/collision_service.cfg
diff --git a/code/snowballs2/bin/common.cfg b/snowballs2/bin/common.cfg
similarity index 100%
rename from code/snowballs2/bin/common.cfg
rename to snowballs2/bin/common.cfg
diff --git a/code/snowballs2/bin/copy_nel_d.bat b/snowballs2/bin/copy_nel_d.bat
similarity index 100%
rename from code/snowballs2/bin/copy_nel_d.bat
rename to snowballs2/bin/copy_nel_d.bat
diff --git a/code/snowballs2/bin/copy_nel_r.bat b/snowballs2/bin/copy_nel_r.bat
similarity index 100%
rename from code/snowballs2/bin/copy_nel_r.bat
rename to snowballs2/bin/copy_nel_r.bat
diff --git a/code/snowballs2/bin/empty_service.cfg b/snowballs2/bin/empty_service.cfg
similarity index 100%
rename from code/snowballs2/bin/empty_service.cfg
rename to snowballs2/bin/empty_service.cfg
diff --git a/code/snowballs2/bin/frontend_service.cfg b/snowballs2/bin/frontend_service.cfg
similarity index 100%
rename from code/snowballs2/bin/frontend_service.cfg
rename to snowballs2/bin/frontend_service.cfg
diff --git a/code/snowballs2/bin/init_r_00_naming_service.bat b/snowballs2/bin/init_r_00_naming_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_00_naming_service.bat
rename to snowballs2/bin/init_r_00_naming_service.bat
diff --git a/code/snowballs2/bin/init_r_01_login_service.bat b/snowballs2/bin/init_r_01_login_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_01_login_service.bat
rename to snowballs2/bin/init_r_01_login_service.bat
diff --git a/code/snowballs2/bin/init_r_10_welcome_service.bat b/snowballs2/bin/init_r_10_welcome_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_10_welcome_service.bat
rename to snowballs2/bin/init_r_10_welcome_service.bat
diff --git a/code/snowballs2/bin/init_r_11_position_service.bat b/snowballs2/bin/init_r_11_position_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_11_position_service.bat
rename to snowballs2/bin/init_r_11_position_service.bat
diff --git a/code/snowballs2/bin/init_r_12_chat_service.bat b/snowballs2/bin/init_r_12_chat_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_12_chat_service.bat
rename to snowballs2/bin/init_r_12_chat_service.bat
diff --git a/code/snowballs2/bin/init_r_13_collision_service.bat b/snowballs2/bin/init_r_13_collision_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_13_collision_service.bat
rename to snowballs2/bin/init_r_13_collision_service.bat
diff --git a/code/snowballs2/bin/init_r_20_frontend_service.bat b/snowballs2/bin/init_r_20_frontend_service.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_20_frontend_service.bat
rename to snowballs2/bin/init_r_20_frontend_service.bat
diff --git a/code/snowballs2/bin/init_r_90_snowballs_client.bat b/snowballs2/bin/init_r_90_snowballs_client.bat
similarity index 100%
rename from code/snowballs2/bin/init_r_90_snowballs_client.bat
rename to snowballs2/bin/init_r_90_snowballs_client.bat
diff --git a/code/snowballs2/bin/position_service.cfg b/snowballs2/bin/position_service.cfg
similarity index 100%
rename from code/snowballs2/bin/position_service.cfg
rename to snowballs2/bin/position_service.cfg
diff --git a/code/snowballs2/bin/pp_oculus_vr.cg b/snowballs2/bin/pp_oculus_vr.cg
similarity index 100%
rename from code/snowballs2/bin/pp_oculus_vr.cg
rename to snowballs2/bin/pp_oculus_vr.cg
diff --git a/code/snowballs2/bin/pp_stereo_debug.cg b/snowballs2/bin/pp_stereo_debug.cg
similarity index 100%
rename from code/snowballs2/bin/pp_stereo_debug.cg
rename to snowballs2/bin/pp_stereo_debug.cg
diff --git a/code/snowballs2/bin/pp_test.cg b/snowballs2/bin/pp_test.cg
similarity index 100%
rename from code/snowballs2/bin/pp_test.cg
rename to snowballs2/bin/pp_test.cg
diff --git a/code/snowballs2/bin/snowballs_client.cfg b/snowballs2/bin/snowballs_client.cfg
similarity index 100%
rename from code/snowballs2/bin/snowballs_client.cfg
rename to snowballs2/bin/snowballs_client.cfg
diff --git a/code/snowballs2/bin/snowballs_client_default.cfg b/snowballs2/bin/snowballs_client_default.cfg
similarity index 100%
rename from code/snowballs2/bin/snowballs_client_default.cfg
rename to snowballs2/bin/snowballs_client_default.cfg
diff --git a/code/snowballs2/client/CMakeLists.txt b/snowballs2/client/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/client/CMakeLists.txt
rename to snowballs2/client/CMakeLists.txt
diff --git a/code/snowballs2/client/client.cfg.in b/snowballs2/client/client.cfg.in
similarity index 100%
rename from code/snowballs2/client/client.cfg.in
rename to snowballs2/client/client.cfg.in
diff --git a/code/snowballs2/client/src/CMakeLists.txt b/snowballs2/client/src/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/client/src/CMakeLists.txt
rename to snowballs2/client/src/CMakeLists.txt
diff --git a/code/snowballs2/client/src/animation.cpp b/snowballs2/client/src/animation.cpp
similarity index 100%
rename from code/snowballs2/client/src/animation.cpp
rename to snowballs2/client/src/animation.cpp
diff --git a/code/snowballs2/client/src/animation.h b/snowballs2/client/src/animation.h
similarity index 100%
rename from code/snowballs2/client/src/animation.h
rename to snowballs2/client/src/animation.h
diff --git a/code/snowballs2/client/src/camera.cpp b/snowballs2/client/src/camera.cpp
similarity index 100%
rename from code/snowballs2/client/src/camera.cpp
rename to snowballs2/client/src/camera.cpp
diff --git a/code/snowballs2/client/src/camera.h b/snowballs2/client/src/camera.h
similarity index 100%
rename from code/snowballs2/client/src/camera.h
rename to snowballs2/client/src/camera.h
diff --git a/code/snowballs2/client/src/commands.cpp b/snowballs2/client/src/commands.cpp
similarity index 100%
rename from code/snowballs2/client/src/commands.cpp
rename to snowballs2/client/src/commands.cpp
diff --git a/code/snowballs2/client/src/commands.h b/snowballs2/client/src/commands.h
similarity index 100%
rename from code/snowballs2/client/src/commands.h
rename to snowballs2/client/src/commands.h
diff --git a/code/snowballs2/client/src/compass.cpp b/snowballs2/client/src/compass.cpp
similarity index 100%
rename from code/snowballs2/client/src/compass.cpp
rename to snowballs2/client/src/compass.cpp
diff --git a/code/snowballs2/client/src/compass.h b/snowballs2/client/src/compass.h
similarity index 100%
rename from code/snowballs2/client/src/compass.h
rename to snowballs2/client/src/compass.h
diff --git a/code/snowballs2/client/src/configuration.cpp b/snowballs2/client/src/configuration.cpp
similarity index 100%
rename from code/snowballs2/client/src/configuration.cpp
rename to snowballs2/client/src/configuration.cpp
diff --git a/code/snowballs2/client/src/configuration.h b/snowballs2/client/src/configuration.h
similarity index 100%
rename from code/snowballs2/client/src/configuration.h
rename to snowballs2/client/src/configuration.h
diff --git a/code/snowballs2/client/src/entities.cpp b/snowballs2/client/src/entities.cpp
similarity index 100%
rename from code/snowballs2/client/src/entities.cpp
rename to snowballs2/client/src/entities.cpp
diff --git a/code/snowballs2/client/src/entities.h b/snowballs2/client/src/entities.h
similarity index 100%
rename from code/snowballs2/client/src/entities.h
rename to snowballs2/client/src/entities.h
diff --git a/code/snowballs2/client/src/game_time.cpp b/snowballs2/client/src/game_time.cpp
similarity index 100%
rename from code/snowballs2/client/src/game_time.cpp
rename to snowballs2/client/src/game_time.cpp
diff --git a/code/snowballs2/client/src/game_time.h b/snowballs2/client/src/game_time.h
similarity index 100%
rename from code/snowballs2/client/src/game_time.h
rename to snowballs2/client/src/game_time.h
diff --git a/code/snowballs2/client/src/graph.cpp b/snowballs2/client/src/graph.cpp
similarity index 100%
rename from code/snowballs2/client/src/graph.cpp
rename to snowballs2/client/src/graph.cpp
diff --git a/code/snowballs2/client/src/graph.h b/snowballs2/client/src/graph.h
similarity index 100%
rename from code/snowballs2/client/src/graph.h
rename to snowballs2/client/src/graph.h
diff --git a/code/snowballs2/client/src/interface.cpp b/snowballs2/client/src/interface.cpp
similarity index 100%
rename from code/snowballs2/client/src/interface.cpp
rename to snowballs2/client/src/interface.cpp
diff --git a/code/snowballs2/client/src/interface.h b/snowballs2/client/src/interface.h
similarity index 100%
rename from code/snowballs2/client/src/interface.h
rename to snowballs2/client/src/interface.h
diff --git a/code/snowballs2/client/src/internationalization.cpp b/snowballs2/client/src/internationalization.cpp
similarity index 100%
rename from code/snowballs2/client/src/internationalization.cpp
rename to snowballs2/client/src/internationalization.cpp
diff --git a/code/snowballs2/client/src/internationalization.h b/snowballs2/client/src/internationalization.h
similarity index 100%
rename from code/snowballs2/client/src/internationalization.h
rename to snowballs2/client/src/internationalization.h
diff --git a/code/snowballs2/client/src/landscape.cpp b/snowballs2/client/src/landscape.cpp
similarity index 100%
rename from code/snowballs2/client/src/landscape.cpp
rename to snowballs2/client/src/landscape.cpp
diff --git a/code/snowballs2/client/src/landscape.h b/snowballs2/client/src/landscape.h
similarity index 100%
rename from code/snowballs2/client/src/landscape.h
rename to snowballs2/client/src/landscape.h
diff --git a/code/snowballs2/client/src/lens_flare.cpp b/snowballs2/client/src/lens_flare.cpp
similarity index 100%
rename from code/snowballs2/client/src/lens_flare.cpp
rename to snowballs2/client/src/lens_flare.cpp
diff --git a/code/snowballs2/client/src/lens_flare.h b/snowballs2/client/src/lens_flare.h
similarity index 100%
rename from code/snowballs2/client/src/lens_flare.h
rename to snowballs2/client/src/lens_flare.h
diff --git a/code/snowballs2/client/src/mouse_listener.cpp b/snowballs2/client/src/mouse_listener.cpp
similarity index 100%
rename from code/snowballs2/client/src/mouse_listener.cpp
rename to snowballs2/client/src/mouse_listener.cpp
diff --git a/code/snowballs2/client/src/mouse_listener.h b/snowballs2/client/src/mouse_listener.h
similarity index 100%
rename from code/snowballs2/client/src/mouse_listener.h
rename to snowballs2/client/src/mouse_listener.h
diff --git a/code/snowballs2/client/src/network.cpp b/snowballs2/client/src/network.cpp
similarity index 100%
rename from code/snowballs2/client/src/network.cpp
rename to snowballs2/client/src/network.cpp
diff --git a/code/snowballs2/client/src/network.h b/snowballs2/client/src/network.h
similarity index 100%
rename from code/snowballs2/client/src/network.h
rename to snowballs2/client/src/network.h
diff --git a/code/snowballs2/client/src/pacs.cpp b/snowballs2/client/src/pacs.cpp
similarity index 100%
rename from code/snowballs2/client/src/pacs.cpp
rename to snowballs2/client/src/pacs.cpp
diff --git a/code/snowballs2/client/src/pacs.h b/snowballs2/client/src/pacs.h
similarity index 100%
rename from code/snowballs2/client/src/pacs.h
rename to snowballs2/client/src/pacs.h
diff --git a/code/snowballs2/client/src/physics.cpp b/snowballs2/client/src/physics.cpp
similarity index 100%
rename from code/snowballs2/client/src/physics.cpp
rename to snowballs2/client/src/physics.cpp
diff --git a/code/snowballs2/client/src/physics.h b/snowballs2/client/src/physics.h
similarity index 100%
rename from code/snowballs2/client/src/physics.h
rename to snowballs2/client/src/physics.h
diff --git a/code/snowballs2/client/src/radar.cpp b/snowballs2/client/src/radar.cpp
similarity index 100%
rename from code/snowballs2/client/src/radar.cpp
rename to snowballs2/client/src/radar.cpp
diff --git a/code/snowballs2/client/src/radar.h b/snowballs2/client/src/radar.h
similarity index 100%
rename from code/snowballs2/client/src/radar.h
rename to snowballs2/client/src/radar.h
diff --git a/code/snowballs2/client/src/snowballs_client.cpp b/snowballs2/client/src/snowballs_client.cpp
similarity index 100%
rename from code/snowballs2/client/src/snowballs_client.cpp
rename to snowballs2/client/src/snowballs_client.cpp
diff --git a/code/snowballs2/client/src/snowballs_client.h b/snowballs2/client/src/snowballs_client.h
similarity index 100%
rename from code/snowballs2/client/src/snowballs_client.h
rename to snowballs2/client/src/snowballs_client.h
diff --git a/code/snowballs2/client/src/snowballs_config.h b/snowballs2/client/src/snowballs_config.h
similarity index 100%
rename from code/snowballs2/client/src/snowballs_config.h
rename to snowballs2/client/src/snowballs_config.h
diff --git a/code/snowballs2/client/src/sound.cpp b/snowballs2/client/src/sound.cpp
similarity index 100%
rename from code/snowballs2/client/src/sound.cpp
rename to snowballs2/client/src/sound.cpp
diff --git a/code/snowballs2/client/src/sound.h b/snowballs2/client/src/sound.h
similarity index 100%
rename from code/snowballs2/client/src/sound.h
rename to snowballs2/client/src/sound.h
diff --git a/code/snowballs2/resources/custom.ini b/snowballs2/resources/custom.ini
similarity index 100%
rename from code/snowballs2/resources/custom.ini
rename to snowballs2/resources/custom.ini
diff --git a/code/snowballs2/resources/nel.bmp b/snowballs2/resources/nel.bmp
similarity index 100%
rename from code/snowballs2/resources/nel.bmp
rename to snowballs2/resources/nel.bmp
diff --git a/code/snowballs2/resources/nel.png b/snowballs2/resources/nel.png
similarity index 100%
rename from code/snowballs2/resources/nel.png
rename to snowballs2/resources/nel.png
diff --git a/code/snowballs2/resources/nevraxpill.ico b/snowballs2/resources/nevraxpill.ico
similarity index 100%
rename from code/snowballs2/resources/nevraxpill.ico
rename to snowballs2/resources/nevraxpill.ico
diff --git a/code/snowballs2/server/CMakeLists.txt b/snowballs2/server/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/CMakeLists.txt
rename to snowballs2/server/CMakeLists.txt
diff --git a/code/snowballs2/server/chat/CMakeLists.txt b/snowballs2/server/chat/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/chat/CMakeLists.txt
rename to snowballs2/server/chat/CMakeLists.txt
diff --git a/code/snowballs2/server/chat/chat_service.cfg b/snowballs2/server/chat/chat_service.cfg
similarity index 100%
rename from code/snowballs2/server/chat/chat_service.cfg
rename to snowballs2/server/chat/chat_service.cfg
diff --git a/code/snowballs2/server/chat/src/CMakeLists.txt b/snowballs2/server/chat/src/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/chat/src/CMakeLists.txt
rename to snowballs2/server/chat/src/CMakeLists.txt
diff --git a/code/snowballs2/server/chat/src/main.cpp b/snowballs2/server/chat/src/main.cpp
similarity index 100%
rename from code/snowballs2/server/chat/src/main.cpp
rename to snowballs2/server/chat/src/main.cpp
diff --git a/code/snowballs2/server/collision/CMakeLists.txt b/snowballs2/server/collision/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/collision/CMakeLists.txt
rename to snowballs2/server/collision/CMakeLists.txt
diff --git a/code/snowballs2/server/collision/collision_service.cfg b/snowballs2/server/collision/collision_service.cfg
similarity index 100%
rename from code/snowballs2/server/collision/collision_service.cfg
rename to snowballs2/server/collision/collision_service.cfg
diff --git a/code/snowballs2/server/collision/src/CMakeLists.txt b/snowballs2/server/collision/src/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/collision/src/CMakeLists.txt
rename to snowballs2/server/collision/src/CMakeLists.txt
diff --git a/code/snowballs2/server/collision/src/collision_service.cpp b/snowballs2/server/collision/src/collision_service.cpp
similarity index 100%
rename from code/snowballs2/server/collision/src/collision_service.cpp
rename to snowballs2/server/collision/src/collision_service.cpp
diff --git a/code/snowballs2/server/collision/src/collision_service.h b/snowballs2/server/collision/src/collision_service.h
similarity index 100%
rename from code/snowballs2/server/collision/src/collision_service.h
rename to snowballs2/server/collision/src/collision_service.h
diff --git a/code/snowballs2/server/common.cfg b/snowballs2/server/common.cfg
similarity index 100%
rename from code/snowballs2/server/common.cfg
rename to snowballs2/server/common.cfg
diff --git a/code/snowballs2/server/empty/empty_service.cfg b/snowballs2/server/empty/empty_service.cfg
similarity index 100%
rename from code/snowballs2/server/empty/empty_service.cfg
rename to snowballs2/server/empty/empty_service.cfg
diff --git a/code/snowballs2/server/empty/src/empty_service.cpp b/snowballs2/server/empty/src/empty_service.cpp
similarity index 100%
rename from code/snowballs2/server/empty/src/empty_service.cpp
rename to snowballs2/server/empty/src/empty_service.cpp
diff --git a/code/snowballs2/server/empty/src/empty_service.h b/snowballs2/server/empty/src/empty_service.h
similarity index 100%
rename from code/snowballs2/server/empty/src/empty_service.h
rename to snowballs2/server/empty/src/empty_service.h
diff --git a/code/snowballs2/server/frontend/CMakeLists.txt b/snowballs2/server/frontend/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/frontend/CMakeLists.txt
rename to snowballs2/server/frontend/CMakeLists.txt
diff --git a/code/snowballs2/server/frontend/frontend_service.cfg b/snowballs2/server/frontend/frontend_service.cfg
similarity index 100%
rename from code/snowballs2/server/frontend/frontend_service.cfg
rename to snowballs2/server/frontend/frontend_service.cfg
diff --git a/code/snowballs2/server/frontend/src/CMakeLists.txt b/snowballs2/server/frontend/src/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/frontend/src/CMakeLists.txt
rename to snowballs2/server/frontend/src/CMakeLists.txt
diff --git a/code/snowballs2/server/frontend/src/main.cpp b/snowballs2/server/frontend/src/main.cpp
similarity index 100%
rename from code/snowballs2/server/frontend/src/main.cpp
rename to snowballs2/server/frontend/src/main.cpp
diff --git a/code/snowballs2/server/position/CMakeLists.txt b/snowballs2/server/position/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/position/CMakeLists.txt
rename to snowballs2/server/position/CMakeLists.txt
diff --git a/code/snowballs2/server/position/position_service.cfg b/snowballs2/server/position/position_service.cfg
similarity index 100%
rename from code/snowballs2/server/position/position_service.cfg
rename to snowballs2/server/position/position_service.cfg
diff --git a/code/snowballs2/server/position/src/CMakeLists.txt b/snowballs2/server/position/src/CMakeLists.txt
similarity index 100%
rename from code/snowballs2/server/position/src/CMakeLists.txt
rename to snowballs2/server/position/src/CMakeLists.txt
diff --git a/code/snowballs2/server/position/src/main.cpp b/snowballs2/server/position/src/main.cpp
similarity index 100%
rename from code/snowballs2/server/position/src/main.cpp
rename to snowballs2/server/position/src/main.cpp
diff --git a/code/snowballs2/server/position/src/physics.cpp b/snowballs2/server/position/src/physics.cpp
similarity index 100%
rename from code/snowballs2/server/position/src/physics.cpp
rename to snowballs2/server/position/src/physics.cpp
diff --git a/code/snowballs2/server/position/src/physics.h b/snowballs2/server/position/src/physics.h
similarity index 100%
rename from code/snowballs2/server/position/src/physics.h
rename to snowballs2/server/position/src/physics.h
diff --git a/code/studio/CMakeLists.txt b/studio/CMakeLists.txt
similarity index 100%
rename from code/studio/CMakeLists.txt
rename to studio/CMakeLists.txt
diff --git a/code/studio/data/andbasr.ttf b/studio/data/andbasr.ttf
similarity index 100%
rename from code/studio/data/andbasr.ttf
rename to studio/data/andbasr.ttf
diff --git a/code/studio/doc/html/cdirection_widget.png b/studio/doc/html/cdirection_widget.png
similarity index 100%
rename from code/studio/doc/html/cdirection_widget.png
rename to studio/doc/html/cdirection_widget.png
diff --git a/code/studio/doc/html/cedit_color_widget.png b/studio/doc/html/cedit_color_widget.png
similarity index 100%
rename from code/studio/doc/html/cedit_color_widget.png
rename to studio/doc/html/cedit_color_widget.png
diff --git a/code/studio/doc/html/cedit_range_float_widget.png b/studio/doc/html/cedit_range_float_widget.png
similarity index 100%
rename from code/studio/doc/html/cedit_range_float_widget.png
rename to studio/doc/html/cedit_range_float_widget.png
diff --git a/code/studio/doc/html/cedit_range_int_widget.png b/studio/doc/html/cedit_range_int_widget.png
similarity index 100%
rename from code/studio/doc/html/cedit_range_int_widget.png
rename to studio/doc/html/cedit_range_int_widget.png
diff --git a/code/studio/doc/html/gui_struct.png b/studio/doc/html/gui_struct.png
similarity index 100%
rename from code/studio/doc/html/gui_struct.png
rename to studio/doc/html/gui_struct.png
diff --git a/code/studio/doc/html/object_viewer_qt_window.png b/studio/doc/html/object_viewer_qt_window.png
similarity index 100%
rename from code/studio/doc/html/object_viewer_qt_window.png
rename to studio/doc/html/object_viewer_qt_window.png
diff --git a/code/studio/doc/make_ovqt_dox.bat b/studio/doc/make_ovqt_dox.bat
similarity index 100%
rename from code/studio/doc/make_ovqt_dox.bat
rename to studio/doc/make_ovqt_dox.bat
diff --git a/code/studio/doc/make_ovqt_dox.sh b/studio/doc/make_ovqt_dox.sh
similarity index 100%
rename from code/studio/doc/make_ovqt_dox.sh
rename to studio/doc/make_ovqt_dox.sh
diff --git a/code/studio/doc/ovqt.dox b/studio/doc/ovqt.dox
similarity index 100%
rename from code/studio/doc/ovqt.dox
rename to studio/doc/ovqt.dox
diff --git a/code/studio/ovqt_config.h.cmake b/studio/ovqt_config.h.cmake
similarity index 100%
rename from code/studio/ovqt_config.h.cmake
rename to studio/ovqt_config.h.cmake
diff --git a/code/studio/src/3rdparty/CMakeLists.txt b/studio/src/3rdparty/CMakeLists.txt
similarity index 100%
rename from code/studio/src/3rdparty/CMakeLists.txt
rename to studio/src/3rdparty/CMakeLists.txt
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt b/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
rename to studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt b/studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
rename to studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3 b/studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
rename to studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL b/studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
rename to studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase b/studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
rename to studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser b/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
rename to studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtBrowserItem b/studio/src/3rdparty/qtpropertybrowser/QtBrowserItem
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtBrowserItem
rename to studio/src/3rdparty/qtpropertybrowser/QtBrowserItem
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser b/studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
rename to studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory b/studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory b/studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory b/studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory b/studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser b/studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
rename to studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory b/studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtProperty b/studio/src/3rdparty/qtpropertybrowser/QtProperty
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtProperty
rename to studio/src/3rdparty/qtpropertybrowser/QtProperty
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory b/studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtSliderFactory b/studio/src/3rdparty/qtpropertybrowser/QtSliderFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtSliderFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtSliderFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory b/studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory b/studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser b/studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
rename to studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory b/studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
rename to studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtVariantProperty b/studio/src/3rdparty/qtpropertybrowser/QtVariantProperty
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtVariantProperty
rename to studio/src/3rdparty/qtpropertybrowser/QtVariantProperty
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager b/studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
rename to studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/README.TXT b/studio/src/3rdparty/qtpropertybrowser/README.TXT
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/README.TXT
rename to studio/src/3rdparty/qtpropertybrowser/README.TXT
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png b/studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
rename to studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png b/studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png
rename to studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h b/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
rename to studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp b/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h b/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h
rename to studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h b/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
rename to studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h b/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp b/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h b/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
rename to studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp b/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h b/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
rename to studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp b/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
rename to studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h b/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
similarity index 100%
rename from code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
rename to studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
diff --git a/code/studio/src/CMakeLists.txt b/studio/src/CMakeLists.txt
similarity index 100%
rename from code/studio/src/CMakeLists.txt
rename to studio/src/CMakeLists.txt
diff --git a/code/studio/src/description.h b/studio/src/description.h
similarity index 100%
rename from code/studio/src/description.h
rename to studio/src/description.h
diff --git a/code/studio/src/extension_system/iplugin.h b/studio/src/extension_system/iplugin.h
similarity index 100%
rename from code/studio/src/extension_system/iplugin.h
rename to studio/src/extension_system/iplugin.h
diff --git a/code/studio/src/extension_system/iplugin_manager.h b/studio/src/extension_system/iplugin_manager.h
similarity index 100%
rename from code/studio/src/extension_system/iplugin_manager.h
rename to studio/src/extension_system/iplugin_manager.h
diff --git a/code/studio/src/extension_system/iplugin_spec.h b/studio/src/extension_system/iplugin_spec.h
similarity index 100%
rename from code/studio/src/extension_system/iplugin_spec.h
rename to studio/src/extension_system/iplugin_spec.h
diff --git a/code/studio/src/extension_system/plugin_manager.cpp b/studio/src/extension_system/plugin_manager.cpp
similarity index 100%
rename from code/studio/src/extension_system/plugin_manager.cpp
rename to studio/src/extension_system/plugin_manager.cpp
diff --git a/code/studio/src/extension_system/plugin_manager.h b/studio/src/extension_system/plugin_manager.h
similarity index 100%
rename from code/studio/src/extension_system/plugin_manager.h
rename to studio/src/extension_system/plugin_manager.h
diff --git a/code/studio/src/extension_system/plugin_spec.cpp b/studio/src/extension_system/plugin_spec.cpp
similarity index 100%
rename from code/studio/src/extension_system/plugin_spec.cpp
rename to studio/src/extension_system/plugin_spec.cpp
diff --git a/code/studio/src/extension_system/plugin_spec.h b/studio/src/extension_system/plugin_spec.h
similarity index 100%
rename from code/studio/src/extension_system/plugin_spec.h
rename to studio/src/extension_system/plugin_spec.h
diff --git a/code/studio/src/images/studio_splash.png b/studio/src/images/studio_splash.png
similarity index 100%
rename from code/studio/src/images/studio_splash.png
rename to studio/src/images/studio_splash.png
diff --git a/code/studio/src/main.cpp b/studio/src/main.cpp
similarity index 100%
rename from code/studio/src/main.cpp
rename to studio/src/main.cpp
diff --git a/code/studio/src/plugins/CMakeLists.txt b/studio/src/plugins/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/CMakeLists.txt
rename to studio/src/plugins/CMakeLists.txt
diff --git a/code/studio/src/plugins/bnp_manager/CMakeLists.txt b/studio/src/plugins/bnp_manager/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/CMakeLists.txt
rename to studio/src/plugins/bnp_manager/CMakeLists.txt
diff --git a/code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp b/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
rename to studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h b/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h
rename to studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_dirtree_form.ui b/studio/src/plugins/bnp_manager/bnp_dirtree_form.ui
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_dirtree_form.ui
rename to studio/src/plugins/bnp_manager/bnp_dirtree_form.ui
diff --git a/code/studio/src/plugins/bnp_manager/bnp_file.cpp b/studio/src/plugins/bnp_manager/bnp_file.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_file.cpp
rename to studio/src/plugins/bnp_manager/bnp_file.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_file.h b/studio/src/plugins/bnp_manager/bnp_file.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_file.h
rename to studio/src/plugins/bnp_manager/bnp_file.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp b/studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
rename to studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.h b/studio/src/plugins/bnp_manager/bnp_filelist_dialog.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.h
rename to studio/src/plugins/bnp_manager/bnp_filelist_dialog.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui b/studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui
rename to studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui
diff --git a/code/studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp b/studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp
rename to studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_filesystem_model.h b/studio/src/plugins/bnp_manager/bnp_filesystem_model.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_filesystem_model.h
rename to studio/src/plugins/bnp_manager/bnp_filesystem_model.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager.qrc b/studio/src/plugins/bnp_manager/bnp_manager.qrc
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager.qrc
rename to studio/src/plugins/bnp_manager/bnp_manager.qrc
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_constants.h b/studio/src/plugins/bnp_manager/bnp_manager_constants.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_constants.h
rename to studio/src/plugins/bnp_manager/bnp_manager_constants.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp b/studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp
rename to studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_plugin.h b/studio/src/plugins/bnp_manager/bnp_manager_plugin.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_plugin.h
rename to studio/src/plugins/bnp_manager/bnp_manager_plugin.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_window.cpp b/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
rename to studio/src/plugins/bnp_manager/bnp_manager_window.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_window.h b/studio/src/plugins/bnp_manager/bnp_manager_window.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_window.h
rename to studio/src/plugins/bnp_manager/bnp_manager_window.h
diff --git a/code/studio/src/plugins/bnp_manager/bnp_manager_window.ui b/studio/src/plugins/bnp_manager/bnp_manager_window.ui
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_manager_window.ui
rename to studio/src/plugins/bnp_manager/bnp_manager_window.ui
diff --git a/code/studio/src/plugins/bnp_manager/bnp_proxy_model.cpp b/studio/src/plugins/bnp_manager/bnp_proxy_model.cpp
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_proxy_model.cpp
rename to studio/src/plugins/bnp_manager/bnp_proxy_model.cpp
diff --git a/code/studio/src/plugins/bnp_manager/bnp_proxy_model.h b/studio/src/plugins/bnp_manager/bnp_proxy_model.h
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/bnp_proxy_model.h
rename to studio/src/plugins/bnp_manager/bnp_proxy_model.h
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_add_item.png b/studio/src/plugins/bnp_manager/images/ic_nel_add_item.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_add_item.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_add_item.png
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png b/studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png b/studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_export.png b/studio/src/plugins/bnp_manager/images/ic_nel_export.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_export.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_export.png
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_new.png b/studio/src/plugins/bnp_manager/images/ic_nel_new.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_new.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_new.png
diff --git a/code/studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png b/studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png
rename to studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png
diff --git a/code/studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml b/studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml
rename to studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml
diff --git a/code/studio/src/plugins/core/CMakeLists.txt b/studio/src/plugins/core/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/core/CMakeLists.txt
rename to studio/src/plugins/core/CMakeLists.txt
diff --git a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp b/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
rename to studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
diff --git a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h b/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
similarity index 100%
rename from code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
rename to studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
diff --git a/code/studio/src/plugins/core/context_manager.cpp b/studio/src/plugins/core/context_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/core/context_manager.cpp
rename to studio/src/plugins/core/context_manager.cpp
diff --git a/code/studio/src/plugins/core/context_manager.h b/studio/src/plugins/core/context_manager.h
similarity index 100%
rename from code/studio/src/plugins/core/context_manager.h
rename to studio/src/plugins/core/context_manager.h
diff --git a/code/studio/src/plugins/core/core.cpp b/studio/src/plugins/core/core.cpp
similarity index 100%
rename from code/studio/src/plugins/core/core.cpp
rename to studio/src/plugins/core/core.cpp
diff --git a/code/studio/src/plugins/core/core.h b/studio/src/plugins/core/core.h
similarity index 100%
rename from code/studio/src/plugins/core/core.h
rename to studio/src/plugins/core/core.h
diff --git a/code/studio/src/plugins/core/core.qrc b/studio/src/plugins/core/core.qrc
similarity index 100%
rename from code/studio/src/plugins/core/core.qrc
rename to studio/src/plugins/core/core.qrc
diff --git a/code/studio/src/plugins/core/core_config.h.cmake b/studio/src/plugins/core/core_config.h.cmake
similarity index 100%
rename from code/studio/src/plugins/core/core_config.h.cmake
rename to studio/src/plugins/core/core_config.h.cmake
diff --git a/code/studio/src/plugins/core/core_constants.h b/studio/src/plugins/core/core_constants.h
similarity index 100%
rename from code/studio/src/plugins/core/core_constants.h
rename to studio/src/plugins/core/core_constants.h
diff --git a/code/studio/src/plugins/core/core_global.h b/studio/src/plugins/core/core_global.h
similarity index 100%
rename from code/studio/src/plugins/core/core_global.h
rename to studio/src/plugins/core/core_global.h
diff --git a/code/studio/src/plugins/core/core_plugin.cpp b/studio/src/plugins/core/core_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/core/core_plugin.cpp
rename to studio/src/plugins/core/core_plugin.cpp
diff --git a/code/studio/src/plugins/core/core_plugin.h b/studio/src/plugins/core/core_plugin.h
similarity index 100%
rename from code/studio/src/plugins/core/core_plugin.h
rename to studio/src/plugins/core/core_plugin.h
diff --git a/code/studio/src/plugins/core/general_settings_page.cpp b/studio/src/plugins/core/general_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/core/general_settings_page.cpp
rename to studio/src/plugins/core/general_settings_page.cpp
diff --git a/code/studio/src/plugins/core/general_settings_page.h b/studio/src/plugins/core/general_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/core/general_settings_page.h
rename to studio/src/plugins/core/general_settings_page.h
diff --git a/code/studio/src/plugins/core/general_settings_page.ui b/studio/src/plugins/core/general_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/core/general_settings_page.ui
rename to studio/src/plugins/core/general_settings_page.ui
diff --git a/code/studio/src/plugins/core/icons/ic_nel_add_item.png b/studio/src/plugins/core/icons/ic_nel_add_item.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_add_item.png
rename to studio/src/plugins/core/icons/ic_nel_add_item.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_crash.png b/studio/src/plugins/core/icons/ic_nel_crash.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_crash.png
rename to studio/src/plugins/core/icons/ic_nel_crash.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_delete_item.png b/studio/src/plugins/core/icons/ic_nel_delete_item.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_delete_item.png
rename to studio/src/plugins/core/icons/ic_nel_delete_item.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_down_item.png b/studio/src/plugins/core/icons/ic_nel_down_item.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_down_item.png
rename to studio/src/plugins/core/icons/ic_nel_down_item.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_generic_settings.png b/studio/src/plugins/core/icons/ic_nel_generic_settings.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_generic_settings.png
rename to studio/src/plugins/core/icons/ic_nel_generic_settings.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_new.png b/studio/src/plugins/core/icons/ic_nel_new.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_new.png
rename to studio/src/plugins/core/icons/ic_nel_new.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_open.png b/studio/src/plugins/core/icons/ic_nel_open.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_open.png
rename to studio/src/plugins/core/icons/ic_nel_open.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_path_settings.png b/studio/src/plugins/core/icons/ic_nel_path_settings.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_path_settings.png
rename to studio/src/plugins/core/icons/ic_nel_path_settings.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_pill.png b/studio/src/plugins/core/icons/ic_nel_pill.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_pill.png
rename to studio/src/plugins/core/icons/ic_nel_pill.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_redo.png b/studio/src/plugins/core/icons/ic_nel_redo.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_redo.png
rename to studio/src/plugins/core/icons/ic_nel_redo.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_reset_all.png b/studio/src/plugins/core/icons/ic_nel_reset_all.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_reset_all.png
rename to studio/src/plugins/core/icons/ic_nel_reset_all.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_save.png b/studio/src/plugins/core/icons/ic_nel_save.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_save.png
rename to studio/src/plugins/core/icons/ic_nel_save.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_save_as.png b/studio/src/plugins/core/icons/ic_nel_save_as.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_save_as.png
rename to studio/src/plugins/core/icons/ic_nel_save_as.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_undo.png b/studio/src/plugins/core/icons/ic_nel_undo.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_undo.png
rename to studio/src/plugins/core/icons/ic_nel_undo.png
diff --git a/code/studio/src/plugins/core/icons/ic_nel_up_item.png b/studio/src/plugins/core/icons/ic_nel_up_item.png
similarity index 100%
rename from code/studio/src/plugins/core/icons/ic_nel_up_item.png
rename to studio/src/plugins/core/icons/ic_nel_up_item.png
diff --git a/code/studio/src/plugins/core/icontext.h b/studio/src/plugins/core/icontext.h
similarity index 100%
rename from code/studio/src/plugins/core/icontext.h
rename to studio/src/plugins/core/icontext.h
diff --git a/code/studio/src/plugins/core/icore.h b/studio/src/plugins/core/icore.h
similarity index 100%
rename from code/studio/src/plugins/core/icore.h
rename to studio/src/plugins/core/icore.h
diff --git a/code/studio/src/plugins/core/icore_listener.h b/studio/src/plugins/core/icore_listener.h
similarity index 100%
rename from code/studio/src/plugins/core/icore_listener.h
rename to studio/src/plugins/core/icore_listener.h
diff --git a/code/studio/src/plugins/core/images/nel.png b/studio/src/plugins/core/images/nel.png
similarity index 100%
rename from code/studio/src/plugins/core/images/nel.png
rename to studio/src/plugins/core/images/nel.png
diff --git a/code/studio/src/plugins/core/images/preferences.png b/studio/src/plugins/core/images/preferences.png
similarity index 100%
rename from code/studio/src/plugins/core/images/preferences.png
rename to studio/src/plugins/core/images/preferences.png
diff --git a/code/studio/src/plugins/core/ioptions_page.h b/studio/src/plugins/core/ioptions_page.h
similarity index 100%
rename from code/studio/src/plugins/core/ioptions_page.h
rename to studio/src/plugins/core/ioptions_page.h
diff --git a/code/studio/src/plugins/core/main_window.cpp b/studio/src/plugins/core/main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/core/main_window.cpp
rename to studio/src/plugins/core/main_window.cpp
diff --git a/code/studio/src/plugins/core/main_window.h b/studio/src/plugins/core/main_window.h
similarity index 100%
rename from code/studio/src/plugins/core/main_window.h
rename to studio/src/plugins/core/main_window.h
diff --git a/code/studio/src/plugins/core/menu_manager.cpp b/studio/src/plugins/core/menu_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/core/menu_manager.cpp
rename to studio/src/plugins/core/menu_manager.cpp
diff --git a/code/studio/src/plugins/core/menu_manager.h b/studio/src/plugins/core/menu_manager.h
similarity index 100%
rename from code/studio/src/plugins/core/menu_manager.h
rename to studio/src/plugins/core/menu_manager.h
diff --git a/code/studio/src/plugins/core/plugin_view_dialog.cpp b/studio/src/plugins/core/plugin_view_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/core/plugin_view_dialog.cpp
rename to studio/src/plugins/core/plugin_view_dialog.cpp
diff --git a/code/studio/src/plugins/core/plugin_view_dialog.h b/studio/src/plugins/core/plugin_view_dialog.h
similarity index 100%
rename from code/studio/src/plugins/core/plugin_view_dialog.h
rename to studio/src/plugins/core/plugin_view_dialog.h
diff --git a/code/studio/src/plugins/core/plugin_view_dialog.ui b/studio/src/plugins/core/plugin_view_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/core/plugin_view_dialog.ui
rename to studio/src/plugins/core/plugin_view_dialog.ui
diff --git a/code/studio/src/plugins/core/qtwin.cpp b/studio/src/plugins/core/qtwin.cpp
similarity index 100%
rename from code/studio/src/plugins/core/qtwin.cpp
rename to studio/src/plugins/core/qtwin.cpp
diff --git a/code/studio/src/plugins/core/qtwin.h b/studio/src/plugins/core/qtwin.h
similarity index 100%
rename from code/studio/src/plugins/core/qtwin.h
rename to studio/src/plugins/core/qtwin.h
diff --git a/code/studio/src/plugins/core/search_paths_settings_page.cpp b/studio/src/plugins/core/search_paths_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/core/search_paths_settings_page.cpp
rename to studio/src/plugins/core/search_paths_settings_page.cpp
diff --git a/code/studio/src/plugins/core/search_paths_settings_page.h b/studio/src/plugins/core/search_paths_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/core/search_paths_settings_page.h
rename to studio/src/plugins/core/search_paths_settings_page.h
diff --git a/code/studio/src/plugins/core/search_paths_settings_page.ui b/studio/src/plugins/core/search_paths_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/core/search_paths_settings_page.ui
rename to studio/src/plugins/core/search_paths_settings_page.ui
diff --git a/code/studio/src/plugins/core/settings_dialog.cpp b/studio/src/plugins/core/settings_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/core/settings_dialog.cpp
rename to studio/src/plugins/core/settings_dialog.cpp
diff --git a/code/studio/src/plugins/core/settings_dialog.h b/studio/src/plugins/core/settings_dialog.h
similarity index 100%
rename from code/studio/src/plugins/core/settings_dialog.h
rename to studio/src/plugins/core/settings_dialog.h
diff --git a/code/studio/src/plugins/core/settings_dialog.ui b/studio/src/plugins/core/settings_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/core/settings_dialog.ui
rename to studio/src/plugins/core/settings_dialog.ui
diff --git a/code/studio/src/plugins/core/studio_plugin_core.xml b/studio/src/plugins/core/studio_plugin_core.xml
similarity index 100%
rename from code/studio/src/plugins/core/studio_plugin_core.xml
rename to studio/src/plugins/core/studio_plugin_core.xml
diff --git a/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt b/studio/src/plugins/disp_sheet_id/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
rename to studio/src/plugins/disp_sheet_id/CMakeLists.txt
diff --git a/code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp b/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
rename to studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
diff --git a/code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h b/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
rename to studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
diff --git a/code/studio/src/plugins/disp_sheet_id/sheet_id_view.cpp b/studio/src/plugins/disp_sheet_id/sheet_id_view.cpp
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/sheet_id_view.cpp
rename to studio/src/plugins/disp_sheet_id/sheet_id_view.cpp
diff --git a/code/studio/src/plugins/disp_sheet_id/sheet_id_view.h b/studio/src/plugins/disp_sheet_id/sheet_id_view.h
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/sheet_id_view.h
rename to studio/src/plugins/disp_sheet_id/sheet_id_view.h
diff --git a/code/studio/src/plugins/disp_sheet_id/sheet_id_view.ui b/studio/src/plugins/disp_sheet_id/sheet_id_view.ui
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/sheet_id_view.ui
rename to studio/src/plugins/disp_sheet_id/sheet_id_view.ui
diff --git a/code/studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml b/studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml
rename to studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml
diff --git a/code/studio/src/plugins/example/CMakeLists.txt b/studio/src/plugins/example/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/example/CMakeLists.txt
rename to studio/src/plugins/example/CMakeLists.txt
diff --git a/code/studio/src/plugins/example/example_plugin.cpp b/studio/src/plugins/example/example_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/example/example_plugin.cpp
rename to studio/src/plugins/example/example_plugin.cpp
diff --git a/code/studio/src/plugins/example/example_plugin.h b/studio/src/plugins/example/example_plugin.h
similarity index 100%
rename from code/studio/src/plugins/example/example_plugin.h
rename to studio/src/plugins/example/example_plugin.h
diff --git a/code/studio/src/plugins/example/example_settings_page.cpp b/studio/src/plugins/example/example_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/example/example_settings_page.cpp
rename to studio/src/plugins/example/example_settings_page.cpp
diff --git a/code/studio/src/plugins/example/example_settings_page.h b/studio/src/plugins/example/example_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/example/example_settings_page.h
rename to studio/src/plugins/example/example_settings_page.h
diff --git a/code/studio/src/plugins/example/example_settings_page.ui b/studio/src/plugins/example/example_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/example/example_settings_page.ui
rename to studio/src/plugins/example/example_settings_page.ui
diff --git a/code/studio/src/plugins/example/qnel_widget.cpp b/studio/src/plugins/example/qnel_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/example/qnel_widget.cpp
rename to studio/src/plugins/example/qnel_widget.cpp
diff --git a/code/studio/src/plugins/example/qnel_widget.h b/studio/src/plugins/example/qnel_widget.h
similarity index 100%
rename from code/studio/src/plugins/example/qnel_widget.h
rename to studio/src/plugins/example/qnel_widget.h
diff --git a/code/studio/src/plugins/example/simple_viewer.cpp b/studio/src/plugins/example/simple_viewer.cpp
similarity index 100%
rename from code/studio/src/plugins/example/simple_viewer.cpp
rename to studio/src/plugins/example/simple_viewer.cpp
diff --git a/code/studio/src/plugins/example/simple_viewer.h b/studio/src/plugins/example/simple_viewer.h
similarity index 100%
rename from code/studio/src/plugins/example/simple_viewer.h
rename to studio/src/plugins/example/simple_viewer.h
diff --git a/code/studio/src/plugins/example/studio_plugin_example.xml b/studio/src/plugins/example/studio_plugin_example.xml
similarity index 100%
rename from code/studio/src/plugins/example/studio_plugin_example.xml
rename to studio/src/plugins/example/studio_plugin_example.xml
diff --git a/code/studio/src/plugins/georges_editor/CMakeLists.txt b/studio/src/plugins/georges_editor/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/georges_editor/CMakeLists.txt
rename to studio/src/plugins/georges_editor/CMakeLists.txt
diff --git a/code/studio/src/plugins/georges_editor/actions.cpp b/studio/src/plugins/georges_editor/actions.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/actions.cpp
rename to studio/src/plugins/georges_editor/actions.cpp
diff --git a/code/studio/src/plugins/georges_editor/actions.h b/studio/src/plugins/georges_editor/actions.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/actions.h
rename to studio/src/plugins/georges_editor/actions.h
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl.cpp b/studio/src/plugins/georges_editor/browser_ctrl.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/browser_ctrl.cpp
rename to studio/src/plugins/georges_editor/browser_ctrl.cpp
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl.h b/studio/src/plugins/georges_editor/browser_ctrl.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/browser_ctrl.h
rename to studio/src/plugins/georges_editor/browser_ctrl.h
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp b/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp
rename to studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h b/studio/src/plugins/georges_editor/browser_ctrl_pvt.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h
rename to studio/src/plugins/georges_editor/browser_ctrl_pvt.h
diff --git a/code/studio/src/plugins/georges_editor/dfn_browser_ctrl.cpp b/studio/src/plugins/georges_editor/dfn_browser_ctrl.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/dfn_browser_ctrl.cpp
rename to studio/src/plugins/georges_editor/dfn_browser_ctrl.cpp
diff --git a/code/studio/src/plugins/georges_editor/dfn_browser_ctrl.h b/studio/src/plugins/georges_editor/dfn_browser_ctrl.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/dfn_browser_ctrl.h
rename to studio/src/plugins/georges_editor/dfn_browser_ctrl.h
diff --git a/code/studio/src/plugins/georges_editor/expandable_headerview.cpp b/studio/src/plugins/georges_editor/expandable_headerview.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/expandable_headerview.cpp
rename to studio/src/plugins/georges_editor/expandable_headerview.cpp
diff --git a/code/studio/src/plugins/georges_editor/expandable_headerview.h b/studio/src/plugins/georges_editor/expandable_headerview.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/expandable_headerview.h
rename to studio/src/plugins/georges_editor/expandable_headerview.h
diff --git a/code/studio/src/plugins/georges_editor/filepath_property_manager.cpp b/studio/src/plugins/georges_editor/filepath_property_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/filepath_property_manager.cpp
rename to studio/src/plugins/georges_editor/filepath_property_manager.cpp
diff --git a/code/studio/src/plugins/georges_editor/filepath_property_manager.h b/studio/src/plugins/georges_editor/filepath_property_manager.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/filepath_property_manager.h
rename to studio/src/plugins/georges_editor/filepath_property_manager.h
diff --git a/code/studio/src/plugins/georges_editor/formdelegate.cpp b/studio/src/plugins/georges_editor/formdelegate.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/formdelegate.cpp
rename to studio/src/plugins/georges_editor/formdelegate.cpp
diff --git a/code/studio/src/plugins/georges_editor/formdelegate.h b/studio/src/plugins/georges_editor/formdelegate.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/formdelegate.h
rename to studio/src/plugins/georges_editor/formdelegate.h
diff --git a/code/studio/src/plugins/georges_editor/formitem.cpp b/studio/src/plugins/georges_editor/formitem.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/formitem.cpp
rename to studio/src/plugins/georges_editor/formitem.cpp
diff --git a/code/studio/src/plugins/georges_editor/formitem.h b/studio/src/plugins/georges_editor/formitem.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/formitem.h
rename to studio/src/plugins/georges_editor/formitem.h
diff --git a/code/studio/src/plugins/georges_editor/georges.cpp b/studio/src/plugins/georges_editor/georges.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges.cpp
rename to studio/src/plugins/georges_editor/georges.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges.h b/studio/src/plugins/georges_editor/georges.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges.h
rename to studio/src/plugins/georges_editor/georges.h
diff --git a/code/studio/src/plugins/georges_editor/georges_dfn_dialog.cpp b/studio/src/plugins/georges_editor/georges_dfn_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dfn_dialog.cpp
rename to studio/src/plugins/georges_editor/georges_dfn_dialog.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_dfn_dialog.h b/studio/src/plugins/georges_editor/georges_dfn_dialog.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dfn_dialog.h
rename to studio/src/plugins/georges_editor/georges_dfn_dialog.h
diff --git a/code/studio/src/plugins/georges_editor/georges_dfn_dialog.ui b/studio/src/plugins/georges_editor/georges_dfn_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dfn_dialog.ui
rename to studio/src/plugins/georges_editor/georges_dfn_dialog.ui
diff --git a/code/studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp b/studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp
rename to studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_dirtree_dialog.h b/studio/src/plugins/georges_editor/georges_dirtree_dialog.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dirtree_dialog.h
rename to studio/src/plugins/georges_editor/georges_dirtree_dialog.h
diff --git a/code/studio/src/plugins/georges_editor/georges_dirtree_form.ui b/studio/src/plugins/georges_editor/georges_dirtree_form.ui
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dirtree_form.ui
rename to studio/src/plugins/georges_editor/georges_dirtree_form.ui
diff --git a/code/studio/src/plugins/georges_editor/georges_dock_widget.cpp b/studio/src/plugins/georges_editor/georges_dock_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dock_widget.cpp
rename to studio/src/plugins/georges_editor/georges_dock_widget.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_dock_widget.h b/studio/src/plugins/georges_editor/georges_dock_widget.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_dock_widget.h
rename to studio/src/plugins/georges_editor/georges_dock_widget.h
diff --git a/code/studio/src/plugins/georges_editor/georges_editor.qrc b/studio/src/plugins/georges_editor/georges_editor.qrc
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor.qrc
rename to studio/src/plugins/georges_editor/georges_editor.qrc
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_constants.h b/studio/src/plugins/georges_editor/georges_editor_constants.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_constants.h
rename to studio/src/plugins/georges_editor/georges_editor_constants.h
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_form.cpp b/studio/src/plugins/georges_editor/georges_editor_form.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_form.cpp
rename to studio/src/plugins/georges_editor/georges_editor_form.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_form.h b/studio/src/plugins/georges_editor/georges_editor_form.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_form.h
rename to studio/src/plugins/georges_editor/georges_editor_form.h
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_form.ui b/studio/src/plugins/georges_editor/georges_editor_form.ui
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_form.ui
rename to studio/src/plugins/georges_editor/georges_editor_form.ui
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_plugin.cpp b/studio/src/plugins/georges_editor/georges_editor_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_plugin.cpp
rename to studio/src/plugins/georges_editor/georges_editor_plugin.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_editor_plugin.h b/studio/src/plugins/georges_editor/georges_editor_plugin.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_editor_plugin.h
rename to studio/src/plugins/georges_editor/georges_editor_plugin.h
diff --git a/code/studio/src/plugins/georges_editor/georges_filesystem_model.cpp b/studio/src/plugins/georges_editor/georges_filesystem_model.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_filesystem_model.cpp
rename to studio/src/plugins/georges_editor/georges_filesystem_model.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_filesystem_model.h b/studio/src/plugins/georges_editor/georges_filesystem_model.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_filesystem_model.h
rename to studio/src/plugins/georges_editor/georges_filesystem_model.h
diff --git a/code/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp b/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
rename to studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_treeview_dialog.h b/studio/src/plugins/georges_editor/georges_treeview_dialog.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_treeview_dialog.h
rename to studio/src/plugins/georges_editor/georges_treeview_dialog.h
diff --git a/code/studio/src/plugins/georges_editor/georges_treeview_form.ui b/studio/src/plugins/georges_editor/georges_treeview_form.ui
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_treeview_form.ui
rename to studio/src/plugins/georges_editor/georges_treeview_form.ui
diff --git a/code/studio/src/plugins/georges_editor/georges_typ_dialog.cpp b/studio/src/plugins/georges_editor/georges_typ_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_typ_dialog.cpp
rename to studio/src/plugins/georges_editor/georges_typ_dialog.cpp
diff --git a/code/studio/src/plugins/georges_editor/georges_typ_dialog.h b/studio/src/plugins/georges_editor/georges_typ_dialog.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_typ_dialog.h
rename to studio/src/plugins/georges_editor/georges_typ_dialog.h
diff --git a/code/studio/src/plugins/georges_editor/georges_typ_dialog.ui b/studio/src/plugins/georges_editor/georges_typ_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georges_typ_dialog.ui
rename to studio/src/plugins/georges_editor/georges_typ_dialog.ui
diff --git a/code/studio/src/plugins/georges_editor/georgesform_model.cpp b/studio/src/plugins/georges_editor/georgesform_model.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georgesform_model.cpp
rename to studio/src/plugins/georges_editor/georgesform_model.cpp
diff --git a/code/studio/src/plugins/georges_editor/georgesform_model.h b/studio/src/plugins/georges_editor/georgesform_model.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georgesform_model.h
rename to studio/src/plugins/georges_editor/georgesform_model.h
diff --git a/code/studio/src/plugins/georges_editor/georgesform_proxy_model.cpp b/studio/src/plugins/georges_editor/georgesform_proxy_model.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georgesform_proxy_model.cpp
rename to studio/src/plugins/georges_editor/georgesform_proxy_model.cpp
diff --git a/code/studio/src/plugins/georges_editor/georgesform_proxy_model.h b/studio/src/plugins/georges_editor/georgesform_proxy_model.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/georgesform_proxy_model.h
rename to studio/src/plugins/georges_editor/georgesform_proxy_model.h
diff --git a/code/studio/src/plugins/georges_editor/images/array.ico b/studio/src/plugins/georges_editor/images/array.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/array.ico
rename to studio/src/plugins/georges_editor/images/array.ico
diff --git a/code/studio/src/plugins/georges_editor/images/header.ico b/studio/src/plugins/georges_editor/images/header.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/header.ico
rename to studio/src/plugins/georges_editor/images/header.ico
diff --git a/code/studio/src/plugins/georges_editor/images/hold.ico b/studio/src/plugins/georges_editor/images/hold.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/hold.ico
rename to studio/src/plugins/georges_editor/images/hold.ico
diff --git a/code/studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png b/studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png
rename to studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png
diff --git a/code/studio/src/plugins/georges_editor/images/root.ico b/studio/src/plugins/georges_editor/images/root.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/root.ico
rename to studio/src/plugins/georges_editor/images/root.ico
diff --git a/code/studio/src/plugins/georges_editor/images/struct.ico b/studio/src/plugins/georges_editor/images/struct.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/struct.ico
rename to studio/src/plugins/georges_editor/images/struct.ico
diff --git a/code/studio/src/plugins/georges_editor/images/vstruct.ico b/studio/src/plugins/georges_editor/images/vstruct.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/vstruct.ico
rename to studio/src/plugins/georges_editor/images/vstruct.ico
diff --git a/code/studio/src/plugins/georges_editor/images/zfee51.ico b/studio/src/plugins/georges_editor/images/zfee51.ico
similarity index 100%
rename from code/studio/src/plugins/georges_editor/images/zfee51.ico
rename to studio/src/plugins/georges_editor/images/zfee51.ico
diff --git a/code/studio/src/plugins/georges_editor/stdpch.cpp b/studio/src/plugins/georges_editor/stdpch.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/stdpch.cpp
rename to studio/src/plugins/georges_editor/stdpch.cpp
diff --git a/code/studio/src/plugins/georges_editor/stdpch.h b/studio/src/plugins/georges_editor/stdpch.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/stdpch.h
rename to studio/src/plugins/georges_editor/stdpch.h
diff --git a/code/studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml b/studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml
similarity index 100%
rename from code/studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml
rename to studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml
diff --git a/code/studio/src/plugins/georges_editor/typ_browser_ctrl.cpp b/studio/src/plugins/georges_editor/typ_browser_ctrl.cpp
similarity index 100%
rename from code/studio/src/plugins/georges_editor/typ_browser_ctrl.cpp
rename to studio/src/plugins/georges_editor/typ_browser_ctrl.cpp
diff --git a/code/studio/src/plugins/georges_editor/typ_browser_ctrl.h b/studio/src/plugins/georges_editor/typ_browser_ctrl.h
similarity index 100%
rename from code/studio/src/plugins/georges_editor/typ_browser_ctrl.h
rename to studio/src/plugins/georges_editor/typ_browser_ctrl.h
diff --git a/code/studio/src/plugins/gui_editor/CMakeLists.txt b/studio/src/plugins/gui_editor/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/gui_editor/CMakeLists.txt
rename to studio/src/plugins/gui_editor/CMakeLists.txt
diff --git a/code/studio/src/plugins/gui_editor/action_editor.cpp b/studio/src/plugins/gui_editor/action_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_editor.cpp
rename to studio/src/plugins/gui_editor/action_editor.cpp
diff --git a/code/studio/src/plugins/gui_editor/action_editor.h b/studio/src/plugins/gui_editor/action_editor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_editor.h
rename to studio/src/plugins/gui_editor/action_editor.h
diff --git a/code/studio/src/plugins/gui_editor/action_editor.ui b/studio/src/plugins/gui_editor/action_editor.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_editor.ui
rename to studio/src/plugins/gui_editor/action_editor.ui
diff --git a/code/studio/src/plugins/gui_editor/action_list.cpp b/studio/src/plugins/gui_editor/action_list.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_list.cpp
rename to studio/src/plugins/gui_editor/action_list.cpp
diff --git a/code/studio/src/plugins/gui_editor/action_list.h b/studio/src/plugins/gui_editor/action_list.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_list.h
rename to studio/src/plugins/gui_editor/action_list.h
diff --git a/code/studio/src/plugins/gui_editor/action_list.ui b/studio/src/plugins/gui_editor/action_list.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_list.ui
rename to studio/src/plugins/gui_editor/action_list.ui
diff --git a/code/studio/src/plugins/gui_editor/action_property_manager.cpp b/studio/src/plugins/gui_editor/action_property_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_property_manager.cpp
rename to studio/src/plugins/gui_editor/action_property_manager.cpp
diff --git a/code/studio/src/plugins/gui_editor/action_property_manager.h b/studio/src/plugins/gui_editor/action_property_manager.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/action_property_manager.h
rename to studio/src/plugins/gui_editor/action_property_manager.h
diff --git a/code/studio/src/plugins/gui_editor/add_widget_widget.cpp b/studio/src/plugins/gui_editor/add_widget_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/add_widget_widget.cpp
rename to studio/src/plugins/gui_editor/add_widget_widget.cpp
diff --git a/code/studio/src/plugins/gui_editor/add_widget_widget.h b/studio/src/plugins/gui_editor/add_widget_widget.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/add_widget_widget.h
rename to studio/src/plugins/gui_editor/add_widget_widget.h
diff --git a/code/studio/src/plugins/gui_editor/add_widget_widget.ui b/studio/src/plugins/gui_editor/add_widget_widget.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/add_widget_widget.ui
rename to studio/src/plugins/gui_editor/add_widget_widget.ui
diff --git a/code/studio/src/plugins/gui_editor/editor_message_processor.cpp b/studio/src/plugins/gui_editor/editor_message_processor.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/editor_message_processor.cpp
rename to studio/src/plugins/gui_editor/editor_message_processor.cpp
diff --git a/code/studio/src/plugins/gui_editor/editor_message_processor.h b/studio/src/plugins/gui_editor/editor_message_processor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/editor_message_processor.h
rename to studio/src/plugins/gui_editor/editor_message_processor.h
diff --git a/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp b/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
rename to studio/src/plugins/gui_editor/editor_selection_watcher.cpp
diff --git a/code/studio/src/plugins/gui_editor/editor_selection_watcher.h b/studio/src/plugins/gui_editor/editor_selection_watcher.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/editor_selection_watcher.h
rename to studio/src/plugins/gui_editor/editor_selection_watcher.h
diff --git a/code/studio/src/plugins/gui_editor/expr_link_dlg.cpp b/studio/src/plugins/gui_editor/expr_link_dlg.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expr_link_dlg.cpp
rename to studio/src/plugins/gui_editor/expr_link_dlg.cpp
diff --git a/code/studio/src/plugins/gui_editor/expr_link_dlg.h b/studio/src/plugins/gui_editor/expr_link_dlg.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expr_link_dlg.h
rename to studio/src/plugins/gui_editor/expr_link_dlg.h
diff --git a/code/studio/src/plugins/gui_editor/expr_link_dlg.ui b/studio/src/plugins/gui_editor/expr_link_dlg.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expr_link_dlg.ui
rename to studio/src/plugins/gui_editor/expr_link_dlg.ui
diff --git a/code/studio/src/plugins/gui_editor/expr_slot_info.h b/studio/src/plugins/gui_editor/expr_slot_info.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expr_slot_info.h
rename to studio/src/plugins/gui_editor/expr_slot_info.h
diff --git a/code/studio/src/plugins/gui_editor/expression_editor.cpp b/studio/src/plugins/gui_editor/expression_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_editor.cpp
rename to studio/src/plugins/gui_editor/expression_editor.cpp
diff --git a/code/studio/src/plugins/gui_editor/expression_editor.h b/studio/src/plugins/gui_editor/expression_editor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_editor.h
rename to studio/src/plugins/gui_editor/expression_editor.h
diff --git a/code/studio/src/plugins/gui_editor/expression_editor.ui b/studio/src/plugins/gui_editor/expression_editor.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_editor.ui
rename to studio/src/plugins/gui_editor/expression_editor.ui
diff --git a/code/studio/src/plugins/gui_editor/expression_info.h b/studio/src/plugins/gui_editor/expression_info.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_info.h
rename to studio/src/plugins/gui_editor/expression_info.h
diff --git a/code/studio/src/plugins/gui_editor/expression_link.cpp b/studio/src/plugins/gui_editor/expression_link.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_link.cpp
rename to studio/src/plugins/gui_editor/expression_link.cpp
diff --git a/code/studio/src/plugins/gui_editor/expression_link.h b/studio/src/plugins/gui_editor/expression_link.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_link.h
rename to studio/src/plugins/gui_editor/expression_link.h
diff --git a/code/studio/src/plugins/gui_editor/expression_loader.cpp b/studio/src/plugins/gui_editor/expression_loader.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_loader.cpp
rename to studio/src/plugins/gui_editor/expression_loader.cpp
diff --git a/code/studio/src/plugins/gui_editor/expression_loader.h b/studio/src/plugins/gui_editor/expression_loader.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_loader.h
rename to studio/src/plugins/gui_editor/expression_loader.h
diff --git a/code/studio/src/plugins/gui_editor/expression_node.cpp b/studio/src/plugins/gui_editor/expression_node.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_node.cpp
rename to studio/src/plugins/gui_editor/expression_node.cpp
diff --git a/code/studio/src/plugins/gui_editor/expression_node.h b/studio/src/plugins/gui_editor/expression_node.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_node.h
rename to studio/src/plugins/gui_editor/expression_node.h
diff --git a/code/studio/src/plugins/gui_editor/expression_store.cpp b/studio/src/plugins/gui_editor/expression_store.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_store.cpp
rename to studio/src/plugins/gui_editor/expression_store.cpp
diff --git a/code/studio/src/plugins/gui_editor/expression_store.h b/studio/src/plugins/gui_editor/expression_store.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expression_store.h
rename to studio/src/plugins/gui_editor/expression_store.h
diff --git a/code/studio/src/plugins/gui_editor/expressions/abs.xml b/studio/src/plugins/gui_editor/expressions/abs.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/abs.xml
rename to studio/src/plugins/gui_editor/expressions/abs.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/add.xml b/studio/src/plugins/gui_editor/expressions/add.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/add.xml
rename to studio/src/plugins/gui_editor/expressions/add.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/and.xml b/studio/src/plugins/gui_editor/expressions/and.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/and.xml
rename to studio/src/plugins/gui_editor/expressions/and.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/band.xml b/studio/src/plugins/gui_editor/expressions/band.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/band.xml
rename to studio/src/plugins/gui_editor/expressions/band.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/bnot.xml b/studio/src/plugins/gui_editor/expressions/bnot.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/bnot.xml
rename to studio/src/plugins/gui_editor/expressions/bnot.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/bor.xml b/studio/src/plugins/gui_editor/expressions/bor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/bor.xml
rename to studio/src/plugins/gui_editor/expressions/bor.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/bxor.xml b/studio/src/plugins/gui_editor/expressions/bxor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/bxor.xml
rename to studio/src/plugins/gui_editor/expressions/bxor.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/dbcount.xml b/studio/src/plugins/gui_editor/expressions/dbcount.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/dbcount.xml
rename to studio/src/plugins/gui_editor/expressions/dbcount.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/depends.xml b/studio/src/plugins/gui_editor/expressions/depends.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/depends.xml
rename to studio/src/plugins/gui_editor/expressions/depends.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/div.xml b/studio/src/plugins/gui_editor/expressions/div.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/div.xml
rename to studio/src/plugins/gui_editor/expressions/div.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/eq.xml b/studio/src/plugins/gui_editor/expressions/eq.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/eq.xml
rename to studio/src/plugins/gui_editor/expressions/eq.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/extSign11To64.xml b/studio/src/plugins/gui_editor/expressions/extSign11To64.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/extSign11To64.xml
rename to studio/src/plugins/gui_editor/expressions/extSign11To64.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/extSign8To64.xml b/studio/src/plugins/gui_editor/expressions/extSign8To64.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/extSign8To64.xml
rename to studio/src/plugins/gui_editor/expressions/extSign8To64.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getAlpha.xml b/studio/src/plugins/gui_editor/expressions/getAlpha.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getAlpha.xml
rename to studio/src/plugins/gui_editor/expressions/getAlpha.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getBlue.xml b/studio/src/plugins/gui_editor/expressions/getBlue.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getBlue.xml
rename to studio/src/plugins/gui_editor/expressions/getBlue.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getGreen.xml b/studio/src/plugins/gui_editor/expressions/getGreen.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getGreen.xml
rename to studio/src/plugins/gui_editor/expressions/getGreen.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getRed.xml b/studio/src/plugins/gui_editor/expressions/getRed.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getRed.xml
rename to studio/src/plugins/gui_editor/expressions/getRed.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getbit.xml b/studio/src/plugins/gui_editor/expressions/getbit.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getbit.xml
rename to studio/src/plugins/gui_editor/expressions/getbit.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/getprop.xml b/studio/src/plugins/gui_editor/expressions/getprop.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/getprop.xml
rename to studio/src/plugins/gui_editor/expressions/getprop.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/identity.xml b/studio/src/plugins/gui_editor/expressions/identity.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/identity.xml
rename to studio/src/plugins/gui_editor/expressions/identity.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/ifthenelse.xml b/studio/src/plugins/gui_editor/expressions/ifthenelse.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/ifthenelse.xml
rename to studio/src/plugins/gui_editor/expressions/ifthenelse.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/ilinear.xml b/studio/src/plugins/gui_editor/expressions/ilinear.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/ilinear.xml
rename to studio/src/plugins/gui_editor/expressions/ilinear.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/int.xml b/studio/src/plugins/gui_editor/expressions/int.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/int.xml
rename to studio/src/plugins/gui_editor/expressions/int.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/intToColor.xml b/studio/src/plugins/gui_editor/expressions/intToColor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/intToColor.xml
rename to studio/src/plugins/gui_editor/expressions/intToColor.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml b/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/isFinalVersion.xml
rename to studio/src/plugins/gui_editor/expressions/isFinalVersion.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/localize.xml b/studio/src/plugins/gui_editor/expressions/localize.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/localize.xml
rename to studio/src/plugins/gui_editor/expressions/localize.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/makeRGB.xml b/studio/src/plugins/gui_editor/expressions/makeRGB.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/makeRGB.xml
rename to studio/src/plugins/gui_editor/expressions/makeRGB.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/max.xml b/studio/src/plugins/gui_editor/expressions/max.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/max.xml
rename to studio/src/plugins/gui_editor/expressions/max.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/min.xml b/studio/src/plugins/gui_editor/expressions/min.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/min.xml
rename to studio/src/plugins/gui_editor/expressions/min.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/mod.xml b/studio/src/plugins/gui_editor/expressions/mod.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/mod.xml
rename to studio/src/plugins/gui_editor/expressions/mod.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/mul.xml b/studio/src/plugins/gui_editor/expressions/mul.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/mul.xml
rename to studio/src/plugins/gui_editor/expressions/mul.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/ne.xml b/studio/src/plugins/gui_editor/expressions/ne.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/ne.xml
rename to studio/src/plugins/gui_editor/expressions/ne.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/not.xml b/studio/src/plugins/gui_editor/expressions/not.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/not.xml
rename to studio/src/plugins/gui_editor/expressions/not.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/oldvalue.xml b/studio/src/plugins/gui_editor/expressions/oldvalue.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/oldvalue.xml
rename to studio/src/plugins/gui_editor/expressions/oldvalue.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/or.xml b/studio/src/plugins/gui_editor/expressions/or.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/or.xml
rename to studio/src/plugins/gui_editor/expressions/or.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/rand.xml b/studio/src/plugins/gui_editor/expressions/rand.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/rand.xml
rename to studio/src/plugins/gui_editor/expressions/rand.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/sal.xml b/studio/src/plugins/gui_editor/expressions/sal.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/sal.xml
rename to studio/src/plugins/gui_editor/expressions/sal.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/sar.xml b/studio/src/plugins/gui_editor/expressions/sar.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/sar.xml
rename to studio/src/plugins/gui_editor/expressions/sar.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml b/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml
rename to studio/src/plugins/gui_editor/expressions/secondsToTimeString.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml b/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml
rename to studio/src/plugins/gui_editor/expressions/secondsToTimeStringShort.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/shl.xml b/studio/src/plugins/gui_editor/expressions/shl.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/shl.xml
rename to studio/src/plugins/gui_editor/expressions/shl.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/shr.xml b/studio/src/plugins/gui_editor/expressions/shr.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/shr.xml
rename to studio/src/plugins/gui_editor/expressions/shr.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/str.xml b/studio/src/plugins/gui_editor/expressions/str.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/str.xml
rename to studio/src/plugins/gui_editor/expressions/str.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/sub.xml b/studio/src/plugins/gui_editor/expressions/sub.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/sub.xml
rename to studio/src/plugins/gui_editor/expressions/sub.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/switch.xml b/studio/src/plugins/gui_editor/expressions/switch.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/switch.xml
rename to studio/src/plugins/gui_editor/expressions/switch.xml
diff --git a/code/studio/src/plugins/gui_editor/expressions/value.xml b/studio/src/plugins/gui_editor/expressions/value.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/expressions/value.xml
rename to studio/src/plugins/gui_editor/expressions/value.xml
diff --git a/code/studio/src/plugins/gui_editor/fonts/ryzom.ttf b/studio/src/plugins/gui_editor/fonts/ryzom.ttf
similarity index 100%
rename from code/studio/src/plugins/gui_editor/fonts/ryzom.ttf
rename to studio/src/plugins/gui_editor/fonts/ryzom.ttf
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_config.h.cmake b/studio/src/plugins/gui_editor/gui_editor_config.h.cmake
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_config.h.cmake
rename to studio/src/plugins/gui_editor/gui_editor_config.h.cmake
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_constants.h b/studio/src/plugins/gui_editor/gui_editor_constants.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_constants.h
rename to studio/src/plugins/gui_editor/gui_editor_constants.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_context.cpp b/studio/src/plugins/gui_editor/gui_editor_context.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_context.cpp
rename to studio/src/plugins/gui_editor/gui_editor_context.cpp
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_context.h b/studio/src/plugins/gui_editor/gui_editor_context.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_context.h
rename to studio/src/plugins/gui_editor/gui_editor_context.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_core_listener.cpp b/studio/src/plugins/gui_editor/gui_editor_core_listener.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_core_listener.cpp
rename to studio/src/plugins/gui_editor/gui_editor_core_listener.cpp
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_core_listener.h b/studio/src/plugins/gui_editor/gui_editor_core_listener.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_core_listener.h
rename to studio/src/plugins/gui_editor/gui_editor_core_listener.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_global.h b/studio/src/plugins/gui_editor/gui_editor_global.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_global.h
rename to studio/src/plugins/gui_editor/gui_editor_global.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_plugin.cpp b/studio/src/plugins/gui_editor/gui_editor_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_plugin.cpp
rename to studio/src/plugins/gui_editor/gui_editor_plugin.cpp
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_plugin.h b/studio/src/plugins/gui_editor/gui_editor_plugin.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_plugin.h
rename to studio/src/plugins/gui_editor/gui_editor_plugin.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_window.cpp b/studio/src/plugins/gui_editor/gui_editor_window.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_window.cpp
rename to studio/src/plugins/gui_editor/gui_editor_window.cpp
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_window.h b/studio/src/plugins/gui_editor/gui_editor_window.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_window.h
rename to studio/src/plugins/gui_editor/gui_editor_window.h
diff --git a/code/studio/src/plugins/gui_editor/gui_editor_window.ui b/studio/src/plugins/gui_editor/gui_editor_window.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/gui_editor_window.ui
rename to studio/src/plugins/gui_editor/gui_editor_window.ui
diff --git a/code/studio/src/plugins/gui_editor/link_editor.cpp b/studio/src/plugins/gui_editor/link_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_editor.cpp
rename to studio/src/plugins/gui_editor/link_editor.cpp
diff --git a/code/studio/src/plugins/gui_editor/link_editor.h b/studio/src/plugins/gui_editor/link_editor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_editor.h
rename to studio/src/plugins/gui_editor/link_editor.h
diff --git a/code/studio/src/plugins/gui_editor/link_editor.ui b/studio/src/plugins/gui_editor/link_editor.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_editor.ui
rename to studio/src/plugins/gui_editor/link_editor.ui
diff --git a/code/studio/src/plugins/gui_editor/link_list.cpp b/studio/src/plugins/gui_editor/link_list.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_list.cpp
rename to studio/src/plugins/gui_editor/link_list.cpp
diff --git a/code/studio/src/plugins/gui_editor/link_list.h b/studio/src/plugins/gui_editor/link_list.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_list.h
rename to studio/src/plugins/gui_editor/link_list.h
diff --git a/code/studio/src/plugins/gui_editor/link_list.ui b/studio/src/plugins/gui_editor/link_list.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/link_list.ui
rename to studio/src/plugins/gui_editor/link_list.ui
diff --git a/code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp b/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
rename to studio/src/plugins/gui_editor/nelgui_ctrl.cpp
diff --git a/code/studio/src/plugins/gui_editor/nelgui_ctrl.h b/studio/src/plugins/gui_editor/nelgui_ctrl.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/nelgui_ctrl.h
rename to studio/src/plugins/gui_editor/nelgui_ctrl.h
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.cpp b/studio/src/plugins/gui_editor/new_gui_dlg.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_gui_dlg.cpp
rename to studio/src/plugins/gui_editor/new_gui_dlg.cpp
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.h b/studio/src/plugins/gui_editor/new_gui_dlg.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_gui_dlg.h
rename to studio/src/plugins/gui_editor/new_gui_dlg.h
diff --git a/code/studio/src/plugins/gui_editor/new_gui_dlg.ui b/studio/src/plugins/gui_editor/new_gui_dlg.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_gui_dlg.ui
rename to studio/src/plugins/gui_editor/new_gui_dlg.ui
diff --git a/code/studio/src/plugins/gui_editor/new_property_widget.cpp b/studio/src/plugins/gui_editor/new_property_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_property_widget.cpp
rename to studio/src/plugins/gui_editor/new_property_widget.cpp
diff --git a/code/studio/src/plugins/gui_editor/new_property_widget.h b/studio/src/plugins/gui_editor/new_property_widget.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_property_widget.h
rename to studio/src/plugins/gui_editor/new_property_widget.h
diff --git a/code/studio/src/plugins/gui_editor/new_property_widget.ui b/studio/src/plugins/gui_editor/new_property_widget.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_property_widget.ui
rename to studio/src/plugins/gui_editor/new_property_widget.ui
diff --git a/code/studio/src/plugins/gui_editor/new_widget_widget.cpp b/studio/src/plugins/gui_editor/new_widget_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_widget_widget.cpp
rename to studio/src/plugins/gui_editor/new_widget_widget.cpp
diff --git a/code/studio/src/plugins/gui_editor/new_widget_widget.h b/studio/src/plugins/gui_editor/new_widget_widget.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_widget_widget.h
rename to studio/src/plugins/gui_editor/new_widget_widget.h
diff --git a/code/studio/src/plugins/gui_editor/new_widget_widget.ui b/studio/src/plugins/gui_editor/new_widget_widget.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/new_widget_widget.ui
rename to studio/src/plugins/gui_editor/new_widget_widget.ui
diff --git a/code/studio/src/plugins/gui_editor/proc_editor.cpp b/studio/src/plugins/gui_editor/proc_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_editor.cpp
rename to studio/src/plugins/gui_editor/proc_editor.cpp
diff --git a/code/studio/src/plugins/gui_editor/proc_editor.h b/studio/src/plugins/gui_editor/proc_editor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_editor.h
rename to studio/src/plugins/gui_editor/proc_editor.h
diff --git a/code/studio/src/plugins/gui_editor/proc_editor.ui b/studio/src/plugins/gui_editor/proc_editor.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_editor.ui
rename to studio/src/plugins/gui_editor/proc_editor.ui
diff --git a/code/studio/src/plugins/gui_editor/proc_list.cpp b/studio/src/plugins/gui_editor/proc_list.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_list.cpp
rename to studio/src/plugins/gui_editor/proc_list.cpp
diff --git a/code/studio/src/plugins/gui_editor/proc_list.h b/studio/src/plugins/gui_editor/proc_list.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_list.h
rename to studio/src/plugins/gui_editor/proc_list.h
diff --git a/code/studio/src/plugins/gui_editor/proc_list.ui b/studio/src/plugins/gui_editor/proc_list.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/proc_list.ui
rename to studio/src/plugins/gui_editor/proc_list.ui
diff --git a/code/studio/src/plugins/gui_editor/project_file_parser.cpp b/studio/src/plugins/gui_editor/project_file_parser.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_file_parser.cpp
rename to studio/src/plugins/gui_editor/project_file_parser.cpp
diff --git a/code/studio/src/plugins/gui_editor/project_file_parser.h b/studio/src/plugins/gui_editor/project_file_parser.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_file_parser.h
rename to studio/src/plugins/gui_editor/project_file_parser.h
diff --git a/code/studio/src/plugins/gui_editor/project_file_serializer.cpp b/studio/src/plugins/gui_editor/project_file_serializer.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_file_serializer.cpp
rename to studio/src/plugins/gui_editor/project_file_serializer.cpp
diff --git a/code/studio/src/plugins/gui_editor/project_file_serializer.h b/studio/src/plugins/gui_editor/project_file_serializer.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_file_serializer.h
rename to studio/src/plugins/gui_editor/project_file_serializer.h
diff --git a/code/studio/src/plugins/gui_editor/project_files.h b/studio/src/plugins/gui_editor/project_files.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_files.h
rename to studio/src/plugins/gui_editor/project_files.h
diff --git a/code/studio/src/plugins/gui_editor/project_files/login.xml b/studio/src/plugins/gui_editor/project_files/login.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_files/login.xml
rename to studio/src/plugins/gui_editor/project_files/login.xml
diff --git a/code/studio/src/plugins/gui_editor/project_window.cpp b/studio/src/plugins/gui_editor/project_window.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_window.cpp
rename to studio/src/plugins/gui_editor/project_window.cpp
diff --git a/code/studio/src/plugins/gui_editor/project_window.h b/studio/src/plugins/gui_editor/project_window.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_window.h
rename to studio/src/plugins/gui_editor/project_window.h
diff --git a/code/studio/src/plugins/gui_editor/project_window.ui b/studio/src/plugins/gui_editor/project_window.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/project_window.ui
rename to studio/src/plugins/gui_editor/project_window.ui
diff --git a/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp b/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
rename to studio/src/plugins/gui_editor/property_browser_ctrl.cpp
diff --git a/code/studio/src/plugins/gui_editor/property_browser_ctrl.h b/studio/src/plugins/gui_editor/property_browser_ctrl.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/property_browser_ctrl.h
rename to studio/src/plugins/gui_editor/property_browser_ctrl.h
diff --git a/code/studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml b/studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml
rename to studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml
diff --git a/code/studio/src/plugins/gui_editor/texture_chooser.cpp b/studio/src/plugins/gui_editor/texture_chooser.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/texture_chooser.cpp
rename to studio/src/plugins/gui_editor/texture_chooser.cpp
diff --git a/code/studio/src/plugins/gui_editor/texture_chooser.h b/studio/src/plugins/gui_editor/texture_chooser.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/texture_chooser.h
rename to studio/src/plugins/gui_editor/texture_chooser.h
diff --git a/code/studio/src/plugins/gui_editor/texture_chooser.ui b/studio/src/plugins/gui_editor/texture_chooser.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/texture_chooser.ui
rename to studio/src/plugins/gui_editor/texture_chooser.ui
diff --git a/code/studio/src/plugins/gui_editor/texture_property_manager.cpp b/studio/src/plugins/gui_editor/texture_property_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/texture_property_manager.cpp
rename to studio/src/plugins/gui_editor/texture_property_manager.cpp
diff --git a/code/studio/src/plugins/gui_editor/texture_property_manager.h b/studio/src/plugins/gui_editor/texture_property_manager.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/texture_property_manager.h
rename to studio/src/plugins/gui_editor/texture_property_manager.h
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp b/studio/src/plugins/gui_editor/widget_hierarchy.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
rename to studio/src/plugins/gui_editor/widget_hierarchy.cpp
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.h b/studio/src/plugins/gui_editor/widget_hierarchy.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_hierarchy.h
rename to studio/src/plugins/gui_editor/widget_hierarchy.h
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.ui b/studio/src/plugins/gui_editor/widget_hierarchy.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_hierarchy.ui
rename to studio/src/plugins/gui_editor/widget_hierarchy.ui
diff --git a/code/studio/src/plugins/gui_editor/widget_info.h b/studio/src/plugins/gui_editor/widget_info.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info.h
rename to studio/src/plugins/gui_editor/widget_info.h
diff --git a/code/studio/src/plugins/gui_editor/widget_info_serializer.cpp b/studio/src/plugins/gui_editor/widget_info_serializer.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info_serializer.cpp
rename to studio/src/plugins/gui_editor/widget_info_serializer.cpp
diff --git a/code/studio/src/plugins/gui_editor/widget_info_serializer.h b/studio/src/plugins/gui_editor/widget_info_serializer.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info_serializer.h
rename to studio/src/plugins/gui_editor/widget_info_serializer.h
diff --git a/code/studio/src/plugins/gui_editor/widget_info_tree.h b/studio/src/plugins/gui_editor/widget_info_tree.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info_tree.h
rename to studio/src/plugins/gui_editor/widget_info_tree.h
diff --git a/code/studio/src/plugins/gui_editor/widget_info_tree_node.h b/studio/src/plugins/gui_editor/widget_info_tree_node.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info_tree_node.h
rename to studio/src/plugins/gui_editor/widget_info_tree_node.h
diff --git a/code/studio/src/plugins/gui_editor/widget_info_tree_visitor.h b/studio/src/plugins/gui_editor/widget_info_tree_visitor.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_info_tree_visitor.h
rename to studio/src/plugins/gui_editor/widget_info_tree_visitor.h
diff --git a/code/studio/src/plugins/gui_editor/widget_properties.cpp b/studio/src/plugins/gui_editor/widget_properties.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_properties.cpp
rename to studio/src/plugins/gui_editor/widget_properties.cpp
diff --git a/code/studio/src/plugins/gui_editor/widget_properties.h b/studio/src/plugins/gui_editor/widget_properties.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_properties.h
rename to studio/src/plugins/gui_editor/widget_properties.h
diff --git a/code/studio/src/plugins/gui_editor/widget_properties.ui b/studio/src/plugins/gui_editor/widget_properties.ui
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_properties.ui
rename to studio/src/plugins/gui_editor/widget_properties.ui
diff --git a/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp b/studio/src/plugins/gui_editor/widget_properties_parser.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
rename to studio/src/plugins/gui_editor/widget_properties_parser.cpp
diff --git a/code/studio/src/plugins/gui_editor/widget_properties_parser.h b/studio/src/plugins/gui_editor/widget_properties_parser.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_properties_parser.h
rename to studio/src/plugins/gui_editor/widget_properties_parser.h
diff --git a/code/studio/src/plugins/gui_editor/widget_serializer.cpp b/studio/src/plugins/gui_editor/widget_serializer.cpp
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_serializer.cpp
rename to studio/src/plugins/gui_editor/widget_serializer.cpp
diff --git a/code/studio/src/plugins/gui_editor/widget_serializer.h b/studio/src/plugins/gui_editor/widget_serializer.h
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widget_serializer.h
rename to studio/src/plugins/gui_editor/widget_serializer.h
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlBase.xml b/studio/src/plugins/gui_editor/widgets/CtrlBase.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlBase.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlBase.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml b/studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml b/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlButton.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml b/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml b/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml b/studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml b/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
rename to studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml b/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
rename to studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml b/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
rename to studio/src/plugins/gui_editor/widgets/DBViewBar.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml b/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
rename to studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml b/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
rename to studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml b/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
rename to studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml b/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
rename to studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupCell.xml b/studio/src/plugins/gui_editor/widgets/GroupCell.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupCell.xml
rename to studio/src/plugins/gui_editor/widgets/GroupCell.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml b/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
rename to studio/src/plugins/gui_editor/widgets/GroupContainer.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml b/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
rename to studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml b/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml
rename to studio/src/plugins/gui_editor/widgets/GroupEditBoxDecor.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupFrame.xml b/studio/src/plugins/gui_editor/widgets/GroupFrame.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupFrame.xml
rename to studio/src/plugins/gui_editor/widgets/GroupFrame.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml b/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
rename to studio/src/plugins/gui_editor/widgets/GroupHTML.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml b/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
rename to studio/src/plugins/gui_editor/widgets/GroupHeader.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupList.xml b/studio/src/plugins/gui_editor/widgets/GroupList.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupList.xml
rename to studio/src/plugins/gui_editor/widgets/GroupList.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml b/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
rename to studio/src/plugins/gui_editor/widgets/GroupMenu.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml b/studio/src/plugins/gui_editor/widgets/GroupModal.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
rename to studio/src/plugins/gui_editor/widgets/GroupModal.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupParagraph.xml b/studio/src/plugins/gui_editor/widgets/GroupParagraph.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupParagraph.xml
rename to studio/src/plugins/gui_editor/widgets/GroupParagraph.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml b/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
rename to studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml b/studio/src/plugins/gui_editor/widgets/GroupTab.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
rename to studio/src/plugins/gui_editor/widgets/GroupTab.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml b/studio/src/plugins/gui_editor/widgets/GroupTable.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
rename to studio/src/plugins/gui_editor/widgets/GroupTable.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml b/studio/src/plugins/gui_editor/widgets/GroupTree.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
rename to studio/src/plugins/gui_editor/widgets/GroupTree.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/InterfaceElement.xml b/studio/src/plugins/gui_editor/widgets/InterfaceElement.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/InterfaceElement.xml
rename to studio/src/plugins/gui_editor/widgets/InterfaceElement.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml b/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
rename to studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml b/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
rename to studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/RootGroup.xml b/studio/src/plugins/gui_editor/widgets/RootGroup.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/RootGroup.xml
rename to studio/src/plugins/gui_editor/widgets/RootGroup.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml b/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
rename to studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml b/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
rename to studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewText.xml b/studio/src/plugins/gui_editor/widgets/ViewText.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewText.xml
rename to studio/src/plugins/gui_editor/widgets/ViewText.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml b/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
rename to studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml b/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
rename to studio/src/plugins/gui_editor/widgets/ViewTextID.xml
diff --git a/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml b/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
rename to studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
diff --git a/code/studio/src/plugins/landscape_editor/CMakeLists.txt b/studio/src/plugins/landscape_editor/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/CMakeLists.txt
rename to studio/src/plugins/landscape_editor/CMakeLists.txt
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone.cpp b/studio/src/plugins/landscape_editor/builder_zone.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone.cpp
rename to studio/src/plugins/landscape_editor/builder_zone.cpp
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone.h b/studio/src/plugins/landscape_editor/builder_zone.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone.h
rename to studio/src/plugins/landscape_editor/builder_zone.h
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone_base.cpp b/studio/src/plugins/landscape_editor/builder_zone_base.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone_base.cpp
rename to studio/src/plugins/landscape_editor/builder_zone_base.cpp
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone_base.h b/studio/src/plugins/landscape_editor/builder_zone_base.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone_base.h
rename to studio/src/plugins/landscape_editor/builder_zone_base.h
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone_region.cpp b/studio/src/plugins/landscape_editor/builder_zone_region.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone_region.cpp
rename to studio/src/plugins/landscape_editor/builder_zone_region.cpp
diff --git a/code/studio/src/plugins/landscape_editor/builder_zone_region.h b/studio/src/plugins/landscape_editor/builder_zone_region.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/builder_zone_region.h
rename to studio/src/plugins/landscape_editor/builder_zone_region.h
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_grid.png b/studio/src/plugins/landscape_editor/icons/ic_grid.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_grid.png
rename to studio/src/plugins/landscape_editor/icons/ic_grid.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png b/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png b/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png b/studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png b/studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_zone.png b/studio/src/plugins/landscape_editor/icons/ic_nel_zone.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_zone.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_zone.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png b/studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_nel_zones.png b/studio/src/plugins/landscape_editor/icons/ic_nel_zones.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_nel_zones.png
rename to studio/src/plugins/landscape_editor/icons/ic_nel_zones.png
diff --git a/code/studio/src/plugins/landscape_editor/icons/ic_snapshot.png b/studio/src/plugins/landscape_editor/icons/ic_snapshot.png
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/icons/ic_snapshot.png
rename to studio/src/plugins/landscape_editor/icons/ic_snapshot.png
diff --git a/code/studio/src/plugins/landscape_editor/landscape_actions.cpp b/studio/src/plugins/landscape_editor/landscape_actions.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_actions.cpp
rename to studio/src/plugins/landscape_editor/landscape_actions.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_actions.h b/studio/src/plugins/landscape_editor/landscape_actions.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_actions.h
rename to studio/src/plugins/landscape_editor/landscape_actions.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor.qrc b/studio/src/plugins/landscape_editor/landscape_editor.qrc
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor.qrc
rename to studio/src/plugins/landscape_editor/landscape_editor.qrc
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_constants.h b/studio/src/plugins/landscape_editor/landscape_editor_constants.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_constants.h
rename to studio/src/plugins/landscape_editor/landscape_editor_constants.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_global.h b/studio/src/plugins/landscape_editor/landscape_editor_global.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_global.h
rename to studio/src/plugins/landscape_editor/landscape_editor_global.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp b/studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp
rename to studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_plugin.h b/studio/src/plugins/landscape_editor/landscape_editor_plugin.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_plugin.h
rename to studio/src/plugins/landscape_editor/landscape_editor_plugin.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_window.cpp b/studio/src/plugins/landscape_editor/landscape_editor_window.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_window.cpp
rename to studio/src/plugins/landscape_editor/landscape_editor_window.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_window.h b/studio/src/plugins/landscape_editor/landscape_editor_window.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_window.h
rename to studio/src/plugins/landscape_editor/landscape_editor_window.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_editor_window.ui b/studio/src/plugins/landscape_editor/landscape_editor_window.ui
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_editor_window.ui
rename to studio/src/plugins/landscape_editor/landscape_editor_window.ui
diff --git a/code/studio/src/plugins/landscape_editor/landscape_scene.cpp b/studio/src/plugins/landscape_editor/landscape_scene.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_scene.cpp
rename to studio/src/plugins/landscape_editor/landscape_scene.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_scene.h b/studio/src/plugins/landscape_editor/landscape_scene.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_scene.h
rename to studio/src/plugins/landscape_editor/landscape_scene.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_scene_base.cpp b/studio/src/plugins/landscape_editor/landscape_scene_base.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_scene_base.cpp
rename to studio/src/plugins/landscape_editor/landscape_scene_base.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_scene_base.h b/studio/src/plugins/landscape_editor/landscape_scene_base.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_scene_base.h
rename to studio/src/plugins/landscape_editor/landscape_scene_base.h
diff --git a/code/studio/src/plugins/landscape_editor/landscape_view.cpp b/studio/src/plugins/landscape_editor/landscape_view.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_view.cpp
rename to studio/src/plugins/landscape_editor/landscape_view.cpp
diff --git a/code/studio/src/plugins/landscape_editor/landscape_view.h b/studio/src/plugins/landscape_editor/landscape_view.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/landscape_view.h
rename to studio/src/plugins/landscape_editor/landscape_view.h
diff --git a/code/studio/src/plugins/landscape_editor/list_zones_model.cpp b/studio/src/plugins/landscape_editor/list_zones_model.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/list_zones_model.cpp
rename to studio/src/plugins/landscape_editor/list_zones_model.cpp
diff --git a/code/studio/src/plugins/landscape_editor/list_zones_model.h b/studio/src/plugins/landscape_editor/list_zones_model.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/list_zones_model.h
rename to studio/src/plugins/landscape_editor/list_zones_model.h
diff --git a/code/studio/src/plugins/landscape_editor/list_zones_widget.cpp b/studio/src/plugins/landscape_editor/list_zones_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/list_zones_widget.cpp
rename to studio/src/plugins/landscape_editor/list_zones_widget.cpp
diff --git a/code/studio/src/plugins/landscape_editor/list_zones_widget.h b/studio/src/plugins/landscape_editor/list_zones_widget.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/list_zones_widget.h
rename to studio/src/plugins/landscape_editor/list_zones_widget.h
diff --git a/code/studio/src/plugins/landscape_editor/list_zones_widget.ui b/studio/src/plugins/landscape_editor/list_zones_widget.ui
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/list_zones_widget.ui
rename to studio/src/plugins/landscape_editor/list_zones_widget.ui
diff --git a/code/studio/src/plugins/landscape_editor/pixmap_database.cpp b/studio/src/plugins/landscape_editor/pixmap_database.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/pixmap_database.cpp
rename to studio/src/plugins/landscape_editor/pixmap_database.cpp
diff --git a/code/studio/src/plugins/landscape_editor/pixmap_database.h b/studio/src/plugins/landscape_editor/pixmap_database.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/pixmap_database.h
rename to studio/src/plugins/landscape_editor/pixmap_database.h
diff --git a/code/studio/src/plugins/landscape_editor/project_settings_dialog.cpp b/studio/src/plugins/landscape_editor/project_settings_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/project_settings_dialog.cpp
rename to studio/src/plugins/landscape_editor/project_settings_dialog.cpp
diff --git a/code/studio/src/plugins/landscape_editor/project_settings_dialog.h b/studio/src/plugins/landscape_editor/project_settings_dialog.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/project_settings_dialog.h
rename to studio/src/plugins/landscape_editor/project_settings_dialog.h
diff --git a/code/studio/src/plugins/landscape_editor/project_settings_dialog.ui b/studio/src/plugins/landscape_editor/project_settings_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/project_settings_dialog.ui
rename to studio/src/plugins/landscape_editor/project_settings_dialog.ui
diff --git a/code/studio/src/plugins/landscape_editor/shapshot_dialog.ui b/studio/src/plugins/landscape_editor/shapshot_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/shapshot_dialog.ui
rename to studio/src/plugins/landscape_editor/shapshot_dialog.ui
diff --git a/code/studio/src/plugins/landscape_editor/snapshot_dialog.cpp b/studio/src/plugins/landscape_editor/snapshot_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/snapshot_dialog.cpp
rename to studio/src/plugins/landscape_editor/snapshot_dialog.cpp
diff --git a/code/studio/src/plugins/landscape_editor/snapshot_dialog.h b/studio/src/plugins/landscape_editor/snapshot_dialog.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/snapshot_dialog.h
rename to studio/src/plugins/landscape_editor/snapshot_dialog.h
diff --git a/code/studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml b/studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml
rename to studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml
diff --git a/code/studio/src/plugins/landscape_editor/zone_region_editor.cpp b/studio/src/plugins/landscape_editor/zone_region_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/zone_region_editor.cpp
rename to studio/src/plugins/landscape_editor/zone_region_editor.cpp
diff --git a/code/studio/src/plugins/landscape_editor/zone_region_editor.h b/studio/src/plugins/landscape_editor/zone_region_editor.h
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/zone_region_editor.h
rename to studio/src/plugins/landscape_editor/zone_region_editor.h
diff --git a/code/studio/src/plugins/log/CMakeLists.txt b/studio/src/plugins/log/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/log/CMakeLists.txt
rename to studio/src/plugins/log/CMakeLists.txt
diff --git a/code/studio/src/plugins/log/log_form.ui b/studio/src/plugins/log/log_form.ui
similarity index 100%
rename from code/studio/src/plugins/log/log_form.ui
rename to studio/src/plugins/log/log_form.ui
diff --git a/code/studio/src/plugins/log/log_plugin.cpp b/studio/src/plugins/log/log_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/log/log_plugin.cpp
rename to studio/src/plugins/log/log_plugin.cpp
diff --git a/code/studio/src/plugins/log/log_plugin.h b/studio/src/plugins/log/log_plugin.h
similarity index 100%
rename from code/studio/src/plugins/log/log_plugin.h
rename to studio/src/plugins/log/log_plugin.h
diff --git a/code/studio/src/plugins/log/log_settings_page.cpp b/studio/src/plugins/log/log_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/log/log_settings_page.cpp
rename to studio/src/plugins/log/log_settings_page.cpp
diff --git a/code/studio/src/plugins/log/log_settings_page.h b/studio/src/plugins/log/log_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/log/log_settings_page.h
rename to studio/src/plugins/log/log_settings_page.h
diff --git a/code/studio/src/plugins/log/log_settings_page.ui b/studio/src/plugins/log/log_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/log/log_settings_page.ui
rename to studio/src/plugins/log/log_settings_page.ui
diff --git a/code/studio/src/plugins/log/qt_displayer.cpp b/studio/src/plugins/log/qt_displayer.cpp
similarity index 100%
rename from code/studio/src/plugins/log/qt_displayer.cpp
rename to studio/src/plugins/log/qt_displayer.cpp
diff --git a/code/studio/src/plugins/log/qt_displayer.h b/studio/src/plugins/log/qt_displayer.h
similarity index 100%
rename from code/studio/src/plugins/log/qt_displayer.h
rename to studio/src/plugins/log/qt_displayer.h
diff --git a/code/studio/src/plugins/log/studio_plugin_log.xml b/studio/src/plugins/log/studio_plugin_log.xml
similarity index 100%
rename from code/studio/src/plugins/log/studio_plugin_log.xml
rename to studio/src/plugins/log/studio_plugin_log.xml
diff --git a/code/studio/src/plugins/mission_compiler/CMakeLists.txt b/studio/src/plugins/mission_compiler/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/CMakeLists.txt
rename to studio/src/plugins/mission_compiler/CMakeLists.txt
diff --git a/code/studio/src/plugins/mission_compiler/images/arrow-left-2.png b/studio/src/plugins/mission_compiler/images/arrow-left-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/arrow-left-2.png
rename to studio/src/plugins/mission_compiler/images/arrow-left-2.png
diff --git a/code/studio/src/plugins/mission_compiler/images/arrow-left-double-2.png b/studio/src/plugins/mission_compiler/images/arrow-left-double-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/arrow-left-double-2.png
rename to studio/src/plugins/mission_compiler/images/arrow-left-double-2.png
diff --git a/code/studio/src/plugins/mission_compiler/images/arrow-right-2.png b/studio/src/plugins/mission_compiler/images/arrow-right-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/arrow-right-2.png
rename to studio/src/plugins/mission_compiler/images/arrow-right-2.png
diff --git a/code/studio/src/plugins/mission_compiler/images/arrow-right-double-2.png b/studio/src/plugins/mission_compiler/images/arrow-right-double-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/arrow-right-double-2.png
rename to studio/src/plugins/mission_compiler/images/arrow-right-double-2.png
diff --git a/code/studio/src/plugins/mission_compiler/images/document-export-4.png b/studio/src/plugins/mission_compiler/images/document-export-4.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/document-export-4.png
rename to studio/src/plugins/mission_compiler/images/document-export-4.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_add_item.png b/studio/src/plugins/mission_compiler/images/ic_nel_add_item.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_add_item.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_add_item.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png b/studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_down_item.png b/studio/src/plugins/mission_compiler/images/ic_nel_down_item.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_down_item.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_down_item.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png b/studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png b/studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png
diff --git a/code/studio/src/plugins/mission_compiler/images/ic_nel_up_item.png b/studio/src/plugins/mission_compiler/images/ic_nel_up_item.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/ic_nel_up_item.png
rename to studio/src/plugins/mission_compiler/images/ic_nel_up_item.png
diff --git a/code/studio/src/plugins/mission_compiler/images/news-subscribe-2.png b/studio/src/plugins/mission_compiler/images/news-subscribe-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/news-subscribe-2.png
rename to studio/src/plugins/mission_compiler/images/news-subscribe-2.png
diff --git a/code/studio/src/plugins/mission_compiler/images/run-build-2.png b/studio/src/plugins/mission_compiler/images/run-build-2.png
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/images/run-build-2.png
rename to studio/src/plugins/mission_compiler/images/run-build-2.png
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler.qrc b/studio/src/plugins/mission_compiler/mission_compiler.qrc
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler.qrc
rename to studio/src/plugins/mission_compiler/mission_compiler.qrc
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp b/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
rename to studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h b/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
rename to studio/src/plugins/mission_compiler/mission_compiler_main_window.h
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.ui b/studio/src/plugins/mission_compiler/mission_compiler_main_window.ui
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_main_window.ui
rename to studio/src/plugins/mission_compiler/mission_compiler_main_window.ui
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp b/studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp
rename to studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h b/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
rename to studio/src/plugins/mission_compiler/mission_compiler_plugin.h
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h b/studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
rename to studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp b/studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
rename to studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.h b/studio/src/plugins/mission_compiler/mission_compiler_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.h
rename to studio/src/plugins/mission_compiler/mission_compiler_settings_page.h
diff --git a/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui b/studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui
rename to studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui
diff --git a/code/studio/src/plugins/mission_compiler/server_entry_dialog.cpp b/studio/src/plugins/mission_compiler/server_entry_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/server_entry_dialog.cpp
rename to studio/src/plugins/mission_compiler/server_entry_dialog.cpp
diff --git a/code/studio/src/plugins/mission_compiler/server_entry_dialog.h b/studio/src/plugins/mission_compiler/server_entry_dialog.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/server_entry_dialog.h
rename to studio/src/plugins/mission_compiler/server_entry_dialog.h
diff --git a/code/studio/src/plugins/mission_compiler/server_entry_dialog.ui b/studio/src/plugins/mission_compiler/server_entry_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/server_entry_dialog.ui
rename to studio/src/plugins/mission_compiler/server_entry_dialog.ui
diff --git a/code/studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml b/studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml
rename to studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml
diff --git a/code/studio/src/plugins/mission_compiler/validation_file.cpp b/studio/src/plugins/mission_compiler/validation_file.cpp
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/validation_file.cpp
rename to studio/src/plugins/mission_compiler/validation_file.cpp
diff --git a/code/studio/src/plugins/mission_compiler/validation_file.h b/studio/src/plugins/mission_compiler/validation_file.h
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/validation_file.h
rename to studio/src/plugins/mission_compiler/validation_file.h
diff --git a/code/studio/src/plugins/object_viewer/CMakeLists.txt b/studio/src/plugins/object_viewer/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/object_viewer/CMakeLists.txt
rename to studio/src/plugins/object_viewer/CMakeLists.txt
diff --git a/code/studio/src/plugins/object_viewer/graphics_settings_page.cpp b/studio/src/plugins/object_viewer/graphics_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/graphics_settings_page.cpp
rename to studio/src/plugins/object_viewer/graphics_settings_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/graphics_settings_page.h b/studio/src/plugins/object_viewer/graphics_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/graphics_settings_page.h
rename to studio/src/plugins/object_viewer/graphics_settings_page.h
diff --git a/code/studio/src/plugins/object_viewer/graphics_settings_page.ui b/studio/src/plugins/object_viewer/graphics_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/graphics_settings_page.ui
rename to studio/src/plugins/object_viewer/graphics_settings_page.ui
diff --git a/code/studio/src/plugins/object_viewer/graphics_viewport.cpp b/studio/src/plugins/object_viewer/graphics_viewport.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/graphics_viewport.cpp
rename to studio/src/plugins/object_viewer/graphics_viewport.cpp
diff --git a/code/studio/src/plugins/object_viewer/graphics_viewport.h b/studio/src/plugins/object_viewer/graphics_viewport.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/graphics_viewport.h
rename to studio/src/plugins/object_viewer/graphics_viewport.h
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_add_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_add_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_add_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_add_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_anim.png b/studio/src/plugins/object_viewer/icons/ic_nel_anim.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_anim.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_anim.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_animset.png b/studio/src/plugins/object_viewer/icons/ic_nel_animset.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_animset.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_animset.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_append_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_append_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_append_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_append_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png b/studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png b/studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png b/studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png b/studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png b/studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_daynight.png b/studio/src/plugins/object_viewer/icons/ic_nel_daynight.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_daynight.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_daynight.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_down_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_down_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_down_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_down_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png b/studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_mixer.png b/studio/src/plugins/object_viewer/icons/ic_nel_mixer.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_mixer.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_mixer.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png b/studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_new.png b/studio/src/plugins/object_viewer/icons/ic_nel_new.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_new.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_new.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_open.png b/studio/src/plugins/object_viewer/icons/ic_nel_open.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_open.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_open.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png b/studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png b/studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_particles.png b/studio/src/plugins/object_viewer/icons/ic_nel_particles.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_particles.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_particles.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_pill.png b/studio/src/plugins/object_viewer/icons/ic_nel_pill.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_pill.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_pill.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png b/studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png b/studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_save.png b/studio/src/plugins/object_viewer/icons/ic_nel_save.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_save.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_save.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_save_as.png b/studio/src/plugins/object_viewer/icons/ic_nel_save_as.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_save_as.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_save_as.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png b/studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_sound.png b/studio/src/plugins/object_viewer/icons/ic_nel_sound.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_sound.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_sound.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_up_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_up_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_up_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_up_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_veget.png b/studio/src/plugins/object_viewer/icons/ic_nel_veget.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_veget.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_veget.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png b/studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_water.png b/studio/src/plugins/object_viewer/icons/ic_nel_water.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_water.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_water.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_wind.png b/studio/src/plugins/object_viewer/icons/ic_nel_wind.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_wind.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_wind.png
diff --git a/code/studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png b/studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
rename to studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png b/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
rename to studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
diff --git a/code/studio/src/plugins/object_viewer/images/dqynight.png b/studio/src/plugins/object_viewer/images/dqynight.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/dqynight.png
rename to studio/src/plugins/object_viewer/images/dqynight.png
diff --git a/code/studio/src/plugins/object_viewer/images/ico_mrm_mesh.png b/studio/src/plugins/object_viewer/images/ico_mrm_mesh.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/ico_mrm_mesh.png
rename to studio/src/plugins/object_viewer/images/ico_mrm_mesh.png
diff --git a/code/studio/src/plugins/object_viewer/images/mixer.png b/studio/src/plugins/object_viewer/images/mixer.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/mixer.png
rename to studio/src/plugins/object_viewer/images/mixer.png
diff --git a/code/studio/src/plugins/object_viewer/images/nel.png b/studio/src/plugins/object_viewer/images/nel.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/nel.png
rename to studio/src/plugins/object_viewer/images/nel.png
diff --git a/code/studio/src/plugins/object_viewer/images/pause.png b/studio/src/plugins/object_viewer/images/pause.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/pause.png
rename to studio/src/plugins/object_viewer/images/pause.png
diff --git a/code/studio/src/plugins/object_viewer/images/play.png b/studio/src/plugins/object_viewer/images/play.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/play.png
rename to studio/src/plugins/object_viewer/images/play.png
diff --git a/code/studio/src/plugins/object_viewer/images/polymode.png b/studio/src/plugins/object_viewer/images/polymode.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/polymode.png
rename to studio/src/plugins/object_viewer/images/polymode.png
diff --git a/code/studio/src/plugins/object_viewer/images/pqrticles.png b/studio/src/plugins/object_viewer/images/pqrticles.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/pqrticles.png
rename to studio/src/plugins/object_viewer/images/pqrticles.png
diff --git a/code/studio/src/plugins/object_viewer/images/refresh.png b/studio/src/plugins/object_viewer/images/refresh.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/refresh.png
rename to studio/src/plugins/object_viewer/images/refresh.png
diff --git a/code/studio/src/plugins/object_viewer/images/rmfill.png b/studio/src/plugins/object_viewer/images/rmfill.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/rmfill.png
rename to studio/src/plugins/object_viewer/images/rmfill.png
diff --git a/code/studio/src/plugins/object_viewer/images/rmline.png b/studio/src/plugins/object_viewer/images/rmline.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/rmline.png
rename to studio/src/plugins/object_viewer/images/rmline.png
diff --git a/code/studio/src/plugins/object_viewer/images/rmpoints.png b/studio/src/plugins/object_viewer/images/rmpoints.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/rmpoints.png
rename to studio/src/plugins/object_viewer/images/rmpoints.png
diff --git a/code/studio/src/plugins/object_viewer/images/seek-backward.png b/studio/src/plugins/object_viewer/images/seek-backward.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/seek-backward.png
rename to studio/src/plugins/object_viewer/images/seek-backward.png
diff --git a/code/studio/src/plugins/object_viewer/images/seek-forward.png b/studio/src/plugins/object_viewer/images/seek-forward.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/seek-forward.png
rename to studio/src/plugins/object_viewer/images/seek-forward.png
diff --git a/code/studio/src/plugins/object_viewer/images/skip-backward.png b/studio/src/plugins/object_viewer/images/skip-backward.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/skip-backward.png
rename to studio/src/plugins/object_viewer/images/skip-backward.png
diff --git a/code/studio/src/plugins/object_viewer/images/skip-forward.png b/studio/src/plugins/object_viewer/images/skip-forward.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/skip-forward.png
rename to studio/src/plugins/object_viewer/images/skip-forward.png
diff --git a/code/studio/src/plugins/object_viewer/images/sound.png b/studio/src/plugins/object_viewer/images/sound.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/sound.png
rename to studio/src/plugins/object_viewer/images/sound.png
diff --git a/code/studio/src/plugins/object_viewer/images/stop.png b/studio/src/plugins/object_viewer/images/stop.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/stop.png
rename to studio/src/plugins/object_viewer/images/stop.png
diff --git a/code/studio/src/plugins/object_viewer/images/water.png b/studio/src/plugins/object_viewer/images/water.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/water.png
rename to studio/src/plugins/object_viewer/images/water.png
diff --git a/code/studio/src/plugins/object_viewer/images/wind.png b/studio/src/plugins/object_viewer/images/wind.png
similarity index 100%
rename from code/studio/src/plugins/object_viewer/images/wind.png
rename to studio/src/plugins/object_viewer/images/wind.png
diff --git a/code/studio/src/plugins/object_viewer/main_window.cpp b/studio/src/plugins/object_viewer/main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/main_window.cpp
rename to studio/src/plugins/object_viewer/main_window.cpp
diff --git a/code/studio/src/plugins/object_viewer/main_window.h b/studio/src/plugins/object_viewer/main_window.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/main_window.h
rename to studio/src/plugins/object_viewer/main_window.h
diff --git a/code/studio/src/plugins/object_viewer/modules.cpp b/studio/src/plugins/object_viewer/modules.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/modules.cpp
rename to studio/src/plugins/object_viewer/modules.cpp
diff --git a/code/studio/src/plugins/object_viewer/modules.h b/studio/src/plugins/object_viewer/modules.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/modules.h
rename to studio/src/plugins/object_viewer/modules.h
diff --git a/code/studio/src/plugins/object_viewer/object_viewer.cpp b/studio/src/plugins/object_viewer/object_viewer.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer.cpp
rename to studio/src/plugins/object_viewer/object_viewer.cpp
diff --git a/code/studio/src/plugins/object_viewer/object_viewer.h b/studio/src/plugins/object_viewer/object_viewer.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer.h
rename to studio/src/plugins/object_viewer/object_viewer.h
diff --git a/code/studio/src/plugins/object_viewer/object_viewer.qrc b/studio/src/plugins/object_viewer/object_viewer.qrc
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer.qrc
rename to studio/src/plugins/object_viewer/object_viewer.qrc
diff --git a/code/studio/src/plugins/object_viewer/object_viewer_constants.h b/studio/src/plugins/object_viewer/object_viewer_constants.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer_constants.h
rename to studio/src/plugins/object_viewer/object_viewer_constants.h
diff --git a/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp b/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
rename to studio/src/plugins/object_viewer/object_viewer_plugin.cpp
diff --git a/code/studio/src/plugins/object_viewer/object_viewer_plugin.h b/studio/src/plugins/object_viewer/object_viewer_plugin.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/object_viewer_plugin.h
rename to studio/src/plugins/object_viewer/object_viewer_plugin.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/attrib_form.ui b/studio/src/plugins/object_viewer/particle_system/attrib_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/attrib_form.ui
rename to studio/src/plugins/object_viewer/particle_system/attrib_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp b/studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/attrib_widget.h b/studio/src/plugins/object_viewer/particle_system/attrib_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/attrib_widget.h
rename to studio/src/plugins/object_viewer/particle_system/attrib_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h b/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui b/studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui
rename to studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui b/studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui
rename to studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp b/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h b/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h
rename to studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h b/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui b/studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
rename to studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp b/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h b/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
rename to studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/curve_dialog.h b/studio/src/plugins/object_viewer/particle_system/curve_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/curve_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/curve_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/curve_form.ui b/studio/src/plugins/object_viewer/particle_system/curve_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/curve_form.ui
rename to studio/src/plugins/object_viewer/particle_system/curve_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/direction_form.ui b/studio/src/plugins/object_viewer/particle_system/direction_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/direction_form.ui
rename to studio/src/plugins/object_viewer/particle_system/direction_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/direction_widget.cpp b/studio/src/plugins/object_viewer/particle_system/direction_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/direction_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/direction_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/direction_widget.h b/studio/src/plugins/object_viewer/particle_system/direction_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/direction_widget.h
rename to studio/src/plugins/object_viewer/particle_system/direction_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp b/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
rename to studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.h b/studio/src/plugins/object_viewer/particle_system/dup_ps.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/dup_ps.h
rename to studio/src/plugins/object_viewer/particle_system/dup_ps.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/emitter_form.ui b/studio/src/plugins/object_viewer/particle_system/emitter_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/emitter_form.ui
rename to studio/src/plugins/object_viewer/particle_system/emitter_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/emitter_page.cpp b/studio/src/plugins/object_viewer/particle_system/emitter_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/emitter_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/emitter_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/emitter_page.h b/studio/src/plugins/object_viewer/particle_system/emitter_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/emitter_page.h
rename to studio/src/plugins/object_viewer/particle_system/emitter_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h b/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui b/studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui
rename to studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp b/studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.h b/studio/src/plugins/object_viewer/particle_system/located_bindable_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.h
rename to studio/src/plugins/object_viewer/particle_system/located_bindable_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_form.ui b/studio/src/plugins/object_viewer/particle_system/located_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_form.ui
rename to studio/src/plugins/object_viewer/particle_system/located_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_page.cpp b/studio/src/plugins/object_viewer/particle_system/located_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/located_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/located_page.h b/studio/src/plugins/object_viewer/particle_system/located_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/located_page.h
rename to studio/src/plugins/object_viewer/particle_system/located_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/mesh_form.ui b/studio/src/plugins/object_viewer/particle_system/mesh_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/mesh_form.ui
rename to studio/src/plugins/object_viewer/particle_system/mesh_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp b/studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/mesh_widget.h b/studio/src/plugins/object_viewer/particle_system/mesh_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/mesh_widget.h
rename to studio/src/plugins/object_viewer/particle_system/mesh_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h b/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui b/studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
rename to studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h b/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui b/studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui
rename to studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h b/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_control_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_control_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_control_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_control_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_editor.cpp b/studio/src/plugins/object_viewer/particle_system/particle_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_editor.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_editor.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_editor.h b/studio/src/plugins/object_viewer/particle_system/particle_editor.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_editor.h
rename to studio/src/plugins/object_viewer/particle_system/particle_editor.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_force_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_force_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_force_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_force_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_force_page.h b/studio/src/plugins/object_viewer/particle_system/particle_force_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_force_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_force_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_light_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_light_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_light_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_light_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_light_page.h b/studio/src/plugins/object_viewer/particle_system/particle_light_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_light_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_light_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h b/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp b/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_node.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.h b/studio/src/plugins/object_viewer/particle_system/particle_node.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_node.h
rename to studio/src/plugins/object_viewer/particle_system/particle_node.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h b/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.h b/studio/src/plugins/object_viewer/particle_system/particle_sound_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_sound_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_system_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_system_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_system_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_system_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_system_page.h b/studio/src/plugins/object_viewer/particle_system/particle_system_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_system_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_system_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp b/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h b/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp b/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h b/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h
rename to studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp b/studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.h b/studio/src/plugins/object_viewer/particle_system/particle_tree_model.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.h
rename to studio/src/plugins/object_viewer/particle_system/particle_tree_model.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h b/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h b/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui b/studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui
rename to studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp b/studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.h b/studio/src/plugins/object_viewer/particle_system/particle_zone_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.h
rename to studio/src/plugins/object_viewer/particle_system/particle_zone_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp b/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
rename to studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h b/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h
rename to studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui b/studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui
rename to studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp b/studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
rename to studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.h b/studio/src/plugins/object_viewer/particle_system/ps_mover_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.h
rename to studio/src/plugins/object_viewer/particle_system/ps_mover_page.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/ps_wrapper.h b/studio/src/plugins/object_viewer/particle_system/ps_wrapper.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/ps_wrapper.h
rename to studio/src/plugins/object_viewer/particle_system/ps_wrapper.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h b/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui b/studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
rename to studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp b/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
rename to studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h b/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
rename to studio/src/plugins/object_viewer/particle_system/scheme_manager.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.h b/studio/src/plugins/object_viewer/particle_system/spinner_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/spinner_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/tail_form.ui b/studio/src/plugins/object_viewer/particle_system/tail_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/tail_form.ui
rename to studio/src/plugins/object_viewer/particle_system/tail_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp b/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
rename to studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h b/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h
rename to studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h b/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h b/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp b/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
rename to studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h b/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
rename to studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui b/studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui
rename to studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui
diff --git a/code/studio/src/plugins/object_viewer/particle_system/workspace_form.ui b/studio/src/plugins/object_viewer/particle_system/workspace_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/particle_system/workspace_form.ui
rename to studio/src/plugins/object_viewer/particle_system/workspace_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_dialog.cpp b/studio/src/plugins/object_viewer/scene/animation_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/animation_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_dialog.h b/studio/src/plugins/object_viewer/scene/animation_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_dialog.h
rename to studio/src/plugins/object_viewer/scene/animation_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_form.ui b/studio/src/plugins/object_viewer/scene/animation_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_form.ui
rename to studio/src/plugins/object_viewer/scene/animation_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp b/studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_set_dialog.h b/studio/src/plugins/object_viewer/scene/animation_set_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_set_dialog.h
rename to studio/src/plugins/object_viewer/scene/animation_set_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/animation_set_form.ui b/studio/src/plugins/object_viewer/scene/animation_set_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/animation_set_form.ui
rename to studio/src/plugins/object_viewer/scene/animation_set_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/camera_control.cpp b/studio/src/plugins/object_viewer/scene/camera_control.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/camera_control.cpp
rename to studio/src/plugins/object_viewer/scene/camera_control.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/camera_control.h b/studio/src/plugins/object_viewer/scene/camera_control.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/camera_control.h
rename to studio/src/plugins/object_viewer/scene/camera_control.h
diff --git a/code/studio/src/plugins/object_viewer/scene/day_night_dialog.cpp b/studio/src/plugins/object_viewer/scene/day_night_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/day_night_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/day_night_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/day_night_dialog.h b/studio/src/plugins/object_viewer/scene/day_night_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/day_night_dialog.h
rename to studio/src/plugins/object_viewer/scene/day_night_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/day_night_form.ui b/studio/src/plugins/object_viewer/scene/day_night_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/day_night_form.ui
rename to studio/src/plugins/object_viewer/scene/day_night_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/entity.cpp b/studio/src/plugins/object_viewer/scene/entity.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/entity.cpp
rename to studio/src/plugins/object_viewer/scene/entity.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/entity.h b/studio/src/plugins/object_viewer/scene/entity.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/entity.h
rename to studio/src/plugins/object_viewer/scene/entity.h
diff --git a/code/studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp b/studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/global_wind_dialog.h b/studio/src/plugins/object_viewer/scene/global_wind_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/global_wind_dialog.h
rename to studio/src/plugins/object_viewer/scene/global_wind_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/global_wind_form.ui b/studio/src/plugins/object_viewer/scene/global_wind_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/global_wind_form.ui
rename to studio/src/plugins/object_viewer/scene/global_wind_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp b/studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.h b/studio/src/plugins/object_viewer/scene/setup_fog_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.h
rename to studio/src/plugins/object_viewer/scene/setup_fog_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/setup_fog_form.ui b/studio/src/plugins/object_viewer/scene/setup_fog_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/setup_fog_form.ui
rename to studio/src/plugins/object_viewer/scene/setup_fog_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp b/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h b/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
rename to studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui b/studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui
rename to studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp b/studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
rename to studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.h b/studio/src/plugins/object_viewer/scene/skeleton_tree_model.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.h
rename to studio/src/plugins/object_viewer/scene/skeleton_tree_model.h
diff --git a/code/studio/src/plugins/object_viewer/scene/slot_form.ui b/studio/src/plugins/object_viewer/scene/slot_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/slot_form.ui
rename to studio/src/plugins/object_viewer/scene/slot_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp b/studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.h b/studio/src/plugins/object_viewer/scene/slot_manager_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.h
rename to studio/src/plugins/object_viewer/scene/slot_manager_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp b/studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/sun_color_dialog.h b/studio/src/plugins/object_viewer/scene/sun_color_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/sun_color_dialog.h
rename to studio/src/plugins/object_viewer/scene/sun_color_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/sun_color_form.ui b/studio/src/plugins/object_viewer/scene/sun_color_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/sun_color_form.ui
rename to studio/src/plugins/object_viewer/scene/sun_color_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp b/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h b/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h
rename to studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_mrm_form.ui b/studio/src/plugins/object_viewer/scene/tune_mrm_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_mrm_form.ui
rename to studio/src/plugins/object_viewer/scene/tune_mrm_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp b/studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.h b/studio/src/plugins/object_viewer/scene/tune_timer_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.h
rename to studio/src/plugins/object_viewer/scene/tune_timer_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/tune_timer_form.ui b/studio/src/plugins/object_viewer/scene/tune_timer_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/tune_timer_form.ui
rename to studio/src/plugins/object_viewer/scene/tune_timer_form.ui
diff --git a/code/studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp b/studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp
rename to studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/scene/water_pool_dialog.h b/studio/src/plugins/object_viewer/scene/water_pool_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/water_pool_dialog.h
rename to studio/src/plugins/object_viewer/scene/water_pool_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/scene/water_pool_form.ui b/studio/src/plugins/object_viewer/scene/water_pool_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/scene/water_pool_form.ui
rename to studio/src/plugins/object_viewer/scene/water_pool_form.ui
diff --git a/code/studio/src/plugins/object_viewer/sound_settings_page.cpp b/studio/src/plugins/object_viewer/sound_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/sound_settings_page.cpp
rename to studio/src/plugins/object_viewer/sound_settings_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/sound_settings_page.h b/studio/src/plugins/object_viewer/sound_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/sound_settings_page.h
rename to studio/src/plugins/object_viewer/sound_settings_page.h
diff --git a/code/studio/src/plugins/object_viewer/sound_settings_page.ui b/studio/src/plugins/object_viewer/sound_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/sound_settings_page.ui
rename to studio/src/plugins/object_viewer/sound_settings_page.ui
diff --git a/code/studio/src/plugins/object_viewer/sound_system.cpp b/studio/src/plugins/object_viewer/sound_system.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/sound_system.cpp
rename to studio/src/plugins/object_viewer/sound_system.cpp
diff --git a/code/studio/src/plugins/object_viewer/sound_system.h b/studio/src/plugins/object_viewer/sound_system.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/sound_system.h
rename to studio/src/plugins/object_viewer/sound_system.h
diff --git a/code/studio/src/plugins/object_viewer/stdpch.cpp b/studio/src/plugins/object_viewer/stdpch.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/stdpch.cpp
rename to studio/src/plugins/object_viewer/stdpch.cpp
diff --git a/code/studio/src/plugins/object_viewer/stdpch.h b/studio/src/plugins/object_viewer/stdpch.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/stdpch.h
rename to studio/src/plugins/object_viewer/stdpch.h
diff --git a/code/studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml b/studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml
similarity index 100%
rename from code/studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml
rename to studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h b/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h b/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h b/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.h b/studio/src/plugins/object_viewer/vegetable/vegetable_editor.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_editor.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h b/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_node.h b/studio/src/plugins/object_viewer/vegetable/vegetable_node.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_node.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_node.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h b/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h b/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui b/studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
rename to studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp b/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
rename to studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h b/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
rename to studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable_settings_page.cpp b/studio/src/plugins/object_viewer/vegetable_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable_settings_page.cpp
rename to studio/src/plugins/object_viewer/vegetable_settings_page.cpp
diff --git a/code/studio/src/plugins/object_viewer/vegetable_settings_page.h b/studio/src/plugins/object_viewer/vegetable_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable_settings_page.h
rename to studio/src/plugins/object_viewer/vegetable_settings_page.h
diff --git a/code/studio/src/plugins/object_viewer/vegetable_settings_page.ui b/studio/src/plugins/object_viewer/vegetable_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/vegetable_settings_page.ui
rename to studio/src/plugins/object_viewer/vegetable_settings_page.ui
diff --git a/code/studio/src/plugins/object_viewer/widgets/color_edit_form.ui b/studio/src/plugins/object_viewer/widgets/color_edit_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/color_edit_form.ui
rename to studio/src/plugins/object_viewer/widgets/color_edit_form.ui
diff --git a/code/studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp b/studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp
rename to studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/widgets/color_edit_widget.h b/studio/src/plugins/object_viewer/widgets/color_edit_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/color_edit_widget.h
rename to studio/src/plugins/object_viewer/widgets/color_edit_widget.h
diff --git a/code/studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui b/studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui
rename to studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui
diff --git a/code/studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui b/studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
rename to studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
diff --git a/code/studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp b/studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp
rename to studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp
diff --git a/code/studio/src/plugins/object_viewer/widgets/edit_range_widget.h b/studio/src/plugins/object_viewer/widgets/edit_range_widget.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/edit_range_widget.h
rename to studio/src/plugins/object_viewer/widgets/edit_range_widget.h
diff --git a/code/studio/src/plugins/object_viewer/widgets/hoverpoints.cpp b/studio/src/plugins/object_viewer/widgets/hoverpoints.cpp
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/hoverpoints.cpp
rename to studio/src/plugins/object_viewer/widgets/hoverpoints.cpp
diff --git a/code/studio/src/plugins/object_viewer/widgets/hoverpoints.h b/studio/src/plugins/object_viewer/widgets/hoverpoints.h
similarity index 100%
rename from code/studio/src/plugins/object_viewer/widgets/hoverpoints.h
rename to studio/src/plugins/object_viewer/widgets/hoverpoints.h
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt b/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
rename to studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp b/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
rename to studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h b/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
rename to studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro b/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
rename to studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h b/studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h
rename to studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp b/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
rename to studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h b/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
rename to studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp b/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
rename to studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h b/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
rename to studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml b/studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml
rename to studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml
diff --git a/code/studio/src/plugins/tile_editor/CMakeLists.txt b/studio/src/plugins/tile_editor/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/tile_editor/CMakeLists.txt
rename to studio/src/plugins/tile_editor/CMakeLists.txt
diff --git a/code/studio/src/plugins/tile_editor/images/add_tile.png b/studio/src/plugins/tile_editor/images/add_tile.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/add_tile.png
rename to studio/src/plugins/tile_editor/images/add_tile.png
diff --git a/code/studio/src/plugins/tile_editor/images/delete_image.png b/studio/src/plugins/tile_editor/images/delete_image.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/delete_image.png
rename to studio/src/plugins/tile_editor/images/delete_image.png
diff --git a/code/studio/src/plugins/tile_editor/images/delete_tile.png b/studio/src/plugins/tile_editor/images/delete_tile.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/delete_tile.png
rename to studio/src/plugins/tile_editor/images/delete_tile.png
diff --git a/code/studio/src/plugins/tile_editor/images/down.png b/studio/src/plugins/tile_editor/images/down.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/down.png
rename to studio/src/plugins/tile_editor/images/down.png
diff --git a/code/studio/src/plugins/tile_editor/images/empty_image.png b/studio/src/plugins/tile_editor/images/empty_image.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/empty_image.png
rename to studio/src/plugins/tile_editor/images/empty_image.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_add_item.png b/studio/src/plugins/tile_editor/images/ic_nel_add_item.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_add_item.png
rename to studio/src/plugins/tile_editor/images/ic_nel_add_item.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_delete_item.png b/studio/src/plugins/tile_editor/images/ic_nel_delete_item.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_delete_item.png
rename to studio/src/plugins/tile_editor/images/ic_nel_delete_item.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_new.png b/studio/src/plugins/tile_editor/images/ic_nel_new.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_new.png
rename to studio/src/plugins/tile_editor/images/ic_nel_new.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_open.png b/studio/src/plugins/tile_editor/images/ic_nel_open.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_open.png
rename to studio/src/plugins/tile_editor/images/ic_nel_open.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_save.png b/studio/src/plugins/tile_editor/images/ic_nel_save.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_save.png
rename to studio/src/plugins/tile_editor/images/ic_nel_save.png
diff --git a/code/studio/src/plugins/tile_editor/images/ic_nel_save_as.png b/studio/src/plugins/tile_editor/images/ic_nel_save_as.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/ic_nel_save_as.png
rename to studio/src/plugins/tile_editor/images/ic_nel_save_as.png
diff --git a/code/studio/src/plugins/tile_editor/images/left.png b/studio/src/plugins/tile_editor/images/left.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/left.png
rename to studio/src/plugins/tile_editor/images/left.png
diff --git a/code/studio/src/plugins/tile_editor/images/nel.png b/studio/src/plugins/tile_editor/images/nel.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/nel.png
rename to studio/src/plugins/tile_editor/images/nel.png
diff --git a/code/studio/src/plugins/tile_editor/images/replace_image.png b/studio/src/plugins/tile_editor/images/replace_image.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/replace_image.png
rename to studio/src/plugins/tile_editor/images/replace_image.png
diff --git a/code/studio/src/plugins/tile_editor/images/reset.png b/studio/src/plugins/tile_editor/images/reset.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/reset.png
rename to studio/src/plugins/tile_editor/images/reset.png
diff --git a/code/studio/src/plugins/tile_editor/images/right.png b/studio/src/plugins/tile_editor/images/right.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/right.png
rename to studio/src/plugins/tile_editor/images/right.png
diff --git a/code/studio/src/plugins/tile_editor/images/rotation0.png b/studio/src/plugins/tile_editor/images/rotation0.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/rotation0.png
rename to studio/src/plugins/tile_editor/images/rotation0.png
diff --git a/code/studio/src/plugins/tile_editor/images/rotation180.png b/studio/src/plugins/tile_editor/images/rotation180.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/rotation180.png
rename to studio/src/plugins/tile_editor/images/rotation180.png
diff --git a/code/studio/src/plugins/tile_editor/images/rotation270.png b/studio/src/plugins/tile_editor/images/rotation270.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/rotation270.png
rename to studio/src/plugins/tile_editor/images/rotation270.png
diff --git a/code/studio/src/plugins/tile_editor/images/rotation90.png b/studio/src/plugins/tile_editor/images/rotation90.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/rotation90.png
rename to studio/src/plugins/tile_editor/images/rotation90.png
diff --git a/code/studio/src/plugins/tile_editor/images/up.png b/studio/src/plugins/tile_editor/images/up.png
similarity index 100%
rename from code/studio/src/plugins/tile_editor/images/up.png
rename to studio/src/plugins/tile_editor/images/up.png
diff --git a/code/studio/src/plugins/tile_editor/land_edit_dialog.cpp b/studio/src/plugins/tile_editor/land_edit_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/land_edit_dialog.cpp
rename to studio/src/plugins/tile_editor/land_edit_dialog.cpp
diff --git a/code/studio/src/plugins/tile_editor/land_edit_dialog.h b/studio/src/plugins/tile_editor/land_edit_dialog.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/land_edit_dialog.h
rename to studio/src/plugins/tile_editor/land_edit_dialog.h
diff --git a/code/studio/src/plugins/tile_editor/land_edit_dialog.ui b/studio/src/plugins/tile_editor/land_edit_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/tile_editor/land_edit_dialog.ui
rename to studio/src/plugins/tile_editor/land_edit_dialog.ui
diff --git a/code/studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml b/studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml
similarity index 100%
rename from code/studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml
rename to studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml
diff --git a/code/studio/src/plugins/tile_editor/tile_bank.cpp b/studio/src/plugins/tile_editor/tile_bank.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_bank.cpp
rename to studio/src/plugins/tile_editor/tile_bank.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_bank.h b/studio/src/plugins/tile_editor/tile_bank.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_bank.h
rename to studio/src/plugins/tile_editor/tile_bank.h
diff --git a/code/studio/src/plugins/tile_editor/tile_constants.h b/studio/src/plugins/tile_editor/tile_constants.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_constants.h
rename to studio/src/plugins/tile_editor/tile_constants.h
diff --git a/code/studio/src/plugins/tile_editor/tile_editor.qrc b/studio/src/plugins/tile_editor/tile_editor.qrc
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor.qrc
rename to studio/src/plugins/tile_editor/tile_editor.qrc
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp b/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
rename to studio/src/plugins/tile_editor/tile_editor_main_window.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_main_window.h b/studio/src/plugins/tile_editor/tile_editor_main_window.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor_main_window.h
rename to studio/src/plugins/tile_editor/tile_editor_main_window.h
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_main_window.ui b/studio/src/plugins/tile_editor/tile_editor_main_window.ui
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor_main_window.ui
rename to studio/src/plugins/tile_editor/tile_editor_main_window.ui
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_plugin.cpp b/studio/src/plugins/tile_editor/tile_editor_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor_plugin.cpp
rename to studio/src/plugins/tile_editor/tile_editor_plugin.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_plugin.h b/studio/src/plugins/tile_editor/tile_editor_plugin.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_editor_plugin.h
rename to studio/src/plugins/tile_editor/tile_editor_plugin.h
diff --git a/code/studio/src/plugins/tile_editor/tile_images.h b/studio/src/plugins/tile_editor/tile_images.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_images.h
rename to studio/src/plugins/tile_editor/tile_images.h
diff --git a/code/studio/src/plugins/tile_editor/tile_item.cpp b/studio/src/plugins/tile_editor/tile_item.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_item.cpp
rename to studio/src/plugins/tile_editor/tile_item.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_item.h b/studio/src/plugins/tile_editor/tile_item.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_item.h
rename to studio/src/plugins/tile_editor/tile_item.h
diff --git a/code/studio/src/plugins/tile_editor/tile_item_delegate.cpp b/studio/src/plugins/tile_editor/tile_item_delegate.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_item_delegate.cpp
rename to studio/src/plugins/tile_editor/tile_item_delegate.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_item_delegate.h b/studio/src/plugins/tile_editor/tile_item_delegate.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_item_delegate.h
rename to studio/src/plugins/tile_editor/tile_item_delegate.h
diff --git a/code/studio/src/plugins/tile_editor/tile_model.cpp b/studio/src/plugins/tile_editor/tile_model.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_model.cpp
rename to studio/src/plugins/tile_editor/tile_model.cpp
diff --git a/code/studio/src/plugins/tile_editor/tile_model.h b/studio/src/plugins/tile_editor/tile_model.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tile_model.h
rename to studio/src/plugins/tile_editor/tile_model.h
diff --git a/code/studio/src/plugins/tile_editor/tilebank_loader.cpp b/studio/src/plugins/tile_editor/tilebank_loader.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tilebank_loader.cpp
rename to studio/src/plugins/tile_editor/tilebank_loader.cpp
diff --git a/code/studio/src/plugins/tile_editor/tilebank_loader.h b/studio/src/plugins/tile_editor/tilebank_loader.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tilebank_loader.h
rename to studio/src/plugins/tile_editor/tilebank_loader.h
diff --git a/code/studio/src/plugins/tile_editor/tilebank_saver.cpp b/studio/src/plugins/tile_editor/tilebank_saver.cpp
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tilebank_saver.cpp
rename to studio/src/plugins/tile_editor/tilebank_saver.cpp
diff --git a/code/studio/src/plugins/tile_editor/tilebank_saver.h b/studio/src/plugins/tile_editor/tilebank_saver.h
similarity index 100%
rename from code/studio/src/plugins/tile_editor/tilebank_saver.h
rename to studio/src/plugins/tile_editor/tilebank_saver.h
diff --git a/code/studio/src/plugins/translation_manager/CMakeLists.txt b/studio/src/plugins/translation_manager/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/translation_manager/CMakeLists.txt
rename to studio/src/plugins/translation_manager/CMakeLists.txt
diff --git a/code/studio/src/plugins/translation_manager/README b/studio/src/plugins/translation_manager/README
similarity index 100%
rename from code/studio/src/plugins/translation_manager/README
rename to studio/src/plugins/translation_manager/README
diff --git a/code/studio/src/plugins/translation_manager/editor_phrase.cpp b/studio/src/plugins/translation_manager/editor_phrase.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/editor_phrase.cpp
rename to studio/src/plugins/translation_manager/editor_phrase.cpp
diff --git a/code/studio/src/plugins/translation_manager/editor_phrase.h b/studio/src/plugins/translation_manager/editor_phrase.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/editor_phrase.h
rename to studio/src/plugins/translation_manager/editor_phrase.h
diff --git a/code/studio/src/plugins/translation_manager/editor_worksheet.cpp b/studio/src/plugins/translation_manager/editor_worksheet.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/editor_worksheet.cpp
rename to studio/src/plugins/translation_manager/editor_worksheet.cpp
diff --git a/code/studio/src/plugins/translation_manager/editor_worksheet.h b/studio/src/plugins/translation_manager/editor_worksheet.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/editor_worksheet.h
rename to studio/src/plugins/translation_manager/editor_worksheet.h
diff --git a/code/studio/src/plugins/translation_manager/extract_bot_names.cpp b/studio/src/plugins/translation_manager/extract_bot_names.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/extract_bot_names.cpp
rename to studio/src/plugins/translation_manager/extract_bot_names.cpp
diff --git a/code/studio/src/plugins/translation_manager/extract_bot_names.h b/studio/src/plugins/translation_manager/extract_bot_names.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/extract_bot_names.h
rename to studio/src/plugins/translation_manager/extract_bot_names.h
diff --git a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp b/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp
rename to studio/src/plugins/translation_manager/extract_new_sheet_names.cpp
diff --git a/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h b/studio/src/plugins/translation_manager/extract_new_sheet_names.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/extract_new_sheet_names.h
rename to studio/src/plugins/translation_manager/extract_new_sheet_names.h
diff --git a/code/studio/src/plugins/translation_manager/ftp_selection.cpp b/studio/src/plugins/translation_manager/ftp_selection.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/ftp_selection.cpp
rename to studio/src/plugins/translation_manager/ftp_selection.cpp
diff --git a/code/studio/src/plugins/translation_manager/ftp_selection.h b/studio/src/plugins/translation_manager/ftp_selection.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/ftp_selection.h
rename to studio/src/plugins/translation_manager/ftp_selection.h
diff --git a/code/studio/src/plugins/translation_manager/ftp_selection.qrc b/studio/src/plugins/translation_manager/ftp_selection.qrc
similarity index 100%
rename from code/studio/src/plugins/translation_manager/ftp_selection.qrc
rename to studio/src/plugins/translation_manager/ftp_selection.qrc
diff --git a/code/studio/src/plugins/translation_manager/ftp_selection.ui b/studio/src/plugins/translation_manager/ftp_selection.ui
similarity index 100%
rename from code/studio/src/plugins/translation_manager/ftp_selection.ui
rename to studio/src/plugins/translation_manager/ftp_selection.ui
diff --git a/code/studio/src/plugins/translation_manager/images/cdtoparent.png b/studio/src/plugins/translation_manager/images/cdtoparent.png
similarity index 100%
rename from code/studio/src/plugins/translation_manager/images/cdtoparent.png
rename to studio/src/plugins/translation_manager/images/cdtoparent.png
diff --git a/code/studio/src/plugins/translation_manager/images/dir.png b/studio/src/plugins/translation_manager/images/dir.png
similarity index 100%
rename from code/studio/src/plugins/translation_manager/images/dir.png
rename to studio/src/plugins/translation_manager/images/dir.png
diff --git a/code/studio/src/plugins/translation_manager/images/file.png b/studio/src/plugins/translation_manager/images/file.png
similarity index 100%
rename from code/studio/src/plugins/translation_manager/images/file.png
rename to studio/src/plugins/translation_manager/images/file.png
diff --git a/code/studio/src/plugins/translation_manager/source_selection.cpp b/studio/src/plugins/translation_manager/source_selection.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/source_selection.cpp
rename to studio/src/plugins/translation_manager/source_selection.cpp
diff --git a/code/studio/src/plugins/translation_manager/source_selection.h b/studio/src/plugins/translation_manager/source_selection.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/source_selection.h
rename to studio/src/plugins/translation_manager/source_selection.h
diff --git a/code/studio/src/plugins/translation_manager/source_selection.ui b/studio/src/plugins/translation_manager/source_selection.ui
similarity index 100%
rename from code/studio/src/plugins/translation_manager/source_selection.ui
rename to studio/src/plugins/translation_manager/source_selection.ui
diff --git a/code/studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml b/studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml
similarity index 100%
rename from code/studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml
rename to studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_constants.h b/studio/src/plugins/translation_manager/translation_manager_constants.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_constants.h
rename to studio/src/plugins/translation_manager/translation_manager_constants.h
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_editor.h b/studio/src/plugins/translation_manager/translation_manager_editor.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_editor.h
rename to studio/src/plugins/translation_manager/translation_manager_editor.h
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_main_window.cpp b/studio/src/plugins/translation_manager/translation_manager_main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_main_window.cpp
rename to studio/src/plugins/translation_manager/translation_manager_main_window.cpp
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_main_window.h b/studio/src/plugins/translation_manager/translation_manager_main_window.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_main_window.h
rename to studio/src/plugins/translation_manager/translation_manager_main_window.h
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_main_window.ui b/studio/src/plugins/translation_manager/translation_manager_main_window.ui
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_main_window.ui
rename to studio/src/plugins/translation_manager/translation_manager_main_window.ui
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_plugin.cpp b/studio/src/plugins/translation_manager/translation_manager_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_plugin.cpp
rename to studio/src/plugins/translation_manager/translation_manager_plugin.cpp
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_plugin.h b/studio/src/plugins/translation_manager/translation_manager_plugin.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_plugin.h
rename to studio/src/plugins/translation_manager/translation_manager_plugin.h
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_settings_page.cpp b/studio/src/plugins/translation_manager/translation_manager_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_settings_page.cpp
rename to studio/src/plugins/translation_manager/translation_manager_settings_page.cpp
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_settings_page.h b/studio/src/plugins/translation_manager/translation_manager_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_settings_page.h
rename to studio/src/plugins/translation_manager/translation_manager_settings_page.h
diff --git a/code/studio/src/plugins/translation_manager/translation_manager_settings_page.ui b/studio/src/plugins/translation_manager/translation_manager_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/translation_manager/translation_manager_settings_page.ui
rename to studio/src/plugins/translation_manager/translation_manager_settings_page.ui
diff --git a/code/studio/src/plugins/translation_manager/uxt_editor.cpp b/studio/src/plugins/translation_manager/uxt_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/translation_manager/uxt_editor.cpp
rename to studio/src/plugins/translation_manager/uxt_editor.cpp
diff --git a/code/studio/src/plugins/translation_manager/uxt_editor.h b/studio/src/plugins/translation_manager/uxt_editor.h
similarity index 100%
rename from code/studio/src/plugins/translation_manager/uxt_editor.h
rename to studio/src/plugins/translation_manager/uxt_editor.h
diff --git a/code/studio/src/plugins/world_editor/CMakeLists.txt b/studio/src/plugins/world_editor/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/world_editor/CMakeLists.txt
rename to studio/src/plugins/world_editor/CMakeLists.txt
diff --git a/code/studio/src/plugins/world_editor/const_string_array_editor.cpp b/studio/src/plugins/world_editor/const_string_array_editor.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/const_string_array_editor.cpp
rename to studio/src/plugins/world_editor/const_string_array_editor.cpp
diff --git a/code/studio/src/plugins/world_editor/const_string_array_editor.h b/studio/src/plugins/world_editor/const_string_array_editor.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/const_string_array_editor.h
rename to studio/src/plugins/world_editor/const_string_array_editor.h
diff --git a/code/studio/src/plugins/world_editor/const_string_array_editor.ui b/studio/src/plugins/world_editor/const_string_array_editor.ui
similarity index 100%
rename from code/studio/src/plugins/world_editor/const_string_array_editor.ui
rename to studio/src/plugins/world_editor/const_string_array_editor.ui
diff --git a/code/studio/src/plugins/world_editor/const_string_array_property.cpp b/studio/src/plugins/world_editor/const_string_array_property.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/const_string_array_property.cpp
rename to studio/src/plugins/world_editor/const_string_array_property.cpp
diff --git a/code/studio/src/plugins/world_editor/const_string_array_property.h b/studio/src/plugins/world_editor/const_string_array_property.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/const_string_array_property.h
rename to studio/src/plugins/world_editor/const_string_array_property.h
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_move.png b/studio/src/plugins/world_editor/icons/ic_nel_move.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_move.png
rename to studio/src/plugins/world_editor/icons/ic_nel_move.png
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_rotate.png b/studio/src/plugins/world_editor/icons/ic_nel_rotate.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_rotate.png
rename to studio/src/plugins/world_editor/icons/ic_nel_rotate.png
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_scale.png b/studio/src/plugins/world_editor/icons/ic_nel_scale.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_scale.png
rename to studio/src/plugins/world_editor/icons/ic_nel_scale.png
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_select.png b/studio/src/plugins/world_editor/icons/ic_nel_select.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_select.png
rename to studio/src/plugins/world_editor/icons/ic_nel_select.png
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_turn.png b/studio/src/plugins/world_editor/icons/ic_nel_turn.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_turn.png
rename to studio/src/plugins/world_editor/icons/ic_nel_turn.png
diff --git a/code/studio/src/plugins/world_editor/icons/ic_nel_world_editor.png b/studio/src/plugins/world_editor/icons/ic_nel_world_editor.png
similarity index 100%
rename from code/studio/src/plugins/world_editor/icons/ic_nel_world_editor.png
rename to studio/src/plugins/world_editor/icons/ic_nel_world_editor.png
diff --git a/code/studio/src/plugins/world_editor/primitive_item.cpp b/studio/src/plugins/world_editor/primitive_item.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitive_item.cpp
rename to studio/src/plugins/world_editor/primitive_item.cpp
diff --git a/code/studio/src/plugins/world_editor/primitive_item.h b/studio/src/plugins/world_editor/primitive_item.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitive_item.h
rename to studio/src/plugins/world_editor/primitive_item.h
diff --git a/code/studio/src/plugins/world_editor/primitives_model.cpp b/studio/src/plugins/world_editor/primitives_model.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitives_model.cpp
rename to studio/src/plugins/world_editor/primitives_model.cpp
diff --git a/code/studio/src/plugins/world_editor/primitives_model.h b/studio/src/plugins/world_editor/primitives_model.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitives_model.h
rename to studio/src/plugins/world_editor/primitives_model.h
diff --git a/code/studio/src/plugins/world_editor/primitives_view.cpp b/studio/src/plugins/world_editor/primitives_view.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitives_view.cpp
rename to studio/src/plugins/world_editor/primitives_view.cpp
diff --git a/code/studio/src/plugins/world_editor/primitives_view.h b/studio/src/plugins/world_editor/primitives_view.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/primitives_view.h
rename to studio/src/plugins/world_editor/primitives_view.h
diff --git a/code/studio/src/plugins/world_editor/project_settings_dialog.cpp b/studio/src/plugins/world_editor/project_settings_dialog.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/project_settings_dialog.cpp
rename to studio/src/plugins/world_editor/project_settings_dialog.cpp
diff --git a/code/studio/src/plugins/world_editor/project_settings_dialog.h b/studio/src/plugins/world_editor/project_settings_dialog.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/project_settings_dialog.h
rename to studio/src/plugins/world_editor/project_settings_dialog.h
diff --git a/code/studio/src/plugins/world_editor/project_settings_dialog.ui b/studio/src/plugins/world_editor/project_settings_dialog.ui
similarity index 100%
rename from code/studio/src/plugins/world_editor/project_settings_dialog.ui
rename to studio/src/plugins/world_editor/project_settings_dialog.ui
diff --git a/code/studio/src/plugins/world_editor/property_editor_widget.cpp b/studio/src/plugins/world_editor/property_editor_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/property_editor_widget.cpp
rename to studio/src/plugins/world_editor/property_editor_widget.cpp
diff --git a/code/studio/src/plugins/world_editor/property_editor_widget.h b/studio/src/plugins/world_editor/property_editor_widget.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/property_editor_widget.h
rename to studio/src/plugins/world_editor/property_editor_widget.h
diff --git a/code/studio/src/plugins/world_editor/property_editor_widget.ui b/studio/src/plugins/world_editor/property_editor_widget.ui
similarity index 100%
rename from code/studio/src/plugins/world_editor/property_editor_widget.ui
rename to studio/src/plugins/world_editor/property_editor_widget.ui
diff --git a/code/studio/src/plugins/world_editor/studio_plugin_world_editor.xml b/studio/src/plugins/world_editor/studio_plugin_world_editor.xml
similarity index 100%
rename from code/studio/src/plugins/world_editor/studio_plugin_world_editor.xml
rename to studio/src/plugins/world_editor/studio_plugin_world_editor.xml
diff --git a/code/studio/src/plugins/world_editor/world_editor.qrc b/studio/src/plugins/world_editor/world_editor.qrc
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor.qrc
rename to studio/src/plugins/world_editor/world_editor.qrc
diff --git a/code/studio/src/plugins/world_editor/world_editor_actions.cpp b/studio/src/plugins/world_editor/world_editor_actions.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_actions.cpp
rename to studio/src/plugins/world_editor/world_editor_actions.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_actions.h b/studio/src/plugins/world_editor/world_editor_actions.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_actions.h
rename to studio/src/plugins/world_editor/world_editor_actions.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_constants.h b/studio/src/plugins/world_editor/world_editor_constants.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_constants.h
rename to studio/src/plugins/world_editor/world_editor_constants.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_global.h b/studio/src/plugins/world_editor/world_editor_global.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_global.h
rename to studio/src/plugins/world_editor/world_editor_global.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_misc.cpp b/studio/src/plugins/world_editor/world_editor_misc.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_misc.cpp
rename to studio/src/plugins/world_editor/world_editor_misc.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_misc.h b/studio/src/plugins/world_editor/world_editor_misc.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_misc.h
rename to studio/src/plugins/world_editor/world_editor_misc.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_plugin.cpp b/studio/src/plugins/world_editor/world_editor_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_plugin.cpp
rename to studio/src/plugins/world_editor/world_editor_plugin.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_plugin.h b/studio/src/plugins/world_editor/world_editor_plugin.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_plugin.h
rename to studio/src/plugins/world_editor/world_editor_plugin.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_scene.cpp b/studio/src/plugins/world_editor/world_editor_scene.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_scene.cpp
rename to studio/src/plugins/world_editor/world_editor_scene.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_scene.h b/studio/src/plugins/world_editor/world_editor_scene.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_scene.h
rename to studio/src/plugins/world_editor/world_editor_scene.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_scene_item.cpp b/studio/src/plugins/world_editor/world_editor_scene_item.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_scene_item.cpp
rename to studio/src/plugins/world_editor/world_editor_scene_item.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_scene_item.h b/studio/src/plugins/world_editor/world_editor_scene_item.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_scene_item.h
rename to studio/src/plugins/world_editor/world_editor_scene_item.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp b/studio/src/plugins/world_editor/world_editor_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
rename to studio/src/plugins/world_editor/world_editor_settings_page.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.h b/studio/src/plugins/world_editor/world_editor_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_settings_page.h
rename to studio/src/plugins/world_editor/world_editor_settings_page.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_settings_page.ui b/studio/src/plugins/world_editor/world_editor_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_settings_page.ui
rename to studio/src/plugins/world_editor/world_editor_settings_page.ui
diff --git a/code/studio/src/plugins/world_editor/world_editor_window.cpp b/studio/src/plugins/world_editor/world_editor_window.cpp
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_window.cpp
rename to studio/src/plugins/world_editor/world_editor_window.cpp
diff --git a/code/studio/src/plugins/world_editor/world_editor_window.h b/studio/src/plugins/world_editor/world_editor_window.h
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_window.h
rename to studio/src/plugins/world_editor/world_editor_window.h
diff --git a/code/studio/src/plugins/world_editor/world_editor_window.ui b/studio/src/plugins/world_editor/world_editor_window.ui
similarity index 100%
rename from code/studio/src/plugins/world_editor/world_editor_window.ui
rename to studio/src/plugins/world_editor/world_editor_window.ui
diff --git a/code/studio/src/plugins/zone_painter/CMakeLists.txt b/studio/src/plugins/zone_painter/CMakeLists.txt
similarity index 100%
rename from code/studio/src/plugins/zone_painter/CMakeLists.txt
rename to studio/src/plugins/zone_painter/CMakeLists.txt
diff --git a/code/studio/src/plugins/zone_painter/images/color-fill.png b/studio/src/plugins/zone_painter/images/color-fill.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/color-fill.png
rename to studio/src/plugins/zone_painter/images/color-fill.png
diff --git a/code/studio/src/plugins/zone_painter/images/color-picker-black.png b/studio/src/plugins/zone_painter/images/color-picker-black.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/color-picker-black.png
rename to studio/src/plugins/zone_painter/images/color-picker-black.png
diff --git a/code/studio/src/plugins/zone_painter/images/colorize.png b/studio/src/plugins/zone_painter/images/colorize.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/colorize.png
rename to studio/src/plugins/zone_painter/images/colorize.png
diff --git a/code/studio/src/plugins/zone_painter/images/draw-brush.png b/studio/src/plugins/zone_painter/images/draw-brush.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/draw-brush.png
rename to studio/src/plugins/zone_painter/images/draw-brush.png
diff --git a/code/studio/src/plugins/zone_painter/images/go-down-7.png b/studio/src/plugins/zone_painter/images/go-down-7.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/go-down-7.png
rename to studio/src/plugins/zone_painter/images/go-down-7.png
diff --git a/code/studio/src/plugins/zone_painter/images/go-jump-4.png b/studio/src/plugins/zone_painter/images/go-jump-4.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/go-jump-4.png
rename to studio/src/plugins/zone_painter/images/go-jump-4.png
diff --git a/code/studio/src/plugins/zone_painter/images/lock-6.png b/studio/src/plugins/zone_painter/images/lock-6.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/lock-6.png
rename to studio/src/plugins/zone_painter/images/lock-6.png
diff --git a/code/studio/src/plugins/zone_painter/images/lock-silver.png b/studio/src/plugins/zone_painter/images/lock-silver.png
similarity index 100%
rename from code/studio/src/plugins/zone_painter/images/lock-silver.png
rename to studio/src/plugins/zone_painter/images/lock-silver.png
diff --git a/code/studio/src/plugins/zone_painter/painter_dock_widget.cpp b/studio/src/plugins/zone_painter/painter_dock_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/painter_dock_widget.cpp
rename to studio/src/plugins/zone_painter/painter_dock_widget.cpp
diff --git a/code/studio/src/plugins/zone_painter/painter_dock_widget.h b/studio/src/plugins/zone_painter/painter_dock_widget.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/painter_dock_widget.h
rename to studio/src/plugins/zone_painter/painter_dock_widget.h
diff --git a/code/studio/src/plugins/zone_painter/painter_dock_widget.ui b/studio/src/plugins/zone_painter/painter_dock_widget.ui
similarity index 100%
rename from code/studio/src/plugins/zone_painter/painter_dock_widget.ui
rename to studio/src/plugins/zone_painter/painter_dock_widget.ui
diff --git a/code/studio/src/plugins/zone_painter/qnel_widget.cpp b/studio/src/plugins/zone_painter/qnel_widget.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/qnel_widget.cpp
rename to studio/src/plugins/zone_painter/qnel_widget.cpp
diff --git a/code/studio/src/plugins/zone_painter/qnel_widget.h b/studio/src/plugins/zone_painter/qnel_widget.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/qnel_widget.h
rename to studio/src/plugins/zone_painter/qnel_widget.h
diff --git a/code/studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml b/studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml
similarity index 100%
rename from code/studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml
rename to studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml
diff --git a/code/studio/src/plugins/zone_painter/zone_painter.qrc b/studio/src/plugins/zone_painter/zone_painter.qrc
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter.qrc
rename to studio/src/plugins/zone_painter/zone_painter.qrc
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_main_window.cpp b/studio/src/plugins/zone_painter/zone_painter_main_window.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_main_window.cpp
rename to studio/src/plugins/zone_painter/zone_painter_main_window.cpp
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_main_window.h b/studio/src/plugins/zone_painter/zone_painter_main_window.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_main_window.h
rename to studio/src/plugins/zone_painter/zone_painter_main_window.h
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_main_window.ui b/studio/src/plugins/zone_painter/zone_painter_main_window.ui
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_main_window.ui
rename to studio/src/plugins/zone_painter/zone_painter_main_window.ui
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_model.cpp b/studio/src/plugins/zone_painter/zone_painter_model.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_model.cpp
rename to studio/src/plugins/zone_painter/zone_painter_model.cpp
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_model.h b/studio/src/plugins/zone_painter/zone_painter_model.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_model.h
rename to studio/src/plugins/zone_painter/zone_painter_model.h
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_plugin.cpp b/studio/src/plugins/zone_painter/zone_painter_plugin.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_plugin.cpp
rename to studio/src/plugins/zone_painter/zone_painter_plugin.cpp
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_plugin.h b/studio/src/plugins/zone_painter/zone_painter_plugin.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_plugin.h
rename to studio/src/plugins/zone_painter/zone_painter_plugin.h
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_settings_page.cpp b/studio/src/plugins/zone_painter/zone_painter_settings_page.cpp
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_settings_page.cpp
rename to studio/src/plugins/zone_painter/zone_painter_settings_page.cpp
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_settings_page.h b/studio/src/plugins/zone_painter/zone_painter_settings_page.h
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_settings_page.h
rename to studio/src/plugins/zone_painter/zone_painter_settings_page.h
diff --git a/code/studio/src/plugins/zone_painter/zone_painter_settings_page.ui b/studio/src/plugins/zone_painter/zone_painter_settings_page.ui
similarity index 100%
rename from code/studio/src/plugins/zone_painter/zone_painter_settings_page.ui
rename to studio/src/plugins/zone_painter/zone_painter_settings_page.ui
diff --git a/code/studio/src/pm_watcher.cpp b/studio/src/pm_watcher.cpp
similarity index 100%
rename from code/studio/src/pm_watcher.cpp
rename to studio/src/pm_watcher.cpp
diff --git a/code/studio/src/pm_watcher.h b/studio/src/pm_watcher.h
similarity index 100%
rename from code/studio/src/pm_watcher.h
rename to studio/src/pm_watcher.h
diff --git a/code/studio/src/splash_screen.cpp b/studio/src/splash_screen.cpp
similarity index 100%
rename from code/studio/src/splash_screen.cpp
rename to studio/src/splash_screen.cpp
diff --git a/code/studio/src/splash_screen.h b/studio/src/splash_screen.h
similarity index 100%
rename from code/studio/src/splash_screen.h
rename to studio/src/splash_screen.h
diff --git a/code/studio/src/startup_settings_dlg.cpp b/studio/src/startup_settings_dlg.cpp
similarity index 100%
rename from code/studio/src/startup_settings_dlg.cpp
rename to studio/src/startup_settings_dlg.cpp
diff --git a/code/studio/src/startup_settings_dlg.h b/studio/src/startup_settings_dlg.h
similarity index 100%
rename from code/studio/src/startup_settings_dlg.h
rename to studio/src/startup_settings_dlg.h
diff --git a/code/studio/src/startup_settings_dlg.ui b/studio/src/startup_settings_dlg.ui
similarity index 100%
rename from code/studio/src/startup_settings_dlg.ui
rename to studio/src/startup_settings_dlg.ui
diff --git a/code/studio/src/studio.ico b/studio/src/studio.ico
similarity index 100%
rename from code/studio/src/studio.ico
rename to studio/src/studio.ico
diff --git a/code/studio/src/studio.qrc b/studio/src/studio.qrc
similarity index 100%
rename from code/studio/src/studio.qrc
rename to studio/src/studio.qrc
diff --git a/code/studio/src/studio.rc b/studio/src/studio.rc
similarity index 100%
rename from code/studio/src/studio.rc
rename to studio/src/studio.rc
diff --git a/code/studio/src/translations/object_viewer_qt_de.ts b/studio/src/translations/object_viewer_qt_de.ts
similarity index 100%
rename from code/studio/src/translations/object_viewer_qt_de.ts
rename to studio/src/translations/object_viewer_qt_de.ts
diff --git a/code/studio/src/translations/object_viewer_qt_en.ts b/studio/src/translations/object_viewer_qt_en.ts
similarity index 100%
rename from code/studio/src/translations/object_viewer_qt_en.ts
rename to studio/src/translations/object_viewer_qt_en.ts
diff --git a/code/studio/src/translations/object_viewer_qt_fr.ts b/studio/src/translations/object_viewer_qt_fr.ts
similarity index 100%
rename from code/studio/src/translations/object_viewer_qt_fr.ts
rename to studio/src/translations/object_viewer_qt_fr.ts
diff --git a/code/studio/src/translations/object_viewer_qt_ru.ts b/studio/src/translations/object_viewer_qt_ru.ts
similarity index 100%
rename from code/studio/src/translations/object_viewer_qt_ru.ts
rename to studio/src/translations/object_viewer_qt_ru.ts
diff --git a/code/studio/src/translations/translations.qrc b/studio/src/translations/translations.qrc
similarity index 100%
rename from code/studio/src/translations/translations.qrc
rename to studio/src/translations/translations.qrc
diff --git a/code/tool/CMakeLists.txt b/tool/CMakeLists.txt
similarity index 100%
rename from code/tool/CMakeLists.txt
rename to tool/CMakeLists.txt
diff --git a/code/tool/attribution/annotate.py b/tool/attribution/annotate.py
similarity index 100%
rename from code/tool/attribution/annotate.py
rename to tool/attribution/annotate.py
diff --git a/code/tool/bin2c/CMakeLists.txt b/tool/bin2c/CMakeLists.txt
similarity index 100%
rename from code/tool/bin2c/CMakeLists.txt
rename to tool/bin2c/CMakeLists.txt
diff --git a/code/tool/bin2c/bin2c.cpp b/tool/bin2c/bin2c.cpp
similarity index 100%
rename from code/tool/bin2c/bin2c.cpp
rename to tool/bin2c/bin2c.cpp
diff --git a/code/tool/build/build b/tool/build/build
similarity index 100%
rename from code/tool/build/build
rename to tool/build/build
diff --git a/code/tool/build/buildquiet b/tool/build/buildquiet
similarity index 100%
rename from code/tool/build/buildquiet
rename to tool/build/buildquiet
diff --git a/code/tool/crash/crash.cpp b/tool/crash/crash.cpp
similarity index 100%
rename from code/tool/crash/crash.cpp
rename to tool/crash/crash.cpp
diff --git a/code/tool/increment_version/increment_version.cpp b/tool/increment_version/increment_version.cpp
similarity index 100%
rename from code/tool/increment_version/increment_version.cpp
rename to tool/increment_version/increment_version.cpp
diff --git a/code/tool/increment_version/increment_version.py b/tool/increment_version/increment_version.py
similarity index 100%
rename from code/tool/increment_version/increment_version.py
rename to tool/increment_version/increment_version.py
diff --git a/code/tool/mkdir_date/mkdir_date.cpp b/tool/mkdir_date/mkdir_date.cpp
similarity index 100%
rename from code/tool/mkdir_date/mkdir_date.cpp
rename to tool/mkdir_date/mkdir_date.cpp
diff --git a/code/tool/open_file/open_file.cpp b/tool/open_file/open_file.cpp
similarity index 100%
rename from code/tool/open_file/open_file.cpp
rename to tool/open_file/open_file.cpp
diff --git a/code/tool/path_content_diff/path_content_diff.cpp b/tool/path_content_diff/path_content_diff.cpp
similarity index 100%
rename from code/tool/path_content_diff/path_content_diff.cpp
rename to tool/path_content_diff/path_content_diff.cpp
diff --git a/code/tool/ren_date/ren_date.cpp b/tool/ren_date/ren_date.cpp
similarity index 100%
rename from code/tool/ren_date/ren_date.cpp
rename to tool/ren_date/ren_date.cpp
diff --git a/code/tool/resswap/ResSwap.cpp b/tool/resswap/ResSwap.cpp
similarity index 100%
rename from code/tool/resswap/ResSwap.cpp
rename to tool/resswap/ResSwap.cpp
diff --git a/code/tool/resswap/icon1.ico b/tool/resswap/icon1.ico
similarity index 100%
rename from code/tool/resswap/icon1.ico
rename to tool/resswap/icon1.ico
diff --git a/code/tool/visual_studio_macros/autoexp.dat b/tool/visual_studio_macros/autoexp.dat
similarity index 100%
rename from code/tool/visual_studio_macros/autoexp.dat
rename to tool/visual_studio_macros/autoexp.dat
diff --git a/code/tool/visual_studio_macros/autoexp_vc10.dat b/tool/visual_studio_macros/autoexp_vc10.dat
similarity index 100%
rename from code/tool/visual_studio_macros/autoexp_vc10.dat
rename to tool/visual_studio_macros/autoexp_vc10.dat
diff --git a/code/tool/visual_studio_macros/doxbar.chm b/tool/visual_studio_macros/doxbar.chm
similarity index 100%
rename from code/tool/visual_studio_macros/doxbar.chm
rename to tool/visual_studio_macros/doxbar.chm
diff --git a/code/tool/visual_studio_macros/nevrax_macros.dsm b/tool/visual_studio_macros/nevrax_macros.dsm
similarity index 100%
rename from code/tool/visual_studio_macros/nevrax_macros.dsm
rename to tool/visual_studio_macros/nevrax_macros.dsm
diff --git a/code/tool/visual_studio_macros/nevrax_macros_98.dsm b/tool/visual_studio_macros/nevrax_macros_98.dsm
similarity index 100%
rename from code/tool/visual_studio_macros/nevrax_macros_98.dsm
rename to tool/visual_studio_macros/nevrax_macros_98.dsm
diff --git a/code/tool/visual_studio_macros/nevrax_macros_howto.txt b/tool/visual_studio_macros/nevrax_macros_howto.txt
similarity index 100%
rename from code/tool/visual_studio_macros/nevrax_macros_howto.txt
rename to tool/visual_studio_macros/nevrax_macros_howto.txt
diff --git a/code/tool/visual_studio_macros/nevrax_macros_ryzom.dsm b/tool/visual_studio_macros/nevrax_macros_ryzom.dsm
similarity index 100%
rename from code/tool/visual_studio_macros/nevrax_macros_ryzom.dsm
rename to tool/visual_studio_macros/nevrax_macros_ryzom.dsm
diff --git a/code/tool/visual_studio_macros/usertype.dat b/tool/visual_studio_macros/usertype.dat
similarity index 100%
rename from code/tool/visual_studio_macros/usertype.dat
rename to tool/visual_studio_macros/usertype.dat
diff --git a/code/tool/visual_studio_macros/visual studio paths.reg b/tool/visual_studio_macros/visual studio paths.reg
similarity index 100%
rename from code/tool/visual_studio_macros/visual studio paths.reg
rename to tool/visual_studio_macros/visual studio paths.reg
diff --git a/code/web/docs/admin/shard_restart/Filelist.xml b/web/docs/admin/shard_restart/Filelist.xml
similarity index 100%
rename from code/web/docs/admin/shard_restart/Filelist.xml
rename to web/docs/admin/shard_restart/Filelist.xml
diff --git a/code/web/docs/admin/shard_restart/H38.css b/web/docs/admin/shard_restart/H38.css
similarity index 100%
rename from code/web/docs/admin/shard_restart/H38.css
rename to web/docs/admin/shard_restart/H38.css
diff --git a/code/web/docs/admin/shard_restart/H70_2.htm b/web/docs/admin/shard_restart/H70_2.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/H70_2.htm
rename to web/docs/admin/shard_restart/H70_2.htm
diff --git a/code/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm b/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm
rename to web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm
diff --git a/code/web/docs/admin/shard_restart/Hd36.xml b/web/docs/admin/shard_restart/Hd36.xml
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hd36.xml
rename to web/docs/admin/shard_restart/Hd36.xml
diff --git a/code/web/docs/admin/shard_restart/Hf69.htm b/web/docs/admin/shard_restart/Hf69.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hf69.htm
rename to web/docs/admin/shard_restart/Hf69.htm
diff --git a/code/web/docs/admin/shard_restart/Hg39_1.gif b/web/docs/admin/shard_restart/Hg39_1.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg39_1.gif
rename to web/docs/admin/shard_restart/Hg39_1.gif
diff --git a/code/web/docs/admin/shard_restart/Hg39_1.htm b/web/docs/admin/shard_restart/Hg39_1.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg39_1.htm
rename to web/docs/admin/shard_restart/Hg39_1.htm
diff --git a/code/web/docs/admin/shard_restart/Hg41_2.gif b/web/docs/admin/shard_restart/Hg41_2.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg41_2.gif
rename to web/docs/admin/shard_restart/Hg41_2.gif
diff --git a/code/web/docs/admin/shard_restart/Hg41_2.htm b/web/docs/admin/shard_restart/Hg41_2.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg41_2.htm
rename to web/docs/admin/shard_restart/Hg41_2.htm
diff --git a/code/web/docs/admin/shard_restart/Hg43_3.gif b/web/docs/admin/shard_restart/Hg43_3.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg43_3.gif
rename to web/docs/admin/shard_restart/Hg43_3.gif
diff --git a/code/web/docs/admin/shard_restart/Hg43_3.htm b/web/docs/admin/shard_restart/Hg43_3.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg43_3.htm
rename to web/docs/admin/shard_restart/Hg43_3.htm
diff --git a/code/web/docs/admin/shard_restart/Hg45_4.gif b/web/docs/admin/shard_restart/Hg45_4.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg45_4.gif
rename to web/docs/admin/shard_restart/Hg45_4.gif
diff --git a/code/web/docs/admin/shard_restart/Hg45_4.htm b/web/docs/admin/shard_restart/Hg45_4.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg45_4.htm
rename to web/docs/admin/shard_restart/Hg45_4.htm
diff --git a/code/web/docs/admin/shard_restart/Hg47_5.gif b/web/docs/admin/shard_restart/Hg47_5.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg47_5.gif
rename to web/docs/admin/shard_restart/Hg47_5.gif
diff --git a/code/web/docs/admin/shard_restart/Hg47_5.htm b/web/docs/admin/shard_restart/Hg47_5.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg47_5.htm
rename to web/docs/admin/shard_restart/Hg47_5.htm
diff --git a/code/web/docs/admin/shard_restart/Hg49_6.gif b/web/docs/admin/shard_restart/Hg49_6.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg49_6.gif
rename to web/docs/admin/shard_restart/Hg49_6.gif
diff --git a/code/web/docs/admin/shard_restart/Hg49_6.htm b/web/docs/admin/shard_restart/Hg49_6.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg49_6.htm
rename to web/docs/admin/shard_restart/Hg49_6.htm
diff --git a/code/web/docs/admin/shard_restart/Hg51_7.gif b/web/docs/admin/shard_restart/Hg51_7.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg51_7.gif
rename to web/docs/admin/shard_restart/Hg51_7.gif
diff --git a/code/web/docs/admin/shard_restart/Hg51_7.htm b/web/docs/admin/shard_restart/Hg51_7.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg51_7.htm
rename to web/docs/admin/shard_restart/Hg51_7.htm
diff --git a/code/web/docs/admin/shard_restart/Hg53_8.gif b/web/docs/admin/shard_restart/Hg53_8.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg53_8.gif
rename to web/docs/admin/shard_restart/Hg53_8.gif
diff --git a/code/web/docs/admin/shard_restart/Hg53_8.htm b/web/docs/admin/shard_restart/Hg53_8.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg53_8.htm
rename to web/docs/admin/shard_restart/Hg53_8.htm
diff --git a/code/web/docs/admin/shard_restart/Hg55_9.gif b/web/docs/admin/shard_restart/Hg55_9.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg55_9.gif
rename to web/docs/admin/shard_restart/Hg55_9.gif
diff --git a/code/web/docs/admin/shard_restart/Hg55_9.htm b/web/docs/admin/shard_restart/Hg55_9.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg55_9.htm
rename to web/docs/admin/shard_restart/Hg55_9.htm
diff --git a/code/web/docs/admin/shard_restart/Hg57_10.gif b/web/docs/admin/shard_restart/Hg57_10.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg57_10.gif
rename to web/docs/admin/shard_restart/Hg57_10.gif
diff --git a/code/web/docs/admin/shard_restart/Hg57_10.htm b/web/docs/admin/shard_restart/Hg57_10.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg57_10.htm
rename to web/docs/admin/shard_restart/Hg57_10.htm
diff --git a/code/web/docs/admin/shard_restart/Hg59_11.gif b/web/docs/admin/shard_restart/Hg59_11.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg59_11.gif
rename to web/docs/admin/shard_restart/Hg59_11.gif
diff --git a/code/web/docs/admin/shard_restart/Hg59_11.htm b/web/docs/admin/shard_restart/Hg59_11.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg59_11.htm
rename to web/docs/admin/shard_restart/Hg59_11.htm
diff --git a/code/web/docs/admin/shard_restart/Hg61_12.gif b/web/docs/admin/shard_restart/Hg61_12.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg61_12.gif
rename to web/docs/admin/shard_restart/Hg61_12.gif
diff --git a/code/web/docs/admin/shard_restart/Hg61_12.htm b/web/docs/admin/shard_restart/Hg61_12.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hg61_12.htm
rename to web/docs/admin/shard_restart/Hg61_12.htm
diff --git a/code/web/docs/admin/shard_restart/Hn68.htm b/web/docs/admin/shard_restart/Hn68.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hn68.htm
rename to web/docs/admin/shard_restart/Hn68.htm
diff --git a/code/web/docs/admin/shard_restart/Hu37.js b/web/docs/admin/shard_restart/Hu37.js
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hu37.js
rename to web/docs/admin/shard_restart/Hu37.js
diff --git a/code/web/docs/admin/shard_restart/Hz63.htm b/web/docs/admin/shard_restart/Hz63.htm
similarity index 100%
rename from code/web/docs/admin/shard_restart/Hz63.htm
rename to web/docs/admin/shard_restart/Hz63.htm
diff --git a/code/web/docs/admin/shard_restart/lt_off.gif b/web/docs/admin/shard_restart/lt_off.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/lt_off.gif
rename to web/docs/admin/shard_restart/lt_off.gif
diff --git a/code/web/docs/admin/shard_restart/lt_over.gif b/web/docs/admin/shard_restart/lt_over.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/lt_over.gif
rename to web/docs/admin/shard_restart/lt_over.gif
diff --git a/code/web/docs/admin/shard_restart/rt_off.gif b/web/docs/admin/shard_restart/rt_off.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/rt_off.gif
rename to web/docs/admin/shard_restart/rt_off.gif
diff --git a/code/web/docs/admin/shard_restart/rt_over.gif b/web/docs/admin/shard_restart/rt_over.gif
similarity index 100%
rename from code/web/docs/admin/shard_restart/rt_over.gif
rename to web/docs/admin/shard_restart/rt_over.gif
diff --git a/code/web/docs/ams/doxygen/Doxyfile b/web/docs/ams/doxygen/Doxyfile
similarity index 100%
rename from code/web/docs/ams/doxygen/Doxyfile
rename to web/docs/ams/doxygen/Doxyfile
diff --git a/code/web/docs/ams/doxygen/img/db.png b/web/docs/ams/doxygen/img/db.png
similarity index 100%
rename from code/web/docs/ams/doxygen/img/db.png
rename to web/docs/ams/doxygen/img/db.png
diff --git a/code/web/docs/ams/doxygen/img/info.jpg b/web/docs/ams/doxygen/img/info.jpg
similarity index 100%
rename from code/web/docs/ams/doxygen/img/info.jpg
rename to web/docs/ams/doxygen/img/info.jpg
diff --git a/code/web/docs/ams/doxygen/img/info.psd b/web/docs/ams/doxygen/img/info.psd
similarity index 100%
rename from code/web/docs/ams/doxygen/img/info.psd
rename to web/docs/ams/doxygen/img/info.psd
diff --git a/code/web/docs/ams/doxygen/info.php b/web/docs/ams/doxygen/info.php
similarity index 100%
rename from code/web/docs/ams/doxygen/info.php
rename to web/docs/ams/doxygen/info.php
diff --git a/code/web/docs/ams/doxygen/logo.png b/web/docs/ams/doxygen/logo.png
similarity index 100%
rename from code/web/docs/ams/doxygen/logo.png
rename to web/docs/ams/doxygen/logo.png
diff --git a/code/web/private_php/ams/autoload/assigned.php b/web/private_php/ams/autoload/assigned.php
similarity index 100%
rename from code/web/private_php/ams/autoload/assigned.php
rename to web/private_php/ams/autoload/assigned.php
diff --git a/code/web/private_php/ams/autoload/dblayer.php b/web/private_php/ams/autoload/dblayer.php
similarity index 100%
rename from code/web/private_php/ams/autoload/dblayer.php
rename to web/private_php/ams/autoload/dblayer.php
diff --git a/code/web/private_php/ams/autoload/forwarded.php b/web/private_php/ams/autoload/forwarded.php
similarity index 100%
rename from code/web/private_php/ams/autoload/forwarded.php
rename to web/private_php/ams/autoload/forwarded.php
diff --git a/code/web/private_php/ams/autoload/gui_elements.php b/web/private_php/ams/autoload/gui_elements.php
similarity index 100%
rename from code/web/private_php/ams/autoload/gui_elements.php
rename to web/private_php/ams/autoload/gui_elements.php
diff --git a/code/web/private_php/ams/autoload/helpers.php b/web/private_php/ams/autoload/helpers.php
similarity index 100%
rename from code/web/private_php/ams/autoload/helpers.php
rename to web/private_php/ams/autoload/helpers.php
diff --git a/code/web/private_php/ams/autoload/in_support_group.php b/web/private_php/ams/autoload/in_support_group.php
similarity index 100%
rename from code/web/private_php/ams/autoload/in_support_group.php
rename to web/private_php/ams/autoload/in_support_group.php
diff --git a/code/web/private_php/ams/autoload/mail_handler.php b/web/private_php/ams/autoload/mail_handler.php
similarity index 100%
rename from code/web/private_php/ams/autoload/mail_handler.php
rename to web/private_php/ams/autoload/mail_handler.php
diff --git a/code/web/private_php/ams/autoload/mycrypt.php b/web/private_php/ams/autoload/mycrypt.php
similarity index 100%
rename from code/web/private_php/ams/autoload/mycrypt.php
rename to web/private_php/ams/autoload/mycrypt.php
diff --git a/code/web/private_php/ams/autoload/pagination.php b/web/private_php/ams/autoload/pagination.php
similarity index 100%
rename from code/web/private_php/ams/autoload/pagination.php
rename to web/private_php/ams/autoload/pagination.php
diff --git a/code/web/private_php/ams/autoload/plugincache.php b/web/private_php/ams/autoload/plugincache.php
similarity index 100%
rename from code/web/private_php/ams/autoload/plugincache.php
rename to web/private_php/ams/autoload/plugincache.php
diff --git a/code/web/private_php/ams/autoload/querycache.php b/web/private_php/ams/autoload/querycache.php
similarity index 100%
rename from code/web/private_php/ams/autoload/querycache.php
rename to web/private_php/ams/autoload/querycache.php
diff --git a/code/web/private_php/ams/autoload/rest_api.php b/web/private_php/ams/autoload/rest_api.php
similarity index 100%
rename from code/web/private_php/ams/autoload/rest_api.php
rename to web/private_php/ams/autoload/rest_api.php
diff --git a/code/web/private_php/ams/autoload/support_group.php b/web/private_php/ams/autoload/support_group.php
similarity index 100%
rename from code/web/private_php/ams/autoload/support_group.php
rename to web/private_php/ams/autoload/support_group.php
diff --git a/code/web/private_php/ams/autoload/sync.php b/web/private_php/ams/autoload/sync.php
similarity index 100%
rename from code/web/private_php/ams/autoload/sync.php
rename to web/private_php/ams/autoload/sync.php
diff --git a/code/web/private_php/ams/autoload/ticket.php b/web/private_php/ams/autoload/ticket.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket.php
rename to web/private_php/ams/autoload/ticket.php
diff --git a/code/web/private_php/ams/autoload/ticket_category.php b/web/private_php/ams/autoload/ticket_category.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_category.php
rename to web/private_php/ams/autoload/ticket_category.php
diff --git a/code/web/private_php/ams/autoload/ticket_content.php b/web/private_php/ams/autoload/ticket_content.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_content.php
rename to web/private_php/ams/autoload/ticket_content.php
diff --git a/code/web/private_php/ams/autoload/ticket_info.php b/web/private_php/ams/autoload/ticket_info.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_info.php
rename to web/private_php/ams/autoload/ticket_info.php
diff --git a/code/web/private_php/ams/autoload/ticket_log.php b/web/private_php/ams/autoload/ticket_log.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_log.php
rename to web/private_php/ams/autoload/ticket_log.php
diff --git a/code/web/private_php/ams/autoload/ticket_queue.php b/web/private_php/ams/autoload/ticket_queue.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_queue.php
rename to web/private_php/ams/autoload/ticket_queue.php
diff --git a/code/web/private_php/ams/autoload/ticket_queue_handler.php b/web/private_php/ams/autoload/ticket_queue_handler.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_queue_handler.php
rename to web/private_php/ams/autoload/ticket_queue_handler.php
diff --git a/code/web/private_php/ams/autoload/ticket_reply.php b/web/private_php/ams/autoload/ticket_reply.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_reply.php
rename to web/private_php/ams/autoload/ticket_reply.php
diff --git a/code/web/private_php/ams/autoload/ticket_user.php b/web/private_php/ams/autoload/ticket_user.php
similarity index 100%
rename from code/web/private_php/ams/autoload/ticket_user.php
rename to web/private_php/ams/autoload/ticket_user.php
diff --git a/code/web/private_php/ams/autoload/users.php b/web/private_php/ams/autoload/users.php
similarity index 100%
rename from code/web/private_php/ams/autoload/users.php
rename to web/private_php/ams/autoload/users.php
diff --git a/code/web/private_php/ams/configs/ams_lib.conf b/web/private_php/ams/configs/ams_lib.conf
similarity index 100%
rename from code/web/private_php/ams/configs/ams_lib.conf
rename to web/private_php/ams/configs/ams_lib.conf
diff --git a/code/web/private_php/ams/configs/ingame_layout.ini b/web/private_php/ams/configs/ingame_layout.ini
similarity index 100%
rename from code/web/private_php/ams/configs/ingame_layout.ini
rename to web/private_php/ams/configs/ingame_layout.ini
diff --git a/code/web/private_php/ams/img/info/client.png b/web/private_php/ams/img/info/client.png
similarity index 100%
rename from code/web/private_php/ams/img/info/client.png
rename to web/private_php/ams/img/info/client.png
diff --git a/code/web/private_php/ams/img/info/connect.png b/web/private_php/ams/img/info/connect.png
similarity index 100%
rename from code/web/private_php/ams/img/info/connect.png
rename to web/private_php/ams/img/info/connect.png
diff --git a/code/web/private_php/ams/img/info/cpuid.png b/web/private_php/ams/img/info/cpuid.png
similarity index 100%
rename from code/web/private_php/ams/img/info/cpuid.png
rename to web/private_php/ams/img/info/cpuid.png
diff --git a/code/web/private_php/ams/img/info/ht.png b/web/private_php/ams/img/info/ht.png
similarity index 100%
rename from code/web/private_php/ams/img/info/ht.png
rename to web/private_php/ams/img/info/ht.png
diff --git a/code/web/private_php/ams/img/info/local.png b/web/private_php/ams/img/info/local.png
similarity index 100%
rename from code/web/private_php/ams/img/info/local.png
rename to web/private_php/ams/img/info/local.png
diff --git a/code/web/private_php/ams/img/info/mask.png b/web/private_php/ams/img/info/mask.png
similarity index 100%
rename from code/web/private_php/ams/img/info/mask.png
rename to web/private_php/ams/img/info/mask.png
diff --git a/code/web/private_php/ams/img/info/memory.png b/web/private_php/ams/img/info/memory.png
similarity index 100%
rename from code/web/private_php/ams/img/info/memory.png
rename to web/private_php/ams/img/info/memory.png
diff --git a/code/web/private_php/ams/img/info/nel.png b/web/private_php/ams/img/info/nel.png
similarity index 100%
rename from code/web/private_php/ams/img/info/nel.png
rename to web/private_php/ams/img/info/nel.png
diff --git a/code/web/private_php/ams/img/info/os.png b/web/private_php/ams/img/info/os.png
similarity index 100%
rename from code/web/private_php/ams/img/info/os.png
rename to web/private_php/ams/img/info/os.png
diff --git a/code/web/private_php/ams/img/info/patch.png b/web/private_php/ams/img/info/patch.png
similarity index 100%
rename from code/web/private_php/ams/img/info/patch.png
rename to web/private_php/ams/img/info/patch.png
diff --git a/code/web/private_php/ams/img/info/position.png b/web/private_php/ams/img/info/position.png
similarity index 100%
rename from code/web/private_php/ams/img/info/position.png
rename to web/private_php/ams/img/info/position.png
diff --git a/code/web/private_php/ams/img/info/processor.png b/web/private_php/ams/img/info/processor.png
similarity index 100%
rename from code/web/private_php/ams/img/info/processor.png
rename to web/private_php/ams/img/info/processor.png
diff --git a/code/web/private_php/ams/img/info/server.png b/web/private_php/ams/img/info/server.png
similarity index 100%
rename from code/web/private_php/ams/img/info/server.png
rename to web/private_php/ams/img/info/server.png
diff --git a/code/web/private_php/ams/img/info/shard.png b/web/private_php/ams/img/info/shard.png
similarity index 100%
rename from code/web/private_php/ams/img/info/shard.png
rename to web/private_php/ams/img/info/shard.png
diff --git a/code/web/private_php/ams/img/info/user.png b/web/private_php/ams/img/info/user.png
similarity index 100%
rename from code/web/private_php/ams/img/info/user.png
rename to web/private_php/ams/img/info/user.png
diff --git a/code/web/private_php/ams/img/info/view.png b/web/private_php/ams/img/info/view.png
similarity index 100%
rename from code/web/private_php/ams/img/info/view.png
rename to web/private_php/ams/img/info/view.png
diff --git a/code/web/private_php/ams/ingame_templates/createticket.tpl b/web/private_php/ams/ingame_templates/createticket.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/createticket.tpl
rename to web/private_php/ams/ingame_templates/createticket.tpl
diff --git a/code/web/private_php/ams/ingame_templates/dashboard.tpl b/web/private_php/ams/ingame_templates/dashboard.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/dashboard.tpl
rename to web/private_php/ams/ingame_templates/dashboard.tpl
diff --git a/code/web/private_php/ams/ingame_templates/index.tpl b/web/private_php/ams/ingame_templates/index.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/index.tpl
rename to web/private_php/ams/ingame_templates/index.tpl
diff --git a/code/web/private_php/ams/ingame_templates/layout.tpl b/web/private_php/ams/ingame_templates/layout.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/layout.tpl
rename to web/private_php/ams/ingame_templates/layout.tpl
diff --git a/code/web/private_php/ams/ingame_templates/layout_admin.tpl b/web/private_php/ams/ingame_templates/layout_admin.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/layout_admin.tpl
rename to web/private_php/ams/ingame_templates/layout_admin.tpl
diff --git a/code/web/private_php/ams/ingame_templates/layout_mod.tpl b/web/private_php/ams/ingame_templates/layout_mod.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/layout_mod.tpl
rename to web/private_php/ams/ingame_templates/layout_mod.tpl
diff --git a/code/web/private_php/ams/ingame_templates/layout_user.tpl b/web/private_php/ams/ingame_templates/layout_user.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/layout_user.tpl
rename to web/private_php/ams/ingame_templates/layout_user.tpl
diff --git a/code/web/private_php/ams/ingame_templates/login.tpl b/web/private_php/ams/ingame_templates/login.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/login.tpl
rename to web/private_php/ams/ingame_templates/login.tpl
diff --git a/code/web/private_php/ams/ingame_templates/register.tpl b/web/private_php/ams/ingame_templates/register.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/register.tpl
rename to web/private_php/ams/ingame_templates/register.tpl
diff --git a/code/web/private_php/ams/ingame_templates/settings.tpl b/web/private_php/ams/ingame_templates/settings.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/settings.tpl
rename to web/private_php/ams/ingame_templates/settings.tpl
diff --git a/code/web/private_php/ams/ingame_templates/sgroup_list.tpl b/web/private_php/ams/ingame_templates/sgroup_list.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/sgroup_list.tpl
rename to web/private_php/ams/ingame_templates/sgroup_list.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_queue.tpl b/web/private_php/ams/ingame_templates/show_queue.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_queue.tpl
rename to web/private_php/ams/ingame_templates/show_queue.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_reply.tpl b/web/private_php/ams/ingame_templates/show_reply.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_reply.tpl
rename to web/private_php/ams/ingame_templates/show_reply.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_sgroup.tpl b/web/private_php/ams/ingame_templates/show_sgroup.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_sgroup.tpl
rename to web/private_php/ams/ingame_templates/show_sgroup.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_ticket.tpl b/web/private_php/ams/ingame_templates/show_ticket.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_ticket.tpl
rename to web/private_php/ams/ingame_templates/show_ticket.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_ticket_info.tpl b/web/private_php/ams/ingame_templates/show_ticket_info.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_ticket_info.tpl
rename to web/private_php/ams/ingame_templates/show_ticket_info.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_ticket_log.tpl b/web/private_php/ams/ingame_templates/show_ticket_log.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_ticket_log.tpl
rename to web/private_php/ams/ingame_templates/show_ticket_log.tpl
diff --git a/code/web/private_php/ams/ingame_templates/show_user.tpl b/web/private_php/ams/ingame_templates/show_user.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/show_user.tpl
rename to web/private_php/ams/ingame_templates/show_user.tpl
diff --git a/code/web/private_php/ams/ingame_templates/userlist.tpl b/web/private_php/ams/ingame_templates/userlist.tpl
similarity index 100%
rename from code/web/private_php/ams/ingame_templates/userlist.tpl
rename to web/private_php/ams/ingame_templates/userlist.tpl
diff --git a/code/web/private_php/ams/libinclude.php b/web/private_php/ams/libinclude.php
similarity index 100%
rename from code/web/private_php/ams/libinclude.php
rename to web/private_php/ams/libinclude.php
diff --git a/code/web/private_php/ams/mail/placeholder b/web/private_php/ams/mail/placeholder
similarity index 100%
rename from code/web/private_php/ams/mail/placeholder
rename to web/private_php/ams/mail/placeholder
diff --git a/code/web/private_php/ams/plugins/API_key_management/.info b/web/private_php/ams/plugins/API_key_management/.info
similarity index 100%
rename from code/web/private_php/ams/plugins/API_key_management/.info
rename to web/private_php/ams/plugins/API_key_management/.info
diff --git a/code/web/private_php/ams/plugins/API_key_management/API_key_management.php b/web/private_php/ams/plugins/API_key_management/API_key_management.php
similarity index 100%
rename from code/web/private_php/ams/plugins/API_key_management/API_key_management.php
rename to web/private_php/ams/plugins/API_key_management/API_key_management.php
diff --git a/code/web/private_php/ams/plugins/API_key_management/generate_key.php b/web/private_php/ams/plugins/API_key_management/generate_key.php
similarity index 100%
rename from code/web/private_php/ams/plugins/API_key_management/generate_key.php
rename to web/private_php/ams/plugins/API_key_management/generate_key.php
diff --git a/code/web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl b/web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl
similarity index 100%
rename from code/web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl
rename to web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl
diff --git a/code/web/private_php/ams/plugins/API_key_management/templates/index.tpl b/web/private_php/ams/plugins/API_key_management/templates/index.tpl
similarity index 100%
rename from code/web/private_php/ams/plugins/API_key_management/templates/index.tpl
rename to web/private_php/ams/plugins/API_key_management/templates/index.tpl
diff --git a/code/web/private_php/ams/plugins/Achievements/.info b/web/private_php/ams/plugins/Achievements/.info
similarity index 100%
rename from code/web/private_php/ams/plugins/Achievements/.info
rename to web/private_php/ams/plugins/Achievements/.info
diff --git a/code/web/private_php/ams/plugins/Achievements/Achievements.php b/web/private_php/ams/plugins/Achievements/Achievements.php
similarity index 100%
rename from code/web/private_php/ams/plugins/Achievements/Achievements.php
rename to web/private_php/ams/plugins/Achievements/Achievements.php
diff --git a/code/web/private_php/ams/plugins/Achievements/templates/index.tpl b/web/private_php/ams/plugins/Achievements/templates/index.tpl
similarity index 100%
rename from code/web/private_php/ams/plugins/Achievements/templates/index.tpl
rename to web/private_php/ams/plugins/Achievements/templates/index.tpl
diff --git a/code/web/private_php/ams/plugins/Domain_Management/.info b/web/private_php/ams/plugins/Domain_Management/.info
similarity index 100%
rename from code/web/private_php/ams/plugins/Domain_Management/.info
rename to web/private_php/ams/plugins/Domain_Management/.info
diff --git a/code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php b/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
similarity index 100%
rename from code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
rename to web/private_php/ams/plugins/Domain_Management/Domain_Management.php
diff --git a/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl b/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
similarity index 100%
rename from code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
rename to web/private_php/ams/plugins/Domain_Management/templates/index.tpl
diff --git a/code/web/private_php/ams/plugins/cacheresource.apc.php b/web/private_php/ams/plugins/cacheresource.apc.php
similarity index 100%
rename from code/web/private_php/ams/plugins/cacheresource.apc.php
rename to web/private_php/ams/plugins/cacheresource.apc.php
diff --git a/code/web/private_php/ams/plugins/cacheresource.memcache.php b/web/private_php/ams/plugins/cacheresource.memcache.php
similarity index 100%
rename from code/web/private_php/ams/plugins/cacheresource.memcache.php
rename to web/private_php/ams/plugins/cacheresource.memcache.php
diff --git a/code/web/private_php/ams/plugins/cacheresource.mysql.php b/web/private_php/ams/plugins/cacheresource.mysql.php
similarity index 100%
rename from code/web/private_php/ams/plugins/cacheresource.mysql.php
rename to web/private_php/ams/plugins/cacheresource.mysql.php
diff --git a/code/web/private_php/ams/plugins/doxygen_plugin_management.php b/web/private_php/ams/plugins/doxygen_plugin_management.php
similarity index 100%
rename from code/web/private_php/ams/plugins/doxygen_plugin_management.php
rename to web/private_php/ams/plugins/doxygen_plugin_management.php
diff --git a/code/web/private_php/ams/plugins/resource.extendsall.php b/web/private_php/ams/plugins/resource.extendsall.php
similarity index 100%
rename from code/web/private_php/ams/plugins/resource.extendsall.php
rename to web/private_php/ams/plugins/resource.extendsall.php
diff --git a/code/web/private_php/ams/plugins/resource.mysql.php b/web/private_php/ams/plugins/resource.mysql.php
similarity index 100%
rename from code/web/private_php/ams/plugins/resource.mysql.php
rename to web/private_php/ams/plugins/resource.mysql.php
diff --git a/code/web/private_php/ams/plugins/resource.mysqls.php b/web/private_php/ams/plugins/resource.mysqls.php
similarity index 100%
rename from code/web/private_php/ams/plugins/resource.mysqls.php
rename to web/private_php/ams/plugins/resource.mysqls.php
diff --git a/code/web/private_php/ams/smarty/README b/web/private_php/ams/smarty/README
similarity index 100%
rename from code/web/private_php/ams/smarty/README
rename to web/private_php/ams/smarty/README
diff --git a/code/web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt b/web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt
similarity index 100%
rename from code/web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt
rename to web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt
diff --git a/code/web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt b/web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt
similarity index 100%
rename from code/web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt
rename to web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt
diff --git a/code/web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt b/web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt
similarity index 100%
rename from code/web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt
rename to web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt
diff --git a/code/web/private_php/ams/smarty/change_log.txt b/web/private_php/ams/smarty/change_log.txt
similarity index 100%
rename from code/web/private_php/ams/smarty/change_log.txt
rename to web/private_php/ams/smarty/change_log.txt
diff --git a/code/web/private_php/ams/smarty/libs/Smarty.class.php b/web/private_php/ams/smarty/libs/Smarty.class.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/Smarty.class.php
rename to web/private_php/ams/smarty/libs/Smarty.class.php
diff --git a/code/web/private_php/ams/smarty/libs/SmartyBC.class.php b/web/private_php/ams/smarty/libs/SmartyBC.class.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/SmartyBC.class.php
rename to web/private_php/ams/smarty/libs/SmartyBC.class.php
diff --git a/code/web/private_php/ams/smarty/libs/debug.tpl b/web/private_php/ams/smarty/libs/debug.tpl
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/debug.tpl
rename to web/private_php/ams/smarty/libs/debug.tpl
diff --git a/code/web/private_php/ams/smarty/libs/plugins/block.textformat.php b/web/private_php/ams/smarty/libs/plugins/block.textformat.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/block.textformat.php
rename to web/private_php/ams/smarty/libs/plugins/block.textformat.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.counter.php b/web/private_php/ams/smarty/libs/plugins/function.counter.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.counter.php
rename to web/private_php/ams/smarty/libs/plugins/function.counter.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.cycle.php b/web/private_php/ams/smarty/libs/plugins/function.cycle.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.cycle.php
rename to web/private_php/ams/smarty/libs/plugins/function.cycle.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.fetch.php b/web/private_php/ams/smarty/libs/plugins/function.fetch.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.fetch.php
rename to web/private_php/ams/smarty/libs/plugins/function.fetch.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php b/web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_image.php b/web/private_php/ams/smarty/libs/plugins/function.html_image.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_image.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_image.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_options.php b/web/private_php/ams/smarty/libs/plugins/function.html_options.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_options.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_options.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_radios.php b/web/private_php/ams/smarty/libs/plugins/function.html_radios.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_radios.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_radios.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_select_date.php b/web/private_php/ams/smarty/libs/plugins/function.html_select_date.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_select_date.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_select_date.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_select_time.php b/web/private_php/ams/smarty/libs/plugins/function.html_select_time.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_select_time.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_select_time.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.html_table.php b/web/private_php/ams/smarty/libs/plugins/function.html_table.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.html_table.php
rename to web/private_php/ams/smarty/libs/plugins/function.html_table.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.mailto.php b/web/private_php/ams/smarty/libs/plugins/function.mailto.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.mailto.php
rename to web/private_php/ams/smarty/libs/plugins/function.mailto.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/function.math.php b/web/private_php/ams/smarty/libs/plugins/function.math.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/function.math.php
rename to web/private_php/ams/smarty/libs/plugins/function.math.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php b/web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.date_format.php b/web/private_php/ams/smarty/libs/plugins/modifier.date_format.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.date_format.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.date_format.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php b/web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.escape.php b/web/private_php/ams/smarty/libs/plugins/modifier.escape.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.escape.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.escape.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php b/web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.replace.php b/web/private_php/ams/smarty/libs/plugins/modifier.replace.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.replace.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.replace.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.spacify.php b/web/private_php/ams/smarty/libs/plugins/modifier.spacify.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.spacify.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.spacify.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifier.truncate.php b/web/private_php/ams/smarty/libs/plugins/modifier.truncate.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifier.truncate.php
rename to web/private_php/ams/smarty/libs/plugins/modifier.truncate.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php b/web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php
rename to web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php b/web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php
rename to web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php b/web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php
rename to web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php b/web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php
rename to web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php b/web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php
rename to web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php b/web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php
rename to web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php b/web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php
rename to web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php b/web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php
rename to web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php
diff --git a/code/web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php
rename to web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_security.php b/web/private_php/ams/smarty/libs/sysplugins/smarty_security.php
similarity index 100%
rename from code/web/private_php/ams/smarty/libs/sysplugins/smarty_security.php
rename to web/private_php/ams/smarty/libs/sysplugins/smarty_security.php
diff --git a/code/web/private_php/ams/tmp/placeholder b/web/private_php/ams/tmp/placeholder
similarity index 100%
rename from code/web/private_php/ams/tmp/placeholder
rename to web/private_php/ams/tmp/placeholder
diff --git a/code/web/private_php/ams/translations/en.ini b/web/private_php/ams/translations/en.ini
similarity index 100%
rename from code/web/private_php/ams/translations/en.ini
rename to web/private_php/ams/translations/en.ini
diff --git a/code/web/private_php/ams/translations/fr.ini b/web/private_php/ams/translations/fr.ini
similarity index 100%
rename from code/web/private_php/ams/translations/fr.ini
rename to web/private_php/ams/translations/fr.ini
diff --git a/code/web/private_php/setup/config/config.php b/web/private_php/setup/config/config.php
similarity index 100%
rename from code/web/private_php/setup/config/config.php
rename to web/private_php/setup/config/config.php
diff --git a/code/web/private_php/setup/config/config_user.php b/web/private_php/setup/config/config_user.php
similarity index 100%
rename from code/web/private_php/setup/config/config_user.php
rename to web/private_php/setup/config/config_user.php
diff --git a/code/web/private_php/setup/sql/nel_00001.sql b/web/private_php/setup/sql/nel_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_00001.sql
rename to web/private_php/setup/sql/nel_00001.sql
diff --git a/code/web/private_php/setup/sql/nel_00002.sql b/web/private_php/setup/sql/nel_00002.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_00002.sql
rename to web/private_php/setup/sql/nel_00002.sql
diff --git a/code/web/private_php/setup/sql/nel_00003.sql b/web/private_php/setup/sql/nel_00003.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_00003.sql
rename to web/private_php/setup/sql/nel_00003.sql
diff --git a/code/web/private_php/setup/sql/nel_00004.sql b/web/private_php/setup/sql/nel_00004.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_00004.sql
rename to web/private_php/setup/sql/nel_00004.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_00001.sql b/web/private_php/setup/sql/nel_ams_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_00001.sql
rename to web/private_php/setup/sql/nel_ams_00001.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_00002.sql b/web/private_php/setup/sql/nel_ams_00002.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_00002.sql
rename to web/private_php/setup/sql/nel_ams_00002.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00001.sql b/web/private_php/setup/sql/nel_ams_lib_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00001.sql
rename to web/private_php/setup/sql/nel_ams_lib_00001.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00002.sql b/web/private_php/setup/sql/nel_ams_lib_00002.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00002.sql
rename to web/private_php/setup/sql/nel_ams_lib_00002.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00003.sql b/web/private_php/setup/sql/nel_ams_lib_00003.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00003.sql
rename to web/private_php/setup/sql/nel_ams_lib_00003.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00004.sql b/web/private_php/setup/sql/nel_ams_lib_00004.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00004.sql
rename to web/private_php/setup/sql/nel_ams_lib_00004.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00005.sql b/web/private_php/setup/sql/nel_ams_lib_00005.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00005.sql
rename to web/private_php/setup/sql/nel_ams_lib_00005.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00006.sql b/web/private_php/setup/sql/nel_ams_lib_00006.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00006.sql
rename to web/private_php/setup/sql/nel_ams_lib_00006.sql
diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00007.sql b/web/private_php/setup/sql/nel_ams_lib_00007.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_ams_lib_00007.sql
rename to web/private_php/setup/sql/nel_ams_lib_00007.sql
diff --git a/code/web/private_php/setup/sql/nel_tool_00001.sql b/web/private_php/setup/sql/nel_tool_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_tool_00001.sql
rename to web/private_php/setup/sql/nel_tool_00001.sql
diff --git a/code/web/private_php/setup/sql/nel_tool_00002.sql b/web/private_php/setup/sql/nel_tool_00002.sql
similarity index 100%
rename from code/web/private_php/setup/sql/nel_tool_00002.sql
rename to web/private_php/setup/sql/nel_tool_00002.sql
diff --git a/code/web/private_php/setup/sql/ring_domain_00001.sql b/web/private_php/setup/sql/ring_domain_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/ring_domain_00001.sql
rename to web/private_php/setup/sql/ring_domain_00001.sql
diff --git a/code/web/private_php/setup/sql/webig_00001.sql b/web/private_php/setup/sql/webig_00001.sql
similarity index 100%
rename from code/web/private_php/setup/sql/webig_00001.sql
rename to web/private_php/setup/sql/webig_00001.sql
diff --git a/code/web/public_php/admin/common.php b/web/public_php/admin/common.php
similarity index 100%
rename from code/web/public_php/admin/common.php
rename to web/public_php/admin/common.php
diff --git a/code/web/public_php/admin/config.php b/web/public_php/admin/config.php
similarity index 100%
rename from code/web/public_php/admin/config.php
rename to web/public_php/admin/config.php
diff --git a/code/web/public_php/admin/crons/cron_harddisk.php b/web/public_php/admin/crons/cron_harddisk.php
similarity index 100%
rename from code/web/public_php/admin/crons/cron_harddisk.php
rename to web/public_php/admin/crons/cron_harddisk.php
diff --git a/code/web/public_php/admin/crons/cron_harddisk.sh b/web/public_php/admin/crons/cron_harddisk.sh
similarity index 100%
rename from code/web/public_php/admin/crons/cron_harddisk.sh
rename to web/public_php/admin/crons/cron_harddisk.sh
diff --git a/code/web/public_php/admin/crons/index.html b/web/public_php/admin/crons/index.html
similarity index 100%
rename from code/web/public_php/admin/crons/index.html
rename to web/public_php/admin/crons/index.html
diff --git a/code/web/public_php/admin/functions_auth.php b/web/public_php/admin/functions_auth.php
similarity index 100%
rename from code/web/public_php/admin/functions_auth.php
rename to web/public_php/admin/functions_auth.php
diff --git a/code/web/public_php/admin/functions_common.php b/web/public_php/admin/functions_common.php
similarity index 100%
rename from code/web/public_php/admin/functions_common.php
rename to web/public_php/admin/functions_common.php
diff --git a/code/web/public_php/admin/functions_mysqli.php b/web/public_php/admin/functions_mysqli.php
similarity index 100%
rename from code/web/public_php/admin/functions_mysqli.php
rename to web/public_php/admin/functions_mysqli.php
diff --git a/code/web/public_php/admin/functions_tool_administration.php b/web/public_php/admin/functions_tool_administration.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_administration.php
rename to web/public_php/admin/functions_tool_administration.php
diff --git a/code/web/public_php/admin/functions_tool_applications.php b/web/public_php/admin/functions_tool_applications.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_applications.php
rename to web/public_php/admin/functions_tool_applications.php
diff --git a/code/web/public_php/admin/functions_tool_event_entities.php b/web/public_php/admin/functions_tool_event_entities.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_event_entities.php
rename to web/public_php/admin/functions_tool_event_entities.php
diff --git a/code/web/public_php/admin/functions_tool_graphs.php b/web/public_php/admin/functions_tool_graphs.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_graphs.php
rename to web/public_php/admin/functions_tool_graphs.php
diff --git a/code/web/public_php/admin/functions_tool_guild_locator.php b/web/public_php/admin/functions_tool_guild_locator.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_guild_locator.php
rename to web/public_php/admin/functions_tool_guild_locator.php
diff --git a/code/web/public_php/admin/functions_tool_log_analyser.php b/web/public_php/admin/functions_tool_log_analyser.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_log_analyser.php
rename to web/public_php/admin/functions_tool_log_analyser.php
diff --git a/code/web/public_php/admin/functions_tool_main.php b/web/public_php/admin/functions_tool_main.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_main.php
rename to web/public_php/admin/functions_tool_main.php
diff --git a/code/web/public_php/admin/functions_tool_mfs.php b/web/public_php/admin/functions_tool_mfs.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_mfs.php
rename to web/public_php/admin/functions_tool_mfs.php
diff --git a/code/web/public_php/admin/functions_tool_notes.php b/web/public_php/admin/functions_tool_notes.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_notes.php
rename to web/public_php/admin/functions_tool_notes.php
diff --git a/code/web/public_php/admin/functions_tool_player_locator.php b/web/public_php/admin/functions_tool_player_locator.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_player_locator.php
rename to web/public_php/admin/functions_tool_player_locator.php
diff --git a/code/web/public_php/admin/functions_tool_preferences.php b/web/public_php/admin/functions_tool_preferences.php
similarity index 100%
rename from code/web/public_php/admin/functions_tool_preferences.php
rename to web/public_php/admin/functions_tool_preferences.php
diff --git a/code/web/public_php/admin/graphs_output/placeholder b/web/public_php/admin/graphs_output/placeholder
similarity index 100%
rename from code/web/public_php/admin/graphs_output/placeholder
rename to web/public_php/admin/graphs_output/placeholder
diff --git a/code/web/public_php/admin/imgs/bg_live.png b/web/public_php/admin/imgs/bg_live.png
similarity index 100%
rename from code/web/public_php/admin/imgs/bg_live.png
rename to web/public_php/admin/imgs/bg_live.png
diff --git a/code/web/public_php/admin/imgs/getfirefox.png b/web/public_php/admin/imgs/getfirefox.png
similarity index 100%
rename from code/web/public_php/admin/imgs/getfirefox.png
rename to web/public_php/admin/imgs/getfirefox.png
diff --git a/code/web/public_php/admin/imgs/icon_admin.gif b/web/public_php/admin/imgs/icon_admin.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_admin.gif
rename to web/public_php/admin/imgs/icon_admin.gif
diff --git a/code/web/public_php/admin/imgs/icon_entity.gif b/web/public_php/admin/imgs/icon_entity.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_entity.gif
rename to web/public_php/admin/imgs/icon_entity.gif
diff --git a/code/web/public_php/admin/imgs/icon_graphs.gif b/web/public_php/admin/imgs/icon_graphs.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_graphs.gif
rename to web/public_php/admin/imgs/icon_graphs.gif
diff --git a/code/web/public_php/admin/imgs/icon_guild_locator.gif b/web/public_php/admin/imgs/icon_guild_locator.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_guild_locator.gif
rename to web/public_php/admin/imgs/icon_guild_locator.gif
diff --git a/code/web/public_php/admin/imgs/icon_log_analyser.gif b/web/public_php/admin/imgs/icon_log_analyser.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_log_analyser.gif
rename to web/public_php/admin/imgs/icon_log_analyser.gif
diff --git a/code/web/public_php/admin/imgs/icon_logout.gif b/web/public_php/admin/imgs/icon_logout.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_logout.gif
rename to web/public_php/admin/imgs/icon_logout.gif
diff --git a/code/web/public_php/admin/imgs/icon_main.gif b/web/public_php/admin/imgs/icon_main.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_main.gif
rename to web/public_php/admin/imgs/icon_main.gif
diff --git a/code/web/public_php/admin/imgs/icon_notes.gif b/web/public_php/admin/imgs/icon_notes.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_notes.gif
rename to web/public_php/admin/imgs/icon_notes.gif
diff --git a/code/web/public_php/admin/imgs/icon_player_locator.gif b/web/public_php/admin/imgs/icon_player_locator.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_player_locator.gif
rename to web/public_php/admin/imgs/icon_player_locator.gif
diff --git a/code/web/public_php/admin/imgs/icon_preferences.gif b/web/public_php/admin/imgs/icon_preferences.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_preferences.gif
rename to web/public_php/admin/imgs/icon_preferences.gif
diff --git a/code/web/public_php/admin/imgs/icon_unknown.png b/web/public_php/admin/imgs/icon_unknown.png
similarity index 100%
rename from code/web/public_php/admin/imgs/icon_unknown.png
rename to web/public_php/admin/imgs/icon_unknown.png
diff --git a/code/web/public_php/admin/imgs/nel.gif b/web/public_php/admin/imgs/nel.gif
similarity index 100%
rename from code/web/public_php/admin/imgs/nel.gif
rename to web/public_php/admin/imgs/nel.gif
diff --git a/code/web/public_php/admin/index.php b/web/public_php/admin/index.php
similarity index 100%
rename from code/web/public_php/admin/index.php
rename to web/public_php/admin/index.php
diff --git a/code/web/public_php/admin/jpgraph/flags.dat b/web/public_php/admin/jpgraph/flags.dat
similarity index 100%
rename from code/web/public_php/admin/jpgraph/flags.dat
rename to web/public_php/admin/jpgraph/flags.dat
diff --git a/code/web/public_php/admin/jpgraph/flags_thumb100x100.dat b/web/public_php/admin/jpgraph/flags_thumb100x100.dat
similarity index 100%
rename from code/web/public_php/admin/jpgraph/flags_thumb100x100.dat
rename to web/public_php/admin/jpgraph/flags_thumb100x100.dat
diff --git a/code/web/public_php/admin/jpgraph/flags_thumb35x35.dat b/web/public_php/admin/jpgraph/flags_thumb35x35.dat
similarity index 100%
rename from code/web/public_php/admin/jpgraph/flags_thumb35x35.dat
rename to web/public_php/admin/jpgraph/flags_thumb35x35.dat
diff --git a/code/web/public_php/admin/jpgraph/flags_thumb60x60.dat b/web/public_php/admin/jpgraph/flags_thumb60x60.dat
similarity index 100%
rename from code/web/public_php/admin/jpgraph/flags_thumb60x60.dat
rename to web/public_php/admin/jpgraph/flags_thumb60x60.dat
diff --git a/code/web/public_php/admin/jpgraph/imgdata_balls.inc b/web/public_php/admin/jpgraph/imgdata_balls.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_balls.inc
rename to web/public_php/admin/jpgraph/imgdata_balls.inc
diff --git a/code/web/public_php/admin/jpgraph/imgdata_bevels.inc b/web/public_php/admin/jpgraph/imgdata_bevels.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_bevels.inc
rename to web/public_php/admin/jpgraph/imgdata_bevels.inc
diff --git a/code/web/public_php/admin/jpgraph/imgdata_diamonds.inc b/web/public_php/admin/jpgraph/imgdata_diamonds.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_diamonds.inc
rename to web/public_php/admin/jpgraph/imgdata_diamonds.inc
diff --git a/code/web/public_php/admin/jpgraph/imgdata_pushpins.inc b/web/public_php/admin/jpgraph/imgdata_pushpins.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_pushpins.inc
rename to web/public_php/admin/jpgraph/imgdata_pushpins.inc
diff --git a/code/web/public_php/admin/jpgraph/imgdata_squares.inc b/web/public_php/admin/jpgraph/imgdata_squares.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_squares.inc
rename to web/public_php/admin/jpgraph/imgdata_squares.inc
diff --git a/code/web/public_php/admin/jpgraph/imgdata_stars.inc b/web/public_php/admin/jpgraph/imgdata_stars.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/imgdata_stars.inc
rename to web/public_php/admin/jpgraph/imgdata_stars.inc
diff --git a/code/web/public_php/admin/jpgraph/jpg-config.inc b/web/public_php/admin/jpgraph/jpg-config.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpg-config.inc
rename to web/public_php/admin/jpgraph/jpg-config.inc
diff --git a/code/web/public_php/admin/jpgraph/jpgraph.php b/web/public_php/admin/jpgraph/jpgraph.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph.php
rename to web/public_php/admin/jpgraph/jpgraph.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_antispam-digits.php b/web/public_php/admin/jpgraph/jpgraph_antispam-digits.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_antispam-digits.php
rename to web/public_php/admin/jpgraph/jpgraph_antispam-digits.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_antispam.php b/web/public_php/admin/jpgraph/jpgraph_antispam.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_antispam.php
rename to web/public_php/admin/jpgraph/jpgraph_antispam.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_bar.php b/web/public_php/admin/jpgraph/jpgraph_bar.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_bar.php
rename to web/public_php/admin/jpgraph/jpgraph_bar.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_canvas.php b/web/public_php/admin/jpgraph/jpgraph_canvas.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_canvas.php
rename to web/public_php/admin/jpgraph/jpgraph_canvas.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_canvtools.php b/web/public_php/admin/jpgraph/jpgraph_canvtools.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_canvtools.php
rename to web/public_php/admin/jpgraph/jpgraph_canvtools.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_date.php b/web/public_php/admin/jpgraph/jpgraph_date.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_date.php
rename to web/public_php/admin/jpgraph/jpgraph_date.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_error.php b/web/public_php/admin/jpgraph/jpgraph_error.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_error.php
rename to web/public_php/admin/jpgraph/jpgraph_error.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_flags.php b/web/public_php/admin/jpgraph/jpgraph_flags.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_flags.php
rename to web/public_php/admin/jpgraph/jpgraph_flags.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_gantt.php b/web/public_php/admin/jpgraph/jpgraph_gantt.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_gantt.php
rename to web/public_php/admin/jpgraph/jpgraph_gantt.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_gb2312.php b/web/public_php/admin/jpgraph/jpgraph_gb2312.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_gb2312.php
rename to web/public_php/admin/jpgraph/jpgraph_gb2312.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_gradient.php b/web/public_php/admin/jpgraph/jpgraph_gradient.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_gradient.php
rename to web/public_php/admin/jpgraph/jpgraph_gradient.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_iconplot.php b/web/public_php/admin/jpgraph/jpgraph_iconplot.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_iconplot.php
rename to web/public_php/admin/jpgraph/jpgraph_iconplot.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_imgtrans.php b/web/public_php/admin/jpgraph/jpgraph_imgtrans.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_imgtrans.php
rename to web/public_php/admin/jpgraph/jpgraph_imgtrans.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_line.php b/web/public_php/admin/jpgraph/jpgraph_line.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_line.php
rename to web/public_php/admin/jpgraph/jpgraph_line.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_log.php b/web/public_php/admin/jpgraph/jpgraph_log.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_log.php
rename to web/public_php/admin/jpgraph/jpgraph_log.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_pie.php b/web/public_php/admin/jpgraph/jpgraph_pie.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_pie.php
rename to web/public_php/admin/jpgraph/jpgraph_pie.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_pie3d.php b/web/public_php/admin/jpgraph/jpgraph_pie3d.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_pie3d.php
rename to web/public_php/admin/jpgraph/jpgraph_pie3d.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_plotband.php b/web/public_php/admin/jpgraph/jpgraph_plotband.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_plotband.php
rename to web/public_php/admin/jpgraph/jpgraph_plotband.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_plotmark.inc b/web/public_php/admin/jpgraph/jpgraph_plotmark.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_plotmark.inc
rename to web/public_php/admin/jpgraph/jpgraph_plotmark.inc
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_polar.php b/web/public_php/admin/jpgraph/jpgraph_polar.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_polar.php
rename to web/public_php/admin/jpgraph/jpgraph_polar.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_radar.php b/web/public_php/admin/jpgraph/jpgraph_radar.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_radar.php
rename to web/public_php/admin/jpgraph/jpgraph_radar.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_regstat.php b/web/public_php/admin/jpgraph/jpgraph_regstat.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_regstat.php
rename to web/public_php/admin/jpgraph/jpgraph_regstat.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_scatter.php b/web/public_php/admin/jpgraph/jpgraph_scatter.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_scatter.php
rename to web/public_php/admin/jpgraph/jpgraph_scatter.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_stock.php b/web/public_php/admin/jpgraph/jpgraph_stock.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_stock.php
rename to web/public_php/admin/jpgraph/jpgraph_stock.php
diff --git a/code/web/public_php/admin/jpgraph/jpgraph_utils.inc b/web/public_php/admin/jpgraph/jpgraph_utils.inc
similarity index 100%
rename from code/web/public_php/admin/jpgraph/jpgraph_utils.inc
rename to web/public_php/admin/jpgraph/jpgraph_utils.inc
diff --git a/code/web/public_php/admin/jpgraph/lang/en.inc.php b/web/public_php/admin/jpgraph/lang/en.inc.php
similarity index 100%
rename from code/web/public_php/admin/jpgraph/lang/en.inc.php
rename to web/public_php/admin/jpgraph/lang/en.inc.php
diff --git a/code/web/public_php/admin/logs/empty.txt b/web/public_php/admin/logs/empty.txt
similarity index 100%
rename from code/web/public_php/admin/logs/empty.txt
rename to web/public_php/admin/logs/empty.txt
diff --git a/code/web/public_php/admin/nel/admin_modules_itf.php b/web/public_php/admin/nel/admin_modules_itf.php
similarity index 100%
rename from code/web/public_php/admin/nel/admin_modules_itf.php
rename to web/public_php/admin/nel/admin_modules_itf.php
diff --git a/code/web/public_php/admin/nel/nel_message.php b/web/public_php/admin/nel/nel_message.php
similarity index 100%
rename from code/web/public_php/admin/nel/nel_message.php
rename to web/public_php/admin/nel/nel_message.php
diff --git a/code/web/public_php/admin/neltool.css b/web/public_php/admin/neltool.css
similarity index 100%
rename from code/web/public_php/admin/neltool.css
rename to web/public_php/admin/neltool.css
diff --git a/code/web/public_php/admin/overlib/handgrab.gif b/web/public_php/admin/overlib/handgrab.gif
similarity index 100%
rename from code/web/public_php/admin/overlib/handgrab.gif
rename to web/public_php/admin/overlib/handgrab.gif
diff --git a/code/web/public_php/admin/overlib/makemini.pl b/web/public_php/admin/overlib/makemini.pl
similarity index 100%
rename from code/web/public_php/admin/overlib/makemini.pl
rename to web/public_php/admin/overlib/makemini.pl
diff --git a/code/web/public_php/admin/overlib/overlib.js b/web/public_php/admin/overlib/overlib.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib.js
rename to web/public_php/admin/overlib/overlib.js
diff --git a/code/web/public_php/admin/overlib/overlib_anchor.js b/web/public_php/admin/overlib/overlib_anchor.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib_anchor.js
rename to web/public_php/admin/overlib/overlib_anchor.js
diff --git a/code/web/public_php/admin/overlib/overlib_anchor_mini.js b/web/public_php/admin/overlib/overlib_anchor_mini.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib_anchor_mini.js
rename to web/public_php/admin/overlib/overlib_anchor_mini.js
diff --git a/code/web/public_php/admin/overlib/overlib_draggable.js b/web/public_php/admin/overlib/overlib_draggable.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib_draggable.js
rename to web/public_php/admin/overlib/overlib_draggable.js
diff --git a/code/web/public_php/admin/overlib/overlib_draggable_mini.js b/web/public_php/admin/overlib/overlib_draggable_mini.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib_draggable_mini.js
rename to web/public_php/admin/overlib/overlib_draggable_mini.js
diff --git a/code/web/public_php/admin/overlib/overlib_mini.js b/web/public_php/admin/overlib/overlib_mini.js
similarity index 100%
rename from code/web/public_php/admin/overlib/overlib_mini.js
rename to web/public_php/admin/overlib/overlib_mini.js
diff --git a/code/web/public_php/admin/scripts/index.html b/web/public_php/admin/scripts/index.html
similarity index 100%
rename from code/web/public_php/admin/scripts/index.html
rename to web/public_php/admin/scripts/index.html
diff --git a/code/web/public_php/admin/scripts/restart_sequence.php b/web/public_php/admin/scripts/restart_sequence.php
similarity index 100%
rename from code/web/public_php/admin/scripts/restart_sequence.php
rename to web/public_php/admin/scripts/restart_sequence.php
diff --git a/code/web/public_php/admin/scripts/run_script.sh b/web/public_php/admin/scripts/run_script.sh
similarity index 100%
rename from code/web/public_php/admin/scripts/run_script.sh
rename to web/public_php/admin/scripts/run_script.sh
diff --git a/code/web/public_php/admin/smarty/Config_File.class.php b/web/public_php/admin/smarty/Config_File.class.php
similarity index 100%
rename from code/web/public_php/admin/smarty/Config_File.class.php
rename to web/public_php/admin/smarty/Config_File.class.php
diff --git a/code/web/public_php/admin/smarty/Smarty.class.php b/web/public_php/admin/smarty/Smarty.class.php
similarity index 100%
rename from code/web/public_php/admin/smarty/Smarty.class.php
rename to web/public_php/admin/smarty/Smarty.class.php
diff --git a/code/web/public_php/admin/smarty/Smarty_Compiler.class.php b/web/public_php/admin/smarty/Smarty_Compiler.class.php
similarity index 100%
rename from code/web/public_php/admin/smarty/Smarty_Compiler.class.php
rename to web/public_php/admin/smarty/Smarty_Compiler.class.php
diff --git a/code/web/public_php/admin/smarty/debug.tpl b/web/public_php/admin/smarty/debug.tpl
similarity index 100%
rename from code/web/public_php/admin/smarty/debug.tpl
rename to web/public_php/admin/smarty/debug.tpl
diff --git a/code/web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php b/web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php
rename to web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php
diff --git a/code/web/public_php/admin/smarty/internals/core.assign_smarty_interface.php b/web/public_php/admin/smarty/internals/core.assign_smarty_interface.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.assign_smarty_interface.php
rename to web/public_php/admin/smarty/internals/core.assign_smarty_interface.php
diff --git a/code/web/public_php/admin/smarty/internals/core.create_dir_structure.php b/web/public_php/admin/smarty/internals/core.create_dir_structure.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.create_dir_structure.php
rename to web/public_php/admin/smarty/internals/core.create_dir_structure.php
diff --git a/code/web/public_php/admin/smarty/internals/core.display_debug_console.php b/web/public_php/admin/smarty/internals/core.display_debug_console.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.display_debug_console.php
rename to web/public_php/admin/smarty/internals/core.display_debug_console.php
diff --git a/code/web/public_php/admin/smarty/internals/core.get_include_path.php b/web/public_php/admin/smarty/internals/core.get_include_path.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.get_include_path.php
rename to web/public_php/admin/smarty/internals/core.get_include_path.php
diff --git a/code/web/public_php/admin/smarty/internals/core.get_microtime.php b/web/public_php/admin/smarty/internals/core.get_microtime.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.get_microtime.php
rename to web/public_php/admin/smarty/internals/core.get_microtime.php
diff --git a/code/web/public_php/admin/smarty/internals/core.get_php_resource.php b/web/public_php/admin/smarty/internals/core.get_php_resource.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.get_php_resource.php
rename to web/public_php/admin/smarty/internals/core.get_php_resource.php
diff --git a/code/web/public_php/admin/smarty/internals/core.is_secure.php b/web/public_php/admin/smarty/internals/core.is_secure.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.is_secure.php
rename to web/public_php/admin/smarty/internals/core.is_secure.php
diff --git a/code/web/public_php/admin/smarty/internals/core.is_trusted.php b/web/public_php/admin/smarty/internals/core.is_trusted.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.is_trusted.php
rename to web/public_php/admin/smarty/internals/core.is_trusted.php
diff --git a/code/web/public_php/admin/smarty/internals/core.load_plugins.php b/web/public_php/admin/smarty/internals/core.load_plugins.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.load_plugins.php
rename to web/public_php/admin/smarty/internals/core.load_plugins.php
diff --git a/code/web/public_php/admin/smarty/internals/core.load_resource_plugin.php b/web/public_php/admin/smarty/internals/core.load_resource_plugin.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.load_resource_plugin.php
rename to web/public_php/admin/smarty/internals/core.load_resource_plugin.php
diff --git a/code/web/public_php/admin/smarty/internals/core.process_cached_inserts.php b/web/public_php/admin/smarty/internals/core.process_cached_inserts.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.process_cached_inserts.php
rename to web/public_php/admin/smarty/internals/core.process_cached_inserts.php
diff --git a/code/web/public_php/admin/smarty/internals/core.process_compiled_include.php b/web/public_php/admin/smarty/internals/core.process_compiled_include.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.process_compiled_include.php
rename to web/public_php/admin/smarty/internals/core.process_compiled_include.php
diff --git a/code/web/public_php/admin/smarty/internals/core.read_cache_file.php b/web/public_php/admin/smarty/internals/core.read_cache_file.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.read_cache_file.php
rename to web/public_php/admin/smarty/internals/core.read_cache_file.php
diff --git a/code/web/public_php/admin/smarty/internals/core.rm_auto.php b/web/public_php/admin/smarty/internals/core.rm_auto.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.rm_auto.php
rename to web/public_php/admin/smarty/internals/core.rm_auto.php
diff --git a/code/web/public_php/admin/smarty/internals/core.rmdir.php b/web/public_php/admin/smarty/internals/core.rmdir.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.rmdir.php
rename to web/public_php/admin/smarty/internals/core.rmdir.php
diff --git a/code/web/public_php/admin/smarty/internals/core.run_insert_handler.php b/web/public_php/admin/smarty/internals/core.run_insert_handler.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.run_insert_handler.php
rename to web/public_php/admin/smarty/internals/core.run_insert_handler.php
diff --git a/code/web/public_php/admin/smarty/internals/core.smarty_include_php.php b/web/public_php/admin/smarty/internals/core.smarty_include_php.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.smarty_include_php.php
rename to web/public_php/admin/smarty/internals/core.smarty_include_php.php
diff --git a/code/web/public_php/admin/smarty/internals/core.write_cache_file.php b/web/public_php/admin/smarty/internals/core.write_cache_file.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.write_cache_file.php
rename to web/public_php/admin/smarty/internals/core.write_cache_file.php
diff --git a/code/web/public_php/admin/smarty/internals/core.write_compiled_include.php b/web/public_php/admin/smarty/internals/core.write_compiled_include.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.write_compiled_include.php
rename to web/public_php/admin/smarty/internals/core.write_compiled_include.php
diff --git a/code/web/public_php/admin/smarty/internals/core.write_compiled_resource.php b/web/public_php/admin/smarty/internals/core.write_compiled_resource.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.write_compiled_resource.php
rename to web/public_php/admin/smarty/internals/core.write_compiled_resource.php
diff --git a/code/web/public_php/admin/smarty/internals/core.write_file.php b/web/public_php/admin/smarty/internals/core.write_file.php
similarity index 100%
rename from code/web/public_php/admin/smarty/internals/core.write_file.php
rename to web/public_php/admin/smarty/internals/core.write_file.php
diff --git a/code/web/public_php/admin/smarty/plugins/block.textformat.php b/web/public_php/admin/smarty/plugins/block.textformat.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/block.textformat.php
rename to web/public_php/admin/smarty/plugins/block.textformat.php
diff --git a/code/web/public_php/admin/smarty/plugins/compiler.assign.php b/web/public_php/admin/smarty/plugins/compiler.assign.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/compiler.assign.php
rename to web/public_php/admin/smarty/plugins/compiler.assign.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.assign_debug_info.php b/web/public_php/admin/smarty/plugins/function.assign_debug_info.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.assign_debug_info.php
rename to web/public_php/admin/smarty/plugins/function.assign_debug_info.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.config_load.php b/web/public_php/admin/smarty/plugins/function.config_load.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.config_load.php
rename to web/public_php/admin/smarty/plugins/function.config_load.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.counter.php b/web/public_php/admin/smarty/plugins/function.counter.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.counter.php
rename to web/public_php/admin/smarty/plugins/function.counter.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.cycle.php b/web/public_php/admin/smarty/plugins/function.cycle.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.cycle.php
rename to web/public_php/admin/smarty/plugins/function.cycle.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.debug.php b/web/public_php/admin/smarty/plugins/function.debug.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.debug.php
rename to web/public_php/admin/smarty/plugins/function.debug.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.eval.php b/web/public_php/admin/smarty/plugins/function.eval.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.eval.php
rename to web/public_php/admin/smarty/plugins/function.eval.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.fetch.php b/web/public_php/admin/smarty/plugins/function.fetch.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.fetch.php
rename to web/public_php/admin/smarty/plugins/function.fetch.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_checkboxes.php b/web/public_php/admin/smarty/plugins/function.html_checkboxes.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_checkboxes.php
rename to web/public_php/admin/smarty/plugins/function.html_checkboxes.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_image.php b/web/public_php/admin/smarty/plugins/function.html_image.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_image.php
rename to web/public_php/admin/smarty/plugins/function.html_image.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_options.php b/web/public_php/admin/smarty/plugins/function.html_options.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_options.php
rename to web/public_php/admin/smarty/plugins/function.html_options.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_radios.php b/web/public_php/admin/smarty/plugins/function.html_radios.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_radios.php
rename to web/public_php/admin/smarty/plugins/function.html_radios.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_select_date.php b/web/public_php/admin/smarty/plugins/function.html_select_date.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_select_date.php
rename to web/public_php/admin/smarty/plugins/function.html_select_date.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_select_time.php b/web/public_php/admin/smarty/plugins/function.html_select_time.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_select_time.php
rename to web/public_php/admin/smarty/plugins/function.html_select_time.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.html_table.php b/web/public_php/admin/smarty/plugins/function.html_table.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.html_table.php
rename to web/public_php/admin/smarty/plugins/function.html_table.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.mailto.php b/web/public_php/admin/smarty/plugins/function.mailto.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.mailto.php
rename to web/public_php/admin/smarty/plugins/function.mailto.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.math.php b/web/public_php/admin/smarty/plugins/function.math.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.math.php
rename to web/public_php/admin/smarty/plugins/function.math.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.popup.php b/web/public_php/admin/smarty/plugins/function.popup.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.popup.php
rename to web/public_php/admin/smarty/plugins/function.popup.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.popup_init.php b/web/public_php/admin/smarty/plugins/function.popup_init.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.popup_init.php
rename to web/public_php/admin/smarty/plugins/function.popup_init.php
diff --git a/code/web/public_php/admin/smarty/plugins/function.substr.php b/web/public_php/admin/smarty/plugins/function.substr.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/function.substr.php
rename to web/public_php/admin/smarty/plugins/function.substr.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.capitalize.php b/web/public_php/admin/smarty/plugins/modifier.capitalize.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.capitalize.php
rename to web/public_php/admin/smarty/plugins/modifier.capitalize.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.cat.php b/web/public_php/admin/smarty/plugins/modifier.cat.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.cat.php
rename to web/public_php/admin/smarty/plugins/modifier.cat.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.count_characters.php b/web/public_php/admin/smarty/plugins/modifier.count_characters.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.count_characters.php
rename to web/public_php/admin/smarty/plugins/modifier.count_characters.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php b/web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php
rename to web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.count_sentences.php b/web/public_php/admin/smarty/plugins/modifier.count_sentences.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.count_sentences.php
rename to web/public_php/admin/smarty/plugins/modifier.count_sentences.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.count_words.php b/web/public_php/admin/smarty/plugins/modifier.count_words.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.count_words.php
rename to web/public_php/admin/smarty/plugins/modifier.count_words.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.date_format.php b/web/public_php/admin/smarty/plugins/modifier.date_format.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.date_format.php
rename to web/public_php/admin/smarty/plugins/modifier.date_format.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.debug_print_var.php b/web/public_php/admin/smarty/plugins/modifier.debug_print_var.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.debug_print_var.php
rename to web/public_php/admin/smarty/plugins/modifier.debug_print_var.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.default.php b/web/public_php/admin/smarty/plugins/modifier.default.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.default.php
rename to web/public_php/admin/smarty/plugins/modifier.default.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.escape.php b/web/public_php/admin/smarty/plugins/modifier.escape.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.escape.php
rename to web/public_php/admin/smarty/plugins/modifier.escape.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.indent.php b/web/public_php/admin/smarty/plugins/modifier.indent.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.indent.php
rename to web/public_php/admin/smarty/plugins/modifier.indent.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.lower.php b/web/public_php/admin/smarty/plugins/modifier.lower.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.lower.php
rename to web/public_php/admin/smarty/plugins/modifier.lower.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.nl2br.php b/web/public_php/admin/smarty/plugins/modifier.nl2br.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.nl2br.php
rename to web/public_php/admin/smarty/plugins/modifier.nl2br.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.regex_replace.php b/web/public_php/admin/smarty/plugins/modifier.regex_replace.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.regex_replace.php
rename to web/public_php/admin/smarty/plugins/modifier.regex_replace.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.replace.php b/web/public_php/admin/smarty/plugins/modifier.replace.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.replace.php
rename to web/public_php/admin/smarty/plugins/modifier.replace.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.spacify.php b/web/public_php/admin/smarty/plugins/modifier.spacify.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.spacify.php
rename to web/public_php/admin/smarty/plugins/modifier.spacify.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.string_format.php b/web/public_php/admin/smarty/plugins/modifier.string_format.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.string_format.php
rename to web/public_php/admin/smarty/plugins/modifier.string_format.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.strip.php b/web/public_php/admin/smarty/plugins/modifier.strip.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.strip.php
rename to web/public_php/admin/smarty/plugins/modifier.strip.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.strip_tags.php b/web/public_php/admin/smarty/plugins/modifier.strip_tags.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.strip_tags.php
rename to web/public_php/admin/smarty/plugins/modifier.strip_tags.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.truncate.php b/web/public_php/admin/smarty/plugins/modifier.truncate.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.truncate.php
rename to web/public_php/admin/smarty/plugins/modifier.truncate.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.upper.php b/web/public_php/admin/smarty/plugins/modifier.upper.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.upper.php
rename to web/public_php/admin/smarty/plugins/modifier.upper.php
diff --git a/code/web/public_php/admin/smarty/plugins/modifier.wordwrap.php b/web/public_php/admin/smarty/plugins/modifier.wordwrap.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/modifier.wordwrap.php
rename to web/public_php/admin/smarty/plugins/modifier.wordwrap.php
diff --git a/code/web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php b/web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php
rename to web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php
diff --git a/code/web/public_php/admin/smarty/plugins/shared.escape_special_chars.php b/web/public_php/admin/smarty/plugins/shared.escape_special_chars.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/shared.escape_special_chars.php
rename to web/public_php/admin/smarty/plugins/shared.escape_special_chars.php
diff --git a/code/web/public_php/admin/smarty/plugins/shared.make_timestamp.php b/web/public_php/admin/smarty/plugins/shared.make_timestamp.php
similarity index 100%
rename from code/web/public_php/admin/smarty/plugins/shared.make_timestamp.php
rename to web/public_php/admin/smarty/plugins/shared.make_timestamp.php
diff --git a/code/web/public_php/admin/templates/default/index.tpl b/web/public_php/admin/templates/default/index.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/index.tpl
rename to web/public_php/admin/templates/default/index.tpl
diff --git a/code/web/public_php/admin/templates/default/index_login.tpl b/web/public_php/admin/templates/default/index_login.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/index_login.tpl
rename to web/public_php/admin/templates/default/index_login.tpl
diff --git a/code/web/public_php/admin/templates/default/index_restart_sequence.tpl b/web/public_php/admin/templates/default/index_restart_sequence.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/index_restart_sequence.tpl
rename to web/public_php/admin/templates/default/index_restart_sequence.tpl
diff --git a/code/web/public_php/admin/templates/default/page_footer.tpl b/web/public_php/admin/templates/default/page_footer.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/page_footer.tpl
rename to web/public_php/admin/templates/default/page_footer.tpl
diff --git a/code/web/public_php/admin/templates/default/page_footer_light.tpl b/web/public_php/admin/templates/default/page_footer_light.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/page_footer_light.tpl
rename to web/public_php/admin/templates/default/page_footer_light.tpl
diff --git a/code/web/public_php/admin/templates/default/page_header.tpl b/web/public_php/admin/templates/default/page_header.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/page_header.tpl
rename to web/public_php/admin/templates/default/page_header.tpl
diff --git a/code/web/public_php/admin/templates/default/page_header_light.tpl b/web/public_php/admin/templates/default/page_header_light.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/page_header_light.tpl
rename to web/public_php/admin/templates/default/page_header_light.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_actions.tpl b/web/public_php/admin/templates/default/tool_actions.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_actions.tpl
rename to web/public_php/admin/templates/default/tool_actions.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration.tpl b/web/public_php/admin/templates/default/tool_administration.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration.tpl
rename to web/public_php/admin/templates/default/tool_administration.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_applications.tpl b/web/public_php/admin/templates/default/tool_administration_applications.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_applications.tpl
rename to web/public_php/admin/templates/default/tool_administration_applications.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_domains.tpl b/web/public_php/admin/templates/default/tool_administration_domains.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_domains.tpl
rename to web/public_php/admin/templates/default/tool_administration_domains.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_groups.tpl b/web/public_php/admin/templates/default/tool_administration_groups.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_groups.tpl
rename to web/public_php/admin/templates/default/tool_administration_groups.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_logs.tpl b/web/public_php/admin/templates/default/tool_administration_logs.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_logs.tpl
rename to web/public_php/admin/templates/default/tool_administration_logs.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl b/web/public_php/admin/templates/default/tool_administration_restarts.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
rename to web/public_php/admin/templates/default/tool_administration_restarts.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_shards.tpl b/web/public_php/admin/templates/default/tool_administration_shards.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_shards.tpl
rename to web/public_php/admin/templates/default/tool_administration_shards.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_users.tpl b/web/public_php/admin/templates/default/tool_administration_users.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_users.tpl
rename to web/public_php/admin/templates/default/tool_administration_users.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_administration_users.tpl.backup b/web/public_php/admin/templates/default/tool_administration_users.tpl.backup
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_administration_users.tpl.backup
rename to web/public_php/admin/templates/default/tool_administration_users.tpl.backup
diff --git a/code/web/public_php/admin/templates/default/tool_event_entities.tpl b/web/public_php/admin/templates/default/tool_event_entities.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_event_entities.tpl
rename to web/public_php/admin/templates/default/tool_event_entities.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_graphs.tpl b/web/public_php/admin/templates/default/tool_graphs.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_graphs.tpl
rename to web/public_php/admin/templates/default/tool_graphs.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl b/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
rename to web/public_php/admin/templates/default/tool_graphs_ccu.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl b/web/public_php/admin/templates/default/tool_graphs_hires.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
rename to web/public_php/admin/templates/default/tool_graphs_hires.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl b/web/public_php/admin/templates/default/tool_graphs_tech.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
rename to web/public_php/admin/templates/default/tool_graphs_tech.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_guild_locator.tpl b/web/public_php/admin/templates/default/tool_guild_locator.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_guild_locator.tpl
rename to web/public_php/admin/templates/default/tool_guild_locator.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_log_analyser.tpl b/web/public_php/admin/templates/default/tool_log_analyser.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_log_analyser.tpl
rename to web/public_php/admin/templates/default/tool_log_analyser.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl b/web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl
rename to web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_mfs.tpl b/web/public_php/admin/templates/default/tool_mfs.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_mfs.tpl
rename to web/public_php/admin/templates/default/tool_mfs.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_notes.tpl b/web/public_php/admin/templates/default/tool_notes.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_notes.tpl
rename to web/public_php/admin/templates/default/tool_notes.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_player_locator.tpl b/web/public_php/admin/templates/default/tool_player_locator.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_player_locator.tpl
rename to web/public_php/admin/templates/default/tool_player_locator.tpl
diff --git a/code/web/public_php/admin/templates/default/tool_preferences.tpl b/web/public_php/admin/templates/default/tool_preferences.tpl
similarity index 100%
rename from code/web/public_php/admin/templates/default/tool_preferences.tpl
rename to web/public_php/admin/templates/default/tool_preferences.tpl
diff --git a/code/web/public_php/admin/templates/default_c/placeholder b/web/public_php/admin/templates/default_c/placeholder
similarity index 100%
rename from code/web/public_php/admin/templates/default_c/placeholder
rename to web/public_php/admin/templates/default_c/placeholder
diff --git a/code/web/public_php/admin/tool_actions.php b/web/public_php/admin/tool_actions.php
similarity index 100%
rename from code/web/public_php/admin/tool_actions.php
rename to web/public_php/admin/tool_actions.php
diff --git a/code/web/public_php/admin/tool_administration.php b/web/public_php/admin/tool_administration.php
similarity index 100%
rename from code/web/public_php/admin/tool_administration.php
rename to web/public_php/admin/tool_administration.php
diff --git a/code/web/public_php/admin/tool_event_entities.php b/web/public_php/admin/tool_event_entities.php
similarity index 100%
rename from code/web/public_php/admin/tool_event_entities.php
rename to web/public_php/admin/tool_event_entities.php
diff --git a/code/web/public_php/admin/tool_graphs.php b/web/public_php/admin/tool_graphs.php
similarity index 100%
rename from code/web/public_php/admin/tool_graphs.php
rename to web/public_php/admin/tool_graphs.php
diff --git a/code/web/public_php/admin/tool_guild_locator.php b/web/public_php/admin/tool_guild_locator.php
similarity index 100%
rename from code/web/public_php/admin/tool_guild_locator.php
rename to web/public_php/admin/tool_guild_locator.php
diff --git a/code/web/public_php/admin/tool_log_analyser.php b/web/public_php/admin/tool_log_analyser.php
similarity index 100%
rename from code/web/public_php/admin/tool_log_analyser.php
rename to web/public_php/admin/tool_log_analyser.php
diff --git a/code/web/public_php/admin/tool_mfs.php b/web/public_php/admin/tool_mfs.php
similarity index 100%
rename from code/web/public_php/admin/tool_mfs.php
rename to web/public_php/admin/tool_mfs.php
diff --git a/code/web/public_php/admin/tool_notes.php b/web/public_php/admin/tool_notes.php
similarity index 100%
rename from code/web/public_php/admin/tool_notes.php
rename to web/public_php/admin/tool_notes.php
diff --git a/code/web/public_php/admin/tool_player_locator.php b/web/public_php/admin/tool_player_locator.php
similarity index 100%
rename from code/web/public_php/admin/tool_player_locator.php
rename to web/public_php/admin/tool_player_locator.php
diff --git a/code/web/public_php/admin/tool_preferences.php b/web/public_php/admin/tool_preferences.php
similarity index 100%
rename from code/web/public_php/admin/tool_preferences.php
rename to web/public_php/admin/tool_preferences.php
diff --git a/code/web/public_php/ams/autoload/webusers.php b/web/public_php/ams/autoload/webusers.php
similarity index 100%
rename from code/web/public_php/ams/autoload/webusers.php
rename to web/public_php/ams/autoload/webusers.php
diff --git a/code/web/public_php/ams/cache/placeholder b/web/public_php/ams/cache/placeholder
similarity index 100%
rename from code/web/public_php/ams/cache/placeholder
rename to web/public_php/ams/cache/placeholder
diff --git a/code/web/public_php/ams/configs/ams_lib.conf b/web/public_php/ams/configs/ams_lib.conf
similarity index 100%
rename from code/web/public_php/ams/configs/ams_lib.conf
rename to web/public_php/ams/configs/ams_lib.conf
diff --git a/code/web/public_php/ams/cron/mail_cron.php b/web/public_php/ams/cron/mail_cron.php
similarity index 100%
rename from code/web/public_php/ams/cron/mail_cron.php
rename to web/public_php/ams/cron/mail_cron.php
diff --git a/code/web/public_php/ams/cron/sync_cron.php b/web/public_php/ams/cron/sync_cron.php
similarity index 100%
rename from code/web/public_php/ams/cron/sync_cron.php
rename to web/public_php/ams/cron/sync_cron.php
diff --git a/code/web/public_php/ams/css/animate.min.css b/web/public_php/ams/css/animate.min.css
similarity index 100%
rename from code/web/public_php/ams/css/animate.min.css
rename to web/public_php/ams/css/animate.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-cerulean.css b/web/public_php/ams/css/bootstrap-cerulean.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-cerulean.css
rename to web/public_php/ams/css/bootstrap-cerulean.css
diff --git a/code/web/public_php/ams/css/bootstrap-cerulean.min.css b/web/public_php/ams/css/bootstrap-cerulean.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-cerulean.min.css
rename to web/public_php/ams/css/bootstrap-cerulean.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-classic.css b/web/public_php/ams/css/bootstrap-classic.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-classic.css
rename to web/public_php/ams/css/bootstrap-classic.css
diff --git a/code/web/public_php/ams/css/bootstrap-classic.min.css b/web/public_php/ams/css/bootstrap-classic.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-classic.min.css
rename to web/public_php/ams/css/bootstrap-classic.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-cyborg.css b/web/public_php/ams/css/bootstrap-cyborg.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-cyborg.css
rename to web/public_php/ams/css/bootstrap-cyborg.css
diff --git a/code/web/public_php/ams/css/bootstrap-cyborg.min.css b/web/public_php/ams/css/bootstrap-cyborg.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-cyborg.min.css
rename to web/public_php/ams/css/bootstrap-cyborg.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-darkly.min.css b/web/public_php/ams/css/bootstrap-darkly.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-darkly.min.css
rename to web/public_php/ams/css/bootstrap-darkly.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-journal.css b/web/public_php/ams/css/bootstrap-journal.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-journal.css
rename to web/public_php/ams/css/bootstrap-journal.css
diff --git a/code/web/public_php/ams/css/bootstrap-lumen.min.css b/web/public_php/ams/css/bootstrap-lumen.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-lumen.min.css
rename to web/public_php/ams/css/bootstrap-lumen.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-redy.css b/web/public_php/ams/css/bootstrap-redy.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-redy.css
rename to web/public_php/ams/css/bootstrap-redy.css
diff --git a/code/web/public_php/ams/css/bootstrap-responsive.css b/web/public_php/ams/css/bootstrap-responsive.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-responsive.css
rename to web/public_php/ams/css/bootstrap-responsive.css
diff --git a/code/web/public_php/ams/css/bootstrap-responsive.min.css b/web/public_php/ams/css/bootstrap-responsive.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-responsive.min.css
rename to web/public_php/ams/css/bootstrap-responsive.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-simplex.css b/web/public_php/ams/css/bootstrap-simplex.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-simplex.css
rename to web/public_php/ams/css/bootstrap-simplex.css
diff --git a/code/web/public_php/ams/css/bootstrap-simplex.min.css b/web/public_php/ams/css/bootstrap-simplex.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-simplex.min.css
rename to web/public_php/ams/css/bootstrap-simplex.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-slate.css b/web/public_php/ams/css/bootstrap-slate.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-slate.css
rename to web/public_php/ams/css/bootstrap-slate.css
diff --git a/code/web/public_php/ams/css/bootstrap-slate.min.css b/web/public_php/ams/css/bootstrap-slate.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-slate.min.css
rename to web/public_php/ams/css/bootstrap-slate.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-spacelab.css b/web/public_php/ams/css/bootstrap-spacelab.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-spacelab.css
rename to web/public_php/ams/css/bootstrap-spacelab.css
diff --git a/code/web/public_php/ams/css/bootstrap-spacelab.min.css b/web/public_php/ams/css/bootstrap-spacelab.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-spacelab.min.css
rename to web/public_php/ams/css/bootstrap-spacelab.min.css
diff --git a/code/web/public_php/ams/css/bootstrap-united.css b/web/public_php/ams/css/bootstrap-united.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-united.css
rename to web/public_php/ams/css/bootstrap-united.css
diff --git a/code/web/public_php/ams/css/bootstrap-united.min.css b/web/public_php/ams/css/bootstrap-united.min.css
similarity index 100%
rename from code/web/public_php/ams/css/bootstrap-united.min.css
rename to web/public_php/ams/css/bootstrap-united.min.css
diff --git a/code/web/public_php/ams/css/charisma-app.css b/web/public_php/ams/css/charisma-app.css
similarity index 100%
rename from code/web/public_php/ams/css/charisma-app.css
rename to web/public_php/ams/css/charisma-app.css
diff --git a/code/web/public_php/ams/css/chosen.css b/web/public_php/ams/css/chosen.css
similarity index 100%
rename from code/web/public_php/ams/css/chosen.css
rename to web/public_php/ams/css/chosen.css
diff --git a/code/web/public_php/ams/css/colorbox.css b/web/public_php/ams/css/colorbox.css
similarity index 100%
rename from code/web/public_php/ams/css/colorbox.css
rename to web/public_php/ams/css/colorbox.css
diff --git a/code/web/public_php/ams/css/custom.css b/web/public_php/ams/css/custom.css
similarity index 100%
rename from code/web/public_php/ams/css/custom.css
rename to web/public_php/ams/css/custom.css
diff --git a/code/web/public_php/ams/css/elfinder.min.css b/web/public_php/ams/css/elfinder.min.css
similarity index 100%
rename from code/web/public_php/ams/css/elfinder.min.css
rename to web/public_php/ams/css/elfinder.min.css
diff --git a/code/web/public_php/ams/css/elfinder.theme.css b/web/public_php/ams/css/elfinder.theme.css
similarity index 100%
rename from code/web/public_php/ams/css/elfinder.theme.css
rename to web/public_php/ams/css/elfinder.theme.css
diff --git a/code/web/public_php/ams/css/fullcalendar.css b/web/public_php/ams/css/fullcalendar.css
similarity index 100%
rename from code/web/public_php/ams/css/fullcalendar.css
rename to web/public_php/ams/css/fullcalendar.css
diff --git a/code/web/public_php/ams/css/fullcalendar.print.css b/web/public_php/ams/css/fullcalendar.print.css
similarity index 100%
rename from code/web/public_php/ams/css/fullcalendar.print.css
rename to web/public_php/ams/css/fullcalendar.print.css
diff --git a/code/web/public_php/ams/css/jquery-ui-1.8.21.custom.css b/web/public_php/ams/css/jquery-ui-1.8.21.custom.css
similarity index 100%
rename from code/web/public_php/ams/css/jquery-ui-1.8.21.custom.css
rename to web/public_php/ams/css/jquery-ui-1.8.21.custom.css
diff --git a/code/web/public_php/ams/css/jquery.cleditor.css b/web/public_php/ams/css/jquery.cleditor.css
similarity index 100%
rename from code/web/public_php/ams/css/jquery.cleditor.css
rename to web/public_php/ams/css/jquery.cleditor.css
diff --git a/code/web/public_php/ams/css/jquery.iphone.toggle.css b/web/public_php/ams/css/jquery.iphone.toggle.css
similarity index 100%
rename from code/web/public_php/ams/css/jquery.iphone.toggle.css
rename to web/public_php/ams/css/jquery.iphone.toggle.css
diff --git a/code/web/public_php/ams/css/jquery.noty.css b/web/public_php/ams/css/jquery.noty.css
similarity index 100%
rename from code/web/public_php/ams/css/jquery.noty.css
rename to web/public_php/ams/css/jquery.noty.css
diff --git a/code/web/public_php/ams/css/noty_theme_default.css b/web/public_php/ams/css/noty_theme_default.css
similarity index 100%
rename from code/web/public_php/ams/css/noty_theme_default.css
rename to web/public_php/ams/css/noty_theme_default.css
diff --git a/code/web/public_php/ams/css/opa-icons.css b/web/public_php/ams/css/opa-icons.css
similarity index 100%
rename from code/web/public_php/ams/css/opa-icons.css
rename to web/public_php/ams/css/opa-icons.css
diff --git a/code/web/public_php/ams/css/uniform.default.css b/web/public_php/ams/css/uniform.default.css
similarity index 100%
rename from code/web/public_php/ams/css/uniform.default.css
rename to web/public_php/ams/css/uniform.default.css
diff --git a/code/web/public_php/ams/css/uploadify.css b/web/public_php/ams/css/uploadify.css
similarity index 100%
rename from code/web/public_php/ams/css/uploadify.css
rename to web/public_php/ams/css/uploadify.css
diff --git a/code/web/public_php/ams/doc/assets/images/html_structure.png b/web/public_php/ams/doc/assets/images/html_structure.png
similarity index 100%
rename from code/web/public_php/ams/doc/assets/images/html_structure.png
rename to web/public_php/ams/doc/assets/images/html_structure.png
diff --git a/code/web/public_php/ams/doc/assets/images/image_1.png b/web/public_php/ams/doc/assets/images/image_1.png
similarity index 100%
rename from code/web/public_php/ams/doc/assets/images/image_1.png
rename to web/public_php/ams/doc/assets/images/image_1.png
diff --git a/code/web/public_php/ams/doc/css/documenter_style.css b/web/public_php/ams/doc/css/documenter_style.css
similarity index 100%
rename from code/web/public_php/ams/doc/css/documenter_style.css
rename to web/public_php/ams/doc/css/documenter_style.css
diff --git a/code/web/public_php/ams/doc/css/img/info.png b/web/public_php/ams/doc/css/img/info.png
similarity index 100%
rename from code/web/public_php/ams/doc/css/img/info.png
rename to web/public_php/ams/doc/css/img/info.png
diff --git a/code/web/public_php/ams/doc/css/img/pre_bg.png b/web/public_php/ams/doc/css/img/pre_bg.png
similarity index 100%
rename from code/web/public_php/ams/doc/css/img/pre_bg.png
rename to web/public_php/ams/doc/css/img/pre_bg.png
diff --git a/code/web/public_php/ams/doc/css/img/warning.png b/web/public_php/ams/doc/css/img/warning.png
similarity index 100%
rename from code/web/public_php/ams/doc/css/img/warning.png
rename to web/public_php/ams/doc/css/img/warning.png
diff --git a/code/web/public_php/ams/doc/favicon.ico b/web/public_php/ams/doc/favicon.ico
similarity index 100%
rename from code/web/public_php/ams/doc/favicon.ico
rename to web/public_php/ams/doc/favicon.ico
diff --git a/code/web/public_php/ams/doc/index.html b/web/public_php/ams/doc/index.html
similarity index 100%
rename from code/web/public_php/ams/doc/index.html
rename to web/public_php/ams/doc/index.html
diff --git a/code/web/public_php/ams/doc/js/jquery.1.6.4.js b/web/public_php/ams/doc/js/jquery.1.6.4.js
similarity index 100%
rename from code/web/public_php/ams/doc/js/jquery.1.6.4.js
rename to web/public_php/ams/doc/js/jquery.1.6.4.js
diff --git a/code/web/public_php/ams/doc/js/jquery.easing.js b/web/public_php/ams/doc/js/jquery.easing.js
similarity index 100%
rename from code/web/public_php/ams/doc/js/jquery.easing.js
rename to web/public_php/ams/doc/js/jquery.easing.js
diff --git a/code/web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js b/web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js
similarity index 100%
rename from code/web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js
rename to web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js
diff --git a/code/web/public_php/ams/doc/js/script.js b/web/public_php/ams/doc/js/script.js
similarity index 100%
rename from code/web/public_php/ams/doc/js/script.js
rename to web/public_php/ams/doc/js/script.js
diff --git a/code/web/public_php/ams/files/.htaccess b/web/public_php/ams/files/.htaccess
similarity index 100%
rename from code/web/public_php/ams/files/.htaccess
rename to web/public_php/ams/files/.htaccess
diff --git a/code/web/public_php/ams/files/index.html b/web/public_php/ams/files/index.html
similarity index 100%
rename from code/web/public_php/ams/files/index.html
rename to web/public_php/ams/files/index.html
diff --git a/code/web/public_php/ams/fonts/glyphicons-halflings-regular.eot b/web/public_php/ams/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from code/web/public_php/ams/fonts/glyphicons-halflings-regular.eot
rename to web/public_php/ams/fonts/glyphicons-halflings-regular.eot
diff --git a/code/web/public_php/ams/fonts/glyphicons-halflings-regular.svg b/web/public_php/ams/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from code/web/public_php/ams/fonts/glyphicons-halflings-regular.svg
rename to web/public_php/ams/fonts/glyphicons-halflings-regular.svg
diff --git a/code/web/public_php/ams/fonts/glyphicons-halflings-regular.ttf b/web/public_php/ams/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from code/web/public_php/ams/fonts/glyphicons-halflings-regular.ttf
rename to web/public_php/ams/fonts/glyphicons-halflings-regular.ttf
diff --git a/code/web/public_php/ams/fonts/glyphicons-halflings-regular.woff b/web/public_php/ams/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from code/web/public_php/ams/fonts/glyphicons-halflings-regular.woff
rename to web/public_php/ams/fonts/glyphicons-halflings-regular.woff
diff --git a/code/web/public_php/ams/func/activate_plugin.php b/web/public_php/ams/func/activate_plugin.php
similarity index 100%
rename from code/web/public_php/ams/func/activate_plugin.php
rename to web/public_php/ams/func/activate_plugin.php
diff --git a/code/web/public_php/ams/func/add_sgroup.php b/web/public_php/ams/func/add_sgroup.php
similarity index 100%
rename from code/web/public_php/ams/func/add_sgroup.php
rename to web/public_php/ams/func/add_sgroup.php
diff --git a/code/web/public_php/ams/func/add_user.php b/web/public_php/ams/func/add_user.php
similarity index 100%
rename from code/web/public_php/ams/func/add_user.php
rename to web/public_php/ams/func/add_user.php
diff --git a/code/web/public_php/ams/func/add_user_to_sgroup.php b/web/public_php/ams/func/add_user_to_sgroup.php
similarity index 100%
rename from code/web/public_php/ams/func/add_user_to_sgroup.php
rename to web/public_php/ams/func/add_user_to_sgroup.php
diff --git a/code/web/public_php/ams/func/change_info.php b/web/public_php/ams/func/change_info.php
similarity index 100%
rename from code/web/public_php/ams/func/change_info.php
rename to web/public_php/ams/func/change_info.php
diff --git a/code/web/public_php/ams/func/change_mail.php b/web/public_php/ams/func/change_mail.php
similarity index 100%
rename from code/web/public_php/ams/func/change_mail.php
rename to web/public_php/ams/func/change_mail.php
diff --git a/code/web/public_php/ams/func/change_password.php b/web/public_php/ams/func/change_password.php
similarity index 100%
rename from code/web/public_php/ams/func/change_password.php
rename to web/public_php/ams/func/change_password.php
diff --git a/code/web/public_php/ams/func/change_receivemail.php b/web/public_php/ams/func/change_receivemail.php
similarity index 100%
rename from code/web/public_php/ams/func/change_receivemail.php
rename to web/public_php/ams/func/change_receivemail.php
diff --git a/code/web/public_php/ams/func/create_ticket.php b/web/public_php/ams/func/create_ticket.php
similarity index 100%
rename from code/web/public_php/ams/func/create_ticket.php
rename to web/public_php/ams/func/create_ticket.php
diff --git a/code/web/public_php/ams/func/deactivate_plugin.php b/web/public_php/ams/func/deactivate_plugin.php
similarity index 100%
rename from code/web/public_php/ams/func/deactivate_plugin.php
rename to web/public_php/ams/func/deactivate_plugin.php
diff --git a/code/web/public_php/ams/func/delete_plugin.php b/web/public_php/ams/func/delete_plugin.php
similarity index 100%
rename from code/web/public_php/ams/func/delete_plugin.php
rename to web/public_php/ams/func/delete_plugin.php
diff --git a/code/web/public_php/ams/func/forgot_password.php b/web/public_php/ams/func/forgot_password.php
similarity index 100%
rename from code/web/public_php/ams/func/forgot_password.php
rename to web/public_php/ams/func/forgot_password.php
diff --git a/code/web/public_php/ams/func/install_plugin.php b/web/public_php/ams/func/install_plugin.php
similarity index 100%
rename from code/web/public_php/ams/func/install_plugin.php
rename to web/public_php/ams/func/install_plugin.php
diff --git a/code/web/public_php/ams/func/login.php b/web/public_php/ams/func/login.php
similarity index 100%
rename from code/web/public_php/ams/func/login.php
rename to web/public_php/ams/func/login.php
diff --git a/code/web/public_php/ams/func/modify_email_of_sgroup.php b/web/public_php/ams/func/modify_email_of_sgroup.php
similarity index 100%
rename from code/web/public_php/ams/func/modify_email_of_sgroup.php
rename to web/public_php/ams/func/modify_email_of_sgroup.php
diff --git a/code/web/public_php/ams/func/reply_on_ticket.php b/web/public_php/ams/func/reply_on_ticket.php
similarity index 100%
rename from code/web/public_php/ams/func/reply_on_ticket.php
rename to web/public_php/ams/func/reply_on_ticket.php
diff --git a/code/web/public_php/ams/func/reset_password.php b/web/public_php/ams/func/reset_password.php
similarity index 100%
rename from code/web/public_php/ams/func/reset_password.php
rename to web/public_php/ams/func/reset_password.php
diff --git a/code/web/public_php/ams/func/update_plugin.php b/web/public_php/ams/func/update_plugin.php
similarity index 100%
rename from code/web/public_php/ams/func/update_plugin.php
rename to web/public_php/ams/func/update_plugin.php
diff --git a/code/web/public_php/ams/func/upload.php b/web/public_php/ams/func/upload.php
similarity index 100%
rename from code/web/public_php/ams/func/upload.php
rename to web/public_php/ams/func/upload.php
diff --git a/code/web/public_php/ams/func/userRegistration.php b/web/public_php/ams/func/userRegistration.php
similarity index 100%
rename from code/web/public_php/ams/func/userRegistration.php
rename to web/public_php/ams/func/userRegistration.php
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif
diff --git a/code/web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif b/web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif
similarity index 100%
rename from code/web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif
rename to web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif
diff --git a/code/web/public_php/ams/img/arrows-active.png b/web/public_php/ams/img/arrows-active.png
similarity index 100%
rename from code/web/public_php/ams/img/arrows-active.png
rename to web/public_php/ams/img/arrows-active.png
diff --git a/code/web/public_php/ams/img/arrows-normal.png b/web/public_php/ams/img/arrows-normal.png
similarity index 100%
rename from code/web/public_php/ams/img/arrows-normal.png
rename to web/public_php/ams/img/arrows-normal.png
diff --git a/code/web/public_php/ams/img/bg-input-focus.png b/web/public_php/ams/img/bg-input-focus.png
similarity index 100%
rename from code/web/public_php/ams/img/bg-input-focus.png
rename to web/public_php/ams/img/bg-input-focus.png
diff --git a/code/web/public_php/ams/img/bg-input.png b/web/public_php/ams/img/bg-input.png
similarity index 100%
rename from code/web/public_php/ams/img/bg-input.png
rename to web/public_php/ams/img/bg-input.png
diff --git a/code/web/public_php/ams/img/border.png b/web/public_php/ams/img/border.png
similarity index 100%
rename from code/web/public_php/ams/img/border.png
rename to web/public_php/ams/img/border.png
diff --git a/code/web/public_php/ams/img/buttons.gif b/web/public_php/ams/img/buttons.gif
similarity index 100%
rename from code/web/public_php/ams/img/buttons.gif
rename to web/public_php/ams/img/buttons.gif
diff --git a/code/web/public_php/ams/img/cancel-off.png b/web/public_php/ams/img/cancel-off.png
similarity index 100%
rename from code/web/public_php/ams/img/cancel-off.png
rename to web/public_php/ams/img/cancel-off.png
diff --git a/code/web/public_php/ams/img/cancel-on.png b/web/public_php/ams/img/cancel-on.png
similarity index 100%
rename from code/web/public_php/ams/img/cancel-on.png
rename to web/public_php/ams/img/cancel-on.png
diff --git a/code/web/public_php/ams/img/chosen-sprite.png b/web/public_php/ams/img/chosen-sprite.png
similarity index 100%
rename from code/web/public_php/ams/img/chosen-sprite.png
rename to web/public_php/ams/img/chosen-sprite.png
diff --git a/code/web/public_php/ams/img/controls.png b/web/public_php/ams/img/controls.png
similarity index 100%
rename from code/web/public_php/ams/img/controls.png
rename to web/public_php/ams/img/controls.png
diff --git a/code/web/public_php/ams/img/crop.gif b/web/public_php/ams/img/crop.gif
similarity index 100%
rename from code/web/public_php/ams/img/crop.gif
rename to web/public_php/ams/img/crop.gif
diff --git a/code/web/public_php/ams/img/dialogs.png b/web/public_php/ams/img/dialogs.png
similarity index 100%
rename from code/web/public_php/ams/img/dialogs.png
rename to web/public_php/ams/img/dialogs.png
diff --git a/code/web/public_php/ams/img/en.png b/web/public_php/ams/img/en.png
similarity index 100%
rename from code/web/public_php/ams/img/en.png
rename to web/public_php/ams/img/en.png
diff --git a/code/web/public_php/ams/img/error_bg.png b/web/public_php/ams/img/error_bg.png
similarity index 100%
rename from code/web/public_php/ams/img/error_bg.png
rename to web/public_php/ams/img/error_bg.png
diff --git a/code/web/public_php/ams/img/favicon.ico b/web/public_php/ams/img/favicon.ico
similarity index 100%
rename from code/web/public_php/ams/img/favicon.ico
rename to web/public_php/ams/img/favicon.ico
diff --git a/code/web/public_php/ams/img/fr.png b/web/public_php/ams/img/fr.png
similarity index 100%
rename from code/web/public_php/ams/img/fr.png
rename to web/public_php/ams/img/fr.png
diff --git a/code/web/public_php/ams/img/glyphicons-halflings-white.png b/web/public_php/ams/img/glyphicons-halflings-white.png
similarity index 100%
rename from code/web/public_php/ams/img/glyphicons-halflings-white.png
rename to web/public_php/ams/img/glyphicons-halflings-white.png
diff --git a/code/web/public_php/ams/img/glyphicons-halflings.png b/web/public_php/ams/img/glyphicons-halflings.png
similarity index 100%
rename from code/web/public_php/ams/img/glyphicons-halflings.png
rename to web/public_php/ams/img/glyphicons-halflings.png
diff --git a/code/web/public_php/ams/img/icons-big.png b/web/public_php/ams/img/icons-big.png
similarity index 100%
rename from code/web/public_php/ams/img/icons-big.png
rename to web/public_php/ams/img/icons-big.png
diff --git a/code/web/public_php/ams/img/icons-small.png b/web/public_php/ams/img/icons-small.png
similarity index 100%
rename from code/web/public_php/ams/img/icons-small.png
rename to web/public_php/ams/img/icons-small.png
diff --git a/code/web/public_php/ams/img/info/client.png b/web/public_php/ams/img/info/client.png
similarity index 100%
rename from code/web/public_php/ams/img/info/client.png
rename to web/public_php/ams/img/info/client.png
diff --git a/code/web/public_php/ams/img/info/connect.png b/web/public_php/ams/img/info/connect.png
similarity index 100%
rename from code/web/public_php/ams/img/info/connect.png
rename to web/public_php/ams/img/info/connect.png
diff --git a/code/web/public_php/ams/img/info/cpuid.png b/web/public_php/ams/img/info/cpuid.png
similarity index 100%
rename from code/web/public_php/ams/img/info/cpuid.png
rename to web/public_php/ams/img/info/cpuid.png
diff --git a/code/web/public_php/ams/img/info/ht.png b/web/public_php/ams/img/info/ht.png
similarity index 100%
rename from code/web/public_php/ams/img/info/ht.png
rename to web/public_php/ams/img/info/ht.png
diff --git a/code/web/public_php/ams/img/info/local.png b/web/public_php/ams/img/info/local.png
similarity index 100%
rename from code/web/public_php/ams/img/info/local.png
rename to web/public_php/ams/img/info/local.png
diff --git a/code/web/public_php/ams/img/info/mask.png b/web/public_php/ams/img/info/mask.png
similarity index 100%
rename from code/web/public_php/ams/img/info/mask.png
rename to web/public_php/ams/img/info/mask.png
diff --git a/code/web/public_php/ams/img/info/memory.png b/web/public_php/ams/img/info/memory.png
similarity index 100%
rename from code/web/public_php/ams/img/info/memory.png
rename to web/public_php/ams/img/info/memory.png
diff --git a/code/web/public_php/ams/img/info/nel.png b/web/public_php/ams/img/info/nel.png
similarity index 100%
rename from code/web/public_php/ams/img/info/nel.png
rename to web/public_php/ams/img/info/nel.png
diff --git a/code/web/public_php/ams/img/info/os.png b/web/public_php/ams/img/info/os.png
similarity index 100%
rename from code/web/public_php/ams/img/info/os.png
rename to web/public_php/ams/img/info/os.png
diff --git a/code/web/public_php/ams/img/info/patch.png b/web/public_php/ams/img/info/patch.png
similarity index 100%
rename from code/web/public_php/ams/img/info/patch.png
rename to web/public_php/ams/img/info/patch.png
diff --git a/code/web/public_php/ams/img/info/position.png b/web/public_php/ams/img/info/position.png
similarity index 100%
rename from code/web/public_php/ams/img/info/position.png
rename to web/public_php/ams/img/info/position.png
diff --git a/code/web/public_php/ams/img/info/processor.png b/web/public_php/ams/img/info/processor.png
similarity index 100%
rename from code/web/public_php/ams/img/info/processor.png
rename to web/public_php/ams/img/info/processor.png
diff --git a/code/web/public_php/ams/img/info/server.png b/web/public_php/ams/img/info/server.png
similarity index 100%
rename from code/web/public_php/ams/img/info/server.png
rename to web/public_php/ams/img/info/server.png
diff --git a/code/web/public_php/ams/img/info/shard.png b/web/public_php/ams/img/info/shard.png
similarity index 100%
rename from code/web/public_php/ams/img/info/shard.png
rename to web/public_php/ams/img/info/shard.png
diff --git a/code/web/public_php/ams/img/info/user.png b/web/public_php/ams/img/info/user.png
similarity index 100%
rename from code/web/public_php/ams/img/info/user.png
rename to web/public_php/ams/img/info/user.png
diff --git a/code/web/public_php/ams/img/info/view.png b/web/public_php/ams/img/info/view.png
similarity index 100%
rename from code/web/public_php/ams/img/info/view.png
rename to web/public_php/ams/img/info/view.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/off.png b/web/public_php/ams/img/iphone-style-checkboxes/off.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/off.png
rename to web/public_php/ams/img/iphone-style-checkboxes/off.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/on.png b/web/public_php/ams/img/iphone-style-checkboxes/on.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/on.png
rename to web/public_php/ams/img/iphone-style-checkboxes/on.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/slider.png b/web/public_php/ams/img/iphone-style-checkboxes/slider.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/slider.png
rename to web/public_php/ams/img/iphone-style-checkboxes/slider.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/slider_center.png b/web/public_php/ams/img/iphone-style-checkboxes/slider_center.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/slider_center.png
rename to web/public_php/ams/img/iphone-style-checkboxes/slider_center.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/slider_left.png b/web/public_php/ams/img/iphone-style-checkboxes/slider_left.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/slider_left.png
rename to web/public_php/ams/img/iphone-style-checkboxes/slider_left.png
diff --git a/code/web/public_php/ams/img/iphone-style-checkboxes/slider_right.png b/web/public_php/ams/img/iphone-style-checkboxes/slider_right.png
similarity index 100%
rename from code/web/public_php/ams/img/iphone-style-checkboxes/slider_right.png
rename to web/public_php/ams/img/iphone-style-checkboxes/slider_right.png
diff --git a/code/web/public_php/ams/img/loading.gif b/web/public_php/ams/img/loading.gif
similarity index 100%
rename from code/web/public_php/ams/img/loading.gif
rename to web/public_php/ams/img/loading.gif
diff --git a/code/web/public_php/ams/img/loading_background.png b/web/public_php/ams/img/loading_background.png
similarity index 100%
rename from code/web/public_php/ams/img/loading_background.png
rename to web/public_php/ams/img/loading_background.png
diff --git a/code/web/public_php/ams/img/logo.png b/web/public_php/ams/img/logo.png
similarity index 100%
rename from code/web/public_php/ams/img/logo.png
rename to web/public_php/ams/img/logo.png
diff --git a/code/web/public_php/ams/img/logo20.png b/web/public_php/ams/img/logo20.png
similarity index 100%
rename from code/web/public_php/ams/img/logo20.png
rename to web/public_php/ams/img/logo20.png
diff --git a/code/web/public_php/ams/img/mainlogo.png b/web/public_php/ams/img/mainlogo.png
similarity index 100%
rename from code/web/public_php/ams/img/mainlogo.png
rename to web/public_php/ams/img/mainlogo.png
diff --git a/code/web/public_php/ams/img/opa-icons-black16.png b/web/public_php/ams/img/opa-icons-black16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-black16.png
rename to web/public_php/ams/img/opa-icons-black16.png
diff --git a/code/web/public_php/ams/img/opa-icons-black32.png b/web/public_php/ams/img/opa-icons-black32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-black32.png
rename to web/public_php/ams/img/opa-icons-black32.png
diff --git a/code/web/public_php/ams/img/opa-icons-blue16.png b/web/public_php/ams/img/opa-icons-blue16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-blue16.png
rename to web/public_php/ams/img/opa-icons-blue16.png
diff --git a/code/web/public_php/ams/img/opa-icons-blue32.png b/web/public_php/ams/img/opa-icons-blue32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-blue32.png
rename to web/public_php/ams/img/opa-icons-blue32.png
diff --git a/code/web/public_php/ams/img/opa-icons-color16.png b/web/public_php/ams/img/opa-icons-color16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-color16.png
rename to web/public_php/ams/img/opa-icons-color16.png
diff --git a/code/web/public_php/ams/img/opa-icons-color32.png b/web/public_php/ams/img/opa-icons-color32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-color32.png
rename to web/public_php/ams/img/opa-icons-color32.png
diff --git a/code/web/public_php/ams/img/opa-icons-darkgray16.png b/web/public_php/ams/img/opa-icons-darkgray16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-darkgray16.png
rename to web/public_php/ams/img/opa-icons-darkgray16.png
diff --git a/code/web/public_php/ams/img/opa-icons-darkgray32.png b/web/public_php/ams/img/opa-icons-darkgray32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-darkgray32.png
rename to web/public_php/ams/img/opa-icons-darkgray32.png
diff --git a/code/web/public_php/ams/img/opa-icons-gray16.png b/web/public_php/ams/img/opa-icons-gray16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-gray16.png
rename to web/public_php/ams/img/opa-icons-gray16.png
diff --git a/code/web/public_php/ams/img/opa-icons-gray32.png b/web/public_php/ams/img/opa-icons-gray32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-gray32.png
rename to web/public_php/ams/img/opa-icons-gray32.png
diff --git a/code/web/public_php/ams/img/opa-icons-green16.png b/web/public_php/ams/img/opa-icons-green16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-green16.png
rename to web/public_php/ams/img/opa-icons-green16.png
diff --git a/code/web/public_php/ams/img/opa-icons-green32.png b/web/public_php/ams/img/opa-icons-green32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-green32.png
rename to web/public_php/ams/img/opa-icons-green32.png
diff --git a/code/web/public_php/ams/img/opa-icons-orange16.png b/web/public_php/ams/img/opa-icons-orange16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-orange16.png
rename to web/public_php/ams/img/opa-icons-orange16.png
diff --git a/code/web/public_php/ams/img/opa-icons-orange32.png b/web/public_php/ams/img/opa-icons-orange32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-orange32.png
rename to web/public_php/ams/img/opa-icons-orange32.png
diff --git a/code/web/public_php/ams/img/opa-icons-red16.png b/web/public_php/ams/img/opa-icons-red16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-red16.png
rename to web/public_php/ams/img/opa-icons-red16.png
diff --git a/code/web/public_php/ams/img/opa-icons-red32.png b/web/public_php/ams/img/opa-icons-red32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-red32.png
rename to web/public_php/ams/img/opa-icons-red32.png
diff --git a/code/web/public_php/ams/img/opa-icons-white16.png b/web/public_php/ams/img/opa-icons-white16.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-white16.png
rename to web/public_php/ams/img/opa-icons-white16.png
diff --git a/code/web/public_php/ams/img/opa-icons-white32.png b/web/public_php/ams/img/opa-icons-white32.png
similarity index 100%
rename from code/web/public_php/ams/img/opa-icons-white32.png
rename to web/public_php/ams/img/opa-icons-white32.png
diff --git a/code/web/public_php/ams/img/progress.gif b/web/public_php/ams/img/progress.gif
similarity index 100%
rename from code/web/public_php/ams/img/progress.gif
rename to web/public_php/ams/img/progress.gif
diff --git a/code/web/public_php/ams/img/qrcode.png b/web/public_php/ams/img/qrcode.png
similarity index 100%
rename from code/web/public_php/ams/img/qrcode.png
rename to web/public_php/ams/img/qrcode.png
diff --git a/code/web/public_php/ams/img/qrcode136.png b/web/public_php/ams/img/qrcode136.png
similarity index 100%
rename from code/web/public_php/ams/img/qrcode136.png
rename to web/public_php/ams/img/qrcode136.png
diff --git a/code/web/public_php/ams/img/quicklook-bg.png b/web/public_php/ams/img/quicklook-bg.png
similarity index 100%
rename from code/web/public_php/ams/img/quicklook-bg.png
rename to web/public_php/ams/img/quicklook-bg.png
diff --git a/code/web/public_php/ams/img/quicklook-icons.png b/web/public_php/ams/img/quicklook-icons.png
similarity index 100%
rename from code/web/public_php/ams/img/quicklook-icons.png
rename to web/public_php/ams/img/quicklook-icons.png
diff --git a/code/web/public_php/ams/img/resize.png b/web/public_php/ams/img/resize.png
similarity index 100%
rename from code/web/public_php/ams/img/resize.png
rename to web/public_php/ams/img/resize.png
diff --git a/code/web/public_php/ams/img/ryzomcore.png b/web/public_php/ams/img/ryzomcore.png
similarity index 100%
rename from code/web/public_php/ams/img/ryzomcore.png
rename to web/public_php/ams/img/ryzomcore.png
diff --git a/code/web/public_php/ams/img/ryzomcore_166_62.png b/web/public_php/ams/img/ryzomcore_166_62.png
similarity index 100%
rename from code/web/public_php/ams/img/ryzomcore_166_62.png
rename to web/public_php/ams/img/ryzomcore_166_62.png
diff --git a/code/web/public_php/ams/img/ryzomlogo.psd b/web/public_php/ams/img/ryzomlogo.psd
similarity index 100%
rename from code/web/public_php/ams/img/ryzomlogo.psd
rename to web/public_php/ams/img/ryzomlogo.psd
diff --git a/code/web/public_php/ams/img/ryzomtop.png b/web/public_php/ams/img/ryzomtop.png
similarity index 100%
rename from code/web/public_php/ams/img/ryzomtop.png
rename to web/public_php/ams/img/ryzomtop.png
diff --git a/code/web/public_php/ams/img/spinner-mini.gif b/web/public_php/ams/img/spinner-mini.gif
similarity index 100%
rename from code/web/public_php/ams/img/spinner-mini.gif
rename to web/public_php/ams/img/spinner-mini.gif
diff --git a/code/web/public_php/ams/img/sprite.png b/web/public_php/ams/img/sprite.png
similarity index 100%
rename from code/web/public_php/ams/img/sprite.png
rename to web/public_php/ams/img/sprite.png
diff --git a/code/web/public_php/ams/img/star-half.png b/web/public_php/ams/img/star-half.png
similarity index 100%
rename from code/web/public_php/ams/img/star-half.png
rename to web/public_php/ams/img/star-half.png
diff --git a/code/web/public_php/ams/img/star-off.png b/web/public_php/ams/img/star-off.png
similarity index 100%
rename from code/web/public_php/ams/img/star-off.png
rename to web/public_php/ams/img/star-off.png
diff --git a/code/web/public_php/ams/img/star-on.png b/web/public_php/ams/img/star-on.png
similarity index 100%
rename from code/web/public_php/ams/img/star-on.png
rename to web/public_php/ams/img/star-on.png
diff --git a/code/web/public_php/ams/img/thumb.png b/web/public_php/ams/img/thumb.png
similarity index 100%
rename from code/web/public_php/ams/img/thumb.png
rename to web/public_php/ams/img/thumb.png
diff --git a/code/web/public_php/ams/img/toolbar.gif b/web/public_php/ams/img/toolbar.gif
similarity index 100%
rename from code/web/public_php/ams/img/toolbar.gif
rename to web/public_php/ams/img/toolbar.gif
diff --git a/code/web/public_php/ams/img/toolbar.png b/web/public_php/ams/img/toolbar.png
similarity index 100%
rename from code/web/public_php/ams/img/toolbar.png
rename to web/public_php/ams/img/toolbar.png
diff --git a/code/web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png b/web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png
rename to web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/code/web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png b/web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png
rename to web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png
diff --git a/code/web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png b/web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png
rename to web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/code/web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png b/web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png
rename to web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png
diff --git a/code/web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png b/web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png
rename to web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png
diff --git a/code/web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png b/web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png
rename to web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/code/web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png b/web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png
rename to web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/code/web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png b/web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/code/web/public_php/ams/img/ui-icons_222222_256x240.png b/web/public_php/ams/img/ui-icons_222222_256x240.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-icons_222222_256x240.png
rename to web/public_php/ams/img/ui-icons_222222_256x240.png
diff --git a/code/web/public_php/ams/img/ui-icons_2e83ff_256x240.png b/web/public_php/ams/img/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-icons_2e83ff_256x240.png
rename to web/public_php/ams/img/ui-icons_2e83ff_256x240.png
diff --git a/code/web/public_php/ams/img/ui-icons_454545_256x240.png b/web/public_php/ams/img/ui-icons_454545_256x240.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-icons_454545_256x240.png
rename to web/public_php/ams/img/ui-icons_454545_256x240.png
diff --git a/code/web/public_php/ams/img/ui-icons_888888_256x240.png b/web/public_php/ams/img/ui-icons_888888_256x240.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-icons_888888_256x240.png
rename to web/public_php/ams/img/ui-icons_888888_256x240.png
diff --git a/code/web/public_php/ams/img/ui-icons_cd0a0a_256x240.png b/web/public_php/ams/img/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from code/web/public_php/ams/img/ui-icons_cd0a0a_256x240.png
rename to web/public_php/ams/img/ui-icons_cd0a0a_256x240.png
diff --git a/code/web/public_php/ams/img/uploadify-cancel.png b/web/public_php/ams/img/uploadify-cancel.png
similarity index 100%
rename from code/web/public_php/ams/img/uploadify-cancel.png
rename to web/public_php/ams/img/uploadify-cancel.png
diff --git a/code/web/public_php/ams/inc/change_permission.php b/web/public_php/ams/inc/change_permission.php
similarity index 100%
rename from code/web/public_php/ams/inc/change_permission.php
rename to web/public_php/ams/inc/change_permission.php
diff --git a/code/web/public_php/ams/inc/createticket.php b/web/public_php/ams/inc/createticket.php
similarity index 100%
rename from code/web/public_php/ams/inc/createticket.php
rename to web/public_php/ams/inc/createticket.php
diff --git a/code/web/public_php/ams/inc/dashboard.php b/web/public_php/ams/inc/dashboard.php
similarity index 100%
rename from code/web/public_php/ams/inc/dashboard.php
rename to web/public_php/ams/inc/dashboard.php
diff --git a/code/web/public_php/ams/inc/error.php b/web/public_php/ams/inc/error.php
similarity index 100%
rename from code/web/public_php/ams/inc/error.php
rename to web/public_php/ams/inc/error.php
diff --git a/code/web/public_php/ams/inc/forgot_password.php b/web/public_php/ams/inc/forgot_password.php
similarity index 100%
rename from code/web/public_php/ams/inc/forgot_password.php
rename to web/public_php/ams/inc/forgot_password.php
diff --git a/code/web/public_php/ams/inc/login.php b/web/public_php/ams/inc/login.php
similarity index 100%
rename from code/web/public_php/ams/inc/login.php
rename to web/public_php/ams/inc/login.php
diff --git a/code/web/public_php/ams/inc/logout.php b/web/public_php/ams/inc/logout.php
similarity index 100%
rename from code/web/public_php/ams/inc/logout.php
rename to web/public_php/ams/inc/logout.php
diff --git a/code/web/public_php/ams/inc/plugins.php b/web/public_php/ams/inc/plugins.php
similarity index 100%
rename from code/web/public_php/ams/inc/plugins.php
rename to web/public_php/ams/inc/plugins.php
diff --git a/code/web/public_php/ams/inc/plugins_update.php b/web/public_php/ams/inc/plugins_update.php
similarity index 100%
rename from code/web/public_php/ams/inc/plugins_update.php
rename to web/public_php/ams/inc/plugins_update.php
diff --git a/code/web/public_php/ams/inc/register.php b/web/public_php/ams/inc/register.php
similarity index 100%
rename from code/web/public_php/ams/inc/register.php
rename to web/public_php/ams/inc/register.php
diff --git a/code/web/public_php/ams/inc/reset_password.php b/web/public_php/ams/inc/reset_password.php
similarity index 100%
rename from code/web/public_php/ams/inc/reset_password.php
rename to web/public_php/ams/inc/reset_password.php
diff --git a/code/web/public_php/ams/inc/settings.php b/web/public_php/ams/inc/settings.php
similarity index 100%
rename from code/web/public_php/ams/inc/settings.php
rename to web/public_php/ams/inc/settings.php
diff --git a/code/web/public_php/ams/inc/sgroup_list.php b/web/public_php/ams/inc/sgroup_list.php
similarity index 100%
rename from code/web/public_php/ams/inc/sgroup_list.php
rename to web/public_php/ams/inc/sgroup_list.php
diff --git a/code/web/public_php/ams/inc/show_queue.php b/web/public_php/ams/inc/show_queue.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_queue.php
rename to web/public_php/ams/inc/show_queue.php
diff --git a/code/web/public_php/ams/inc/show_reply.php b/web/public_php/ams/inc/show_reply.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_reply.php
rename to web/public_php/ams/inc/show_reply.php
diff --git a/code/web/public_php/ams/inc/show_sgroup.php b/web/public_php/ams/inc/show_sgroup.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_sgroup.php
rename to web/public_php/ams/inc/show_sgroup.php
diff --git a/code/web/public_php/ams/inc/show_ticket.php b/web/public_php/ams/inc/show_ticket.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_ticket.php
rename to web/public_php/ams/inc/show_ticket.php
diff --git a/code/web/public_php/ams/inc/show_ticket_info.php b/web/public_php/ams/inc/show_ticket_info.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_ticket_info.php
rename to web/public_php/ams/inc/show_ticket_info.php
diff --git a/code/web/public_php/ams/inc/show_ticket_log.php b/web/public_php/ams/inc/show_ticket_log.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_ticket_log.php
rename to web/public_php/ams/inc/show_ticket_log.php
diff --git a/code/web/public_php/ams/inc/show_user.php b/web/public_php/ams/inc/show_user.php
similarity index 100%
rename from code/web/public_php/ams/inc/show_user.php
rename to web/public_php/ams/inc/show_user.php
diff --git a/code/web/public_php/ams/inc/syncing.php b/web/public_php/ams/inc/syncing.php
similarity index 100%
rename from code/web/public_php/ams/inc/syncing.php
rename to web/public_php/ams/inc/syncing.php
diff --git a/code/web/public_php/ams/inc/userlist.php b/web/public_php/ams/inc/userlist.php
similarity index 100%
rename from code/web/public_php/ams/inc/userlist.php
rename to web/public_php/ams/inc/userlist.php
diff --git a/code/web/public_php/ams/index.php b/web/public_php/ams/index.php
similarity index 100%
rename from code/web/public_php/ams/index.php
rename to web/public_php/ams/index.php
diff --git a/code/web/public_php/ams/js/bootstrap-alert.js b/web/public_php/ams/js/bootstrap-alert.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-alert.js
rename to web/public_php/ams/js/bootstrap-alert.js
diff --git a/code/web/public_php/ams/js/bootstrap-button.js b/web/public_php/ams/js/bootstrap-button.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-button.js
rename to web/public_php/ams/js/bootstrap-button.js
diff --git a/code/web/public_php/ams/js/bootstrap-carousel.js b/web/public_php/ams/js/bootstrap-carousel.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-carousel.js
rename to web/public_php/ams/js/bootstrap-carousel.js
diff --git a/code/web/public_php/ams/js/bootstrap-collapse.js b/web/public_php/ams/js/bootstrap-collapse.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-collapse.js
rename to web/public_php/ams/js/bootstrap-collapse.js
diff --git a/code/web/public_php/ams/js/bootstrap-dropdown.js b/web/public_php/ams/js/bootstrap-dropdown.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-dropdown.js
rename to web/public_php/ams/js/bootstrap-dropdown.js
diff --git a/code/web/public_php/ams/js/bootstrap-modal.js b/web/public_php/ams/js/bootstrap-modal.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-modal.js
rename to web/public_php/ams/js/bootstrap-modal.js
diff --git a/code/web/public_php/ams/js/bootstrap-popover.js b/web/public_php/ams/js/bootstrap-popover.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-popover.js
rename to web/public_php/ams/js/bootstrap-popover.js
diff --git a/code/web/public_php/ams/js/bootstrap-scrollspy.js b/web/public_php/ams/js/bootstrap-scrollspy.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-scrollspy.js
rename to web/public_php/ams/js/bootstrap-scrollspy.js
diff --git a/code/web/public_php/ams/js/bootstrap-tab.js b/web/public_php/ams/js/bootstrap-tab.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-tab.js
rename to web/public_php/ams/js/bootstrap-tab.js
diff --git a/code/web/public_php/ams/js/bootstrap-toggle.js b/web/public_php/ams/js/bootstrap-toggle.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-toggle.js
rename to web/public_php/ams/js/bootstrap-toggle.js
diff --git a/code/web/public_php/ams/js/bootstrap-tooltip.js b/web/public_php/ams/js/bootstrap-tooltip.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-tooltip.js
rename to web/public_php/ams/js/bootstrap-tooltip.js
diff --git a/code/web/public_php/ams/js/bootstrap-tour.js b/web/public_php/ams/js/bootstrap-tour.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-tour.js
rename to web/public_php/ams/js/bootstrap-tour.js
diff --git a/code/web/public_php/ams/js/bootstrap-transition.js b/web/public_php/ams/js/bootstrap-transition.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-transition.js
rename to web/public_php/ams/js/bootstrap-transition.js
diff --git a/code/web/public_php/ams/js/bootstrap-typeahead.js b/web/public_php/ams/js/bootstrap-typeahead.js
similarity index 100%
rename from code/web/public_php/ams/js/bootstrap-typeahead.js
rename to web/public_php/ams/js/bootstrap-typeahead.js
diff --git a/code/web/public_php/ams/js/charisma.js b/web/public_php/ams/js/charisma.js
similarity index 100%
rename from code/web/public_php/ams/js/charisma.js
rename to web/public_php/ams/js/charisma.js
diff --git a/code/web/public_php/ams/js/custom.js b/web/public_php/ams/js/custom.js
similarity index 100%
rename from code/web/public_php/ams/js/custom.js
rename to web/public_php/ams/js/custom.js
diff --git a/code/web/public_php/ams/js/excanvas.js b/web/public_php/ams/js/excanvas.js
similarity index 100%
rename from code/web/public_php/ams/js/excanvas.js
rename to web/public_php/ams/js/excanvas.js
diff --git a/code/web/public_php/ams/js/fullcalendar.min.js b/web/public_php/ams/js/fullcalendar.min.js
similarity index 100%
rename from code/web/public_php/ams/js/fullcalendar.min.js
rename to web/public_php/ams/js/fullcalendar.min.js
diff --git a/code/web/public_php/ams/js/help.js b/web/public_php/ams/js/help.js
similarity index 100%
rename from code/web/public_php/ams/js/help.js
rename to web/public_php/ams/js/help.js
diff --git a/code/web/public_php/ams/js/init-chart.js b/web/public_php/ams/js/init-chart.js
similarity index 100%
rename from code/web/public_php/ams/js/init-chart.js
rename to web/public_php/ams/js/init-chart.js
diff --git a/code/web/public_php/ams/js/jquery-1.7.2.min.js b/web/public_php/ams/js/jquery-1.7.2.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery-1.7.2.min.js
rename to web/public_php/ams/js/jquery-1.7.2.min.js
diff --git a/code/web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js b/web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js
rename to web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js
diff --git a/code/web/public_php/ams/js/jquery.autogrow-textarea.js b/web/public_php/ams/js/jquery.autogrow-textarea.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.autogrow-textarea.js
rename to web/public_php/ams/js/jquery.autogrow-textarea.js
diff --git a/code/web/public_php/ams/js/jquery.chosen.min.js b/web/public_php/ams/js/jquery.chosen.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.chosen.min.js
rename to web/public_php/ams/js/jquery.chosen.min.js
diff --git a/code/web/public_php/ams/js/jquery.cleditor.min.js b/web/public_php/ams/js/jquery.cleditor.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.cleditor.min.js
rename to web/public_php/ams/js/jquery.cleditor.min.js
diff --git a/code/web/public_php/ams/js/jquery.colorbox.min.js b/web/public_php/ams/js/jquery.colorbox.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.colorbox.min.js
rename to web/public_php/ams/js/jquery.colorbox.min.js
diff --git a/code/web/public_php/ams/js/jquery.cookie.js b/web/public_php/ams/js/jquery.cookie.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.cookie.js
rename to web/public_php/ams/js/jquery.cookie.js
diff --git a/code/web/public_php/ams/js/jquery.dataTables.min.js b/web/public_php/ams/js/jquery.dataTables.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.dataTables.min.js
rename to web/public_php/ams/js/jquery.dataTables.min.js
diff --git a/code/web/public_php/ams/js/jquery.elfinder.min.js b/web/public_php/ams/js/jquery.elfinder.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.elfinder.min.js
rename to web/public_php/ams/js/jquery.elfinder.min.js
diff --git a/code/web/public_php/ams/js/jquery.flot.min.js b/web/public_php/ams/js/jquery.flot.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.flot.min.js
rename to web/public_php/ams/js/jquery.flot.min.js
diff --git a/code/web/public_php/ams/js/jquery.flot.pie.min.js b/web/public_php/ams/js/jquery.flot.pie.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.flot.pie.min.js
rename to web/public_php/ams/js/jquery.flot.pie.min.js
diff --git a/code/web/public_php/ams/js/jquery.flot.resize.min.js b/web/public_php/ams/js/jquery.flot.resize.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.flot.resize.min.js
rename to web/public_php/ams/js/jquery.flot.resize.min.js
diff --git a/code/web/public_php/ams/js/jquery.flot.stack.js b/web/public_php/ams/js/jquery.flot.stack.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.flot.stack.js
rename to web/public_php/ams/js/jquery.flot.stack.js
diff --git a/code/web/public_php/ams/js/jquery.history.js b/web/public_php/ams/js/jquery.history.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.history.js
rename to web/public_php/ams/js/jquery.history.js
diff --git a/code/web/public_php/ams/js/jquery.iphone.toggle.js b/web/public_php/ams/js/jquery.iphone.toggle.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.iphone.toggle.js
rename to web/public_php/ams/js/jquery.iphone.toggle.js
diff --git a/code/web/public_php/ams/js/jquery.js b/web/public_php/ams/js/jquery.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.js
rename to web/public_php/ams/js/jquery.js
diff --git a/code/web/public_php/ams/js/jquery.min.js b/web/public_php/ams/js/jquery.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.min.js
rename to web/public_php/ams/js/jquery.min.js
diff --git a/code/web/public_php/ams/js/jquery.noty.js b/web/public_php/ams/js/jquery.noty.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.noty.js
rename to web/public_php/ams/js/jquery.noty.js
diff --git a/code/web/public_php/ams/js/jquery.raty.min.js b/web/public_php/ams/js/jquery.raty.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.raty.min.js
rename to web/public_php/ams/js/jquery.raty.min.js
diff --git a/code/web/public_php/ams/js/jquery.uniform.min.js b/web/public_php/ams/js/jquery.uniform.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.uniform.min.js
rename to web/public_php/ams/js/jquery.uniform.min.js
diff --git a/code/web/public_php/ams/js/jquery.uploadify-3.1.js b/web/public_php/ams/js/jquery.uploadify-3.1.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.uploadify-3.1.js
rename to web/public_php/ams/js/jquery.uploadify-3.1.js
diff --git a/code/web/public_php/ams/js/jquery.uploadify-3.1.min.js b/web/public_php/ams/js/jquery.uploadify-3.1.min.js
similarity index 100%
rename from code/web/public_php/ams/js/jquery.uploadify-3.1.min.js
rename to web/public_php/ams/js/jquery.uploadify-3.1.min.js
diff --git a/code/web/public_php/ams/js/masonry.pkgd.min.js b/web/public_php/ams/js/masonry.pkgd.min.js
similarity index 100%
rename from code/web/public_php/ams/js/masonry.pkgd.min.js
rename to web/public_php/ams/js/masonry.pkgd.min.js
diff --git a/code/web/public_php/ams/misc/check-exists.php b/web/public_php/ams/misc/check-exists.php
similarity index 100%
rename from code/web/public_php/ams/misc/check-exists.php
rename to web/public_php/ams/misc/check-exists.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql b/web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql
rename to web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql
diff --git a/code/web/public_php/ams/misc/elfinder-connector/connector.php b/web/public_php/ams/misc/elfinder-connector/connector.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/connector.php
rename to web/public_php/ams/misc/elfinder-connector/connector.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/elFinder.class.php b/web/public_php/ams/misc/elfinder-connector/elFinder.class.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/elFinder.class.php
rename to web/public_php/ams/misc/elfinder-connector/elFinder.class.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php b/web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php
rename to web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php b/web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php
rename to web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php b/web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php
rename to web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php b/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php
rename to web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php
diff --git a/code/web/public_php/ams/misc/elfinder-connector/mime.types b/web/public_php/ams/misc/elfinder-connector/mime.types
similarity index 100%
rename from code/web/public_php/ams/misc/elfinder-connector/mime.types
rename to web/public_php/ams/misc/elfinder-connector/mime.types
diff --git a/code/web/public_php/ams/misc/uploadify.php b/web/public_php/ams/misc/uploadify.php
similarity index 100%
rename from code/web/public_php/ams/misc/uploadify.php
rename to web/public_php/ams/misc/uploadify.php
diff --git a/code/web/public_php/ams/misc/uploadify.swf b/web/public_php/ams/misc/uploadify.swf
similarity index 100%
rename from code/web/public_php/ams/misc/uploadify.swf
rename to web/public_php/ams/misc/uploadify.swf
diff --git a/code/web/public_php/ams/sql/DBScheme.png b/web/public_php/ams/sql/DBScheme.png
similarity index 100%
rename from code/web/public_php/ams/sql/DBScheme.png
rename to web/public_php/ams/sql/DBScheme.png
diff --git a/code/web/public_php/ams/sql/db.sql b/web/public_php/ams/sql/db.sql
similarity index 100%
rename from code/web/public_php/ams/sql/db.sql
rename to web/public_php/ams/sql/db.sql
diff --git a/code/web/public_php/ams/sql/importusers.php b/web/public_php/ams/sql/importusers.php
similarity index 100%
rename from code/web/public_php/ams/sql/importusers.php
rename to web/public_php/ams/sql/importusers.php
diff --git a/code/web/public_php/ams/sql/ticketsql.sql b/web/public_php/ams/sql/ticketsql.sql
similarity index 100%
rename from code/web/public_php/ams/sql/ticketsql.sql
rename to web/public_php/ams/sql/ticketsql.sql
diff --git a/code/web/public_php/ams/sql/ticketsystemmodel.mwb b/web/public_php/ams/sql/ticketsystemmodel.mwb
similarity index 100%
rename from code/web/public_php/ams/sql/ticketsystemmodel.mwb
rename to web/public_php/ams/sql/ticketsystemmodel.mwb
diff --git a/code/web/public_php/ams/templates/README.md b/web/public_php/ams/templates/README.md
similarity index 100%
rename from code/web/public_php/ams/templates/README.md
rename to web/public_php/ams/templates/README.md
diff --git a/code/web/public_php/ams/templates/createticket.tpl b/web/public_php/ams/templates/createticket.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/createticket.tpl
rename to web/public_php/ams/templates/createticket.tpl
diff --git a/code/web/public_php/ams/templates/dashboard.tpl b/web/public_php/ams/templates/dashboard.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/dashboard.tpl
rename to web/public_php/ams/templates/dashboard.tpl
diff --git a/code/web/public_php/ams/templates/error.tpl b/web/public_php/ams/templates/error.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/error.tpl
rename to web/public_php/ams/templates/error.tpl
diff --git a/code/web/public_php/ams/templates/forgot_password.tpl b/web/public_php/ams/templates/forgot_password.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/forgot_password.tpl
rename to web/public_php/ams/templates/forgot_password.tpl
diff --git a/code/web/public_php/ams/templates/homebackup.tpl b/web/public_php/ams/templates/homebackup.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/homebackup.tpl
rename to web/public_php/ams/templates/homebackup.tpl
diff --git a/code/web/public_php/ams/templates/install.tpl b/web/public_php/ams/templates/install.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/install.tpl
rename to web/public_php/ams/templates/install.tpl
diff --git a/code/web/public_php/ams/templates/install_plugin.tpl b/web/public_php/ams/templates/install_plugin.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/install_plugin.tpl
rename to web/public_php/ams/templates/install_plugin.tpl
diff --git a/code/web/public_php/ams/templates/layout.tpl b/web/public_php/ams/templates/layout.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/layout.tpl
rename to web/public_php/ams/templates/layout.tpl
diff --git a/code/web/public_php/ams/templates/layout_admin.tpl b/web/public_php/ams/templates/layout_admin.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/layout_admin.tpl
rename to web/public_php/ams/templates/layout_admin.tpl
diff --git a/code/web/public_php/ams/templates/layout_mod.tpl b/web/public_php/ams/templates/layout_mod.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/layout_mod.tpl
rename to web/public_php/ams/templates/layout_mod.tpl
diff --git a/code/web/public_php/ams/templates/layout_plugin.tpl b/web/public_php/ams/templates/layout_plugin.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/layout_plugin.tpl
rename to web/public_php/ams/templates/layout_plugin.tpl
diff --git a/code/web/public_php/ams/templates/layout_user.tpl b/web/public_php/ams/templates/layout_user.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/layout_user.tpl
rename to web/public_php/ams/templates/layout_user.tpl
diff --git a/code/web/public_php/ams/templates/license.txt b/web/public_php/ams/templates/license.txt
similarity index 100%
rename from code/web/public_php/ams/templates/license.txt
rename to web/public_php/ams/templates/license.txt
diff --git a/code/web/public_php/ams/templates/login.tpl b/web/public_php/ams/templates/login.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/login.tpl
rename to web/public_php/ams/templates/login.tpl
diff --git a/code/web/public_php/ams/templates/logout.tpl b/web/public_php/ams/templates/logout.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/logout.tpl
rename to web/public_php/ams/templates/logout.tpl
diff --git a/code/web/public_php/ams/templates/plugins.tpl b/web/public_php/ams/templates/plugins.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/plugins.tpl
rename to web/public_php/ams/templates/plugins.tpl
diff --git a/code/web/public_php/ams/templates/plugins_update.tpl b/web/public_php/ams/templates/plugins_update.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/plugins_update.tpl
rename to web/public_php/ams/templates/plugins_update.tpl
diff --git a/code/web/public_php/ams/templates/register.tpl b/web/public_php/ams/templates/register.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/register.tpl
rename to web/public_php/ams/templates/register.tpl
diff --git a/code/web/public_php/ams/templates/register_feedback.tpl b/web/public_php/ams/templates/register_feedback.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/register_feedback.tpl
rename to web/public_php/ams/templates/register_feedback.tpl
diff --git a/code/web/public_php/ams/templates/reset_password.tpl b/web/public_php/ams/templates/reset_password.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/reset_password.tpl
rename to web/public_php/ams/templates/reset_password.tpl
diff --git a/code/web/public_php/ams/templates/reset_success.tpl b/web/public_php/ams/templates/reset_success.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/reset_success.tpl
rename to web/public_php/ams/templates/reset_success.tpl
diff --git a/code/web/public_php/ams/templates/settings.tpl b/web/public_php/ams/templates/settings.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/settings.tpl
rename to web/public_php/ams/templates/settings.tpl
diff --git a/code/web/public_php/ams/templates/sgroup_list.tpl b/web/public_php/ams/templates/sgroup_list.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/sgroup_list.tpl
rename to web/public_php/ams/templates/sgroup_list.tpl
diff --git a/code/web/public_php/ams/templates/show_queue.tpl b/web/public_php/ams/templates/show_queue.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_queue.tpl
rename to web/public_php/ams/templates/show_queue.tpl
diff --git a/code/web/public_php/ams/templates/show_reply.tpl b/web/public_php/ams/templates/show_reply.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_reply.tpl
rename to web/public_php/ams/templates/show_reply.tpl
diff --git a/code/web/public_php/ams/templates/show_sgroup.tpl b/web/public_php/ams/templates/show_sgroup.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_sgroup.tpl
rename to web/public_php/ams/templates/show_sgroup.tpl
diff --git a/code/web/public_php/ams/templates/show_ticket.tpl b/web/public_php/ams/templates/show_ticket.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_ticket.tpl
rename to web/public_php/ams/templates/show_ticket.tpl
diff --git a/code/web/public_php/ams/templates/show_ticket_info.tpl b/web/public_php/ams/templates/show_ticket_info.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_ticket_info.tpl
rename to web/public_php/ams/templates/show_ticket_info.tpl
diff --git a/code/web/public_php/ams/templates/show_ticket_log.tpl b/web/public_php/ams/templates/show_ticket_log.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_ticket_log.tpl
rename to web/public_php/ams/templates/show_ticket_log.tpl
diff --git a/code/web/public_php/ams/templates/show_user.tpl b/web/public_php/ams/templates/show_user.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/show_user.tpl
rename to web/public_php/ams/templates/show_user.tpl
diff --git a/code/web/public_php/ams/templates/syncing.tpl b/web/public_php/ams/templates/syncing.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/syncing.tpl
rename to web/public_php/ams/templates/syncing.tpl
diff --git a/code/web/public_php/ams/templates/userlist.tpl b/web/public_php/ams/templates/userlist.tpl
similarity index 100%
rename from code/web/public_php/ams/templates/userlist.tpl
rename to web/public_php/ams/templates/userlist.tpl
diff --git a/code/web/public_php/ams/templates_c/placeholder b/web/public_php/ams/templates_c/placeholder
similarity index 100%
rename from code/web/public_php/ams/templates_c/placeholder
rename to web/public_php/ams/templates_c/placeholder
diff --git a/code/web/public_php/api/client/auth.php b/web/public_php/api/client/auth.php
similarity index 100%
rename from code/web/public_php/api/client/auth.php
rename to web/public_php/api/client/auth.php
diff --git a/code/web/public_php/api/client/config.php.default b/web/public_php/api/client/config.php.default
similarity index 100%
rename from code/web/public_php/api/client/config.php.default
rename to web/public_php/api/client/config.php.default
diff --git a/code/web/public_php/api/client/time.php b/web/public_php/api/client/time.php
similarity index 100%
rename from code/web/public_php/api/client/time.php
rename to web/public_php/api/client/time.php
diff --git a/code/web/public_php/api/client/user.php b/web/public_php/api/client/user.php
similarity index 100%
rename from code/web/public_php/api/client/user.php
rename to web/public_php/api/client/user.php
diff --git a/code/web/public_php/api/client/utils.php b/web/public_php/api/client/utils.php
similarity index 100%
rename from code/web/public_php/api/client/utils.php
rename to web/public_php/api/client/utils.php
diff --git a/code/web/public_php/api/common/actionPage.php b/web/public_php/api/common/actionPage.php
similarity index 100%
rename from code/web/public_php/api/common/actionPage.php
rename to web/public_php/api/common/actionPage.php
diff --git a/code/web/public_php/api/common/auth.php b/web/public_php/api/common/auth.php
similarity index 100%
rename from code/web/public_php/api/common/auth.php
rename to web/public_php/api/common/auth.php
diff --git a/code/web/public_php/api/common/bbCode.php b/web/public_php/api/common/bbCode.php
similarity index 100%
rename from code/web/public_php/api/common/bbCode.php
rename to web/public_php/api/common/bbCode.php
diff --git a/code/web/public_php/api/common/config.php.default b/web/public_php/api/common/config.php.default
similarity index 100%
rename from code/web/public_php/api/common/config.php.default
rename to web/public_php/api/common/config.php.default
diff --git a/code/web/public_php/api/common/db_defs.php b/web/public_php/api/common/db_defs.php
similarity index 100%
rename from code/web/public_php/api/common/db_defs.php
rename to web/public_php/api/common/db_defs.php
diff --git a/code/web/public_php/api/common/db_lib.php b/web/public_php/api/common/db_lib.php
similarity index 100%
rename from code/web/public_php/api/common/db_lib.php
rename to web/public_php/api/common/db_lib.php
diff --git a/code/web/public_php/api/common/dfm.php b/web/public_php/api/common/dfm.php
similarity index 100%
rename from code/web/public_php/api/common/dfm.php
rename to web/public_php/api/common/dfm.php
diff --git a/code/web/public_php/api/common/logger.php b/web/public_php/api/common/logger.php
similarity index 100%
rename from code/web/public_php/api/common/logger.php
rename to web/public_php/api/common/logger.php
diff --git a/code/web/public_php/api/common/render.php b/web/public_php/api/common/render.php
similarity index 100%
rename from code/web/public_php/api/common/render.php
rename to web/public_php/api/common/render.php
diff --git a/code/web/public_php/api/common/ryform.php b/web/public_php/api/common/ryform.php
similarity index 100%
rename from code/web/public_php/api/common/ryform.php
rename to web/public_php/api/common/ryform.php
diff --git a/code/web/public_php/api/common/ryformBases.php b/web/public_php/api/common/ryformBases.php
similarity index 100%
rename from code/web/public_php/api/common/ryformBases.php
rename to web/public_php/api/common/ryformBases.php
diff --git a/code/web/public_php/api/common/time.php b/web/public_php/api/common/time.php
similarity index 100%
rename from code/web/public_php/api/common/time.php
rename to web/public_php/api/common/time.php
diff --git a/code/web/public_php/api/common/user.php b/web/public_php/api/common/user.php
similarity index 100%
rename from code/web/public_php/api/common/user.php
rename to web/public_php/api/common/user.php
diff --git a/code/web/public_php/api/common/utils.php b/web/public_php/api/common/utils.php
similarity index 100%
rename from code/web/public_php/api/common/utils.php
rename to web/public_php/api/common/utils.php
diff --git a/code/web/public_php/api/common/xml_utils.php b/web/public_php/api/common/xml_utils.php
similarity index 100%
rename from code/web/public_php/api/common/xml_utils.php
rename to web/public_php/api/common/xml_utils.php
diff --git a/code/web/public_php/api/data/css/ryzom_iphone.css b/web/public_php/api/data/css/ryzom_iphone.css
similarity index 100%
rename from code/web/public_php/api/data/css/ryzom_iphone.css
rename to web/public_php/api/data/css/ryzom_iphone.css
diff --git a/code/web/public_php/api/data/css/ryzom_ui.css b/web/public_php/api/data/css/ryzom_ui.css
similarity index 100%
rename from code/web/public_php/api/data/css/ryzom_ui.css
rename to web/public_php/api/data/css/ryzom_ui.css
diff --git a/code/web/public_php/api/data/css/skin_b.gif b/web/public_php/api/data/css/skin_b.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_b.gif
rename to web/public_php/api/data/css/skin_b.gif
diff --git a/code/web/public_php/api/data/css/skin_bl.gif b/web/public_php/api/data/css/skin_bl.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_bl.gif
rename to web/public_php/api/data/css/skin_bl.gif
diff --git a/code/web/public_php/api/data/css/skin_blank.png b/web/public_php/api/data/css/skin_blank.png
similarity index 100%
rename from code/web/public_php/api/data/css/skin_blank.png
rename to web/public_php/api/data/css/skin_blank.png
diff --git a/code/web/public_php/api/data/css/skin_blank_inner.png b/web/public_php/api/data/css/skin_blank_inner.png
similarity index 100%
rename from code/web/public_php/api/data/css/skin_blank_inner.png
rename to web/public_php/api/data/css/skin_blank_inner.png
diff --git a/code/web/public_php/api/data/css/skin_br.gif b/web/public_php/api/data/css/skin_br.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_br.gif
rename to web/public_php/api/data/css/skin_br.gif
diff --git a/code/web/public_php/api/data/css/skin_header_l.gif b/web/public_php/api/data/css/skin_header_l.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_header_l.gif
rename to web/public_php/api/data/css/skin_header_l.gif
diff --git a/code/web/public_php/api/data/css/skin_header_m.gif b/web/public_php/api/data/css/skin_header_m.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_header_m.gif
rename to web/public_php/api/data/css/skin_header_m.gif
diff --git a/code/web/public_php/api/data/css/skin_header_r.gif b/web/public_php/api/data/css/skin_header_r.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_header_r.gif
rename to web/public_php/api/data/css/skin_header_r.gif
diff --git a/code/web/public_php/api/data/css/skin_l.gif b/web/public_php/api/data/css/skin_l.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_l.gif
rename to web/public_php/api/data/css/skin_l.gif
diff --git a/code/web/public_php/api/data/css/skin_r.gif b/web/public_php/api/data/css/skin_r.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_r.gif
rename to web/public_php/api/data/css/skin_r.gif
diff --git a/code/web/public_php/api/data/css/skin_t.gif b/web/public_php/api/data/css/skin_t.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_t.gif
rename to web/public_php/api/data/css/skin_t.gif
diff --git a/code/web/public_php/api/data/css/skin_tl.gif b/web/public_php/api/data/css/skin_tl.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_tl.gif
rename to web/public_php/api/data/css/skin_tl.gif
diff --git a/code/web/public_php/api/data/css/skin_tr.gif b/web/public_php/api/data/css/skin_tr.gif
similarity index 100%
rename from code/web/public_php/api/data/css/skin_tr.gif
rename to web/public_php/api/data/css/skin_tr.gif
diff --git a/code/web/public_php/api/data/icons/add_app.png b/web/public_php/api/data/icons/add_app.png
similarity index 100%
rename from code/web/public_php/api/data/icons/add_app.png
rename to web/public_php/api/data/icons/add_app.png
diff --git a/code/web/public_php/api/data/icons/edit.png b/web/public_php/api/data/icons/edit.png
similarity index 100%
rename from code/web/public_php/api/data/icons/edit.png
rename to web/public_php/api/data/icons/edit.png
diff --git a/code/web/public_php/api/data/icons/edit_16.png b/web/public_php/api/data/icons/edit_16.png
similarity index 100%
rename from code/web/public_php/api/data/icons/edit_16.png
rename to web/public_php/api/data/icons/edit_16.png
diff --git a/code/web/public_php/api/data/icons/no_action.png b/web/public_php/api/data/icons/no_action.png
similarity index 100%
rename from code/web/public_php/api/data/icons/no_action.png
rename to web/public_php/api/data/icons/no_action.png
diff --git a/code/web/public_php/api/data/icons/spe_com.png b/web/public_php/api/data/icons/spe_com.png
similarity index 100%
rename from code/web/public_php/api/data/icons/spe_com.png
rename to web/public_php/api/data/icons/spe_com.png
diff --git a/code/web/public_php/api/data/img/backgrounds/parchemin.png b/web/public_php/api/data/img/backgrounds/parchemin.png
similarity index 100%
rename from code/web/public_php/api/data/img/backgrounds/parchemin.png
rename to web/public_php/api/data/img/backgrounds/parchemin.png
diff --git a/code/web/public_php/api/data/img/bg.jpg b/web/public_php/api/data/img/bg.jpg
similarity index 100%
rename from code/web/public_php/api/data/img/bg.jpg
rename to web/public_php/api/data/img/bg.jpg
diff --git a/code/web/public_php/api/data/img/bordure.png b/web/public_php/api/data/img/bordure.png
similarity index 100%
rename from code/web/public_php/api/data/img/bordure.png
rename to web/public_php/api/data/img/bordure.png
diff --git a/code/web/public_php/api/data/img/lang/de.png b/web/public_php/api/data/img/lang/de.png
similarity index 100%
rename from code/web/public_php/api/data/img/lang/de.png
rename to web/public_php/api/data/img/lang/de.png
diff --git a/code/web/public_php/api/data/img/lang/en.png b/web/public_php/api/data/img/lang/en.png
similarity index 100%
rename from code/web/public_php/api/data/img/lang/en.png
rename to web/public_php/api/data/img/lang/en.png
diff --git a/code/web/public_php/api/data/img/lang/es.png b/web/public_php/api/data/img/lang/es.png
similarity index 100%
rename from code/web/public_php/api/data/img/lang/es.png
rename to web/public_php/api/data/img/lang/es.png
diff --git a/code/web/public_php/api/data/img/lang/fr.png b/web/public_php/api/data/img/lang/fr.png
similarity index 100%
rename from code/web/public_php/api/data/img/lang/fr.png
rename to web/public_php/api/data/img/lang/fr.png
diff --git a/code/web/public_php/api/data/img/lang/ru.png b/web/public_php/api/data/img/lang/ru.png
similarity index 100%
rename from code/web/public_php/api/data/img/lang/ru.png
rename to web/public_php/api/data/img/lang/ru.png
diff --git a/code/web/public_php/api/data/img/logo.gif b/web/public_php/api/data/img/logo.gif
similarity index 100%
rename from code/web/public_php/api/data/img/logo.gif
rename to web/public_php/api/data/img/logo.gif
diff --git a/code/web/public_php/api/data/js/combobox.js b/web/public_php/api/data/js/combobox.js
similarity index 100%
rename from code/web/public_php/api/data/js/combobox.js
rename to web/public_php/api/data/js/combobox.js
diff --git a/code/web/public_php/api/data/js/jquery-1.7.1.js b/web/public_php/api/data/js/jquery-1.7.1.js
similarity index 100%
rename from code/web/public_php/api/data/js/jquery-1.7.1.js
rename to web/public_php/api/data/js/jquery-1.7.1.js
diff --git a/code/web/public_php/api/data/js/tab.js b/web/public_php/api/data/js/tab.js
similarity index 100%
rename from code/web/public_php/api/data/js/tab.js
rename to web/public_php/api/data/js/tab.js
diff --git a/code/web/public_php/api/data/ryzom/guild_png/.htaccess b/web/public_php/api/data/ryzom/guild_png/.htaccess
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/.htaccess
rename to web/public_php/api/data/ryzom/guild_png/.htaccess
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png b/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png
rename to web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png
diff --git a/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png b/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png
rename to web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png
diff --git a/code/web/public_php/api/data/ryzom/interface/1h_over.png b/web/public_php/api/data/ryzom/interface/1h_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/1h_over.png
rename to web/public_php/api/data/ryzom/interface/1h_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/2h_over.png b/web/public_php/api/data/ryzom/interface/2h_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/2h_over.png
rename to web/public_php/api/data/ryzom/interface/2h_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/am_logo.png b/web/public_php/api/data/ryzom/interface/am_logo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/am_logo.png
rename to web/public_php/api/data/ryzom/interface/am_logo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_armpad.png b/web/public_php/api/data/ryzom/interface/ar_armpad.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_armpad.png
rename to web/public_php/api/data/ryzom/interface/ar_armpad.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_armpad_mask.png b/web/public_php/api/data/ryzom/interface/ar_armpad_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_armpad_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_armpad_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_botte.png b/web/public_php/api/data/ryzom/interface/ar_botte.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_botte.png
rename to web/public_php/api/data/ryzom/interface/ar_botte.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_botte_mask.png b/web/public_php/api/data/ryzom/interface/ar_botte_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_botte_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_botte_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_gilet.png b/web/public_php/api/data/ryzom/interface/ar_gilet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_gilet.png
rename to web/public_php/api/data/ryzom/interface/ar_gilet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_gilet_mask.png b/web/public_php/api/data/ryzom/interface/ar_gilet_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_gilet_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_gilet_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_hand.png b/web/public_php/api/data/ryzom/interface/ar_hand.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_hand.png
rename to web/public_php/api/data/ryzom/interface/ar_hand.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_hand_mask.png b/web/public_php/api/data/ryzom/interface/ar_hand_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_hand_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_hand_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_helmet.png b/web/public_php/api/data/ryzom/interface/ar_helmet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_helmet.png
rename to web/public_php/api/data/ryzom/interface/ar_helmet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_helmet_mask.png b/web/public_php/api/data/ryzom/interface/ar_helmet_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_helmet_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_helmet_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_pantabotte.png b/web/public_php/api/data/ryzom/interface/ar_pantabotte.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_pantabotte.png
rename to web/public_php/api/data/ryzom/interface/ar_pantabotte.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png b/web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png
rename to web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_exit.png b/web/public_php/api/data/ryzom/interface/asc_exit.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_exit.png
rename to web/public_php/api/data/ryzom/interface/asc_exit.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png b/web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png
rename to web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png b/web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png
rename to web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png b/web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png
rename to web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png b/web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png
rename to web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/asc_unknown.png b/web/public_php/api/data/ryzom/interface/asc_unknown.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/asc_unknown.png
rename to web/public_php/api/data/ryzom/interface/asc_unknown.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bg_downloader.png b/web/public_php/api/data/ryzom/interface/bg_downloader.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bg_downloader.png
rename to web/public_php/api/data/ryzom/interface/bg_downloader.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bg_empty.png b/web/public_php/api/data/ryzom/interface/bg_empty.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bg_empty.png
rename to web/public_php/api/data/ryzom/interface/bg_empty.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_aura.png b/web/public_php/api/data/ryzom/interface/bk_aura.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_aura.png
rename to web/public_php/api/data/ryzom/interface/bk_aura.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_conso.png b/web/public_php/api/data/ryzom/interface/bk_conso.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_conso.png
rename to web/public_php/api/data/ryzom/interface/bk_conso.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_consommable.png b/web/public_php/api/data/ryzom/interface/bk_consommable.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_consommable.png
rename to web/public_php/api/data/ryzom/interface/bk_consommable.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_fyros.png b/web/public_php/api/data/ryzom/interface/bk_fyros.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_fyros.png
rename to web/public_php/api/data/ryzom/interface/bk_fyros.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_fyros_brick.png b/web/public_php/api/data/ryzom/interface/bk_fyros_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_fyros_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_fyros_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_generic.png b/web/public_php/api/data/ryzom/interface/bk_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_generic.png
rename to web/public_php/api/data/ryzom/interface/bk_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_generic_brick.png b/web/public_php/api/data/ryzom/interface/bk_generic_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_generic_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_generic_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_goo.png b/web/public_php/api/data/ryzom/interface/bk_goo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_goo.png
rename to web/public_php/api/data/ryzom/interface/bk_goo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_guild.png b/web/public_php/api/data/ryzom/interface/bk_guild.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_guild.png
rename to web/public_php/api/data/ryzom/interface/bk_guild.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_horde.png b/web/public_php/api/data/ryzom/interface/bk_horde.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_horde.png
rename to web/public_php/api/data/ryzom/interface/bk_horde.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_kami.png b/web/public_php/api/data/ryzom/interface/bk_kami.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_kami.png
rename to web/public_php/api/data/ryzom/interface/bk_kami.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_karavan.png b/web/public_php/api/data/ryzom/interface/bk_karavan.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_karavan.png
rename to web/public_php/api/data/ryzom/interface/bk_karavan.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png b/web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_matis.png b/web/public_php/api/data/ryzom/interface/bk_matis.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_matis.png
rename to web/public_php/api/data/ryzom/interface/bk_matis.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_matis_brick.png b/web/public_php/api/data/ryzom/interface/bk_matis_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_matis_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_matis_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_mission.png b/web/public_php/api/data/ryzom/interface/bk_mission.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_mission.png
rename to web/public_php/api/data/ryzom/interface/bk_mission.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_mission2.png b/web/public_php/api/data/ryzom/interface/bk_mission2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_mission2.png
rename to web/public_php/api/data/ryzom/interface/bk_mission2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_outpost.png b/web/public_php/api/data/ryzom/interface/bk_outpost.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_outpost.png
rename to web/public_php/api/data/ryzom/interface/bk_outpost.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_outpost_brick.png b/web/public_php/api/data/ryzom/interface/bk_outpost_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_outpost_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_outpost_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_power.png b/web/public_php/api/data/ryzom/interface/bk_power.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_power.png
rename to web/public_php/api/data/ryzom/interface/bk_power.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_primes.png b/web/public_php/api/data/ryzom/interface/bk_primes.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_primes.png
rename to web/public_php/api/data/ryzom/interface/bk_primes.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_service.png b/web/public_php/api/data/ryzom/interface/bk_service.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_service.png
rename to web/public_php/api/data/ryzom/interface/bk_service.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_training.png b/web/public_php/api/data/ryzom/interface/bk_training.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_training.png
rename to web/public_php/api/data/ryzom/interface/bk_training.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_tryker.png b/web/public_php/api/data/ryzom/interface/bk_tryker.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_tryker.png
rename to web/public_php/api/data/ryzom/interface/bk_tryker.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_tryker_brick.png b/web/public_php/api/data/ryzom/interface/bk_tryker_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_tryker_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_tryker_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_zorai.png b/web/public_php/api/data/ryzom/interface/bk_zorai.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_zorai.png
rename to web/public_php/api/data/ryzom/interface/bk_zorai.png
diff --git a/code/web/public_php/api/data/ryzom/interface/bk_zorai_brick.png b/web/public_php/api/data/ryzom/interface/bk_zorai_brick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/bk_zorai_brick.png
rename to web/public_php/api/data/ryzom/interface/bk_zorai_brick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/brick_default.png b/web/public_php/api/data/ryzom/interface/brick_default.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/brick_default.png
rename to web/public_php/api/data/ryzom/interface/brick_default.png
diff --git a/code/web/public_php/api/data/ryzom/interface/building_state_24x24.png b/web/public_php/api/data/ryzom/interface/building_state_24x24.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/building_state_24x24.png
rename to web/public_php/api/data/ryzom/interface/building_state_24x24.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cb_main_nue.png b/web/public_php/api/data/ryzom/interface/cb_main_nue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cb_main_nue.png
rename to web/public_php/api/data/ryzom/interface/cb_main_nue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ch_back.png b/web/public_php/api/data/ryzom/interface/ch_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ch_back.png
rename to web/public_php/api/data/ryzom/interface/ch_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/charge.png b/web/public_php/api/data/ryzom/interface/charge.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/charge.png
rename to web/public_php/api/data/ryzom/interface/charge.png
diff --git a/code/web/public_php/api/data/ryzom/interface/clef.png b/web/public_php/api/data/ryzom/interface/clef.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/clef.png
rename to web/public_php/api/data/ryzom/interface/clef.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_branche.png b/web/public_php/api/data/ryzom/interface/conso_branche.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_branche.png
rename to web/public_php/api/data/ryzom/interface/conso_branche.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_branche_mask.png b/web/public_php/api/data/ryzom/interface/conso_branche_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_branche_mask.png
rename to web/public_php/api/data/ryzom/interface/conso_branche_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_fleur.png b/web/public_php/api/data/ryzom/interface/conso_fleur.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_fleur.png
rename to web/public_php/api/data/ryzom/interface/conso_fleur.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_fleur_mask.png b/web/public_php/api/data/ryzom/interface/conso_fleur_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_fleur_mask.png
rename to web/public_php/api/data/ryzom/interface/conso_fleur_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_grappe.png b/web/public_php/api/data/ryzom/interface/conso_grappe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_grappe.png
rename to web/public_php/api/data/ryzom/interface/conso_grappe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_grappe_mask.png b/web/public_php/api/data/ryzom/interface/conso_grappe_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_grappe_mask.png
rename to web/public_php/api/data/ryzom/interface/conso_grappe_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_nectar.png b/web/public_php/api/data/ryzom/interface/conso_nectar.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_nectar.png
rename to web/public_php/api/data/ryzom/interface/conso_nectar.png
diff --git a/code/web/public_php/api/data/ryzom/interface/conso_nectar_mask.png b/web/public_php/api/data/ryzom/interface/conso_nectar_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/conso_nectar_mask.png
rename to web/public_php/api/data/ryzom/interface/conso_nectar_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/construction.png b/web/public_php/api/data/ryzom/interface/construction.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/construction.png
rename to web/public_php/api/data/ryzom/interface/construction.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_back.png b/web/public_php/api/data/ryzom/interface/cp_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_back.png
rename to web/public_php/api/data/ryzom/interface/cp_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_over_break.png b/web/public_php/api/data/ryzom/interface/cp_over_break.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_over_break.png
rename to web/public_php/api/data/ryzom/interface/cp_over_break.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_over_less.png b/web/public_php/api/data/ryzom/interface/cp_over_less.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_over_less.png
rename to web/public_php/api/data/ryzom/interface/cp_over_less.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_over_more.png b/web/public_php/api/data/ryzom/interface/cp_over_more.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_over_more.png
rename to web/public_php/api/data/ryzom/interface/cp_over_more.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_over_opening.png b/web/public_php/api/data/ryzom/interface/cp_over_opening.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_over_opening.png
rename to web/public_php/api/data/ryzom/interface/cp_over_opening.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cp_over_opening_2.png b/web/public_php/api/data/ryzom/interface/cp_over_opening_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cp_over_opening_2.png
rename to web/public_php/api/data/ryzom/interface/cp_over_opening_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cristal_ammo.png b/web/public_php/api/data/ryzom/interface/cristal_ammo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cristal_ammo.png
rename to web/public_php/api/data/ryzom/interface/cristal_ammo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cristal_generic.png b/web/public_php/api/data/ryzom/interface/cristal_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cristal_generic.png
rename to web/public_php/api/data/ryzom/interface/cristal_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/cristal_spell.png b/web/public_php/api/data/ryzom/interface/cristal_spell.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/cristal_spell.png
rename to web/public_php/api/data/ryzom/interface/cristal_spell.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ef_back.png b/web/public_php/api/data/ryzom/interface/ef_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ef_back.png
rename to web/public_php/api/data/ryzom/interface/ef_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ef_over_break.png b/web/public_php/api/data/ryzom/interface/ef_over_break.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ef_over_break.png
rename to web/public_php/api/data/ryzom/interface/ef_over_break.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ef_over_less.png b/web/public_php/api/data/ryzom/interface/ef_over_less.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ef_over_less.png
rename to web/public_php/api/data/ryzom/interface/ef_over_less.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ef_over_more.png b/web/public_php/api/data/ryzom/interface/ef_over_more.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ef_over_more.png
rename to web/public_php/api/data/ryzom/interface/ef_over_more.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fo_back.png b/web/public_php/api/data/ryzom/interface/fo_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fo_back.png
rename to web/public_php/api/data/ryzom/interface/fo_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fo_over.png b/web/public_php/api/data/ryzom/interface/fo_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fo_over.png
rename to web/public_php/api/data/ryzom/interface/fo_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_ammo.png b/web/public_php/api/data/ryzom/interface/fp_ammo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_ammo.png
rename to web/public_php/api/data/ryzom/interface/fp_ammo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_armor.png b/web/public_php/api/data/ryzom/interface/fp_armor.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_armor.png
rename to web/public_php/api/data/ryzom/interface/fp_armor.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_building.png b/web/public_php/api/data/ryzom/interface/fp_building.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_building.png
rename to web/public_php/api/data/ryzom/interface/fp_building.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_jewel.png b/web/public_php/api/data/ryzom/interface/fp_jewel.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_jewel.png
rename to web/public_php/api/data/ryzom/interface/fp_jewel.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_melee.png b/web/public_php/api/data/ryzom/interface/fp_melee.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_melee.png
rename to web/public_php/api/data/ryzom/interface/fp_melee.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_over.png b/web/public_php/api/data/ryzom/interface/fp_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_over.png
rename to web/public_php/api/data/ryzom/interface/fp_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_range.png b/web/public_php/api/data/ryzom/interface/fp_range.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_range.png
rename to web/public_php/api/data/ryzom/interface/fp_range.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_shield.png b/web/public_php/api/data/ryzom/interface/fp_shield.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_shield.png
rename to web/public_php/api/data/ryzom/interface/fp_shield.png
diff --git a/code/web/public_php/api/data/ryzom/interface/fp_tools.png b/web/public_php/api/data/ryzom/interface/fp_tools.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/fp_tools.png
rename to web/public_php/api/data/ryzom/interface/fp_tools.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png b/web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png
rename to web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_absorb_damage.png b/web/public_php/api/data/ryzom/interface/ico_absorb_damage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_absorb_damage.png
rename to web/public_php/api/data/ryzom/interface/ico_absorb_damage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_accurate.png b/web/public_php/api/data/ryzom/interface/ico_accurate.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_accurate.png
rename to web/public_php/api/data/ryzom/interface/ico_accurate.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_acid.png b/web/public_php/api/data/ryzom/interface/ico_acid.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_acid.png
rename to web/public_php/api/data/ryzom/interface/ico_acid.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim.png b/web/public_php/api/data/ryzom/interface/ico_aim.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim.png
rename to web/public_php/api/data/ryzom/interface/ico_aim.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png b/web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png b/web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png b/web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png b/web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png
rename to web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_amande.png b/web/public_php/api/data/ryzom/interface/ico_amande.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_amande.png
rename to web/public_php/api/data/ryzom/interface/ico_amande.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png b/web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png
rename to web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png b/web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png
rename to web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_angle.png b/web/public_php/api/data/ryzom/interface/ico_angle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_angle.png
rename to web/public_php/api/data/ryzom/interface/ico_angle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png b/web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png
rename to web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor.png b/web/public_php/api/data/ryzom/interface/ico_armor.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor.png
rename to web/public_php/api/data/ryzom/interface/ico_armor.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_clip.png b/web/public_php/api/data/ryzom/interface/ico_armor_clip.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_clip.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_clip.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_heavy.png b/web/public_php/api/data/ryzom/interface/ico_armor_heavy.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_heavy.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_heavy.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_kitin.png b/web/public_php/api/data/ryzom/interface/ico_armor_kitin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_kitin.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_kitin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_light.png b/web/public_php/api/data/ryzom/interface/ico_armor_light.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_light.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_light.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_medium.png b/web/public_php/api/data/ryzom/interface/ico_armor_medium.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_medium.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_medium.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_penalty.png b/web/public_php/api/data/ryzom/interface/ico_armor_penalty.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_penalty.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_penalty.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_armor_shell.png b/web/public_php/api/data/ryzom/interface/ico_armor_shell.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_armor_shell.png
rename to web/public_php/api/data/ryzom/interface/ico_armor_shell.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_atys.png b/web/public_php/api/data/ryzom/interface/ico_atys.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_atys.png
rename to web/public_php/api/data/ryzom/interface/ico_atys.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_atysian.png b/web/public_php/api/data/ryzom/interface/ico_atysian.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_atysian.png
rename to web/public_php/api/data/ryzom/interface/ico_atysian.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_balance_hp.png b/web/public_php/api/data/ryzom/interface/ico_balance_hp.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_balance_hp.png
rename to web/public_php/api/data/ryzom/interface/ico_balance_hp.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_barrel.png b/web/public_php/api/data/ryzom/interface/ico_barrel.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_barrel.png
rename to web/public_php/api/data/ryzom/interface/ico_barrel.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_bash.png b/web/public_php/api/data/ryzom/interface/ico_bash.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_bash.png
rename to web/public_php/api/data/ryzom/interface/ico_bash.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_berserk.png b/web/public_php/api/data/ryzom/interface/ico_berserk.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_berserk.png
rename to web/public_php/api/data/ryzom/interface/ico_berserk.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_blade.png b/web/public_php/api/data/ryzom/interface/ico_blade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_blade.png
rename to web/public_php/api/data/ryzom/interface/ico_blade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_bleeding.png b/web/public_php/api/data/ryzom/interface/ico_bleeding.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_bleeding.png
rename to web/public_php/api/data/ryzom/interface/ico_bleeding.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_blind.png b/web/public_php/api/data/ryzom/interface/ico_blind.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_blind.png
rename to web/public_php/api/data/ryzom/interface/ico_blind.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_blunt.png b/web/public_php/api/data/ryzom/interface/ico_blunt.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_blunt.png
rename to web/public_php/api/data/ryzom/interface/ico_blunt.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_bomb.png b/web/public_php/api/data/ryzom/interface/ico_bomb.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_bomb.png
rename to web/public_php/api/data/ryzom/interface/ico_bomb.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png b/web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png
rename to web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_celestial.png b/web/public_php/api/data/ryzom/interface/ico_celestial.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_celestial.png
rename to web/public_php/api/data/ryzom/interface/ico_celestial.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_circular_attack.png b/web/public_php/api/data/ryzom/interface/ico_circular_attack.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_circular_attack.png
rename to web/public_php/api/data/ryzom/interface/ico_circular_attack.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_clothes.png b/web/public_php/api/data/ryzom/interface/ico_clothes.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_clothes.png
rename to web/public_php/api/data/ryzom/interface/ico_clothes.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_cold.png b/web/public_php/api/data/ryzom/interface/ico_cold.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_cold.png
rename to web/public_php/api/data/ryzom/interface/ico_cold.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_concentration.png b/web/public_php/api/data/ryzom/interface/ico_concentration.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_concentration.png
rename to web/public_php/api/data/ryzom/interface/ico_concentration.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_consommable_over.png b/web/public_php/api/data/ryzom/interface/ico_consommable_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_consommable_over.png
rename to web/public_php/api/data/ryzom/interface/ico_consommable_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_constitution.png b/web/public_php/api/data/ryzom/interface/ico_constitution.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_constitution.png
rename to web/public_php/api/data/ryzom/interface/ico_constitution.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_counterweight.png b/web/public_php/api/data/ryzom/interface/ico_counterweight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_counterweight.png
rename to web/public_php/api/data/ryzom/interface/ico_counterweight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_craft_buff.png b/web/public_php/api/data/ryzom/interface/ico_craft_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_craft_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_craft_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_create_sapload.png b/web/public_php/api/data/ryzom/interface/ico_create_sapload.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_create_sapload.png
rename to web/public_php/api/data/ryzom/interface/ico_create_sapload.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_curse.png b/web/public_php/api/data/ryzom/interface/ico_curse.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_curse.png
rename to web/public_php/api/data/ryzom/interface/ico_curse.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_debuff.png b/web/public_php/api/data/ryzom/interface/ico_debuff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_debuff.png
rename to web/public_php/api/data/ryzom/interface/ico_debuff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_debuff_resist.png b/web/public_php/api/data/ryzom/interface/ico_debuff_resist.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_debuff_resist.png
rename to web/public_php/api/data/ryzom/interface/ico_debuff_resist.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_debuff_skill.png b/web/public_php/api/data/ryzom/interface/ico_debuff_skill.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_debuff_skill.png
rename to web/public_php/api/data/ryzom/interface/ico_debuff_skill.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_desert.png b/web/public_php/api/data/ryzom/interface/ico_desert.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_desert.png
rename to web/public_php/api/data/ryzom/interface/ico_desert.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_dexterity.png b/web/public_php/api/data/ryzom/interface/ico_dexterity.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_dexterity.png
rename to web/public_php/api/data/ryzom/interface/ico_dexterity.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_disarm.png b/web/public_php/api/data/ryzom/interface/ico_disarm.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_disarm.png
rename to web/public_php/api/data/ryzom/interface/ico_disarm.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_dodge.png b/web/public_php/api/data/ryzom/interface/ico_dodge.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_dodge.png
rename to web/public_php/api/data/ryzom/interface/ico_dodge.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_dot.png b/web/public_php/api/data/ryzom/interface/ico_dot.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_dot.png
rename to web/public_php/api/data/ryzom/interface/ico_dot.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_durability.png b/web/public_php/api/data/ryzom/interface/ico_durability.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_durability.png
rename to web/public_php/api/data/ryzom/interface/ico_durability.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_electric.png b/web/public_php/api/data/ryzom/interface/ico_electric.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_electric.png
rename to web/public_php/api/data/ryzom/interface/ico_electric.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_explosif.png b/web/public_php/api/data/ryzom/interface/ico_explosif.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_explosif.png
rename to web/public_php/api/data/ryzom/interface/ico_explosif.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_extracting.png b/web/public_php/api/data/ryzom/interface/ico_extracting.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_extracting.png
rename to web/public_php/api/data/ryzom/interface/ico_extracting.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fear.png b/web/public_php/api/data/ryzom/interface/ico_fear.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fear.png
rename to web/public_php/api/data/ryzom/interface/ico_fear.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_feint.png b/web/public_php/api/data/ryzom/interface/ico_feint.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_feint.png
rename to web/public_php/api/data/ryzom/interface/ico_feint.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fire.png b/web/public_php/api/data/ryzom/interface/ico_fire.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fire.png
rename to web/public_php/api/data/ryzom/interface/ico_fire.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_firing_pin.png b/web/public_php/api/data/ryzom/interface/ico_firing_pin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_firing_pin.png
rename to web/public_php/api/data/ryzom/interface/ico_firing_pin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png b/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png
rename to web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_focus.png b/web/public_php/api/data/ryzom/interface/ico_focus.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_focus.png
rename to web/public_php/api/data/ryzom/interface/ico_focus.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_forage_buff.png b/web/public_php/api/data/ryzom/interface/ico_forage_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_forage_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_forage_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_forbid_item.png b/web/public_php/api/data/ryzom/interface/ico_forbid_item.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_forbid_item.png
rename to web/public_php/api/data/ryzom/interface/ico_forbid_item.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_forest.png b/web/public_php/api/data/ryzom/interface/ico_forest.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_forest.png
rename to web/public_php/api/data/ryzom/interface/ico_forest.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_foreuse.png b/web/public_php/api/data/ryzom/interface/ico_foreuse.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_foreuse.png
rename to web/public_php/api/data/ryzom/interface/ico_foreuse.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_gardening.png b/web/public_php/api/data/ryzom/interface/ico_gardening.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_gardening.png
rename to web/public_php/api/data/ryzom/interface/ico_gardening.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_gentle.png b/web/public_php/api/data/ryzom/interface/ico_gentle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_gentle.png
rename to web/public_php/api/data/ryzom/interface/ico_gentle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_goo.png b/web/public_php/api/data/ryzom/interface/ico_goo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_goo.png
rename to web/public_php/api/data/ryzom/interface/ico_goo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_gripp.png b/web/public_php/api/data/ryzom/interface/ico_gripp.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_gripp.png
rename to web/public_php/api/data/ryzom/interface/ico_gripp.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_haircolor.png b/web/public_php/api/data/ryzom/interface/ico_haircolor.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_haircolor.png
rename to web/public_php/api/data/ryzom/interface/ico_haircolor.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_haircut.png b/web/public_php/api/data/ryzom/interface/ico_haircut.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_haircut.png
rename to web/public_php/api/data/ryzom/interface/ico_haircut.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_hammer.png b/web/public_php/api/data/ryzom/interface/ico_hammer.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_hammer.png
rename to web/public_php/api/data/ryzom/interface/ico_hammer.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_harmful.png b/web/public_php/api/data/ryzom/interface/ico_harmful.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_harmful.png
rename to web/public_php/api/data/ryzom/interface/ico_harmful.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_hatred.png b/web/public_php/api/data/ryzom/interface/ico_hatred.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_hatred.png
rename to web/public_php/api/data/ryzom/interface/ico_hatred.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_heal.png b/web/public_php/api/data/ryzom/interface/ico_heal.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_heal.png
rename to web/public_php/api/data/ryzom/interface/ico_heal.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_hit_rate.png b/web/public_php/api/data/ryzom/interface/ico_hit_rate.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_hit_rate.png
rename to web/public_php/api/data/ryzom/interface/ico_hit_rate.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_incapacity.png b/web/public_php/api/data/ryzom/interface/ico_incapacity.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_incapacity.png
rename to web/public_php/api/data/ryzom/interface/ico_incapacity.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_intelligence.png b/web/public_php/api/data/ryzom/interface/ico_intelligence.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_intelligence.png
rename to web/public_php/api/data/ryzom/interface/ico_intelligence.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_interrupt.png b/web/public_php/api/data/ryzom/interface/ico_interrupt.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_interrupt.png
rename to web/public_php/api/data/ryzom/interface/ico_interrupt.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_invulnerability.png b/web/public_php/api/data/ryzom/interface/ico_invulnerability.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_invulnerability.png
rename to web/public_php/api/data/ryzom/interface/ico_invulnerability.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_jewel_stone.png b/web/public_php/api/data/ryzom/interface/ico_jewel_stone.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_jewel_stone.png
rename to web/public_php/api/data/ryzom/interface/ico_jewel_stone.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png b/web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png
rename to web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_jungle.png b/web/public_php/api/data/ryzom/interface/ico_jungle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_jungle.png
rename to web/public_php/api/data/ryzom/interface/ico_jungle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_lacustre.png b/web/public_php/api/data/ryzom/interface/ico_lacustre.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_lacustre.png
rename to web/public_php/api/data/ryzom/interface/ico_lacustre.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png b/web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png
rename to web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_level.png b/web/public_php/api/data/ryzom/interface/ico_level.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_level.png
rename to web/public_php/api/data/ryzom/interface/ico_level.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_lining.png b/web/public_php/api/data/ryzom/interface/ico_lining.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_lining.png
rename to web/public_php/api/data/ryzom/interface/ico_lining.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_location.png b/web/public_php/api/data/ryzom/interface/ico_location.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_location.png
rename to web/public_php/api/data/ryzom/interface/ico_location.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_madness.png b/web/public_php/api/data/ryzom/interface/ico_madness.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_madness.png
rename to web/public_php/api/data/ryzom/interface/ico_madness.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_magic.png b/web/public_php/api/data/ryzom/interface/ico_magic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_magic.png
rename to web/public_php/api/data/ryzom/interface/ico_magic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png b/web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_magic_focus.png b/web/public_php/api/data/ryzom/interface/ico_magic_focus.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_magic_focus.png
rename to web/public_php/api/data/ryzom/interface/ico_magic_focus.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png b/web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png b/web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png b/web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mental.png b/web/public_php/api/data/ryzom/interface/ico_mental.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mental.png
rename to web/public_php/api/data/ryzom/interface/ico_mental.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_metabolism.png b/web/public_php/api/data/ryzom/interface/ico_metabolism.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_metabolism.png
rename to web/public_php/api/data/ryzom/interface/ico_metabolism.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mezz.png b/web/public_php/api/data/ryzom/interface/ico_mezz.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mezz.png
rename to web/public_php/api/data/ryzom/interface/ico_mezz.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_misfortune.png b/web/public_php/api/data/ryzom/interface/ico_misfortune.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_misfortune.png
rename to web/public_php/api/data/ryzom/interface/ico_misfortune.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png b/web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png b/web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png b/web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png b/web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_barrel.png b/web/public_php/api/data/ryzom/interface/ico_mission_barrel.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_barrel.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_barrel.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_bottle.png b/web/public_php/api/data/ryzom/interface/ico_mission_bottle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_bottle.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_bottle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_casket.png b/web/public_php/api/data/ryzom/interface/ico_mission_casket.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_casket.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_casket.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_medicine.png b/web/public_php/api/data/ryzom/interface/ico_mission_medicine.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_medicine.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_medicine.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_message.png b/web/public_php/api/data/ryzom/interface/ico_mission_message.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_message.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_message.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_package.png b/web/public_php/api/data/ryzom/interface/ico_mission_package.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_package.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_package.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_pot.png b/web/public_php/api/data/ryzom/interface/ico_mission_pot.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_pot.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_pot.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_mission_purse.png b/web/public_php/api/data/ryzom/interface/ico_mission_purse.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_mission_purse.png
rename to web/public_php/api/data/ryzom/interface/ico_mission_purse.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_move.png b/web/public_php/api/data/ryzom/interface/ico_move.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_move.png
rename to web/public_php/api/data/ryzom/interface/ico_move.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_multi_fight.png b/web/public_php/api/data/ryzom/interface/ico_multi_fight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_multi_fight.png
rename to web/public_php/api/data/ryzom/interface/ico_multi_fight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_multiple_spots.png b/web/public_php/api/data/ryzom/interface/ico_multiple_spots.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_multiple_spots.png
rename to web/public_php/api/data/ryzom/interface/ico_multiple_spots.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_noix.png b/web/public_php/api/data/ryzom/interface/ico_noix.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_noix.png
rename to web/public_php/api/data/ryzom/interface/ico_noix.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_opening_hit.png b/web/public_php/api/data/ryzom/interface/ico_opening_hit.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_opening_hit.png
rename to web/public_php/api/data/ryzom/interface/ico_opening_hit.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_autumn.png b/web/public_php/api/data/ryzom/interface/ico_over_autumn.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_autumn.png
rename to web/public_php/api/data/ryzom/interface/ico_over_autumn.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_degenerated.png b/web/public_php/api/data/ryzom/interface/ico_over_degenerated.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_degenerated.png
rename to web/public_php/api/data/ryzom/interface/ico_over_degenerated.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_fauna.png b/web/public_php/api/data/ryzom/interface/ico_over_fauna.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_fauna.png
rename to web/public_php/api/data/ryzom/interface/ico_over_fauna.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_flora.png b/web/public_php/api/data/ryzom/interface/ico_over_flora.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_flora.png
rename to web/public_php/api/data/ryzom/interface/ico_over_flora.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_head.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_head.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_head.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_head.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png b/web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png
rename to web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_homin.png b/web/public_php/api/data/ryzom/interface/ico_over_homin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_homin.png
rename to web/public_php/api/data/ryzom/interface/ico_over_homin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_kitin.png b/web/public_php/api/data/ryzom/interface/ico_over_kitin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_kitin.png
rename to web/public_php/api/data/ryzom/interface/ico_over_kitin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_magic.png b/web/public_php/api/data/ryzom/interface/ico_over_magic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_magic.png
rename to web/public_php/api/data/ryzom/interface/ico_over_magic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_melee.png b/web/public_php/api/data/ryzom/interface/ico_over_melee.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_melee.png
rename to web/public_php/api/data/ryzom/interface/ico_over_melee.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_racial.png b/web/public_php/api/data/ryzom/interface/ico_over_racial.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_racial.png
rename to web/public_php/api/data/ryzom/interface/ico_over_racial.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_range.png b/web/public_php/api/data/ryzom/interface/ico_over_range.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_range.png
rename to web/public_php/api/data/ryzom/interface/ico_over_range.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_special.png b/web/public_php/api/data/ryzom/interface/ico_over_special.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_special.png
rename to web/public_php/api/data/ryzom/interface/ico_over_special.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_spring.png b/web/public_php/api/data/ryzom/interface/ico_over_spring.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_spring.png
rename to web/public_php/api/data/ryzom/interface/ico_over_spring.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_summer.png b/web/public_php/api/data/ryzom/interface/ico_over_summer.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_summer.png
rename to web/public_php/api/data/ryzom/interface/ico_over_summer.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_over_winter.png b/web/public_php/api/data/ryzom/interface/ico_over_winter.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_over_winter.png
rename to web/public_php/api/data/ryzom/interface/ico_over_winter.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_parry.png b/web/public_php/api/data/ryzom/interface/ico_parry.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_parry.png
rename to web/public_php/api/data/ryzom/interface/ico_parry.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_piercing.png b/web/public_php/api/data/ryzom/interface/ico_piercing.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_piercing.png
rename to web/public_php/api/data/ryzom/interface/ico_piercing.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_pointe.png b/web/public_php/api/data/ryzom/interface/ico_pointe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_pointe.png
rename to web/public_php/api/data/ryzom/interface/ico_pointe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_poison.png b/web/public_php/api/data/ryzom/interface/ico_poison.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_poison.png
rename to web/public_php/api/data/ryzom/interface/ico_poison.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_power.png b/web/public_php/api/data/ryzom/interface/ico_power.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_power.png
rename to web/public_php/api/data/ryzom/interface/ico_power.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_preservation.png b/web/public_php/api/data/ryzom/interface/ico_preservation.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_preservation.png
rename to web/public_php/api/data/ryzom/interface/ico_preservation.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_primal.png b/web/public_php/api/data/ryzom/interface/ico_primal.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_primal.png
rename to web/public_php/api/data/ryzom/interface/ico_primal.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_prime_roots.png b/web/public_php/api/data/ryzom/interface/ico_prime_roots.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_prime_roots.png
rename to web/public_php/api/data/ryzom/interface/ico_prime_roots.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_private.png b/web/public_php/api/data/ryzom/interface/ico_private.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_private.png
rename to web/public_php/api/data/ryzom/interface/ico_private.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_prospecting.png b/web/public_php/api/data/ryzom/interface/ico_prospecting.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_prospecting.png
rename to web/public_php/api/data/ryzom/interface/ico_prospecting.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_quality.png b/web/public_php/api/data/ryzom/interface/ico_quality.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_quality.png
rename to web/public_php/api/data/ryzom/interface/ico_quality.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_racine.png b/web/public_php/api/data/ryzom/interface/ico_racine.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_racine.png
rename to web/public_php/api/data/ryzom/interface/ico_racine.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_range.png b/web/public_php/api/data/ryzom/interface/ico_range.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_range.png
rename to web/public_php/api/data/ryzom/interface/ico_range.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_range_action_buff.png b/web/public_php/api/data/ryzom/interface/ico_range_action_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_range_action_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_range_action_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_range_target_buff.png b/web/public_php/api/data/ryzom/interface/ico_range_target_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_range_target_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_range_target_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_ricochet.png b/web/public_php/api/data/ryzom/interface/ico_ricochet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_ricochet.png
rename to web/public_php/api/data/ryzom/interface/ico_ricochet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_root.png b/web/public_php/api/data/ryzom/interface/ico_root.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_root.png
rename to web/public_php/api/data/ryzom/interface/ico_root.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_rot.png b/web/public_php/api/data/ryzom/interface/ico_rot.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_rot.png
rename to web/public_php/api/data/ryzom/interface/ico_rot.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_safe.png b/web/public_php/api/data/ryzom/interface/ico_safe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_safe.png
rename to web/public_php/api/data/ryzom/interface/ico_safe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_sap.png b/web/public_php/api/data/ryzom/interface/ico_sap.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_sap.png
rename to web/public_php/api/data/ryzom/interface/ico_sap.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_self_damage.png b/web/public_php/api/data/ryzom/interface/ico_self_damage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_self_damage.png
rename to web/public_php/api/data/ryzom/interface/ico_self_damage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_shaft.png b/web/public_php/api/data/ryzom/interface/ico_shaft.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_shaft.png
rename to web/public_php/api/data/ryzom/interface/ico_shaft.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_shield_buff.png b/web/public_php/api/data/ryzom/interface/ico_shield_buff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_shield_buff.png
rename to web/public_php/api/data/ryzom/interface/ico_shield_buff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_shield_up.png b/web/public_php/api/data/ryzom/interface/ico_shield_up.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_shield_up.png
rename to web/public_php/api/data/ryzom/interface/ico_shield_up.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_shielding.png b/web/public_php/api/data/ryzom/interface/ico_shielding.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_shielding.png
rename to web/public_php/api/data/ryzom/interface/ico_shielding.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_shockwave.png b/web/public_php/api/data/ryzom/interface/ico_shockwave.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_shockwave.png
rename to web/public_php/api/data/ryzom/interface/ico_shockwave.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_sickness.png b/web/public_php/api/data/ryzom/interface/ico_sickness.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_sickness.png
rename to web/public_php/api/data/ryzom/interface/ico_sickness.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_slashing.png b/web/public_php/api/data/ryzom/interface/ico_slashing.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_slashing.png
rename to web/public_php/api/data/ryzom/interface/ico_slashing.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_slow.png b/web/public_php/api/data/ryzom/interface/ico_slow.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_slow.png
rename to web/public_php/api/data/ryzom/interface/ico_slow.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_soft_spot.png b/web/public_php/api/data/ryzom/interface/ico_soft_spot.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_soft_spot.png
rename to web/public_php/api/data/ryzom/interface/ico_soft_spot.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_source_knowledge.png b/web/public_php/api/data/ryzom/interface/ico_source_knowledge.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_source_knowledge.png
rename to web/public_php/api/data/ryzom/interface/ico_source_knowledge.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_source_time.png b/web/public_php/api/data/ryzom/interface/ico_source_time.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_source_time.png
rename to web/public_php/api/data/ryzom/interface/ico_source_time.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_speed.png b/web/public_php/api/data/ryzom/interface/ico_speed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_speed.png
rename to web/public_php/api/data/ryzom/interface/ico_speed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_speeding_up.png b/web/public_php/api/data/ryzom/interface/ico_speeding_up.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_speeding_up.png
rename to web/public_php/api/data/ryzom/interface/ico_speeding_up.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_spell_break.png b/web/public_php/api/data/ryzom/interface/ico_spell_break.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_spell_break.png
rename to web/public_php/api/data/ryzom/interface/ico_spell_break.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_spores.png b/web/public_php/api/data/ryzom/interface/ico_spores.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_spores.png
rename to web/public_php/api/data/ryzom/interface/ico_spores.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_spray.png b/web/public_php/api/data/ryzom/interface/ico_spray.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_spray.png
rename to web/public_php/api/data/ryzom/interface/ico_spray.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_spying.png b/web/public_php/api/data/ryzom/interface/ico_spying.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_spying.png
rename to web/public_php/api/data/ryzom/interface/ico_spying.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_stamina.png b/web/public_php/api/data/ryzom/interface/ico_stamina.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_stamina.png
rename to web/public_php/api/data/ryzom/interface/ico_stamina.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_strength.png b/web/public_php/api/data/ryzom/interface/ico_strength.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_strength.png
rename to web/public_php/api/data/ryzom/interface/ico_strength.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_stuffing.png b/web/public_php/api/data/ryzom/interface/ico_stuffing.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_stuffing.png
rename to web/public_php/api/data/ryzom/interface/ico_stuffing.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_stunn.png b/web/public_php/api/data/ryzom/interface/ico_stunn.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_stunn.png
rename to web/public_php/api/data/ryzom/interface/ico_stunn.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_craft.png b/web/public_php/api/data/ryzom/interface/ico_task_craft.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_craft.png
rename to web/public_php/api/data/ryzom/interface/ico_task_craft.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_done.png b/web/public_php/api/data/ryzom/interface/ico_task_done.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_done.png
rename to web/public_php/api/data/ryzom/interface/ico_task_done.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_failed.png b/web/public_php/api/data/ryzom/interface/ico_task_failed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_failed.png
rename to web/public_php/api/data/ryzom/interface/ico_task_failed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_fight.png b/web/public_php/api/data/ryzom/interface/ico_task_fight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_fight.png
rename to web/public_php/api/data/ryzom/interface/ico_task_fight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_forage.png b/web/public_php/api/data/ryzom/interface/ico_task_forage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_forage.png
rename to web/public_php/api/data/ryzom/interface/ico_task_forage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_generic.png b/web/public_php/api/data/ryzom/interface/ico_task_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_generic.png
rename to web/public_php/api/data/ryzom/interface/ico_task_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png b/web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png
rename to web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_guild.png b/web/public_php/api/data/ryzom/interface/ico_task_guild.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_guild.png
rename to web/public_php/api/data/ryzom/interface/ico_task_guild.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_rite.png b/web/public_php/api/data/ryzom/interface/ico_task_rite.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_rite.png
rename to web/public_php/api/data/ryzom/interface/ico_task_rite.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_task_travel.png b/web/public_php/api/data/ryzom/interface/ico_task_travel.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_task_travel.png
rename to web/public_php/api/data/ryzom/interface/ico_task_travel.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_tatoo.png b/web/public_php/api/data/ryzom/interface/ico_tatoo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_tatoo.png
rename to web/public_php/api/data/ryzom/interface/ico_tatoo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_taunt.png b/web/public_php/api/data/ryzom/interface/ico_taunt.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_taunt.png
rename to web/public_php/api/data/ryzom/interface/ico_taunt.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_time.png b/web/public_php/api/data/ryzom/interface/ico_time.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_time.png
rename to web/public_php/api/data/ryzom/interface/ico_time.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_time_bonus.png b/web/public_php/api/data/ryzom/interface/ico_time_bonus.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_time_bonus.png
rename to web/public_php/api/data/ryzom/interface/ico_time_bonus.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_tourbe.png b/web/public_php/api/data/ryzom/interface/ico_tourbe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_tourbe.png
rename to web/public_php/api/data/ryzom/interface/ico_tourbe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_trigger.png b/web/public_php/api/data/ryzom/interface/ico_trigger.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_trigger.png
rename to web/public_php/api/data/ryzom/interface/ico_trigger.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_umbrella.png b/web/public_php/api/data/ryzom/interface/ico_umbrella.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_umbrella.png
rename to web/public_php/api/data/ryzom/interface/ico_umbrella.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_use_enchantement.png b/web/public_php/api/data/ryzom/interface/ico_use_enchantement.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_use_enchantement.png
rename to web/public_php/api/data/ryzom/interface/ico_use_enchantement.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_vampire.png b/web/public_php/api/data/ryzom/interface/ico_vampire.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_vampire.png
rename to web/public_php/api/data/ryzom/interface/ico_vampire.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_visibility.png b/web/public_php/api/data/ryzom/interface/ico_visibility.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_visibility.png
rename to web/public_php/api/data/ryzom/interface/ico_visibility.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_war_cry.png b/web/public_php/api/data/ryzom/interface/ico_war_cry.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_war_cry.png
rename to web/public_php/api/data/ryzom/interface/ico_war_cry.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_weight.png b/web/public_php/api/data/ryzom/interface/ico_weight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_weight.png
rename to web/public_php/api/data/ryzom/interface/ico_weight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_wellbalanced.png b/web/public_php/api/data/ryzom/interface/ico_wellbalanced.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_wellbalanced.png
rename to web/public_php/api/data/ryzom/interface/ico_wellbalanced.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_will.png b/web/public_php/api/data/ryzom/interface/ico_will.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_will.png
rename to web/public_php/api/data/ryzom/interface/ico_will.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_windding.png b/web/public_php/api/data/ryzom/interface/ico_windding.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_windding.png
rename to web/public_php/api/data/ryzom/interface/ico_windding.png
diff --git a/code/web/public_php/api/data/ryzom/interface/ico_wisdom.png b/web/public_php/api/data/ryzom/interface/ico_wisdom.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/ico_wisdom.png
rename to web/public_php/api/data/ryzom/interface/ico_wisdom.png
diff --git a/code/web/public_php/api/data/ryzom/interface/improved_tool.png b/web/public_php/api/data/ryzom/interface/improved_tool.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/improved_tool.png
rename to web/public_php/api/data/ryzom/interface/improved_tool.png
diff --git a/code/web/public_php/api/data/ryzom/interface/item_default.png b/web/public_php/api/data/ryzom/interface/item_default.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/item_default.png
rename to web/public_php/api/data/ryzom/interface/item_default.png
diff --git a/code/web/public_php/api/data/ryzom/interface/item_plan_over.png b/web/public_php/api/data/ryzom/interface/item_plan_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/item_plan_over.png
rename to web/public_php/api/data/ryzom/interface/item_plan_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/lucky_flower.png b/web/public_php/api/data/ryzom/interface/lucky_flower.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/lucky_flower.png
rename to web/public_php/api/data/ryzom/interface/lucky_flower.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mail.png b/web/public_php/api/data/ryzom/interface/mail.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mail.png
rename to web/public_php/api/data/ryzom/interface/mail.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mektoub_pack.png b/web/public_php/api/data/ryzom/interface/mektoub_pack.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mektoub_pack.png
rename to web/public_php/api/data/ryzom/interface/mektoub_pack.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mektoub_steed.png b/web/public_php/api/data/ryzom/interface/mektoub_steed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mektoub_steed.png
rename to web/public_php/api/data/ryzom/interface/mektoub_steed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mf_back.png b/web/public_php/api/data/ryzom/interface/mf_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mf_back.png
rename to web/public_php/api/data/ryzom/interface/mf_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mf_over.png b/web/public_php/api/data/ryzom/interface/mf_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mf_over.png
rename to web/public_php/api/data/ryzom/interface/mf_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mg_glove.png b/web/public_php/api/data/ryzom/interface/mg_glove.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mg_glove.png
rename to web/public_php/api/data/ryzom/interface/mg_glove.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mission_icon_0.png b/web/public_php/api/data/ryzom/interface/mission_icon_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mission_icon_0.png
rename to web/public_php/api/data/ryzom/interface/mission_icon_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mission_icon_1.png b/web/public_php/api/data/ryzom/interface/mission_icon_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mission_icon_1.png
rename to web/public_php/api/data/ryzom/interface/mission_icon_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mission_icon_2.png b/web/public_php/api/data/ryzom/interface/mission_icon_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mission_icon_2.png
rename to web/public_php/api/data/ryzom/interface/mission_icon_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mission_icon_3.png b/web/public_php/api/data/ryzom/interface/mission_icon_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mission_icon_3.png
rename to web/public_php/api/data/ryzom/interface/mission_icon_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp3.png b/web/public_php/api/data/ryzom/interface/mp3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp3.png
rename to web/public_php/api/data/ryzom/interface/mp3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_amber.png b/web/public_php/api/data/ryzom/interface/mp_amber.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_amber.png
rename to web/public_php/api/data/ryzom/interface/mp_amber.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_back_curative.png b/web/public_php/api/data/ryzom/interface/mp_back_curative.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_back_curative.png
rename to web/public_php/api/data/ryzom/interface/mp_back_curative.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_back_offensive.png b/web/public_php/api/data/ryzom/interface/mp_back_offensive.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_back_offensive.png
rename to web/public_php/api/data/ryzom/interface/mp_back_offensive.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_back_selfonly.png b/web/public_php/api/data/ryzom/interface/mp_back_selfonly.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_back_selfonly.png
rename to web/public_php/api/data/ryzom/interface/mp_back_selfonly.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_bark.png b/web/public_php/api/data/ryzom/interface/mp_bark.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_bark.png
rename to web/public_php/api/data/ryzom/interface/mp_bark.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_brique.png b/web/public_php/api/data/ryzom/interface/mp_batiment_brique.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_brique.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_brique.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png b/web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png b/web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_comble.png b/web/public_php/api/data/ryzom/interface/mp_batiment_comble.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_comble.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_comble.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png b/web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png b/web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png b/web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_socle.png b/web/public_php/api/data/ryzom/interface/mp_batiment_socle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_socle.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_socle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_batiment_statue.png b/web/public_php/api/data/ryzom/interface/mp_batiment_statue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_batiment_statue.png
rename to web/public_php/api/data/ryzom/interface/mp_batiment_statue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_beak.png b/web/public_php/api/data/ryzom/interface/mp_beak.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_beak.png
rename to web/public_php/api/data/ryzom/interface/mp_beak.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_blood.png b/web/public_php/api/data/ryzom/interface/mp_blood.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_blood.png
rename to web/public_php/api/data/ryzom/interface/mp_blood.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_bone.png b/web/public_php/api/data/ryzom/interface/mp_bone.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_bone.png
rename to web/public_php/api/data/ryzom/interface/mp_bone.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_bud.png b/web/public_php/api/data/ryzom/interface/mp_bud.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_bud.png
rename to web/public_php/api/data/ryzom/interface/mp_bud.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png b/web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png
rename to web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png b/web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png
rename to web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_cereal.png b/web/public_php/api/data/ryzom/interface/mp_cereal.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_cereal.png
rename to web/public_php/api/data/ryzom/interface/mp_cereal.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_claw.png b/web/public_php/api/data/ryzom/interface/mp_claw.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_claw.png
rename to web/public_php/api/data/ryzom/interface/mp_claw.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dandelion.png b/web/public_php/api/data/ryzom/interface/mp_dandelion.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dandelion.png
rename to web/public_php/api/data/ryzom/interface/mp_dandelion.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dry b/web/public_php/api/data/ryzom/interface/mp_dry
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dry
rename to web/public_php/api/data/ryzom/interface/mp_dry
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dry wood.png b/web/public_php/api/data/ryzom/interface/mp_dry wood.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dry wood.png
rename to web/public_php/api/data/ryzom/interface/mp_dry wood.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dry.png b/web/public_php/api/data/ryzom/interface/mp_dry.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dry.png
rename to web/public_php/api/data/ryzom/interface/mp_dry.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dry_wood.png b/web/public_php/api/data/ryzom/interface/mp_dry_wood.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dry_wood.png
rename to web/public_php/api/data/ryzom/interface/mp_dry_wood.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_dust.png b/web/public_php/api/data/ryzom/interface/mp_dust.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_dust.png
rename to web/public_php/api/data/ryzom/interface/mp_dust.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_egg.png b/web/public_php/api/data/ryzom/interface/mp_egg.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_egg.png
rename to web/public_php/api/data/ryzom/interface/mp_egg.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_eyes.png b/web/public_php/api/data/ryzom/interface/mp_eyes.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_eyes.png
rename to web/public_php/api/data/ryzom/interface/mp_eyes.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_fang.png b/web/public_php/api/data/ryzom/interface/mp_fang.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_fang.png
rename to web/public_php/api/data/ryzom/interface/mp_fang.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_fiber.png b/web/public_php/api/data/ryzom/interface/mp_fiber.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_fiber.png
rename to web/public_php/api/data/ryzom/interface/mp_fiber.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_filament.png b/web/public_php/api/data/ryzom/interface/mp_filament.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_filament.png
rename to web/public_php/api/data/ryzom/interface/mp_filament.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png b/web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png
rename to web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_fish_scale.png b/web/public_php/api/data/ryzom/interface/mp_fish_scale.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_fish_scale.png
rename to web/public_php/api/data/ryzom/interface/mp_fish_scale.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_flowers.png b/web/public_php/api/data/ryzom/interface/mp_flowers.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_flowers.png
rename to web/public_php/api/data/ryzom/interface/mp_flowers.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png b/web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png
rename to web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_fruit.png b/web/public_php/api/data/ryzom/interface/mp_fruit.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_fruit.png
rename to web/public_php/api/data/ryzom/interface/mp_fruit.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_generic.png b/web/public_php/api/data/ryzom/interface/mp_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_generic.png
rename to web/public_php/api/data/ryzom/interface/mp_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_generic_colorize.png b/web/public_php/api/data/ryzom/interface/mp_generic_colorize.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_generic_colorize.png
rename to web/public_php/api/data/ryzom/interface/mp_generic_colorize.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_gomme.png b/web/public_php/api/data/ryzom/interface/mp_gomme.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_gomme.png
rename to web/public_php/api/data/ryzom/interface/mp_gomme.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_goo_residue.png b/web/public_php/api/data/ryzom/interface/mp_goo_residue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_goo_residue.png
rename to web/public_php/api/data/ryzom/interface/mp_goo_residue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_hairs.png b/web/public_php/api/data/ryzom/interface/mp_hairs.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_hairs.png
rename to web/public_php/api/data/ryzom/interface/mp_hairs.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_hoof.png b/web/public_php/api/data/ryzom/interface/mp_hoof.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_hoof.png
rename to web/public_php/api/data/ryzom/interface/mp_hoof.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_horn.png b/web/public_php/api/data/ryzom/interface/mp_horn.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_horn.png
rename to web/public_php/api/data/ryzom/interface/mp_horn.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_horney.png b/web/public_php/api/data/ryzom/interface/mp_horney.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_horney.png
rename to web/public_php/api/data/ryzom/interface/mp_horney.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_insect_fossil.png b/web/public_php/api/data/ryzom/interface/mp_insect_fossil.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_insect_fossil.png
rename to web/public_php/api/data/ryzom/interface/mp_insect_fossil.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png b/web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png
rename to web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png b/web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png
rename to web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_kitinshell.png b/web/public_php/api/data/ryzom/interface/mp_kitinshell.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_kitinshell.png
rename to web/public_php/api/data/ryzom/interface/mp_kitinshell.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_larva.png b/web/public_php/api/data/ryzom/interface/mp_larva.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_larva.png
rename to web/public_php/api/data/ryzom/interface/mp_larva.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_leaf.png b/web/public_php/api/data/ryzom/interface/mp_leaf.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_leaf.png
rename to web/public_php/api/data/ryzom/interface/mp_leaf.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_leather.png b/web/public_php/api/data/ryzom/interface/mp_leather.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_leather.png
rename to web/public_php/api/data/ryzom/interface/mp_leather.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_liane.png b/web/public_php/api/data/ryzom/interface/mp_liane.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_liane.png
rename to web/public_php/api/data/ryzom/interface/mp_liane.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_lichen.png b/web/public_php/api/data/ryzom/interface/mp_lichen.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_lichen.png
rename to web/public_php/api/data/ryzom/interface/mp_lichen.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_ligament.png b/web/public_php/api/data/ryzom/interface/mp_ligament.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_ligament.png
rename to web/public_php/api/data/ryzom/interface/mp_ligament.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_mandible.png b/web/public_php/api/data/ryzom/interface/mp_mandible.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_mandible.png
rename to web/public_php/api/data/ryzom/interface/mp_mandible.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_meat.png b/web/public_php/api/data/ryzom/interface/mp_meat.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_meat.png
rename to web/public_php/api/data/ryzom/interface/mp_meat.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_moss.png b/web/public_php/api/data/ryzom/interface/mp_moss.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_moss.png
rename to web/public_php/api/data/ryzom/interface/mp_moss.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_mushroom.png b/web/public_php/api/data/ryzom/interface/mp_mushroom.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_mushroom.png
rename to web/public_php/api/data/ryzom/interface/mp_mushroom.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_nail.png b/web/public_php/api/data/ryzom/interface/mp_nail.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_nail.png
rename to web/public_php/api/data/ryzom/interface/mp_nail.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_oil.png b/web/public_php/api/data/ryzom/interface/mp_oil.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_oil.png
rename to web/public_php/api/data/ryzom/interface/mp_oil.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_over_link.png b/web/public_php/api/data/ryzom/interface/mp_over_link.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_over_link.png
rename to web/public_php/api/data/ryzom/interface/mp_over_link.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_parasite.png b/web/public_php/api/data/ryzom/interface/mp_parasite.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_parasite.png
rename to web/public_php/api/data/ryzom/interface/mp_parasite.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_pearl.png b/web/public_php/api/data/ryzom/interface/mp_pearl.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_pearl.png
rename to web/public_php/api/data/ryzom/interface/mp_pearl.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_pelvis.png b/web/public_php/api/data/ryzom/interface/mp_pelvis.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_pelvis.png
rename to web/public_php/api/data/ryzom/interface/mp_pelvis.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_pigment.png b/web/public_php/api/data/ryzom/interface/mp_pigment.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_pigment.png
rename to web/public_php/api/data/ryzom/interface/mp_pigment.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_pistil.png b/web/public_php/api/data/ryzom/interface/mp_pistil.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_pistil.png
rename to web/public_php/api/data/ryzom/interface/mp_pistil.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_plant_fossil.png b/web/public_php/api/data/ryzom/interface/mp_plant_fossil.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_plant_fossil.png
rename to web/public_php/api/data/ryzom/interface/mp_plant_fossil.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_pollen.png b/web/public_php/api/data/ryzom/interface/mp_pollen.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_pollen.png
rename to web/public_php/api/data/ryzom/interface/mp_pollen.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_resin.png b/web/public_php/api/data/ryzom/interface/mp_resin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_resin.png
rename to web/public_php/api/data/ryzom/interface/mp_resin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_ronce.png b/web/public_php/api/data/ryzom/interface/mp_ronce.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_ronce.png
rename to web/public_php/api/data/ryzom/interface/mp_ronce.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_rostrum.png b/web/public_php/api/data/ryzom/interface/mp_rostrum.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_rostrum.png
rename to web/public_php/api/data/ryzom/interface/mp_rostrum.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_sap.png b/web/public_php/api/data/ryzom/interface/mp_sap.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_sap.png
rename to web/public_php/api/data/ryzom/interface/mp_sap.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_sawdust.png b/web/public_php/api/data/ryzom/interface/mp_sawdust.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_sawdust.png
rename to web/public_php/api/data/ryzom/interface/mp_sawdust.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_seed.png b/web/public_php/api/data/ryzom/interface/mp_seed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_seed.png
rename to web/public_php/api/data/ryzom/interface/mp_seed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_shell.png b/web/public_php/api/data/ryzom/interface/mp_shell.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_shell.png
rename to web/public_php/api/data/ryzom/interface/mp_shell.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_silk_worm.png b/web/public_php/api/data/ryzom/interface/mp_silk_worm.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_silk_worm.png
rename to web/public_php/api/data/ryzom/interface/mp_silk_worm.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_skin.png b/web/public_php/api/data/ryzom/interface/mp_skin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_skin.png
rename to web/public_php/api/data/ryzom/interface/mp_skin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_skull.png b/web/public_php/api/data/ryzom/interface/mp_skull.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_skull.png
rename to web/public_php/api/data/ryzom/interface/mp_skull.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_spiders_web.png b/web/public_php/api/data/ryzom/interface/mp_spiders_web.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_spiders_web.png
rename to web/public_php/api/data/ryzom/interface/mp_spiders_web.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_spine.png b/web/public_php/api/data/ryzom/interface/mp_spine.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_spine.png
rename to web/public_php/api/data/ryzom/interface/mp_spine.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_stem.png b/web/public_php/api/data/ryzom/interface/mp_stem.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_stem.png
rename to web/public_php/api/data/ryzom/interface/mp_stem.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_sting.png b/web/public_php/api/data/ryzom/interface/mp_sting.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_sting.png
rename to web/public_php/api/data/ryzom/interface/mp_sting.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_straw.png b/web/public_php/api/data/ryzom/interface/mp_straw.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_straw.png
rename to web/public_php/api/data/ryzom/interface/mp_straw.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_suc.png b/web/public_php/api/data/ryzom/interface/mp_suc.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_suc.png
rename to web/public_php/api/data/ryzom/interface/mp_suc.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_tail.png b/web/public_php/api/data/ryzom/interface/mp_tail.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_tail.png
rename to web/public_php/api/data/ryzom/interface/mp_tail.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_tooth.png b/web/public_php/api/data/ryzom/interface/mp_tooth.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_tooth.png
rename to web/public_php/api/data/ryzom/interface/mp_tooth.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_trunk.png b/web/public_php/api/data/ryzom/interface/mp_trunk.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_trunk.png
rename to web/public_php/api/data/ryzom/interface/mp_trunk.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_whiskers.png b/web/public_php/api/data/ryzom/interface/mp_whiskers.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_whiskers.png
rename to web/public_php/api/data/ryzom/interface/mp_whiskers.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_wing.png b/web/public_php/api/data/ryzom/interface/mp_wing.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_wing.png
rename to web/public_php/api/data/ryzom/interface/mp_wing.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_wood.png b/web/public_php/api/data/ryzom/interface/mp_wood.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_wood.png
rename to web/public_php/api/data/ryzom/interface/mp_wood.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mp_wood_node.png b/web/public_php/api/data/ryzom/interface/mp_wood_node.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mp_wood_node.png
rename to web/public_php/api/data/ryzom/interface/mp_wood_node.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_2h_axe.png b/web/public_php/api/data/ryzom/interface/mw_2h_axe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_2h_axe.png
rename to web/public_php/api/data/ryzom/interface/mw_2h_axe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_2h_lance.png b/web/public_php/api/data/ryzom/interface/mw_2h_lance.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_2h_lance.png
rename to web/public_php/api/data/ryzom/interface/mw_2h_lance.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_2h_mace.png b/web/public_php/api/data/ryzom/interface/mw_2h_mace.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_2h_mace.png
rename to web/public_php/api/data/ryzom/interface/mw_2h_mace.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_2h_sword.png b/web/public_php/api/data/ryzom/interface/mw_2h_sword.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_2h_sword.png
rename to web/public_php/api/data/ryzom/interface/mw_2h_sword.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_axe.png b/web/public_php/api/data/ryzom/interface/mw_axe.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_axe.png
rename to web/public_php/api/data/ryzom/interface/mw_axe.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_dagger.png b/web/public_php/api/data/ryzom/interface/mw_dagger.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_dagger.png
rename to web/public_php/api/data/ryzom/interface/mw_dagger.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_lance.png b/web/public_php/api/data/ryzom/interface/mw_lance.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_lance.png
rename to web/public_php/api/data/ryzom/interface/mw_lance.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_mace.png b/web/public_php/api/data/ryzom/interface/mw_mace.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_mace.png
rename to web/public_php/api/data/ryzom/interface/mw_mace.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_staff.png b/web/public_php/api/data/ryzom/interface/mw_staff.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_staff.png
rename to web/public_php/api/data/ryzom/interface/mw_staff.png
diff --git a/code/web/public_php/api/data/ryzom/interface/mw_sword.png b/web/public_php/api/data/ryzom/interface/mw_sword.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/mw_sword.png
rename to web/public_php/api/data/ryzom/interface/mw_sword.png
diff --git a/code/web/public_php/api/data/ryzom/interface/no_action.png b/web/public_php/api/data/ryzom/interface/no_action.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/no_action.png
rename to web/public_php/api/data/ryzom/interface/no_action.png
diff --git a/code/web/public_php/api/data/ryzom/interface/num_slash.png b/web/public_php/api/data/ryzom/interface/num_slash.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/num_slash.png
rename to web/public_php/api/data/ryzom/interface/num_slash.png
diff --git a/code/web/public_php/api/data/ryzom/interface/op_back.png b/web/public_php/api/data/ryzom/interface/op_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/op_back.png
rename to web/public_php/api/data/ryzom/interface/op_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/op_over_break.png b/web/public_php/api/data/ryzom/interface/op_over_break.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/op_over_break.png
rename to web/public_php/api/data/ryzom/interface/op_over_break.png
diff --git a/code/web/public_php/api/data/ryzom/interface/op_over_less.png b/web/public_php/api/data/ryzom/interface/op_over_less.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/op_over_less.png
rename to web/public_php/api/data/ryzom/interface/op_over_less.png
diff --git a/code/web/public_php/api/data/ryzom/interface/op_over_more.png b/web/public_php/api/data/ryzom/interface/op_over_more.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/op_over_more.png
rename to web/public_php/api/data/ryzom/interface/op_over_more.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_anklet.png b/web/public_php/api/data/ryzom/interface/pa_anklet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_anklet.png
rename to web/public_php/api/data/ryzom/interface/pa_anklet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_back.png b/web/public_php/api/data/ryzom/interface/pa_back.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_back.png
rename to web/public_php/api/data/ryzom/interface/pa_back.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_bracelet.png b/web/public_php/api/data/ryzom/interface/pa_bracelet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_bracelet.png
rename to web/public_php/api/data/ryzom/interface/pa_bracelet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_diadem.png b/web/public_php/api/data/ryzom/interface/pa_diadem.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_diadem.png
rename to web/public_php/api/data/ryzom/interface/pa_diadem.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_earring.png b/web/public_php/api/data/ryzom/interface/pa_earring.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_earring.png
rename to web/public_php/api/data/ryzom/interface/pa_earring.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_over_break.png b/web/public_php/api/data/ryzom/interface/pa_over_break.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_over_break.png
rename to web/public_php/api/data/ryzom/interface/pa_over_break.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_over_less.png b/web/public_php/api/data/ryzom/interface/pa_over_less.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_over_less.png
rename to web/public_php/api/data/ryzom/interface/pa_over_less.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_over_more.png b/web/public_php/api/data/ryzom/interface/pa_over_more.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_over_more.png
rename to web/public_php/api/data/ryzom/interface/pa_over_more.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_pendant.png b/web/public_php/api/data/ryzom/interface/pa_pendant.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_pendant.png
rename to web/public_php/api/data/ryzom/interface/pa_pendant.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pa_ring.png b/web/public_php/api/data/ryzom/interface/pa_ring.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pa_ring.png
rename to web/public_php/api/data/ryzom/interface/pa_ring.png
diff --git a/code/web/public_php/api/data/ryzom/interface/profile.png b/web/public_php/api/data/ryzom/interface/profile.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/profile.png
rename to web/public_php/api/data/ryzom/interface/profile.png
diff --git a/code/web/public_php/api/data/ryzom/interface/protect_amber.png b/web/public_php/api/data/ryzom/interface/protect_amber.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/protect_amber.png
rename to web/public_php/api/data/ryzom/interface/protect_amber.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_0.png b/web/public_php/api/data/ryzom/interface/pvp_ally_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_0.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_1.png b/web/public_php/api/data/ryzom/interface/pvp_ally_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_1.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_2.png b/web/public_php/api/data/ryzom/interface/pvp_ally_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_2.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_3.png b/web/public_php/api/data/ryzom/interface/pvp_ally_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_3.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_4.png b/web/public_php/api/data/ryzom/interface/pvp_ally_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_4.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_6.png b/web/public_php/api/data/ryzom/interface/pvp_ally_6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_6.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_primas.png b/web/public_php/api/data/ryzom/interface/pvp_ally_primas.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_primas.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_primas.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png b/web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png
rename to web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_aura.png b/web/public_php/api/data/ryzom/interface/pvp_aura.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_aura.png
rename to web/public_php/api/data/ryzom/interface/pvp_aura.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_aura_mask.png b/web/public_php/api/data/ryzom/interface/pvp_aura_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_aura_mask.png
rename to web/public_php/api/data/ryzom/interface/pvp_aura_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_boost.png b/web/public_php/api/data/ryzom/interface/pvp_boost.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_boost.png
rename to web/public_php/api/data/ryzom/interface/pvp_boost.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_boost_mask.png b/web/public_php/api/data/ryzom/interface/pvp_boost_mask.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_boost_mask.png
rename to web/public_php/api/data/ryzom/interface/pvp_boost_mask.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_0.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_0.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_1.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_1.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_2.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_2.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_3.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_3.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_4.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_4.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_6.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_6.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png b/web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png
rename to web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_4.png b/web/public_php/api/data/ryzom/interface/pw_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_4.png
rename to web/public_php/api/data/ryzom/interface/pw_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_5.png b/web/public_php/api/data/ryzom/interface/pw_5.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_5.png
rename to web/public_php/api/data/ryzom/interface/pw_5.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_6.png b/web/public_php/api/data/ryzom/interface/pw_6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_6.png
rename to web/public_php/api/data/ryzom/interface/pw_6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_7.png b/web/public_php/api/data/ryzom/interface/pw_7.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_7.png
rename to web/public_php/api/data/ryzom/interface/pw_7.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_heavy.png b/web/public_php/api/data/ryzom/interface/pw_heavy.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_heavy.png
rename to web/public_php/api/data/ryzom/interface/pw_heavy.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_light.png b/web/public_php/api/data/ryzom/interface/pw_light.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_light.png
rename to web/public_php/api/data/ryzom/interface/pw_light.png
diff --git a/code/web/public_php/api/data/ryzom/interface/pw_medium.png b/web/public_php/api/data/ryzom/interface/pw_medium.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/pw_medium.png
rename to web/public_php/api/data/ryzom/interface/pw_medium.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_coeur.png b/web/public_php/api/data/ryzom/interface/quest_coeur.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_coeur.png
rename to web/public_php/api/data/ryzom/interface/quest_coeur.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_foie.png b/web/public_php/api/data/ryzom/interface/quest_foie.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_foie.png
rename to web/public_php/api/data/ryzom/interface/quest_foie.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_jeton.png b/web/public_php/api/data/ryzom/interface/quest_jeton.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_jeton.png
rename to web/public_php/api/data/ryzom/interface/quest_jeton.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_langue.png b/web/public_php/api/data/ryzom/interface/quest_langue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_langue.png
rename to web/public_php/api/data/ryzom/interface/quest_langue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_louche.png b/web/public_php/api/data/ryzom/interface/quest_louche.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_louche.png
rename to web/public_php/api/data/ryzom/interface/quest_louche.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_oreille.png b/web/public_php/api/data/ryzom/interface/quest_oreille.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_oreille.png
rename to web/public_php/api/data/ryzom/interface/quest_oreille.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_patte.png b/web/public_php/api/data/ryzom/interface/quest_patte.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_patte.png
rename to web/public_php/api/data/ryzom/interface/quest_patte.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_poils.png b/web/public_php/api/data/ryzom/interface/quest_poils.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_poils.png
rename to web/public_php/api/data/ryzom/interface/quest_poils.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_queue.png b/web/public_php/api/data/ryzom/interface/quest_queue.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_queue.png
rename to web/public_php/api/data/ryzom/interface/quest_queue.png
diff --git a/code/web/public_php/api/data/ryzom/interface/quest_ticket.png b/web/public_php/api/data/ryzom/interface/quest_ticket.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/quest_ticket.png
rename to web/public_php/api/data/ryzom/interface/quest_ticket.png
diff --git a/code/web/public_php/api/data/ryzom/interface/r2_live.png b/web/public_php/api/data/ryzom/interface/r2_live.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/r2_live.png
rename to web/public_php/api/data/ryzom/interface/r2_live.png
diff --git a/code/web/public_php/api/data/ryzom/interface/r2_live_over.png b/web/public_php/api/data/ryzom/interface/r2_live_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/r2_live_over.png
rename to web/public_php/api/data/ryzom/interface/r2_live_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/r2_live_pushed.png b/web/public_php/api/data/ryzom/interface/r2_live_pushed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/r2_live_pushed.png
rename to web/public_php/api/data/ryzom/interface/r2_live_pushed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/r2_palette_entities.png b/web/public_php/api/data/ryzom/interface/r2_palette_entities.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/r2_palette_entities.png
rename to web/public_php/api/data/ryzom/interface/r2_palette_entities.png
diff --git a/code/web/public_php/api/data/ryzom/interface/requirement.png b/web/public_php/api/data/ryzom/interface/requirement.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/requirement.png
rename to web/public_php/api/data/ryzom/interface/requirement.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_f.png b/web/public_php/api/data/ryzom/interface/rm_f.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_f.png
rename to web/public_php/api/data/ryzom/interface/rm_f.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_f_upgrade.png b/web/public_php/api/data/ryzom/interface/rm_f_upgrade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_f_upgrade.png
rename to web/public_php/api/data/ryzom/interface/rm_f_upgrade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_h.png b/web/public_php/api/data/ryzom/interface/rm_h.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_h.png
rename to web/public_php/api/data/ryzom/interface/rm_h.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_h_upgrade.png b/web/public_php/api/data/ryzom/interface/rm_h_upgrade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_h_upgrade.png
rename to web/public_php/api/data/ryzom/interface/rm_h_upgrade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_m.png b/web/public_php/api/data/ryzom/interface/rm_m.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_m.png
rename to web/public_php/api/data/ryzom/interface/rm_m.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_m_upgrade.png b/web/public_php/api/data/ryzom/interface/rm_m_upgrade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_m_upgrade.png
rename to web/public_php/api/data/ryzom/interface/rm_m_upgrade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_r.png b/web/public_php/api/data/ryzom/interface/rm_r.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_r.png
rename to web/public_php/api/data/ryzom/interface/rm_r.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rm_r_upgrade.png b/web/public_php/api/data/ryzom/interface/rm_r_upgrade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rm_r_upgrade.png
rename to web/public_php/api/data/ryzom/interface/rm_r_upgrade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_200.png b/web/public_php/api/data/ryzom/interface/rpjob_200.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_200.png
rename to web/public_php/api/data/ryzom/interface/rpjob_200.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_201.png b/web/public_php/api/data/ryzom/interface/rpjob_201.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_201.png
rename to web/public_php/api/data/ryzom/interface/rpjob_201.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_202.png b/web/public_php/api/data/ryzom/interface/rpjob_202.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_202.png
rename to web/public_php/api/data/ryzom/interface/rpjob_202.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_203.png b/web/public_php/api/data/ryzom/interface/rpjob_203.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_203.png
rename to web/public_php/api/data/ryzom/interface/rpjob_203.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_204.png b/web/public_php/api/data/ryzom/interface/rpjob_204.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_204.png
rename to web/public_php/api/data/ryzom/interface/rpjob_204.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_205.png b/web/public_php/api/data/ryzom/interface/rpjob_205.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_205.png
rename to web/public_php/api/data/ryzom/interface/rpjob_205.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_206.png b/web/public_php/api/data/ryzom/interface/rpjob_206.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_206.png
rename to web/public_php/api/data/ryzom/interface/rpjob_206.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_207.png b/web/public_php/api/data/ryzom/interface/rpjob_207.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_207.png
rename to web/public_php/api/data/ryzom/interface/rpjob_207.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_advanced.png b/web/public_php/api/data/ryzom/interface/rpjob_advanced.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_advanced.png
rename to web/public_php/api/data/ryzom/interface/rpjob_advanced.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_elementary.png b/web/public_php/api/data/ryzom/interface/rpjob_elementary.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_elementary.png
rename to web/public_php/api/data/ryzom/interface/rpjob_elementary.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_roleplay.png b/web/public_php/api/data/ryzom/interface/rpjob_roleplay.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_roleplay.png
rename to web/public_php/api/data/ryzom/interface/rpjob_roleplay.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task.png b/web/public_php/api/data/ryzom/interface/rpjob_task.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png b/web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task_convert.png b/web/public_php/api/data/ryzom/interface/rpjob_task_convert.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task_convert.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task_convert.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png b/web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task_generic.png b/web/public_php/api/data/ryzom/interface/rpjob_task_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task_generic.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png b/web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png
rename to web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png b/web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png b/web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png b/web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png b/web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png
rename to web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_autolaunch.png b/web/public_php/api/data/ryzom/interface/rw_autolaunch.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_autolaunch.png
rename to web/public_php/api/data/ryzom/interface/rw_autolaunch.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_bowgun.png b/web/public_php/api/data/ryzom/interface/rw_bowgun.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_bowgun.png
rename to web/public_php/api/data/ryzom/interface/rw_bowgun.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_grenade.png b/web/public_php/api/data/ryzom/interface/rw_grenade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_grenade.png
rename to web/public_php/api/data/ryzom/interface/rw_grenade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_harpoongun.png b/web/public_php/api/data/ryzom/interface/rw_harpoongun.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_harpoongun.png
rename to web/public_php/api/data/ryzom/interface/rw_harpoongun.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_launcher.png b/web/public_php/api/data/ryzom/interface/rw_launcher.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_launcher.png
rename to web/public_php/api/data/ryzom/interface/rw_launcher.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_pistol.png b/web/public_php/api/data/ryzom/interface/rw_pistol.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_pistol.png
rename to web/public_php/api/data/ryzom/interface/rw_pistol.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_pistolarc.png b/web/public_php/api/data/ryzom/interface/rw_pistolarc.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_pistolarc.png
rename to web/public_php/api/data/ryzom/interface/rw_pistolarc.png
diff --git a/code/web/public_php/api/data/ryzom/interface/rw_rifle.png b/web/public_php/api/data/ryzom/interface/rw_rifle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/rw_rifle.png
rename to web/public_php/api/data/ryzom/interface/rw_rifle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/sapload.png b/web/public_php/api/data/ryzom/interface/sapload.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/sapload.png
rename to web/public_php/api/data/ryzom/interface/sapload.png
diff --git a/code/web/public_php/api/data/ryzom/interface/sh_buckler.png b/web/public_php/api/data/ryzom/interface/sh_buckler.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/sh_buckler.png
rename to web/public_php/api/data/ryzom/interface/sh_buckler.png
diff --git a/code/web/public_php/api/data/ryzom/interface/sh_large_shield.png b/web/public_php/api/data/ryzom/interface/sh_large_shield.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/sh_large_shield.png
rename to web/public_php/api/data/ryzom/interface/sh_large_shield.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_craft.png b/web/public_php/api/data/ryzom/interface/small_task_craft.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_craft.png
rename to web/public_php/api/data/ryzom/interface/small_task_craft.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_done.png b/web/public_php/api/data/ryzom/interface/small_task_done.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_done.png
rename to web/public_php/api/data/ryzom/interface/small_task_done.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_failed.png b/web/public_php/api/data/ryzom/interface/small_task_failed.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_failed.png
rename to web/public_php/api/data/ryzom/interface/small_task_failed.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_fight.png b/web/public_php/api/data/ryzom/interface/small_task_fight.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_fight.png
rename to web/public_php/api/data/ryzom/interface/small_task_fight.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_forage.png b/web/public_php/api/data/ryzom/interface/small_task_forage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_forage.png
rename to web/public_php/api/data/ryzom/interface/small_task_forage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_generic.png b/web/public_php/api/data/ryzom/interface/small_task_generic.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_generic.png
rename to web/public_php/api/data/ryzom/interface/small_task_generic.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_guild.png b/web/public_php/api/data/ryzom/interface/small_task_guild.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_guild.png
rename to web/public_php/api/data/ryzom/interface/small_task_guild.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_rite.png b/web/public_php/api/data/ryzom/interface/small_task_rite.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_rite.png
rename to web/public_php/api/data/ryzom/interface/small_task_rite.png
diff --git a/code/web/public_php/api/data/ryzom/interface/small_task_travel.png b/web/public_php/api/data/ryzom/interface/small_task_travel.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/small_task_travel.png
rename to web/public_php/api/data/ryzom/interface/small_task_travel.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_beast.png b/web/public_php/api/data/ryzom/interface/spe_beast.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_beast.png
rename to web/public_php/api/data/ryzom/interface/spe_beast.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_com.png b/web/public_php/api/data/ryzom/interface/spe_com.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_com.png
rename to web/public_php/api/data/ryzom/interface/spe_com.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_inventory.png b/web/public_php/api/data/ryzom/interface/spe_inventory.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_inventory.png
rename to web/public_php/api/data/ryzom/interface/spe_inventory.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_labs.png b/web/public_php/api/data/ryzom/interface/spe_labs.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_labs.png
rename to web/public_php/api/data/ryzom/interface/spe_labs.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_memory.png b/web/public_php/api/data/ryzom/interface/spe_memory.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_memory.png
rename to web/public_php/api/data/ryzom/interface/spe_memory.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_options.png b/web/public_php/api/data/ryzom/interface/spe_options.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_options.png
rename to web/public_php/api/data/ryzom/interface/spe_options.png
diff --git a/code/web/public_php/api/data/ryzom/interface/spe_status.png b/web/public_php/api/data/ryzom/interface/spe_status.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/spe_status.png
rename to web/public_php/api/data/ryzom/interface/spe_status.png
diff --git a/code/web/public_php/api/data/ryzom/interface/stimulating_water.png b/web/public_php/api/data/ryzom/interface/stimulating_water.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/stimulating_water.png
rename to web/public_php/api/data/ryzom/interface/stimulating_water.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_attack.png b/web/public_php/api/data/ryzom/interface/tb_action_attack.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_attack.png
rename to web/public_php/api/data/ryzom/interface/tb_action_attack.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_config.png b/web/public_php/api/data/ryzom/interface/tb_action_config.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_config.png
rename to web/public_php/api/data/ryzom/interface/tb_action_config.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_disband.png b/web/public_php/api/data/ryzom/interface/tb_action_disband.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_disband.png
rename to web/public_php/api/data/ryzom/interface/tb_action_disband.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_disengage.png b/web/public_php/api/data/ryzom/interface/tb_action_disengage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_disengage.png
rename to web/public_php/api/data/ryzom/interface/tb_action_disengage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_extract.png b/web/public_php/api/data/ryzom/interface/tb_action_extract.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_extract.png
rename to web/public_php/api/data/ryzom/interface/tb_action_extract.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_invite.png b/web/public_php/api/data/ryzom/interface/tb_action_invite.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_invite.png
rename to web/public_php/api/data/ryzom/interface/tb_action_invite.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_kick.png b/web/public_php/api/data/ryzom/interface/tb_action_kick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_kick.png
rename to web/public_php/api/data/ryzom/interface/tb_action_kick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_move.png b/web/public_php/api/data/ryzom/interface/tb_action_move.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_move.png
rename to web/public_php/api/data/ryzom/interface/tb_action_move.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_run.png b/web/public_php/api/data/ryzom/interface/tb_action_run.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_run.png
rename to web/public_php/api/data/ryzom/interface/tb_action_run.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_sit.png b/web/public_php/api/data/ryzom/interface/tb_action_sit.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_sit.png
rename to web/public_php/api/data/ryzom/interface/tb_action_sit.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_stand.png b/web/public_php/api/data/ryzom/interface/tb_action_stand.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_stand.png
rename to web/public_php/api/data/ryzom/interface/tb_action_stand.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_stop.png b/web/public_php/api/data/ryzom/interface/tb_action_stop.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_stop.png
rename to web/public_php/api/data/ryzom/interface/tb_action_stop.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_talk.png b/web/public_php/api/data/ryzom/interface/tb_action_talk.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_talk.png
rename to web/public_php/api/data/ryzom/interface/tb_action_talk.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_action_walk.png b/web/public_php/api/data/ryzom/interface/tb_action_walk.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_action_walk.png
rename to web/public_php/api/data/ryzom/interface/tb_action_walk.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_animals.png b/web/public_php/api/data/ryzom/interface/tb_animals.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_animals.png
rename to web/public_php/api/data/ryzom/interface/tb_animals.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_config.png b/web/public_php/api/data/ryzom/interface/tb_config.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_config.png
rename to web/public_php/api/data/ryzom/interface/tb_config.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_connection.png b/web/public_php/api/data/ryzom/interface/tb_connection.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_connection.png
rename to web/public_php/api/data/ryzom/interface/tb_connection.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_contacts.png b/web/public_php/api/data/ryzom/interface/tb_contacts.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_contacts.png
rename to web/public_php/api/data/ryzom/interface/tb_contacts.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_desk_1.png b/web/public_php/api/data/ryzom/interface/tb_desk_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_desk_1.png
rename to web/public_php/api/data/ryzom/interface/tb_desk_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_desk_2.png b/web/public_php/api/data/ryzom/interface/tb_desk_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_desk_2.png
rename to web/public_php/api/data/ryzom/interface/tb_desk_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_desk_3.png b/web/public_php/api/data/ryzom/interface/tb_desk_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_desk_3.png
rename to web/public_php/api/data/ryzom/interface/tb_desk_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_desk_4.png b/web/public_php/api/data/ryzom/interface/tb_desk_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_desk_4.png
rename to web/public_php/api/data/ryzom/interface/tb_desk_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_faction.png b/web/public_php/api/data/ryzom/interface/tb_faction.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_faction.png
rename to web/public_php/api/data/ryzom/interface/tb_faction.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_forum.png b/web/public_php/api/data/ryzom/interface/tb_forum.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_forum.png
rename to web/public_php/api/data/ryzom/interface/tb_forum.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_guild.png b/web/public_php/api/data/ryzom/interface/tb_guild.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_guild.png
rename to web/public_php/api/data/ryzom/interface/tb_guild.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_help2.png b/web/public_php/api/data/ryzom/interface/tb_help2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_help2.png
rename to web/public_php/api/data/ryzom/interface/tb_help2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_keys.png b/web/public_php/api/data/ryzom/interface/tb_keys.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_keys.png
rename to web/public_php/api/data/ryzom/interface/tb_keys.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_macros.png b/web/public_php/api/data/ryzom/interface/tb_macros.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_macros.png
rename to web/public_php/api/data/ryzom/interface/tb_macros.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_mail.png b/web/public_php/api/data/ryzom/interface/tb_mail.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_mail.png
rename to web/public_php/api/data/ryzom/interface/tb_mail.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_mode.png b/web/public_php/api/data/ryzom/interface/tb_mode.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_mode.png
rename to web/public_php/api/data/ryzom/interface/tb_mode.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_mode_dodge.png b/web/public_php/api/data/ryzom/interface/tb_mode_dodge.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_mode_dodge.png
rename to web/public_php/api/data/ryzom/interface/tb_mode_dodge.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_mode_parry.png b/web/public_php/api/data/ryzom/interface/tb_mode_parry.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_mode_parry.png
rename to web/public_php/api/data/ryzom/interface/tb_mode_parry.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_over.png b/web/public_php/api/data/ryzom/interface/tb_over.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_over.png
rename to web/public_php/api/data/ryzom/interface/tb_over.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_support.png b/web/public_php/api/data/ryzom/interface/tb_support.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_support.png
rename to web/public_php/api/data/ryzom/interface/tb_support.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_team.png b/web/public_php/api/data/ryzom/interface/tb_team.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_team.png
rename to web/public_php/api/data/ryzom/interface/tb_team.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tb_windows.png b/web/public_php/api/data/ryzom/interface/tb_windows.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tb_windows.png
rename to web/public_php/api/data/ryzom/interface/tb_windows.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tetekitin.png b/web/public_php/api/data/ryzom/interface/tetekitin.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tetekitin.png
rename to web/public_php/api/data/ryzom/interface/tetekitin.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_ammo.png b/web/public_php/api/data/ryzom/interface/to_ammo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_ammo.png
rename to web/public_php/api/data/ryzom/interface/to_ammo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_armor.png b/web/public_php/api/data/ryzom/interface/to_armor.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_armor.png
rename to web/public_php/api/data/ryzom/interface/to_armor.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_cooking_pot.png b/web/public_php/api/data/ryzom/interface/to_cooking_pot.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_cooking_pot.png
rename to web/public_php/api/data/ryzom/interface/to_cooking_pot.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_fishing_rod.png b/web/public_php/api/data/ryzom/interface/to_fishing_rod.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_fishing_rod.png
rename to web/public_php/api/data/ryzom/interface/to_fishing_rod.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_forage.png b/web/public_php/api/data/ryzom/interface/to_forage.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_forage.png
rename to web/public_php/api/data/ryzom/interface/to_forage.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_hammer.png b/web/public_php/api/data/ryzom/interface/to_hammer.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_hammer.png
rename to web/public_php/api/data/ryzom/interface/to_hammer.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png b/web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png
rename to web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_jewels.png b/web/public_php/api/data/ryzom/interface/to_jewels.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_jewels.png
rename to web/public_php/api/data/ryzom/interface/to_jewels.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_leathercutter.png b/web/public_php/api/data/ryzom/interface/to_leathercutter.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_leathercutter.png
rename to web/public_php/api/data/ryzom/interface/to_leathercutter.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_melee.png b/web/public_php/api/data/ryzom/interface/to_melee.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_melee.png
rename to web/public_php/api/data/ryzom/interface/to_melee.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_needle.png b/web/public_php/api/data/ryzom/interface/to_needle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_needle.png
rename to web/public_php/api/data/ryzom/interface/to_needle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_pestle.png b/web/public_php/api/data/ryzom/interface/to_pestle.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_pestle.png
rename to web/public_php/api/data/ryzom/interface/to_pestle.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_range.png b/web/public_php/api/data/ryzom/interface/to_range.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_range.png
rename to web/public_php/api/data/ryzom/interface/to_range.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_searake.png b/web/public_php/api/data/ryzom/interface/to_searake.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_searake.png
rename to web/public_php/api/data/ryzom/interface/to_searake.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_spade.png b/web/public_php/api/data/ryzom/interface/to_spade.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_spade.png
rename to web/public_php/api/data/ryzom/interface/to_spade.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_stick.png b/web/public_php/api/data/ryzom/interface/to_stick.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_stick.png
rename to web/public_php/api/data/ryzom/interface/to_stick.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_tunneling_knife.png b/web/public_php/api/data/ryzom/interface/to_tunneling_knife.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_tunneling_knife.png
rename to web/public_php/api/data/ryzom/interface/to_tunneling_knife.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_whip.png b/web/public_php/api/data/ryzom/interface/to_whip.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_whip.png
rename to web/public_php/api/data/ryzom/interface/to_whip.png
diff --git a/code/web/public_php/api/data/ryzom/interface/to_wrench.png b/web/public_php/api/data/ryzom/interface/to_wrench.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/to_wrench.png
rename to web/public_php/api/data/ryzom/interface/to_wrench.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tp_caravane.png b/web/public_php/api/data/ryzom/interface/tp_caravane.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tp_caravane.png
rename to web/public_php/api/data/ryzom/interface/tp_caravane.png
diff --git a/code/web/public_php/api/data/ryzom/interface/tp_kami.png b/web/public_php/api/data/ryzom/interface/tp_kami.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/tp_kami.png
rename to web/public_php/api/data/ryzom/interface/tp_kami.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_0.png b/web/public_php/api/data/ryzom/interface/us_back_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_0.png
rename to web/public_php/api/data/ryzom/interface/us_back_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_1.png b/web/public_php/api/data/ryzom/interface/us_back_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_1.png
rename to web/public_php/api/data/ryzom/interface/us_back_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_2.png b/web/public_php/api/data/ryzom/interface/us_back_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_2.png
rename to web/public_php/api/data/ryzom/interface/us_back_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_3.png b/web/public_php/api/data/ryzom/interface/us_back_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_3.png
rename to web/public_php/api/data/ryzom/interface/us_back_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_4.png b/web/public_php/api/data/ryzom/interface/us_back_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_4.png
rename to web/public_php/api/data/ryzom/interface/us_back_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_5.png b/web/public_php/api/data/ryzom/interface/us_back_5.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_5.png
rename to web/public_php/api/data/ryzom/interface/us_back_5.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_6.png b/web/public_php/api/data/ryzom/interface/us_back_6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_6.png
rename to web/public_php/api/data/ryzom/interface/us_back_6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_7.png b/web/public_php/api/data/ryzom/interface/us_back_7.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_7.png
rename to web/public_php/api/data/ryzom/interface/us_back_7.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_8.png b/web/public_php/api/data/ryzom/interface/us_back_8.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_8.png
rename to web/public_php/api/data/ryzom/interface/us_back_8.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_back_9.png b/web/public_php/api/data/ryzom/interface/us_back_9.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_back_9.png
rename to web/public_php/api/data/ryzom/interface/us_back_9.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_0.png b/web/public_php/api/data/ryzom/interface/us_ico_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_0.png
rename to web/public_php/api/data/ryzom/interface/us_ico_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_1.png b/web/public_php/api/data/ryzom/interface/us_ico_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_1.png
rename to web/public_php/api/data/ryzom/interface/us_ico_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_2.png b/web/public_php/api/data/ryzom/interface/us_ico_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_2.png
rename to web/public_php/api/data/ryzom/interface/us_ico_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_3.png b/web/public_php/api/data/ryzom/interface/us_ico_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_3.png
rename to web/public_php/api/data/ryzom/interface/us_ico_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_4.png b/web/public_php/api/data/ryzom/interface/us_ico_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_4.png
rename to web/public_php/api/data/ryzom/interface/us_ico_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_5.png b/web/public_php/api/data/ryzom/interface/us_ico_5.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_5.png
rename to web/public_php/api/data/ryzom/interface/us_ico_5.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_6.png b/web/public_php/api/data/ryzom/interface/us_ico_6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_6.png
rename to web/public_php/api/data/ryzom/interface/us_ico_6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_7.png b/web/public_php/api/data/ryzom/interface/us_ico_7.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_7.png
rename to web/public_php/api/data/ryzom/interface/us_ico_7.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_8.png b/web/public_php/api/data/ryzom/interface/us_ico_8.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_8.png
rename to web/public_php/api/data/ryzom/interface/us_ico_8.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_ico_9.png b/web/public_php/api/data/ryzom/interface/us_ico_9.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_ico_9.png
rename to web/public_php/api/data/ryzom/interface/us_ico_9.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_over_0.png b/web/public_php/api/data/ryzom/interface/us_over_0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_over_0.png
rename to web/public_php/api/data/ryzom/interface/us_over_0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_over_1.png b/web/public_php/api/data/ryzom/interface/us_over_1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_over_1.png
rename to web/public_php/api/data/ryzom/interface/us_over_1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_over_2.png b/web/public_php/api/data/ryzom/interface/us_over_2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_over_2.png
rename to web/public_php/api/data/ryzom/interface/us_over_2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_over_3.png b/web/public_php/api/data/ryzom/interface/us_over_3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_over_3.png
rename to web/public_php/api/data/ryzom/interface/us_over_3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/us_over_4.png b/web/public_php/api/data/ryzom/interface/us_over_4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/us_over_4.png
rename to web/public_php/api/data/ryzom/interface/us_over_4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_am_logo.png b/web/public_php/api/data/ryzom/interface/w_am_logo.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_am_logo.png
rename to web/public_php/api/data/ryzom/interface/w_am_logo.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_leader.png b/web/public_php/api/data/ryzom/interface/w_leader.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_leader.png
rename to web/public_php/api/data/ryzom/interface/w_leader.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_major.png b/web/public_php/api/data/ryzom/interface/w_major.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_major.png
rename to web/public_php/api/data/ryzom/interface/w_major.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_anklet.png b/web/public_php/api/data/ryzom/interface/w_pa_anklet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_anklet.png
rename to web/public_php/api/data/ryzom/interface/w_pa_anklet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_bracelet.png b/web/public_php/api/data/ryzom/interface/w_pa_bracelet.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_bracelet.png
rename to web/public_php/api/data/ryzom/interface/w_pa_bracelet.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_diadem.png b/web/public_php/api/data/ryzom/interface/w_pa_diadem.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_diadem.png
rename to web/public_php/api/data/ryzom/interface/w_pa_diadem.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_earring.png b/web/public_php/api/data/ryzom/interface/w_pa_earring.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_earring.png
rename to web/public_php/api/data/ryzom/interface/w_pa_earring.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_pendant.png b/web/public_php/api/data/ryzom/interface/w_pa_pendant.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_pendant.png
rename to web/public_php/api/data/ryzom/interface/w_pa_pendant.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_pa_ring.png b/web/public_php/api/data/ryzom/interface/w_pa_ring.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_pa_ring.png
rename to web/public_php/api/data/ryzom/interface/w_pa_ring.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png
diff --git a/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png b/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png
rename to web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png
diff --git a/code/web/public_php/api/data/ryzom/interface/xp_cat_green.png b/web/public_php/api/data/ryzom/interface/xp_cat_green.png
similarity index 100%
rename from code/web/public_php/api/data/ryzom/interface/xp_cat_green.png
rename to web/public_php/api/data/ryzom/interface/xp_cat_green.png
diff --git a/code/web/public_php/api/data/ryzom/items_db.php b/web/public_php/api/data/ryzom/items_db.php
similarity index 100%
rename from code/web/public_php/api/data/ryzom/items_db.php
rename to web/public_php/api/data/ryzom/items_db.php
diff --git a/code/web/public_php/api/data/ryzom/ryShapesPs.php b/web/public_php/api/data/ryzom/ryShapesPs.php
similarity index 100%
rename from code/web/public_php/api/data/ryzom/ryShapesPs.php
rename to web/public_php/api/data/ryzom/ryShapesPs.php
diff --git a/code/web/public_php/api/data/ryzom/sbrick_db.php b/web/public_php/api/data/ryzom/sbrick_db.php
similarity index 100%
rename from code/web/public_php/api/data/ryzom/sbrick_db.php
rename to web/public_php/api/data/ryzom/sbrick_db.php
diff --git a/code/web/public_php/api/index.php b/web/public_php/api/index.php
similarity index 100%
rename from code/web/public_php/api/index.php
rename to web/public_php/api/index.php
diff --git a/code/web/public_php/api/player_auth.php b/web/public_php/api/player_auth.php
similarity index 100%
rename from code/web/public_php/api/player_auth.php
rename to web/public_php/api/player_auth.php
diff --git a/code/web/public_php/api/ryzom_api.php b/web/public_php/api/ryzom_api.php
similarity index 100%
rename from code/web/public_php/api/ryzom_api.php
rename to web/public_php/api/ryzom_api.php
diff --git a/code/web/public_php/api/server/auth.php b/web/public_php/api/server/auth.php
similarity index 100%
rename from code/web/public_php/api/server/auth.php
rename to web/public_php/api/server/auth.php
diff --git a/code/web/public_php/api/server/config.php.default b/web/public_php/api/server/config.php.default
similarity index 100%
rename from code/web/public_php/api/server/config.php.default
rename to web/public_php/api/server/config.php.default
diff --git a/code/web/public_php/api/server/guilds.php b/web/public_php/api/server/guilds.php
similarity index 100%
rename from code/web/public_php/api/server/guilds.php
rename to web/public_php/api/server/guilds.php
diff --git a/code/web/public_php/api/server/hmagic.php b/web/public_php/api/server/hmagic.php
similarity index 100%
rename from code/web/public_php/api/server/hmagic.php
rename to web/public_php/api/server/hmagic.php
diff --git a/code/web/public_php/api/server/item_icon.php b/web/public_php/api/server/item_icon.php
similarity index 100%
rename from code/web/public_php/api/server/item_icon.php
rename to web/public_php/api/server/item_icon.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/AchWebParser.php b/web/public_php/api/server/scripts/achievement_script/AchWebParser.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/AchWebParser.php
rename to web/public_php/api/server/scripts/achievement_script/AchWebParser.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/_test/char_346.xml b/web/public_php/api/server/scripts/achievement_script/_test/char_346.xml
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/_test/char_346.xml
rename to web/public_php/api/server/scripts/achievement_script/_test/char_346.xml
diff --git a/code/web/public_php/api/server/scripts/achievement_script/_test/diff_class.php b/web/public_php/api/server/scripts/achievement_script/_test/diff_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/_test/diff_class.php
rename to web/public_php/api/server/scripts/achievement_script/_test/diff_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/_test/diff_test.php b/web/public_php/api/server/scripts/achievement_script/_test/diff_test.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/_test/diff_test.php
rename to web/public_php/api/server/scripts/achievement_script/_test/diff_test.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml b/web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml
rename to web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/Atom_class.php b/web/public_php/api/server/scripts/achievement_script/class/Atom_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/Atom_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/Atom_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/Callback_class.php b/web/public_php/api/server/scripts/achievement_script/class/Callback_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/Callback_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/Callback_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php b/web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php b/web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php b/web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php
rename to web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php b/web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php b/web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php
rename to web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/Stats_class.php b/web/public_php/api/server/scripts/achievement_script/class/Stats_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/Stats_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/Stats_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php b/web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php b/web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php b/web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php b/web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php b/web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php
rename to web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/conf.php b/web/public_php/api/server/scripts/achievement_script/conf.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/conf.php
rename to web/public_php/api/server/scripts/achievement_script/conf.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/include/functions_inc.php b/web/public_php/api/server/scripts/achievement_script/include/functions_inc.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/include/functions_inc.php
rename to web/public_php/api/server/scripts/achievement_script/include/functions_inc.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh b/web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh
rename to web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh
diff --git a/code/web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_ b/web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_
rename to web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_
diff --git a/code/web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir b/web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir
rename to web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir
diff --git a/code/web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh b/web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh
rename to web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh
diff --git a/code/web/public_php/api/server/scripts/achievement_script/script/_scriptDir b/web/public_php/api/server/scripts/achievement_script/script/_scriptDir
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/script/_scriptDir
rename to web/public_php/api/server/scripts/achievement_script/script/_scriptDir
diff --git a/code/web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php b/web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php
rename to web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/script/places/continents.php b/web/public_php/api/server/scripts/achievement_script/script/places/continents.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/script/places/continents.php
rename to web/public_php/api/server/scripts/achievement_script/script/places/continents.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/script/places/global.php b/web/public_php/api/server/scripts/achievement_script/script/places/global.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/script/places/global.php
rename to web/public_php/api/server/scripts/achievement_script/script/places/global.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/script/statsdb.php b/web/public_php/api/server/scripts/achievement_script/script/statsdb.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/script/statsdb.php
rename to web/public_php/api/server/scripts/achievement_script/script/statsdb.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php b/web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php
rename to web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php b/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php
rename to web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/debug.php b/web/public_php/api/server/scripts/achievement_script/xmldef/debug.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/debug.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/debug.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/faction.php b/web/public_php/api/server/scripts/achievement_script/xmldef/faction.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/faction.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/faction.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/fame.php b/web/public_php/api/server/scripts/achievement_script/xmldef/fame.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/fame.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/fame.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php b/web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php b/web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/logs.php b/web/public_php/api/server/scripts/achievement_script/xmldef/logs.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/logs.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/logs.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/missions.php b/web/public_php/api/server/scripts/achievement_script/xmldef/missions.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/missions.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/missions.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/public.php b/web/public_php/api/server/scripts/achievement_script/xmldef/public.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/public.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/public.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/shop.php b/web/public_php/api/server/scripts/achievement_script/xmldef/shop.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/shop.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/shop.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/skills.php b/web/public_php/api/server/scripts/achievement_script/xmldef/skills.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/skills.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/skills.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/social.php b/web/public_php/api/server/scripts/achievement_script/xmldef/social.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/social.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/social.php
diff --git a/code/web/public_php/api/server/scripts/achievement_script/xmldef/stats.php b/web/public_php/api/server/scripts/achievement_script/xmldef/stats.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/achievement_script/xmldef/stats.php
rename to web/public_php/api/server/scripts/achievement_script/xmldef/stats.php
diff --git a/code/web/public_php/api/server/scripts/create_guilds_xml.php b/web/public_php/api/server/scripts/create_guilds_xml.php
similarity index 100%
rename from code/web/public_php/api/server/scripts/create_guilds_xml.php
rename to web/public_php/api/server/scripts/create_guilds_xml.php
diff --git a/code/web/public_php/api/server/scripts/generate_guild_icon.sh b/web/public_php/api/server/scripts/generate_guild_icon.sh
similarity index 100%
rename from code/web/public_php/api/server/scripts/generate_guild_icon.sh
rename to web/public_php/api/server/scripts/generate_guild_icon.sh
diff --git a/code/web/public_php/api/server/scripts/get_guilds_xml.sh b/web/public_php/api/server/scripts/get_guilds_xml.sh
similarity index 100%
rename from code/web/public_php/api/server/scripts/get_guilds_xml.sh
rename to web/public_php/api/server/scripts/get_guilds_xml.sh
diff --git a/code/web/public_php/api/server/time.php b/web/public_php/api/server/time.php
similarity index 100%
rename from code/web/public_php/api/server/time.php
rename to web/public_php/api/server/time.php
diff --git a/code/web/public_php/api/server/user.php b/web/public_php/api/server/user.php
similarity index 100%
rename from code/web/public_php/api/server/user.php
rename to web/public_php/api/server/user.php
diff --git a/code/web/public_php/api/server/utils.php b/web/public_php/api/server/utils.php
similarity index 100%
rename from code/web/public_php/api/server/utils.php
rename to web/public_php/api/server/utils.php
diff --git a/code/web/public_php/api/time.php b/web/public_php/api/time.php
similarity index 100%
rename from code/web/public_php/api/time.php
rename to web/public_php/api/time.php
diff --git a/code/web/public_php/app/app_achievements/_API/ach_progress.php b/web/public_php/app/app_achievements/_API/ach_progress.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/_API/ach_progress.php
rename to web/public_php/app/app_achievements/_API/ach_progress.php
diff --git a/code/web/public_php/app/app_achievements/_API/ach_struct.php b/web/public_php/app/app_achievements/_API/ach_struct.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/_API/ach_struct.php
rename to web/public_php/app/app_achievements/_API/ach_struct.php
diff --git a/code/web/public_php/app/app_achievements/_API/class/mySQL_class.php b/web/public_php/app/app_achievements/_API/class/mySQL_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/_API/class/mySQL_class.php
rename to web/public_php/app/app_achievements/_API/class/mySQL_class.php
diff --git a/code/web/public_php/app/app_achievements/_API/conf.php b/web/public_php/app/app_achievements/_API/conf.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/_API/conf.php
rename to web/public_php/app/app_achievements/_API/conf.php
diff --git a/code/web/public_php/app/app_achievements/_doc/Class_scheme.dia b/web/public_php/app/app_achievements/_doc/Class_scheme.dia
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/Class_scheme.dia
rename to web/public_php/app/app_achievements/_doc/Class_scheme.dia
diff --git a/code/web/public_php/app/app_achievements/_doc/Class_scheme.png b/web/public_php/app/app_achievements/_doc/Class_scheme.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/Class_scheme.png
rename to web/public_php/app/app_achievements/_doc/Class_scheme.png
diff --git a/code/web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf b/web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf
rename to web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf
diff --git a/code/web/public_php/app/app_achievements/_doc/ER_scheme.dia b/web/public_php/app/app_achievements/_doc/ER_scheme.dia
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/ER_scheme.dia
rename to web/public_php/app/app_achievements/_doc/ER_scheme.dia
diff --git a/code/web/public_php/app/app_achievements/_doc/ER_scheme.png b/web/public_php/app/app_achievements/_doc/ER_scheme.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/ER_scheme.png
rename to web/public_php/app/app_achievements/_doc/ER_scheme.png
diff --git a/code/web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf b/web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf
rename to web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf
diff --git a/code/web/public_php/app/app_achievements/_doc/devshot_001.jpg b/web/public_php/app/app_achievements/_doc/devshot_001.jpg
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/devshot_001.jpg
rename to web/public_php/app/app_achievements/_doc/devshot_001.jpg
diff --git a/code/web/public_php/app/app_achievements/_doc/devshot_002.jpg b/web/public_php/app/app_achievements/_doc/devshot_002.jpg
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/devshot_002.jpg
rename to web/public_php/app/app_achievements/_doc/devshot_002.jpg
diff --git a/code/web/public_php/app/app_achievements/_doc/devshot_003.jpg b/web/public_php/app/app_achievements/_doc/devshot_003.jpg
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/devshot_003.jpg
rename to web/public_php/app/app_achievements/_doc/devshot_003.jpg
diff --git a/code/web/public_php/app/app_achievements/_doc/devshot_004.jpg b/web/public_php/app/app_achievements/_doc/devshot_004.jpg
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/devshot_004.jpg
rename to web/public_php/app/app_achievements/_doc/devshot_004.jpg
diff --git a/code/web/public_php/app/app_achievements/_doc/structure_app_achievements.sql b/web/public_php/app/app_achievements/_doc/structure_app_achievements.sql
similarity index 100%
rename from code/web/public_php/app/app_achievements/_doc/structure_app_achievements.sql
rename to web/public_php/app/app_achievements/_doc/structure_app_achievements.sql
diff --git a/code/web/public_php/app/app_achievements/class/AVLTree_class.php b/web/public_php/app/app_achievements/class/AVLTree_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AVLTree_class.php
rename to web/public_php/app/app_achievements/class/AVLTree_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchAchievement_class.php b/web/public_php/app/app_achievements/class/AchAchievement_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchAchievement_class.php
rename to web/public_php/app/app_achievements/class/AchAchievement_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchCategory_class.php b/web/public_php/app/app_achievements/class/AchCategory_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchCategory_class.php
rename to web/public_php/app/app_achievements/class/AchCategory_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchList_abstract.php b/web/public_php/app/app_achievements/class/AchList_abstract.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchList_abstract.php
rename to web/public_php/app/app_achievements/class/AchList_abstract.php
diff --git a/code/web/public_php/app/app_achievements/class/AchMenuNode_class.php b/web/public_php/app/app_achievements/class/AchMenuNode_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchMenuNode_class.php
rename to web/public_php/app/app_achievements/class/AchMenuNode_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchMenu_class.php b/web/public_php/app/app_achievements/class/AchMenu_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchMenu_class.php
rename to web/public_php/app/app_achievements/class/AchMenu_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchObjective_class.php b/web/public_php/app/app_achievements/class/AchObjective_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchObjective_class.php
rename to web/public_php/app/app_achievements/class/AchObjective_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchSummary_class.php b/web/public_php/app/app_achievements/class/AchSummary_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchSummary_class.php
rename to web/public_php/app/app_achievements/class/AchSummary_class.php
diff --git a/code/web/public_php/app/app_achievements/class/AchTask_class.php b/web/public_php/app/app_achievements/class/AchTask_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/AchTask_class.php
rename to web/public_php/app/app_achievements/class/AchTask_class.php
diff --git a/code/web/public_php/app/app_achievements/class/DLL_class.php b/web/public_php/app/app_achievements/class/DLL_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/DLL_class.php
rename to web/public_php/app/app_achievements/class/DLL_class.php
diff --git a/code/web/public_php/app/app_achievements/class/InDev_trait.php b/web/public_php/app/app_achievements/class/InDev_trait.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/InDev_trait.php
rename to web/public_php/app/app_achievements/class/InDev_trait.php
diff --git a/code/web/public_php/app/app_achievements/class/NodeIterator_class.php b/web/public_php/app/app_achievements/class/NodeIterator_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/NodeIterator_class.php
rename to web/public_php/app/app_achievements/class/NodeIterator_class.php
diff --git a/code/web/public_php/app/app_achievements/class/Node_abstract.php b/web/public_php/app/app_achievements/class/Node_abstract.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/Node_abstract.php
rename to web/public_php/app/app_achievements/class/Node_abstract.php
diff --git a/code/web/public_php/app/app_achievements/class/Parentum_abstract.php b/web/public_php/app/app_achievements/class/Parentum_abstract.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/Parentum_abstract.php
rename to web/public_php/app/app_achievements/class/Parentum_abstract.php
diff --git a/code/web/public_php/app/app_achievements/class/RyzomUser_class.php b/web/public_php/app/app_achievements/class/RyzomUser_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/RyzomUser_class.php
rename to web/public_php/app/app_achievements/class/RyzomUser_class.php
diff --git a/code/web/public_php/app/app_achievements/class/Tieable_inter.php b/web/public_php/app/app_achievements/class/Tieable_inter.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/class/Tieable_inter.php
rename to web/public_php/app/app_achievements/class/Tieable_inter.php
diff --git a/code/web/public_php/app/app_achievements/conf.php b/web/public_php/app/app_achievements/conf.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/conf.php
rename to web/public_php/app/app_achievements/conf.php
diff --git a/code/web/public_php/app/app_achievements/favicon.ico b/web/public_php/app/app_achievements/favicon.ico
similarity index 100%
rename from code/web/public_php/app/app_achievements/favicon.ico
rename to web/public_php/app/app_achievements/favicon.ico
diff --git a/code/web/public_php/app/app_achievements/favicon.png b/web/public_php/app/app_achievements/favicon.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/favicon.png
rename to web/public_php/app/app_achievements/favicon.png
diff --git a/code/web/public_php/app/app_achievements/fb/base_facebook.php b/web/public_php/app/app_achievements/fb/base_facebook.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/fb/base_facebook.php
rename to web/public_php/app/app_achievements/fb/base_facebook.php
diff --git a/code/web/public_php/app/app_achievements/fb/facebook.php b/web/public_php/app/app_achievements/fb/facebook.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/fb/facebook.php
rename to web/public_php/app/app_achievements/fb/facebook.php
diff --git a/code/web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt b/web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt
similarity index 100%
rename from code/web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt
rename to web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt
diff --git a/code/web/public_php/app/app_achievements/include/ach_render_common.php b/web/public_php/app/app_achievements/include/ach_render_common.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/include/ach_render_common.php
rename to web/public_php/app/app_achievements/include/ach_render_common.php
diff --git a/code/web/public_php/app/app_achievements/include/ach_render_ig.php b/web/public_php/app/app_achievements/include/ach_render_ig.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/include/ach_render_ig.php
rename to web/public_php/app/app_achievements/include/ach_render_ig.php
diff --git a/code/web/public_php/app/app_achievements/include/ach_render_web.php b/web/public_php/app/app_achievements/include/ach_render_web.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/include/ach_render_web.php
rename to web/public_php/app/app_achievements/include/ach_render_web.php
diff --git a/code/web/public_php/app/app_achievements/index.php b/web/public_php/app/app_achievements/index.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/index.php
rename to web/public_php/app/app_achievements/index.php
diff --git a/code/web/public_php/app/app_achievements/lang.php b/web/public_php/app/app_achievements/lang.php
similarity index 100%
rename from code/web/public_php/app/app_achievements/lang.php
rename to web/public_php/app/app_achievements/lang.php
diff --git a/code/web/public_php/app/app_achievements/pic/ach_news.png b/web/public_php/app/app_achievements/pic/ach_news.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/ach_news.png
rename to web/public_php/app/app_achievements/pic/ach_news.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_b.png b/web/public_php/app/app_achievements/pic/bar_done_b.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_b.png
rename to web/public_php/app/app_achievements/pic/bar_done_b.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_bg.png b/web/public_php/app/app_achievements/pic/bar_done_bg.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_bg.png
rename to web/public_php/app/app_achievements/pic/bar_done_bg.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_bl.png b/web/public_php/app/app_achievements/pic/bar_done_bl.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_bl.png
rename to web/public_php/app/app_achievements/pic/bar_done_bl.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_br.png b/web/public_php/app/app_achievements/pic/bar_done_br.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_br.png
rename to web/public_php/app/app_achievements/pic/bar_done_br.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_l.png b/web/public_php/app/app_achievements/pic/bar_done_l.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_l.png
rename to web/public_php/app/app_achievements/pic/bar_done_l.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_r.png b/web/public_php/app/app_achievements/pic/bar_done_r.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_r.png
rename to web/public_php/app/app_achievements/pic/bar_done_r.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_u.png b/web/public_php/app/app_achievements/pic/bar_done_u.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_u.png
rename to web/public_php/app/app_achievements/pic/bar_done_u.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_ul.png b/web/public_php/app/app_achievements/pic/bar_done_ul.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_ul.png
rename to web/public_php/app/app_achievements/pic/bar_done_ul.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_done_ur.png b/web/public_php/app/app_achievements/pic/bar_done_ur.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_done_ur.png
rename to web/public_php/app/app_achievements/pic/bar_done_ur.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_b.png b/web/public_php/app/app_achievements/pic/bar_pending_b.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_b.png
rename to web/public_php/app/app_achievements/pic/bar_pending_b.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_bl.png b/web/public_php/app/app_achievements/pic/bar_pending_bl.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_bl.png
rename to web/public_php/app/app_achievements/pic/bar_pending_bl.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_br.png b/web/public_php/app/app_achievements/pic/bar_pending_br.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_br.png
rename to web/public_php/app/app_achievements/pic/bar_pending_br.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_l.png b/web/public_php/app/app_achievements/pic/bar_pending_l.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_l.png
rename to web/public_php/app/app_achievements/pic/bar_pending_l.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_r.png b/web/public_php/app/app_achievements/pic/bar_pending_r.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_r.png
rename to web/public_php/app/app_achievements/pic/bar_pending_r.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_u.png b/web/public_php/app/app_achievements/pic/bar_pending_u.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_u.png
rename to web/public_php/app/app_achievements/pic/bar_pending_u.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_ul.png b/web/public_php/app/app_achievements/pic/bar_pending_ul.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_ul.png
rename to web/public_php/app/app_achievements/pic/bar_pending_ul.png
diff --git a/code/web/public_php/app/app_achievements/pic/bar_pending_ur.png b/web/public_php/app/app_achievements/pic/bar_pending_ur.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/bar_pending_ur.png
rename to web/public_php/app/app_achievements/pic/bar_pending_ur.png
diff --git a/code/web/public_php/app/app_achievements/pic/check.png b/web/public_php/app/app_achievements/pic/check.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/check.png
rename to web/public_php/app/app_achievements/pic/check.png
diff --git a/code/web/public_php/app/app_achievements/pic/f-connect.png b/web/public_php/app/app_achievements/pic/f-connect.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/f-connect.png
rename to web/public_php/app/app_achievements/pic/f-connect.png
diff --git a/code/web/public_php/app/app_achievements/pic/facebook-logo.png b/web/public_php/app/app_achievements/pic/facebook-logo.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/facebook-logo.png
rename to web/public_php/app/app_achievements/pic/facebook-logo.png
diff --git a/code/web/public_php/app/app_achievements/pic/icon/grey/small/test.png b/web/public_php/app/app_achievements/pic/icon/grey/small/test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/icon/grey/small/test.png
rename to web/public_php/app/app_achievements/pic/icon/grey/small/test.png
diff --git a/code/web/public_php/app/app_achievements/pic/icon/grey/test.png b/web/public_php/app/app_achievements/pic/icon/grey/test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/icon/grey/test.png
rename to web/public_php/app/app_achievements/pic/icon/grey/test.png
diff --git a/code/web/public_php/app/app_achievements/pic/icon/small/test.png b/web/public_php/app/app_achievements/pic/icon/small/test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/icon/small/test.png
rename to web/public_php/app/app_achievements/pic/icon/small/test.png
diff --git a/code/web/public_php/app/app_achievements/pic/icon/test.png b/web/public_php/app/app_achievements/pic/icon/test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/icon/test.png
rename to web/public_php/app/app_achievements/pic/icon/test.png
diff --git a/code/web/public_php/app/app_achievements/pic/menu/ig_summary.png b/web/public_php/app/app_achievements/pic/menu/ig_summary.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/menu/ig_summary.png
rename to web/public_php/app/app_achievements/pic/menu/ig_summary.png
diff --git a/code/web/public_php/app/app_achievements/pic/menu/ig_test.png b/web/public_php/app/app_achievements/pic/menu/ig_test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/menu/ig_test.png
rename to web/public_php/app/app_achievements/pic/menu/ig_test.png
diff --git a/code/web/public_php/app/app_achievements/pic/menu/summary.png b/web/public_php/app/app_achievements/pic/menu/summary.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/menu/summary.png
rename to web/public_php/app/app_achievements/pic/menu/summary.png
diff --git a/code/web/public_php/app/app_achievements/pic/menu/test.png b/web/public_php/app/app_achievements/pic/menu/test.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/menu/test.png
rename to web/public_php/app/app_achievements/pic/menu/test.png
diff --git a/code/web/public_php/app/app_achievements/pic/menu_space.png b/web/public_php/app/app_achievements/pic/menu_space.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/menu_space.png
rename to web/public_php/app/app_achievements/pic/menu_space.png
diff --git a/code/web/public_php/app/app_achievements/pic/pending.png b/web/public_php/app/app_achievements/pic/pending.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/pending.png
rename to web/public_php/app/app_achievements/pic/pending.png
diff --git a/code/web/public_php/app/app_achievements/pic/star_done.png b/web/public_php/app/app_achievements/pic/star_done.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/star_done.png
rename to web/public_php/app/app_achievements/pic/star_done.png
diff --git a/code/web/public_php/app/app_achievements/pic/yubo_done.png b/web/public_php/app/app_achievements/pic/yubo_done.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/yubo_done.png
rename to web/public_php/app/app_achievements/pic/yubo_done.png
diff --git a/code/web/public_php/app/app_achievements/pic/yubo_done_small.png b/web/public_php/app/app_achievements/pic/yubo_done_small.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/yubo_done_small.png
rename to web/public_php/app/app_achievements/pic/yubo_done_small.png
diff --git a/code/web/public_php/app/app_achievements/pic/yubo_pending.png b/web/public_php/app/app_achievements/pic/yubo_pending.png
similarity index 100%
rename from code/web/public_php/app/app_achievements/pic/yubo_pending.png
rename to web/public_php/app/app_achievements/pic/yubo_pending.png
diff --git a/code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia b/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia
rename to web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia
diff --git a/code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png b/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png
rename to web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png
diff --git a/code/web/public_php/app/app_achievements_admin/class/ADM_inter.php b/web/public_php/app/app_achievements_admin/class/ADM_inter.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/ADM_inter.php
rename to web/public_php/app/app_achievements_admin/class/ADM_inter.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php b/web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmAtom_class.php b/web/public_php/app/app_achievements_admin/class/AdmAtom_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmAtom_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmAtom_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmCategory_class.php b/web/public_php/app/app_achievements_admin/class/AdmCategory_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmCategory_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmCategory_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php b/web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php
rename to web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php b/web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmMenu_class.php b/web/public_php/app/app_achievements_admin/class/AdmMenu_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmMenu_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmMenu_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmObjective_class.php b/web/public_php/app/app_achievements_admin/class/AdmObjective_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmObjective_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmObjective_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/AdmTask_class.php b/web/public_php/app/app_achievements_admin/class/AdmTask_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/AdmTask_class.php
rename to web/public_php/app/app_achievements_admin/class/AdmTask_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php b/web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php
rename to web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRAtom_class.php b/web/public_php/app/app_achievements_admin/class/CSRAtom_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRAtom_class.php
rename to web/public_php/app/app_achievements_admin/class/CSRAtom_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRCategory_class.php b/web/public_php/app/app_achievements_admin/class/CSRCategory_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRCategory_class.php
rename to web/public_php/app/app_achievements_admin/class/CSRCategory_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php b/web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php
rename to web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRObjective_class.php b/web/public_php/app/app_achievements_admin/class/CSRObjective_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRObjective_class.php
rename to web/public_php/app/app_achievements_admin/class/CSRObjective_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSRTask_class.php b/web/public_php/app/app_achievements_admin/class/CSRTask_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSRTask_class.php
rename to web/public_php/app/app_achievements_admin/class/CSRTask_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/CSR_inter.php b/web/public_php/app/app_achievements_admin/class/CSR_inter.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/CSR_inter.php
rename to web/public_php/app/app_achievements_admin/class/CSR_inter.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php b/web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php
rename to web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/class/mySQL_class.php b/web/public_php/app/app_achievements_admin/class/mySQL_class.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/class/mySQL_class.php
rename to web/public_php/app/app_achievements_admin/class/mySQL_class.php
diff --git a/code/web/public_php/app/app_achievements_admin/conf.php b/web/public_php/app/app_achievements_admin/conf.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/conf.php
rename to web/public_php/app/app_achievements_admin/conf.php
diff --git a/code/web/public_php/app/app_achievements_admin/favicon.png b/web/public_php/app/app_achievements_admin/favicon.png
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/favicon.png
rename to web/public_php/app/app_achievements_admin/favicon.png
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_ach.php b/web/public_php/app/app_achievements_admin/include/adm_render_ach.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_ach.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_ach.php
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_atom.php b/web/public_php/app/app_achievements_admin/include/adm_render_atom.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_atom.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_atom.php
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_csr.php b/web/public_php/app/app_achievements_admin/include/adm_render_csr.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_csr.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_csr.php
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_lang.php b/web/public_php/app/app_achievements_admin/include/adm_render_lang.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_lang.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_lang.php
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_menu.php b/web/public_php/app/app_achievements_admin/include/adm_render_menu.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_menu.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_menu.php
diff --git a/code/web/public_php/app/app_achievements_admin/include/adm_render_stats.php b/web/public_php/app/app_achievements_admin/include/adm_render_stats.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/include/adm_render_stats.php
rename to web/public_php/app/app_achievements_admin/include/adm_render_stats.php
diff --git a/code/web/public_php/app/app_achievements_admin/index.php b/web/public_php/app/app_achievements_admin/index.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/index.php
rename to web/public_php/app/app_achievements_admin/index.php
diff --git a/code/web/public_php/app/app_achievements_admin/lang.php b/web/public_php/app/app_achievements_admin/lang.php
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/lang.php
rename to web/public_php/app/app_achievements_admin/lang.php
diff --git a/code/web/public_php/app/app_achievements_admin/pic/b_drop.png b/web/public_php/app/app_achievements_admin/pic/b_drop.png
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/b_drop.png
rename to web/public_php/app/app_achievements_admin/pic/b_drop.png
diff --git a/code/web/public_php/app/app_achievements_admin/pic/b_insrow.png b/web/public_php/app/app_achievements_admin/pic/b_insrow.png
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/b_insrow.png
rename to web/public_php/app/app_achievements_admin/pic/b_insrow.png
diff --git a/code/web/public_php/app/app_achievements_admin/pic/b_tblops.png b/web/public_php/app/app_achievements_admin/pic/b_tblops.png
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/b_tblops.png
rename to web/public_php/app/app_achievements_admin/pic/b_tblops.png
diff --git a/code/web/public_php/app/app_achievements_admin/pic/green.gif b/web/public_php/app/app_achievements_admin/pic/green.gif
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/green.gif
rename to web/public_php/app/app_achievements_admin/pic/green.gif
diff --git a/code/web/public_php/app/app_achievements_admin/pic/icon_edit.gif b/web/public_php/app/app_achievements_admin/pic/icon_edit.gif
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/icon_edit.gif
rename to web/public_php/app/app_achievements_admin/pic/icon_edit.gif
diff --git a/code/web/public_php/app/app_achievements_admin/pic/red.gif b/web/public_php/app/app_achievements_admin/pic/red.gif
similarity index 100%
rename from code/web/public_php/app/app_achievements_admin/pic/red.gif
rename to web/public_php/app/app_achievements_admin/pic/red.gif
diff --git a/code/web/public_php/app/app_test/create.sql b/web/public_php/app/app_test/create.sql
similarity index 100%
rename from code/web/public_php/app/app_test/create.sql
rename to web/public_php/app/app_test/create.sql
diff --git a/code/web/public_php/app/app_test/favicon.png b/web/public_php/app/app_test/favicon.png
similarity index 100%
rename from code/web/public_php/app/app_test/favicon.png
rename to web/public_php/app/app_test/favicon.png
diff --git a/code/web/public_php/app/app_test/index.php b/web/public_php/app/app_test/index.php
similarity index 100%
rename from code/web/public_php/app/app_test/index.php
rename to web/public_php/app/app_test/index.php
diff --git a/code/web/public_php/app/app_test/lang.php b/web/public_php/app/app_test/lang.php
similarity index 100%
rename from code/web/public_php/app/app_test/lang.php
rename to web/public_php/app/app_test/lang.php
diff --git a/code/web/public_php/app/config.php.default b/web/public_php/app/config.php.default
similarity index 100%
rename from code/web/public_php/app/config.php.default
rename to web/public_php/app/config.php.default
diff --git a/code/web/public_php/app/index.php b/web/public_php/app/index.php
similarity index 100%
rename from code/web/public_php/app/index.php
rename to web/public_php/app/index.php
diff --git a/code/web/public_php/app/lang.php b/web/public_php/app/lang.php
similarity index 100%
rename from code/web/public_php/app/lang.php
rename to web/public_php/app/lang.php
diff --git a/code/web/public_php/crash_report/config.inc.php b/web/public_php/crash_report/config.inc.php
similarity index 100%
rename from code/web/public_php/crash_report/config.inc.php
rename to web/public_php/crash_report/config.inc.php
diff --git a/code/web/public_php/crash_report/log.inc.php b/web/public_php/crash_report/log.inc.php
similarity index 100%
rename from code/web/public_php/crash_report/log.inc.php
rename to web/public_php/crash_report/log.inc.php
diff --git a/code/web/public_php/crash_report/submit.php b/web/public_php/crash_report/submit.php
similarity index 100%
rename from code/web/public_php/crash_report/submit.php
rename to web/public_php/crash_report/submit.php
diff --git a/code/web/public_php/index.php b/web/public_php/index.php
similarity index 100%
rename from code/web/public_php/index.php
rename to web/public_php/index.php
diff --git a/code/web/public_php/login/client_install.php b/web/public_php/login/client_install.php
similarity index 100%
rename from code/web/public_php/login/client_install.php
rename to web/public_php/login/client_install.php
diff --git a/code/web/public_php/login/config.php b/web/public_php/login/config.php
similarity index 100%
rename from code/web/public_php/login/config.php
rename to web/public_php/login/config.php
diff --git a/code/web/public_php/login/email/RFC822.php b/web/public_php/login/email/RFC822.php
similarity index 100%
rename from code/web/public_php/login/email/RFC822.php
rename to web/public_php/login/email/RFC822.php
diff --git a/code/web/public_php/login/email/htmlMimeMail.php b/web/public_php/login/email/htmlMimeMail.php
similarity index 100%
rename from code/web/public_php/login/email/htmlMimeMail.php
rename to web/public_php/login/email/htmlMimeMail.php
diff --git a/code/web/public_php/login/email/mimePart.php b/web/public_php/login/email/mimePart.php
similarity index 100%
rename from code/web/public_php/login/email/mimePart.php
rename to web/public_php/login/email/mimePart.php
diff --git a/code/web/public_php/login/email/smtp.php b/web/public_php/login/email/smtp.php
similarity index 100%
rename from code/web/public_php/login/email/smtp.php
rename to web/public_php/login/email/smtp.php
diff --git a/code/web/public_php/login/login_service_itf.php b/web/public_php/login/login_service_itf.php
similarity index 100%
rename from code/web/public_php/login/login_service_itf.php
rename to web/public_php/login/login_service_itf.php
diff --git a/code/web/public_php/login/login_translations.php b/web/public_php/login/login_translations.php
similarity index 100%
rename from code/web/public_php/login/login_translations.php
rename to web/public_php/login/login_translations.php
diff --git a/code/web/public_php/login/r2_login.php b/web/public_php/login/r2_login.php
similarity index 100%
rename from code/web/public_php/login/r2_login.php
rename to web/public_php/login/r2_login.php
diff --git a/code/web/public_php/ring/anim_session.php b/web/public_php/ring/anim_session.php
similarity index 100%
rename from code/web/public_php/ring/anim_session.php
rename to web/public_php/ring/anim_session.php
diff --git a/code/web/public_php/ring/cancel_session.php b/web/public_php/ring/cancel_session.php
similarity index 100%
rename from code/web/public_php/ring/cancel_session.php
rename to web/public_php/ring/cancel_session.php
diff --git a/code/web/public_php/ring/close_session.php b/web/public_php/ring/close_session.php
similarity index 100%
rename from code/web/public_php/ring/close_session.php
rename to web/public_php/ring/close_session.php
diff --git a/code/web/public_php/ring/edit_session.php b/web/public_php/ring/edit_session.php
similarity index 100%
rename from code/web/public_php/ring/edit_session.php
rename to web/public_php/ring/edit_session.php
diff --git a/code/web/public_php/ring/invite_pioneer.php b/web/public_php/ring/invite_pioneer.php
similarity index 100%
rename from code/web/public_php/ring/invite_pioneer.php
rename to web/public_php/ring/invite_pioneer.php
diff --git a/code/web/public_php/ring/join_session.php b/web/public_php/ring/join_session.php
similarity index 100%
rename from code/web/public_php/ring/join_session.php
rename to web/public_php/ring/join_session.php
diff --git a/code/web/public_php/ring/join_shard.php b/web/public_php/ring/join_shard.php
similarity index 100%
rename from code/web/public_php/ring/join_shard.php
rename to web/public_php/ring/join_shard.php
diff --git a/code/web/public_php/ring/mail_forum_itf.php b/web/public_php/ring/mail_forum_itf.php
similarity index 100%
rename from code/web/public_php/ring/mail_forum_itf.php
rename to web/public_php/ring/mail_forum_itf.php
diff --git a/code/web/public_php/ring/plan_edit_session.php b/web/public_php/ring/plan_edit_session.php
similarity index 100%
rename from code/web/public_php/ring/plan_edit_session.php
rename to web/public_php/ring/plan_edit_session.php
diff --git a/code/web/public_php/ring/ring_session_manager_itf.php b/web/public_php/ring/ring_session_manager_itf.php
similarity index 100%
rename from code/web/public_php/ring/ring_session_manager_itf.php
rename to web/public_php/ring/ring_session_manager_itf.php
diff --git a/code/web/public_php/ring/send_plan_edit_session.php b/web/public_php/ring/send_plan_edit_session.php
similarity index 100%
rename from code/web/public_php/ring/send_plan_edit_session.php
rename to web/public_php/ring/send_plan_edit_session.php
diff --git a/code/web/public_php/ring/session_tools.php b/web/public_php/ring/session_tools.php
similarity index 100%
rename from code/web/public_php/ring/session_tools.php
rename to web/public_php/ring/session_tools.php
diff --git a/code/web/public_php/ring/start_session.php b/web/public_php/ring/start_session.php
similarity index 100%
rename from code/web/public_php/ring/start_session.php
rename to web/public_php/ring/start_session.php
diff --git a/code/web/public_php/ring/welcome_service_itf.php b/web/public_php/ring/welcome_service_itf.php
similarity index 100%
rename from code/web/public_php/ring/welcome_service_itf.php
rename to web/public_php/ring/welcome_service_itf.php
diff --git a/code/web/public_php/setup/auth.php b/web/public_php/setup/auth.php
similarity index 100%
rename from code/web/public_php/setup/auth.php
rename to web/public_php/setup/auth.php
diff --git a/code/web/public_php/setup/css/bootstrap-theme.css b/web/public_php/setup/css/bootstrap-theme.css
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap-theme.css
rename to web/public_php/setup/css/bootstrap-theme.css
diff --git a/code/web/public_php/setup/css/bootstrap-theme.css.map b/web/public_php/setup/css/bootstrap-theme.css.map
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap-theme.css.map
rename to web/public_php/setup/css/bootstrap-theme.css.map
diff --git a/code/web/public_php/setup/css/bootstrap-theme.min.css b/web/public_php/setup/css/bootstrap-theme.min.css
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap-theme.min.css
rename to web/public_php/setup/css/bootstrap-theme.min.css
diff --git a/code/web/public_php/setup/css/bootstrap.css b/web/public_php/setup/css/bootstrap.css
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap.css
rename to web/public_php/setup/css/bootstrap.css
diff --git a/code/web/public_php/setup/css/bootstrap.css.map b/web/public_php/setup/css/bootstrap.css.map
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap.css.map
rename to web/public_php/setup/css/bootstrap.css.map
diff --git a/code/web/public_php/setup/css/bootstrap.min.css b/web/public_php/setup/css/bootstrap.min.css
similarity index 100%
rename from code/web/public_php/setup/css/bootstrap.min.css
rename to web/public_php/setup/css/bootstrap.min.css
diff --git a/code/web/public_php/setup/database.php b/web/public_php/setup/database.php
similarity index 100%
rename from code/web/public_php/setup/database.php
rename to web/public_php/setup/database.php
diff --git a/code/web/public_php/setup/fonts/glyphicons-halflings-regular.eot b/web/public_php/setup/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from code/web/public_php/setup/fonts/glyphicons-halflings-regular.eot
rename to web/public_php/setup/fonts/glyphicons-halflings-regular.eot
diff --git a/code/web/public_php/setup/fonts/glyphicons-halflings-regular.svg b/web/public_php/setup/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from code/web/public_php/setup/fonts/glyphicons-halflings-regular.svg
rename to web/public_php/setup/fonts/glyphicons-halflings-regular.svg
diff --git a/code/web/public_php/setup/fonts/glyphicons-halflings-regular.ttf b/web/public_php/setup/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from code/web/public_php/setup/fonts/glyphicons-halflings-regular.ttf
rename to web/public_php/setup/fonts/glyphicons-halflings-regular.ttf
diff --git a/code/web/public_php/setup/fonts/glyphicons-halflings-regular.woff b/web/public_php/setup/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from code/web/public_php/setup/fonts/glyphicons-halflings-regular.woff
rename to web/public_php/setup/fonts/glyphicons-halflings-regular.woff
diff --git a/code/web/public_php/setup/footer.php b/web/public_php/setup/footer.php
similarity index 100%
rename from code/web/public_php/setup/footer.php
rename to web/public_php/setup/footer.php
diff --git a/code/web/public_php/setup/header.php b/web/public_php/setup/header.php
similarity index 100%
rename from code/web/public_php/setup/header.php
rename to web/public_php/setup/header.php
diff --git a/code/web/public_php/setup/img/agplv3-88x31.png b/web/public_php/setup/img/agplv3-88x31.png
similarity index 100%
rename from code/web/public_php/setup/img/agplv3-88x31.png
rename to web/public_php/setup/img/agplv3-88x31.png
diff --git a/code/web/public_php/setup/index.php b/web/public_php/setup/index.php
similarity index 100%
rename from code/web/public_php/setup/index.php
rename to web/public_php/setup/index.php
diff --git a/code/web/public_php/setup/install.php b/web/public_php/setup/install.php
similarity index 100%
rename from code/web/public_php/setup/install.php
rename to web/public_php/setup/install.php
diff --git a/code/web/public_php/setup/js/bootstrap.js b/web/public_php/setup/js/bootstrap.js
similarity index 100%
rename from code/web/public_php/setup/js/bootstrap.js
rename to web/public_php/setup/js/bootstrap.js
diff --git a/code/web/public_php/setup/js/bootstrap.min.js b/web/public_php/setup/js/bootstrap.min.js
similarity index 100%
rename from code/web/public_php/setup/js/bootstrap.min.js
rename to web/public_php/setup/js/bootstrap.min.js
diff --git a/code/web/public_php/setup/template.htm b/web/public_php/setup/template.htm
similarity index 100%
rename from code/web/public_php/setup/template.htm
rename to web/public_php/setup/template.htm
diff --git a/code/web/public_php/setup/upgrade.php b/web/public_php/setup/upgrade.php
similarity index 100%
rename from code/web/public_php/setup/upgrade.php
rename to web/public_php/setup/upgrade.php
diff --git a/code/web/public_php/setup/version.php b/web/public_php/setup/version.php
similarity index 100%
rename from code/web/public_php/setup/version.php
rename to web/public_php/setup/version.php
diff --git a/code/web/public_php/tools/domain_info.php b/web/public_php/tools/domain_info.php
similarity index 100%
rename from code/web/public_php/tools/domain_info.php
rename to web/public_php/tools/domain_info.php
diff --git a/code/web/public_php/tools/nel_message.php b/web/public_php/tools/nel_message.php
similarity index 100%
rename from code/web/public_php/tools/nel_message.php
rename to web/public_php/tools/nel_message.php
diff --git a/code/web/public_php/tools/validate_cookie.php b/web/public_php/tools/validate_cookie.php
similarity index 100%
rename from code/web/public_php/tools/validate_cookie.php
rename to web/public_php/tools/validate_cookie.php
diff --git a/code/web/public_php/webtt/.gitignore b/web/public_php/webtt/.gitignore
similarity index 100%
rename from code/web/public_php/webtt/.gitignore
rename to web/public_php/webtt/.gitignore
diff --git a/code/web/public_php/webtt/.htaccess b/web/public_php/webtt/.htaccess
similarity index 100%
rename from code/web/public_php/webtt/.htaccess
rename to web/public_php/webtt/.htaccess
diff --git a/code/web/public_php/webtt/CakePHP_README b/web/public_php/webtt/CakePHP_README
similarity index 100%
rename from code/web/public_php/webtt/CakePHP_README
rename to web/public_php/webtt/CakePHP_README
diff --git a/code/web/public_php/webtt/app/.htaccess b/web/public_php/webtt/app/.htaccess
similarity index 100%
rename from code/web/public_php/webtt/app/.htaccess
rename to web/public_php/webtt/app/.htaccess
diff --git a/code/web/public_php/webtt/app/config/acl.ini.php b/web/public_php/webtt/app/config/acl.ini.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/acl.ini.php
rename to web/public_php/webtt/app/config/acl.ini.php
diff --git a/code/web/public_php/webtt/app/config/bootstrap.php b/web/public_php/webtt/app/config/bootstrap.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/bootstrap.php
rename to web/public_php/webtt/app/config/bootstrap.php
diff --git a/code/web/public_php/webtt/app/config/core.php b/web/public_php/webtt/app/config/core.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/core.php
rename to web/public_php/webtt/app/config/core.php
diff --git a/code/web/public_php/webtt/app/config/database.php b/web/public_php/webtt/app/config/database.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/database.php
rename to web/public_php/webtt/app/config/database.php
diff --git a/code/web/public_php/webtt/app/config/database.php.default b/web/public_php/webtt/app/config/database.php.default
similarity index 100%
rename from code/web/public_php/webtt/app/config/database.php.default
rename to web/public_php/webtt/app/config/database.php.default
diff --git a/code/web/public_php/webtt/app/config/routes.php b/web/public_php/webtt/app/config/routes.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/routes.php
rename to web/public_php/webtt/app/config/routes.php
diff --git a/code/web/public_php/webtt/app/config/schema/db_acl.php b/web/public_php/webtt/app/config/schema/db_acl.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/schema/db_acl.php
rename to web/public_php/webtt/app/config/schema/db_acl.php
diff --git a/code/web/public_php/webtt/app/config/schema/i18n.php b/web/public_php/webtt/app/config/schema/i18n.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/schema/i18n.php
rename to web/public_php/webtt/app/config/schema/i18n.php
diff --git a/code/web/public_php/webtt/app/config/schema/sessions.php b/web/public_php/webtt/app/config/schema/sessions.php
similarity index 100%
rename from code/web/public_php/webtt/app/config/schema/sessions.php
rename to web/public_php/webtt/app/config/schema/sessions.php
diff --git a/code/web/public_php/webtt/app/controllers/app_controller.php b/web/public_php/webtt/app/controllers/app_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/app_controller.php
rename to web/public_php/webtt/app/controllers/app_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/comments_controller.php b/web/public_php/webtt/app/controllers/comments_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/comments_controller.php
rename to web/public_php/webtt/app/controllers/comments_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/components/empty b/web/public_php/webtt/app/controllers/components/empty
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/components/empty
rename to web/public_php/webtt/app/controllers/components/empty
diff --git a/code/web/public_php/webtt/app/controllers/components/path_resolver.php b/web/public_php/webtt/app/controllers/components/path_resolver.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/components/path_resolver.php
rename to web/public_php/webtt/app/controllers/components/path_resolver.php
diff --git a/code/web/public_php/webtt/app/controllers/file_identifiers_controller.php b/web/public_php/webtt/app/controllers/file_identifiers_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/file_identifiers_controller.php
rename to web/public_php/webtt/app/controllers/file_identifiers_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/identifier_columns_controller.php b/web/public_php/webtt/app/controllers/identifier_columns_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/identifier_columns_controller.php
rename to web/public_php/webtt/app/controllers/identifier_columns_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/identifiers_controller.php b/web/public_php/webtt/app/controllers/identifiers_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/identifiers_controller.php
rename to web/public_php/webtt/app/controllers/identifiers_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/imported_translation_files_controller.php b/web/public_php/webtt/app/controllers/imported_translation_files_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/imported_translation_files_controller.php
rename to web/public_php/webtt/app/controllers/imported_translation_files_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/languages_controller.php b/web/public_php/webtt/app/controllers/languages_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/languages_controller.php
rename to web/public_php/webtt/app/controllers/languages_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/pages_controller.php b/web/public_php/webtt/app/controllers/pages_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/pages_controller.php
rename to web/public_php/webtt/app/controllers/pages_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/raw_files_controller.php b/web/public_php/webtt/app/controllers/raw_files_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/raw_files_controller.php
rename to web/public_php/webtt/app/controllers/raw_files_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/translation_files_controller.php b/web/public_php/webtt/app/controllers/translation_files_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/translation_files_controller.php
rename to web/public_php/webtt/app/controllers/translation_files_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/translations_controller.php b/web/public_php/webtt/app/controllers/translations_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/translations_controller.php
rename to web/public_php/webtt/app/controllers/translations_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/users_controller.php b/web/public_php/webtt/app/controllers/users_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/users_controller.php
rename to web/public_php/webtt/app/controllers/users_controller.php
diff --git a/code/web/public_php/webtt/app/controllers/votes_controller.php b/web/public_php/webtt/app/controllers/votes_controller.php
similarity index 100%
rename from code/web/public_php/webtt/app/controllers/votes_controller.php
rename to web/public_php/webtt/app/controllers/votes_controller.php
diff --git a/code/web/public_php/webtt/app/index.php b/web/public_php/webtt/app/index.php
similarity index 100%
rename from code/web/public_php/webtt/app/index.php
rename to web/public_php/webtt/app/index.php
diff --git a/code/web/public_php/webtt/app/libs/empty b/web/public_php/webtt/app/libs/empty
similarity index 100%
rename from code/web/public_php/webtt/app/libs/empty
rename to web/public_php/webtt/app/libs/empty
diff --git a/code/web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty b/web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from code/web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty
rename to web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty
diff --git a/code/web/public_php/webtt/app/models/app_model.php b/web/public_php/webtt/app/models/app_model.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/app_model.php
rename to web/public_php/webtt/app/models/app_model.php
diff --git a/code/web/public_php/webtt/app/models/behaviors/empty b/web/public_php/webtt/app/models/behaviors/empty
similarity index 100%
rename from code/web/public_php/webtt/app/models/behaviors/empty
rename to web/public_php/webtt/app/models/behaviors/empty
diff --git a/code/web/public_php/webtt/app/models/behaviors/null.php b/web/public_php/webtt/app/models/behaviors/null.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/behaviors/null.php
rename to web/public_php/webtt/app/models/behaviors/null.php
diff --git a/code/web/public_php/webtt/app/models/comment.php b/web/public_php/webtt/app/models/comment.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/comment.php
rename to web/public_php/webtt/app/models/comment.php
diff --git a/code/web/public_php/webtt/app/models/datasources/empty b/web/public_php/webtt/app/models/datasources/empty
similarity index 100%
rename from code/web/public_php/webtt/app/models/datasources/empty
rename to web/public_php/webtt/app/models/datasources/empty
diff --git a/code/web/public_php/webtt/app/models/datasources/raw_files_source.php b/web/public_php/webtt/app/models/datasources/raw_files_source.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/datasources/raw_files_source.php
rename to web/public_php/webtt/app/models/datasources/raw_files_source.php
diff --git a/code/web/public_php/webtt/app/models/file_identifier.php b/web/public_php/webtt/app/models/file_identifier.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/file_identifier.php
rename to web/public_php/webtt/app/models/file_identifier.php
diff --git a/code/web/public_php/webtt/app/models/identifier.php b/web/public_php/webtt/app/models/identifier.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/identifier.php
rename to web/public_php/webtt/app/models/identifier.php
diff --git a/code/web/public_php/webtt/app/models/identifier_column.php b/web/public_php/webtt/app/models/identifier_column.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/identifier_column.php
rename to web/public_php/webtt/app/models/identifier_column.php
diff --git a/code/web/public_php/webtt/app/models/imported_translation_file.php b/web/public_php/webtt/app/models/imported_translation_file.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/imported_translation_file.php
rename to web/public_php/webtt/app/models/imported_translation_file.php
diff --git a/code/web/public_php/webtt/app/models/language.php b/web/public_php/webtt/app/models/language.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/language.php
rename to web/public_php/webtt/app/models/language.php
diff --git a/code/web/public_php/webtt/app/models/raw_file.php b/web/public_php/webtt/app/models/raw_file.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/raw_file.php
rename to web/public_php/webtt/app/models/raw_file.php
diff --git a/code/web/public_php/webtt/app/models/translation.php b/web/public_php/webtt/app/models/translation.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/translation.php
rename to web/public_php/webtt/app/models/translation.php
diff --git a/code/web/public_php/webtt/app/models/translation_file.php b/web/public_php/webtt/app/models/translation_file.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/translation_file.php
rename to web/public_php/webtt/app/models/translation_file.php
diff --git a/code/web/public_php/webtt/app/models/user.php b/web/public_php/webtt/app/models/user.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/user.php
rename to web/public_php/webtt/app/models/user.php
diff --git a/code/web/public_php/webtt/app/models/vote.php b/web/public_php/webtt/app/models/vote.php
similarity index 100%
rename from code/web/public_php/webtt/app/models/vote.php
rename to web/public_php/webtt/app/models/vote.php
diff --git a/code/web/public_php/webtt/app/plugins/empty b/web/public_php/webtt/app/plugins/empty
similarity index 100%
rename from code/web/public_php/webtt/app/plugins/empty
rename to web/public_php/webtt/app/plugins/empty
diff --git a/code/web/public_php/webtt/app/tests/cases/behaviors/empty b/web/public_php/webtt/app/tests/cases/behaviors/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/cases/behaviors/empty
rename to web/public_php/webtt/app/tests/cases/behaviors/empty
diff --git a/code/web/public_php/webtt/app/tests/cases/components/empty b/web/public_php/webtt/app/tests/cases/components/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/cases/components/empty
rename to web/public_php/webtt/app/tests/cases/components/empty
diff --git a/code/web/public_php/webtt/app/tests/cases/controllers/empty b/web/public_php/webtt/app/tests/cases/controllers/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/cases/controllers/empty
rename to web/public_php/webtt/app/tests/cases/controllers/empty
diff --git a/code/web/public_php/webtt/app/tests/cases/helpers/empty b/web/public_php/webtt/app/tests/cases/helpers/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/cases/helpers/empty
rename to web/public_php/webtt/app/tests/cases/helpers/empty
diff --git a/code/web/public_php/webtt/app/tests/cases/models/empty b/web/public_php/webtt/app/tests/cases/models/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/cases/models/empty
rename to web/public_php/webtt/app/tests/cases/models/empty
diff --git a/code/web/public_php/webtt/app/tests/fixtures/empty b/web/public_php/webtt/app/tests/fixtures/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/fixtures/empty
rename to web/public_php/webtt/app/tests/fixtures/empty
diff --git a/code/web/public_php/webtt/app/tests/groups/empty b/web/public_php/webtt/app/tests/groups/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tests/groups/empty
rename to web/public_php/webtt/app/tests/groups/empty
diff --git a/code/web/public_php/webtt/app/tmp/cache/models/empty b/web/public_php/webtt/app/tmp/cache/models/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/cache/models/empty
rename to web/public_php/webtt/app/tmp/cache/models/empty
diff --git a/code/web/public_php/webtt/app/tmp/cache/persistent/empty b/web/public_php/webtt/app/tmp/cache/persistent/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/cache/persistent/empty
rename to web/public_php/webtt/app/tmp/cache/persistent/empty
diff --git a/code/web/public_php/webtt/app/tmp/cache/views/empty b/web/public_php/webtt/app/tmp/cache/views/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/cache/views/empty
rename to web/public_php/webtt/app/tmp/cache/views/empty
diff --git a/code/web/public_php/webtt/app/tmp/logs/empty b/web/public_php/webtt/app/tmp/logs/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/logs/empty
rename to web/public_php/webtt/app/tmp/logs/empty
diff --git a/code/web/public_php/webtt/app/tmp/sessions/empty b/web/public_php/webtt/app/tmp/sessions/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/sessions/empty
rename to web/public_php/webtt/app/tmp/sessions/empty
diff --git a/code/web/public_php/webtt/app/tmp/tests/empty b/web/public_php/webtt/app/tmp/tests/empty
similarity index 100%
rename from code/web/public_php/webtt/app/tmp/tests/empty
rename to web/public_php/webtt/app/tmp/tests/empty
diff --git a/code/web/public_php/webtt/app/vendors/PhraseParser.php b/web/public_php/webtt/app/vendors/PhraseParser.php
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/PhraseParser.php
rename to web/public_php/webtt/app/vendors/PhraseParser.php
diff --git a/code/web/public_php/webtt/app/vendors/SheetParser.php b/web/public_php/webtt/app/vendors/SheetParser.php
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/SheetParser.php
rename to web/public_php/webtt/app/vendors/SheetParser.php
diff --git a/code/web/public_php/webtt/app/vendors/StringParser.php b/web/public_php/webtt/app/vendors/StringParser.php
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/StringParser.php
rename to web/public_php/webtt/app/vendors/StringParser.php
diff --git a/code/web/public_php/webtt/app/vendors/shells/tasks/empty b/web/public_php/webtt/app/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/tasks/empty
rename to web/public_php/webtt/app/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp b/web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp b/web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp b/web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp b/web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/empty b/web/public_php/webtt/app/vendors/shells/templates/empty
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/empty
rename to web/public_php/webtt/app/vendors/shells/templates/empty
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp b/web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp b/web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp b/web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp
diff --git a/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp b/web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp
rename to web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/add.ctp b/web/public_php/webtt/app/views/comments/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/add.ctp
rename to web/public_php/webtt/app/views/comments/add.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/admin_add.ctp b/web/public_php/webtt/app/views/comments/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/admin_add.ctp
rename to web/public_php/webtt/app/views/comments/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/admin_edit.ctp b/web/public_php/webtt/app/views/comments/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/admin_edit.ctp
rename to web/public_php/webtt/app/views/comments/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/admin_index.ctp b/web/public_php/webtt/app/views/comments/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/admin_index.ctp
rename to web/public_php/webtt/app/views/comments/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/admin_view.ctp b/web/public_php/webtt/app/views/comments/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/admin_view.ctp
rename to web/public_php/webtt/app/views/comments/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/edit.ctp b/web/public_php/webtt/app/views/comments/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/edit.ctp
rename to web/public_php/webtt/app/views/comments/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/index.ctp b/web/public_php/webtt/app/views/comments/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/index.ctp
rename to web/public_php/webtt/app/views/comments/index.ctp
diff --git a/code/web/public_php/webtt/app/views/comments/view.ctp b/web/public_php/webtt/app/views/comments/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/comments/view.ctp
rename to web/public_php/webtt/app/views/comments/view.ctp
diff --git a/code/web/public_php/webtt/app/views/elements/email/html/empty b/web/public_php/webtt/app/views/elements/email/html/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/email/html/empty
rename to web/public_php/webtt/app/views/elements/email/html/empty
diff --git a/code/web/public_php/webtt/app/views/elements/email/html/registration.ctp b/web/public_php/webtt/app/views/elements/email/html/registration.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/email/html/registration.ctp
rename to web/public_php/webtt/app/views/elements/email/html/registration.ctp
diff --git a/code/web/public_php/webtt/app/views/elements/email/text/empty b/web/public_php/webtt/app/views/elements/email/text/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/email/text/empty
rename to web/public_php/webtt/app/views/elements/email/text/empty
diff --git a/code/web/public_php/webtt/app/views/elements/email/text/registration.ctp b/web/public_php/webtt/app/views/elements/email/text/registration.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/email/text/registration.ctp
rename to web/public_php/webtt/app/views/elements/email/text/registration.ctp
diff --git a/code/web/public_php/webtt/app/views/elements/empty b/web/public_php/webtt/app/views/elements/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/empty
rename to web/public_php/webtt/app/views/elements/empty
diff --git a/code/web/public_php/webtt/app/views/elements/neighbours.ctp b/web/public_php/webtt/app/views/elements/neighbours.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/elements/neighbours.ctp
rename to web/public_php/webtt/app/views/elements/neighbours.ctp
diff --git a/code/web/public_php/webtt/app/views/errors/empty b/web/public_php/webtt/app/views/errors/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/errors/empty
rename to web/public_php/webtt/app/views/errors/empty
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/add.ctp b/web/public_php/webtt/app/views/file_identifiers/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/add.ctp
rename to web/public_php/webtt/app/views/file_identifiers/add.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/admin_add.ctp b/web/public_php/webtt/app/views/file_identifiers/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/admin_add.ctp
rename to web/public_php/webtt/app/views/file_identifiers/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp b/web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp
rename to web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/admin_index.ctp b/web/public_php/webtt/app/views/file_identifiers/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/admin_index.ctp
rename to web/public_php/webtt/app/views/file_identifiers/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/admin_view.ctp b/web/public_php/webtt/app/views/file_identifiers/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/admin_view.ctp
rename to web/public_php/webtt/app/views/file_identifiers/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/edit.ctp b/web/public_php/webtt/app/views/file_identifiers/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/edit.ctp
rename to web/public_php/webtt/app/views/file_identifiers/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/index.ctp b/web/public_php/webtt/app/views/file_identifiers/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/index.ctp
rename to web/public_php/webtt/app/views/file_identifiers/index.ctp
diff --git a/code/web/public_php/webtt/app/views/file_identifiers/view.ctp b/web/public_php/webtt/app/views/file_identifiers/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/file_identifiers/view.ctp
rename to web/public_php/webtt/app/views/file_identifiers/view.ctp
diff --git a/code/web/public_php/webtt/app/views/helpers/empty b/web/public_php/webtt/app/views/helpers/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/helpers/empty
rename to web/public_php/webtt/app/views/helpers/empty
diff --git a/code/web/public_php/webtt/app/views/identifier_columns/admin_index.ctp b/web/public_php/webtt/app/views/identifier_columns/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifier_columns/admin_index.ctp
rename to web/public_php/webtt/app/views/identifier_columns/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/identifier_columns/admin_view.ctp b/web/public_php/webtt/app/views/identifier_columns/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifier_columns/admin_view.ctp
rename to web/public_php/webtt/app/views/identifier_columns/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/identifier_columns/index.ctp b/web/public_php/webtt/app/views/identifier_columns/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifier_columns/index.ctp
rename to web/public_php/webtt/app/views/identifier_columns/index.ctp
diff --git a/code/web/public_php/webtt/app/views/identifier_columns/view.ctp b/web/public_php/webtt/app/views/identifier_columns/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifier_columns/view.ctp
rename to web/public_php/webtt/app/views/identifier_columns/view.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/add.ctp b/web/public_php/webtt/app/views/identifiers/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/add.ctp
rename to web/public_php/webtt/app/views/identifiers/add.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/admin_add.ctp b/web/public_php/webtt/app/views/identifiers/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/admin_add.ctp
rename to web/public_php/webtt/app/views/identifiers/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/admin_edit.ctp b/web/public_php/webtt/app/views/identifiers/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/admin_edit.ctp
rename to web/public_php/webtt/app/views/identifiers/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/admin_index.ctp b/web/public_php/webtt/app/views/identifiers/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/admin_index.ctp
rename to web/public_php/webtt/app/views/identifiers/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/admin_view.ctp b/web/public_php/webtt/app/views/identifiers/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/admin_view.ctp
rename to web/public_php/webtt/app/views/identifiers/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/edit.ctp b/web/public_php/webtt/app/views/identifiers/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/edit.ctp
rename to web/public_php/webtt/app/views/identifiers/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/index.ctp b/web/public_php/webtt/app/views/identifiers/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/index.ctp
rename to web/public_php/webtt/app/views/identifiers/index.ctp
diff --git a/code/web/public_php/webtt/app/views/identifiers/view.ctp b/web/public_php/webtt/app/views/identifiers/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/identifiers/view.ctp
rename to web/public_php/webtt/app/views/identifiers/view.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp b/web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp b/web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp b/web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp b/web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/index.ctp b/web/public_php/webtt/app/views/imported_translation_files/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/index.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/index.ctp
diff --git a/code/web/public_php/webtt/app/views/imported_translation_files/view.ctp b/web/public_php/webtt/app/views/imported_translation_files/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/imported_translation_files/view.ctp
rename to web/public_php/webtt/app/views/imported_translation_files/view.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/add.ctp b/web/public_php/webtt/app/views/languages/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/add.ctp
rename to web/public_php/webtt/app/views/languages/add.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/admin_add.ctp b/web/public_php/webtt/app/views/languages/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/admin_add.ctp
rename to web/public_php/webtt/app/views/languages/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/admin_edit.ctp b/web/public_php/webtt/app/views/languages/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/admin_edit.ctp
rename to web/public_php/webtt/app/views/languages/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/admin_index.ctp b/web/public_php/webtt/app/views/languages/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/admin_index.ctp
rename to web/public_php/webtt/app/views/languages/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/admin_view.ctp b/web/public_php/webtt/app/views/languages/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/admin_view.ctp
rename to web/public_php/webtt/app/views/languages/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/edit.ctp b/web/public_php/webtt/app/views/languages/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/edit.ctp
rename to web/public_php/webtt/app/views/languages/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/index.ctp b/web/public_php/webtt/app/views/languages/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/index.ctp
rename to web/public_php/webtt/app/views/languages/index.ctp
diff --git a/code/web/public_php/webtt/app/views/languages/view.ctp b/web/public_php/webtt/app/views/languages/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/languages/view.ctp
rename to web/public_php/webtt/app/views/languages/view.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/admin.ctp b/web/public_php/webtt/app/views/layouts/admin.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/admin.ctp
rename to web/public_php/webtt/app/views/layouts/admin.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/default.ctp b/web/public_php/webtt/app/views/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/default.ctp
rename to web/public_php/webtt/app/views/layouts/default.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/default_debug.ctp b/web/public_php/webtt/app/views/layouts/default_debug.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/default_debug.ctp
rename to web/public_php/webtt/app/views/layouts/default_debug.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/email/html/default.ctp b/web/public_php/webtt/app/views/layouts/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/email/html/default.ctp
rename to web/public_php/webtt/app/views/layouts/email/html/default.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/email/text/default.ctp b/web/public_php/webtt/app/views/layouts/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/email/text/default.ctp
rename to web/public_php/webtt/app/views/layouts/email/text/default.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/js/empty b/web/public_php/webtt/app/views/layouts/js/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/js/empty
rename to web/public_php/webtt/app/views/layouts/js/empty
diff --git a/code/web/public_php/webtt/app/views/layouts/new.ctp b/web/public_php/webtt/app/views/layouts/new.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/new.ctp
rename to web/public_php/webtt/app/views/layouts/new.ctp
diff --git a/code/web/public_php/webtt/app/views/layouts/rss/empty b/web/public_php/webtt/app/views/layouts/rss/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/rss/empty
rename to web/public_php/webtt/app/views/layouts/rss/empty
diff --git a/code/web/public_php/webtt/app/views/layouts/xml/empty b/web/public_php/webtt/app/views/layouts/xml/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/layouts/xml/empty
rename to web/public_php/webtt/app/views/layouts/xml/empty
diff --git a/code/web/public_php/webtt/app/views/pages/admin/home.ctp b/web/public_php/webtt/app/views/pages/admin/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/pages/admin/home.ctp
rename to web/public_php/webtt/app/views/pages/admin/home.ctp
diff --git a/code/web/public_php/webtt/app/views/pages/home.ctp b/web/public_php/webtt/app/views/pages/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/pages/home.ctp
rename to web/public_php/webtt/app/views/pages/home.ctp
diff --git a/code/web/public_php/webtt/app/views/raw_files/admin_index.ctp b/web/public_php/webtt/app/views/raw_files/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/raw_files/admin_index.ctp
rename to web/public_php/webtt/app/views/raw_files/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/raw_files/admin_view.ctp b/web/public_php/webtt/app/views/raw_files/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/raw_files/admin_view.ctp
rename to web/public_php/webtt/app/views/raw_files/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/raw_files/index.ctp b/web/public_php/webtt/app/views/raw_files/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/raw_files/index.ctp
rename to web/public_php/webtt/app/views/raw_files/index.ctp
diff --git a/code/web/public_php/webtt/app/views/raw_files/listdir.ctp b/web/public_php/webtt/app/views/raw_files/listdir.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/raw_files/listdir.ctp
rename to web/public_php/webtt/app/views/raw_files/listdir.ctp
diff --git a/code/web/public_php/webtt/app/views/raw_files/view.ctp b/web/public_php/webtt/app/views/raw_files/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/raw_files/view.ctp
rename to web/public_php/webtt/app/views/raw_files/view.ctp
diff --git a/code/web/public_php/webtt/app/views/scaffolds/edit.ctp b/web/public_php/webtt/app/views/scaffolds/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/scaffolds/edit.ctp
rename to web/public_php/webtt/app/views/scaffolds/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/scaffolds/empty b/web/public_php/webtt/app/views/scaffolds/empty
similarity index 100%
rename from code/web/public_php/webtt/app/views/scaffolds/empty
rename to web/public_php/webtt/app/views/scaffolds/empty
diff --git a/code/web/public_php/webtt/app/views/scaffolds/index.ctp b/web/public_php/webtt/app/views/scaffolds/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/scaffolds/index.ctp
rename to web/public_php/webtt/app/views/scaffolds/index.ctp
diff --git a/code/web/public_php/webtt/app/views/scaffolds/view.ctp b/web/public_php/webtt/app/views/scaffolds/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/scaffolds/view.ctp
rename to web/public_php/webtt/app/views/scaffolds/view.ctp
diff --git a/code/web/public_php/webtt/app/views/translation_files/admin_index.ctp b/web/public_php/webtt/app/views/translation_files/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translation_files/admin_index.ctp
rename to web/public_php/webtt/app/views/translation_files/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/translation_files/admin_view.ctp b/web/public_php/webtt/app/views/translation_files/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translation_files/admin_view.ctp
rename to web/public_php/webtt/app/views/translation_files/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/translation_files/index.ctp b/web/public_php/webtt/app/views/translation_files/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translation_files/index.ctp
rename to web/public_php/webtt/app/views/translation_files/index.ctp
diff --git a/code/web/public_php/webtt/app/views/translation_files/view.ctp b/web/public_php/webtt/app/views/translation_files/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translation_files/view.ctp
rename to web/public_php/webtt/app/views/translation_files/view.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/add.ctp b/web/public_php/webtt/app/views/translations/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/add.ctp
rename to web/public_php/webtt/app/views/translations/add.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/admin_add.ctp b/web/public_php/webtt/app/views/translations/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/admin_add.ctp
rename to web/public_php/webtt/app/views/translations/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/admin_edit.ctp b/web/public_php/webtt/app/views/translations/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/admin_edit.ctp
rename to web/public_php/webtt/app/views/translations/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/admin_index.ctp b/web/public_php/webtt/app/views/translations/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/admin_index.ctp
rename to web/public_php/webtt/app/views/translations/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/admin_view.ctp b/web/public_php/webtt/app/views/translations/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/admin_view.ctp
rename to web/public_php/webtt/app/views/translations/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/edit.ctp b/web/public_php/webtt/app/views/translations/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/edit.ctp
rename to web/public_php/webtt/app/views/translations/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/index.ctp b/web/public_php/webtt/app/views/translations/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/index.ctp
rename to web/public_php/webtt/app/views/translations/index.ctp
diff --git a/code/web/public_php/webtt/app/views/translations/view.ctp b/web/public_php/webtt/app/views/translations/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/translations/view.ctp
rename to web/public_php/webtt/app/views/translations/view.ctp
diff --git a/code/web/public_php/webtt/app/views/users/admin_add.ctp b/web/public_php/webtt/app/views/users/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/admin_add.ctp
rename to web/public_php/webtt/app/views/users/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/users/admin_edit.ctp b/web/public_php/webtt/app/views/users/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/admin_edit.ctp
rename to web/public_php/webtt/app/views/users/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/users/admin_index.ctp b/web/public_php/webtt/app/views/users/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/admin_index.ctp
rename to web/public_php/webtt/app/views/users/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/users/admin_view.ctp b/web/public_php/webtt/app/views/users/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/admin_view.ctp
rename to web/public_php/webtt/app/views/users/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/users/index.ctp b/web/public_php/webtt/app/views/users/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/index.ctp
rename to web/public_php/webtt/app/views/users/index.ctp
diff --git a/code/web/public_php/webtt/app/views/users/login.ctp b/web/public_php/webtt/app/views/users/login.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/login.ctp
rename to web/public_php/webtt/app/views/users/login.ctp
diff --git a/code/web/public_php/webtt/app/views/users/register.ctp b/web/public_php/webtt/app/views/users/register.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/register.ctp
rename to web/public_php/webtt/app/views/users/register.ctp
diff --git a/code/web/public_php/webtt/app/views/users/view.ctp b/web/public_php/webtt/app/views/users/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/users/view.ctp
rename to web/public_php/webtt/app/views/users/view.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/add.ctp b/web/public_php/webtt/app/views/votes/add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/add.ctp
rename to web/public_php/webtt/app/views/votes/add.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/admin_add.ctp b/web/public_php/webtt/app/views/votes/admin_add.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/admin_add.ctp
rename to web/public_php/webtt/app/views/votes/admin_add.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/admin_edit.ctp b/web/public_php/webtt/app/views/votes/admin_edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/admin_edit.ctp
rename to web/public_php/webtt/app/views/votes/admin_edit.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/admin_index.ctp b/web/public_php/webtt/app/views/votes/admin_index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/admin_index.ctp
rename to web/public_php/webtt/app/views/votes/admin_index.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/admin_view.ctp b/web/public_php/webtt/app/views/votes/admin_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/admin_view.ctp
rename to web/public_php/webtt/app/views/votes/admin_view.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/edit.ctp b/web/public_php/webtt/app/views/votes/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/edit.ctp
rename to web/public_php/webtt/app/views/votes/edit.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/index.ctp b/web/public_php/webtt/app/views/votes/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/index.ctp
rename to web/public_php/webtt/app/views/votes/index.ctp
diff --git a/code/web/public_php/webtt/app/views/votes/view.ctp b/web/public_php/webtt/app/views/votes/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/app/views/votes/view.ctp
rename to web/public_php/webtt/app/views/votes/view.ctp
diff --git a/code/web/public_php/webtt/app/webroot/.htaccess b/web/public_php/webtt/app/webroot/.htaccess
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/.htaccess
rename to web/public_php/webtt/app/webroot/.htaccess
diff --git a/code/web/public_php/webtt/app/webroot/css.php b/web/public_php/webtt/app/webroot/css.php
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css.php
rename to web/public_php/webtt/app/webroot/css.php
diff --git a/code/web/public_php/webtt/app/webroot/css/960.css b/web/public_php/webtt/app/webroot/css/960.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/960.css
rename to web/public_php/webtt/app/webroot/css/960.css
diff --git a/code/web/public_php/webtt/app/webroot/css/cake.generic.css b/web/public_php/webtt/app/webroot/css/cake.generic.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/cake.generic.css
rename to web/public_php/webtt/app/webroot/css/cake.generic.css
diff --git a/code/web/public_php/webtt/app/webroot/css/grid.css b/web/public_php/webtt/app/webroot/css/grid.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/grid.css
rename to web/public_php/webtt/app/webroot/css/grid.css
diff --git a/code/web/public_php/webtt/app/webroot/css/ie.css b/web/public_php/webtt/app/webroot/css/ie.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/ie.css
rename to web/public_php/webtt/app/webroot/css/ie.css
diff --git a/code/web/public_php/webtt/app/webroot/css/ie6.css b/web/public_php/webtt/app/webroot/css/ie6.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/ie6.css
rename to web/public_php/webtt/app/webroot/css/ie6.css
diff --git a/code/web/public_php/webtt/app/webroot/css/labelWidth.css b/web/public_php/webtt/app/webroot/css/labelWidth.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/labelWidth.css
rename to web/public_php/webtt/app/webroot/css/labelWidth.css
diff --git a/code/web/public_php/webtt/app/webroot/css/layout.css b/web/public_php/webtt/app/webroot/css/layout.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/layout.css
rename to web/public_php/webtt/app/webroot/css/layout.css
diff --git a/code/web/public_php/webtt/app/webroot/css/nav.css b/web/public_php/webtt/app/webroot/css/nav.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/nav.css
rename to web/public_php/webtt/app/webroot/css/nav.css
diff --git a/code/web/public_php/webtt/app/webroot/css/reset.css b/web/public_php/webtt/app/webroot/css/reset.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/reset.css
rename to web/public_php/webtt/app/webroot/css/reset.css
diff --git a/code/web/public_php/webtt/app/webroot/css/text.css b/web/public_php/webtt/app/webroot/css/text.css
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/css/text.css
rename to web/public_php/webtt/app/webroot/css/text.css
diff --git a/code/web/public_php/webtt/app/webroot/favicon.ico b/web/public_php/webtt/app/webroot/favicon.ico
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/favicon.ico
rename to web/public_php/webtt/app/webroot/favicon.ico
diff --git a/code/web/public_php/webtt/app/webroot/files/empty b/web/public_php/webtt/app/webroot/files/empty
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/files/empty
rename to web/public_php/webtt/app/webroot/files/empty
diff --git a/code/web/public_php/webtt/app/webroot/img/cake.icon.png b/web/public_php/webtt/app/webroot/img/cake.icon.png
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/img/cake.icon.png
rename to web/public_php/webtt/app/webroot/img/cake.icon.png
diff --git a/code/web/public_php/webtt/app/webroot/img/cake.power.gif b/web/public_php/webtt/app/webroot/img/cake.power.gif
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/img/cake.power.gif
rename to web/public_php/webtt/app/webroot/img/cake.power.gif
diff --git a/code/web/public_php/webtt/app/webroot/img/switch_minus.gif b/web/public_php/webtt/app/webroot/img/switch_minus.gif
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/img/switch_minus.gif
rename to web/public_php/webtt/app/webroot/img/switch_minus.gif
diff --git a/code/web/public_php/webtt/app/webroot/img/switch_plus.gif b/web/public_php/webtt/app/webroot/img/switch_plus.gif
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/img/switch_plus.gif
rename to web/public_php/webtt/app/webroot/img/switch_plus.gif
diff --git a/code/web/public_php/webtt/app/webroot/index.php b/web/public_php/webtt/app/webroot/index.php
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/index.php
rename to web/public_php/webtt/app/webroot/index.php
diff --git a/code/web/public_php/webtt/app/webroot/js/empty b/web/public_php/webtt/app/webroot/js/empty
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/js/empty
rename to web/public_php/webtt/app/webroot/js/empty
diff --git a/code/web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js b/web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js
rename to web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js
diff --git a/code/web/public_php/webtt/app/webroot/js/jquery-fluid16.js b/web/public_php/webtt/app/webroot/js/jquery-fluid16.js
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/js/jquery-fluid16.js
rename to web/public_php/webtt/app/webroot/js/jquery-fluid16.js
diff --git a/code/web/public_php/webtt/app/webroot/js/jquery-ui.js b/web/public_php/webtt/app/webroot/js/jquery-ui.js
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/js/jquery-ui.js
rename to web/public_php/webtt/app/webroot/js/jquery-ui.js
diff --git a/code/web/public_php/webtt/app/webroot/test.php b/web/public_php/webtt/app/webroot/test.php
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/test.php
rename to web/public_php/webtt/app/webroot/test.php
diff --git a/code/web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv b/web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv
rename to web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv
diff --git a/code/web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv b/web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv
rename to web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv
diff --git a/code/web/public_php/webtt/app/webroot/testfiles/ugabla.csv b/web/public_php/webtt/app/webroot/testfiles/ugabla.csv
similarity index 100%
rename from code/web/public_php/webtt/app/webroot/testfiles/ugabla.csv
rename to web/public_php/webtt/app/webroot/testfiles/ugabla.csv
diff --git a/code/web/public_php/webtt/cake/LICENSE.txt b/web/public_php/webtt/cake/LICENSE.txt
similarity index 100%
rename from code/web/public_php/webtt/cake/LICENSE.txt
rename to web/public_php/webtt/cake/LICENSE.txt
diff --git a/code/web/public_php/webtt/cake/VERSION.txt b/web/public_php/webtt/cake/VERSION.txt
similarity index 100%
rename from code/web/public_php/webtt/cake/VERSION.txt
rename to web/public_php/webtt/cake/VERSION.txt
diff --git a/code/web/public_php/webtt/cake/basics.php b/web/public_php/webtt/cake/basics.php
similarity index 100%
rename from code/web/public_php/webtt/cake/basics.php
rename to web/public_php/webtt/cake/basics.php
diff --git a/code/web/public_php/webtt/cake/bootstrap.php b/web/public_php/webtt/cake/bootstrap.php
similarity index 100%
rename from code/web/public_php/webtt/cake/bootstrap.php
rename to web/public_php/webtt/cake/bootstrap.php
diff --git a/code/web/public_php/webtt/cake/config/config.php b/web/public_php/webtt/cake/config/config.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/config.php
rename to web/public_php/webtt/cake/config/config.php
diff --git a/code/web/public_php/webtt/cake/config/paths.php b/web/public_php/webtt/cake/config/paths.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/paths.php
rename to web/public_php/webtt/cake/config/paths.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php b/web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php b/web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php b/web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php b/web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php b/web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php b/web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php b/web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php b/web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php b/web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php b/web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php b/web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php b/web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php b/web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php b/web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php b/web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php b/web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php
diff --git a/code/web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php b/web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php
similarity index 100%
rename from code/web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php
rename to web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php
diff --git a/code/web/public_php/webtt/cake/console/cake b/web/public_php/webtt/cake/console/cake
similarity index 100%
rename from code/web/public_php/webtt/cake/console/cake
rename to web/public_php/webtt/cake/console/cake
diff --git a/code/web/public_php/webtt/cake/console/cake.bat b/web/public_php/webtt/cake/console/cake.bat
similarity index 100%
rename from code/web/public_php/webtt/cake/console/cake.bat
rename to web/public_php/webtt/cake/console/cake.bat
diff --git a/code/web/public_php/webtt/cake/console/cake.php b/web/public_php/webtt/cake/console/cake.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/cake.php
rename to web/public_php/webtt/cake/console/cake.php
diff --git a/code/web/public_php/webtt/cake/console/error.php b/web/public_php/webtt/cake/console/error.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/error.php
rename to web/public_php/webtt/cake/console/error.php
diff --git a/code/web/public_php/webtt/cake/console/libs/acl.php b/web/public_php/webtt/cake/console/libs/acl.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/acl.php
rename to web/public_php/webtt/cake/console/libs/acl.php
diff --git a/code/web/public_php/webtt/cake/console/libs/api.php b/web/public_php/webtt/cake/console/libs/api.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/api.php
rename to web/public_php/webtt/cake/console/libs/api.php
diff --git a/code/web/public_php/webtt/cake/console/libs/bake.php b/web/public_php/webtt/cake/console/libs/bake.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/bake.php
rename to web/public_php/webtt/cake/console/libs/bake.php
diff --git a/code/web/public_php/webtt/cake/console/libs/console.php b/web/public_php/webtt/cake/console/libs/console.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/console.php
rename to web/public_php/webtt/cake/console/libs/console.php
diff --git a/code/web/public_php/webtt/cake/console/libs/i18n.php b/web/public_php/webtt/cake/console/libs/i18n.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/i18n.php
rename to web/public_php/webtt/cake/console/libs/i18n.php
diff --git a/code/web/public_php/webtt/cake/console/libs/schema.php b/web/public_php/webtt/cake/console/libs/schema.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/schema.php
rename to web/public_php/webtt/cake/console/libs/schema.php
diff --git a/code/web/public_php/webtt/cake/console/libs/shell.php b/web/public_php/webtt/cake/console/libs/shell.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/shell.php
rename to web/public_php/webtt/cake/console/libs/shell.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/bake.php b/web/public_php/webtt/cake/console/libs/tasks/bake.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/bake.php
rename to web/public_php/webtt/cake/console/libs/tasks/bake.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/controller.php b/web/public_php/webtt/cake/console/libs/tasks/controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/controller.php
rename to web/public_php/webtt/cake/console/libs/tasks/controller.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/db_config.php b/web/public_php/webtt/cake/console/libs/tasks/db_config.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/db_config.php
rename to web/public_php/webtt/cake/console/libs/tasks/db_config.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/extract.php b/web/public_php/webtt/cake/console/libs/tasks/extract.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/extract.php
rename to web/public_php/webtt/cake/console/libs/tasks/extract.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/fixture.php b/web/public_php/webtt/cake/console/libs/tasks/fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/fixture.php
rename to web/public_php/webtt/cake/console/libs/tasks/fixture.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/model.php b/web/public_php/webtt/cake/console/libs/tasks/model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/model.php
rename to web/public_php/webtt/cake/console/libs/tasks/model.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/plugin.php b/web/public_php/webtt/cake/console/libs/tasks/plugin.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/plugin.php
rename to web/public_php/webtt/cake/console/libs/tasks/plugin.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/project.php b/web/public_php/webtt/cake/console/libs/tasks/project.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/project.php
rename to web/public_php/webtt/cake/console/libs/tasks/project.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/template.php b/web/public_php/webtt/cake/console/libs/tasks/template.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/template.php
rename to web/public_php/webtt/cake/console/libs/tasks/template.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/test.php b/web/public_php/webtt/cake/console/libs/tasks/test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/test.php
rename to web/public_php/webtt/cake/console/libs/tasks/test.php
diff --git a/code/web/public_php/webtt/cake/console/libs/tasks/view.php b/web/public_php/webtt/cake/console/libs/tasks/view.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/tasks/view.php
rename to web/public_php/webtt/cake/console/libs/tasks/view.php
diff --git a/code/web/public_php/webtt/cake/console/libs/testsuite.php b/web/public_php/webtt/cake/console/libs/testsuite.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/libs/testsuite.php
rename to web/public_php/webtt/cake/console/libs/testsuite.php
diff --git a/code/web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp b/web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp
rename to web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/classes/controller.ctp b/web/public_php/webtt/cake/console/templates/default/classes/controller.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/classes/controller.ctp
rename to web/public_php/webtt/cake/console/templates/default/classes/controller.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp b/web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp
rename to web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/classes/model.ctp b/web/public_php/webtt/cake/console/templates/default/classes/model.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/classes/model.ctp
rename to web/public_php/webtt/cake/console/templates/default/classes/model.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/classes/test.ctp b/web/public_php/webtt/cake/console/templates/default/classes/test.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/classes/test.ctp
rename to web/public_php/webtt/cake/console/templates/default/classes/test.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/views/form.ctp b/web/public_php/webtt/cake/console/templates/default/views/form.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/views/form.ctp
rename to web/public_php/webtt/cake/console/templates/default/views/form.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/views/home.ctp b/web/public_php/webtt/cake/console/templates/default/views/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/views/home.ctp
rename to web/public_php/webtt/cake/console/templates/default/views/home.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/views/index.ctp b/web/public_php/webtt/cake/console/templates/default/views/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/views/index.ctp
rename to web/public_php/webtt/cake/console/templates/default/views/index.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/default/views/view.ctp b/web/public_php/webtt/cake/console/templates/default/views/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/default/views/view.ctp
rename to web/public_php/webtt/cake/console/templates/default/views/view.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/.htaccess b/web/public_php/webtt/cake/console/templates/skel/.htaccess
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/.htaccess
rename to web/public_php/webtt/cake/console/templates/skel/.htaccess
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/app_controller.php b/web/public_php/webtt/cake/console/templates/skel/app_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/app_controller.php
rename to web/public_php/webtt/cake/console/templates/skel/app_controller.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/app_helper.php b/web/public_php/webtt/cake/console/templates/skel/app_helper.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/app_helper.php
rename to web/public_php/webtt/cake/console/templates/skel/app_helper.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/app_model.php b/web/public_php/webtt/cake/console/templates/skel/app_model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/app_model.php
rename to web/public_php/webtt/cake/console/templates/skel/app_model.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php b/web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php
rename to web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php b/web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php
rename to web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/core.php b/web/public_php/webtt/cake/console/templates/skel/config/core.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/core.php
rename to web/public_php/webtt/cake/console/templates/skel/config/core.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/database.php.default b/web/public_php/webtt/cake/console/templates/skel/config/database.php.default
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/database.php.default
rename to web/public_php/webtt/cake/console/templates/skel/config/database.php.default
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/routes.php b/web/public_php/webtt/cake/console/templates/skel/config/routes.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/routes.php
rename to web/public_php/webtt/cake/console/templates/skel/config/routes.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php b/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql b/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php b/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql b/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php b/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql b/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql
rename to web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/controllers/components/empty b/web/public_php/webtt/cake/console/templates/skel/controllers/components/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/controllers/components/empty
rename to web/public_php/webtt/cake/console/templates/skel/controllers/components/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php b/web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php
rename to web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/index.php b/web/public_php/webtt/cake/console/templates/skel/index.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/index.php
rename to web/public_php/webtt/cake/console/templates/skel/index.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/libs/empty b/web/public_php/webtt/cake/console/templates/skel/libs/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/libs/empty
rename to web/public_php/webtt/cake/console/templates/skel/libs/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty b/web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty
rename to web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty b/web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty
rename to web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/models/datasources/empty b/web/public_php/webtt/cake/console/templates/skel/models/datasources/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/models/datasources/empty
rename to web/public_php/webtt/cake/console/templates/skel/models/datasources/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/plugins/empty b/web/public_php/webtt/cake/console/templates/skel/plugins/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/plugins/empty
rename to web/public_php/webtt/cake/console/templates/skel/plugins/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty b/web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty b/web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tests/groups/empty b/web/public_php/webtt/cake/console/templates/skel/tests/groups/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tests/groups/empty
rename to web/public_php/webtt/cake/console/templates/skel/tests/groups/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty b/web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty
rename to web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty b/web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty
rename to web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/elements/empty b/web/public_php/webtt/cake/console/templates/skel/views/elements/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/elements/empty
rename to web/public_php/webtt/cake/console/templates/skel/views/elements/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/errors/empty b/web/public_php/webtt/cake/console/templates/skel/views/errors/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/errors/empty
rename to web/public_php/webtt/cake/console/templates/skel/views/errors/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/helpers/empty b/web/public_php/webtt/cake/console/templates/skel/views/helpers/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/helpers/empty
rename to web/public_php/webtt/cake/console/templates/skel/views/helpers/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp b/web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp
rename to web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/pages/empty b/web/public_php/webtt/cake/console/templates/skel/views/pages/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/pages/empty
rename to web/public_php/webtt/cake/console/templates/skel/views/pages/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty b/web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty
rename to web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess b/web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess
rename to web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/css.php b/web/public_php/webtt/cake/console/templates/skel/webroot/css.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/css.php
rename to web/public_php/webtt/cake/console/templates/skel/webroot/css.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css b/web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css
rename to web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico b/web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico
rename to web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png b/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png
rename to web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif b/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif
rename to web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/index.php b/web/public_php/webtt/cake/console/templates/skel/webroot/index.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/index.php
rename to web/public_php/webtt/cake/console/templates/skel/webroot/index.php
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/js/empty b/web/public_php/webtt/cake/console/templates/skel/webroot/js/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/js/empty
rename to web/public_php/webtt/cake/console/templates/skel/webroot/js/empty
diff --git a/code/web/public_php/webtt/cake/console/templates/skel/webroot/test.php b/web/public_php/webtt/cake/console/templates/skel/webroot/test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/console/templates/skel/webroot/test.php
rename to web/public_php/webtt/cake/console/templates/skel/webroot/test.php
diff --git a/code/web/public_php/webtt/cake/dispatcher.php b/web/public_php/webtt/cake/dispatcher.php
similarity index 100%
rename from code/web/public_php/webtt/cake/dispatcher.php
rename to web/public_php/webtt/cake/dispatcher.php
diff --git a/code/web/public_php/webtt/cake/libs/cache.php b/web/public_php/webtt/cake/libs/cache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cache.php
rename to web/public_php/webtt/cake/libs/cache.php
diff --git a/code/web/public_php/webtt/cake/libs/cache/apc.php b/web/public_php/webtt/cake/libs/cache/apc.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cache/apc.php
rename to web/public_php/webtt/cake/libs/cache/apc.php
diff --git a/code/web/public_php/webtt/cake/libs/cache/file.php b/web/public_php/webtt/cake/libs/cache/file.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cache/file.php
rename to web/public_php/webtt/cake/libs/cache/file.php
diff --git a/code/web/public_php/webtt/cake/libs/cache/memcache.php b/web/public_php/webtt/cake/libs/cache/memcache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cache/memcache.php
rename to web/public_php/webtt/cake/libs/cache/memcache.php
diff --git a/code/web/public_php/webtt/cake/libs/cache/xcache.php b/web/public_php/webtt/cake/libs/cache/xcache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cache/xcache.php
rename to web/public_php/webtt/cake/libs/cache/xcache.php
diff --git a/code/web/public_php/webtt/cake/libs/cake_log.php b/web/public_php/webtt/cake/libs/cake_log.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cake_log.php
rename to web/public_php/webtt/cake/libs/cake_log.php
diff --git a/code/web/public_php/webtt/cake/libs/cake_session.php b/web/public_php/webtt/cake/libs/cake_session.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cake_session.php
rename to web/public_php/webtt/cake/libs/cake_session.php
diff --git a/code/web/public_php/webtt/cake/libs/cake_socket.php b/web/public_php/webtt/cake/libs/cake_socket.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/cake_socket.php
rename to web/public_php/webtt/cake/libs/cake_socket.php
diff --git a/code/web/public_php/webtt/cake/libs/class_registry.php b/web/public_php/webtt/cake/libs/class_registry.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/class_registry.php
rename to web/public_php/webtt/cake/libs/class_registry.php
diff --git a/code/web/public_php/webtt/cake/libs/configure.php b/web/public_php/webtt/cake/libs/configure.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/configure.php
rename to web/public_php/webtt/cake/libs/configure.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/app_controller.php b/web/public_php/webtt/cake/libs/controller/app_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/app_controller.php
rename to web/public_php/webtt/cake/libs/controller/app_controller.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/component.php b/web/public_php/webtt/cake/libs/controller/component.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/component.php
rename to web/public_php/webtt/cake/libs/controller/component.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/acl.php b/web/public_php/webtt/cake/libs/controller/components/acl.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/acl.php
rename to web/public_php/webtt/cake/libs/controller/components/acl.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/auth.php b/web/public_php/webtt/cake/libs/controller/components/auth.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/auth.php
rename to web/public_php/webtt/cake/libs/controller/components/auth.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/cookie.php b/web/public_php/webtt/cake/libs/controller/components/cookie.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/cookie.php
rename to web/public_php/webtt/cake/libs/controller/components/cookie.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/email.php b/web/public_php/webtt/cake/libs/controller/components/email.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/email.php
rename to web/public_php/webtt/cake/libs/controller/components/email.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/request_handler.php b/web/public_php/webtt/cake/libs/controller/components/request_handler.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/request_handler.php
rename to web/public_php/webtt/cake/libs/controller/components/request_handler.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/security.php b/web/public_php/webtt/cake/libs/controller/components/security.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/security.php
rename to web/public_php/webtt/cake/libs/controller/components/security.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/components/session.php b/web/public_php/webtt/cake/libs/controller/components/session.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/components/session.php
rename to web/public_php/webtt/cake/libs/controller/components/session.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/controller.php b/web/public_php/webtt/cake/libs/controller/controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/controller.php
rename to web/public_php/webtt/cake/libs/controller/controller.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/pages_controller.php b/web/public_php/webtt/cake/libs/controller/pages_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/pages_controller.php
rename to web/public_php/webtt/cake/libs/controller/pages_controller.php
diff --git a/code/web/public_php/webtt/cake/libs/controller/scaffold.php b/web/public_php/webtt/cake/libs/controller/scaffold.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/controller/scaffold.php
rename to web/public_php/webtt/cake/libs/controller/scaffold.php
diff --git a/code/web/public_php/webtt/cake/libs/debugger.php b/web/public_php/webtt/cake/libs/debugger.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/debugger.php
rename to web/public_php/webtt/cake/libs/debugger.php
diff --git a/code/web/public_php/webtt/cake/libs/error.php b/web/public_php/webtt/cake/libs/error.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/error.php
rename to web/public_php/webtt/cake/libs/error.php
diff --git a/code/web/public_php/webtt/cake/libs/file.php b/web/public_php/webtt/cake/libs/file.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/file.php
rename to web/public_php/webtt/cake/libs/file.php
diff --git a/code/web/public_php/webtt/cake/libs/folder.php b/web/public_php/webtt/cake/libs/folder.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/folder.php
rename to web/public_php/webtt/cake/libs/folder.php
diff --git a/code/web/public_php/webtt/cake/libs/http_socket.php b/web/public_php/webtt/cake/libs/http_socket.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/http_socket.php
rename to web/public_php/webtt/cake/libs/http_socket.php
diff --git a/code/web/public_php/webtt/cake/libs/i18n.php b/web/public_php/webtt/cake/libs/i18n.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/i18n.php
rename to web/public_php/webtt/cake/libs/i18n.php
diff --git a/code/web/public_php/webtt/cake/libs/inflector.php b/web/public_php/webtt/cake/libs/inflector.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/inflector.php
rename to web/public_php/webtt/cake/libs/inflector.php
diff --git a/code/web/public_php/webtt/cake/libs/l10n.php b/web/public_php/webtt/cake/libs/l10n.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/l10n.php
rename to web/public_php/webtt/cake/libs/l10n.php
diff --git a/code/web/public_php/webtt/cake/libs/log/file_log.php b/web/public_php/webtt/cake/libs/log/file_log.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/log/file_log.php
rename to web/public_php/webtt/cake/libs/log/file_log.php
diff --git a/code/web/public_php/webtt/cake/libs/magic_db.php b/web/public_php/webtt/cake/libs/magic_db.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/magic_db.php
rename to web/public_php/webtt/cake/libs/magic_db.php
diff --git a/code/web/public_php/webtt/cake/libs/model/app_model.php b/web/public_php/webtt/cake/libs/model/app_model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/app_model.php
rename to web/public_php/webtt/cake/libs/model/app_model.php
diff --git a/code/web/public_php/webtt/cake/libs/model/behaviors/acl.php b/web/public_php/webtt/cake/libs/model/behaviors/acl.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/behaviors/acl.php
rename to web/public_php/webtt/cake/libs/model/behaviors/acl.php
diff --git a/code/web/public_php/webtt/cake/libs/model/behaviors/containable.php b/web/public_php/webtt/cake/libs/model/behaviors/containable.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/behaviors/containable.php
rename to web/public_php/webtt/cake/libs/model/behaviors/containable.php
diff --git a/code/web/public_php/webtt/cake/libs/model/behaviors/translate.php b/web/public_php/webtt/cake/libs/model/behaviors/translate.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/behaviors/translate.php
rename to web/public_php/webtt/cake/libs/model/behaviors/translate.php
diff --git a/code/web/public_php/webtt/cake/libs/model/behaviors/tree.php b/web/public_php/webtt/cake/libs/model/behaviors/tree.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/behaviors/tree.php
rename to web/public_php/webtt/cake/libs/model/behaviors/tree.php
diff --git a/code/web/public_php/webtt/cake/libs/model/cake_schema.php b/web/public_php/webtt/cake/libs/model/cake_schema.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/cake_schema.php
rename to web/public_php/webtt/cake/libs/model/cake_schema.php
diff --git a/code/web/public_php/webtt/cake/libs/model/connection_manager.php b/web/public_php/webtt/cake/libs/model/connection_manager.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/connection_manager.php
rename to web/public_php/webtt/cake/libs/model/connection_manager.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/datasource.php b/web/public_php/webtt/cake/libs/model/datasources/datasource.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/datasource.php
rename to web/public_php/webtt/cake/libs/model/datasources/datasource.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php b/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
diff --git a/code/web/public_php/webtt/cake/libs/model/datasources/dbo_source.php b/web/public_php/webtt/cake/libs/model/datasources/dbo_source.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/datasources/dbo_source.php
rename to web/public_php/webtt/cake/libs/model/datasources/dbo_source.php
diff --git a/code/web/public_php/webtt/cake/libs/model/db_acl.php b/web/public_php/webtt/cake/libs/model/db_acl.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/db_acl.php
rename to web/public_php/webtt/cake/libs/model/db_acl.php
diff --git a/code/web/public_php/webtt/cake/libs/model/model.php b/web/public_php/webtt/cake/libs/model/model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/model.php
rename to web/public_php/webtt/cake/libs/model/model.php
diff --git a/code/web/public_php/webtt/cake/libs/model/model_behavior.php b/web/public_php/webtt/cake/libs/model/model_behavior.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/model/model_behavior.php
rename to web/public_php/webtt/cake/libs/model/model_behavior.php
diff --git a/code/web/public_php/webtt/cake/libs/multibyte.php b/web/public_php/webtt/cake/libs/multibyte.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/multibyte.php
rename to web/public_php/webtt/cake/libs/multibyte.php
diff --git a/code/web/public_php/webtt/cake/libs/object.php b/web/public_php/webtt/cake/libs/object.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/object.php
rename to web/public_php/webtt/cake/libs/object.php
diff --git a/code/web/public_php/webtt/cake/libs/overloadable.php b/web/public_php/webtt/cake/libs/overloadable.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/overloadable.php
rename to web/public_php/webtt/cake/libs/overloadable.php
diff --git a/code/web/public_php/webtt/cake/libs/overloadable_php4.php b/web/public_php/webtt/cake/libs/overloadable_php4.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/overloadable_php4.php
rename to web/public_php/webtt/cake/libs/overloadable_php4.php
diff --git a/code/web/public_php/webtt/cake/libs/overloadable_php5.php b/web/public_php/webtt/cake/libs/overloadable_php5.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/overloadable_php5.php
rename to web/public_php/webtt/cake/libs/overloadable_php5.php
diff --git a/code/web/public_php/webtt/cake/libs/router.php b/web/public_php/webtt/cake/libs/router.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/router.php
rename to web/public_php/webtt/cake/libs/router.php
diff --git a/code/web/public_php/webtt/cake/libs/sanitize.php b/web/public_php/webtt/cake/libs/sanitize.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/sanitize.php
rename to web/public_php/webtt/cake/libs/sanitize.php
diff --git a/code/web/public_php/webtt/cake/libs/security.php b/web/public_php/webtt/cake/libs/security.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/security.php
rename to web/public_php/webtt/cake/libs/security.php
diff --git a/code/web/public_php/webtt/cake/libs/set.php b/web/public_php/webtt/cake/libs/set.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/set.php
rename to web/public_php/webtt/cake/libs/set.php
diff --git a/code/web/public_php/webtt/cake/libs/string.php b/web/public_php/webtt/cake/libs/string.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/string.php
rename to web/public_php/webtt/cake/libs/string.php
diff --git a/code/web/public_php/webtt/cake/libs/validation.php b/web/public_php/webtt/cake/libs/validation.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/validation.php
rename to web/public_php/webtt/cake/libs/validation.php
diff --git a/code/web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp b/web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp
rename to web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp b/web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp
rename to web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp b/web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp
rename to web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/error404.ctp b/web/public_php/webtt/cake/libs/view/errors/error404.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/error404.ctp
rename to web/public_php/webtt/cake/libs/view/errors/error404.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/error500.ctp b/web/public_php/webtt/cake/libs/view/errors/error500.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/error500.ctp
rename to web/public_php/webtt/cake/libs/view/errors/error500.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_action.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_action.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_action.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_action.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_model.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_model.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_model.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_model.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_table.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_table.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_table.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_table.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/missing_view.ctp b/web/public_php/webtt/cake/libs/view/errors/missing_view.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/missing_view.ctp
rename to web/public_php/webtt/cake/libs/view/errors/missing_view.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/private_action.ctp b/web/public_php/webtt/cake/libs/view/errors/private_action.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/private_action.ctp
rename to web/public_php/webtt/cake/libs/view/errors/private_action.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp b/web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp
rename to web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/helper.php b/web/public_php/webtt/cake/libs/view/helper.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helper.php
rename to web/public_php/webtt/cake/libs/view/helper.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/ajax.php b/web/public_php/webtt/cake/libs/view/helpers/ajax.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/ajax.php
rename to web/public_php/webtt/cake/libs/view/helpers/ajax.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/app_helper.php b/web/public_php/webtt/cake/libs/view/helpers/app_helper.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/app_helper.php
rename to web/public_php/webtt/cake/libs/view/helpers/app_helper.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/cache.php b/web/public_php/webtt/cake/libs/view/helpers/cache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/cache.php
rename to web/public_php/webtt/cake/libs/view/helpers/cache.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/form.php b/web/public_php/webtt/cake/libs/view/helpers/form.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/form.php
rename to web/public_php/webtt/cake/libs/view/helpers/form.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/html.php b/web/public_php/webtt/cake/libs/view/helpers/html.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/html.php
rename to web/public_php/webtt/cake/libs/view/helpers/html.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/javascript.php b/web/public_php/webtt/cake/libs/view/helpers/javascript.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/javascript.php
rename to web/public_php/webtt/cake/libs/view/helpers/javascript.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php b/web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php
rename to web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/js.php b/web/public_php/webtt/cake/libs/view/helpers/js.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/js.php
rename to web/public_php/webtt/cake/libs/view/helpers/js.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php b/web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php
rename to web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/number.php b/web/public_php/webtt/cake/libs/view/helpers/number.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/number.php
rename to web/public_php/webtt/cake/libs/view/helpers/number.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/paginator.php b/web/public_php/webtt/cake/libs/view/helpers/paginator.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/paginator.php
rename to web/public_php/webtt/cake/libs/view/helpers/paginator.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php b/web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php
rename to web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/rss.php b/web/public_php/webtt/cake/libs/view/helpers/rss.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/rss.php
rename to web/public_php/webtt/cake/libs/view/helpers/rss.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/session.php b/web/public_php/webtt/cake/libs/view/helpers/session.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/session.php
rename to web/public_php/webtt/cake/libs/view/helpers/session.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/text.php b/web/public_php/webtt/cake/libs/view/helpers/text.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/text.php
rename to web/public_php/webtt/cake/libs/view/helpers/text.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/time.php b/web/public_php/webtt/cake/libs/view/helpers/time.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/time.php
rename to web/public_php/webtt/cake/libs/view/helpers/time.php
diff --git a/code/web/public_php/webtt/cake/libs/view/helpers/xml.php b/web/public_php/webtt/cake/libs/view/helpers/xml.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/helpers/xml.php
rename to web/public_php/webtt/cake/libs/view/helpers/xml.php
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/ajax.ctp b/web/public_php/webtt/cake/libs/view/layouts/ajax.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/ajax.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/ajax.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/flash.ctp b/web/public_php/webtt/cake/libs/view/layouts/flash.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/flash.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/flash.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/js/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/js/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/js/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/js/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp b/web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp
rename to web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/media.php b/web/public_php/webtt/cake/libs/view/media.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/media.php
rename to web/public_php/webtt/cake/libs/view/media.php
diff --git a/code/web/public_php/webtt/cake/libs/view/pages/home.ctp b/web/public_php/webtt/cake/libs/view/pages/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/pages/home.ctp
rename to web/public_php/webtt/cake/libs/view/pages/home.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp b/web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp
rename to web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/scaffolds/index.ctp b/web/public_php/webtt/cake/libs/view/scaffolds/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/scaffolds/index.ctp
rename to web/public_php/webtt/cake/libs/view/scaffolds/index.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/scaffolds/view.ctp b/web/public_php/webtt/cake/libs/view/scaffolds/view.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/scaffolds/view.ctp
rename to web/public_php/webtt/cake/libs/view/scaffolds/view.ctp
diff --git a/code/web/public_php/webtt/cake/libs/view/theme.php b/web/public_php/webtt/cake/libs/view/theme.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/theme.php
rename to web/public_php/webtt/cake/libs/view/theme.php
diff --git a/code/web/public_php/webtt/cake/libs/view/view.php b/web/public_php/webtt/cake/libs/view/view.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/view/view.php
rename to web/public_php/webtt/cake/libs/view/view.php
diff --git a/code/web/public_php/webtt/cake/libs/xml.php b/web/public_php/webtt/cake/libs/xml.php
similarity index 100%
rename from code/web/public_php/webtt/cake/libs/xml.php
rename to web/public_php/webtt/cake/libs/xml.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/basics.test.php b/web/public_php/webtt/cake/tests/cases/basics.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/basics.test.php
rename to web/public_php/webtt/cake/tests/cases/basics.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/cake.test.php b/web/public_php/webtt/cake/tests/cases/console/cake.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/cake.test.php
rename to web/public_php/webtt/cake/tests/cases/console/cake.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/api.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/api.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/api.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/api.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php b/web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php
rename to web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/dispatcher.test.php b/web/public_php/webtt/cake/tests/cases/dispatcher.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/dispatcher.test.php
rename to web/public_php/webtt/cake/tests/cases/dispatcher.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cache.test.php b/web/public_php/webtt/cake/tests/cases/libs/cache.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cache.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cache.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php b/web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php b/web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php b/web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php b/web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php b/web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php b/web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php b/web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php b/web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php b/web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php b/web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php b/web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/configure.test.php b/web/public_php/webtt/cake/tests/cases/libs/configure.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/configure.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/configure.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php b/web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/debugger.test.php b/web/public_php/webtt/cake/tests/cases/libs/debugger.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/debugger.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/debugger.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/error.test.php b/web/public_php/webtt/cake/tests/cases/libs/error.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/error.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/error.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/file.test.php b/web/public_php/webtt/cake/tests/cases/libs/file.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/file.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/file.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/folder.test.php b/web/public_php/webtt/cake/tests/cases/libs/folder.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/folder.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/folder.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php b/web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/i18n.test.php b/web/public_php/webtt/cake/tests/cases/libs/i18n.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/i18n.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/i18n.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/inflector.test.php b/web/public_php/webtt/cake/tests/cases/libs/inflector.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/inflector.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/inflector.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/l10n.test.php b/web/public_php/webtt/cake/tests/cases/libs/l10n.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/l10n.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/l10n.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php b/web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php b/web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php b/web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/model/models.php b/web/public_php/webtt/cake/tests/cases/libs/model/models.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/model/models.php
rename to web/public_php/webtt/cake/tests/cases/libs/model/models.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php b/web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/object.test.php b/web/public_php/webtt/cake/tests/cases/libs/object.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/object.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/object.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php b/web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/router.test.php b/web/public_php/webtt/cake/tests/cases/libs/router.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/router.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/router.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php b/web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/security.test.php b/web/public_php/webtt/cake/tests/cases/libs/security.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/security.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/security.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/set.test.php b/web/public_php/webtt/cake/tests/cases/libs/set.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/set.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/set.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/string.test.php b/web/public_php/webtt/cake/tests/cases/libs/string.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/string.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/string.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php b/web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/validation.test.php b/web/public_php/webtt/cake/tests/cases/libs/validation.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/validation.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/validation.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/media.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/media.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/media.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/media.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/view/view.test.php b/web/public_php/webtt/cake/tests/cases/libs/view/view.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/view/view.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/view/view.test.php
diff --git a/code/web/public_php/webtt/cake/tests/cases/libs/xml.test.php b/web/public_php/webtt/cake/tests/cases/libs/xml.test.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/cases/libs/xml.test.php
rename to web/public_php/webtt/cake/tests/cases/libs/xml.test.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/account_fixture.php b/web/public_php/webtt/cake/tests/fixtures/account_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/account_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/account_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aco_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aco_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aco_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aco_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/ad_fixture.php b/web/public_php/webtt/cake/tests/fixtures/ad_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/ad_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/ad_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php b/web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php b/web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/apple_fixture.php b/web/public_php/webtt/cake/tests/fixtures/apple_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/apple_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/apple_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aro_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aro_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aro_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aro_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php b/web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php b/web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php b/web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php b/web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php b/web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php b/web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/author_fixture.php b/web/public_php/webtt/cake/tests/fixtures/author_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/author_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/author_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/basket_fixture.php b/web/public_php/webtt/cake/tests/fixtures/basket_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/basket_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/basket_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/bid_fixture.php b/web/public_php/webtt/cake/tests/fixtures/bid_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/bid_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/bid_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php b/web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/book_fixture.php b/web/public_php/webtt/cake/tests/fixtures/book_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/book_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/book_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php b/web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/callback_fixture.php b/web/public_php/webtt/cake/tests/fixtures/callback_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/callback_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/callback_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php b/web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/category_fixture.php b/web/public_php/webtt/cake/tests/fixtures/category_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/category_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/category_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php b/web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/cd_fixture.php b/web/public_php/webtt/cake/tests/fixtures/cd_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/cd_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/cd_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/comment_fixture.php b/web/public_php/webtt/cake/tests/fixtures/comment_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/comment_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/comment_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php b/web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/content_fixture.php b/web/public_php/webtt/cake/tests/fixtures/content_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/content_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/content_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php b/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php b/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php b/web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php b/web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php b/web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/device_fixture.php b/web/public_php/webtt/cake/tests/fixtures/device_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/device_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/device_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php b/web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php b/web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php b/web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/document_fixture.php b/web/public_php/webtt/cake/tests/fixtures/document_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/document_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/document_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php b/web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php b/web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/featured_fixture.php b/web/public_php/webtt/cake/tests/fixtures/featured_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/featured_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/featured_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php b/web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php b/web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php b/web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php b/web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/home_fixture.php b/web/public_php/webtt/cake/tests/fixtures/home_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/home_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/home_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/image_fixture.php b/web/public_php/webtt/cake/tests/fixtures/image_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/image_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/image_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/item_fixture.php b/web/public_php/webtt/cake/tests/fixtures/item_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/item_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/item_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php b/web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php b/web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/message_fixture.php b/web/public_php/webtt/cake/tests/fixtures/message_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/message_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/message_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php b/web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php b/web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php b/web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php b/web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php b/web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/node_fixture.php b/web/public_php/webtt/cake/tests/fixtures/node_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/node_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/node_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php b/web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php b/web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php b/web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/person_fixture.php b/web/public_php/webtt/cake/tests/fixtures/person_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/person_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/person_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php b/web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/post_fixture.php b/web/public_php/webtt/cake/tests/fixtures/post_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/post_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/post_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php b/web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/product_fixture.php b/web/public_php/webtt/cake/tests/fixtures/product_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/product_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/product_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php b/web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/project_fixture.php b/web/public_php/webtt/cake/tests/fixtures/project_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/project_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/project_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/sample_fixture.php b/web/public_php/webtt/cake/tests/fixtures/sample_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/sample_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/sample_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php b/web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/session_fixture.php b/web/public_php/webtt/cake/tests/fixtures/session_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/session_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/session_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php b/web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/something_fixture.php b/web/public_php/webtt/cake/tests/fixtures/something_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/something_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/something_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/story_fixture.php b/web/public_php/webtt/cake/tests/fixtures/story_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/story_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/story_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php b/web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php b/web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php b/web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/thread_fixture.php b/web/public_php/webtt/cake/tests/fixtures/thread_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/thread_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/thread_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translate_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translate_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translate_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translate_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php b/web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php b/web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php b/web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/user_fixture.php b/web/public_php/webtt/cake/tests/fixtures/user_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/user_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/user_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php b/web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php
rename to web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/acl.group.php b/web/public_php/webtt/cake/tests/groups/acl.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/acl.group.php
rename to web/public_php/webtt/cake/tests/groups/acl.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/bake.group.php b/web/public_php/webtt/cake/tests/groups/bake.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/bake.group.php
rename to web/public_php/webtt/cake/tests/groups/bake.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/behaviors.group.php b/web/public_php/webtt/cake/tests/groups/behaviors.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/behaviors.group.php
rename to web/public_php/webtt/cake/tests/groups/behaviors.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/cache.group.php b/web/public_php/webtt/cake/tests/groups/cache.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/cache.group.php
rename to web/public_php/webtt/cake/tests/groups/cache.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/components.group.php b/web/public_php/webtt/cake/tests/groups/components.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/components.group.php
rename to web/public_php/webtt/cake/tests/groups/components.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/configure.group.php b/web/public_php/webtt/cake/tests/groups/configure.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/configure.group.php
rename to web/public_php/webtt/cake/tests/groups/configure.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/console.group.php b/web/public_php/webtt/cake/tests/groups/console.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/console.group.php
rename to web/public_php/webtt/cake/tests/groups/console.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/controller.group.php b/web/public_php/webtt/cake/tests/groups/controller.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/controller.group.php
rename to web/public_php/webtt/cake/tests/groups/controller.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/database.group.php b/web/public_php/webtt/cake/tests/groups/database.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/database.group.php
rename to web/public_php/webtt/cake/tests/groups/database.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/helpers.group.php b/web/public_php/webtt/cake/tests/groups/helpers.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/helpers.group.php
rename to web/public_php/webtt/cake/tests/groups/helpers.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/i18n.group.php b/web/public_php/webtt/cake/tests/groups/i18n.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/i18n.group.php
rename to web/public_php/webtt/cake/tests/groups/i18n.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/javascript.group.php b/web/public_php/webtt/cake/tests/groups/javascript.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/javascript.group.php
rename to web/public_php/webtt/cake/tests/groups/javascript.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/lib.group.php b/web/public_php/webtt/cake/tests/groups/lib.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/lib.group.php
rename to web/public_php/webtt/cake/tests/groups/lib.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/model.group.php b/web/public_php/webtt/cake/tests/groups/model.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/model.group.php
rename to web/public_php/webtt/cake/tests/groups/model.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php b/web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php
rename to web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/routing_system.group.php b/web/public_php/webtt/cake/tests/groups/routing_system.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/routing_system.group.php
rename to web/public_php/webtt/cake/tests/groups/routing_system.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/socket.group.php b/web/public_php/webtt/cake/tests/groups/socket.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/socket.group.php
rename to web/public_php/webtt/cake/tests/groups/socket.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/test_suite.group.php b/web/public_php/webtt/cake/tests/groups/test_suite.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/test_suite.group.php
rename to web/public_php/webtt/cake/tests/groups/test_suite.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/view.group.php b/web/public_php/webtt/cake/tests/groups/view.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/view.group.php
rename to web/public_php/webtt/cake/tests/groups/view.group.php
diff --git a/code/web/public_php/webtt/cake/tests/groups/xml.group.php b/web/public_php/webtt/cake/tests/groups/xml.group.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/groups/xml.group.php
rename to web/public_php/webtt/cake/tests/groups/xml.group.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/cake_test_case.php b/web/public_php/webtt/cake/tests/lib/cake_test_case.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/cake_test_case.php
rename to web/public_php/webtt/cake/tests/lib/cake_test_case.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/cake_test_fixture.php b/web/public_php/webtt/cake/tests/lib/cake_test_fixture.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/cake_test_fixture.php
rename to web/public_php/webtt/cake/tests/lib/cake_test_fixture.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/cake_test_model.php b/web/public_php/webtt/cake/tests/lib/cake_test_model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/cake_test_model.php
rename to web/public_php/webtt/cake/tests/lib/cake_test_model.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php b/web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php
rename to web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/cake_web_test_case.php b/web/public_php/webtt/cake/tests/lib/cake_web_test_case.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/cake_web_test_case.php
rename to web/public_php/webtt/cake/tests/lib/cake_web_test_case.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/code_coverage_manager.php b/web/public_php/webtt/cake/tests/lib/code_coverage_manager.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/code_coverage_manager.php
rename to web/public_php/webtt/cake/tests/lib/code_coverage_manager.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php b/web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php
rename to web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php b/web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php
rename to web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php b/web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php
rename to web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php b/web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php
rename to web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/templates/footer.php b/web/public_php/webtt/cake/tests/lib/templates/footer.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/templates/footer.php
rename to web/public_php/webtt/cake/tests/lib/templates/footer.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/templates/header.php b/web/public_php/webtt/cake/tests/lib/templates/header.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/templates/header.php
rename to web/public_php/webtt/cake/tests/lib/templates/header.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/templates/menu.php b/web/public_php/webtt/cake/tests/lib/templates/menu.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/templates/menu.php
rename to web/public_php/webtt/cake/tests/lib/templates/menu.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/templates/simpletest.php b/web/public_php/webtt/cake/tests/lib/templates/simpletest.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/templates/simpletest.php
rename to web/public_php/webtt/cake/tests/lib/templates/simpletest.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/templates/xdebug.php b/web/public_php/webtt/cake/tests/lib/templates/xdebug.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/templates/xdebug.php
rename to web/public_php/webtt/cake/tests/lib/templates/xdebug.php
diff --git a/code/web/public_php/webtt/cake/tests/lib/test_manager.php b/web/public_php/webtt/cake/tests/lib/test_manager.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/lib/test_manager.php
rename to web/public_php/webtt/cake/tests/lib/test_manager.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/config/acl.ini.php b/web/public_php/webtt/cake/tests/test_app/config/acl.ini.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/config/acl.ini.php
rename to web/public_php/webtt/cake/tests/test_app/config/acl.ini.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/controllers/components/empty b/web/public_php/webtt/cake/tests/test_app/controllers/components/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/controllers/components/empty
rename to web/public_php/webtt/cake/tests/test_app/controllers/components/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php b/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php
rename to web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php
rename to web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php b/web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php
rename to web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/libs/library.php b/web/public_php/webtt/cake/tests/test_app/libs/library.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/libs/library.php
rename to web/public_php/webtt/cake/tests/test_app/libs/library.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php b/web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php
rename to web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
rename to web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
rename to web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME b/web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME
rename to web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po b/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME b/web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME
rename to web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
rename to web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME b/web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME
rename to web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/empty b/web/public_php/webtt/cake/tests/test_app/models/behaviors/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/behaviors/empty
rename to web/public_php/webtt/cake/tests/test_app/models/behaviors/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php
rename to web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php
rename to web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/comment.php b/web/public_php/webtt/cake/tests/test_app/models/comment.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/comment.php
rename to web/public_php/webtt/cake/tests/test_app/models/comment.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php b/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php
rename to web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php b/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php
rename to web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/persister_one.php b/web/public_php/webtt/cake/tests/test_app/models/persister_one.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/persister_one.php
rename to web/public_php/webtt/cake/tests/test_app/models/persister_one.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/persister_two.php b/web/public_php/webtt/cake/tests/test_app/models/persister_two.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/persister_two.php
rename to web/public_php/webtt/cake/tests/test_app/models/persister_two.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/models/post.php b/web/public_php/webtt/cake/tests/test_app/models/post.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/models/post.php
rename to web/public_php/webtt/cake/tests/test_app/models/post.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
rename to web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
rename to web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
rename to web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/tmp/dir_map b/web/public_php/webtt/cake/tests/test_app/tmp/dir_map
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/tmp/dir_map
rename to web/public_php/webtt/cake/tests/test_app/tmp/dir_map
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php b/web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php b/web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css b/web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css
rename to web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg b/web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg
rename to web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php b/web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty b/web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty
rename to web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php b/web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/vendors/welcome.php b/web/public_php/webtt/cake/tests/test_app/vendors/welcome.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/vendors/welcome.php
rename to web/public_php/webtt/cake/tests/test_app/vendors/welcome.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/empty b/web/public_php/webtt/cake/tests/test_app/views/elements/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/empty
rename to web/public_php/webtt/cake/tests/test_app/views/elements/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp b/web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/errors/empty b/web/public_php/webtt/cake/tests/test_app/views/errors/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/errors/empty
rename to web/public_php/webtt/cake/tests/test_app/views/errors/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php b/web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php
rename to web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/helpers/empty b/web/public_php/webtt/cake/tests/test_app/views/helpers/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/helpers/empty
rename to web/public_php/webtt/cake/tests/test_app/views/helpers/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/pages/empty b/web/public_php/webtt/cake/tests/test_app/views/pages/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/pages/empty
rename to web/public_php/webtt/cake/tests/test_app/views/pages/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp b/web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp b/web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty b/web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty
rename to web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp b/web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
diff --git a/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf b/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
rename to web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
diff --git a/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css b/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
rename to web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css b/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
rename to web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
diff --git a/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif b/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
rename to web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
diff --git a/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg b/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
similarity index 100%
rename from code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
rename to web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
diff --git a/code/web/public_php/webtt/docs/INSTALL b/web/public_php/webtt/docs/INSTALL
similarity index 100%
rename from code/web/public_php/webtt/docs/INSTALL
rename to web/public_php/webtt/docs/INSTALL
diff --git a/code/web/public_php/webtt/docs/db/CakePHP_Associations b/web/public_php/webtt/docs/db/CakePHP_Associations
similarity index 100%
rename from code/web/public_php/webtt/docs/db/CakePHP_Associations
rename to web/public_php/webtt/docs/db/CakePHP_Associations
diff --git a/code/web/public_php/webtt/docs/db/erd.png b/web/public_php/webtt/docs/db/erd.png
similarity index 100%
rename from code/web/public_php/webtt/docs/db/erd.png
rename to web/public_php/webtt/docs/db/erd.png
diff --git a/code/web/public_php/webtt/docs/db/webtt2.db b/web/public_php/webtt/docs/db/webtt2.db
similarity index 100%
rename from code/web/public_php/webtt/docs/db/webtt2.db
rename to web/public_php/webtt/docs/db/webtt2.db
diff --git a/code/web/public_php/webtt/index.php b/web/public_php/webtt/index.php
similarity index 100%
rename from code/web/public_php/webtt/index.php
rename to web/public_php/webtt/index.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/.gitignore b/web/public_php/webtt/plugins/debug_kit/.gitignore
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/.gitignore
rename to web/public_php/webtt/plugins/debug_kit/.gitignore
diff --git a/code/web/public_php/webtt/plugins/debug_kit/README.mdown b/web/public_php/webtt/plugins/debug_kit/README.mdown
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/README.mdown
rename to web/public_php/webtt/plugins/debug_kit/README.mdown
diff --git a/code/web/public_php/webtt/plugins/debug_kit/build.py b/web/public_php/webtt/plugins/debug_kit/build.py
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/build.py
rename to web/public_php/webtt/plugins/debug_kit/build.py
diff --git a/code/web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php b/web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php
rename to web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php b/web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php
rename to web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php b/web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php
rename to web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php b/web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php
rename to web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot b/web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot
rename to web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot
diff --git a/code/web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po b/web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po
rename to web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po
diff --git a/code/web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po b/web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po
rename to web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po
diff --git a/code/web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php b/web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php
rename to web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php b/web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php
rename to web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php b/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php
rename to web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php b/web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php
rename to web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php b/web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php
rename to web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php b/web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php
rename to web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp b/web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp
rename to web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php b/web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php
rename to web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php b/web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php
rename to web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php b/web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php
rename to web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php b/web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php
rename to web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/debug.php b/web/public_php/webtt/plugins/debug_kit/views/debug.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/debug.php
rename to web/public_php/webtt/plugins/debug_kit/views/debug.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp b/web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php b/web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php
rename to web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php b/web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php
rename to web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php b/web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php
rename to web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php b/web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php
rename to web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp b/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp b/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp
rename to web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp
diff --git a/code/web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css b/web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css
rename to web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css
diff --git a/code/web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png b/web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png
rename to web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png
diff --git a/code/web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js b/web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js
similarity index 100%
rename from code/web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js
rename to web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js
diff --git a/code/web/public_php/webtt/plugins/empty b/web/public_php/webtt/plugins/empty
similarity index 100%
rename from code/web/public_php/webtt/plugins/empty
rename to web/public_php/webtt/plugins/empty
diff --git a/code/web/public_php/webtt/vendors/shells/tasks/empty b/web/public_php/webtt/vendors/shells/tasks/empty
similarity index 100%
rename from code/web/public_php/webtt/vendors/shells/tasks/empty
rename to web/public_php/webtt/vendors/shells/tasks/empty
diff --git a/code/web/public_php/webtt/vendors/shells/templates/empty b/web/public_php/webtt/vendors/shells/templates/empty
similarity index 100%
rename from code/web/public_php/webtt/vendors/shells/templates/empty
rename to web/public_php/webtt/vendors/shells/templates/empty
diff --git a/code/web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
rename to web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
diff --git a/code/web/public_php/webtt/vendors/simpletest/LICENSE b/web/public_php/webtt/vendors/simpletest/LICENSE
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/LICENSE
rename to web/public_php/webtt/vendors/simpletest/LICENSE
diff --git a/code/web/public_php/webtt/vendors/simpletest/README b/web/public_php/webtt/vendors/simpletest/README
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/README
rename to web/public_php/webtt/vendors/simpletest/README
diff --git a/code/web/public_php/webtt/vendors/simpletest/VERSION b/web/public_php/webtt/vendors/simpletest/VERSION
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/VERSION
rename to web/public_php/webtt/vendors/simpletest/VERSION
diff --git a/code/web/public_php/webtt/vendors/simpletest/authentication.php b/web/public_php/webtt/vendors/simpletest/authentication.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/authentication.php
rename to web/public_php/webtt/vendors/simpletest/authentication.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/autorun.php b/web/public_php/webtt/vendors/simpletest/autorun.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/autorun.php
rename to web/public_php/webtt/vendors/simpletest/autorun.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/browser.php b/web/public_php/webtt/vendors/simpletest/browser.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/browser.php
rename to web/public_php/webtt/vendors/simpletest/browser.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/collector.php b/web/public_php/webtt/vendors/simpletest/collector.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/collector.php
rename to web/public_php/webtt/vendors/simpletest/collector.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/compatibility.php b/web/public_php/webtt/vendors/simpletest/compatibility.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/compatibility.php
rename to web/public_php/webtt/vendors/simpletest/compatibility.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/cookies.php b/web/public_php/webtt/vendors/simpletest/cookies.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/cookies.php
rename to web/public_php/webtt/vendors/simpletest/cookies.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/default_reporter.php b/web/public_php/webtt/vendors/simpletest/default_reporter.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/default_reporter.php
rename to web/public_php/webtt/vendors/simpletest/default_reporter.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/detached.php b/web/public_php/webtt/vendors/simpletest/detached.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/detached.php
rename to web/public_php/webtt/vendors/simpletest/detached.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/docs.css b/web/public_php/webtt/vendors/simpletest/docs/en/docs.css
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/docs.css
rename to web/public_php/webtt/vendors/simpletest/docs/en/docs.css
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/index.html b/web/public_php/webtt/vendors/simpletest/docs/en/index.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/index.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/index.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/overview.html b/web/public_php/webtt/vendors/simpletest/docs/en/overview.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/overview.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/overview.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/docs.css b/web/public_php/webtt/vendors/simpletest/docs/fr/docs.css
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/docs.css
rename to web/public_php/webtt/vendors/simpletest/docs/fr/docs.css
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/index.html b/web/public_php/webtt/vendors/simpletest/docs/fr/index.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/index.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/index.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/overview.html b/web/public_php/webtt/vendors/simpletest/docs/fr/overview.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/overview.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/overview.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html b/web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html
rename to web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html
diff --git a/code/web/public_php/webtt/vendors/simpletest/dumper.php b/web/public_php/webtt/vendors/simpletest/dumper.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/dumper.php
rename to web/public_php/webtt/vendors/simpletest/dumper.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/eclipse.php b/web/public_php/webtt/vendors/simpletest/eclipse.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/eclipse.php
rename to web/public_php/webtt/vendors/simpletest/eclipse.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/encoding.php b/web/public_php/webtt/vendors/simpletest/encoding.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/encoding.php
rename to web/public_php/webtt/vendors/simpletest/encoding.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/errors.php b/web/public_php/webtt/vendors/simpletest/errors.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/errors.php
rename to web/public_php/webtt/vendors/simpletest/errors.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/exceptions.php b/web/public_php/webtt/vendors/simpletest/exceptions.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/exceptions.php
rename to web/public_php/webtt/vendors/simpletest/exceptions.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/expectation.php b/web/public_php/webtt/vendors/simpletest/expectation.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/expectation.php
rename to web/public_php/webtt/vendors/simpletest/expectation.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php b/web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php
rename to web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/extensions/testdox.php b/web/public_php/webtt/vendors/simpletest/extensions/testdox.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/extensions/testdox.php
rename to web/public_php/webtt/vendors/simpletest/extensions/testdox.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php b/web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php
rename to web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/form.php b/web/public_php/webtt/vendors/simpletest/form.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/form.php
rename to web/public_php/webtt/vendors/simpletest/form.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/frames.php b/web/public_php/webtt/vendors/simpletest/frames.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/frames.php
rename to web/public_php/webtt/vendors/simpletest/frames.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/http.php b/web/public_php/webtt/vendors/simpletest/http.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/http.php
rename to web/public_php/webtt/vendors/simpletest/http.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/invoker.php b/web/public_php/webtt/vendors/simpletest/invoker.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/invoker.php
rename to web/public_php/webtt/vendors/simpletest/invoker.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/mock_objects.php b/web/public_php/webtt/vendors/simpletest/mock_objects.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/mock_objects.php
rename to web/public_php/webtt/vendors/simpletest/mock_objects.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/page.php b/web/public_php/webtt/vendors/simpletest/page.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/page.php
rename to web/public_php/webtt/vendors/simpletest/page.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/php_parser.php b/web/public_php/webtt/vendors/simpletest/php_parser.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/php_parser.php
rename to web/public_php/webtt/vendors/simpletest/php_parser.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/reflection_php4.php b/web/public_php/webtt/vendors/simpletest/reflection_php4.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/reflection_php4.php
rename to web/public_php/webtt/vendors/simpletest/reflection_php4.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/reflection_php5.php b/web/public_php/webtt/vendors/simpletest/reflection_php5.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/reflection_php5.php
rename to web/public_php/webtt/vendors/simpletest/reflection_php5.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/remote.php b/web/public_php/webtt/vendors/simpletest/remote.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/remote.php
rename to web/public_php/webtt/vendors/simpletest/remote.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/reporter.php b/web/public_php/webtt/vendors/simpletest/reporter.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/reporter.php
rename to web/public_php/webtt/vendors/simpletest/reporter.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/scorer.php b/web/public_php/webtt/vendors/simpletest/scorer.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/scorer.php
rename to web/public_php/webtt/vendors/simpletest/scorer.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/selector.php b/web/public_php/webtt/vendors/simpletest/selector.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/selector.php
rename to web/public_php/webtt/vendors/simpletest/selector.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/shell_tester.php b/web/public_php/webtt/vendors/simpletest/shell_tester.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/shell_tester.php
rename to web/public_php/webtt/vendors/simpletest/shell_tester.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/simpletest.php b/web/public_php/webtt/vendors/simpletest/simpletest.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/simpletest.php
rename to web/public_php/webtt/vendors/simpletest/simpletest.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/socket.php b/web/public_php/webtt/vendors/simpletest/socket.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/socket.php
rename to web/public_php/webtt/vendors/simpletest/socket.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/tag.php b/web/public_php/webtt/vendors/simpletest/tag.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/tag.php
rename to web/public_php/webtt/vendors/simpletest/tag.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/test_case.php b/web/public_php/webtt/vendors/simpletest/test_case.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/test_case.php
rename to web/public_php/webtt/vendors/simpletest/test_case.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/tidy_parser.php b/web/public_php/webtt/vendors/simpletest/tidy_parser.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/tidy_parser.php
rename to web/public_php/webtt/vendors/simpletest/tidy_parser.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/unit_tester.php b/web/public_php/webtt/vendors/simpletest/unit_tester.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/unit_tester.php
rename to web/public_php/webtt/vendors/simpletest/unit_tester.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/url.php b/web/public_php/webtt/vendors/simpletest/url.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/url.php
rename to web/public_php/webtt/vendors/simpletest/url.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/user_agent.php b/web/public_php/webtt/vendors/simpletest/user_agent.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/user_agent.php
rename to web/public_php/webtt/vendors/simpletest/user_agent.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/web_tester.php b/web/public_php/webtt/vendors/simpletest/web_tester.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/web_tester.php
rename to web/public_php/webtt/vendors/simpletest/web_tester.php
diff --git a/code/web/public_php/webtt/vendors/simpletest/xml.php b/web/public_php/webtt/vendors/simpletest/xml.php
similarity index 100%
rename from code/web/public_php/webtt/vendors/simpletest/xml.php
rename to web/public_php/webtt/vendors/simpletest/xml.php

From bc0071ac5709f1b259145db96454b25569cb34a9 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 21 May 2021 00:41:01 +0300
Subject: [PATCH 253/292] Fix issue with single enchant icon on jewels not
 showing

---
 ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 990a406af..94f9c2d33 100644
--- a/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -1168,10 +1168,20 @@ void CDBCtrlSheet::infoReceived()
 				}
 				else if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter())
 				{
-					if (!haveRoot && !brick->getIconBack().empty())
+					if (!haveRoot)
 					{
-						_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor));
-						rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						haveRoot = true;
+						if (brick->getIconBack().empty())
+						{
+							// use blank texture with size from main icon
+							_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName("blank.tga"), NLMISC::CRGBA::White));
+							rVR.getTextureSizeFromId(rVR.getTextureIdFromName(brick->getIcon()), _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						}
+						else
+						{
+							_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor));
+							rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						}
 					}
 					_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor));
 					rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);

From 6d4b58c281e1f7b7e1892e9ece76dfe6d6d31f29 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 3 Jun 2021 06:41:54 +0800
Subject: [PATCH 254/292] Update GPL headers

---
 nel/src/3d/driver/opengl/driver_opengl_extension.cpp       | 2 +-
 nel/src/3d/vegetable_manager.cpp                           | 2 +-
 nel/src/gui/group_menu.cpp                                 | 2 +-
 nel/src/gui/interface_element.cpp                          | 2 +-
 ryzom/client/src/actions.cpp                               | 2 +-
 ryzom/client/src/actions.h                                 | 2 +-
 ryzom/client/src/character_cl.cpp                          | 2 +-
 ryzom/client/src/client_sheets/sbrick_sheet.cpp            | 2 +-
 ryzom/client/src/client_sheets/sbrick_sheet.h              | 2 +-
 ryzom/client/src/connection.cpp                            | 2 +-
 ryzom/client/src/connection.h                              | 2 +-
 ryzom/client/src/game_context_menu.cpp                     | 2 +-
 ryzom/client/src/game_context_menu.h                       | 2 +-
 ryzom/client/src/global.cpp                                | 2 +-
 ryzom/client/src/global.h                                  | 2 +-
 ryzom/client/src/interface_v3/action_handler_debug.cpp     | 2 +-
 ryzom/client/src/interface_v3/action_handler_game.cpp      | 2 +-
 ryzom/client/src/interface_v3/action_handler_move.cpp      | 2 +-
 ryzom/client/src/interface_v3/action_phrase_faber.cpp      | 2 +-
 ryzom/client/src/interface_v3/action_phrase_faber.h        | 2 +-
 ryzom/client/src/interface_v3/bot_chat_page_trade.cpp      | 2 +-
 ryzom/client/src/interface_v3/chat_text_manager.cpp        | 2 +-
 ryzom/client/src/interface_v3/chat_window.cpp              | 2 +-
 ryzom/client/src/interface_v3/group_in_scene_bubble.cpp    | 2 +-
 ryzom/client/src/interface_v3/group_in_scene_user_info.cpp | 2 +-
 ryzom/client/src/interface_v3/group_map.cpp                | 2 +-
 ryzom/client/src/interface_v3/group_map.h                  | 2 +-
 ryzom/client/src/interface_v3/guild_manager.cpp            | 2 +-
 ryzom/client/src/interface_v3/interface_manager.cpp        | 2 +-
 ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp            | 2 +-
 ryzom/client/src/interface_v3/people_interraction.cpp      | 2 +-
 ryzom/client/src/interface_v3/people_list.h                | 2 +-
 ryzom/client/src/net_manager.cpp                           | 2 +-
 ryzom/client/src/progress.cpp                              | 2 +-
 ryzom/client/src/sheet_manager.cpp                         | 2 +-
 ryzom/client/src/user_entity.cpp                           | 2 +-
 ryzom/client/src/user_entity.h                             | 2 +-
 ryzom/common/src/game_share/brick_families.cpp             | 2 +-
 ryzom/common/src/game_share/brick_families.h               | 2 +-
 ryzom/common/src/game_share/player_visual_properties.cpp   | 2 +-
 ryzom/common/src/game_share/player_visual_properties.h     | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index ba6bca5ce..3fa725382 100644
--- a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
diff --git a/nel/src/3d/vegetable_manager.cpp b/nel/src/3d/vegetable_manager.cpp
index 12d96fa07..1bc0701dd 100644
--- a/nel/src/3d/vegetable_manager.cpp
+++ b/nel/src/3d/vegetable_manager.cpp
@@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/nel/src/gui/group_menu.cpp b/nel/src/gui/group_menu.cpp
index f92b645f5..116e114ac 100644
--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/nel/src/gui/interface_element.cpp b/nel/src/gui/interface_element.cpp
index 234ff6101..5ceebdddb 100644
--- a/nel/src/gui/interface_element.cpp
+++ b/nel/src/gui/interface_element.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/actions.cpp b/ryzom/client/src/actions.cpp
index ec54e4cd6..06b0e1d21 100644
--- a/ryzom/client/src/actions.cpp
+++ b/ryzom/client/src/actions.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/actions.h b/ryzom/client/src/actions.h
index b542329ad..7e03452b9 100644
--- a/ryzom/client/src/actions.h
+++ b/ryzom/client/src/actions.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp
index 6678b3ad7..68f8acfcb 100644
--- a/ryzom/client/src/character_cl.cpp
+++ b/ryzom/client/src/character_cl.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
index dadd56253..5f3f0c149 100644
--- a/ryzom/client/src/client_sheets/sbrick_sheet.cpp
+++ b/ryzom/client/src/client_sheets/sbrick_sheet.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/client_sheets/sbrick_sheet.h b/ryzom/client/src/client_sheets/sbrick_sheet.h
index 7c214a42b..78a5eb52d 100644
--- a/ryzom/client/src/client_sheets/sbrick_sheet.h
+++ b/ryzom/client/src/client_sheets/sbrick_sheet.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp
index d2999cc21..222ad6a1e 100644
--- a/ryzom/client/src/connection.cpp
+++ b/ryzom/client/src/connection.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/connection.h b/ryzom/client/src/connection.h
index 4233b6f9a..08e95d99f 100644
--- a/ryzom/client/src/connection.h
+++ b/ryzom/client/src/connection.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 333bd5cde..c3163225d 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/game_context_menu.h b/ryzom/client/src/game_context_menu.h
index 5104aad60..499bd5197 100644
--- a/ryzom/client/src/game_context_menu.h
+++ b/ryzom/client/src/game_context_menu.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/global.cpp b/ryzom/client/src/global.cpp
index e7db5855f..623686f98 100644
--- a/ryzom/client/src/global.cpp
+++ b/ryzom/client/src/global.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/global.h b/ryzom/client/src/global.h
index 8897b3755..ecfa323e0 100644
--- a/ryzom/client/src/global.h
+++ b/ryzom/client/src/global.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/interface_v3/action_handler_debug.cpp b/ryzom/client/src/interface_v3/action_handler_debug.cpp
index 8c8c37a39..2b123bce9 100644
--- a/ryzom/client/src/interface_v3/action_handler_debug.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_debug.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2017  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_game.cpp b/ryzom/client/src/interface_v3/action_handler_game.cpp
index c5bda3e63..60690428f 100644
--- a/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2020  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_handler_move.cpp b/ryzom/client/src/interface_v3/action_handler_move.cpp
index 390574940..848ec780b 100644
--- a/ryzom/client/src/interface_v3/action_handler_move.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_move.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index fb6f4e8ef..7625be010 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2014  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/action_phrase_faber.h b/ryzom/client/src/interface_v3/action_phrase_faber.h
index f406d0ee2..5f10c0c51 100644
--- a/ryzom/client/src/interface_v3/action_phrase_faber.h
+++ b/ryzom/client/src/interface_v3/action_phrase_faber.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 997bfc680..cbc1a30c1 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/chat_text_manager.cpp b/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 1cc434516..e2474b6a2 100644
--- a/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp
index 4d8cba5b3..19e244979 100644
--- a/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/ryzom/client/src/interface_v3/chat_window.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index ed6d2e801..d60a20bf8 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index a44ce8d73..58aad93fa 100644
--- a/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_map.cpp b/ryzom/client/src/interface_v3/group_map.cpp
index c1e19d2cb..3d1902ef2 100644
--- a/ryzom/client/src/interface_v3/group_map.cpp
+++ b/ryzom/client/src/interface_v3/group_map.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2020  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/group_map.h b/ryzom/client/src/interface_v3/group_map.h
index 78cc21e13..5a5d5624e 100644
--- a/ryzom/client/src/interface_v3/group_map.h
+++ b/ryzom/client/src/interface_v3/group_map.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/guild_manager.cpp b/ryzom/client/src/interface_v3/guild_manager.cpp
index 02c382105..83dbbdeea 100644
--- a/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index 931c62375..643ca959e 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2020  Winch Gate Property Limited
+// Copyright (C) 2010-2021  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index ec470d637..1b3ea8c67 100644
--- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/people_interraction.cpp b/ryzom/client/src/interface_v3/people_interraction.cpp
index a2973570c..1424b782c 100644
--- a/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/interface_v3/people_list.h b/ryzom/client/src/interface_v3/people_list.h
index 5b470d401..aebb98673 100644
--- a/ryzom/client/src/interface_v3/people_list.h
+++ b/ryzom/client/src/interface_v3/people_list.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/net_manager.cpp b/ryzom/client/src/net_manager.cpp
index 24877c6c4..549732372 100644
--- a/ryzom/client/src/net_manager.cpp
+++ b/ryzom/client/src/net_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/progress.cpp b/ryzom/client/src/progress.cpp
index ddc74c380..377e06ec7 100644
--- a/ryzom/client/src/progress.cpp
+++ b/ryzom/client/src/progress.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/sheet_manager.cpp b/ryzom/client/src/sheet_manager.cpp
index 8d8045276..838807934 100644
--- a/ryzom/client/src/sheet_manager.cpp
+++ b/ryzom/client/src/sheet_manager.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index 5aa20227c..ca205c6de 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/client/src/user_entity.h b/ryzom/client/src/user_entity.h
index 6b9c0cf5a..7499c5888 100644
--- a/ryzom/client/src/user_entity.h
+++ b/ryzom/client/src/user_entity.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
diff --git a/ryzom/common/src/game_share/brick_families.cpp b/ryzom/common/src/game_share/brick_families.cpp
index 796a2f590..19deb6f7d 100644
--- a/ryzom/common/src/game_share/brick_families.cpp
+++ b/ryzom/common/src/game_share/brick_families.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/brick_families.h b/ryzom/common/src/game_share/brick_families.h
index be5f521d4..8a66c1c6d 100644
--- a/ryzom/common/src/game_share/brick_families.h
+++ b/ryzom/common/src/game_share/brick_families.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/player_visual_properties.cpp b/ryzom/common/src/game_share/player_visual_properties.cpp
index 33f9da0a6..2dde246b2 100644
--- a/ryzom/common/src/game_share/player_visual_properties.cpp
+++ b/ryzom/common/src/game_share/player_visual_properties.cpp
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
diff --git a/ryzom/common/src/game_share/player_visual_properties.h b/ryzom/common/src/game_share/player_visual_properties.h
index 14f245d97..30a223d6d 100644
--- a/ryzom/common/src/game_share/player_visual_properties.h
+++ b/ryzom/common/src/game_share/player_visual_properties.h
@@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as

From a227dccbb8f697c0892b76857a8fd960d4e435a8 Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Thu, 3 Jun 2021 08:49:57 +0800
Subject: [PATCH 255/292] Fix PHP setup script

---
 web/public_php/setup/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/public_php/setup/header.php b/web/public_php/setup/header.php
index cefc30a01..11d64213a 100644
--- a/web/public_php/setup/header.php
+++ b/web/public_php/setup/header.php
@@ -33,7 +33,7 @@ function printalert($type, $message) {
 	print '</div>';
 }
 function is__writable($path) {
-	if ($path{strlen($path) - 1} == '/') {
+	if ($path[strlen($path) - 1] == '/' || $path[strlen($path) - 1] == '\\') {
 		return is__writable($path.uniqid(mt_rand()).'.tmp');
 	}
 

From 8a7e96f7a631135decdcbd46e7038391439bf9bb Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Fri, 4 Jun 2021 18:59:46 +0800
Subject: [PATCH 256/292] Fix crash with bad `parts[next]` index

---
 nel/src/gui/css_style.cpp | 51 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index 01bd812f1..e4a9751fa 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -1039,36 +1039,39 @@ namespace NLGUI
 						// second loop -> false && break
 						loop = !loop;
 
-						val = toLowerAscii(parts[next]);
-						if (val == "center")
-						{
-							if (bgPositionX.empty()) bgPositionX = "center";
-							if (bgPositionY.empty()) bgPositionY = "center";
-							// consume 'center'
-							next++;
-						}
-						else if (val == "left" || val == "right")
+						if (next < parts.size())
 						{
-							bgPositionX = val;
-							// consume 'left|right'
-							next++;
-							if(next < parts.size() && getCssLength(fval, unit, parts[next]))
+							val = toLowerAscii(parts[next]);
+							if (val == "center")
 							{
-								bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
-								// consume css length
+								if (bgPositionX.empty()) bgPositionX = "center";
+								if (bgPositionY.empty()) bgPositionY = "center";
+								// consume 'center'
 								next++;
 							}
-						}
-						else if (val == "top" || val == "bottom")
-						{
-							bgPositionY = val;
-							// consume top|bottom
-							next++;
-							if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+							else if (val == "left" || val == "right")
 							{
-								bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
-								// consume css length
+								bgPositionX = val;
+								// consume 'left|right'
 								next++;
+								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+								{
+									bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
+									// consume css length
+									next++;
+								}
+							}
+							else if (val == "top" || val == "bottom")
+							{
+								bgPositionY = val;
+								// consume top|bottom
+								next++;
+								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+								{
+									bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
+									// consume css length
+									next++;
+								}
 							}
 						}
 					} while (loop);

From 0c5f4cdc1a0c7a5dd508b11d3d908254804399c8 Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Tue, 8 Jun 2021 18:10:51 +0800
Subject: [PATCH 257/292] Implement NLNET sleepUntilDataAvailable for Win32
 build

---
 nel/include/nel/net/buf_net_base.h    | 15 +++++++-
 nel/include/nel/net/unified_network.h |  6 ++-
 nel/src/net/buf_net_base.cpp          | 14 +++++--
 nel/src/net/unified_network.cpp       | 54 +++++++++++++++++++++------
 4 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/nel/include/nel/net/buf_net_base.h b/nel/include/nel/net/buf_net_base.h
index 26e35a5ce..88e7aad66 100644
--- a/nel/include/nel/net/buf_net_base.h
+++ b/nel/include/nel/net/buf_net_base.h
@@ -56,6 +56,10 @@ extern uint32 	NbNetworkTask;
 enum TPipeWay { PipeRead, PipeWrite };
 #endif
 
+#ifdef NL_OS_WINDOWS
+typedef void *HANDLE;
+#endif
+
 
 /**
  * Layer 1
@@ -78,7 +82,7 @@ public:
 	/// Destructor
 	virtual ~CBufNetBase();
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	/** Init the pipe for data available with an external pipe.
 	 * Call it only if you set initPipeForDataAvailable to false in the constructor.
 	 * Then don't call sleepUntilDataAvailable() but use select() on the pipe.
@@ -89,6 +93,11 @@ public:
 		_DataAvailablePipeHandle[PipeRead] = twoPipeHandles[PipeRead];
 		_DataAvailablePipeHandle[PipeWrite] = twoPipeHandles[PipeWrite];
 	}
+#elif defined(NL_OS_WINDOWS)
+	void setExternalPipeForDataAvailable(HANDLE eventHandle)
+	{
+		_DataAvailableHandle = eventHandle;
+	}
 #endif
 
 	/// Sets callback for detecting a disconnection (or NULL to disable callback)
@@ -201,9 +210,11 @@ protected:
 	/// Return _DataAvailable
 	bool				dataAvailableFlag() const { return _DataAvailable; }
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	/// Pipe to select() on data available
 	int					_DataAvailablePipeHandle [2];
+#elif defined(NL_OS_WINDOWS)
+	HANDLE				_DataAvailableHandle;
 #endif
 
 private:
diff --git a/nel/include/nel/net/unified_network.h b/nel/include/nel/net/unified_network.h
index 094ff7390..a40037e06 100644
--- a/nel/include/nel/net/unified_network.h
+++ b/nel/include/nel/net/unified_network.h
@@ -638,7 +638,7 @@ protected:
 	/// Auto-reconnect
 	void				autoReconnect( CUnifiedConnection &uc, uint connectionIndex );
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX) || defined(NL_OS_WINDOWS)
 	/// Sleep (implemented by select())
 	void				sleepUntilDataAvailable( NLMISC::TTime msecMax );
 #endif
@@ -700,9 +700,11 @@ private:
 	/// for each services, which network to take
 	std::vector<std::string>					_DefaultNetwork;
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	/// Pipe to select() on data available (shared among all connections)
 	int											_MainDataAvailablePipe [2];
+#elif defined(NL_OS_WINDOWS)
+	HANDLE										_MainDataAvailableHandle;
 #endif
 
 	/// Service id of the running service
diff --git a/nel/src/net/buf_net_base.cpp b/nel/src/net/buf_net_base.cpp
index cc6a397aa..eefc22cfc 100644
--- a/nel/src/net/buf_net_base.cpp
+++ b/nel/src/net/buf_net_base.cpp
@@ -57,13 +57,15 @@ CBufNetBase::CBufNetBase() :
 #ifdef MUTEX_DEBUG
 	initAcquireTimeMap();
 #endif
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	_IsDataAvailablePipeSelfManaged = isDataAvailablePipeSelfManaged;
 	if ( _IsDataAvailablePipeSelfManaged )
 	{
 		if ( ::pipe( _DataAvailablePipeHandle ) != 0 )
 			nlwarning( "Unable to create D.A. pipe" );
 	}
+#elif defined(NL_OS_WINDOWS)
+	_DataAvailableHandle = NULL;
 #endif
 }
 
@@ -99,7 +101,7 @@ void	CBufNetBase::pushMessageIntoReceiveQueue( const std::vector<uint8>& buffer
 		//mbsize = recvfifo.value().size() / 1048576;
 		setDataAvailableFlag( true );
 	}
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	// Wake-up main thread (outside the critical section of CFifoAccessor, to allow main thread to be
 	// read the fifo; if the main thread sees the Data Available flag is true but the pipe not written
 	// yet, it will block on read()).
@@ -109,6 +111,9 @@ void	CBufNetBase::pushMessageIntoReceiveQueue( const std::vector<uint8>& buffer
 		nlwarning( "LNETL1: Write pipe failed in pushMessageIntoReceiveQueue" );
 	}
 	//nldebug( "Pipe: 1 byte written (%p)", this );
+#elif defined(NL_OS_WINDOWS)
+	if (_DataAvailableHandle)
+		SetEvent(_DataAvailableHandle);
 #endif
 	//nldebug( "BNB: Released." );
 	//if ( mbsize > 1 )
@@ -131,7 +136,7 @@ void	CBufNetBase::pushMessageIntoReceiveQueue( const uint8 *buffer, uint32 size
 		//nldebug( "BNB: Pushed, releasing the receive queue..." );
 		//mbsize = recvfifo.value().size() / 1048576;
 		setDataAvailableFlag( true );
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 		// Wake-up main thread
 		uint8 b=0;
 		if ( write( _DataAvailablePipeHandle[PipeWrite], &b, 1 ) == -1 )
@@ -139,6 +144,9 @@ void	CBufNetBase::pushMessageIntoReceiveQueue( const uint8 *buffer, uint32 size
 			nlwarning( "LNETL1: Write pipe failed in pushMessageIntoReceiveQueue" );
 		}
 		nldebug( "Pipe: 1 byte written" );
+#elif defined(NL_OS_WINDOWS)
+		if (_DataAvailableHandle)
+			SetEvent(_DataAvailableHandle);
 #endif
 	}
 	//nldebug( "BNB: Released." );
diff --git a/nel/src/net/unified_network.cpp b/nel/src/net/unified_network.cpp
index 0ac8b1c21..d624fcff0 100644
--- a/nel/src/net/unified_network.cpp
+++ b/nel/src/net/unified_network.cpp
@@ -45,8 +45,8 @@ uint32 TotalCallbackCalled = 0;
 
 uint32 TimeInCallback =0;
 
-#ifdef NL_OS_UNIX
-/// Yield method (Unix only)
+#if defined(NL_OS_UNIX) || defined(NL_OS_WINDOWS)
+/// Yield method
 CVariable<uint32> UseYieldMethod("nel", "UseYieldMethod", "0=select 1=usleep 2=nanosleep 3=sched_yield 4=none", 0, 0, true );
 #endif
 
@@ -564,11 +564,15 @@ bool	CUnifiedNetwork::init(const CInetAddress *addr, CCallbackNetBase::TRecordin
 			port = CNamingClient::queryServicePort ();
 	}
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	/// Init the main pipe to select() on data available
 	if ( ::pipe( _MainDataAvailablePipe ) != 0 )
 		nlwarning( "Unable to create main D.A. pipe" );
 	//nldebug( "Pipe: created" );
+#elif defined(NL_OS_WINDOWS)
+	_MainDataAvailableHandle = CreateEventW(NULL, FALSE, FALSE, NULL);
+	if (!_MainDataAvailableHandle)
+		nlwarning("Unable to create main D.A. event");
 #endif
 
 	// setup the server callback only if server port != 0, otherwise there's no server callback
@@ -578,9 +582,11 @@ bool	CUnifiedNetwork::init(const CInetAddress *addr, CCallbackNetBase::TRecordin
 	{
 		nlassert (_CbServer == 0);
 		_CbServer = new CCallbackServer( CCallbackNetBase::Off, "", true, false ); // don't init one pipe per connection
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 		_CbServer->setExternalPipeForDataAvailable( _MainDataAvailablePipe ); // the main pipe is shared for all connections
 		//nldebug( "Pipe: set (server %p)", _CbServer );
+#elif defined(NL_OS_WINDOWS)
+		_CbServer->setExternalPipeForDataAvailable(_MainDataAvailableHandle);
 #endif
 		bool retry = false;
 		do
@@ -754,9 +760,15 @@ void	CUnifiedNetwork::release(bool mustFlushSendQueues, const std::vector<std::s
 	if (CNamingClient::connected ())
 		CNamingClient::disconnect ();
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 	::close( _MainDataAvailablePipe[PipeRead] );
 	::close( _MainDataAvailablePipe[PipeWrite] );
+#elif defined(NL_OS_WINDOWS)
+	if (_MainDataAvailableHandle)
+	{
+		CloseHandle(_MainDataAvailableHandle);
+		_MainDataAvailableHandle = NULL;
+	}
 #endif
 }
 
@@ -856,9 +868,11 @@ void	CUnifiedNetwork::addService(const string &name, const vector<CInetAddress>
 
 		// Create a new connection with the service, setup callback and connect
 		CCallbackClient	*cbc = new CCallbackClient( CCallbackNetBase::Off, "", true, false ); // don't init one pipe per connection
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 		cbc->setExternalPipeForDataAvailable( _MainDataAvailablePipe ); // the main pipe is shared for all connections
 		//nldebug( "Pipe: set (client %p)", cbc );
+#elif defined(NL_OS_WINDOWS)
+		cbc->setExternalPipeForDataAvailable(_MainDataAvailableHandle);
 #endif
 		cbc->setDisconnectionCallback(uncbDisconnection, NULL);
 		cbc->setDefaultCallback(uncbMsgProcessing);
@@ -1147,7 +1161,7 @@ void	CUnifiedNetwork::update(TTime timeout)
 			t0 = currentTime - (timeout - remainingTime);
 		}
 
-#ifdef NL_OS_UNIX
+#if defined(NL_OS_UNIX)
 		// Sleep until the time expires or we receive a message
 		H_BEFORE(L5UpdateSleep);
 		switch ( UseYieldMethod.get() )
@@ -1159,6 +1173,18 @@ void	CUnifiedNetwork::update(TTime timeout)
 		default: break; // don't sleep at all, makes all slow!
 		}
 		H_AFTER(L5UpdateSleep);
+#elif defined(NL_OS_WINDOWS)
+		// Sleep until the time expires or we receive a message
+		H_BEFORE(L5UpdateSleep);
+		switch (UseYieldMethod.get())
+		{
+		case 0: sleepUntilDataAvailable(remainingTime); break; // accurate sleep
+		case 1: nlSleep(1); break;
+		case 2: nlSleep(1); break;
+		case 3: SwitchToThread(); break;
+		default: break; // don't sleep at all, makes all slow!
+		}
+		H_AFTER(L5UpdateSleep);
 #else
 		// Enable windows multithreading before rescanning all connections
 		H_TIME(L5UpdateSleep, nlSleep(1);); // 0 (yield) would be too harmful to other applications
@@ -1222,10 +1248,7 @@ void CUnifiedNetwork::autoReconnect( CUnifiedConnection &uc, uint connectionInde
 	}
 }
 
-#ifdef NL_OS_UNIX
-/*
- *
- */
+#if defined(NL_OS_UNIX)
 void CUnifiedNetwork::sleepUntilDataAvailable( TTime msecMax )
 {
 	// Prevent looping infinitely if an erroneous time was provided
@@ -1249,6 +1272,15 @@ void CUnifiedNetwork::sleepUntilDataAvailable( TTime msecMax )
 		nlwarning( "HNETL5: Select failed in sleepUntilDataAvailable");
 	//nldebug( "Slept %u ms", (uint)(CTime::getLocalTime()-before) );
 }
+#elif defined(NL_OS_WINDOWS)
+void CUnifiedNetwork::sleepUntilDataAvailable(TTime msecMax)
+{
+	if (msecMax > 999)
+		msecMax = 999;
+
+	nlassert(_MainDataAvailableHandle);
+	WaitForSingleObject(_MainDataAvailableHandle, msecMax);
+}
 #endif
 
 

From 19a0d929bbab11c4bee40074f84ebe606e231cf0 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 15 Jun 2021 03:48:09 +0800
Subject: [PATCH 258/292] Exclude commits from attribution

---
 tool/attribution/annotate.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tool/attribution/annotate.py b/tool/attribution/annotate.py
index 40942deea..4d5818857 100644
--- a/tool/attribution/annotate.py
+++ b/tool/attribution/annotate.py
@@ -206,6 +206,9 @@ override_author["43452ea27c6e92488d8bd1417b2aee60d75d8a68"] = "-" # Header
 override_author["8e21fed1e6b79bf92f6364c7cb4f0c56e1dda103"] = "-" # Header cleanup
 override_author["c8e562f37781d62ebc54b68ef74f7693de79a907"] = "-" # Header cleanup
 override_author["dc734ed66226b257becae9fcd140898e14510e6a"] = "-" # Header cleanup
+override_author["a3a074f455a3f52e6fa4d44214f6c34289fa6f8c"] = "-" # Sync
+override_author["141e7c645966ee3475097a75a65def8c9bd7086a"] = "-" # Sync
+override_author["e6a617b8bcd1630dba5fc3b6ae9815775ba2c19d"] = "-" # Sync
 
 # Exclude some paths
 exclude_paths = { }

From 75f490d3944c717c12763e576e31f15dce72dff3 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 18 Aug 2021 14:19:36 +0300
Subject: [PATCH 259/292] Fix comparing same variable twice in CRingAccess

---
 ryzom/common/src/game_share/ring_access.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/common/src/game_share/ring_access.cpp b/ryzom/common/src/game_share/ring_access.cpp
index 1d178efad..5c2f4d6d5 100644
--- a/ryzom/common/src/game_share/ring_access.cpp
+++ b/ryzom/common/src/game_share/ring_access.cpp
@@ -156,7 +156,7 @@ void CRingAccess::init()
 			CXMLAutoPtr sheetClientPtr( (const char*) xmlGetProp(entityAccess, (xmlChar*) "sheetClient") );
 			CXMLAutoPtr sheetPtr( (const char*) xmlGetProp(entityAccess, (xmlChar*) "sheetServer") );
 
-			if (!namePtr.getDatas()|| !packagePtr.getDatas() || !sheetPtr.getDatas() || !sheetPtr.getDatas())
+			if (!namePtr.getDatas()|| !packagePtr.getDatas() || !sheetClientPtr.getDatas() || !sheetPtr.getDatas())
 			{
 				nlerror( "Syntax error in %s", pathFileName.c_str());
 				return;

From 95716b65ca39c016d7cbfdc221a0572766ae620d Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 18 Aug 2021 14:21:43 +0300
Subject: [PATCH 260/292] Fix comparing x twice in Direct3d setupScissor

---
 nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp b/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
index 6e7520fb7..988f9c9eb 100644
--- a/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
+++ b/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp
@@ -283,18 +283,16 @@ void CDriverD3D::setupScissor (const class CScissor& scissor)
 	// Get viewport
 	_ScissorTouched = false;
 	float x= scissor.X;
+	float y= scissor.Y;
 	float width= scissor.Width;
 	float height= scissor.Height;
 
-	if(x==0 && x==0 && width==1 && height==1)
+	if(x==0 && y==0 && width==1 && height==1)
 	{
 		setRenderState (D3DRS_SCISSORTESTENABLE, FALSE);
 	}
 	else
 	{
-
-		float y= scissor.Y;
-
 		if (_HWnd)
 		{
 			// Get the render target size

From 093702a70425c29082558ae2e65e3c88733e7131 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 2 Sep 2021 23:56:12 +0300
Subject: [PATCH 261/292] Fix web link in item customtext being visible

---
 .../src/interface_v3/action_handler_help.cpp       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ryzom/client/src/interface_v3/action_handler_help.cpp b/ryzom/client/src/interface_v3/action_handler_help.cpp
index 3c5f47df6..4417966bb 100644
--- a/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -1907,9 +1907,17 @@ void getItemText (CDBCtrlSheet *item, string &itemText, const CItemSheet*pIS)
 	const	CClientItemInfo	&itemInfo = getInventory().getItemInfo(getInventory().getItemSlotId(item) );
 	if (!itemInfo.CustomText.empty())
 	{
-		strFindReplace(itemText, "%custom_text", "\n@{FFFF}" + itemInfo.CustomText.toUtf8() + "\n");
-		string itemMFC = CI18N::get("uiItemTextMessageFromCrafter");
-		strFindReplace(itemText, "%mfc", itemMFC);
+		std::string text = itemInfo.CustomText.toUtf8();
+		if (text.size() > 3 && text[0]=='@' && ((text[1]=='W' && text[2]=='E' && text[3]=='B') || (text[1]=='L' && text[2]=='U' && text[3]=='A')))
+		{
+			strFindReplace(itemText, "%custom_text", string() );
+		}
+		else
+		{
+			strFindReplace(itemText, "%custom_text", "\n@{FFFF}" + itemInfo.CustomText.toUtf8() + "\n");
+			string itemMFC = CI18N::get("uiItemTextMessageFromCrafter");
+			strFindReplace(itemText, "%mfc", itemMFC);
+		}
 	}
 	else
 		strFindReplace(itemText, "%custom_text", string() );

From cade609a3ad2d2ee0d7012fb748847bc29ff4e98 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 2 Sep 2021 23:54:32 +0300
Subject: [PATCH 262/292] Fix textarea not preserving linebreaks, keep tab char

---
 nel/src/gui/group_html.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 6eeecfdb9..75d7eb64c 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -6668,8 +6668,7 @@ namespace NLGUI
 
 		_TextAreaTemplate = !templateName.empty() ? templateName : DefaultFormTextAreaGroup;
 
-		std::string content = strFindReplaceAll(elm.serializeChilds(), std::string("\t"), std::string(" "));
-		content = strFindReplaceAll(content, std::string("\n"), std::string(" "));
+		std::string content = strFindReplaceAll(elm.serializeChilds(), std::string("\r"), std::string(""));
 
 		CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, content, _TextAreaMaxLength);
 		if (textArea)

From 565932c18d9312ea92f53b4f14809e97709d174e Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 1 Jun 2021 12:46:13 +0300
Subject: [PATCH 263/292] Expand css margin shorthand

---
 nel/include/nel/gui/css_style.h |  5 ++++
 nel/src/gui/css_style.cpp       | 53 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 7a1d11ee5..604fac431 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -72,6 +72,7 @@ namespace NLGUI
 			// background
 			BackgroundColor=NLMISC::CRGBA::Black;
 			BackgroundColorOver=NLMISC::CRGBA::Black;
+			MarginTop = MarginRight = MarginBottom = MarginLeft = 0;
 			PaddingTop = PaddingRight = PaddingBottom = PaddingLeft = 0;
 		}
 
@@ -106,6 +107,7 @@ namespace NLGUI
 		NLMISC::CRGBA BorderTopColor, BorderRightColor, BorderBottomColor, BorderLeftColor;
 		NLMISC::CRGBA BackgroundColor;
 		NLMISC::CRGBA BackgroundColorOver;
+		uint32 MarginTop, MarginRight, MarginBottom, MarginLeft;
 		uint32 PaddingTop, PaddingRight, PaddingBottom, PaddingLeft;
 
 		std::string WhiteSpace;
@@ -177,6 +179,7 @@ namespace NLGUI
 
 		// parse 'padding' into 'padding-top', 'padding-left', etc
 		void expandPaddingShorthand(const std::string &value, TStyle &style) const;
+		void expandMarginShorthand(const std::string &value, TStyle &style) const;
 
 		// expand shorthand rule, ie "border", into longhand names, ie "border-top-width"
 		// if shorthand is present in style, then its removed
@@ -187,6 +190,7 @@ namespace NLGUI
 		void applyBorderColor(const std::string &value, NLMISC::CRGBA *dest, const NLMISC::CRGBA &currentColor, const NLMISC::CRGBA &textColor) const;
 		void applyLineStyle(const std::string &value, CSSLineStyle *dest, const CSSLineStyle &currentStyle) const;
 		void applyPaddingWidth(const std::string &value, uint32 *dest, const uint32 currentPadding, uint32 fontSize) const;
+		void applyMarginWidth(const std::string &value, uint32 *dest, const uint32 current, uint32 fontSize) const;
 
 		// parse and replace var(--name, fallback) function
 		// return false if property should be ignored
@@ -224,6 +228,7 @@ namespace NLGUI
 			Current.BorderTopWidth = Current.BorderRightWidth = Current.BorderBottomWidth = Current.BorderLeftWidth = CSS_LINE_WIDTH_MEDIUM;
 			Current.BorderTopStyle = Current.BorderRightStyle = Current.BorderBottomStyle = Current.BorderLeftStyle = CSS_LINE_STYLE_NONE;
 			Current.BorderTopColor = Current.BorderRightColor = Current.BorderBottomColor = Current.BorderLeftColor = Current.TextColor;
+			Current.MarginTop = Current.MarginRight = Current.MarginBottom = Current.MarginLeft = 0;
 			Current.PaddingTop = Current.PaddingRight = Current.PaddingBottom = Current.PaddingLeft = 0;
 
 			Current.StyleRules.clear();
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index e4a9751fa..c2b4a6ff1 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -606,6 +606,39 @@ namespace NLGUI
 		}
 	}
 
+	void CCssStyle::applyMarginWidth(const std::string &value, uint32 *dest, const uint32 current, uint32 fontSize) const
+	{
+		if (!dest) return;
+
+		if (value == "inherit")
+		{
+			*dest = current;
+			return;
+		}
+		else if (value == "auto")
+		{
+			// TODO: requires content width;
+			*dest = 0;
+			return;
+		}
+
+		float tmpf;
+		std::string unit;
+		if (getCssLength(tmpf, unit, value.c_str()))
+		{
+			if (unit == "rem")
+				*dest = fontSize * tmpf;
+			else if (unit == "em")
+				*dest = fontSize * tmpf;
+			else if (unit == "pt")
+				*dest = tmpf / 0.75f;
+			else if (unit == "%")
+				*dest = 0; // TODO: requires content width, must remember 'unit' type
+			else
+				*dest = tmpf;
+		}
+	}
+
 	// apply style rules
 	void CCssStyle::apply(CStyleParams &style, const CStyleParams &current) const
 	{
@@ -625,6 +658,10 @@ namespace NLGUI
 			else if (it->first == "border-left-width")	 applyBorderWidth(it->second, &style.BorderLeftWidth, current.BorderLeftWidth, current.FontSize);
 			else if (it->first == "border-left-color")	 applyBorderColor(it->second, &style.BorderLeftColor, current.BorderLeftColor, current.TextColor);
 			else if (it->first == "border-left-style")	 applyLineStyle(it->second, &style.BorderLeftStyle, current.BorderLeftStyle);
+			else if (it->first == "margin-top")			 applyMarginWidth(it->second, &style.MarginTop, current.MarginTop, current.FontSize);
+			else if (it->first == "margin-right")		 applyMarginWidth(it->second, &style.MarginRight, current.MarginRight, current.FontSize);
+			else if (it->first == "margin-bottom")		 applyMarginWidth(it->second, &style.MarginBottom, current.MarginBottom, current.FontSize);
+			else if (it->first == "margin-left")		 applyMarginWidth(it->second, &style.MarginLeft, current.MarginLeft, current.FontSize);
 			else if (it->first == "padding-top")		 applyPaddingWidth(it->second, &style.PaddingTop, current.PaddingTop, current.FontSize);
 			else if (it->first == "padding-right")		 applyPaddingWidth(it->second, &style.PaddingRight, current.PaddingRight, current.FontSize);
 			else if (it->first == "padding-bottom")		 applyPaddingWidth(it->second, &style.PaddingBottom, current.PaddingBottom, current.FontSize);
@@ -1556,6 +1593,22 @@ namespace NLGUI
 		style["padding-left"] = parts[l];
 	}
 
+	// ***************************************************************************
+	void CCssStyle::expandMarginShorthand(const std::string &value, TStyle &style) const
+	{
+		std::vector<std::string> parts;
+		splitParams(toLowerAscii(value), ' ', parts);
+
+		uint8 t, r, b, l;
+		if (!getShorthandIndices(parts.size(), t, r, b, l))
+			return;
+
+		style["margin-top"] = parts[t];
+		style["margin-right"] = parts[r];
+		style["margin-bottom"] = parts[b];
+		style["margin-left"] = parts[l];
+	}
+
 	// ***************************************************************************
 	void CCssStyle::expandShorthand(const std::string &prop, const std::string &value, TStyle &style) const
 	{

From a040f7a2a8427113af1b196c44b784a9a9760811 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 10 Jun 2021 12:23:45 +0300
Subject: [PATCH 264/292] CSS background color should not inherit its value

---
 nel/include/nel/gui/css_style.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 604fac431..664d13c64 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -228,6 +228,10 @@ namespace NLGUI
 			Current.BorderTopWidth = Current.BorderRightWidth = Current.BorderBottomWidth = Current.BorderLeftWidth = CSS_LINE_WIDTH_MEDIUM;
 			Current.BorderTopStyle = Current.BorderRightStyle = Current.BorderBottomStyle = Current.BorderLeftStyle = CSS_LINE_STYLE_NONE;
 			Current.BorderTopColor = Current.BorderRightColor = Current.BorderBottomColor = Current.BorderLeftColor = Current.TextColor;
+
+			Current.BackgroundColor = NLMISC::CRGBA::Transparent;
+			Current.BackgroundColorOver = NLMISC::CRGBA::Transparent;
+
 			Current.MarginTop = Current.MarginRight = Current.MarginBottom = Current.MarginLeft = 0;
 			Current.PaddingTop = Current.PaddingRight = Current.PaddingBottom = Current.PaddingLeft = 0;
 

From 63f1fb73dd2b10ad87987f7b866b6dc1869c1be2 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 2 Jun 2021 15:03:08 +0300
Subject: [PATCH 265/292] Fix table background color and image draw order

---
 nel/src/gui/group_table.cpp | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/nel/src/gui/group_table.cpp b/nel/src/gui/group_table.cpp
index 2144d0020..6b1d320aa 100644
--- a/nel/src/gui/group_table.cpp
+++ b/nel/src/gui/group_table.cpp
@@ -514,7 +514,24 @@ namespace NLGUI
 		{
 			CViewRenderer &rVR = *CViewRenderer::getInstance();
 
+			// flush draw queue to force correct draw order for color+image
+			rVR.flush();
+
 			bool flush = false;
+
+			if (BgColor.A > 0)
+			{
+				CRGBA finalColor = BgColor;
+				if (_ModulateGlobalColor)
+					finalColor.modulateFromColor (finalColor, CWidgetManager::getInstance()->getGlobalColor());
+				finalColor.A = (uint8) (((uint16) CurrentAlpha * (uint16) finalColor.A) >> 8);
+
+				if (finalColor.A > 0)
+					rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
+
+				flush = true;
+			}
+
 			if (CurrentAlpha > 0 && !_TextureId.empty())
 			{
 				CRGBA col = CRGBA::White;
@@ -540,19 +557,6 @@ namespace NLGUI
 				flush = true;
 			}
 
-			if (BgColor.A > 0)
-			{
-				CRGBA finalColor = BgColor;
-				if (_ModulateGlobalColor)
-					finalColor.modulateFromColor (finalColor, CWidgetManager::getInstance()->getGlobalColor());
-				finalColor.A = (uint8) (((uint16) CurrentAlpha * (uint16) finalColor.A) >> 8);
-
-				if (finalColor.A > 0)
-					rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
-
-				flush = true;
-			}
-
 			if (flush)
 				rVR.flush();
 		}
@@ -1502,6 +1506,10 @@ namespace NLGUI
 			bool flush = false;
 			CViewRenderer &rVR = *CViewRenderer::getInstance();
 
+			// flush draw queue to force correct draw order for color+image
+			if (BgColor.A >0 || !_TextureId.empty())
+				rVR.flush();
+
 			if (BgColor.A > 0)
 			{
 				CRGBA finalColor = BgColor;
@@ -1539,7 +1547,6 @@ namespace NLGUI
 				flush = true;
 			}
 
-			// flush background color and image
 			if (flush)
 				rVR.flush();
 

From 2133f6d2b767de0e846120d5e0a8221d295cec21 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 3 Jun 2021 13:49:44 +0300
Subject: [PATCH 266/292] Fixed bad type for _RenderLayer

---
 nel/include/nel/gui/css_border_renderer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/include/nel/gui/css_border_renderer.h b/nel/include/nel/gui/css_border_renderer.h
index 1c5db47d4..3e6c3bdc5 100644
--- a/nel/include/nel/gui/css_border_renderer.h
+++ b/nel/include/nel/gui/css_border_renderer.h
@@ -43,7 +43,7 @@ namespace NLGUI
 		NLMISC::CQuadUV _QuadB;
 		NLMISC::CQuadUV _QuadL;
 
-		uint8 _RenderLayer;
+		sint8 _RenderLayer;
 		bool _ModulateGlobalColor;
 
 		// if true, then updateCoords() is called from draw()

From 234465387b1747a5e4be5196995947ea0ed9beff Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 12 Jun 2021 00:11:38 +0300
Subject: [PATCH 267/292] Fix getCssLength returning false for '0'

---
 nel/src/gui/libwww.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
index 362dce8e2..200e7baf1 100644
--- a/nel/src/gui/libwww.cpp
+++ b/nel/src/gui/libwww.cpp
@@ -215,6 +215,13 @@ namespace NLGUI
 			return false;
 		}
 
+		if (len == 1 && str[0] == '0')
+		{
+			value = 0;
+			unit.clear();
+			return true;
+		}
+
 		while(pos < len)
 		{
 			bool isNumeric = (str[pos] >= '0' && str[pos] <= '9')

From b2ec03d1a124486530a13b4596e4a07d5f1471b3 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 3 Jul 2021 23:56:43 +0300
Subject: [PATCH 268/292] Fix background shorthand for -position and -clip

---
 nel/src/gui/css_style.cpp | 44 ++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index c2b4a6ff1..fa80e7b52 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -1075,7 +1075,6 @@ namespace NLGUI
 						// first loop -> true
 						// second loop -> false && break
 						loop = !loop;
-
 						if (next < parts.size())
 						{
 							val = toLowerAscii(parts[next]);
@@ -1086,30 +1085,57 @@ namespace NLGUI
 								// consume 'center'
 								next++;
 							}
-							else if (val == "left" || val == "right")
+							else if ((bgPositionX.empty() || bgPositionX == "center") && (val == "left" || val == "right"))
 							{
 								bgPositionX = val;
 								// consume 'left|right'
 								next++;
 								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
 								{
-									bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
+									bgPositionX += " " + parts[next];
 									// consume css length
 									next++;
 								}
 							}
-							else if (val == "top" || val == "bottom")
+							else if ((bgPositionY.empty() || bgPositionY == "center") && (val == "top" || val == "bottom"))
 							{
 								bgPositionY = val;
 								// consume top|bottom
 								next++;
 								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
 								{
-									bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
+									bgPositionY += " " + parts[next];
 									// consume css length
 									next++;
 								}
 							}
+							else if (getCssLength(fval, unit, parts[next]))
+							{
+								// override X only on first loop
+								if (next == index)
+								{
+									bgPositionX = parts[next];
+								}
+								else if (bgPositionY.empty())
+								{
+									bgPositionY = parts[next];
+								}
+								else
+								{
+									// invalid
+									bgPositionX.clear();
+									bgPositionY.clear();
+									break;
+								}
+								next++;
+							}
+							else
+							{
+								// invalid value
+								bgPositionX.clear();
+								bgPositionY.clear();
+								break;
+							}
 						}
 					} while (loop);
 
@@ -1152,7 +1178,7 @@ namespace NLGUI
 									if (val == "auto")
 										h = v = "auto";
 									else
-										h = v = toString("%.0f%s", fval, unit.c_str());
+										h = v = val;
 
 									next++;
 									if (next < parts.size())
@@ -1161,7 +1187,7 @@ namespace NLGUI
 										if (val == "auto")
 											v = "auto";
 										else if (getCssLength(fval, unit, val))
-											v = toString("%.0f%s", fval, unit.c_str());
+											v = val;
 										else
 											next--; // not size token
 									}
@@ -1244,7 +1270,10 @@ namespace NLGUI
 
 						// first time background-origin is set, also set background-clip
 						if (!bgClipFound)
+						{
 							bgClipValue = val;
+							bgClipFound = true;
+						}
 					}
 				}
 				else if (props[i] == "background-clip")
@@ -1294,6 +1323,7 @@ namespace NLGUI
 			{
 				if (props[i] == "background-position")
 				{
+					style["background-position"] = bgPositionX + " " + bgPositionY;
 					style["background-position-x"] = bgPositionX;
 					style["background-position-y"] = bgPositionY;
 				}

From 5d4a04169bdab9978e9a1bb0060d13a81bff66d7 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 4 Jul 2021 16:56:54 +0300
Subject: [PATCH 269/292] Update getCssLength for new types, enable reading
 negative values.

---
 nel/include/nel/gui/libwww.h |  2 +-
 nel/src/gui/libwww.cpp       | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nel/include/nel/gui/libwww.h b/nel/include/nel/gui/libwww.h
index df9c20cd8..a3d4c25fd 100644
--- a/nel/include/nel/gui/libwww.h
+++ b/nel/include/nel/gui/libwww.h
@@ -184,7 +184,7 @@ namespace NLGUI
 	// ***************************************************************************
 	// Read a CSS length value, return true if one of supported units '%, rem, em, px, pt'
 	// On failure: 'value' and 'unit' values are undefined
-	bool getCssLength (float &value, std::string &unit, const std::string &str);
+	bool getCssLength (float &value, std::string &unit, const std::string &str, bool neg = false);
 
 	// Read a width HTML parameter. "100" or "100%". Returns true if percent (0 ~ 1) else false
 	bool getPercentage (sint32 &width, float &percent, const char *str);
diff --git a/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
index 200e7baf1..02217a541 100644
--- a/nel/src/gui/libwww.cpp
+++ b/nel/src/gui/libwww.cpp
@@ -206,11 +206,15 @@ namespace NLGUI
 	// ***************************************************************************
 
 	// ***************************************************************************
-	bool getCssLength (float &value, std::string &unit, const std::string &str)
+	bool getCssLength (float &value, std::string &unit, const std::string &str, bool neg)
 	{
+		static const std::set<std::string> knownUnits = {
+			"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
+		};
+
 		std::string::size_type pos = 0;
 		std::string::size_type len = str.size();
-		if (len == 1 && str[0] == '.')
+		if (len == 0)
 		{
 			return false;
 		}
@@ -222,6 +226,12 @@ namespace NLGUI
 			return true;
 		}
 
+		// +100px; -100px
+		if (str[0] == '+')
+			pos++;
+		else if (neg && str[0] == '-')
+			pos++;
+
 		while(pos < len)
 		{
 			bool isNumeric = (str[pos] >= '0' && str[pos] <= '9')
@@ -236,7 +246,7 @@ namespace NLGUI
 		}
 
 		unit = toLowerAscii(str.substr(pos));
-		if (unit == "%" || unit == "rem" || unit == "em" || unit == "px" || unit == "pt")
+		if (knownUnits.count(unit))
 		{
 			std::string tmpstr = str.substr(0, pos);
 			return fromString(tmpstr, value);

From 2e816ddf6ed89bc4dc3f58aa47fd614ed1b34654 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 1 Sep 2021 18:10:23 +0300
Subject: [PATCH 270/292] Add "transparent" to html color list

---
 nel/src/gui/libwww.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nel/src/gui/libwww.cpp b/nel/src/gui/libwww.cpp
index 02217a541..5d739863d 100644
--- a/nel/src/gui/libwww.cpp
+++ b/nel/src/gui/libwww.cpp
@@ -628,6 +628,12 @@ namespace NLGUI
 			return false;
 		}
 
+		if (nlstricmp(src, "transparent") == 0)
+		{
+			dest = CRGBA::Transparent;
+			return true;
+		}
+
 		{
 			// slow but should suffice for now
 			for(uint k = 0; k < sizeofarray(htmlColorNameToRGBA); ++k)

From 487f9f060e79019a898ba445d17ceff56510a666 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 23 Aug 2021 11:45:06 +0300
Subject: [PATCH 271/292] Fix css rule declaration splitting

---
 nel/src/gui/css_parser.cpp | 62 +++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/nel/src/gui/css_parser.cpp b/nel/src/gui/css_parser.cpp
index d4980784a..dcc82dfc6 100644
--- a/nel/src/gui/css_parser.cpp
+++ b/nel/src/gui/css_parser.cpp
@@ -41,25 +41,57 @@ namespace NLGUI
 	TStyleVec CCssParser::parseDecls(const std::string &styleString)
 	{
 		TStyleVec styles;
-		std::vector<std::string> elements;
-		NLMISC::splitString(styleString, ";", elements);
-
-		for(uint i = 0; i < elements.size(); ++i)
+		size_t pos = 0;
+		size_t end = styleString.size();
+		while(pos < end)
 		{
-			std::string::size_type pos;
-			pos = elements[i].find_first_of(':');
-			if (pos != std::string::npos)
+			size_t sep = styleString.find(':', pos);
+			if (sep == std::string::npos)
+				break;
+
+			size_t keyIndex = pos;
+			size_t keyLength = sep - pos;
+
+			sep++;
+			pos = sep;
+			while(sep < end)
 			{
-				// css properties are case-insensitive, but
-				// custom properties (--name; ...;) are case sensitive
-				std::string key = trim(elements[i].substr(0, pos));
-				if (key.size() < 2 || (key[0] != '-' && key[1] != '-'))
-					key = toLowerAscii(key);
-				std::string value = trim(elements[i].substr(pos+1));
-				styles.push_back(TStylePair(key, value));
+				sep = styleString.find_first_of(";'\"(", sep);
+				if (sep == std::string::npos || styleString[sep] == ';')
+					break;
+
+				if (styleString[sep] == '\'' || styleString[sep] == '"')
+				{
+					char ch = styleString[sep];
+					// skip open quote
+					sep++;
+					while(sep < end && styleString[sep] != ch)
+					{
+						if (styleString[sep] == '\\')
+							sep++;
+						sep++;
+					}
+					// skip close quote
+					sep++;
+				}
+				else if (styleString[sep] == '(')
+				{
+					while(sep < end && styleString[sep] != ')')
+					{
+						sep++;
+					}
+					// skip close parenthesis
+					sep++;
+				}
 			}
-		}
 
+			styles.push_back(TStylePair(trim(styleString.substr(keyIndex, keyLength)), trim(styleString.substr(pos, sep - pos))));
+
+			if (sep >= end)
+				break;
+
+			pos = sep + 1;
+		}
 		return styles;
 	}
 

From 65edd9f95d0e2bca794b2e0a02fe9f0d58fe5d26 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 15 Jun 2021 12:11:14 +0300
Subject: [PATCH 272/292] Draw double/groove/ridge border styles

---
 nel/include/nel/gui/css_border_renderer.h |  30 +-
 nel/include/nel/gui/css_types.h           |   5 +
 nel/src/gui/css_border_renderer.cpp       | 373 +++++++++++++---------
 nel/src/gui/css_style.cpp                 |  14 +-
 4 files changed, 254 insertions(+), 168 deletions(-)

diff --git a/nel/include/nel/gui/css_border_renderer.h b/nel/include/nel/gui/css_border_renderer.h
index 3e6c3bdc5..b70f1c169 100644
--- a/nel/include/nel/gui/css_border_renderer.h
+++ b/nel/include/nel/gui/css_border_renderer.h
@@ -35,22 +35,24 @@ namespace NLGUI
 	{
 	private:
 		// parent element screen coordinates
-		sint32 _XReal, _YReal;
-		sint32 _WReal, _HReal;
+		sint32 m_XReal, m_YReal;
+		sint32 m_WReal, m_HReal;
 
-		NLMISC::CQuadUV _QuadT;
-		NLMISC::CQuadUV _QuadR;
-		NLMISC::CQuadUV _QuadB;
-		NLMISC::CQuadUV _QuadL;
+		struct SDrawBorder
+		{
+			NLMISC::CQuadUV Quad;
+			NLMISC::CRGBA Color;
+		};
+		std::vector<SDrawBorder> m_DrawBorders;
 
-		sint8 _RenderLayer;
-		bool _ModulateGlobalColor;
+		sint8 m_RenderLayer;
+		bool m_ModulateGlobalColor;
 
 		// if true, then updateCoords() is called from draw()
-		bool _Dirty;
+		bool m_Dirty;
 		// if true, then at least one border is set
-		bool _Border;
-		bool _BorderTop, _BorderRight, _BorderBottom, _BorderLeft;
+		bool m_Border;
+		bool m_BorderTop, m_BorderRight, m_BorderBottom, m_BorderLeft;
 
 	public:
 		uint32        TopWidth, RightWidth, BottomWidth, LeftWidth;
@@ -73,8 +75,8 @@ namespace NLGUI
 		void setColor(const NLMISC::CRGBA &top, const NLMISC::CRGBA &right, const NLMISC::CRGBA &bottom, const NLMISC::CRGBA &left);
 
 		void updateCoords();
-		void invalidateCoords() { _Dirty = _Border = true; }
-		void invalidateContent() { _Dirty = _Border = true; };
+		void invalidateCoords() { m_Dirty = m_Border = true; }
+		void invalidateContent() { m_Dirty = m_Border = true; };
 
 		uint32 getTopWidth() const;
 		uint32 getRightWidth() const;
@@ -84,6 +86,8 @@ namespace NLGUI
 		uint32 getLeftRightWidth() const;
 		uint32 getTopBottomWidth() const;
 
+		bool hasInnerShape(CSSLineStyle style) const;
+
 		void draw();
 	}; // CSSBorderRenderer
 
diff --git a/nel/include/nel/gui/css_types.h b/nel/include/nel/gui/css_types.h
index fd526858e..dd80e308f 100644
--- a/nel/include/nel/gui/css_types.h
+++ b/nel/include/nel/gui/css_types.h
@@ -30,7 +30,12 @@ namespace NLGUI
 	enum CSSLineStyle {
 		CSS_LINE_STYLE_NONE = 0,
 		CSS_LINE_STYLE_HIDDEN,
+		CSS_LINE_STYLE_DOTTED,
+		CSS_LINE_STYLE_DASHED,
 		CSS_LINE_STYLE_SOLID,
+		CSS_LINE_STYLE_DOUBLE,
+		CSS_LINE_STYLE_GROOVE,
+		CSS_LINE_STYLE_RIDGE,
 		CSS_LINE_STYLE_INSET,
 		CSS_LINE_STYLE_OUTSET
 	};
diff --git a/nel/src/gui/css_border_renderer.cpp b/nel/src/gui/css_border_renderer.cpp
index e41d11857..aa44073f4 100644
--- a/nel/src/gui/css_border_renderer.cpp
+++ b/nel/src/gui/css_border_renderer.cpp
@@ -29,8 +29,6 @@ using namespace NLMISC;
 
 namespace NLGUI
 {
-
-
 	// ----------------------------------------------------------------------------
 	CSSBorderRenderer::CSSBorderRenderer()
 	{
@@ -39,56 +37,39 @@ namespace NLGUI
 		TopStyle = RightStyle = BottomStyle = LeftStyle = CSS_LINE_STYLE_SOLID;
 		CurrentAlpha = 255;
 
-		_RenderLayer = 0;
-		_ModulateGlobalColor = false;
-
-		_Border = true;
-		_Dirty = true;
-		_BorderTop = _BorderRight = _BorderBottom = _BorderLeft = false;
-
-		//
-		_QuadT.Uv0.set(0.f, 0.f);
-		_QuadT.Uv1.set(0.f, 0.f);
-		_QuadT.Uv2.set(1.f, 1.f);
-		_QuadT.Uv3.set(0.f, 1.f);
-		//
-		_QuadR.Uv0.set(0.f, 0.f);
-		_QuadR.Uv1.set(0.f, 0.f);
-		_QuadR.Uv2.set(1.f, 1.f);
-		_QuadR.Uv3.set(0.f, 1.f);
-		//
-		_QuadB.Uv0.set(0.f, 0.f);
-		_QuadB.Uv1.set(0.f, 0.f);
-		_QuadB.Uv2.set(1.f, 1.f);
-		_QuadB.Uv3.set(0.f, 1.f);
-		//
-		_QuadL.Uv0.set(0.f, 0.f);
-		_QuadL.Uv1.set(0.f, 0.f);
-		_QuadL.Uv2.set(1.f, 1.f);
-		_QuadL.Uv3.set(0.f, 1.f);
+		m_RenderLayer = 0;
+		m_ModulateGlobalColor = false;
+
+		m_Border = true;
+		m_Dirty = true;
+		m_BorderTop = m_BorderRight = m_BorderBottom = m_BorderLeft = false;
+		m_XReal = 0;
+		m_YReal = 0;
+		m_WReal = 0;
+		m_HReal = 0;
 	}
 
 	// ----------------------------------------------------------------------------
 	void CSSBorderRenderer::setRenderLayer(sint layer)
 	{
-		_RenderLayer = layer;
+		m_RenderLayer = layer;
 	}
 
 	// ----------------------------------------------------------------------------
 	void CSSBorderRenderer::setModulateGlobalColor(bool s)
 	{
-		_ModulateGlobalColor = s;
+		m_ModulateGlobalColor = s;
 	}
 
 	// ----------------------------------------------------------------------------
 	void CSSBorderRenderer::setRect(sint32 x, sint32 y, sint32 w, sint32 h)
 	{
-		_XReal = x;
-		_YReal = y;
-		_WReal = w;
-		_HReal = h;
+		m_XReal = x;
+		m_YReal = y;
+		m_WReal = w;
+		m_HReal = h;
 
-		_Dirty = _Border = (w > 0 && h > 0);
+		m_Dirty = m_Border = (w > 0 && h > 0);
 	}
 
 	// ----------------------------------------------------------------------------
@@ -99,7 +80,7 @@ namespace NLGUI
 		BottomWidth = bottom;
 		LeftWidth = left;
 
-		_Dirty = _Border = (top > 0 || right > 0 || bottom > 0 || left > 0);
+		m_Dirty = m_Border = (top > 0 || right > 0 || bottom > 0 || left > 0);
 	}
 
 	// ----------------------------------------------------------------------------
@@ -110,7 +91,7 @@ namespace NLGUI
 		BottomStyle = bottom;
 		LeftStyle = left;
 
-		_Dirty = _Border = true;
+		m_Dirty = m_Border = true;
 	}
 
 	// ----------------------------------------------------------------------------
@@ -121,7 +102,7 @@ namespace NLGUI
 		BottomColor = bottom;
 		LeftColor = left;
 
-		_Dirty = true;
+		m_Dirty = true;
 	}
 
 	// ----------------------------------------------------------------------------
@@ -173,146 +154,232 @@ namespace NLGUI
 	}
 
 	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::updateCoords()
+	bool CSSBorderRenderer::hasInnerShape(CSSLineStyle style) const
 	{
-		_Dirty = false;
-		if (!_Border) return;
-
-		sint dTop    = getTopWidth();    _BorderTop    = dTop > 0;
-		sint dRight  = getRightWidth();  _BorderRight  = dRight > 0;
-		sint dBottom = getBottomWidth(); _BorderBottom = dBottom > 0;
-		sint dLeft   = getLeftWidth();   _BorderLeft   = dLeft > 0;
-
-		_Border = _BorderTop || _BorderRight || _BorderBottom || _BorderLeft;
-		if (!_Border) return;
+		return style == CSS_LINE_STYLE_DOUBLE ||
+				style == CSS_LINE_STYLE_GROOVE ||
+				style == CSS_LINE_STYLE_RIDGE;
+	}
 
-		if (_BorderTop)
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::updateCoords()
+	{
+		m_Dirty = false;
+		m_DrawBorders.clear();
+		if (!m_Border) return;
+
+		sint dTop    = getTopWidth();    m_BorderTop    = dTop > 0;
+		sint dRight  = getRightWidth();  m_BorderRight  = dRight > 0;
+		sint dBottom = getBottomWidth(); m_BorderBottom = dBottom > 0;
+		sint dLeft   = getLeftWidth();   m_BorderLeft   = dLeft > 0;
+
+		m_Border = m_BorderTop || m_BorderRight || m_BorderBottom || m_BorderLeft;
+		if (!m_Border) return;
+
+		sint xTop = m_YReal + m_HReal;
+		sint xRight = m_XReal + m_WReal;
+
+		sint bLeft = m_XReal + dLeft;
+		sint bRight = xRight - dRight;
+		sint bTop = xTop - dTop;
+		sint bBottom = m_YReal + dBottom;
+
+		SDrawBorder shape;
+		shape.Quad.Uv0.set(0.f, 0.f);
+		shape.Quad.Uv1.set(1.f, 0.f);
+		shape.Quad.Uv2.set(1.f, 1.f);
+		shape.Quad.Uv3.set(0.f, 1.f);
+
+		// V3 - top-left
+		// V2 - top-right
+		// V1 - bottom-right
+		// V0 - bottom-left
+		if (m_BorderTop)
 		{
-			// top-left
-			_QuadT.V3.x = _XReal;
-			_QuadT.V3.y = _YReal + _HReal;
-			// top-right
-			_QuadT.V2.x = _XReal + _WReal;
-			_QuadT.V2.y = _YReal + _HReal;
-			// bottom-right
-			_QuadT.V1.x = _XReal + _WReal - dRight;
-			_QuadT.V1.y = _YReal + _HReal - dTop;
-			// bottom-left
-			_QuadT.V0.x = _XReal + dLeft;
-			_QuadT.V0.y = _YReal + _HReal - dTop;
+			if (TopStyle == CSS_LINE_STYLE_INSET || TopStyle == CSS_LINE_STYLE_GROOVE)
+				shape.Color = blend(TopColor, CRGBA::Black, 0.5f);
+			else
+				shape.Color = TopColor;
+
+			shape.Quad.V3.x = m_XReal; shape.Quad.V3.y = xTop;
+			shape.Quad.V2.x = xRight; shape.Quad.V2.y = xTop;
+			shape.Quad.V1.x = bRight; shape.Quad.V1.y = bTop;
+			shape.Quad.V0.x = bLeft;  shape.Quad.V0.y = bTop;
+			m_DrawBorders.push_back(shape);
+
+			if (hasInnerShape(TopStyle))
+			{
+				float iLeft, iTop, iRight;
+				if (TopStyle == CSS_LINE_STYLE_DOUBLE)
+				{
+					iLeft  = 2*dLeft   / 3.f;
+					iTop   = 2*dBottom / 3.f;
+					iRight = 2*dRight  / 3.f;
+				} else {
+					iLeft  = dLeft  / 2.f;
+					iTop   = dTop   / 2.f;
+					iRight = dRight / 2.f;
+				}
+
+				if (TopStyle == CSS_LINE_STYLE_RIDGE)
+					shape.Color = blend(TopColor, CRGBA::Black, 0.5f);
+				else
+					shape.Color = TopColor;
+
+				// create inner border shape and remove overlapping from outer shape
+				m_DrawBorders.back().Quad.V0.x  -= iLeft; m_DrawBorders.back().Quad.V0.y  += iTop;
+				m_DrawBorders.back().Quad.V1.x  += iRight; m_DrawBorders.back().Quad.V1.y  += iTop;
+				shape.Quad.V3.x += iLeft; shape.Quad.V3.y -= iTop;
+				shape.Quad.V2.x -= iRight; shape.Quad.V2.y -= iTop;
+				m_DrawBorders.push_back(shape);
+			}
 		}
 
-		if (_BorderRight)
+		if (m_BorderBottom)
 		{
-			// top-left
-			_QuadR.V3.x = _XReal + _WReal - dRight;
-			_QuadR.V3.y = _YReal + _HReal - dTop;
-			// top-right
-			_QuadR.V2.x = _XReal + _WReal;
-			_QuadR.V2.y = _YReal + _HReal;
-			// bottom-right
-			_QuadR.V1.x = _XReal + _WReal;
-			_QuadR.V1.y = _YReal;
-			// bottom-left
-			_QuadR.V0.x = _XReal + _WReal - dRight;
-			_QuadR.V0.y = _YReal + dBottom;
+			if (BottomStyle == CSS_LINE_STYLE_OUTSET || BottomStyle == CSS_LINE_STYLE_RIDGE)
+				shape.Color = blend(BottomColor, CRGBA::Black, 0.5f);
+			else
+				shape.Color = BottomColor;
+
+			shape.Quad.V3.x = bLeft; shape.Quad.V3.y = bBottom;
+			shape.Quad.V2.x = bRight; shape.Quad.V2.y = bBottom;
+			shape.Quad.V1.x = xRight; shape.Quad.V1.y = m_YReal;
+			shape.Quad.V0.x = m_XReal; shape.Quad.V0.y = m_YReal;
+			m_DrawBorders.push_back(shape);
+
+			if (hasInnerShape(BottomStyle))
+			{
+				float iLeft, iBottom, iRight;
+				if (BottomStyle == CSS_LINE_STYLE_DOUBLE)
+				{
+					iLeft   = 2*dLeft   / 3.f;
+					iBottom = 2*dBottom / 3.f;
+					iRight  = 2*dRight  / 3.f;
+				}
+				else
+				{
+					iLeft   = dLeft   / 2.f;
+					iBottom = dBottom / 2.f;
+					iRight  = dRight  / 2.f;
+				}
+
+				if (BottomStyle == CSS_LINE_STYLE_GROOVE)
+					shape.Color = blend(shape.Color, CRGBA::Black, 0.5f);
+				else
+					shape.Color = BottomColor;
+
+				m_DrawBorders.back().Quad.V2.x  += iRight;  m_DrawBorders.back().Quad.V2.y -= iBottom;
+				m_DrawBorders.back().Quad.V3.x  -= iLeft;  m_DrawBorders.back().Quad.V3.y -= iBottom;
+				shape.Quad.V1.x -= iRight; shape.Quad.V1.y += iBottom;
+				shape.Quad.V0.x += iLeft; shape.Quad.V0.y += iBottom;
+				m_DrawBorders.push_back(shape);
+			}
 		}
 
-		if (_BorderBottom)
+		if (m_BorderRight)
 		{
-			// top-left
-			_QuadB.V3.x = _XReal + dLeft;
-			_QuadB.V3.y = _YReal + dBottom;
-			// top-right
-			_QuadB.V2.x = _XReal + _WReal - dRight;
-			_QuadB.V2.y = _YReal + dBottom;
-			// bottom-right
-			_QuadB.V1.x = _XReal + _WReal;
-			_QuadB.V1.y = _YReal;
-			// bottom-left
-			_QuadB.V0.x = _XReal;
-			_QuadB.V0.y = _YReal;
+			if (RightStyle == CSS_LINE_STYLE_OUTSET || RightStyle == CSS_LINE_STYLE_RIDGE)
+				shape.Color = blend(RightColor, CRGBA::Black, 0.5f);
+			else
+				shape.Color = RightColor;
+
+			shape.Quad.V3.x = bRight; shape.Quad.V3.y = bTop;
+			shape.Quad.V2.x = xRight; shape.Quad.V2.y = xTop;
+			shape.Quad.V1.x = xRight; shape.Quad.V1.y = m_YReal;
+			shape.Quad.V0.x = bRight; shape.Quad.V0.y = bBottom;
+			m_DrawBorders.push_back(shape);
+
+			if (hasInnerShape(RightStyle))
+			{
+				float iTop, iRight, iBottom;
+				if (RightStyle == CSS_LINE_STYLE_DOUBLE)
+				{
+					iTop = 2*dTop / 3.f;
+					iRight = 2*dRight / 3.f;
+					iBottom = 2*dBottom / 3.f;
+				} else {
+					iTop = dTop / 2.f;
+					iRight = dRight / 2.f;
+					iBottom = dBottom / 2.f;
+				}
+
+				if (RightStyle == CSS_LINE_STYLE_GROOVE)
+					shape.Color = blend(shape.Color, CRGBA::Black, 0.5f);
+				else
+					shape.Color = RightColor;
+
+				m_DrawBorders.back().Quad.V3.x  += iRight;  m_DrawBorders.back().Quad.V3.y += iTop;
+				m_DrawBorders.back().Quad.V0.x  += iRight;  m_DrawBorders.back().Quad.V0.y -= iBottom;
+				shape.Quad.V2.x -= iRight; shape.Quad.V2.y -= iTop;
+				shape.Quad.V1.x -= iRight; shape.Quad.V1.y += iBottom;
+				m_DrawBorders.push_back(shape);
+			}
 		}
 
-		if (_BorderLeft)
+		if (m_BorderLeft)
 		{
-			// top-left
-			_QuadL.V3.x = _XReal;
-			_QuadL.V3.y = _YReal + _HReal;
-			// top-right
-			_QuadL.V2.x = _XReal + dLeft;
-			_QuadL.V2.y = _YReal + _HReal - dTop;
-			// bottom-right
-			_QuadL.V1.x = _XReal + dLeft;
-			_QuadL.V1.y = _YReal + dBottom;
-			// bottom-left
-			_QuadL.V0.x = _XReal;
-			_QuadL.V0.y = _YReal;
+			if (LeftStyle == CSS_LINE_STYLE_INSET || LeftStyle == CSS_LINE_STYLE_GROOVE)
+				shape.Color = blend(LeftColor, CRGBA::Black, 0.5f);
+			else
+				shape.Color = LeftColor;
+
+			shape.Quad.V3.x = m_XReal; shape.Quad.V3.y = xTop;
+			shape.Quad.V2.x = bLeft; shape.Quad.V2.y = bTop;
+			shape.Quad.V1.x = bLeft; shape.Quad.V1.y = bBottom;
+			shape.Quad.V0.x = m_XReal; shape.Quad.V0.y = m_YReal;
+
+			m_DrawBorders.push_back(shape);
+
+			if (hasInnerShape(LeftStyle))
+			{
+				if (LeftStyle == CSS_LINE_STYLE_RIDGE)
+					shape.Color = blend(LeftColor, CRGBA::Black, 0.5f);
+				else
+					shape.Color = LeftColor;
+
+				float iTop, iLeft, iBottom;
+				if (LeftStyle == CSS_LINE_STYLE_DOUBLE)
+				{
+					iTop    = 2*dTop    / 3.f;
+					iLeft   = 2*dLeft   / 3.f;
+					iBottom = 2*dBottom / 3.f;
+				} else {
+					iTop = dTop / 2.f;
+					iLeft = dLeft / 2.f;
+					dBottom = dBottom / 2.f;
+				}
+
+				m_DrawBorders.back().Quad.V2.x  -= iLeft;  m_DrawBorders.back().Quad.V2.y += iTop;
+				m_DrawBorders.back().Quad.V1.x  -= iLeft;  m_DrawBorders.back().Quad.V1.y -= iBottom;
+				shape.Quad.V3.x += iLeft; shape.Quad.V3.y -= iTop;
+				shape.Quad.V0.x += iLeft; shape.Quad.V0.y += iBottom;
+				m_DrawBorders.push_back(shape);
+			}
 		}
 	}
 
 	// ----------------------------------------------------------------------------
 	void CSSBorderRenderer::draw() {
-		if (_Dirty) updateCoords();
-		if (!_Border) return;
+		if (m_Dirty) updateCoords();
+		if (!m_Border) return;
 
 		CViewRenderer &rVR = *CViewRenderer::getInstance();
 
 		// TODO: no need for widget manager, if global color is set from parent
 		CRGBA globalColor;
-		if (_ModulateGlobalColor)
+		if (m_ModulateGlobalColor)
 			globalColor = CWidgetManager::getInstance()->getGlobalColor();
 
-		// TODO: monitor ModulateGlobalColor and CurrentAlpha in table checkCoords and recalculate colors on change only
-		// OUTSET - bottom/right darker than normal (default table style)
-		// INSET  - top/left darker than normal
-		if (_BorderTop)
+		sint32 texId = rVR.getBlankTextureId();
+		for(uint i = 0; i < m_DrawBorders.size(); ++i)
 		{
-			CRGBA borderColorT = TopColor;
-			if (TopStyle == CSS_LINE_STYLE_INSET)
-				borderColorT = blend(borderColorT, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorT.modulateFromColor (borderColorT, globalColor);
-
-			borderColorT.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorT.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadT, rVR.getBlankTextureId(), borderColorT, false);
-		}
-		if (_BorderRight)
-		{
-			CRGBA borderColorR = RightColor;
-			if (RightStyle == CSS_LINE_STYLE_OUTSET)
-				borderColorR = blend(borderColorR, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorR.modulateFromColor (borderColorR, globalColor);
-
-			borderColorR.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorR.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadR, rVR.getBlankTextureId(), borderColorR, false);
-		}
-		if (_BorderBottom)
-		{
-			CRGBA borderColorB = BottomColor;
-			if (BottomStyle == CSS_LINE_STYLE_OUTSET)
-				borderColorB = blend(borderColorB, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorB.modulateFromColor (borderColorB, globalColor);
-
-			borderColorB.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorB.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadB, rVR.getBlankTextureId(), borderColorB, false);
-		}
-		if (_BorderLeft)
-		{
-			CRGBA borderColorL = LeftColor;
-			if (LeftStyle == CSS_LINE_STYLE_INSET)
-				borderColorL = blend(borderColorL, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorL.modulateFromColor (borderColorL, globalColor);
+			CRGBA color = m_DrawBorders[i].Color;
+			if (m_ModulateGlobalColor)
+				color.modulateFromColor (color, globalColor);
 
-			borderColorL.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorL.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadL, rVR.getBlankTextureId(), borderColorL, false);
+			color.A = (uint8) (((uint16) CurrentAlpha * (uint16) color.A) >> 8);
+			rVR.drawQuad(m_RenderLayer, m_DrawBorders[i].Quad, texId, color, false);
 		}
 	}
 
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index fa80e7b52..c7dae35ad 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -571,12 +571,22 @@ namespace NLGUI
 			*dest = CSS_LINE_STYLE_NONE;
 		else if (value == "hidden")
 			*dest = CSS_LINE_STYLE_HIDDEN;
+		else if (value == "dotted")
+			*dest = CSS_LINE_STYLE_DOTTED;
+		else if (value == "dashed")
+			*dest = CSS_LINE_STYLE_DASHED;
+		else if (value == "solid")
+			*dest = CSS_LINE_STYLE_SOLID;
+		else if (value == "double")
+			*dest = CSS_LINE_STYLE_DOUBLE;
+		else if (value == "groove")
+			*dest = CSS_LINE_STYLE_GROOVE;
+		else if (value == "ridge")
+			*dest = CSS_LINE_STYLE_RIDGE;
 		else if (value == "inset")
 			*dest = CSS_LINE_STYLE_INSET;
 		else if (value == "outset")
 			*dest = CSS_LINE_STYLE_OUTSET;
-		else if (value == "solid")
-			*dest = CSS_LINE_STYLE_SOLID;
 	}
 
 	void CCssStyle::applyPaddingWidth(const std::string &value, uint32 *dest, const uint32 currentPadding, uint32 fontSize) const

From dfe45029ab612bbb0df9ae09e4d2b3d7ed5b4b60 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 4 Jul 2021 16:55:50 +0300
Subject: [PATCH 273/292] Add CSSLength, CSSBackground, CSSBackgroundRenderer
 classes

---
 nel/include/nel/gui/css_background.h          |  83 +++
 nel/include/nel/gui/css_background_renderer.h | 193 ++++++
 nel/include/nel/gui/css_length.h              |  76 +++
 nel/include/nel/gui/css_types.h               |  38 ++
 nel/src/gui/css_background.cpp                | 427 ++++++++++++
 nel/src/gui/css_background_renderer.cpp       | 607 ++++++++++++++++++
 nel/src/gui/css_length.cpp                    | 222 +++++++
 7 files changed, 1646 insertions(+)
 create mode 100644 nel/include/nel/gui/css_background.h
 create mode 100644 nel/include/nel/gui/css_background_renderer.h
 create mode 100644 nel/include/nel/gui/css_length.h
 create mode 100644 nel/src/gui/css_background.cpp
 create mode 100644 nel/src/gui/css_background_renderer.cpp
 create mode 100644 nel/src/gui/css_length.cpp

diff --git a/nel/include/nel/gui/css_background.h b/nel/include/nel/gui/css_background.h
new file mode 100644
index 000000000..87ce87d0e
--- /dev/null
+++ b/nel/include/nel/gui/css_background.h
@@ -0,0 +1,83 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2019  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CL_CSS_BACKGROUND_H
+#define CL_CSS_BACKGROUND_H
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/rgba.h"
+#include "nel/gui/css_types.h"
+#include "nel/gui/css_length.h"
+
+namespace NLGUI
+{
+	/**
+	 * \brief CSS background info
+	 * \date 2021-07-02 11:36 GMT
+	 * \author Meelis Mägi (Nimetu)
+	 */
+	class CSSBackground
+	{
+	public:
+		CSSBackground()
+		:color(NLMISC::CRGBA::Transparent),
+			repeatX(CSS_VALUE_REPEAT), repeatY(CSS_VALUE_REPEAT), attachment(CSS_VALUE_SCROLL),
+			xAnchor(CSS_VALUE_LEFT), yAnchor(CSS_VALUE_TOP),
+			clip(CSS_VALUE_BORDER_BOX), origin(CSS_VALUE_PADDING_BOX), size(CSS_VALUE_AUTO)
+		{}
+
+		void setImage(const std::string &value);
+		void setPosition(const std::string &value);
+		void setSize(const std::string &value);
+		void setRepeat(const std::string &value);
+		void setOrigin(const std::string &value);
+		void setClip(const std::string &value);
+		void setAttachment(const std::string &value);
+		void setColor(const std::string &value);
+
+	public:
+		// TODO: only final layer has color
+		NLMISC::CRGBA color;
+		std::string image;
+
+		CSSValueType repeatX;
+		CSSValueType repeatY;
+		CSSValueType attachment;
+
+		CSSValueType xAnchor;
+		CSSValueType yAnchor;
+		CSSLength xPosition;
+		CSSLength yPosition;
+
+		CSSValueType clip;
+		CSSValueType origin;
+
+		CSSValueType size;
+		CSSLength width;
+		CSSLength height;
+
+	private:
+		void positionFromOne(const std::vector<std::string> &parts);
+		void positionFromTwo(const std::vector<std::string> &parts);
+		void positionFromThree(const std::vector<std::string> &parts);
+		void positionFromFour(const std::vector<std::string> &parts);
+	};
+
+}//namespace
+
+#endif // CL_CSS_BACKGROUND_H
+
+
diff --git a/nel/include/nel/gui/css_background_renderer.h b/nel/include/nel/gui/css_background_renderer.h
new file mode 100644
index 000000000..86b31cb3d
--- /dev/null
+++ b/nel/include/nel/gui/css_background_renderer.h
@@ -0,0 +1,193 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2019  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+#ifndef NL_CSS_BACKGROUND_RENDERER_H
+#define NL_CSS_BACKGROUND_RENDERER_H
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/rgba.h"
+#include "nel/misc/geom_ext.h"
+#include "nel/gui/css_types.h"
+#include "nel/gui/css_background.h"
+
+namespace NLGUI
+{
+class CInterfaceElement;
+
+/**
+ * \brief Border renderer for GUI classes
+ * \date 2021-06-29 15:17 GMT
+ * \author Meelis Mägi (Nimetu)
+ */
+class CSSBackgroundRenderer
+{
+public:
+	// alpha value from parent
+	uint8 CurrentAlpha;
+
+	// TODO: should be moved to CSSBackground
+	sint32 TextureId;
+
+public:
+	CSSBackgroundRenderer();
+	~CSSBackgroundRenderer();
+
+	// return true if no background is set
+	bool isEmpty() const
+	{
+		return m_Background.image.empty() && m_Background.color.A == 0;
+	}
+
+	void setModulateGlobalColor(bool m) { m_ModulateGlobalColor = m; }
+
+	void updateCoords();
+	void invalidateCoords() { m_Dirty = true; }
+	void invalidateContent() { m_Dirty = true; };
+
+	void clear();
+	void setBackground(const CSSBackground &bg);
+
+	// helper function to change background image
+	void setImage(const std::string &bgtex);
+	void setImageRepeat(bool b);
+	void setImageCover(bool b);
+
+	// helper function to change background color
+	void setColor(const NLMISC::CRGBA &color)
+	{
+		m_Dirty = true;
+		m_Background.color = color;
+	}
+
+	NLMISC::CRGBA getColor() const
+	{
+		return m_Background.color;
+	}
+
+	// override painting area to be at least the size of viewport (ie, <html> background)
+	void setFillViewport(bool b) {
+		m_Dirty = true;
+		m_FillViewport = b;
+	}
+
+	void setViewport(CInterfaceElement *root)
+	{
+		m_Dirty = true;
+		m_Viewport = root;
+	}
+
+	void setBorderArea(sint32 x, sint32 y, sint32 w, sint32 h)
+	{
+		m_Dirty = true;
+		m_BorderX = x;
+		m_BorderY = y;
+		m_BorderW = w;
+		m_BorderH = h;
+	}
+
+	void setPaddingArea(sint32 x, sint32 y, sint32 w, sint32 h)
+	{
+		m_Dirty = true;
+		m_PaddingX = x;
+		m_PaddingY = y;
+		m_PaddingW = w;
+		m_PaddingH = h;
+	}
+
+	void setContentArea(sint32 x, sint32 y, sint32 w, sint32 h)
+	{
+		m_Dirty = true;
+		m_ContentX = x;
+		m_ContentY = y;
+		m_ContentW = w;
+		m_ContentH = h;
+	}
+
+	// sizes for em, rem units
+	void setFontSize(float rootFontSize, float fontSize)
+	{
+		m_Dirty = true;
+		m_RootFontSize = rootFontSize;
+		m_FontSize = fontSize;
+	}
+
+	void draw();
+
+private:
+	sint32 m_BorderX, m_BorderY, m_BorderW, m_BorderH;
+	sint32 m_PaddingX, m_PaddingY, m_PaddingW, m_PaddingH;
+	sint32 m_ContentX, m_ContentY, m_ContentW, m_ContentH;
+
+	// font size for 'rem'
+	float m_RootFontSize;
+
+	// font size for 'em'
+	float m_FontSize;
+
+	// viewport element for vw,wh,vmin,vmax
+	CInterfaceElement* m_Viewport;
+
+	struct SDrawQueue
+	{
+		sint32 TextureId;
+		NLMISC::CQuadUV Quad;
+		NLMISC::CRGBA Color;
+	};
+	std::vector<SDrawQueue> m_DrawQueue;
+
+	const sint8 m_RenderLayer;
+	bool m_ModulateGlobalColor;
+	// if true, painting area returns area at least the size of viewport (ie, <html> background)
+	bool m_FillViewport;
+
+	// if true, then updateCoords() is called from draw()
+	bool m_Dirty;
+
+	CSSBackground m_Background;
+
+	// get clip area based on background-clip
+	void getPaintingArea(const CSSBackground &bg, sint32 &areaX, sint32 &areaY, sint32 &areaW, sint32 &areaH) const;
+
+	// get positioning area based on background-origin
+	void getPositioningArea(const CSSBackground &bg, sint32 &areaX, sint32 &areaY, sint32 &areaW, sint32 &areaH) const;
+
+	// calculate image size based on background-size
+	void calculateSize(const CSSBackground &bg, sint32 &texW, sint32 &texH) const;
+
+	// calculate image position based on background-position
+	void calculatePosition(const CSSBackground &bg, sint32 &texX, sint32 &texY, sint32 &texW, sint32 &texH) const;
+
+	// calculate image tile position, size, count, and spacing based on background-repeat
+	void calculateTiles(const CSSBackground &bg, sint32 &texX, sint32 &texY, sint32 &texW, sint32 &texH, sint32 &tilesX, sint32 &tilesY, sint32 &spacingX, sint32 &spacingY) const;
+
+	// position, size, and count for first tile to cover an area
+	void getImageTile(sint32 &tilePos, sint32 &tileSize, sint32 &spacing, sint32 &tiles, sint32 areaPos, sint32 areaSize, CSSValueType repeat) const;
+
+	// push background color to draw queue
+	void buildColorQuads(const CSSBackground &bg);
+
+	// push background image to draw quque
+	void buildImageQuads(const CSSBackground &bg, sint32 textureId);
+
+}; // CSSBackgroundRenderer
+
+}//namespace
+
+#endif // NL_CSS_BACKGROUND_RENDERER_H
+
+
diff --git a/nel/include/nel/gui/css_length.h b/nel/include/nel/gui/css_length.h
new file mode 100644
index 000000000..d7b8c657b
--- /dev/null
+++ b/nel/include/nel/gui/css_length.h
@@ -0,0 +1,76 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CL_CSS_LENGTH_H
+#define CL_CSS_LENGTH_H
+
+#include "nel/misc/types_nl.h"
+#include "nel/gui/css_types.h"
+
+namespace NLGUI
+{
+	/**
+	 * \brief CSS types used in GUI classes
+	 * \date 2021-07-02 11:36 GMT
+	 * \author Meelis Mägi (Nimetu)
+	 */
+
+	class CSSLength
+	{
+	public:
+		enum Kind {
+			Auto, Relative, Fixed
+		};
+
+		CSSLength(float value = 0, CSSUnitType unit = CSS_UNIT_NONE, Kind kind = Auto)
+		: m_Value(value), m_Unit(unit), m_Kind(Auto)
+		{}
+
+		void setAuto() { m_Kind = Auto; }
+		bool parseValue(const std::string &value, bool allowPercent = true, bool allowNegative = false);
+		void setFloatValue(float f, const std::string &unit);
+
+		float getValue() const;
+		float getFloat() const { return m_Value; }
+
+		bool isPercent() const { return m_Unit == CSS_UNIT_PERCENT; }
+
+		bool isAuto() const { return m_Kind == Auto; }
+		bool isRelative() const { return m_Kind == Relative; }
+
+		// % uses relValue
+		// em uses emSize
+		// rem uses remSize
+		// vw,vh,vi,vb,vmin,vmax uses vwSize/vhSize
+		float calculate(uint32 relValue, uint32 emSize, uint32 remSize, uint32 vwSize, uint32 whSize) const;
+
+		CSSUnitType getUnit() const { return m_Unit; }
+
+		std::string toString() const;
+
+	private:
+		void setUnit(const std::string &unit);
+
+		float m_Value;
+		CSSUnitType m_Unit;
+		Kind m_Kind;
+	};
+
+}//namespace
+
+#endif // CL_CSS_LENGTH_H
+
+
diff --git a/nel/include/nel/gui/css_types.h b/nel/include/nel/gui/css_types.h
index dd80e308f..ac59af422 100644
--- a/nel/include/nel/gui/css_types.h
+++ b/nel/include/nel/gui/css_types.h
@@ -47,6 +47,44 @@ namespace NLGUI
 		CSS_LINE_WIDTH_THICK = 5
 	};
 
+	enum CSSUnitType {
+		CSS_UNIT_NONE = 0,
+		CSS_UNIT_EM,
+		CSS_UNIT_REM,
+		CSS_UNIT_PERCENT,
+		CSS_UNIT_PX,
+		CSS_UNIT_PT,
+		CSS_UNIT_VW,
+		CSS_UNIT_VH,
+		CSS_UNIT_VI,
+		CSS_UNIT_VB,
+		CSS_UNIT_VMIN,
+		CSS_UNIT_VMAX
+	};
+
+	enum CSSValueType {
+		CSS_VALUE_NONE = 0,
+		CSS_VALUE_REPEAT,
+		CSS_VALUE_SPACE,
+		CSS_VALUE_ROUND,
+		CSS_VALUE_NOREPEAT,
+		CSS_VALUE_FIXED,
+		CSS_VALUE_LOCAL,
+		CSS_VALUE_SCROLL,
+		CSS_VALUE_LEFT,
+		CSS_VALUE_CENTER,
+		CSS_VALUE_RIGHT,
+		CSS_VALUE_TOP,
+		CSS_VALUE_BOTTOM,
+		CSS_VALUE_BORDER_BOX,
+		CSS_VALUE_PADDING_BOX,
+		CSS_VALUE_CONTENT_BOX,
+		CSS_VALUE_LENGTH,
+		CSS_VALUE_AUTO,
+		CSS_VALUE_COVER,
+		CSS_VALUE_CONTAIN
+	};
+
 }//namespace
 
 #endif // CL_CSS_TYPES_H
diff --git a/nel/src/gui/css_background.cpp b/nel/src/gui/css_background.cpp
new file mode 100644
index 000000000..4665a0c42
--- /dev/null
+++ b/nel/src/gui/css_background.cpp
@@ -0,0 +1,427 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdpch.h"
+
+#include <string>
+#include "nel/gui/libwww.h"
+#include "nel/gui/css_length.h"
+#include "nel/gui/css_background.h"
+
+using namespace NLMISC;
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+namespace NLGUI
+{
+
+void CSSBackground::setImage(const std::string &value)
+{
+	image = value;
+}
+
+void CSSBackground::setPosition(const std::string &value)
+{
+	std::vector<std::string> parts;
+	splitString(toLowerAscii(value), " ", parts);
+
+	if (parts.empty() || parts.size() > 4)
+		return;
+
+	switch(parts.size())
+	{
+		case 1:
+			positionFromOne(parts);
+			break;
+		case 2:
+			positionFromTwo(parts);
+			break;
+		case 3:
+			positionFromThree(parts);
+			break;
+		case 4:
+			positionFromFour(parts);
+			break;
+		default:
+			return;
+	}
+}
+
+void CSSBackground::setSize(const std::string &value)
+{
+	std::vector<std::string> parts;
+	splitString(toLowerAscii(value), " ", parts);
+	if (parts.size() > 2)
+		return;
+
+	if (parts.size() == 1 && (parts[0] == "cover" || parts[0] == "contain"))
+	{
+		if (parts[0] == "cover")
+			size = CSS_VALUE_COVER;
+		else
+			size = CSS_VALUE_CONTAIN;
+
+		width.setAuto();
+		height.setAuto();
+		return;
+	}
+
+	// height will default to 'auto' if not set
+	if (parts.size() == 1)
+		parts.push_back("auto");
+
+	if (parts[0] == "auto" && parts[1] == "auto")
+	{
+		size = CSS_VALUE_AUTO;
+		width.setAuto();
+		height.setAuto();
+		return;
+	}
+
+	CSSLength newW, newH;
+	bool success = true;
+	if (parts[0] == "auto")
+	{
+		newW.setAuto();
+	}
+	else
+	{
+		float fval;
+		std::string unit;
+		if (!getCssLength(fval, unit, parts[0]))
+		{
+			nlwarning("Failed to parse background-size[0] '%s'", parts[0].c_str());
+			return;
+		}
+		newW.setFloatValue(fval, unit);
+	}
+
+	if (parts[1] == "auto")
+	{
+		newH.setAuto();
+	}
+	else
+	{
+		float fval;
+		std::string unit;
+		if (!getCssLength(fval, unit, parts[1]))
+		{
+			nlwarning("Failed to parse background-size[1] '%s'", parts[1].c_str());
+			return;
+		}
+		newH.setFloatValue(fval, unit);
+	}
+
+	size = CSS_VALUE_LENGTH;
+	width = newW;
+	height = newH;
+}
+
+void CSSBackground::setRepeat(const std::string &value)
+{
+	std::vector<std::string> parts;
+	splitString(toLowerAscii(value), " ", parts);
+	if (parts.size() == 0 || parts.size() > 2)
+		return;
+
+	if (parts.size() == 1)
+	{
+		if (parts[0] == "repeat-x")
+			parts.push_back("no-repeat");
+		else if (parts[0] == "repeat-y")
+			parts.insert(parts.begin(), "no-repeat");
+		else //repeat, space, round, no-repeat
+			parts.push_back(parts[0]);
+	}
+
+
+	if (parts[0] == "repeat") repeatX = CSS_VALUE_REPEAT;
+	else if (parts[0] == "no-repeat") repeatX = CSS_VALUE_NOREPEAT;
+	else if (parts[0] == "space") repeatX = CSS_VALUE_SPACE;
+	else if (parts[0] == "round") repeatX = CSS_VALUE_ROUND;
+	else repeatX = CSS_VALUE_REPEAT;
+
+	if (parts[1] == "repeat") repeatY = CSS_VALUE_REPEAT;
+	else if (parts[1] == "no-repeat") repeatY = CSS_VALUE_NOREPEAT;
+	else if (parts[1] == "space") repeatY = CSS_VALUE_SPACE;
+	else if (parts[1] == "round") repeatY = CSS_VALUE_ROUND;
+	else repeatY = CSS_VALUE_REPEAT;
+}
+
+void CSSBackground::setOrigin(const std::string &value)
+{
+	if (value == "border-box") origin = CSS_VALUE_BORDER_BOX;
+	else if (value == "padding-box") origin = CSS_VALUE_PADDING_BOX;
+	else if (value == "content-box") origin = CSS_VALUE_CONTENT_BOX;
+	else origin = CSS_VALUE_PADDING_BOX;
+}
+
+void CSSBackground::setClip(const std::string &value)
+{
+	if (value == "border-box") clip = CSS_VALUE_BORDER_BOX;
+	else if (value == "padding-box") clip = CSS_VALUE_PADDING_BOX;
+	else if (value == "content-box") clip = CSS_VALUE_CONTENT_BOX;
+	//else if (value == "text") clip = CSSValueType::Text;
+	else clip = CSS_VALUE_PADDING_BOX;
+}
+
+void CSSBackground::setAttachment(const std::string &value)
+{
+	if (value == "fixed") attachment = CSS_VALUE_FIXED;
+	else if (value == "local") attachment = CSS_VALUE_LOCAL;
+	else if (value == "scroll") attachment = CSS_VALUE_SCROLL;
+	else attachment = CSS_VALUE_SCROLL;
+}
+
+void CSSBackground::setColor(const std::string &value)
+{
+	NLMISC::CRGBA tmp;
+	if (scanHTMLColor(value.c_str(), tmp))
+		color = tmp;
+}
+
+static bool isHorizontalKeyword(const std::string &val)
+{
+	return val == "left" || val == "right";
+}
+
+static bool isVerticalKeyword(const std::string &val)
+{
+	return val == "top" || val == "bottom";
+}
+
+void CSSBackground::positionFromOne(const std::vector<std::string> &parts)
+{
+	CSSValueType newH = CSS_VALUE_LEFT;
+	CSSValueType newV = CSS_VALUE_TOP;
+	CSSLength newX, newY;
+	newX.setFloatValue(0, "%");
+	newY.setFloatValue(0, "%");
+
+	uint index = 0;
+	float fval;
+	std::string unit;
+	if (isHorizontalKeyword(parts[index]))
+	{
+		newH = parts[index] == "left" ? CSS_VALUE_LEFT : CSS_VALUE_RIGHT;
+		newV = CSS_VALUE_CENTER;
+	}
+	else if (isVerticalKeyword(parts[index]))
+	{
+		newH = CSS_VALUE_CENTER;
+		newV = parts[index] == "top" ? CSS_VALUE_TOP : CSS_VALUE_BOTTOM;
+	}
+	else if (parts[index] == "center")
+	{
+		newH = CSS_VALUE_CENTER;
+		newV = CSS_VALUE_CENTER;
+	}
+	else if (getCssLength(fval, unit, parts[index], true))
+	{
+		newX.setFloatValue(fval, unit);
+		newV = CSS_VALUE_CENTER;
+	}
+	else
+	{
+		return;
+	}
+
+	xAnchor = newH;
+	yAnchor = newV;
+	xPosition = newX;
+	yPosition = newY;
+}
+
+void CSSBackground::positionFromTwo(const std::vector<std::string> &parts)
+{
+	CSSValueType newH = CSS_VALUE_LEFT;
+	CSSValueType newV = CSS_VALUE_TOP;
+	CSSLength newX, newY;
+	newX.setFloatValue(0, "%");
+	newY.setFloatValue(0, "%");
+
+	float fval;
+	std::string unit;
+	uint index = 0;
+	bool hasCenter = false;
+	bool hasX = false;
+	bool hasY = false;
+	for (uint index = 0; index < parts.size(); index++)
+	{
+		if (parts[index] == "center")
+		{
+			hasCenter = true;
+		}
+		else if (isHorizontalKeyword(parts[index]))
+		{
+			if (hasX) return;
+			hasX = true;
+			newH = parts[index] == "left" ? CSS_VALUE_LEFT : CSS_VALUE_RIGHT;
+		}
+		else if (isVerticalKeyword(parts[index]))
+		{
+			if (hasY) return;
+			hasY = true;
+			newV = parts[index] == "top" ? CSS_VALUE_TOP : CSS_VALUE_BOTTOM;
+		}
+		else if (getCssLength(fval, unit, parts[index], true))
+		{
+			// invalid: 'top 50%';
+			if (hasY) return;
+			if (!hasX)
+			{
+				hasX = true;
+				newX.setFloatValue(fval, unit);
+			}
+			else
+			{
+				hasY = true;
+				newY.setFloatValue(fval, unit);
+			}
+		}
+		else
+		{
+			return;
+		}
+	}
+
+	if (hasCenter)
+	{
+		if (!hasX)
+			newH = CSS_VALUE_CENTER;
+		if (!hasY)
+			newV = CSS_VALUE_CENTER;
+	}
+
+	xAnchor = newH;
+	yAnchor = newV;
+	xPosition = newX;
+	yPosition = newY;
+}
+
+void CSSBackground::positionFromThree(const std::vector<std::string> &parts)
+{
+	CSSValueType newH = CSS_VALUE_LEFT;
+	CSSValueType newV = CSS_VALUE_TOP;
+	CSSLength newX, newY;
+	newX.setFloatValue(0, "%");
+	newY.setFloatValue(0, "%");
+
+	float fval;
+	std::string unit;
+	bool hasCenter = false;
+	bool hasX = false;
+	bool hasY = false;
+	for(uint index = 0; index < 3; index++)
+	{
+		if (parts[index] == "center")
+		{
+			if (hasCenter) return;
+			hasCenter = true;
+		}
+		else if (isHorizontalKeyword(parts[index]))
+		{
+			if (hasX) return;
+			hasX = true;
+			newH = parts[index] == "left" ? CSS_VALUE_LEFT : CSS_VALUE_RIGHT;
+			if ((index+1) < parts.size() && getCssLength(fval, unit, parts[index+1], true))
+			{
+				newX.setFloatValue(fval, unit);
+				index++;
+			}
+		}
+		else if (isVerticalKeyword(parts[index]))
+		{
+			if (hasY) return;
+			hasY = true;
+			newV = parts[index] == "top" ? CSS_VALUE_TOP : CSS_VALUE_BOTTOM;
+			if ((index+1) < parts.size() && getCssLength(fval, unit, parts[index+1], true))
+			{
+				newY.setFloatValue(fval, unit);
+				index++;
+			}
+		}
+		else
+		{
+			return;
+		}
+	}
+	if (hasCenter)
+	{
+		if (hasX && hasY)
+			return;
+
+		if (!hasX)
+			newH = CSS_VALUE_CENTER;
+		else
+			newV = CSS_VALUE_CENTER;
+	}
+
+	xAnchor = newH;
+	yAnchor = newV;
+	xPosition = newX;
+	yPosition = newY;
+}
+
+void CSSBackground::positionFromFour(const std::vector<std::string> &parts)
+{
+	CSSValueType newH = CSS_VALUE_LEFT;
+	CSSValueType newV = CSS_VALUE_TOP;
+	CSSLength newX, newY;
+	newX.setFloatValue(0, "%");
+	newY.setFloatValue(0, "%");
+
+	float fval;
+	std::string unit;
+	bool hasX = false;
+	bool hasY = false;
+	for(uint index = 0; index<4; index+=2)
+	{
+		if (parts[index] == "center")
+			return;
+
+		if (isHorizontalKeyword(parts[index]))
+		{
+			if (hasX) return;
+			hasX = true;
+			if (!getCssLength(fval, unit, parts[index+1], true)) return;
+			newH = parts[index] == "left" ? CSS_VALUE_LEFT : CSS_VALUE_RIGHT;
+			newX.setFloatValue(fval, unit);
+		}
+		else if (isVerticalKeyword(parts[index]))
+		{
+			if (hasY) return;
+			hasY = true;
+			if (!getCssLength(fval, unit, parts[index+1], true)) return;
+			newV = parts[index] == "top" ? CSS_VALUE_TOP : CSS_VALUE_BOTTOM;
+			newY.setFloatValue(fval, unit);
+		}
+		else
+		{
+			return;
+		}
+	}
+
+	xAnchor = newH;
+	yAnchor = newV;
+	xPosition = newX;
+	yPosition = newY;
+}
+
+} // namespace
+
diff --git a/nel/src/gui/css_background_renderer.cpp b/nel/src/gui/css_background_renderer.cpp
new file mode 100644
index 000000000..4d7df021e
--- /dev/null
+++ b/nel/src/gui/css_background_renderer.cpp
@@ -0,0 +1,607 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2019  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#include "stdpch.h"
+#include "nel/gui/css_background_renderer.h"
+#include "nel/gui/css_border_renderer.h"
+#include "nel/gui/view_renderer.h"
+#include "nel/gui/widget_manager.h"
+#include "nel/gui/view_bitmap.h"
+
+using namespace std;
+using namespace NLMISC;
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+namespace NLGUI
+{
+	// ----------------------------------------------------------------------------
+	CSSBackgroundRenderer::CSSBackgroundRenderer()
+	: CurrentAlpha(255), TextureId(-1),
+		m_BorderX(0), m_BorderY(0), m_BorderW(0), m_BorderH(0),
+		m_PaddingX(0), m_PaddingY(0), m_PaddingW(0), m_PaddingH(0),
+		m_ContentX(0), m_ContentY(0), m_ContentW(0), m_ContentH(0),
+		m_RootFontSize(16.f), m_FontSize(16.f), m_Viewport(NULL),
+		m_RenderLayer(0), m_ModulateGlobalColor(false), m_FillViewport(false),
+		m_Dirty(false)
+	{
+	}
+
+	// ----------------------------------------------------------------------------
+	CSSBackgroundRenderer::~CSSBackgroundRenderer()
+	{
+		if (TextureId != -1)
+			CViewRenderer::getInstance()->deleteTexture(TextureId);
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::clear()
+	{
+		m_Dirty = true;
+
+		if (TextureId != -1)
+			CViewRenderer::getInstance()->deleteTexture(TextureId);
+
+		TextureId = -1;
+		m_Background.image.clear();
+		m_Background.color.A = 0;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::setBackground(const CSSBackground &bg)
+	{
+		m_Dirty = true;
+		// TODO: CSSBackground should keep track of TextureId
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+		if (bg.image != m_Background.image && TextureId != -1)
+			rVR.deleteTexture(TextureId);
+
+		m_Background = bg;
+		// TODO: does not accept urls
+		if (TextureId == -1 && !bg.image.empty())
+		{
+			// TODO: make CViewRenderer accept urls
+			if (bg.image.find("://") != std::string::npos)
+				TextureId = rVR.createTexture(bg.image, 0, 0, -1, -1, false);
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::setImage(const std::string &bgtex)
+	{
+		m_Dirty = true;
+		// TODO: CSSBackground should keep track of TextureId
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+		if (bgtex != m_Background.image && TextureId != -1)
+		{
+			rVR.deleteTexture(TextureId);
+			TextureId = -1;
+		}
+		m_Background.image = bgtex;
+
+		if (TextureId == -1 && !bgtex.empty())
+		{
+			// TODO: make CViewRenderer accept urls
+			if (bgtex.find("://") != std::string::npos)
+				TextureId = rVR.createTexture(bgtex, 0, 0, -1, -1, false);
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::setImageRepeat(bool b)
+	{
+		m_Background.repeatX = b ? CSS_VALUE_REPEAT : CSS_VALUE_NOREPEAT;
+		m_Background.repeatY = b ? CSS_VALUE_REPEAT : CSS_VALUE_NOREPEAT;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::setImageCover(bool b)
+	{
+		m_Background.size = b ? CSS_VALUE_COVER : CSS_VALUE_AUTO;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::updateCoords()
+	{
+		m_Dirty = false;
+		m_DrawQueue.clear();
+
+		// TODO: color from last background layer
+		buildColorQuads(m_Background);
+
+		// -------------------------------------------------------------------
+		// background-image
+		buildImageQuads(m_Background, TextureId);
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::draw() {
+		if (m_Dirty) updateCoords();
+		if (m_DrawQueue.empty()) return;
+
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+
+		// flush draw cache to ensure correct draw order
+		rVR.flush();
+
+		sint32 clipX, clipY, clipW, clipH;
+		if (m_Viewport)
+		{
+			rVR.getClipWindow(clipX, clipY, clipW, clipH);
+			rVR.setClipWindow(m_Viewport->getXReal(), m_Viewport->getYReal(), m_Viewport->getWReal(), m_Viewport->getHReal());
+		}
+
+		// TODO: no need for widget manager, if global color is set from parent
+		CRGBA globalColor;
+		if (m_ModulateGlobalColor)
+			globalColor = CWidgetManager::getInstance()->getGlobalColor();
+
+		// TODO: there might be issue on draw order IF using multiple textures
+		// and second (top) texture is created before first one.
+		for(uint i = 0; i < m_DrawQueue.size(); ++i)
+		{
+			CRGBA color = m_DrawQueue[i].Color;
+			if (m_ModulateGlobalColor)
+				color.modulateFromColor (color, globalColor);
+
+			color.A = (uint8) (((uint16) CurrentAlpha * (uint16) color.A) >> 8);
+			rVR.drawQuad(m_RenderLayer, m_DrawQueue[i].Quad, m_DrawQueue[i].TextureId, color, false);
+		}
+
+		// flush draw cache to ensure correct draw order
+		rVR.flush();
+
+		if (m_Viewport)
+			rVR.setClipWindow(clipX, clipY, clipW, clipH);
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::getPositioningArea(const CSSBackground &bg, sint32 &areaX, sint32 &areaY, sint32 &areaW, sint32 &areaH) const
+	{
+		switch(bg.origin)
+		{
+			case CSS_VALUE_PADDING_BOX:
+				areaX = m_PaddingX;
+				areaY = m_PaddingY;
+				areaW = m_PaddingW;
+				areaH = m_PaddingH;
+				break;
+			case CSS_VALUE_CONTENT_BOX:
+				areaX = m_ContentX;
+				areaY = m_ContentY;
+				areaW = m_ContentW;
+				areaH = m_ContentH;
+				break;
+			case CSS_VALUE_BORDER_BOX:
+				// fall thru
+			default:
+				areaX = m_BorderX;
+				areaY = m_BorderY;
+				areaW = m_BorderW;
+				areaH = m_BorderH;
+				break;
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::getPaintingArea(const CSSBackground &bg, sint32 &areaX, sint32 &areaY, sint32 &areaW, sint32 &areaH) const
+	{
+		switch(bg.clip)
+		{
+			case CSS_VALUE_PADDING_BOX:
+				areaX = m_PaddingX;
+				areaY = m_PaddingY;
+				areaW = m_PaddingW;
+				areaH = m_PaddingH;
+				break;
+			case CSS_VALUE_CONTENT_BOX:
+				areaX = m_ContentX;
+				areaY = m_ContentY;
+				areaW = m_ContentW;
+				areaH = m_ContentH;
+				break;
+			case CSS_VALUE_BORDER_BOX:
+				// fall thru
+			default:
+				areaX = m_BorderX;
+				areaY = m_BorderY;
+				areaW = m_BorderW;
+				areaH = m_BorderH;
+				break;
+		}
+
+		if (m_FillViewport && m_Viewport)
+		{
+			sint32 newX = std::min(areaX, m_Viewport->getXReal());
+			sint32 newY = std::min(areaY, m_Viewport->getYReal());
+			areaW = std::max(areaX + areaW, m_Viewport->getXReal() + m_Viewport->getWReal()) - newX;
+			areaH = std::max(areaY + areaH, m_Viewport->getYReal() + m_Viewport->getHReal()) - newY;
+			areaX = newX;
+			areaY = newY;
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::calculateSize(const CSSBackground &bg, sint32 &texW, sint32 &texH) const
+	{
+		sint32 areaX, areaY, areaW, areaH;
+		getPositioningArea(bg, areaX, areaY, areaW, areaH);
+
+		sint32 vpW=0;
+		sint32 vpH=0;
+		if (m_Viewport)
+		{
+			vpW = m_Viewport->getWReal();
+			vpH = m_Viewport->getHReal();
+		}
+
+		float whRatio = (float)texW / (float)texH;
+		switch(bg.size)
+		{
+			case CSS_VALUE_LENGTH:
+			{
+				if (bg.width.isAuto() && bg.height.isAuto())
+				{
+					// no-op
+				}
+				else if (bg.width.isAuto())
+				{
+					texH = bg.height.calculate(areaH, m_FontSize, m_RootFontSize, vpW, vpH);
+					texW = texH * whRatio;
+				}
+				else if (bg.height.isAuto())
+				{
+					// calculate Height
+					texW = bg.width.calculate(areaW, m_FontSize, m_RootFontSize, vpW, vpH);
+					texH = texW / whRatio;
+				}
+				else
+				{
+					texW = bg.width.calculate(areaW, m_FontSize, m_RootFontSize, vpW, vpH);
+					texH = bg.height.calculate(areaH, m_FontSize, m_RootFontSize, vpW, vpH);
+				}
+				break;
+			}
+			case CSS_VALUE_AUTO:
+			{
+				// no-op
+				break;
+			}
+			case CSS_VALUE_COVER:
+			{
+				float canvasRatio = (float)areaW / (float)areaH;
+				if (whRatio < canvasRatio)
+				{
+					texW = areaW;
+					texH = areaW / whRatio;
+				} else {
+					texW = areaH * whRatio;
+					texH = areaH;
+				}
+				break;
+			}
+			case CSS_VALUE_CONTAIN:
+			{
+				// same as covert, but ratio check is reversed
+				float canvasRatio = (float)areaW / (float)areaH;
+				if (whRatio > canvasRatio)
+				{
+					texW = areaW;
+					texH = areaW / whRatio;
+				} else {
+					texW = areaH * whRatio;
+					texH = areaH;
+				}
+				break;
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::calculatePosition(const CSSBackground &bg, sint32 &texX, sint32 &texY, sint32 &texW, sint32 &texH) const
+	{
+		sint32 areaX, areaY, areaW, areaH;
+		getPositioningArea(bg, areaX, areaY, areaW, areaH);
+
+		sint32 vpW=0;
+		sint32 vpH=0;
+		if (m_Viewport)
+		{
+			vpW = m_Viewport->getWReal();
+			vpH = m_Viewport->getHReal();
+		}
+
+		float ofsX = bg.xPosition.calculate(1, m_FontSize, m_RootFontSize, vpW, vpH);
+		float ofsY = bg.yPosition.calculate(1, m_FontSize, m_RootFontSize, vpW, vpH);
+
+		if (bg.xPosition.isPercent() || bg.xAnchor == CSS_VALUE_CENTER)
+		{
+			if (bg.xAnchor == CSS_VALUE_RIGHT)
+				ofsX = 1.f - ofsX;
+			else if (bg.xAnchor == CSS_VALUE_CENTER)
+				ofsX = 0.5f;
+
+			ofsX = (float)(areaW - texW) * ofsX;
+		}
+		else if (bg.xAnchor == CSS_VALUE_RIGHT)
+		{
+			ofsX = areaW - texW - ofsX;
+		}
+
+		// areaY is bottom edge, areaY+areaH is top edge
+		if (bg.yPosition.isPercent() || bg.yAnchor == CSS_VALUE_CENTER)
+		{
+			if (bg.yAnchor == CSS_VALUE_TOP)
+				ofsY = 1.f - ofsY;
+			else if (bg.yAnchor == CSS_VALUE_CENTER)
+				ofsY = 0.5f;
+
+			ofsY = (float)(areaH - texH) * ofsY;
+		}
+		else if (bg.yAnchor == CSS_VALUE_TOP)
+		{
+			ofsY = areaH - texH - ofsY;
+		}
+
+		texX = areaX + ofsX;
+		texY = areaY + ofsY;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::getImageTile(sint32 &tilePos, sint32 &tileSize, sint32 &spacing, sint32 &tiles, sint32 areaPos, sint32 areaSize, CSSValueType repeat) const
+	{
+		switch(repeat)
+		{
+			case CSS_VALUE_NOREPEAT:
+			{
+				tiles = 1;
+				spacing = 0;
+				break;
+			}
+			case CSS_VALUE_SPACE:
+			{
+				// if no space for 2+ tiles, then show single one on calculated tilePos
+				if (tileSize * 2 > areaSize)
+				{
+					// set spacing large enough to only display single tile
+					tiles = 1;
+					spacing = areaSize;
+				}
+				else
+				{
+					// available for middle tiles
+					sint32 midSize = (areaSize - tileSize*2);
+					// number of middle tiles
+					sint32 midTiles = midSize / tileSize;
+
+					tiles = 2 + midTiles;
+					tilePos = areaPos;
+					// int div for floor()
+					spacing = ( midSize - tileSize * midTiles) / (midTiles + 1);
+				}
+				break;
+			}
+			case CSS_VALUE_ROUND:
+				// fall-thru - size is already calculated
+			case CSS_VALUE_REPEAT:
+				// fall-thru
+			default:
+			{
+				tilePos -= std::ceil(abs(tilePos - areaPos)/(float)tileSize)*tileSize;
+				tiles = std::ceil((std::abs(areaPos - tilePos) + areaSize) / (float)tileSize);
+				spacing = 0;
+				break;
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::calculateTiles(const CSSBackground &bg, sint32 &texX, sint32 &texY, sint32 &texW, sint32 &texH, sint32 &tilesX, sint32 &tilesY, sint32 &spacingX, sint32 &spacingY) const
+	{
+		sint32 areaX, areaY, areaW, areaH;
+		getPositioningArea(bg, areaX, areaY, areaW, areaH);
+
+		// texX,texY is for position area (ie content-box), but painting area can be bigger (ie border-box)
+		sint32 paintX, paintY, paintW, paintH;
+		getPaintingArea(bg, paintX, paintY, paintW, paintH);
+		if (paintX < areaX)
+			areaX -= std::ceil((areaX - paintX) / (float)texW) * texW;
+		if ((paintX + paintW) > (areaX + areaW))
+			areaW += std::ceil(((paintX + paintW) - (areaX + areaW)) / (float)texW) * texW;
+		if (paintY < areaY)
+			areaY -= std::ceil((areaY - paintY) / (float)texH) * texH;
+		if ((paintY + paintH) > (areaY + areaH))
+			areaH += std::ceil(((paintY + paintH) - (areaY + areaH)) / (float)texH) * texH;
+
+		if (texW <= 0 || texH <= 0 || areaW <= 0 || areaH <= 0)
+		{
+			tilesX = tilesY = 0;
+			spacingX = spacingY = 0;
+			return;
+		}
+
+		if (bg.repeatX == CSS_VALUE_ROUND)
+		{
+			sint numTiles = std::max(1, (sint)std::round((float)areaW / texW));
+			texW = areaW / numTiles;
+			if (bg.height.isAuto() && bg.repeatY != CSS_VALUE_ROUND)
+			{
+				float aspect = (float)areaW / (numTiles * texW);
+				texH = texW * aspect;
+			}
+		}
+
+		if (bg.repeatY == CSS_VALUE_ROUND)
+		{
+			sint numTiles = std::max(1, (sint)std::round((float)areaH / texH));
+			texH = areaH / numTiles;
+			if (bg.width.isAuto() && bg.repeatX != CSS_VALUE_ROUND)
+			{
+				float aspect = (float)areaH / (numTiles * texH);
+				texW = texH * aspect;
+			}
+		}
+
+		getImageTile(texX, texW, spacingX, tilesX, areaX, areaW, bg.repeatX);
+		getImageTile(texY, texH, spacingY, tilesY, areaY, areaH, bg.repeatY);
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::buildColorQuads(const CSSBackground &bg)
+	{
+		if (bg.color.A == 0)
+			return;
+
+		// painting area defined with background-clip
+		sint32 x, y, w, h;
+		getPaintingArea(bg, x, y, w, h);
+
+		if (w <= 0 || h <= 0)
+			return;
+
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+
+		SDrawQueue shape;
+		shape.Quad.Uv0.set(0.f, 1.f);
+		shape.Quad.Uv1.set(1.f, 1.f);
+		shape.Quad.Uv2.set(1.f, 0.f);
+		shape.Quad.Uv3.set(0.f, 0.f);
+
+		shape.Quad.V0.set(x,   y,   0);
+		shape.Quad.V1.set(x+w, y,   0);
+		shape.Quad.V2.set(x+w, y+h, 0);
+		shape.Quad.V3.set(x,   y+h, 0);
+
+		shape.Color = bg.color;
+		shape.TextureId = rVR.getBlankTextureId();
+
+		m_DrawQueue.push_back(shape);
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBackgroundRenderer::buildImageQuads(const CSSBackground &bg, sint32 textureId)
+	{
+		// TODO: m_Background should have textureId and that should be "reserved" in CViewRenderer
+		// even before download is finished
+		if (textureId < 0)
+			return;
+
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+
+		sint32 texW = 0;
+		sint32 texH = 0;
+		rVR.getTextureSizeFromId(textureId, texW, texH);
+		if (texW <= 0 || texH <= 0)
+			return;
+
+		// get requested texture size
+		calculateSize(m_Background, texW, texH);
+		if(texW <= 0 || texH <= 0)
+			return;
+
+		// get texture left/top corner
+		sint32 texX, texY;
+		calculatePosition(m_Background, texX, texY, texW, texH);
+
+		sint32 tilesX, tilesY;
+		sint32 spacingX, spacingY;
+		calculateTiles(m_Background, texX, texY, texW, texH, tilesX, tilesY, spacingX, spacingY);
+
+		sint32 clipL, clipB, clipR, clipT;
+		getPaintingArea(m_Background, clipL, clipB, clipR, clipT);
+		clipR += clipL;
+		clipT += clipB;
+
+		m_DrawQueue.reserve(tilesX * tilesY + m_DrawQueue.size());
+		for(sint32 tileX = 0; tileX < tilesX; tileX++)
+		{
+			for(sint32 tileY = 0; tileY < tilesY; tileY++)
+			{
+				sint32 tileL = texX + tileX * (texW + spacingX);
+				sint32 tileB = texY + tileY * (texH + spacingY);
+				sint32 tileR = tileL + texW;
+				sint32 tileT = tileB + texH;
+
+				// tile is outside clip area
+				if (tileT <= clipB || tileB >= clipT || tileR <= clipL || tileL >= clipR)
+					continue;
+
+				CUV uv0(0,1);
+				CUV uv1(1,1);
+				CUV uv2(1,0);
+				CUV uv3(0,0);
+
+				// clip if tile not totally inside clip area
+				if (!(tileL >= clipL && tileR <= clipR && tileB >= clipB && tileT <= clipT))
+				{
+					float ratio;
+					if (tileL < clipL)
+					{
+						ratio = ((float)(clipL - tileL))/((float)(tileR - tileL));
+						tileL = clipL;
+						uv0.U += ratio*(uv1.U-uv0.U);
+						uv3.U += ratio*(uv2.U-uv3.U);
+					}
+
+					if (tileB < clipB)
+					{
+						ratio = ((float)(clipB - tileB))/((float)(tileT - tileB));
+						tileB = clipB;
+						uv0.V += ratio*(uv3.V-uv0.V);
+						uv1.V += ratio*(uv2.V-uv1.V);
+					}
+
+					if (tileR > clipR)
+					{
+						ratio = ((float)(clipR - tileR))/((float)(tileL - tileR));
+						tileR = clipR;
+						uv2.U += ratio*(uv3.U-uv2.U);
+						uv1.U += ratio*(uv0.U-uv1.U);
+					}
+
+					if (tileT > clipT)
+					{
+						ratio = ((float)(clipT - tileT))/((float)(tileB - tileT));
+						tileT = clipT;
+						uv2.V += ratio*(uv1.V-uv2.V);
+						uv3.V += ratio*(uv0.V-uv3.V);
+					}
+				}
+
+				SDrawQueue shape;
+				shape.Quad.Uv0 = uv0;
+				shape.Quad.Uv1 = uv1;
+				shape.Quad.Uv2 = uv2;
+				shape.Quad.Uv3 = uv3;
+
+				shape.Color = CRGBA::White;
+				shape.TextureId = textureId;
+
+				shape.Quad.V0.set(tileL, tileB, 0);
+				shape.Quad.V1.set(tileR, tileB, 0);
+				shape.Quad.V2.set(tileR, tileT, 0);
+				shape.Quad.V3.set(tileL, tileT, 0);
+
+				m_DrawQueue.push_back(shape);
+			}
+		}
+	}
+
+}//namespace
+
diff --git a/nel/src/gui/css_length.cpp b/nel/src/gui/css_length.cpp
new file mode 100644
index 000000000..fde47b644
--- /dev/null
+++ b/nel/src/gui/css_length.cpp
@@ -0,0 +1,222 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdpch.h"
+
+#include <string>
+#include "nel/gui/css_length.h"
+
+using namespace NLMISC;
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+namespace NLGUI
+{
+
+bool CSSLength::parseValue(const std::string &value, bool allowPercent, bool allowNegative)
+{
+	static const std::set<std::string> knownUnits = {
+		"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
+	};
+
+	std::string::size_type pos = 0;
+	std::string::size_type len = value.size();
+	if (len == 0)
+		return false;
+
+	if (len == 1 && value[0] == '0')
+	{
+		m_Value = 0;
+		m_Kind = Auto;
+		return true;
+	}
+
+	// +100px; -100px
+	if (value[0] == '+')
+		pos++;
+	else if (allowNegative && value[0] == '-')
+		pos++;
+
+	while(pos < len)
+	{
+		bool isNumeric = (value[pos] >= '0' && value[pos] <= '9')
+			|| (pos == 0 && value[pos] == '.')
+			|| (pos > 0 && value[pos] == '.' && value[pos-1] >= '0' && value[pos-1] <= '9');
+
+		if (!isNumeric)
+			break;
+
+		pos++;
+	}
+
+	std::string unit = toLowerAscii(value.substr(pos));
+	if (knownUnits.count(unit))
+	{
+		std::string tmpstr = value.substr(0, pos);
+		return fromString(tmpstr, m_Value);
+	}
+
+	return false;
+}
+
+float CSSLength::getValue() const
+{
+	if (m_Unit == CSS_UNIT_PERCENT)
+		return m_Value / 100.f;
+
+	return m_Value;
+}
+void CSSLength::setFloatValue(float f, const std::string &unit)
+{
+	m_Value = f;
+	setUnit(unit);
+}
+
+void CSSLength::setUnit(const std::string &unit)
+{
+	if (unit.empty())
+	{
+		m_Unit = CSS_UNIT_NONE;
+		m_Kind = Fixed;
+	}
+	else if (unit == "px")
+	{
+		m_Unit = CSS_UNIT_PX;
+		m_Kind = Fixed;
+	} else if (unit == "pt")
+	{
+		m_Unit = CSS_UNIT_PT;
+		m_Kind = Fixed;
+	} else if (unit == "%")
+	{
+		m_Unit = CSS_UNIT_PERCENT;
+		m_Kind = Relative;
+	} else if (unit == "em")
+	{
+		m_Unit = CSS_UNIT_EM;
+		m_Kind = Relative;
+	} else if (unit == "rem")
+	{
+		m_Unit = CSS_UNIT_REM;
+		m_Kind = Relative;
+	} else if (unit == "vw")
+	{
+		m_Unit = CSS_UNIT_VW;
+		m_Kind = Relative;
+	} else if (unit == "vh")
+	{
+		m_Unit = CSS_UNIT_VH;
+		m_Kind = Relative;
+	} else if (unit == "vi")
+	{
+		m_Unit = CSS_UNIT_VI;
+		m_Kind = Relative;
+	} else if (unit == "vb")
+	{
+		m_Unit = CSS_UNIT_VB;
+		m_Kind = Relative;
+	} else if (unit == "vmin")
+	{
+		m_Unit = CSS_UNIT_VMIN;
+		m_Kind = Relative;
+	} else if (unit == "vmax")
+	{
+		m_Unit = CSS_UNIT_VMAX;
+		m_Kind = Relative;
+	} else if (unit == "auto")
+	{
+		m_Unit = CSS_UNIT_NONE;
+		m_Kind = Auto;
+	} else
+	{
+		// fallback to auto
+		m_Unit = CSS_UNIT_NONE;
+		m_Kind = Auto;
+	}
+}
+
+float CSSLength::calculate(uint32 relValue, uint32 emSize, uint32 remSize, uint32 vwSize, uint32 vhSize = 0) const
+{
+	float value = getValue();
+	switch(m_Unit)
+	{
+		case CSS_UNIT_EM:
+			return emSize * value;
+		case CSS_UNIT_REM:
+			return remSize * value;
+		case CSS_UNIT_PERCENT:
+			return relValue * value;
+		case CSS_UNIT_PX:
+		case CSS_UNIT_PT:
+			return value;
+		case CSS_UNIT_VW:
+		case CSS_UNIT_VI:
+			// Vi for horizontal writing mode only
+			return (float)vwSize*0.01f;
+		case CSS_UNIT_VH:
+		case CSS_UNIT_VB:
+			// Vb for horizontal writing mode only
+			return (float)vhSize*0.01f;
+		case CSS_UNIT_VMIN:
+			return (float)std::min(vwSize, vhSize)*0.01f;
+		case CSS_UNIT_VMAX:
+			return (float)std::max(vwSize, vhSize)*0.01f;
+	}
+
+	nldebug("Unknown CSS unit '%s'", toString().c_str());
+	return value;
+}
+
+std::string CSSLength::toString() const
+{
+	if (m_Kind == Auto)
+		return "auto";
+
+	std::string ret;
+	ret += NLMISC::toString("%f", m_Value);
+
+	size_t pos = ret.find(".");
+	for( ; pos < ret.size(); ++pos)
+	{
+		if (ret[pos] != '0')
+			break;
+	}
+	if (pos == ret.size())
+		ret = ret.substr(0, ret.find("."));
+
+	switch(m_Unit)
+	{
+		case CSS_UNIT_NONE: break;
+		case CSS_UNIT_EM: ret += "em"; break;
+		case CSS_UNIT_REM: ret += "rem"; break;
+		case CSS_UNIT_PERCENT: ret += "%"; break;
+		case CSS_UNIT_PX: ret += "px"; break;
+		case CSS_UNIT_PT: ret += "pt"; break;
+		case CSS_UNIT_VW: ret += "vw"; break;
+		case CSS_UNIT_VH: ret += "vh"; break;
+		case CSS_UNIT_VI: ret += "vi"; break;
+		case CSS_UNIT_VB: ret += "vb"; break;
+		case CSS_UNIT_VMIN: ret += "vmin"; break;
+		case CSS_UNIT_VMAX: ret += "vmax"; break;
+	}
+
+	return ret;
+}
+
+} // namespace
+

From f26dc534c83a7d54169c7aeb2e5ead8ee3f9cdd5 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Wed, 30 Jun 2021 13:48:41 +0300
Subject: [PATCH 274/292] Split CDataDownload into subclasses

---
 nel/include/nel/gui/group_html.h  | 114 +++++---
 nel/include/nel/gui/view_bitmap.h |   7 +-
 nel/src/gui/group_html.cpp        | 422 ++++++++++++++++--------------
 nel/src/gui/view_bitmap.cpp       |  10 +-
 4 files changed, 319 insertions(+), 234 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 3c94e7fa9..c94bec024 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -47,6 +47,20 @@ namespace NLGUI
 
 	extern std::string CurrentCookie;
 
+	class ICurlDownloadCB
+	{
+	public:
+		ICurlDownloadCB(const std::string &url)
+		: url(url)
+		{}
+
+		virtual ~ICurlDownloadCB() {};
+
+		virtual void finish() = 0;
+
+		std::string url;
+	};
+
 	// HTML group
 	/**
 	 * Widget to have a resizable scrolltext and its scrollbar
@@ -133,9 +147,8 @@ namespace NLGUI
 		void endParagraph();
 
 		// add image download (used by view_bitmap.cpp to load web images)
-		void addImageDownload(const std::string &url, CViewBase *img, const CStyleParams &style = CStyleParams(), const TImageType type = NormalImage, const std::string &placeholder = "web_del.tga");
-		// remove image from download list if present
-		void removeImageDownload(CViewBase *img);
+		ICurlDownloadCB *addImageDownload(const std::string &url, CViewBase *img, const CStyleParams &style = CStyleParams(), const TImageType type = NormalImage, const std::string &placeholder = "web_del.tga");
+		void removeImageDownload(ICurlDownloadCB *handle, CViewBase *img);
 		std::string localImageName(const std::string &url);
 
 		// Timeout
@@ -817,48 +830,89 @@ namespace NLGUI
 		// decode all HTML entities
 		static std::string decodeHTMLEntities(const std::string &str);
 
-		struct CDataImageDownload
+		class CDataDownload : public ICurlDownloadCB
 		{
 		public:
-			CDataImageDownload(CViewBase *img, CStyleParams style, TImageType type): Image(img), Style(style), Type(type)
-			{
-			}
+			CDataDownload(const std::string &u, const std::string &d)
+				: ICurlDownloadCB(u), data(NULL), fp(NULL), dest(d), redirects(0), ConnectionTimeout(60)
+			{}
+			virtual ~CDataDownload();
+
 		public:
-			CViewBase * Image;
-			CStyleParams Style;
-			TImageType Type;
+			CCurlWWWData *data;
+			std::string dest;
+			std::string tmpdest;
+			uint32 redirects;
+			FILE *fp;
+			uint32 ConnectionTimeout;
+		};
+
+		class StylesheetDownloadCB : public CDataDownload
+		{
+		public:
+			StylesheetDownloadCB(const std::string &url, const std::string &dest, CGroupHTML *parent)
+				: CDataDownload(url, dest), Parent(parent)
+			{}
+
+			virtual void finish() NL_OVERRIDE;
+
+		private:
+			CGroupHTML *Parent;
 		};
 
-		struct CDataDownload
+		class ImageDownloadCB : public CDataDownload
 		{
 		public:
-			CDataDownload(const std::string &u, const std::string &d, TDataType t, CViewBase *i, const std::string &s, const std::string &m, const CStyleParams &style = CStyleParams(), const TImageType imagetype = NormalImage)
-				: data(NULL), fp(NULL), url(u), dest(d), type(t), luaScript(s), md5sum(m), redirects(0), ConnectionTimeout(60)
+			struct SImageInfo
+			{
+				SImageInfo(CViewBase *img, const CStyleParams &style, TImageType type)
+				: Image(img), Style(style), Type(type)
+				{}
+
+				CViewBase *Image;
+				CStyleParams Style;
+				TImageType Type;
+			};
+
+			ImageDownloadCB(const std::string &url, const std::string &dest, CViewBase *img, const CStyleParams &style, TImageType type, CGroupHTML *parent)
+			: CDataDownload(url, dest), Parent(parent)
 			{
-				if (t == ImgType) imgs.push_back(CDataImageDownload(i, style, imagetype));
+				addImage(img, style, type);
 			}
-			~CDataDownload();
 
+			virtual void finish() NL_OVERRIDE;
+
+			void addImage(CViewBase *img, const CStyleParams &style, TImageType type);
+			void removeImage(CViewBase *img);
+
+		private:
+			std::vector<SImageInfo> Images;
+			CGroupHTML *Parent;
+			CStyleParams Style;
+			TImageType Type;
+		};
+
+		class BnpDownloadCB : public CDataDownload
+		{
 		public:
-			CCurlWWWData *data;
-			std::string url;
-			std::string dest;
-			std::string tmpdest;
-			std::string luaScript;
-			std::string md5sum;
-			TDataType type;
-			uint32 redirects;
-			FILE *fp;
-			std::vector<CDataImageDownload> imgs;
-			uint32 ConnectionTimeout;
+			BnpDownloadCB(const std::string &url, const std::string &dest, const std::string md5sum, const std::string lua, CGroupHTML *parent)
+			: CDataDownload(url, dest), Parent(parent), m_md5sum(md5sum), m_lua(lua)
+			{}
+
+			virtual void finish() NL_OVERRIDE;
+
+		private:
+			CGroupHTML *Parent;
+			std::string m_md5sum;
+			std::string m_lua;
 		};
 
-		std::list<CDataDownload> Curls;
+		std::list<CDataDownload*> Curls;
 		CURLM *MultiCurl;
 		int RunningCurls;
 
-		bool startCurlDownload(CDataDownload &download);
-		void finishCurlDownload(const CDataDownload &download);
+		bool startCurlDownload(CDataDownload *download);
+		void finishCurlDownload(CDataDownload *download);
 		void pumpCurlQueue();
 
 		void initImageDownload();
@@ -888,7 +942,7 @@ namespace NLGUI
 		// _CurlWWW download finished
 		void htmlDownloadFinished(bool success, const std::string &error);
 		// images, stylesheets, etc finished downloading
-		void dataDownloadFinished(bool success, const std::string &error, CDataDownload &data);
+		void dataDownloadFinished(bool success, const std::string &error, CDataDownload *data);
 
 		// HtmlType download finished
 		void htmlDownloadFinished(const std::string &content, const std::string &type, long code);
diff --git a/nel/include/nel/gui/view_bitmap.h b/nel/include/nel/gui/view_bitmap.h
index f7a77cb30..958fdcc5c 100644
--- a/nel/include/nel/gui/view_bitmap.h
+++ b/nel/include/nel/gui/view_bitmap.h
@@ -28,6 +28,7 @@
 
 namespace NLGUI
 {
+	class ICurlDownloadCB;
 
 	/**
 	 * class implementing a bitmap view
@@ -61,7 +62,7 @@ namespace NLGUI
 			_TxtHeight = -1;
 
 			// Support for https://.. textures
-			_HtmlDownload = false;
+			_HtmlDownload = NULL;
 		}
 
 		/// Destructor
@@ -141,7 +142,9 @@ namespace NLGUI
 		bool	_Flip           : 1;
 		bool	_Tile           : 1;
 		bool	_InheritGCAlpha : 1;
-		bool	_HtmlDownload   : 1;
+
+		// pointer to active curl download object
+		ICurlDownloadCB *_HtmlDownload;
 
 		// For single texture
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 75d7eb64c..0c48b92a8 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -266,6 +266,120 @@ namespace NLGUI
 		data = NULL;
 	}
 
+	void CGroupHTML::StylesheetDownloadCB::finish()
+	{
+		if (CFile::fileExists(tmpdest))
+		{
+			if (CFile::fileExists(dest))
+			{
+				CFile::deleteFile(dest);
+			}
+			CFile::moveFile(dest, tmpdest);
+		}
+		Parent->cssDownloadFinished(url, dest);
+	}
+
+	void CGroupHTML::ImageDownloadCB::addImage(CViewBase *img, const CStyleParams &style, TImageType type)
+	{
+		Images.push_back(SImageInfo(img, style, type));
+	}
+
+	void CGroupHTML::ImageDownloadCB::removeImage(CViewBase *img)
+	{
+		for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+		{
+			if (it->Image == img)
+			{
+				Images.erase(it);
+				break;
+			}
+		}
+	}
+
+	void CGroupHTML::ImageDownloadCB::finish()
+	{
+		// tmpdest file does not exist if download skipped (ie cache was used)
+		if (CFile::fileExists(tmpdest) || CFile::getFileSize(tmpdest) == 0)
+		{
+			try {
+				// verify that image is not corrupted
+				uint32 w, h;
+				CBitmap::loadSize(tmpdest, w, h);
+				if (w != 0 && h != 0)
+				{
+					if (CFile::fileExists(dest))
+						CFile::deleteFile(dest);
+				}
+			}
+			catch(const NLMISC::Exception &e)
+			{
+				// exception message has .tmp file name, so keep it for further analysis
+				nlwarning("Invalid image (%s) from url (%s): %s", tmpdest.c_str(), url.c_str(), e.what());
+			}
+
+			// to reload image on page, the easiest seems to be changing texture
+			// to temp file temporarily. that forces driver to reload texture from disk
+			// ITexture::touch() seem not to do this.
+			// cache was updated, first set texture as temp file
+			for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+			{
+				SImageInfo &img = *it;
+				Parent->setImage(img.Image, tmpdest, img.Type);
+				Parent->setImageSize(img.Image, img.Style);
+			}
+
+			CFile::moveFile(dest, tmpdest);
+		}
+
+		if (!CFile::fileExists(dest) || CFile::getFileSize(dest) == 0)
+		{
+			// placeholder if cached image failed
+			dest = "web_del.tga";
+		}
+
+		// even if image was cached, incase there was 'http://' image set to CViewBitmap
+		for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+		{
+			SImageInfo &img = *it;
+			Parent->setImage(img.Image, dest, img.Type);
+			Parent->setImageSize(img.Image, img.Style);
+		}
+	}
+
+	void CGroupHTML::BnpDownloadCB::finish()
+	{
+		bool verified = false;
+		// no tmpfile if file was already in cache
+		if (CFile::fileExists(tmpdest))
+		{
+			verified = m_md5sum.empty() || (m_md5sum != getMD5(tmpdest).toString());
+			if (verified)
+			{
+				if (CFile::fileExists(dest))
+				{
+					CFile::deleteFile(dest);
+				}
+				CFile::moveFile(dest, tmpdest);
+			}
+			else
+			{
+				CFile::deleteFile(tmpdest);
+			}
+		}
+		else if (CFile::fileExists(dest))
+		{
+			verified = m_md5sum.empty() || (m_md5sum != getMD5(dest).toString());
+		}
+
+		if (!m_lua.empty())
+		{
+			std::string script = "\nlocal __CURRENT_WINDOW__ = \""+Parent->getId()+"\"";
+			script += toString("\nlocal __DOWNLOAD_STATUS__ = %s\n", verified ? "true" : "false");
+			script += m_lua;
+			CLuaManager::getInstance().executeLuaScript(script, true );
+		}
+	}
+
 	// Check if domain is on TrustedDomain
 	bool CGroupHTML::isTrustedDomain(const string &domain)
 	{
@@ -479,17 +593,17 @@ namespace NLGUI
 	{
 		if (RunningCurls < options.curlMaxConnections)
 		{
-			std::list<CDataDownload>::iterator it=Curls.begin();
-			uint c = 0;
+			std::list<CDataDownload*>::iterator it=Curls.begin();
 			while(it != Curls.end() && RunningCurls < options.curlMaxConnections)
 			{
-				if (it->data == NULL)
+				if ((*it)->data == NULL)
 				{
 					LOG_DL("(%s) starting new download '%s'", _Id.c_str(), it->url.c_str());
 					if (!startCurlDownload(*it))
 					{
 						LOG_DL("(%s) failed to start '%s)'", _Id.c_str(), it->url.c_str());
 						finishCurlDownload(*it);
+
 						it = Curls.erase(it);
 						continue;
 					}
@@ -504,11 +618,11 @@ namespace NLGUI
 	}
 
 	// Add url to MultiCurl queue and return cURL handle
-	bool CGroupHTML::startCurlDownload(CDataDownload &download)
+	bool CGroupHTML::startCurlDownload(CDataDownload *download)
 	{
 		if (!MultiCurl)
 		{
-			nlwarning("Invalid MultiCurl handle, unable to download '%s'", download.url.c_str());
+			nlwarning("Invalid MultiCurl handle, unable to download '%s'", download->url.c_str());
 			return false;
 		}
 
@@ -516,28 +630,28 @@ namespace NLGUI
 		time(&currentTime);
 
 		CHttpCacheObject cache;
-		if (CFile::fileExists(download.dest))
-			cache = CHttpCache::getInstance()->lookup(download.dest);
+		if (CFile::fileExists(download->dest))
+			cache = CHttpCache::getInstance()->lookup(download->dest);
 
 		if (cache.Expires > currentTime)
 		{
-			LOG_DL("Cache for (%s) is not expired (%s, expires:%d)", download.url.c_str(), download.dest.c_str(), cache.Expires - currentTime);
+			LOG_DL("Cache for (%s) is not expired (%s, expires:%d)", download->url.c_str(), download->dest.c_str(), cache.Expires - currentTime);
 			return false;
 		}
 
 		// use browser Id so that two browsers would not use same temp file
-		download.tmpdest = localImageName(_Id + download.dest) + ".tmp";
+		download->tmpdest = localImageName(_Id + download->dest) + ".tmp";
 
 		// erase the tmp file if exists
-		if (CFile::fileExists(download.tmpdest))
+		if (CFile::fileExists(download->tmpdest))
 		{
-			CFile::deleteFile(download.tmpdest);
+			CFile::deleteFile(download->tmpdest);
 		}
 
-		FILE *fp = nlfopen (download.tmpdest, "wb");
+		FILE *fp = nlfopen (download->tmpdest, "wb");
 		if (fp == NULL)
 		{
-			nlwarning("Can't open file '%s' for writing: code=%d '%s'", download.tmpdest.c_str (), errno, strerror(errno));
+			nlwarning("Can't open file '%s' for writing: code=%d '%s'", download->tmpdest.c_str (), errno, strerror(errno));
 			return false;
 		}
 
@@ -545,28 +659,28 @@ namespace NLGUI
 		if (!curl)
 		{
 			fclose(fp);
-			CFile::deleteFile(download.tmpdest);
+			CFile::deleteFile(download->tmpdest);
 
-			nlwarning("Creating cURL handle failed, unable to download '%s'", download.url.c_str());
+			nlwarning("Creating cURL handle failed, unable to download '%s'", download->url.c_str());
 			return false;
 		}
-		LOG_DL("curl easy handle %p created for '%s'", curl, download.url.c_str());
+		LOG_DL("curl easy handle %p created for '%s'", curl, download->url.c_str());
 
 		// https://
-		if (toLowerAscii(download.url.substr(0, 8)) == "https://")
+		if (toLowerAscii(download->url.substr(0, 8)) == "https://")
 		{
 			// if supported, use custom SSL context function to load certificates
 			NLWEB::CCurlCertificates::useCertificates(curl);
 		}
 
-		download.data = new CCurlWWWData(curl, download.url);
-		download.fp = fp;
+		download->data = new CCurlWWWData(curl, download->url);
+		download->fp = fp;
 
 		// initial connection timeout, curl default is 300sec
-		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, download.ConnectionTimeout);
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, download->ConnectionTimeout);
 
 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, true);
-		curl_easy_setopt(curl, CURLOPT_URL, download.url.c_str());
+		curl_easy_setopt(curl, CURLOPT_URL, download->url.c_str());
 
 		// limit curl to HTTP and HTTPS protocols only
 		curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
@@ -580,16 +694,16 @@ namespace NLGUI
 			headers.push_back("If-Modified-Since: " + cache.LastModified);
 
 		if (headers.size() > 0)
-			download.data->sendHeaders(headers);
+			download->data->sendHeaders(headers);
 
 		// catch headers
 		curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, NLGUI::curlHeaderCallback);
-		curl_easy_setopt(curl, CURLOPT_WRITEHEADER, download.data);
+		curl_easy_setopt(curl, CURLOPT_WRITEHEADER, download->data);
 
 		std::string userAgent = options.appName + "/" + options.appVersion;
 		curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
 
-		CUrlParser uri(download.url);
+		CUrlParser uri(download->url);
 		if (!uri.host.empty())
 			sendCookies(curl, uri.host, isTrustedDomain(uri.host));
 
@@ -599,7 +713,7 @@ namespace NLGUI
 		CURLMcode ret = curl_multi_add_handle(MultiCurl, curl);
 		if (ret != CURLM_OK)
 		{
-			nlwarning("cURL multi handle %p error %d on '%s'", curl, ret, download.url.c_str());
+			nlwarning("cURL multi handle %p error %d on '%s'", curl, ret, download->url.c_str());
 			return false;
 		}
 
@@ -607,118 +721,21 @@ namespace NLGUI
 		return true;
 	}
 
-	void CGroupHTML::finishCurlDownload(const CDataDownload &download)
+	void CGroupHTML::finishCurlDownload(CDataDownload *download)
 	{
-		if (download.type == ImgType)
+		if (download)
 		{
-			if (CFile::fileExists(download.tmpdest) && CFile::getFileSize(download.tmpdest) > 0)
-			{
-				try
-				{
-					// verify that image is not corrupted
-					uint32 w, h;
-					CBitmap::loadSize(download.tmpdest, w, h);
-					if (w != 0 && h != 0)
-					{
-						if (CFile::fileExists(download.dest))
-							CFile::deleteFile(download.dest);
-
-						// to reload image on page, the easiest seems to be changing texture
-						// to temp file temporarily. that forces driver to reload texture from disk
-						// ITexture::touch() seem not to do this.
-						// cache was updated, first set texture as temp file
-						for(uint i = 0; i < download.imgs.size(); i++)
-						{
-							setImage(download.imgs[i].Image, download.tmpdest, download.imgs[i].Type);
-							setImageSize(download.imgs[i].Image, download.imgs[i].Style);
-						}
-
-						CFile::moveFile(download.dest, download.tmpdest);
-					}
-				}
-				catch(const NLMISC::Exception &e)
-				{
-					// exception message has .tmp file name, so keep it for further analysis
-					nlwarning("Invalid image (%s) from url (%s): %s", download.tmpdest.c_str(), download.url.c_str(), e.what());
-				}
-			}
-
-			if (CFile::fileExists(download.dest) && CFile::getFileSize(download.dest) > 0)
-			{
-				try
-				{
-					// verify that image is not corrupted
-					uint32 w, h;
-					CBitmap::loadSize(download.dest, w, h);
-					if (w != 0 && h != 0)
-					for(uint i = 0; i < download.imgs.size(); i++)
-					{
-						setImage(download.imgs[i].Image, download.dest, download.imgs[i].Type);
-						setImageSize(download.imgs[i].Image, download.imgs[i].Style);
-					}
-				}
-				catch(const NLMISC::Exception &e)
-				{
-					nlwarning("Invalid image (%s) from url (%s): %s", download.dest.c_str(), download.url.c_str(), e.what());
-				}
-			}
-
-			return;
+			download->finish();
+			delete download;
 		}
-
-		if (download.type == StylesheetType)
-		{
-			if (CFile::fileExists(download.tmpdest))
-			{
-				if (CFile::fileExists(download.dest))
-				{
-					CFile::deleteFile(download.dest);
-				}
-				CFile::moveFile(download.dest, download.tmpdest);
-			}
-			cssDownloadFinished(download.url, download.dest);
-
-			return;
-		}
-
-		if (download.type == BnpType)
+		else
 		{
-			bool verified = false;
-			// no tmpfile if file was already in cache
-			if (CFile::fileExists(download.tmpdest))
-			{
-				verified = download.md5sum.empty() || (download.md5sum != getMD5(download.tmpdest).toString());
-				if (verified)
-				{
-					if (CFile::fileExists(download.dest))
-					{
-						CFile::deleteFile(download.dest);
-					}
-					CFile::moveFile(download.dest, download.tmpdest);
-				}
-				else
-				{
-					CFile::deleteFile(download.tmpdest);
-				}
-			}
-			else if (CFile::fileExists(download.dest))
-			{
-				verified = download.md5sum.empty() || (download.md5sum != getMD5(download.dest).toString());
-			}
-
-			std::string script = "\nlocal __CURRENT_WINDOW__ = \""+this->_Id+"\"";
-			script += toString("\nlocal __DOWNLOAD_STATUS__ = %s\n", verified ? "true" : "false");
-			script += download.luaScript;
-			CLuaManager::getInstance().executeLuaScript(script, true );
-
-			return;
+			nlwarning("Unknown CURL download (nullptr)");
 		}
-
-		nlwarning("Unknown CURL download type (%d) finished '%s'", download.type, download.url.c_str());
 	}
 
 	// Add a image download request in the multi_curl
-	void CGroupHTML::addImageDownload(const string &url, CViewBase *img, const CStyleParams &style, TImageType type, const std::string &placeholder)
+	ICurlDownloadCB *CGroupHTML::addImageDownload(const string &url, CViewBase *img, const CStyleParams &style, TImageType type, const std::string &placeholder)
 	{
 		std::string finalUrl;
 		img->setModulateGlobalColor(style.GlobalColor);
@@ -728,7 +745,7 @@ namespace NLGUI
 		{
 			setImage(img, decodeURIComponent(url), type);
 			setImageSize(img, style);
-			return;
+			return NULL;
 		}
 
 		// load the image from local files/bnp
@@ -737,7 +754,7 @@ namespace NLGUI
 		{
 			setImage(img, image, type);
 			setImageSize(img, style);
-			return;
+			return NULL;
 		}
 
 		finalUrl = upgradeInsecureUrl(getAbsoluteUrl(url));
@@ -759,36 +776,40 @@ namespace NLGUI
 		}
 
 		// Search if we are not already downloading this url.
-		for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
+		for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
-			if(it->url == finalUrl)
+			if((*it)->url == finalUrl)
 			{
 				LOG_DL("already downloading '%s' img %p", finalUrl.c_str(), img);
-				it->imgs.push_back(CDataImageDownload(img, style, type));
-				return;
+				ImageDownloadCB *cb = dynamic_cast<ImageDownloadCB*>(*it);
+				if (cb)
+				{
+					cb->addImage(img, style, type);
+					// return pointer to shared ImageDownloadCB
+					return cb;
+				}
+				else
+				{
+					nlwarning("Found image download '%s', but casting to ImageDownloadCB failed", finalUrl.c_str());
+				}
 			}
 		}
 
-		Curls.push_back(CDataDownload(finalUrl, dest, ImgType, img, "", "", style, type));
-		pumpCurlQueue();
+		Curls.push_back(new ImageDownloadCB(finalUrl, dest, img, style, type, this));
+		// as we return pointer to callback, skip starting downloads just now
+		//pumpCurlQueue();
+		return Curls.back();
 	}
 
-	void CGroupHTML::removeImageDownload(CViewBase *img)
+	void CGroupHTML::removeImageDownload(ICurlDownloadCB *handle, CViewBase *img)
 	{
-		for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
-		{
-			// check all active downloads because image does not keep url around
-			std::vector<CDataImageDownload>::iterator imgIter = it->imgs.begin();
-			while(imgIter != it->imgs.end())
-			{
-				if (imgIter->Image == img)
-				{
-					it->imgs.erase(imgIter);
-					break;
-				}
-				++imgIter;
-			}
+		ImageDownloadCB *cb = dynamic_cast<ImageDownloadCB*>(handle);
+		if (!cb) {
+			nlwarning("Trying to remove image from downloads, but ICurlDownloadCB pointer did not cast to ImageDownloadCB");
+			return;
 		}
+		// image will be removed from handle, but handle is kept and image will be downloaded
+		cb->removeImage(img);
 	}
 
 	void CGroupHTML::initImageDownload()
@@ -815,9 +836,9 @@ namespace NLGUI
 		url = upgradeInsecureUrl(getAbsoluteUrl(url));
 
 		// Search if we are not already downloading this url.
-		for(std::list<CDataDownload>::const_iterator it = Curls.begin(); it != Curls.end(); ++it)
+		for(std::list<CDataDownload*>::const_iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
-			if(it->url == url)
+			if((*it)->url == url)
 			{
 				LOG_DL("already downloading '%s'", url.c_str());
 				return false;
@@ -842,7 +863,7 @@ namespace NLGUI
 		}
 		if (action != "delete")
 		{
-			Curls.push_back(CDataDownload(url, dest, BnpType, NULL, script, md5sum));
+			Curls.push_back(new BnpDownloadCB(url, dest, md5sum, script, this));
 			pumpCurlQueue();
 		}
 		else
@@ -871,7 +892,7 @@ namespace NLGUI
 			_StylesheetQueue.back().Url = url;
 
 			// push to the front of the queue
-			Curls.push_front(CDataDownload(url, localImageName(url), StylesheetType, NULL, "", ""));
+			Curls.push_front(new StylesheetDownloadCB(url, localImageName(url), this));
 		}
 		pumpCurlQueue();
 	}
@@ -915,9 +936,9 @@ namespace NLGUI
 				}
 				else
 				{
-					for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
+					for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 					{
-						if(it->data && it->data->Request == msg->easy_handle)
+						if((*it)->data && (*it)->data->Request == msg->easy_handle)
 						{
 							std::string error;
 							bool success = msg->data.result == CURLE_OK;
@@ -956,27 +977,30 @@ namespace NLGUI
 		}
 
 		// remove all queued and already started downloads
-		for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
+		for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
-			if (it->data)
+			CDataDownload &dl = *(*it);
+			if (dl.data)
 			{
-				LOG_DL("(%s) stop data url '%s'", _Id.c_str(), it->url.c_str());
+				LOG_DL("(%s) stop data url '%s'", _Id.c_str(), dl.url.c_str());
 				if (MultiCurl)
 				{
-					curl_multi_remove_handle(MultiCurl, it->data->Request);
+					curl_multi_remove_handle(MultiCurl, dl.data->Request);
 				}
 
 				// close and remove temp file
-				if (it->fp)
+				if (dl.fp)
 				{
-					fclose(it->fp);
+					fclose(dl.fp);
 
-					if (CFile::fileExists(it->tmpdest))
+					if (CFile::fileExists(dl.tmpdest))
 					{
-						CFile::deleteFile(it->tmpdest);
+						CFile::deleteFile(dl.tmpdest);
 					}
 				}
 			}
+			// release CDataDownload
+			delete *it;
 		}
 		Curls.clear();
 
@@ -2935,10 +2959,10 @@ namespace NLGUI
 		LOG_DL("Clear pointers to %d curls", Curls.size());
 
 		// remove image refs from downloads
-		for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
+		/*for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
 			it->imgs.clear();
-		}
+		}*/
 	}
 
 	// ***************************************************************************
@@ -3691,96 +3715,98 @@ namespace NLGUI
 		updateRefreshButton();
 	}
 
-	void CGroupHTML::dataDownloadFinished(bool success, const std::string &error, CDataDownload &data)
+	void CGroupHTML::dataDownloadFinished(bool success, const std::string &error, CDataDownload *data)
 	{
-		fclose(data.fp);
+		fclose(data->fp);
 
-		CUrlParser uri(data.url);
+		CUrlParser uri(data->url);
 		if (!uri.host.empty())
 		{
-			receiveCookies(data.data->Request, uri.host, isTrustedDomain(uri.host));
+			receiveCookies(data->data->Request, uri.host, isTrustedDomain(uri.host));
 		}
 
 		long code = -1;
-		curl_easy_getinfo(data.data->Request, CURLINFO_RESPONSE_CODE, &code);
+		curl_easy_getinfo(data->data->Request, CURLINFO_RESPONSE_CODE, &code);
 
-		LOG_DL("(%s) transfer '%p' completed with http code %d, url (len %d) '%s'", _Id.c_str(), data.data->Request, code, data.url.size(), data.url.c_str());
-		curl_multi_remove_handle(MultiCurl, data.data->Request);
+		LOG_DL("(%s) transfer '%p' completed with http code %d, url (len %d) '%s'", _Id.c_str(), data->data->Request, code, data->url.size(), data->url.c_str());
+		curl_multi_remove_handle(MultiCurl, data->data->Request);
 
 		// save HSTS header from all requests regardless of HTTP code
 		if (success)
 		{
-			if (data.data->hasHSTSHeader())
+			if (data->data->hasHSTSHeader())
 			{
-				CStrictTransportSecurity::getInstance()->setFromHeader(uri.host, data.data->getHSTSHeader());
+				CStrictTransportSecurity::getInstance()->setFromHeader(uri.host, data->data->getHSTSHeader());
 			}
 
 			// 2XX success, 304 Not Modified
 			if ((code >= 200 && code <= 204) || code == 304)
 			{
 				CHttpCacheObject obj;
-				obj.Expires = data.data->getExpires();
-				obj.Etag = data.data->getEtag();
-				obj.LastModified = data.data->getLastModified();
+				obj.Expires = data->data->getExpires();
+				obj.Etag = data->data->getEtag();
+				obj.LastModified = data->data->getLastModified();
 
-				CHttpCache::getInstance()->store(data.dest, obj);
-				if (code == 304 && CFile::fileExists(data.tmpdest))
+				CHttpCache::getInstance()->store(data->dest, obj);
+				if (code == 304 && CFile::fileExists(data->tmpdest))
 				{
-					CFile::deleteFile(data.tmpdest);
+					CFile::deleteFile(data->tmpdest);
 				}
 			}
 			else if ((code >= 301 && code <= 303) || code == 307 || code == 308)
 			{
-				if (data.redirects < DEFAULT_RYZOM_REDIRECT_LIMIT)
+				if (data->redirects < DEFAULT_RYZOM_REDIRECT_LIMIT)
 				{
-					std::string location(data.data->getLocationHeader());
+					std::string location(data->data->getLocationHeader());
 					if (!location.empty())
 					{
 						CUrlParser uri(location);
 						if (!uri.isAbsolute())
 						{
-							uri.inherit(data.url);
+							uri.inherit(data->url);
 							location = uri.toString();
 						}
 
+						// clear old request state, and curl easy handle
+						delete data->data;
+						data->data = NULL;
+						data->fp = NULL;
+						data->url = location;
+						data->redirects++;
+
 						// push same request in the front of the queue
 						// cache filename is based of original url
 						Curls.push_front(data);
-						// clear old request state
-						Curls.front().data = NULL;
-						Curls.front().fp = NULL;
-						Curls.front().url = location;
-						Curls.front().redirects++;
 
 						LOG_DL("Redirect '%s'", location.c_str());
 						// no finished callback called, so cleanup old temp
-						if (CFile::fileExists(data.tmpdest))
+						if (CFile::fileExists(data->tmpdest))
 						{
-							CFile::deleteFile(data.tmpdest);
+							CFile::deleteFile(data->tmpdest);
 						}
 						return;
 					}
 
-					nlwarning("Redirected to empty url '%s'", data.url.c_str());
+					nlwarning("Redirected to empty url '%s'", data->url.c_str());
 				}
 				else
 				{
-					nlwarning("Redirect limit reached for '%s'", data.url.c_str());
+					nlwarning("Redirect limit reached for '%s'", data->url.c_str());
 				}
 			}
 			else
 			{
-				nlwarning("HTTP request failed with code [%d] for '%s'\n",code, data.url.c_str());
+				nlwarning("HTTP request failed with code [%d] for '%s'\n",code, data->url.c_str());
 				// 404, 500, etc
-				if (CFile::fileExists(data.dest))
+				if (CFile::fileExists(data->dest))
 				{
-					CFile::deleteFile(data.dest);
+					CFile::deleteFile(data->dest);
 				}
 			}
 		}
 		else
 		{
-			nlwarning("DATA download failed '%s', error '%s'", data.url.c_str(), error.c_str());
+			nlwarning("DATA download failed '%s', error '%s'", data->url.c_str(), error.c_str());
 		}
 
 		finishCurlDownload(data);
diff --git a/nel/src/gui/view_bitmap.cpp b/nel/src/gui/view_bitmap.cpp
index 4186a4362..89c944a18 100644
--- a/nel/src/gui/view_bitmap.cpp
+++ b/nel/src/gui/view_bitmap.cpp
@@ -46,8 +46,8 @@ namespace NLGUI
 		{
 			CGroupHTML *groupHtml = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:webig:content:html"));
 			if (groupHtml) {
-				_HtmlDownload = false;
-				groupHtml->removeImageDownload(dynamic_cast<CViewBase*>(this));
+				groupHtml->removeImageDownload(_HtmlDownload, dynamic_cast<CViewBase*>(this));
+				_HtmlDownload = NULL;
 			}
 		}
 	}
@@ -476,12 +476,14 @@ namespace NLGUI
 				if (!CFile::fileExists(localname))
 					localname = "web_del.tga";
 				_TextureId.setTexture (localname.c_str(), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
-				_HtmlDownload = true;
-				groupHtml->addImageDownload(TxName, dynamic_cast<CViewBase*>(this));
+				_HtmlDownload = groupHtml->addImageDownload(TxName, dynamic_cast<CViewBase*>(this));
 			}
 		}
 		else
+		{
+			_HtmlDownload = NULL;
 			_TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
+		}
 	}
 
 	// ----------------------------------------------------------------------------

From dff191a7c21faa0213f6d5af548595d8c2b542c8 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 17 Jul 2021 15:12:27 +0300
Subject: [PATCH 275/292] Move loading texture from file/memory into own
 functions

---
 nel/include/nel/gui/view_renderer.h |   3 +
 nel/src/gui/view_renderer.cpp       | 125 +++++++++++++++++-----------
 2 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/nel/include/nel/gui/view_renderer.h b/nel/include/nel/gui/view_renderer.h
index 35d806aab..d1ad48d43 100644
--- a/nel/include/nel/gui/view_renderer.h
+++ b/nel/include/nel/gui/view_renderer.h
@@ -479,6 +479,9 @@ namespace NLGUI
 		// \name Texture management
 		// ***************************************************************************
 
+		bool loadTextureFromString(SGlobalTexture *gt, const std::string &data);
+		bool loadTextureFromFile(SGlobalTexture *gt, const std::string &filename);
+
 		// SImage accessors
 		SImage	*getSImage(sint32 textureId)
 		{
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 796479e82..0f0676cfc 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -999,6 +999,74 @@ namespace NLGUI
 		ite->Texture = externalTexture;
 	}
 
+	bool CViewRenderer::loadTextureFromString(CViewRenderer::SGlobalTexture *gt, const std::string &data)
+	{
+		size_t pos = data.find(";base64,");
+		if (pos == std::string::npos)
+		{
+			nlwarning("Data does not have 'data:image/...;base64,...' format '%s'", data.c_str());
+			return false;
+		}
+
+		std::string decoded = base64::decode(data.substr(pos + 8));
+		if (decoded.empty())
+		{
+			nlwarning("base64 decoding failed '%s", data.substr(pos + 8).c_str());
+			return false;
+		}
+
+		CMemStream buf;
+		if (buf.isReading()) buf.invert();
+		buf.serialBuffer((uint8 *)(decoded.data()), decoded.size());
+		buf.invert();
+
+		CBitmap btm;
+		btm.load(buf);
+
+		gt->Width = gt->DefaultWidth = btm.getWidth();;
+		gt->Height = gt->DefaultHeight = btm.getHeight();
+
+		if (gt->Width == 0 || gt->Height == 0)
+		{
+			nlwarning("Decoded image has width==0 || height==0, check image format. '%s'", data.c_str());
+			return false;
+		}
+
+		UTextureMem *texture = driver->createTextureMem(btm.getWidth(), btm.getHeight(), CBitmap::RGBA);
+		if (!texture)
+		{
+			nlwarning("Failed to create mem texture (%d,%d)", btm.getWidth(), btm.getHeight());
+			return false;
+		}
+
+		memcpy(texture->getPointer(), btm.getPixels().getPtr(), btm.getSize() * 4);
+		gt->Texture = texture;
+		gt->FromGlobaleTexture = false;
+
+		return true;
+	}
+
+	bool CViewRenderer::loadTextureFromFile(CViewRenderer::SGlobalTexture *gt, const std::string &filename)
+	{
+		// load new file
+		CIFile ifTmp;
+		if (ifTmp.open(filename))
+		{
+			CBitmap::loadSize (ifTmp, gt->Width, gt->Height);
+			gt->DefaultWidth = gt->Width;
+			gt->DefaultHeight = gt->Height;
+			if (gt->Width == 0 || gt->Height == 0)
+			{
+				nlwarning("Failed to load the texture '%s', please check image format", filename.c_str());
+				return false;
+			}
+		}
+
+		gt->Texture = driver->createTextureFile(filename);
+		gt->FromGlobaleTexture = false;
+
+		return true;
+	}
 	/*
 	 * createTexture
 	 */
@@ -1030,27 +1098,20 @@ namespace NLGUI
 		// If global texture not exists create it
 		if (ite == _GlobalTextures.end())
 		{
-			SGlobalTexture gtTmp;
-			gtTmp.FromGlobaleTexture = false;
 			string filename = CPath::lookup (sLwrGTName, false);
 			if (filename.empty() ) return -1;
-			CIFile ifTmp;
-			if (ifTmp.open(filename))
-			{
-				CBitmap::loadSize (ifTmp, gtTmp.Width, gtTmp.Height);
-				gtTmp.DefaultWidth = gtTmp.Width;
-				gtTmp.DefaultHeight = gtTmp.Height;
-				if (gtTmp.Width == 0 || gtTmp.Height == 0)
-				{
-					nlwarning("Failed to load the texture '%s', please check image format", filename.c_str());
-				}
-			}
-			gtTmp.Texture = driver->createTextureFile (sLwrGTName);
+
+			SGlobalTexture gtTmp;
 			gtTmp.Name = sLwrGTName;
+
+			if (!loadTextureFromFile(&gtTmp, filename))
+				return -1;
+
 			gtTmp.Texture->setFilterMode(UTexture::Nearest, UTexture::NearestMipMapOff);
 			if(uploadDXTC)
 				gtTmp.Texture->setUploadFormat(UTexture::DXTC5);
 			gtTmp.Texture->setReleasable(bReleasable);
+
 			_GlobalTextures.push_back(gtTmp);
 			ite = _GlobalTextures.end();
 			ite--;
@@ -1105,44 +1166,10 @@ namespace NLGUI
 		// If global texture not exists create it
 		if (ite == _GlobalTextures.end())
 		{
-			std::string decoded = base64::decode(data.substr(pos + 8));
-			if (decoded.empty())
-			{
-				nlwarning("base64 decode failed '%s'", data.substr(pos + 8).c_str());
-				return -1;
-			}
-
-			//
-			CMemStream buf;
-			if (buf.isReading()) buf.invert();
-			buf.serialBuffer((uint8 *)(decoded.data()), decoded.size());
-			buf.invert();
-
-			CBitmap btm;
-			btm.load(buf);
-
 			SGlobalTexture gtTmp;
-			gtTmp.FromGlobaleTexture = false;
-
-			gtTmp.Width = gtTmp.DefaultWidth = btm.getWidth();;
-			gtTmp.Height = gtTmp.DefaultHeight = btm.getHeight();
-
-			if (gtTmp.Width == 0 || gtTmp.Height == 0)
-			{
-				nlwarning("Failed to load the texture '%s', please check image format", data.c_str());
-				return -1;
-			}
-
-			UTextureMem *texture = driver->createTextureMem(btm.getWidth(), btm.getHeight(), CBitmap::RGBA);
-			if (!texture)
-			{
-				nlwarning("Failed to create mem texture (%d,%d)", btm.getWidth(), btm.getHeight());
+			if (!loadTextureFromString(&gtTmp, data))
 				return -1;
-			}
-
-			memcpy(texture->getPointer(), btm.getPixels().getPtr(), btm.getSize() * 4);
 
-			gtTmp.Texture = texture;
 			gtTmp.Name = md5hash;
 			gtTmp.Texture->setFilterMode(UTexture::Nearest, UTexture::NearestMipMapOff);
 			gtTmp.Texture->setReleasable(bReleasable);

From a40ddf795577af54b1b7f8400d4ed44cf55f5e3a Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 17 Jul 2021 20:13:12 +0300
Subject: [PATCH 276/292] Methods to preallocate texture id and swap texture
 for existing id

---
 nel/include/nel/gui/view_renderer.h |  16 +++
 nel/src/gui/view_renderer.cpp       | 156 +++++++++++++++++++++++++++-
 2 files changed, 169 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/view_renderer.h b/nel/include/nel/gui/view_renderer.h
index d1ad48d43..d4349e83f 100644
--- a/nel/include/nel/gui/view_renderer.h
+++ b/nel/include/nel/gui/view_renderer.h
@@ -252,6 +252,19 @@ namespace NLGUI
 		 */
 		bool loadTextures (const std::string &textureFileName, const std::string &uvFileName, bool uploadDXTC);
 
+		/*
+		 * newTextureId : Return new placeholder texture id.
+		 *                You should call deleteTexture when the texture is not used anymore.
+		 */
+		sint32 newTextureId (const std::string &name);
+
+		/*
+		 * reloadTexture : Replace existing global texture with new.
+		 *                 If previous was texture atlas and still used by 2+ textures,
+		 *                 then create new global texture.
+		 */
+		void reloadTexture (sint32 texId, const std::string &name, bool uploadDXTC=true, bool bReleasable=true);
+
 		/*
 		 *	createTexture : create a texture for the interface, possibly from an externally created texture
 		 *  If no external texture is given, then 'sGlobalTextureName' is the filename of the big texture
@@ -312,6 +325,9 @@ namespace NLGUI
 
 		/**
 		 * get a texture file pointer from a string name. O(logN)
+		 *
+		 * FIXME: only works with textures in atlas loaded with loadTextures()
+		 *
 		 * \param id : the id of the texture
 		 * \return a texture file pointer. -1 if not found or if sName is empty()
 		 */
diff --git a/nel/src/gui/view_renderer.cpp b/nel/src/gui/view_renderer.cpp
index 0f0676cfc..38c4a9bde 100644
--- a/nel/src/gui/view_renderer.cpp
+++ b/nel/src/gui/view_renderer.cpp
@@ -267,10 +267,18 @@ namespace NLGUI
 		TGlobalTextureList::iterator ite = _GlobalTextures.begin();
 		while (ite != _GlobalTextures.end())
 		{
-			UTextureFile *tf = dynamic_cast<NL3D::UTextureFile *>(ite->Texture);
-			if (tf)
+			if (ite->Texture)
 			{
-				driver->deleteTextureFile (tf);
+				UTextureFile *tf = dynamic_cast<NL3D::UTextureFile *>(ite->Texture);
+				if (tf)
+				{
+					driver->deleteTextureFile (tf);
+				}
+				else
+				{
+					UTextureMem *tf = dynamic_cast<NL3D::UTextureMem *>(ite->Texture);
+					if (tf) driver->deleteTextureMem(tf);
+				}
 			}
 			ite++;
 		}
@@ -1067,6 +1075,139 @@ namespace NLGUI
 
 		return true;
 	}
+
+	sint32 CViewRenderer::newTextureId(const std::string &name)
+	{
+		SImage iTmp;
+		iTmp.Name = toLowerAscii(name);
+		iTmp.UVMin = CUV(0,0);
+		iTmp.UVMax = CUV(1,1);
+
+		// lookup global texture with same name
+		TGlobalTextureList::iterator ite = _GlobalTextures.begin();
+		while (ite != _GlobalTextures.end())
+		{
+			std::string sText = toLowerAscii(ite->Name);
+			if (sText == iTmp.Name)
+				break;
+			ite++;
+		}
+
+		if (ite == _GlobalTextures.end())
+		{
+			SGlobalTexture gtTmp;
+			gtTmp.Name = iTmp.Name;
+			gtTmp.FromGlobaleTexture = false;
+			gtTmp.DefaultWidth = gtTmp.Width = 0;
+			gtTmp.DefaultHeight = gtTmp.Height = 0;
+			gtTmp.Texture = NULL;
+			_GlobalTextures.push_back(gtTmp);
+			ite = _GlobalTextures.end();
+			ite--;
+		}
+		iTmp.GlobalTexturePtr = &(*ite);
+
+		// allocate new texture id
+		return addSImage(iTmp);
+	}
+
+	void CViewRenderer::reloadTexture(sint32 texId, const std::string &name, bool uploadDXTC, bool bReleasable)
+	{
+		if ((uint)texId >= _SImageIterators.size())
+		{
+			nlwarning("Invalid texture id %d, maximum is %u", texId, _SImageIterators.size());
+			return;
+		}
+
+		SImage *sImage = getSImage(texId);
+		SGlobalTexture *gt = sImage->GlobalTexturePtr;
+		if (!gt)
+		{
+			nlwarning("Unknown texture id %d (file %s)", texId, name.c_str());
+			return;
+		}
+
+		// create new global texture if previous is atlas
+		if (gt->FromGlobaleTexture)
+		{
+			uint count = 0;
+			TSImageList::iterator ite = _SImages.begin();
+			while (ite != _SImages.end() && count != 2)
+			{
+				// Same global texture ?
+				if (ite->GlobalTexturePtr == gt)
+					count++;
+
+				ite++;
+			}
+
+			// create new only when atlas is used by 2+ textures
+			if (count == 2)
+			{
+				SGlobalTexture gtTmp;
+				gtTmp.Name = toLowerAscii(name);
+				gtTmp.FromGlobaleTexture = false;
+				gtTmp.DefaultWidth = gtTmp.Width = 0;
+				gtTmp.DefaultHeight = gtTmp.Height = 0;
+				gtTmp.Texture = NULL;
+				_GlobalTextures.push_back(gtTmp);
+
+				TGlobalTextureList::iterator ite = _GlobalTextures.end();
+				ite--;
+
+				sImage->GlobalTexturePtr = &(*ite);
+				gt = sImage->GlobalTexturePtr;
+			}
+		}
+
+		NL3D::UTexture *oldTexture = gt->Texture;
+
+		std::string sLwrGTName;
+		if (startsWith(name, "data:image/"))
+		{
+			if (!loadTextureFromString(gt, name))
+				return;
+
+			sLwrGTName = getMD5((uint8 *)name.c_str(), (uint32)name.size()).toString();
+		}
+		else
+		{
+			sLwrGTName = toLowerAscii(name);
+			std::string filename = CPath::lookup(sLwrGTName, false);
+			if (filename.empty())
+			{
+				nlwarning("Unable to find file '%s for texture %d", name.c_str(), texId);
+				return;
+			}
+
+			if (!loadTextureFromFile(gt, filename))
+			{
+				nlwarning("Unable to load texture from file '%s'", filename.c_str());
+				return;
+			}
+		}
+
+		gt->Name = sLwrGTName;
+		gt->Texture->setFilterMode(UTexture::Nearest, UTexture::NearestMipMapOff);
+		gt->Texture->setUploadFormat(uploadDXTC ? UTexture::DXTC5 : UTexture::Auto);
+		gt->Texture->setReleasable(bReleasable);
+
+		// release previous only after successfully loading new one
+		if (oldTexture)
+		{
+			UTextureFile *tf = dynamic_cast<NL3D::UTextureFile *>(oldTexture);
+			if (tf)
+			{
+				driver->deleteTextureFile (tf);
+			}
+			else
+			{
+				UTextureMem *tf = dynamic_cast<NL3D::UTextureMem *>(oldTexture);
+				if (tf) driver->deleteTextureMem(tf);
+			}
+		}
+	}
+
 	/*
 	 * createTexture
 	 */
@@ -1285,6 +1426,8 @@ namespace NLGUI
 					// This one ?
 					if (&(*iteGT) == gt)
 					{
+						if (iteGT->Texture == NULL)
+							return;
 						// Remove this global texture
 						UTextureFile *tf = dynamic_cast<NL3D::UTextureFile *>(iteGT->Texture);
 						if (tf)
@@ -1466,6 +1609,13 @@ namespace NLGUI
 			TGlobalTextureList::iterator ite = _GlobalTextures.begin();
 			while (ite != _GlobalTextures.end())
 			{
+				// texture not loaded yet
+				if (ite->Texture == NULL)
+				{
+					++ite;
+					continue;
+				}
+
 				// TMP TMP
 	//			volatile SGlobalTexture *sg = &(*ite);
 				CLayer	&layer= ite->Layers[layerId];

From 285cfb163ff32316ba727ecc7a1fc6ba38f062ee Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 7 Sep 2021 12:08:32 +0300
Subject: [PATCH 277/292] Fix possible deadlock in css content attribute

---
 nel/src/gui/group_html.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 0c48b92a8..7432cd9b7 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -1296,6 +1296,7 @@ namespace NLGUI
 		}
 
 		std::string::size_type pos = 0;
+		// TODO: tokenize by whitespace
 		while(pos < content.size())
 		{
 			std::string::size_type start;
@@ -1328,6 +1329,9 @@ namespace NLGUI
 				start = pos + 4;
 				// fails if url contains ')'
 				pos = content.find(")", start);
+				if (pos == std::string::npos)
+					break;
+
 				token = trim(content.substr(start, pos - start));
 				// skip ')'
 				pos++;
@@ -1390,14 +1394,22 @@ namespace NLGUI
 			{
 				// attr(title)
 				start = pos + 5;
-				pos = content.find(")", start);
-				token = content.substr(start, pos - start);
-				// skip ')'
-				pos++;
-
-				if (elm.hasAttribute(token))
+				std::string::size_type end = 0;
+				end = content.find(")", start);
+				if (end != std::string::npos)
 				{
-					addString(elm.getAttribute(token));
+					token = content.substr(start, end - start);
+					// skip ')'
+					pos = end + 1;
+					if (elm.hasAttribute(token))
+					{
+						addString(elm.getAttribute(token));
+					}
+				}
+				else
+				{
+					// skip over 'a'
+					pos++;
 				}
 			}
 			else

From 12c515c2648a7f573cd28feabe9fed5dee4cb9a8 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 13 Jul 2021 14:44:22 +0300
Subject: [PATCH 278/292] Parse background style into own class

---
 nel/include/nel/gui/css_style.h         |  7 +++--
 nel/src/gui/css_style.cpp               | 38 +++++++++++++++++++++----
 nel/src/gui/group_html.cpp              | 24 ++++++++--------
 nel/tools/htmlcss_test/htmlcss_test.cpp |  2 +-
 4 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 664d13c64..990b24e20 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -21,6 +21,8 @@
 #include "nel/misc/rgba.h"
 #include "nel/gui/css_selector.h"
 #include "nel/gui/css_types.h"
+#include "nel/gui/css_length.h"
+#include "nel/gui/css_background.h"
 
 namespace NLGUI
 {
@@ -70,7 +72,6 @@ namespace NLGUI
 			BorderTopStyle = BorderRightStyle = BorderBottomStyle = BorderLeftStyle = CSS_LINE_STYLE_NONE;
 			BorderTopColor = BorderRightColor = BorderBottomColor = BorderLeftColor = NLMISC::CRGBA::Transparent;
 			// background
-			BackgroundColor=NLMISC::CRGBA::Black;
 			BackgroundColorOver=NLMISC::CRGBA::Black;
 			MarginTop = MarginRight = MarginBottom = MarginLeft = 0;
 			PaddingTop = PaddingRight = PaddingBottom = PaddingLeft = 0;
@@ -105,7 +106,7 @@ namespace NLGUI
 		uint32 BorderTopWidth, BorderRightWidth, BorderBottomWidth, BorderLeftWidth;
 		CSSLineStyle BorderTopStyle, BorderRightStyle, BorderBottomStyle, BorderLeftStyle;
 		NLMISC::CRGBA BorderTopColor, BorderRightColor, BorderBottomColor, BorderLeftColor;
-		NLMISC::CRGBA BackgroundColor;
+		CSSBackground Background;
 		NLMISC::CRGBA BackgroundColorOver;
 		uint32 MarginTop, MarginRight, MarginBottom, MarginLeft;
 		uint32 PaddingTop, PaddingRight, PaddingBottom, PaddingLeft;
@@ -229,7 +230,7 @@ namespace NLGUI
 			Current.BorderTopStyle = Current.BorderRightStyle = Current.BorderBottomStyle = Current.BorderLeftStyle = CSS_LINE_STYLE_NONE;
 			Current.BorderTopColor = Current.BorderRightColor = Current.BorderBottomColor = Current.BorderLeftColor = Current.TextColor;
 
-			Current.BackgroundColor = NLMISC::CRGBA::Transparent;
+			Current.Background = CSSBackground();
 			Current.BackgroundColorOver = NLMISC::CRGBA::Transparent;
 
 			Current.MarginTop = Current.MarginRight = Current.MarginBottom = Current.MarginLeft = 0;
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index c7dae35ad..7a9b725af 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -957,13 +957,13 @@ namespace NLGUI
 			if (it->first == "background-color")
 			{
 				if (it->second == "inherit")
-					style.BackgroundColor = current.BackgroundColor;
+					style.Background.color = current.Background.color;
 				else if (it->second == "transparent")
-					style.BackgroundColor = CRGBA(0, 0, 0, 0);
+					style.Background.color = CRGBA(0, 0, 0, 0);
 				else if (it->second == "currentcolor")
-					style.BackgroundColorOver = style.TextColor;
+					style.Background.color = style.TextColor;
 				else
-					scanHTMLColor(it->second.c_str(), style.BackgroundColor);
+					scanHTMLColor(it->second.c_str(), style.Background.color);
 			}
 			else
 			if (it->first == "-ryzom-background-color-over")
@@ -987,10 +987,13 @@ namespace NLGUI
 					image = image.substr(4, image.size()-5);
 				}
 				style.StyleRules[it->first] = trimQuotes(image);
+				style.Background.setImage(style.StyleRules[it->first]);
 			}
 			else
 			if (it->first == "background-repeat")
 			{
+				style.Background.setRepeat(it->second);
+				// TODO: remove after removing old code that depends on this
 				// normalize
 				std::string val = toLowerAscii(trim(it->second));
 				std::vector<std::string> parts;
@@ -1004,6 +1007,8 @@ namespace NLGUI
 			else
 			if (it->first == "background-size")
 			{
+				style.Background.setSize(it->second);
+				// TODO: remove after removing old code that depends on this
 				// normalize
 				std::string val = toLowerAscii(trim(it->second));
 				std::vector<std::string> parts;
@@ -1013,6 +1018,27 @@ namespace NLGUI
 
 				style.StyleRules[it->first] = val;
 			}
+			else
+			if (it->first == "background-position")
+			{
+				// TODO: background-position-x, background-position-y
+				style.Background.setPosition(it->second);
+			}
+			else
+			if (it->first == "background-origin")
+			{
+				style.Background.setOrigin(it->second);
+			}
+			else
+			if (it->first == "background-clip")
+			{
+				style.Background.setClip(it->second);
+			}
+			else
+			if (it->first == "background-attachment")
+			{
+				style.Background.setAttachment(it->second);
+			}
 		}
 
 		// if outer element has underline set, then inner element cannot remove it
@@ -1348,10 +1374,10 @@ namespace NLGUI
 			}
 			else
 			{
-				// fill in default if one is set
+				// fill in default if one is not set
 				if (props[i] == "background-image")
 				{
-					style[props[i]] = "none";
+					style[props[i]] = "";
 				}
 				else if (props[i] == "background-position")
 				{
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 7432cd9b7..8a56832c9 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -538,14 +538,14 @@ namespace NLGUI
 
 		if (style.hasStyle("background-color"))
 		{
-			ctrlButton->setColor(style.BackgroundColor);
+			ctrlButton->setColor(style.Background.color);
 			if (style.hasStyle("-ryzom-background-color-over"))
 			{
 				ctrlButton->setColorOver(style.BackgroundColorOver);
 			}
 			else
 			{
-				ctrlButton->setColorOver(style.BackgroundColor);
+				ctrlButton->setColorOver(style.Background.color);
 			}
 			ctrlButton->setTexture("", "blank.tga", "", false);
 			ctrlButton->setTextureOver("", "blank.tga", "");
@@ -2706,7 +2706,7 @@ namespace NLGUI
 						if (bg)
 						{
 							bg->setTexture("blank.tga");
-							bg->setColor(style.BackgroundColor);
+							bg->setColor(style.Background.color);
 						}
 					}
 				}
@@ -4082,7 +4082,7 @@ namespace NLGUI
 		clearContext();
 
 		// Reset default background color
-		setBackgroundColor (_BrowserStyle.Current.BackgroundColor);
+		setBackgroundColor (_BrowserStyle.Current.Background.color);
 		setBackground ("blank.tga", true, false);
 
 		paragraphChange ();
@@ -4940,7 +4940,7 @@ namespace NLGUI
 		style.pushStyle();
 		style.applyStyle(elm.getPseudo(":-webkit-meter-bar"));
 		if(style.hasStyle("background-color"))
-			color = style.Current.BackgroundColor;
+			color = style.Current.Background.color;
 		style.popStyle();
 
 		return color;
@@ -4957,14 +4957,14 @@ namespace NLGUI
 			{
 				style.applyStyle(elm.getPseudo(":-webkit-meter-optimum-value"));
 				if (style.hasStyle("background-color"))
-					color = style.Current.BackgroundColor;
+					color = style.Current.Background.color;
 				break;
 			}
 		case VALUE_SUB_OPTIMAL:
 			{
 				style.applyStyle(elm.getPseudo(":-webkit-meter-suboptimum-value"));
 				if (style.hasStyle("background-color"))
-					color = style.Current.BackgroundColor;
+					color = style.Current.Background.color;
 				break;
 			}
 		case VALUE_EVEN_LESS_GOOD: // fall through
@@ -4972,7 +4972,7 @@ namespace NLGUI
 			{
 				style.applyStyle(elm.getPseudo(":-webkit-meter-even-less-good-value"));
 				if (style.hasStyle("background-color"))
-					color = style.Current.BackgroundColor;
+					color = style.Current.Background.color;
 				break;
 			}
 		}//switch
@@ -5009,7 +5009,7 @@ namespace NLGUI
 		style.pushStyle();
 		style.applyStyle(elm.getPseudo(":-webkit-progress-bar"));
 		if (style.hasStyle("background-color"))
-			color = style.Current.BackgroundColor;
+			color = style.Current.Background.color;
 		style.popStyle();
 
 		return color;
@@ -5023,7 +5023,7 @@ namespace NLGUI
 		style.pushStyle();
 		style.applyStyle(elm.getPseudo(":-webkit-progress-value"));
 		if (style.hasStyle("background-color"))
-			color = style.Current.BackgroundColor;
+			color = style.Current.Background.color;
 		style.popStyle();
 
 		return color;
@@ -5037,7 +5037,7 @@ namespace NLGUI
 			cellParams = _CellParams.back();
 
 		if (_Style.hasStyle("background-color"))
-			cellParams.BgColor = _Style.Current.BackgroundColor;
+			cellParams.BgColor = _Style.Current.Background.color;
 		else if (elm.hasNonEmptyAttribute("bgcolor"))
 			scanHTMLColor(elm.getAttribute("bgcolor").c_str(), cellParams.BgColor);
 
@@ -5120,7 +5120,7 @@ namespace NLGUI
 
 		if (_Style.hasStyle("background-color"))
 		{
-			CRGBA bgColor = _Style.Current.BackgroundColor;
+			CRGBA bgColor = _Style.Current.Background.color;
 			scanHTMLColor(elm.getAttribute("bgcolor").c_str(), bgColor);
 			if (root)
 			{
diff --git a/nel/tools/htmlcss_test/htmlcss_test.cpp b/nel/tools/htmlcss_test/htmlcss_test.cpp
index 4e5b79843..563f5add9 100644
--- a/nel/tools/htmlcss_test/htmlcss_test.cpp
+++ b/nel/tools/htmlcss_test/htmlcss_test.cpp
@@ -46,7 +46,7 @@ void checkRuleset(CHtmlElement &elm, CCssStyle &style, TStyleVec testset, bool e
 			}
 			else if (it.first == "background-color")
 			{
-				printf("[%s]: background-color: '%s'; expected '%s'\n", existsMessage.c_str(), style.Current.BackgroundColor.toString().c_str(), it.second.c_str());
+				printf("[%s]: background-color: '%s'; expected '%s'\n", existsMessage.c_str(), style.Current.Background.color.toString().c_str(), it.second.c_str());
 				printf("     (%s)\n", elm.toString().c_str());
 				failed2 = false;
 			}

From 2046c4bf6e33e6b1064b5df46b743d7a47d4af36 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 13 Jul 2021 14:39:08 +0300
Subject: [PATCH 279/292] Draw browser background with CSSBackgroundRenderer

---
 nel/include/nel/gui/group_html.h |  32 ++++-
 nel/src/gui/group_html.cpp       | 236 ++++++++++++++++++++-----------
 2 files changed, 183 insertions(+), 85 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index c94bec024..4315d8059 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -30,6 +30,7 @@
 #include "nel/gui/html_element.h"
 #include "nel/gui/html_parser.h"
 #include "nel/gui/css_style.h"
+#include "nel/gui/css_background_renderer.h"
 
 // forward declaration
 typedef void CURLM;
@@ -148,6 +149,7 @@ namespace NLGUI
 
 		// add image download (used by view_bitmap.cpp to load web images)
 		ICurlDownloadCB *addImageDownload(const std::string &url, CViewBase *img, const CStyleParams &style = CStyleParams(), const TImageType type = NormalImage, const std::string &placeholder = "web_del.tga");
+		ICurlDownloadCB *addTextureDownload(const std::string &url, sint32 &texId, CViewBase *view);
 		void removeImageDownload(ICurlDownloadCB *handle, CViewBase *img);
 		std::string localImageName(const std::string &url);
 
@@ -178,6 +180,7 @@ namespace NLGUI
 		std::string		DefaultRadioButtonBitmapNormal;
 		std::string		DefaultRadioButtonBitmapPushed;
 		std::string		DefaultRadioButtonBitmapOver;
+		// TODO: remove from interface xml and code
 		std::string		DefaultBackgroundBitmapView;
 
 		struct TFormField {
@@ -342,6 +345,9 @@ namespace NLGUI
 			const std::string &overBitmap, const char *actionHandler, const char *actionHandlerParams, const std::string &tooltip,
 			const CStyleParams &style = CStyleParams());
 
+		// Set the background color
+		void setupBackground(CSSBackgroundRenderer *bg);
+
 		// Set the background color
 		void setBackgroundColor (const NLMISC::CRGBA &bgcolor);
 
@@ -381,6 +387,10 @@ namespace NLGUI
 		// <style> and downloaded <link rel=stylesheet> elements
 		std::vector<std::string> _HtmlStyles;
 
+		// background from <html> or <body> element
+		CSSBackgroundRenderer m_HtmlBackground;
+		CSSBackgroundRenderer m_BodyBackground;
+
 		// Valid base href was found
 		bool            _IgnoreBaseUrlTag;
 		// Fragment from loading url
@@ -892,6 +902,25 @@ namespace NLGUI
 			TImageType Type;
 		};
 
+		class TextureDownloadCB : public CDataDownload
+		{
+		public:
+			TextureDownloadCB(const std::string &url, const std::string &dest, sint32 texId, CViewBase *view)
+			: CDataDownload(url, dest)
+			{
+				addTexture(texId, view);
+			}
+
+			virtual void finish() NL_OVERRIDE;
+
+			void addTexture(sint32 texId, CViewBase *view) {
+				TextureIds.push_back(std::make_pair(texId, view));
+			}
+
+		private:
+			std::vector<std::pair<sint32, CViewBase *> > TextureIds;
+		};
+
 		class BnpDownloadCB : public CDataDownload
 		{
 		public:
@@ -959,9 +988,6 @@ namespace NLGUI
 		// :before, :after rendering
 		void renderPseudoElement(const std::string &pseudo, const CHtmlElement &elm);
 
-		// apply background from current style (for html, body)
-		void applyBackground(const CHtmlElement &elm);
-
 		void insertFormImageButton(const std::string &name,
 			const std::string &tooltip,
 			const std::string &src,
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 8a56832c9..578041fa7 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -58,6 +58,7 @@
 #include "nel/gui/css_style.h"
 #include "nel/gui/css_parser.h"
 #include "nel/gui/css_border_renderer.h"
+#include "nel/gui/css_background_renderer.h"
 
 #include <curl/curl.h>
 
@@ -346,6 +347,25 @@ namespace NLGUI
 		}
 	}
 
+	void CGroupHTML::TextureDownloadCB::finish()
+	{
+		// tmpdest file does not exist if download skipped (ie cache was used)
+		if (CFile::fileExists(tmpdest) && CFile::getFileSize(tmpdest) == 0)
+		{
+			if (CFile::fileExists(dest))
+				CFile::deleteFile(dest);
+
+			CFile::moveFile(dest, tmpdest);
+		}
+
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+		for(uint i = 0; i < TextureIds.size(); i++)
+		{
+			rVR.reloadTexture(TextureIds[i].first, dest);
+			TextureIds[i].second->invalidateCoords();
+		}
+	}
+
 	void CGroupHTML::BnpDownloadCB::finish()
 	{
 		bool verified = false;
@@ -734,6 +754,63 @@ namespace NLGUI
 		}
 	}
 
+	// Add a image download request in the multi_curl
+	// return new textureId and download callback
+	ICurlDownloadCB *CGroupHTML::addTextureDownload(const string &url, sint32 &texId, CViewBase *view)
+	{
+		CViewRenderer &rVR = *CViewRenderer::getInstance();
+		// data:image/png;base64,AA...==
+		if (startsWith(url, "data:image/"))
+		{
+			texId = rVR.createTextureFromDataURL(url);
+			return NULL;
+		}
+
+		std::string finalUrl;
+		// load the image from local files/bnp
+		if (lookupLocalFile(finalUrl, std::string(CFile::getPath(url) + CFile::getFilenameWithoutExtension(url) + ".tga").c_str(), false))
+		{
+			texId = rVR.createTexture(finalUrl);
+			return NULL;
+		}
+
+		finalUrl = upgradeInsecureUrl(getAbsoluteUrl(url));
+
+		// use requested url for local name (cache)
+		string dest = localImageName(url);
+		LOG_DL("add to download '%s' dest '%s'", finalUrl.c_str(), dest.c_str());
+
+		if (CFile::fileExists(dest) && CFile::getFileSize(dest) > 0)
+			texId = rVR.createTexture(dest);
+		else
+			texId = rVR.newTextureId(dest);
+
+		// Search if we are not already downloading this url.
+		for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
+		{
+			if((*it)->url == finalUrl)
+			{
+				LOG_DL("already downloading '%s' img %p", finalUrl.c_str(), img);
+				TextureDownloadCB *cb = dynamic_cast<TextureDownloadCB*>(*it);
+				if (cb)
+				{
+					cb->addTexture(texId, view);
+					// return pointer to shared ImageDownloadCB
+					return cb;
+				}
+				else
+				{
+					nlwarning("Found texture download '%s', but casting to TextureDownloadCB failed", finalUrl.c_str());
+				}
+			}
+		}
+
+		Curls.push_back(new TextureDownloadCB(finalUrl, dest, texId, this));
+		// as we return pointer to callback, skip starting downloads just now
+		//pumpCurlQueue();
+		return Curls.back();
+	}
+
 	// Add a image download request in the multi_curl
 	ICurlDownloadCB *CGroupHTML::addImageDownload(const string &url, CViewBase *img, const CStyleParams &style, TImageType type, const std::string &placeholder)
 	{
@@ -2331,6 +2408,38 @@ namespace NLGUI
 			doBrowseAnchor(_UrlFragment);
 			_UrlFragment.clear();
 		}
+
+		if (!m_HtmlBackground.isEmpty() || !m_BodyBackground.isEmpty())
+		{
+			// get scroll offset from list
+			CGroupList	*list = getList();
+			if (list)
+			{
+				CInterfaceElement* vp = list->getParentPos() ? list->getParentPos() : this;
+				sint htmlW = std::max(vp->getWReal(), list->getWReal());
+				sint htmlH = list->getHReal();
+				sint htmlX = list->getXReal() + list->getOfsX();
+				sint htmlY = list->getYReal() + list->getOfsY();
+
+				if (!m_HtmlBackground.isEmpty())
+				{
+					m_HtmlBackground.setFillViewport(true);
+					m_HtmlBackground.setBorderArea(htmlX, htmlY, htmlW, htmlH);
+					m_HtmlBackground.setPaddingArea(htmlX, htmlY, htmlW, htmlH);
+					m_HtmlBackground.setContentArea(htmlX, htmlY, htmlW, htmlH);
+				}
+
+				if (!m_BodyBackground.isEmpty())
+				{
+					// TODO: html padding + html border
+					m_BodyBackground.setBorderArea(htmlX, htmlY, htmlW, htmlH);
+					// TODO: html padding + html border + body border
+					m_BodyBackground.setPaddingArea(htmlX, htmlY, htmlW, htmlH);
+					// TODO: html padding + html_border + body padding
+					m_BodyBackground.setContentArea(htmlX, htmlY, htmlW, htmlH);
+				}
+			}
+		}
 	}
 
 	// ***************************************************************************
@@ -3185,52 +3294,47 @@ namespace NLGUI
 
 	// ***************************************************************************
 
+	void CGroupHTML::setupBackground(CSSBackgroundRenderer *bg)
+	{
+		if (!bg) return;
+
+		bg->setModulateGlobalColor(_Style.Current.GlobalColor);
+		bg->setBackground(_Style.Current.Background);
+		bg->setFontSize(_Style.Root.FontSize, _Style.Current.FontSize);
+
+		bg->setViewport(getList()->getParentPos() ? getList()->getParentPos() : this);
+
+		if (!_Style.Current.Background.image.empty())
+			addTextureDownload(_Style.Current.Background.image, bg->TextureId, this);
+	}
+
+	// ***************************************************************************
+
 	void CGroupHTML::setBackgroundColor (const CRGBA &bgcolor)
 	{
-		// Should have a child named bg
+		// TODO: DefaultBackgroundBitmapView should be removed from interface xml
 		CViewBase *view = getView (DefaultBackgroundBitmapView);
 		if (view)
-		{
-			CViewBitmap *bitmap = dynamic_cast<CViewBitmap*> (view);
-			if (bitmap)
-			{
-				// TODO: background color should have separate bitmap from background texture
-				// Change the background color
-				bitmap->setColor (bgcolor);
-				bitmap->setModulateGlobalColor(false);
-			}
-		}
+			view->setActive(false);
+
+		m_HtmlBackground.setColor(bgcolor);
 	}
 
 	// ***************************************************************************
 
 	void CGroupHTML::setBackground (const string &bgtex, bool scale, bool tile)
 	{
-		// Should have a child named bg
+		// TODO: DefaultBackgroundBitmapView should be removed from interface xml
 		CViewBase *view = getView (DefaultBackgroundBitmapView);
 		if (view)
-		{
-			CViewBitmap *bitmap = dynamic_cast<CViewBitmap*> (view);
-			if (bitmap)
-			{
-				bitmap->setParentPosRef(Hotspot_TL);
-				bitmap->setPosRef(Hotspot_TL);
-				bitmap->setX(0);
-				bitmap->setY(0);
-				// FIXME: renders behind container background
-				bitmap->setRenderLayer(-2);
-				bitmap->setScale(scale);
-				bitmap->setTile(tile);
-
-				// clear size ref for non-scaled image or it does not show up
-				if (scale || tile)
-					bitmap->setSizeRef("wh");
-				else
-					bitmap->setSizeRef("");
+			view->setActive(false);
 
-				addImageDownload(bgtex, view, CStyleParams(), NormalImage, "");
-			}
-		}
+		m_HtmlBackground.setImage(bgtex);
+		m_HtmlBackground.setImageRepeat(tile);
+		m_HtmlBackground.setImageCover(scale);
+
+		if (!bgtex.empty())
+			addTextureDownload(bgtex, m_HtmlBackground.TextureId, this);
 	}
 
 
@@ -4013,6 +4117,8 @@ namespace NLGUI
 
 	void CGroupHTML::draw ()
 	{
+		m_HtmlBackground.draw();
+		m_BodyBackground.draw();
 		CGroupScrollText::draw ();
 	}
 
@@ -4081,9 +4187,14 @@ namespace NLGUI
 		// Clear all the context
 		clearContext();
 
-		// Reset default background color
-		setBackgroundColor (_BrowserStyle.Current.Background.color);
-		setBackground ("blank.tga", true, false);
+		// Reset default background
+		m_HtmlBackground.clear();
+		m_BodyBackground.clear();
+
+		// TODO: DefaultBackgroundBitmapView should be removed from interface xml
+		CViewBase *view = getView (DefaultBackgroundBitmapView);
+		if (view)
+			view->setActive(false);
 
 		paragraphChange ();
 	}
@@ -5091,46 +5202,6 @@ namespace NLGUI
 		_CellParams.push_back (cellParams);
 	}
 
-	// ***************************************************************************
-	void CGroupHTML::applyBackground(const CHtmlElement &elm)
-	{
-		bool root = elm.Value == "html" || elm.Value == "body";
-
-		// non-empty image
-		if (_Style.hasStyle("background-image"))
-		{
-			bool repeat = _Style.checkStyle("background-repeat", "repeat");
-			bool scale = _Style.checkStyle("background-size", "100%");
-			std::string image = _Style.getStyle("background-image");
-			if (!image.empty())
-			{
-				if (root)
-				{
-					setBackground (image, scale, repeat);
-				}
-				// TODO: else
-
-				// default background color is transparent, so image does not show
-				if (!_Style.hasStyle("background-color") || _Style.checkStyle("background-color", "transparent"))
-				{
-					_Style.applyStyle("background-color: #fff;");
-				}
-			}
-		}
-
-		if (_Style.hasStyle("background-color"))
-		{
-			CRGBA bgColor = _Style.Current.Background.color;
-			scanHTMLColor(elm.getAttribute("bgcolor").c_str(), bgColor);
-			if (root)
-			{
-				setBackgroundColor(bgColor);
-			}
-			// TODO: else
-		}
-
-	}
-
 	// ***************************************************************************
 	void CGroupHTML::insertFormImageButton(const std::string &name, const std::string &tooltip, const std::string &src, const std::string &over, const std::string &formId, const std::string &action, uint32 minWidth, const std::string &templateName)
 	{
@@ -5261,11 +5332,12 @@ namespace NLGUI
 	{
 		// override <body> (or <html>) css style attribute
 		if (elm.hasNonEmptyAttribute("bgcolor"))
-		{
 			_Style.applyStyle("background-color: " + elm.getAttribute("bgcolor"));
-		}
 
-		applyBackground(elm);
+		if (m_HtmlBackground.isEmpty())
+			setupBackground(&m_HtmlBackground);
+		else
+			setupBackground(&m_BodyBackground);
 
 		renderPseudoElement(":before", elm);
 	}
@@ -5659,11 +5731,11 @@ namespace NLGUI
 	void CGroupHTML::htmlHTML(const CHtmlElement &elm)
 	{
 		if (elm.hasNonEmptyAttribute("style"))
-		{
 			_Style.applyStyle(elm.getAttribute("style"));
-		}
+
 		_Style.Root = _Style.Current;
-		applyBackground(elm);
+
+		setupBackground(&m_HtmlBackground);
 	}
 
 	// ***************************************************************************

From 37eec8cd7f545333aaeb96a6951fcef8cfdabe3f Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 9 Sep 2021 12:41:51 +0300
Subject: [PATCH 280/292] Dotted/dashed border styles

---
 nel/include/nel/gui/css_border.h          |  72 ++
 nel/include/nel/gui/css_border_renderer.h | 130 +++-
 nel/include/nel/gui/css_style.h           |  18 +-
 nel/include/nel/gui/css_types.h           |   9 +
 nel/src/gui/css_border_renderer.cpp       | 797 ++++++++++++++++------
 nel/src/gui/css_style.cpp                 |  52 +-
 6 files changed, 795 insertions(+), 283 deletions(-)
 create mode 100644 nel/include/nel/gui/css_border.h

diff --git a/nel/include/nel/gui/css_border.h b/nel/include/nel/gui/css_border.h
new file mode 100644
index 000000000..787b71710
--- /dev/null
+++ b/nel/include/nel/gui/css_border.h
@@ -0,0 +1,72 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010-2019  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CL_CSS_BORDER_H
+#define CL_CSS_BORDER_H
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/rgba.h"
+#include "nel/gui/css_types.h"
+#include "nel/gui/css_length.h"
+
+namespace NLGUI
+{
+	/**
+	 * \brief CSS border info
+	 * \date 2021-07-23 09:51 GMT
+	 * \author Meelis Mägi (Nimetu)
+	 */
+	class CSSBorder
+	{
+	public:
+		CSSBorder()
+		{
+			reset();
+		}
+
+		CSSBorder(uint width, CSSLineStyle style, NLMISC::CRGBA color)
+		{
+			set(width, style, color);
+		}
+
+		void reset()
+		{
+			set(CSS_LINE_WIDTH_MEDIUM, CSS_LINE_STYLE_NONE, NLMISC::CRGBA::Transparent);
+		}
+
+		void set(uint width, CSSLineStyle style, NLMISC::CRGBA color)
+		{
+			Width.setFloatValue(width, "px");
+			Style = style;
+			Color = color;
+		}
+
+		bool empty() const
+		{
+			return Style == CSS_LINE_STYLE_NONE || Style == CSS_LINE_STYLE_HIDDEN
+				|| Width.getFloat() == 0;
+		}
+
+		CSSLength Width;
+		CSSLineStyle Style;
+		NLMISC::CRGBA Color;
+	};
+
+}//namespace
+
+#endif // CL_CSS_BORDER_H
+
+
diff --git a/nel/include/nel/gui/css_border_renderer.h b/nel/include/nel/gui/css_border_renderer.h
index b70f1c169..54505a686 100644
--- a/nel/include/nel/gui/css_border_renderer.h
+++ b/nel/include/nel/gui/css_border_renderer.h
@@ -23,9 +23,12 @@
 #include "nel/misc/rgba.h"
 #include "nel/misc/geom_ext.h"
 #include "nel/gui/css_types.h"
+#include "nel/gui/css_border.h"
 
 namespace NLGUI
 {
+	class CInterfaceElement;
+
 	/**
 	 * \brief Border renderer for GUI classes
 	 * \date 2019-09-03 10:50 GMT
@@ -34,6 +37,22 @@ namespace NLGUI
 	class CSSBorderRenderer
 	{
 	private:
+		enum EBorderSide
+		{
+			BORDER_TOP_LEFT = 0,
+			BORDER_TOP_RIGHT,
+			BORDER_BOTTOM_LEFT,
+			BORDER_BOTTOM_RIGHT,
+			BORDER_LEFT_TOP,
+			BORDER_RIGHT_TOP,
+			BORDER_LEFT_BOTTOM,
+			BORDER_RIGHT_BOTTOM,
+			BORDER_TOP,
+			BORDER_RIGHT,
+			BORDER_BOTTOM,
+			BORDER_LEFT,
+			BORDER_INVALID
+		};
 		// parent element screen coordinates
 		sint32 m_XReal, m_YReal;
 		sint32 m_WReal, m_HReal;
@@ -50,15 +69,44 @@ namespace NLGUI
 
 		// if true, then updateCoords() is called from draw()
 		bool m_Dirty;
-		// if true, then at least one border is set
-		bool m_Border;
-		bool m_BorderTop, m_BorderRight, m_BorderBottom, m_BorderLeft;
+		// UI scale, used to calculate number of segments to draw for circle
+		float m_Scale;
 
-	public:
-		uint32        TopWidth, RightWidth, BottomWidth, LeftWidth;
-		NLMISC::CRGBA TopColor, RightColor, BottomColor, LeftColor;
-		CSSLineStyle  TopStyle, RightStyle, BottomStyle, LeftStyle;
+		CSSRect<CSSBorder> m_Border;
+		CSSRect<sint32> m_Computed;
+
+		// font size for 'rem'
+		float m_RootFontSize;
+
+		// font size for 'em'
+		float m_FontSize;
+
+		// if true, then CSSLength values are recomputed
+		bool m_MustComputeValues;
+
+		// viewport element for vw,wh,vmin,vmax
+		CInterfaceElement* m_Viewport;
+
+		// update CSSLength values
+		void computeValues();
+
+		void getAdjacentBorders(EBorderSide side, EBorderSide &adjBorderL, EBorderSide &adjBorderR) const;
+		void getAdjacentBorderWidth(EBorderSide side, sint32 &adjWidthL, sint32 &adjWidthR) const;
+		// dot
+		void buildDotCornerStart(EBorderSide side, SDrawBorder shape, float x1, float y1, float radius);
+		void buildDotCornerEnd(EBorderSide side, SDrawBorder shape, float x1, float y1, float radius);
+		void buildDotCorner(SDrawBorder shape, float x, float y, float r, const NLMISC::CLine &line);
+		// draw circle, angle is CCW between 0..1 (3'o'clock being 0deg).
+		void buildDotSegments(SDrawBorder shape, float x, float y, float radius, float fromAngle=0.f, float toAngle=1.f);
+		// dash
+		void makeBorderQuad(EBorderSide side, SDrawBorder &shape, float x, float y, float width, float thickness) const;
+		void makeCornerQuad(EBorderSide side, SDrawBorder &shape) const;
+		void buildDashedBorder(EBorderSide side);
+		void buildSolidBorder(EBorderSide side);
+
+		bool hasInnerShape(CSSLineStyle style) const;
 
+	public:
 		// alpha value from parent
 		uint8 CurrentAlpha;
 
@@ -70,23 +118,67 @@ namespace NLGUI
 
 		void setRect(sint32 x, sint32 y, sint32 w, sint32 h);
 
-		void setWidth(uint32 top, uint32 right, uint32 bottom, uint32 left);
-		void setStyle(CSSLineStyle top, CSSLineStyle right, CSSLineStyle bottom, CSSLineStyle left);
-		void setColor(const NLMISC::CRGBA &top, const NLMISC::CRGBA &right, const NLMISC::CRGBA &bottom, const NLMISC::CRGBA &left);
+		void setBorder(const CSSRect<CSSBorder> &b) { m_Dirty = true; m_Border = b; }
 
 		void updateCoords();
-		void invalidateCoords() { m_Dirty = m_Border = true; }
-		void invalidateContent() { m_Dirty = m_Border = true; };
+		void invalidateCoords() { m_Dirty = true; }
+		void invalidateContent() { m_Dirty = true; }
 
-		uint32 getTopWidth() const;
-		uint32 getRightWidth() const;
-		uint32 getBottomWidth() const;
-		uint32 getLeftWidth() const;
+		bool isEmpty() const {
+			return (m_Border.Top.Width.getFloat() +
+				m_Border.Right.Width.getFloat() +
+				m_Border.Bottom.Width.getFloat() +
+				m_Border.Left.Width.getFloat()) == 0;
+		}
 
-		uint32 getLeftRightWidth() const;
-		uint32 getTopBottomWidth() const;
+		uint32 getTopWidth()    { if (m_MustComputeValues) computeValues(); return m_Computed.Top; }
+		uint32 getRightWidth()  { if (m_MustComputeValues) computeValues(); return m_Computed.Right; }
+		uint32 getBottomWidth() { if (m_MustComputeValues) computeValues(); return m_Computed.Bottom; }
+		uint32 getLeftWidth()   { if (m_MustComputeValues) computeValues(); return m_Computed.Left; }
 
-		bool hasInnerShape(CSSLineStyle style) const;
+		uint32 getLeftRightWidth() { if (m_MustComputeValues) computeValues(); return m_Computed.Left + m_Computed.Right; }
+		uint32 getTopBottomWidth() { if (m_MustComputeValues) computeValues(); return m_Computed.Top + m_Computed.Bottom; }
+
+		NLMISC::CRGBA getTopColor() const { return m_Border.Top.Color; }
+		NLMISC::CRGBA getRightColor() const { return m_Border.Right.Color; }
+		NLMISC::CRGBA getBottomColor() const { return m_Border.Bottom.Color; }
+		NLMISC::CRGBA getLeftColor() const { return m_Border.Left.Color; }
+
+
+		void setWidth(uint width)
+		{
+			m_Dirty = true;
+			m_MustComputeValues = true;
+			m_Border.Top.Width.setFloatValue(width, "px");
+			m_Border.Right.Width.setFloatValue(width, "px");
+			m_Border.Bottom.Width.setFloatValue(width, "px");
+			m_Border.Left.Width.setFloatValue(width, "px");
+		}
+
+		void setColor(const NLMISC::CRGBA &color)
+		{
+			m_Dirty = true;
+			m_Border.Top.Color = color;
+			m_Border.Right.Color = color;
+			m_Border.Bottom.Color = color;
+			m_Border.Left.Color = color;
+		}
+
+		// sizes for em, rem units
+		void setFontSize(float rootFontSize, float fontSize)
+		{
+			m_Dirty = true;
+			m_MustComputeValues = true;
+			m_RootFontSize = rootFontSize;
+			m_FontSize = fontSize;
+		}
+
+		void setViewport(CInterfaceElement *root)
+		{
+			m_Dirty = true;
+			m_MustComputeValues = true;
+			m_Viewport = root;
+		}
 
 		void draw();
 	}; // CSSBorderRenderer
diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 990b24e20..042486d17 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -23,6 +23,7 @@
 #include "nel/gui/css_types.h"
 #include "nel/gui/css_length.h"
 #include "nel/gui/css_background.h"
+#include "nel/gui/css_border.h"
 
 namespace NLGUI
 {
@@ -67,10 +68,6 @@ namespace NLGUI
 			Height=-1;
 			MaxWidth=-1;
 			MaxHeight=-1;
-			// border style
-			BorderTopWidth = BorderRightWidth = BorderBottomWidth = BorderLeftWidth = CSS_LINE_WIDTH_MEDIUM;
-			BorderTopStyle = BorderRightStyle = BorderBottomStyle = BorderLeftStyle = CSS_LINE_STYLE_NONE;
-			BorderTopColor = BorderRightColor = BorderBottomColor = BorderLeftColor = NLMISC::CRGBA::Transparent;
 			// background
 			BackgroundColorOver=NLMISC::CRGBA::Black;
 			MarginTop = MarginRight = MarginBottom = MarginLeft = 0;
@@ -103,9 +100,7 @@ namespace NLGUI
 		sint32 Height;
 		sint32 MaxWidth;
 		sint32 MaxHeight;
-		uint32 BorderTopWidth, BorderRightWidth, BorderBottomWidth, BorderLeftWidth;
-		CSSLineStyle BorderTopStyle, BorderRightStyle, BorderBottomStyle, BorderLeftStyle;
-		NLMISC::CRGBA BorderTopColor, BorderRightColor, BorderBottomColor, BorderLeftColor;
+		CSSRect<CSSBorder> Border;
 		CSSBackground Background;
 		NLMISC::CRGBA BackgroundColorOver;
 		uint32 MarginTop, MarginRight, MarginBottom, MarginLeft;
@@ -187,7 +182,7 @@ namespace NLGUI
 		void expandShorthand(const std::string &prop, const std::string &value, TStyle &style) const;
 
 		// parse string value into corresponding value
-		void applyBorderWidth(const std::string &value, uint32 *dest, const uint32 currentWidth, const uint32 fontSize) const;
+		void applyBorderWidth(const std::string &value, CSSLength *dest, const CSSLength &currentWidth) const;
 		void applyBorderColor(const std::string &value, NLMISC::CRGBA *dest, const NLMISC::CRGBA &currentColor, const NLMISC::CRGBA &textColor) const;
 		void applyLineStyle(const std::string &value, CSSLineStyle *dest, const CSSLineStyle &currentStyle) const;
 		void applyPaddingWidth(const std::string &value, uint32 *dest, const uint32 currentPadding, uint32 fontSize) const;
@@ -226,9 +221,10 @@ namespace NLGUI
 			Current.MaxWidth=-1;
 			Current.MaxHeight=-1;
 
-			Current.BorderTopWidth = Current.BorderRightWidth = Current.BorderBottomWidth = Current.BorderLeftWidth = CSS_LINE_WIDTH_MEDIUM;
-			Current.BorderTopStyle = Current.BorderRightStyle = Current.BorderBottomStyle = Current.BorderLeftStyle = CSS_LINE_STYLE_NONE;
-			Current.BorderTopColor = Current.BorderRightColor = Current.BorderBottomColor = Current.BorderLeftColor = Current.TextColor;
+			Current.Border.Top.reset();
+			Current.Border.Right.reset();
+			Current.Border.Bottom.reset();
+			Current.Border.Left.reset();
 
 			Current.Background = CSSBackground();
 			Current.BackgroundColorOver = NLMISC::CRGBA::Transparent;
diff --git a/nel/include/nel/gui/css_types.h b/nel/include/nel/gui/css_types.h
index ac59af422..172c21d18 100644
--- a/nel/include/nel/gui/css_types.h
+++ b/nel/include/nel/gui/css_types.h
@@ -85,6 +85,15 @@ namespace NLGUI
 		CSS_VALUE_CONTAIN
 	};
 
+	template<typename T>
+	struct CSSRect
+	{
+		T Top;
+		T Right;
+		T Bottom;
+		T Left;
+	};
+
 }//namespace
 
 #endif // CL_CSS_TYPES_H
diff --git a/nel/src/gui/css_border_renderer.cpp b/nel/src/gui/css_border_renderer.cpp
index aa44073f4..cb2ef9709 100644
--- a/nel/src/gui/css_border_renderer.cpp
+++ b/nel/src/gui/css_border_renderer.cpp
@@ -32,21 +32,24 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	CSSBorderRenderer::CSSBorderRenderer()
 	{
-		TopWidth = RightWidth = BottomWidth = LeftWidth = 0;
-		TopColor = RightColor = BottomColor = LeftColor = CRGBA(128, 128, 128, 255);
-		TopStyle = RightStyle = BottomStyle = LeftStyle = CSS_LINE_STYLE_SOLID;
 		CurrentAlpha = 255;
 
+		m_Scale = 1.f;
 		m_RenderLayer = 0;
 		m_ModulateGlobalColor = false;
 
-		m_Border = true;
 		m_Dirty = true;
-		m_BorderTop = m_BorderRight = m_BorderBottom = m_BorderLeft = false;
+		m_MustComputeValues = true;
 		m_XReal = 0;
 		m_YReal = 0;
 		m_WReal = 0;
 		m_HReal = 0;
+
+		m_Viewport = NULL;
+		m_FontSize = 16.f;
+		m_RootFontSize = 16.f;
+
+		m_Computed.Top = m_Computed.Right = m_Computed.Bottom = m_Computed.Left = 0;
 	}
 
 	// ----------------------------------------------------------------------------
@@ -69,304 +72,662 @@ namespace NLGUI
 		m_WReal = w;
 		m_HReal = h;
 
-		m_Dirty = m_Border = (w > 0 && h > 0);
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setWidth(uint32 top, uint32 right, uint32 bottom, uint32 left)
-	{
-		TopWidth = top;
-		RightWidth = right;
-		BottomWidth = bottom;
-		LeftWidth = left;
-
-		m_Dirty = m_Border = (top > 0 || right > 0 || bottom > 0 || left > 0);
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setStyle(CSSLineStyle top, CSSLineStyle right, CSSLineStyle bottom, CSSLineStyle left)
-	{
-		TopStyle = top;
-		RightStyle = right;
-		BottomStyle = bottom;
-		LeftStyle = left;
-
-		m_Dirty = m_Border = true;
+		m_Dirty = (w > 0 && h > 0);
 	}
 
 	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setColor(const NLMISC::CRGBA &top, const NLMISC::CRGBA &right, const NLMISC::CRGBA &bottom, const NLMISC::CRGBA &left)
-	{
-		TopColor = top;
-		RightColor = right;
-		BottomColor = bottom;
-		LeftColor = left;
-
-		m_Dirty = true;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getTopWidth() const
+	bool CSSBorderRenderer::hasInnerShape(CSSLineStyle style) const
 	{
-		if (TopStyle == CSS_LINE_STYLE_NONE || TopStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return TopWidth;
+		return style == CSS_LINE_STYLE_DOUBLE ||
+				style == CSS_LINE_STYLE_GROOVE ||
+				style == CSS_LINE_STYLE_RIDGE;
 	}
 
 	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getRightWidth() const
+	void CSSBorderRenderer::computeValues()
 	{
-		if (RightStyle == CSS_LINE_STYLE_NONE || RightStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return RightWidth;
-	}
+		m_MustComputeValues = false;
 
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getBottomWidth() const
-	{
-		if (BottomStyle == CSS_LINE_STYLE_NONE || BottomStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
+		// TODO :should save as computed value
+		sint32 vpW=0;
+		sint32 vpH=0;
+		if (m_Viewport)
+		{
+			vpW = m_Viewport->getWReal();
+			vpH = m_Viewport->getHReal();
+		}
 
-		return BottomWidth;
+		m_Computed.Top    = m_Border.Top.empty()    ? 0 : m_Border.Top.Width.calculate(0, m_FontSize, m_RootFontSize, vpW, vpH);
+		m_Computed.Right  = m_Border.Right.empty()  ? 0 : m_Border.Right.Width.calculate(0, m_FontSize, m_RootFontSize, vpW, vpH);
+		m_Computed.Bottom = m_Border.Bottom.empty() ? 0 : m_Border.Bottom.Width.calculate(0, m_FontSize, m_RootFontSize, vpW, vpH);
+		m_Computed.Left   = m_Border.Left.empty()   ? 0 : m_Border.Left.Width.calculate(0, m_FontSize, m_RootFontSize, vpW, vpH);
 	}
 
 	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getLeftWidth() const
+	void CSSBorderRenderer::getAdjacentBorders(EBorderSide side, EBorderSide &adjBorderL, EBorderSide &adjBorderR) const
 	{
-		if (LeftStyle == CSS_LINE_STYLE_NONE || LeftStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return LeftWidth;
+		switch(side)
+		{
+			case BORDER_TOP:
+				adjBorderL = BORDER_TOP_LEFT;
+				adjBorderR = BORDER_TOP_RIGHT;
+				break;
+			case BORDER_RIGHT:
+				adjBorderL = BORDER_RIGHT_BOTTOM;
+				adjBorderR = BORDER_RIGHT_TOP;
+				break;
+			case BORDER_BOTTOM:
+				adjBorderL = BORDER_BOTTOM_LEFT;
+				adjBorderR = BORDER_BOTTOM_RIGHT;
+				break;
+			case BORDER_LEFT:
+				adjBorderL = BORDER_LEFT_BOTTOM;
+				adjBorderR = BORDER_LEFT_TOP;
+				break;
+			default:
+				adjBorderL = adjBorderR = BORDER_INVALID;
+				break;
+		}
 	}
 
 	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getLeftRightWidth() const
+	void CSSBorderRenderer::getAdjacentBorderWidth(EBorderSide side, sint32 &adjWidthL, sint32 &adjWidthR) const
 	{
-		return getLeftWidth() + getRightWidth();
+		switch(side)
+		{
+			case BORDER_TOP:
+			case BORDER_BOTTOM:
+				adjWidthL = m_Computed.Left;
+				adjWidthR = m_Computed.Right;
+				break;
+			case BORDER_LEFT:
+			case BORDER_RIGHT:
+				adjWidthL = m_Computed.Bottom;
+				adjWidthR = m_Computed.Top;
+				break;
+			default:
+				adjWidthL = adjWidthR = 0;
+				break;
+		}
 	}
 
 	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getTopBottomWidth() const
+	void CSSBorderRenderer::buildDotCornerStart(EBorderSide side, SDrawBorder shape, float x1, float y1, float radius)
 	{
-		return getTopWidth() + getBottomWidth();
+		NLMISC::CLine line;
+		switch(side)
+		{
+			case BORDER_TOP:
+				line.V0.set(m_XReal + m_Computed.Left, m_YReal + m_HReal - m_Computed.Top, 0);
+				line.V1.set(m_XReal, m_YReal + m_HReal, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_RIGHT:
+				line.V0.set(m_XReal + m_WReal, m_YReal, 0);
+				line.V1.set(m_XReal + m_WReal - m_Computed.Right, m_YReal + m_Computed.Bottom, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_BOTTOM:
+				line.V0.set(m_XReal, m_YReal, 0);
+				line.V1.set(m_XReal + m_Computed.Left, m_YReal + m_Computed.Bottom, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_LEFT:
+				line.V0.set(m_XReal + m_Computed.Left, m_YReal + m_Computed.Bottom, 0);
+				line.V1.set(m_XReal, m_YReal, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+		}
 	}
 
 	// ----------------------------------------------------------------------------
-	bool CSSBorderRenderer::hasInnerShape(CSSLineStyle style) const
+	void CSSBorderRenderer::buildDotCornerEnd(EBorderSide side, SDrawBorder shape, float x1, float y1, float radius)
 	{
-		return style == CSS_LINE_STYLE_DOUBLE ||
-				style == CSS_LINE_STYLE_GROOVE ||
-				style == CSS_LINE_STYLE_RIDGE;
+		NLMISC::CLine line;
+		switch(side)
+		{
+			case BORDER_TOP:
+				line.V0.set(m_XReal + m_WReal, m_YReal + m_HReal, 0);
+				line.V1.set(m_XReal + m_WReal - m_Computed.Right, m_YReal + m_HReal - m_Computed.Top, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_RIGHT:
+				line.V0.set(m_XReal + m_WReal - m_Computed.Right, m_YReal + m_HReal - m_Computed.Top, 0);
+				line.V1.set(m_XReal + m_WReal, m_YReal + m_HReal, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_BOTTOM:
+				line.V0.set(m_XReal + m_WReal - m_Computed.Right, m_YReal + m_Computed.Bottom, 0);
+				line.V1.set(m_XReal + m_WReal, m_YReal, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+			case BORDER_LEFT:
+				line.V0.set(m_XReal, m_YReal + m_HReal, 0);
+				line.V1.set(m_XReal + m_Computed.Left, m_YReal + m_HReal - m_Computed.Top, 0);
+				buildDotCorner(shape, x1, y1, radius, line);
+				break;
+		}
 	}
 
 	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::updateCoords()
+	void CSSBorderRenderer::buildDashedBorder(EBorderSide side)
 	{
-		m_Dirty = false;
-		m_DrawBorders.clear();
-		if (!m_Border) return;
+		CSSBorder border;
 
-		sint dTop    = getTopWidth();    m_BorderTop    = dTop > 0;
-		sint dRight  = getRightWidth();  m_BorderRight  = dRight > 0;
-		sint dBottom = getBottomWidth(); m_BorderBottom = dBottom > 0;
-		sint dLeft   = getLeftWidth();   m_BorderLeft   = dLeft > 0;
-
-		m_Border = m_BorderTop || m_BorderRight || m_BorderBottom || m_BorderLeft;
-		if (!m_Border) return;
-
-		sint xTop = m_YReal + m_HReal;
-		sint xRight = m_XReal + m_WReal;
+		float x, y;
+		bool horizontal;
+		sint32 width, thickness;
+		switch(side)
+		{
+			case BORDER_TOP:
+				horizontal = true;
+				border = m_Border.Top;
+				width = m_WReal;
+				thickness = m_Computed.Top;
+				x = m_XReal;
+				y = m_YReal + m_HReal - thickness;
+				break;
+			case BORDER_RIGHT:
+				horizontal = false;
+				border = m_Border.Right;
+				width = m_HReal;
+				thickness = m_Computed.Right;
+				x = m_XReal + m_WReal - thickness;
+				y = m_YReal;
+				break;
+			case BORDER_BOTTOM:
+				horizontal = true;
+				border = m_Border.Bottom;
+				width = m_WReal;
+				thickness = m_Computed.Bottom;
+				x = m_XReal;
+				y = m_YReal;
+				break;
+			case BORDER_LEFT:
+				horizontal = false;
+				border = m_Border.Left;
+				width = m_HReal;
+				thickness = m_Computed.Left;
+				x = m_XReal;
+				y = m_YReal;
+				break;
+			default:
+				return;
+		}
 
-		sint bLeft = m_XReal + dLeft;
-		sint bRight = xRight - dRight;
-		sint bTop = xTop - dTop;
-		sint bBottom = m_YReal + dBottom;
+		if (width < 1) return;
+		if (thickness < 1) return;
 
 		SDrawBorder shape;
+		shape.Color = border.Color;
 		shape.Quad.Uv0.set(0.f, 0.f);
 		shape.Quad.Uv1.set(1.f, 0.f);
 		shape.Quad.Uv2.set(1.f, 1.f);
 		shape.Quad.Uv3.set(0.f, 1.f);
 
-		// V3 - top-left
-		// V2 - top-right
-		// V1 - bottom-right
-		// V0 - bottom-left
-		if (m_BorderTop)
+		EBorderSide adjBorderL, adjBorderR;
+		getAdjacentBorders(side, adjBorderL, adjBorderR);
+
+		sint32 adjWidthL, adjWidthR;
+		getAdjacentBorderWidth(side, adjWidthL, adjWidthR);
+
+		// get alias to x/y
+		float &xy = horizontal ? x : y;
+
+		if (border.Style == CSS_LINE_STYLE_DOTTED)
 		{
-			if (TopStyle == CSS_LINE_STYLE_INSET || TopStyle == CSS_LINE_STYLE_GROOVE)
-				shape.Color = blend(TopColor, CRGBA::Black, 0.5f);
-			else
-				shape.Color = TopColor;
+			// thick border with little or no content might try to draw larger dot that fits
+			float radius = std::min(thickness / 2.f, width / 2.f);
+			float dot = thickness;
 
-			shape.Quad.V3.x = m_XReal; shape.Quad.V3.y = xTop;
-			shape.Quad.V2.x = xRight; shape.Quad.V2.y = xTop;
-			shape.Quad.V1.x = bRight; shape.Quad.V1.y = bTop;
-			shape.Quad.V0.x = bLeft;  shape.Quad.V0.y = bTop;
-			m_DrawBorders.push_back(shape);
+			sint32 count = std::floor((float)width / dot);
+			// 3n (dot, gap, dot) groups; count should be odd
+			if ((count % 2) == 0) count += 1;
 
-			if (hasInnerShape(TopStyle))
+			if (count == 1)
 			{
-				float iLeft, iTop, iRight;
-				if (TopStyle == CSS_LINE_STYLE_DOUBLE)
+				// fallback to single dot
+				if (horizontal)
 				{
-					iLeft  = 2*dLeft   / 3.f;
-					iTop   = 2*dBottom / 3.f;
-					iRight = 2*dRight  / 3.f;
-				} else {
-					iLeft  = dLeft  / 2.f;
-					iTop   = dTop   / 2.f;
-					iRight = dRight / 2.f;
+					x += width / 2.f;
+					y += radius;
 				}
-
-				if (TopStyle == CSS_LINE_STYLE_RIDGE)
-					shape.Color = blend(TopColor, CRGBA::Black, 0.5f);
 				else
-					shape.Color = TopColor;
-
-				// create inner border shape and remove overlapping from outer shape
-				m_DrawBorders.back().Quad.V0.x  -= iLeft; m_DrawBorders.back().Quad.V0.y  += iTop;
-				m_DrawBorders.back().Quad.V1.x  += iRight; m_DrawBorders.back().Quad.V1.y  += iTop;
-				shape.Quad.V3.x += iLeft; shape.Quad.V3.y -= iTop;
-				shape.Quad.V2.x -= iRight; shape.Quad.V2.y -= iTop;
-				m_DrawBorders.push_back(shape);
+				{
+					x += radius;
+					y += width / 2.f;
+				}
+
+				buildDotSegments(shape, x, y, radius);
+				return;
 			}
-		}
 
-		if (m_BorderBottom)
-		{
-			if (BottomStyle == CSS_LINE_STYLE_OUTSET || BottomStyle == CSS_LINE_STYLE_RIDGE)
-				shape.Color = blend(BottomColor, CRGBA::Black, 0.5f);
+			// center-to-center spacing for dots
+			float spacing = dot + (width - dot * count) / (count-1);
+
+			x += radius;
+			y += radius;
+
+			if (adjWidthL > 0)
+				buildDotCornerStart(side, shape, x, y, radius);
 			else
-				shape.Color = BottomColor;
+				buildDotSegments(shape, x, y, radius);
+
+			xy += spacing;
+			count--;
+
+			if (adjWidthR > 0)
+				count--;
+
+			bool isDot = false;
+			while(count > 0)
+			{
+				if (isDot)
+					buildDotSegments(shape, x, y, radius);
+
+				isDot = !isDot;
+				xy += spacing;
+				count--;
+			}
+
+			if (adjWidthR > 0)
+				buildDotCornerEnd(side, shape, x, y, radius);
+		}
+		else
+		{
+			sint32 innerWidth = width;
+			if (adjWidthL > 0) innerWidth -= adjWidthL;
+			if (adjWidthR > 0) innerWidth -= adjWidthR;
+
+			sint32 count = std::floor((float)innerWidth * 2.f / (thickness * 3));
 
-			shape.Quad.V3.x = bLeft; shape.Quad.V3.y = bBottom;
-			shape.Quad.V2.x = bRight; shape.Quad.V2.y = bBottom;
-			shape.Quad.V1.x = xRight; shape.Quad.V1.y = m_YReal;
-			shape.Quad.V0.x = m_XReal; shape.Quad.V0.y = m_YReal;
+			if ((float)innerWidth < 2.f * thickness)
+			{
+				buildSolidBorder(side);
+				return;
+			}
+
+			// 4n groups (halfDash, halfGap, halfGap, halfDash)
+			     if ((count % 4) == 1) count += 3;
+			else if ((count % 4) == 2) count += 2;
+			else if ((count % 4) == 3) count += 1;
+
+			float halfDash = (float)innerWidth / (float)count;
+			float fullDash = halfDash * 2.f;
+
+			// draw half dash or full corner
+			makeBorderQuad(side, shape, x, y, adjWidthL + halfDash, thickness);
+			if (adjWidthL > 0)
+				makeCornerQuad(adjBorderL, shape);
 			m_DrawBorders.push_back(shape);
+			xy += adjWidthL + halfDash;
+
+			// start/end half dash that are merged with corners
+			count -= 2;
 
-			if (hasInnerShape(BottomStyle))
+			bool isDash = false;
+			while(count > 0)
 			{
-				float iLeft, iBottom, iRight;
-				if (BottomStyle == CSS_LINE_STYLE_DOUBLE)
+				if (isDash)
 				{
-					iLeft   = 2*dLeft   / 3.f;
-					iBottom = 2*dBottom / 3.f;
-					iRight  = 2*dRight  / 3.f;
-				}
-				else
-				{
-					iLeft   = dLeft   / 2.f;
-					iBottom = dBottom / 2.f;
-					iRight  = dRight  / 2.f;
+					makeBorderQuad(side, shape, x, y, fullDash, thickness);
+					m_DrawBorders.push_back(shape);
 				}
+				isDash = !isDash;
 
-				if (BottomStyle == CSS_LINE_STYLE_GROOVE)
-					shape.Color = blend(shape.Color, CRGBA::Black, 0.5f);
-				else
-					shape.Color = BottomColor;
-
-				m_DrawBorders.back().Quad.V2.x  += iRight;  m_DrawBorders.back().Quad.V2.y -= iBottom;
-				m_DrawBorders.back().Quad.V3.x  -= iLeft;  m_DrawBorders.back().Quad.V3.y -= iBottom;
-				shape.Quad.V1.x -= iRight; shape.Quad.V1.y += iBottom;
-				shape.Quad.V0.x += iLeft; shape.Quad.V0.y += iBottom;
-				m_DrawBorders.push_back(shape);
+				xy += fullDash;
+				count -= 2;
 			}
+
+			// draw half dash or full corner
+			makeBorderQuad(side, shape, x, y, adjWidthR + halfDash, thickness);
+			if (adjWidthR > 0)
+				makeCornerQuad(adjBorderR, shape);
+
+			m_DrawBorders.push_back(shape);
 		}
+	}
 
-		if (m_BorderRight)
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::buildSolidBorder(EBorderSide side)
+	{
+		float x, y;
+		sint width, thickness;
+		CSSBorder border;
+		switch(side)
 		{
-			if (RightStyle == CSS_LINE_STYLE_OUTSET || RightStyle == CSS_LINE_STYLE_RIDGE)
-				shape.Color = blend(RightColor, CRGBA::Black, 0.5f);
-			else
-				shape.Color = RightColor;
+			case BORDER_TOP:
+				border = m_Border.Top;
+				width = m_WReal;
+				thickness = m_Computed.Top;
+				x = m_XReal;
+				y = m_YReal + m_HReal - thickness;
+				break;
+			case BORDER_RIGHT:
+				border = m_Border.Right;
+				width = m_HReal;
+				thickness = m_Computed.Right;
+				x = m_XReal + m_WReal - thickness;
+				y = m_YReal;
+				break;
+			case BORDER_BOTTOM:
+				border = m_Border.Bottom;
+				width = m_WReal;
+				thickness = m_Computed.Bottom;
+				x = m_XReal;
+				y = m_YReal;
+				break;
+			case BORDER_LEFT:
+				border = m_Border.Left;
+				width = m_HReal;
+				thickness = m_Computed.Left;
+				x = m_XReal;
+				y = m_YReal;
+				break;
+			default:
+				return;
+		}
+
+		SDrawBorder shape;
+		shape.Color = border.Color;
+		shape.Quad.Uv0.set(0.f, 0.f);
+		shape.Quad.Uv1.set(1.f, 0.f);
+		shape.Quad.Uv2.set(1.f, 1.f);
+		shape.Quad.Uv3.set(0.f, 1.f);
+
+		if (border.Style == CSS_LINE_STYLE_INSET && (side == BORDER_TOP || side == BORDER_LEFT))
+			shape.Color = blend(border.Color, CRGBA::Black, 0.5f);
+		else if (border.Style == CSS_LINE_STYLE_OUTSET && (side == BORDER_BOTTOM || side == BORDER_RIGHT))
+			shape.Color = blend(border.Color, CRGBA::Black, 0.5f);
+
+		// solid border
+		{
+			EBorderSide adjBorderL, adjBorderR;
+			getAdjacentBorders(side, adjBorderL, adjBorderR);
+
+			makeBorderQuad(side, shape, x, y, width, thickness);
+			makeCornerQuad(adjBorderL, shape);
+			makeCornerQuad(adjBorderR, shape);
 
-			shape.Quad.V3.x = bRight; shape.Quad.V3.y = bTop;
-			shape.Quad.V2.x = xRight; shape.Quad.V2.y = xTop;
-			shape.Quad.V1.x = xRight; shape.Quad.V1.y = m_YReal;
-			shape.Quad.V0.x = bRight; shape.Quad.V0.y = bBottom;
 			m_DrawBorders.push_back(shape);
+		}
 
-			if (hasInnerShape(RightStyle))
+		if (hasInnerShape(border.Style))
+		{
+			if (side == BORDER_TOP || side == BORDER_LEFT)
 			{
-				float iTop, iRight, iBottom;
-				if (RightStyle == CSS_LINE_STYLE_DOUBLE)
-				{
-					iTop = 2*dTop / 3.f;
-					iRight = 2*dRight / 3.f;
-					iBottom = 2*dBottom / 3.f;
-				} else {
-					iTop = dTop / 2.f;
-					iRight = dRight / 2.f;
-					iBottom = dBottom / 2.f;
-				}
+				if (border.Style == CSS_LINE_STYLE_GROOVE)
+					m_DrawBorders.back().Color = blend(border.Color, CRGBA::Black, 0.5f);
+				else if (border.Style == CSS_LINE_STYLE_RIDGE)
+					shape.Color = blend(border.Color, CRGBA::Black, 0.5f);
+			}
+			else if (side == BORDER_BOTTOM || side == BORDER_RIGHT)
+			{
+				if (border.Style == CSS_LINE_STYLE_GROOVE)
+					shape.Color = blend(border.Color, CRGBA::Black, 0.5f);
+				else if (border.Style == CSS_LINE_STYLE_RIDGE)
+					m_DrawBorders.back().Color = blend(border.Color, CRGBA::Black, 0.5f);
+			}
 
-				if (RightStyle == CSS_LINE_STYLE_GROOVE)
-					shape.Color = blend(shape.Color, CRGBA::Black, 0.5f);
-				else
-					shape.Color = RightColor;
+			sint32 adjWidthL, adjWidthR;
+			getAdjacentBorderWidth(side, adjWidthL, adjWidthR);
+
+			float iStart, iMiddle, iEnd;
+			if (border.Style == CSS_LINE_STYLE_DOUBLE)
+			{
+				iStart  = 2 * adjWidthL  / 3.f;
+				iMiddle = 2 * thickness  / 3.f;
+				iEnd    = 2 * adjWidthR  / 3.f;
+			} else {
+				iStart  = adjWidthL / 2.f;
+				iMiddle = thickness / 2.f;
+				iEnd    = adjWidthR / 2.f;
+			}
 
-				m_DrawBorders.back().Quad.V3.x  += iRight;  m_DrawBorders.back().Quad.V3.y += iTop;
-				m_DrawBorders.back().Quad.V0.x  += iRight;  m_DrawBorders.back().Quad.V0.y -= iBottom;
-				shape.Quad.V2.x -= iRight; shape.Quad.V2.y -= iTop;
-				shape.Quad.V1.x -= iRight; shape.Quad.V1.y += iBottom;
-				m_DrawBorders.push_back(shape);
+			// create inner shape and remove overlapping from outer shape
+			switch(side)
+			{
+				case BORDER_TOP:
+					m_DrawBorders.back().Quad.V0.x -= iStart; m_DrawBorders.back().Quad.V0.y  += iMiddle;
+					m_DrawBorders.back().Quad.V1.x += iEnd;   m_DrawBorders.back().Quad.V1.y  += iMiddle;
+					shape.Quad.V3.x += iStart; shape.Quad.V3.y -= iMiddle;
+					shape.Quad.V2.x -= iEnd;   shape.Quad.V2.y -= iMiddle;
+					break;
+				case BORDER_BOTTOM:
+					m_DrawBorders.back().Quad.V2.x += iEnd;   m_DrawBorders.back().Quad.V2.y -= iMiddle;
+					m_DrawBorders.back().Quad.V3.x -= iStart; m_DrawBorders.back().Quad.V3.y -= iMiddle;
+					shape.Quad.V1.x -= iEnd;   shape.Quad.V1.y += iMiddle;
+					shape.Quad.V0.x += iStart; shape.Quad.V0.y += iMiddle;
+					break;
+				case BORDER_RIGHT:
+					m_DrawBorders.back().Quad.V3.x += iMiddle; m_DrawBorders.back().Quad.V3.y += iEnd;
+					m_DrawBorders.back().Quad.V0.x += iMiddle; m_DrawBorders.back().Quad.V0.y -= iStart;
+					shape.Quad.V2.x -= iMiddle; shape.Quad.V2.y -= iEnd;
+					shape.Quad.V1.x -= iMiddle; shape.Quad.V1.y += iStart;
+					break;
+				case BORDER_LEFT:
+					m_DrawBorders.back().Quad.V2.x -= iMiddle; m_DrawBorders.back().Quad.V2.y += iEnd;
+					m_DrawBorders.back().Quad.V1.x -= iMiddle; m_DrawBorders.back().Quad.V1.y -= iStart;
+					shape.Quad.V3.x += iMiddle; shape.Quad.V3.y -= iEnd;
+					shape.Quad.V0.x += iMiddle; shape.Quad.V0.y += iStart;
+					break;
 			}
+			m_DrawBorders.push_back(shape);
 		}
+	}
 
-		if (m_BorderLeft)
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::makeBorderQuad(EBorderSide side, SDrawBorder &shape, float x, float y, float width, float thickness) const
+	{
+		float quadW, quadH;
+		switch(side)
 		{
-			if (LeftStyle == CSS_LINE_STYLE_INSET || LeftStyle == CSS_LINE_STYLE_GROOVE)
-				shape.Color = blend(LeftColor, CRGBA::Black, 0.5f);
-			else
-				shape.Color = LeftColor;
+			case BORDER_TOP:   quadW = width; quadH = thickness; break;
+			case BORDER_BOTTOM:quadW = width; quadH = thickness; break;
+			case BORDER_LEFT:  quadW = thickness; quadH = width; break;
+			case BORDER_RIGHT: quadW = thickness; quadH = width; break;
+			default: return;
+		}
+		shape.Quad.V3.x = x;         shape.Quad.V3.y = y + quadH;
+		shape.Quad.V2.x = x + quadW; shape.Quad.V2.y = y + quadH;
+		shape.Quad.V1.x = x + quadW; shape.Quad.V1.y = y;
+		shape.Quad.V0.x = x;         shape.Quad.V0.y = y;
+	}
 
-			shape.Quad.V3.x = m_XReal; shape.Quad.V3.y = xTop;
-			shape.Quad.V2.x = bLeft; shape.Quad.V2.y = bTop;
-			shape.Quad.V1.x = bLeft; shape.Quad.V1.y = bBottom;
-			shape.Quad.V0.x = m_XReal; shape.Quad.V0.y = m_YReal;
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::makeCornerQuad(EBorderSide side, SDrawBorder &shape) const
+	{
+		switch(side)
+		{
+			case BORDER_TOP_LEFT:     shape.Quad.V0.x += m_Computed.Left; break;
+			case BORDER_TOP_RIGHT:    shape.Quad.V1.x -= m_Computed.Right; break;
+			case BORDER_RIGHT_TOP:    shape.Quad.V3.y -= m_Computed.Top; break;
+			case BORDER_RIGHT_BOTTOM: shape.Quad.V0.y += m_Computed.Bottom; break;
+			case BORDER_BOTTOM_LEFT:  shape.Quad.V3.x += m_Computed.Left; break;
+			case BORDER_BOTTOM_RIGHT: shape.Quad.V2.x -= m_Computed.Right; break;
+			case BORDER_LEFT_TOP:     shape.Quad.V2.y -= m_Computed.Top; break;
+			case BORDER_LEFT_BOTTOM:  shape.Quad.V1.y += m_Computed.Bottom; break;
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	static bool getCircleLineIntersection(float x, float y, float r, const NLMISC::CLine &line, NLMISC::CLine &result)
+	{
+		float dx = line.V0.x - line.V1.x;
+		float dy = line.V0.y - line.V1.y;
+		float rx = line.V0.x-x;
+		float ry = line.V0.y-y;
+		float a = dx*dx + dy*dy;
+		float b = 2*(dx * rx + dy * ry);
+		float c = rx * rx + ry * ry - r*r;
+		float d = b*b - 4 * a * c;
+
+		if (d < 0)
+			return false;
+
+		if (d == 0)
+		{
+			// single intersection
+			//float t = -b / (2*a);
+			//result.V0.x = result.V1.x = line.V0.x + t * dx;
+			//result.V0.y = result.V1.y = line.V0.y + t * dy;
+			return false;
+		}
+
+		float t;
+		t = (-b + sqrt(d)) / (2 * a);
+		result.V0.x = line.V0.x + t * dx;
+		result.V0.y = line.V0.y + t * dy;
+
+		t = (-b - sqrt(d)) / (2 * a);
+		result.V1.x = line.V0.x + t * dx;
+		result.V1.y = line.V0.y + t * dy;
 
+		return true;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::buildDotCorner(SDrawBorder shape, float cX, float cY, float cR, const NLMISC::CLine &line)
+	{
+		static const float twopi = 2 * NLMISC::Pi;
+		NLMISC::CLine out;
+		if (getCircleLineIntersection(cX, cY, cR, line, out))
+		{
+			float fromAngle = std::atan2(out.V0.y - cY, out.V0.x - cX);
+			float toAngle   = std::atan2(out.V1.y - cY, out.V1.x - cX);
+			if (fromAngle < 0) fromAngle += twopi;
+			if (toAngle < 0) toAngle += twopi;
+			fromAngle /= twopi;
+			toAngle /= twopi;
+			buildDotSegments(shape, cX, cY, cR, fromAngle, toAngle);
+		} else {
+			buildDotSegments(shape, cX, cY, cR);
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::buildDotSegments(SDrawBorder shape, float x, float y, float radius, float fromAngle, float toAngle)
+	{
+		static const float pi = (float)NLMISC::Pi;
+		static const float twopi = (float)(NLMISC::Pi * 2);
+		static const uint minSectors = 12;
+
+		// use single quad if dot is small
+		if (2 * radius * m_Scale < 4)
+		{
+			makeBorderQuad(BORDER_TOP, shape, x - radius, y - radius, radius * 2, radius * 2);
 			m_DrawBorders.push_back(shape);
+			return;
+		}
 
-			if (hasInnerShape(LeftStyle))
-			{
-				if (LeftStyle == CSS_LINE_STYLE_RIDGE)
-					shape.Color = blend(LeftColor, CRGBA::Black, 0.5f);
-				else
-					shape.Color = LeftColor;
+		// number of sectors for full circle
+		uint sectors = std::max(minSectors, (uint)std::ceil(radius * m_Scale));
 
-				float iTop, iLeft, iBottom;
-				if (LeftStyle == CSS_LINE_STYLE_DOUBLE)
-				{
-					iTop    = 2*dTop    / 3.f;
-					iLeft   = 2*dLeft   / 3.f;
-					iBottom = 2*dBottom / 3.f;
-				} else {
-					iTop = dTop / 2.f;
-					iLeft = dLeft / 2.f;
-					dBottom = dBottom / 2.f;
-				}
+		float arcLength;
+		if (toAngle < fromAngle)
+			arcLength = twopi * (1 + toAngle - fromAngle);
+		else
+			arcLength = twopi * (toAngle - fromAngle);
 
-				m_DrawBorders.back().Quad.V2.x  -= iLeft;  m_DrawBorders.back().Quad.V2.y += iTop;
-				m_DrawBorders.back().Quad.V1.x  -= iLeft;  m_DrawBorders.back().Quad.V1.y -= iBottom;
-				shape.Quad.V3.x += iLeft; shape.Quad.V3.y -= iTop;
-				shape.Quad.V0.x += iLeft; shape.Quad.V0.y += iBottom;
-				m_DrawBorders.push_back(shape);
-			}
+		// sectors to draw
+		float arcSectors = ceil(arcLength * sectors / twopi );
+		float arcSectorLength = arcLength / arcSectors;
+
+		if (arcSectors <= 1)
+			return;
+
+		if (arcLength < pi)
+		{
+			// only small segment is visible
+			float px1 = x + radius * cosf(twopi * fromAngle);
+			float py1 = y + radius * sinf(twopi * fromAngle);
+			float px2 = x + radius * cosf(twopi * toAngle);
+			float py2 = y + radius * sinf(twopi * toAngle);
+			float cx = (px1 + px2) / 2.f;
+			float cy = (py1 + py2) / 2.f;
+			shape.Quad.V0.x = cx; shape.Quad.V0.y = cy;
+			shape.Quad.V1.x = cx; shape.Quad.V1.y = cy;
+		}
+		else
+		{
+			shape.Quad.V0.x = x; shape.Quad.V0.y = y;
+			shape.Quad.V1.x = x; shape.Quad.V1.y = y;
+		}
+
+		float a1 = fromAngle * twopi;
+		uint step;
+		for(step = 0; step < (uint)arcSectors; step++)
+		{
+			float a2 = a1 + arcSectorLength;
+
+			shape.Quad.V2.x = x + radius * cosf(a1); shape.Quad.V2.y = y + radius * sinf(a1);
+			shape.Quad.V3.x = x + radius * cosf(a2); shape.Quad.V3.y = y + radius * sinf(a2);
+
+			m_DrawBorders.push_back(shape);
+
+			a1 = a2;
 		}
+
+		// build last sector if requested range is over 180deg
+		if (arcLength > pi && arcLength < twopi)
+		{
+			float a2 = fromAngle * twopi;
+			shape.Quad.V2.x = x + radius * cosf(a1); shape.Quad.V2.y = y + radius * sinf(a1);
+			shape.Quad.V3.x = x + radius * cosf(a2); shape.Quad.V3.y = y + radius * sinf(a2);
+			m_DrawBorders.push_back(shape);
+		}
+	}
+
+	// ----------------------------------------------------------------------------
+	void CSSBorderRenderer::updateCoords()
+	{
+		m_Dirty = false;
+		m_DrawBorders.clear();
+
+		if (m_MustComputeValues)
+			computeValues();
+
+		if (m_Computed.Top > 0 && m_Border.Top.Color.A > 0)
+		{
+			if (m_Border.Top.Style == CSS_LINE_STYLE_DASHED || m_Border.Top.Style == CSS_LINE_STYLE_DOTTED)
+				buildDashedBorder(BORDER_TOP);
+			else
+				buildSolidBorder(BORDER_TOP);
+		}
+
+		if (m_Computed.Bottom > 0 && m_Border.Bottom.Color.A > 0)
+		{
+			if (m_Border.Bottom.Style == CSS_LINE_STYLE_DASHED || m_Border.Bottom.Style == CSS_LINE_STYLE_DOTTED)
+				buildDashedBorder(BORDER_BOTTOM);
+			else
+				buildSolidBorder(BORDER_BOTTOM);
+		}
+
+		if (m_Computed.Right > 0 && m_Border.Right.Color.A > 0)
+		{
+			if (m_Border.Right.Style == CSS_LINE_STYLE_DASHED || m_Border.Right.Style == CSS_LINE_STYLE_DOTTED)
+				buildDashedBorder(BORDER_RIGHT);
+			else
+				buildSolidBorder(BORDER_RIGHT);
+		}
+
+		if (m_Computed.Left > 0 && m_Border.Left.Color.A > 0)
+		{
+			if (m_Border.Left.Style == CSS_LINE_STYLE_DASHED || m_Border.Left.Style == CSS_LINE_STYLE_DOTTED)
+				buildDashedBorder(BORDER_LEFT);
+			else
+				buildSolidBorder(BORDER_LEFT);
+		}
+
 	}
 
 	// ----------------------------------------------------------------------------
 	void CSSBorderRenderer::draw() {
 		if (m_Dirty) updateCoords();
-		if (!m_Border) return;
+		if (m_DrawBorders.empty()) return;
 
 		CViewRenderer &rVR = *CViewRenderer::getInstance();
 
-		// TODO: no need for widget manager, if global color is set from parent
 		CRGBA globalColor;
 		if (m_ModulateGlobalColor)
 			globalColor = CWidgetManager::getInstance()->getGlobalColor();
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index 7a9b725af..912ff04d4 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -504,7 +504,7 @@ namespace NLGUI
 		}
 	}
 
-	void CCssStyle::applyBorderWidth(const std::string &value, uint32 *dest, const uint32 currentWidth, const uint32 fontSize) const
+	void CCssStyle::applyBorderWidth(const std::string &value, CSSLength *dest, const CSSLength &currentWidth) const
 	{
 		if (!dest) return;
 		if (value == "inherit")
@@ -513,37 +513,19 @@ namespace NLGUI
 		}
 		else if (value == "thin")
 		{
-			*dest = 1;
+			dest->setFloatValue(1, "px");
 		}
 		else if (value == "medium")
 		{
-			*dest = 3;
+			dest->setFloatValue(3, "px");
 		}
 		else if (value == "thick")
 		{
-			*dest = 5;
-		}
-		else if (value == "0")
-		{
-			*dest = 0;
+			dest->setFloatValue(5, "px");
 		}
 		else
 		{
-			float tmpf;
-			std::string unit;
-			if (getCssLength(tmpf, unit, value.c_str()))
-			{
-				if (unit == "rem")
-					*dest = fontSize * tmpf;
-				else if (unit == "em")
-					*dest = fontSize * tmpf;
-				else if (unit == "pt")
-					*dest = tmpf / 0.75f;
-				else if (unit == "%")
-					*dest = 0; // no support for % in border width
-				else
-					*dest = tmpf;
-			}
+			dest->parseValue(value, false, false);
 		}
 	}
 
@@ -656,18 +638,18 @@ namespace NLGUI
 		TStyle::const_iterator it;
 		for (it=style.StyleRules.begin(); it != style.StyleRules.end(); ++it)
 		{
-			     if (it->first == "border-top-width")	 applyBorderWidth(it->second, &style.BorderTopWidth, current.BorderTopWidth, current.FontSize);
-			else if (it->first == "border-top-color")	 applyBorderColor(it->second, &style.BorderTopColor, current.BorderTopColor, current.TextColor);
-			else if (it->first == "border-top-style")	 applyLineStyle(it->second, &style.BorderTopStyle, current.BorderTopStyle);
-			else if (it->first == "border-right-width")	 applyBorderWidth(it->second, &style.BorderRightWidth, current.BorderRightWidth, current.FontSize);
-			else if (it->first == "border-right-color")	 applyBorderColor(it->second, &style.BorderRightColor, current.BorderRightColor, current.TextColor);
-			else if (it->first == "border-right-style")	 applyLineStyle(it->second, &style.BorderRightStyle, current.BorderRightStyle);
-			else if (it->first == "border-bottom-width") applyBorderWidth(it->second, &style.BorderBottomWidth, current.BorderBottomWidth, current.FontSize);
-			else if (it->first == "border-bottom-color") applyBorderColor(it->second, &style.BorderBottomColor, current.BorderBottomColor, current.TextColor);
-			else if (it->first == "border-bottom-style") applyLineStyle(it->second, &style.BorderBottomStyle, current.BorderBottomStyle);
-			else if (it->first == "border-left-width")	 applyBorderWidth(it->second, &style.BorderLeftWidth, current.BorderLeftWidth, current.FontSize);
-			else if (it->first == "border-left-color")	 applyBorderColor(it->second, &style.BorderLeftColor, current.BorderLeftColor, current.TextColor);
-			else if (it->first == "border-left-style")	 applyLineStyle(it->second, &style.BorderLeftStyle, current.BorderLeftStyle);
+			     if (it->first == "border-top-width")	 applyBorderWidth(it->second, &style.Border.Top.Width, current.Border.Top.Width);
+			else if (it->first == "border-top-color")	 applyBorderColor(it->second, &style.Border.Top.Color, current.Border.Top.Color, current.TextColor);
+			else if (it->first == "border-top-style")	 applyLineStyle(it->second,   &style.Border.Top.Style, current.Border.Top.Style);
+			else if (it->first == "border-right-width")	 applyBorderWidth(it->second, &style.Border.Right.Width,  current.Border.Right.Width);
+			else if (it->first == "border-right-color")	 applyBorderColor(it->second, &style.Border.Right.Color,  current.Border.Right.Color, current.TextColor);
+			else if (it->first == "border-right-style")	 applyLineStyle(it->second,   &style.Border.Right.Style,  current.Border.Right.Style);
+			else if (it->first == "border-bottom-width") applyBorderWidth(it->second, &style.Border.Bottom.Width, current.Border.Bottom.Width);
+			else if (it->first == "border-bottom-color") applyBorderColor(it->second, &style.Border.Bottom.Color, current.Border.Bottom.Color, current.TextColor);
+			else if (it->first == "border-bottom-style") applyLineStyle(it->second,   &style.Border.Bottom.Style, current.Border.Bottom.Style);
+			else if (it->first == "border-left-width")	 applyBorderWidth(it->second, &style.Border.Left.Width,   current.Border.Left.Width);
+			else if (it->first == "border-left-color")	 applyBorderColor(it->second, &style.Border.Left.Color,   current.Border.Left.Color, current.TextColor);
+			else if (it->first == "border-left-style")	 applyLineStyle(it->second,   &style.Border.Left.Style,   current.Border.Left.Style);
 			else if (it->first == "margin-top")			 applyMarginWidth(it->second, &style.MarginTop, current.MarginTop, current.FontSize);
 			else if (it->first == "margin-right")		 applyMarginWidth(it->second, &style.MarginRight, current.MarginRight, current.FontSize);
 			else if (it->first == "margin-bottom")		 applyMarginWidth(it->second, &style.MarginBottom, current.MarginBottom, current.FontSize);

From e0d54f78979e36d918ad5c8d92687046c2cd0174 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 9 Sep 2021 12:42:27 +0300
Subject: [PATCH 281/292] Draw table background/border using css renderers

---
 nel/include/nel/gui/group_table.h |  34 +--
 nel/src/gui/group_html.cpp        | 151 ++++++-------
 nel/src/gui/group_table.cpp       | 348 ++++++++++++------------------
 3 files changed, 213 insertions(+), 320 deletions(-)

diff --git a/nel/include/nel/gui/group_table.h b/nel/include/nel/gui/group_table.h
index 74f5ae18d..c680811c0 100644
--- a/nel/include/nel/gui/group_table.h
+++ b/nel/include/nel/gui/group_table.h
@@ -31,6 +31,7 @@
 namespace NLGUI
 {
 	class CSSBorderRenderer;
+	class CSSBackgroundRenderer;
 
 	/**
 	  * This group is used to simulate HTML cells.
@@ -94,22 +95,10 @@ namespace NLGUI
 		// Memorize max width
 		sint32	WidthMax;
 
-		// The cell color
-		NLMISC::CRGBA	BgColor;
-
 		CSSBorderRenderer* Border;
+		CSSBackgroundRenderer *Background;
 		uint32 PaddingTop, PaddingRight, PaddingBottom, PaddingLeft;
 
-		// Texture
-		CViewRenderer::CTextureId	_TextureId;
-		bool _TextureTiled;
-		bool _TextureScaled;
-		// cached absolute coords for background texture
-		sint32 _TextureXReal;
-		sint32 _TextureYReal;
-		sint32 _TextureWReal;
-		sint32 _TextureHReal;
-
 		// Alignment
 		TAlign	Align;
 		TVAlign	VAlign;
@@ -121,6 +110,7 @@ namespace NLGUI
 		// The cell is nowrap
 		bool	NoWrap;
 
+		// deprecated background image
 		void setTexture(const std::string & TxName);
 		void setTextureTile(bool tiled);
 		void setTextureScale(bool scaled);
@@ -134,8 +124,6 @@ namespace NLGUI
 		static bool getDebugUICell(){ return DebugUICell; }
 
 	private:
-		void updateTextureCoords();
-
 		void setEnclosedGroupDefaultParams();
 		static bool DebugUICell;
 	};
@@ -164,18 +152,18 @@ namespace NLGUI
 		sint32	ForceWidthMin;
 
 		CSSBorderRenderer* Border;
+		CSSBackgroundRenderer *Background;
 
 		// Cell has 1px solid border when <table> has 'border' attribute with width > 0
 		bool	CellBorder;
 		sint32	CellPadding;
 		sint32	CellSpacing;
 
-		// The table color
-		NLMISC::CRGBA	BgColor;
 		uint8	CurrentAlpha;
 
 		bool    ContinuousUpdate;
 
+		// deprecated background image
 		void setTexture(const std::string & TxName);
 		void setTextureTile(bool tiled);
 		void setTextureScale(bool scaled);
@@ -201,18 +189,6 @@ namespace NLGUI
 
 		virtual bool parse (xmlNodePtr cur, CInterfaceGroup * parentGroup);
 
-		// Texture
-		CViewRenderer::CTextureId _TextureId;
-		bool _TextureTiled;
-		bool _TextureScaled;
-		// cached absolute coords for background texture
-		sint32 _TextureXReal;
-		sint32 _TextureYReal;
-		sint32 _TextureWReal;
-		sint32 _TextureHReal;
-
-		void updateTextureCoords();
-
 		// Content validated
 		bool	_ContentValidated;
 
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 578041fa7..1dd28d473 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -5147,10 +5147,13 @@ namespace NLGUI
 		if (!_CellParams.empty() && inherit)
 			cellParams = _CellParams.back();
 
-		if (_Style.hasStyle("background-color"))
-			cellParams.BgColor = _Style.Current.Background.color;
-		else if (elm.hasNonEmptyAttribute("bgcolor"))
-			scanHTMLColor(elm.getAttribute("bgcolor").c_str(), cellParams.BgColor);
+		if (!_Style.hasStyle("background-color") && elm.hasNonEmptyAttribute("bgcolor"))
+		{
+			CRGBA c;
+			if (scanHTMLColor(elm.getAttribute("bgcolor").c_str(), c))
+				_Style.Current.Background.color = c;
+		}
+		cellParams.BgColor = _Style.Current.Background.color;
 
 		if (elm.hasAttribute("nowrap") || _Style.Current.WhiteSpace == "nowrap")
 			cellParams.NoWrap = true;
@@ -6109,7 +6112,7 @@ namespace NLGUI
 		uint32 width = _Style.Current.Width > -1 ? _Style.Current.Width : _Style.Current.FontSize * 5;
 		uint32 height = _Style.Current.Height > -1 ? _Style.Current.Height : _Style.Current.FontSize;
 		// FIXME: only using border-top
-		uint32 border = _Style.Current.BorderTopWidth > -1 ? _Style.Current.BorderTopWidth : 0;
+		uint32 border = _Style.Current.Border.Top.Width.getValue() > -1 ? _Style.Current.Border.Top.Width.getValue() : 0;
 
 		uint barw = (uint) (width * meter.getValueRatio());
 		CRGBA bgColor = meter.getBarColor(elm, _Style);
@@ -6331,7 +6334,7 @@ namespace NLGUI
 		uint32 width = _Style.Current.Width > -1 ? _Style.Current.Width : _Style.Current.FontSize * 10;
 		uint32 height = _Style.Current.Height > -1 ? _Style.Current.Height : _Style.Current.FontSize;
 		// FIXME: only using border-top
-		uint32 border = _Style.Current.BorderTopWidth > -1 ? _Style.Current.BorderTopWidth : 0;
+		uint32 border = _Style.Current.Border.Top.Width.getValue() > -1 ? _Style.Current.Border.Top.Width.getValue() : 0;
 
 		uint barw = (uint) (width * progress.getValueRatio());
 		CRGBA bgColor = progress.getBarColor(elm, _Style);
@@ -6459,7 +6462,7 @@ namespace NLGUI
 		getCellsParameters(elm, false);
 
 		CGroupTable *table = new CGroupTable(TCtorParam());
-		table->BgColor = _CellParams.back().BgColor;
+
 		if (elm.hasNonEmptyAttribute("id"))
 			table->setId(getCurrentGroup()->getId() + ":" + elm.getAttribute("id"));
 		else
@@ -6502,11 +6505,17 @@ namespace NLGUI
 
 		// border from css or from attribute
 		{
-			uint32 borderWidth = 0;
-			CRGBA borderColor = CRGBA::Transparent;
+			CSSRect<CSSBorder> border;
+			border.Top.Color = _Style.Current.TextColor;
+			border.Right.Color = _Style.Current.TextColor;
+			border.Bottom.Color = _Style.Current.TextColor;
+			border.Left.Color = _Style.Current.TextColor;
 
 			if (elm.hasAttribute("border"))
 			{
+				uint32 borderWidth = 0;
+				CRGBA borderColor = CRGBA::Transparent;
+
 				std::string s = elm.getAttribute("border");
 				if (s.empty())
 					borderWidth = 1;
@@ -6519,48 +6528,36 @@ namespace NLGUI
 					borderColor = CRGBA(128, 128, 128, 255);
 
 				table->CellBorder = (borderWidth > 0);
-				table->Border->setWidth(borderWidth, borderWidth, borderWidth, borderWidth);
-				table->Border->setColor(borderColor, borderColor, borderColor, borderColor);
-				table->Border->setStyle(CSS_LINE_STYLE_OUTSET, CSS_LINE_STYLE_OUTSET, CSS_LINE_STYLE_OUTSET, CSS_LINE_STYLE_OUTSET);
-			}
-			else
-			{
-				table->CellBorder = false;
+
+				border.Top.set(borderWidth, CSS_LINE_STYLE_OUTSET, borderColor);
+				border.Right.set(borderWidth, CSS_LINE_STYLE_OUTSET, borderColor);
+				border.Bottom.set(borderWidth, CSS_LINE_STYLE_OUTSET, borderColor);
+				border.Left.set(borderWidth, CSS_LINE_STYLE_OUTSET, borderColor);
 			}
 
-			if (_Style.hasStyle("border-top-width"))	table->Border->TopWidth = _Style.Current.BorderTopWidth;
-			if (_Style.hasStyle("border-right-width"))	table->Border->RightWidth = _Style.Current.BorderRightWidth;
-			if (_Style.hasStyle("border-bottom-width"))	table->Border->BottomWidth = _Style.Current.BorderBottomWidth;
-			if (_Style.hasStyle("border-left-width"))	table->Border->LeftWidth = _Style.Current.BorderLeftWidth;
+			if (_Style.hasStyle("border-top-width"))	border.Top.Width = _Style.Current.Border.Top.Width;
+			if (_Style.hasStyle("border-right-width"))	border.Right.Width = _Style.Current.Border.Right.Width;
+			if (_Style.hasStyle("border-bottom-width"))	border.Bottom.Width = _Style.Current.Border.Bottom.Width;
+			if (_Style.hasStyle("border-left-width"))	border.Left.Width = _Style.Current.Border.Left.Width;
 
-			if (_Style.hasStyle("border-top-color"))	table->Border->TopColor = _Style.Current.BorderTopColor;
-			if (_Style.hasStyle("border-right-color"))	table->Border->RightColor = _Style.Current.BorderRightColor;
-			if (_Style.hasStyle("border-bottom-color"))	table->Border->BottomColor = _Style.Current.BorderBottomColor;
-			if (_Style.hasStyle("border-left-color"))	table->Border->LeftColor = _Style.Current.BorderLeftColor;
+			if (_Style.hasStyle("border-top-color"))	border.Top.Color = _Style.Current.Border.Top.Color;
+			if (_Style.hasStyle("border-right-color"))	border.Right.Color = _Style.Current.Border.Right.Color;
+			if (_Style.hasStyle("border-bottom-color"))	border.Bottom.Color = _Style.Current.Border.Bottom.Color;
+			if (_Style.hasStyle("border-left-color"))	border.Left.Color = _Style.Current.Border.Left.Color;
 
-			if (_Style.hasStyle("border-top-style"))	table->Border->TopStyle = _Style.Current.BorderTopStyle;
-			if (_Style.hasStyle("border-right-style"))	table->Border->RightStyle = _Style.Current.BorderRightStyle;
-			if (_Style.hasStyle("border-bottom-style"))	table->Border->BottomStyle = _Style.Current.BorderBottomStyle;
-			if (_Style.hasStyle("border-left-style"))	table->Border->LeftStyle = _Style.Current.BorderLeftStyle;
-		}
+			if (_Style.hasStyle("border-top-style"))	border.Top.Style = _Style.Current.Border.Top.Style;
+			if (_Style.hasStyle("border-right-style"))	border.Right.Style = _Style.Current.Border.Right.Style;
+			if (_Style.hasStyle("border-bottom-style"))	border.Bottom.Style = _Style.Current.Border.Bottom.Style;
+			if (_Style.hasStyle("border-left-style"))	border.Left.Style = _Style.Current.Border.Left.Style;
 
-		if (_Style.hasStyle("background-image"))
-		{
-			if (_Style.checkStyle("background-repeat", "repeat"))
-				table->setTextureTile(true);
-
-			if (_Style.checkStyle("background-size", "100%"))
-				table->setTextureScale(true);
-
-			string image = _Style.getStyle("background-image");
-			addImageDownload(image, table, CStyleParams(), NormalImage, "");
-		}
-		else
-		{
-			// will be set in addImageDownload if background-image exists
-			table->setModulateGlobalColor(_Style.Current.GlobalColor);
+			table->Border->setBorder(border);
+			table->Border->setFontSize(_Style.Root.FontSize, _Style.Current.FontSize);
+			table->Border->setViewport(getList()->getParentPos() ? getList()->getParentPos() : this);
 		}
 
+		setupBackground(table->Background);
+		table->setModulateGlobalColor(_Style.Current.GlobalColor);
+
 		table->setMarginLeft(getIndent());
 		addHtmlGroup (table, 0);
 
@@ -6597,10 +6594,10 @@ namespace NLGUI
 		getCellsParameters(elm, true);
 
 		// if cell has own background,then it must be blended with row
-		if (rowColor.A > 0 && (elm.hasNonEmptyAttribute("bgcolor") || _Style.hasStyle("background-color")))
+		if (rowColor.A > 0 && _Style.Current.Background.color.A < 255)
 		{
-			if (_CellParams.back().BgColor.A < 255)
-				_CellParams.back().BgColor.blendFromui(rowColor, _CellParams.back().BgColor, _CellParams.back().BgColor.A);
+			_Style.Current.Background.color.blendFromui(rowColor,
+				_Style.Current.Background.color, _Style.Current.Background.color.A);
 		}
 
 		if (elm.ID == HTML_TH)
@@ -6633,29 +6630,14 @@ namespace NLGUI
 		// inner cell content
 		_Cells.back()->Group->setId(_Cells.back()->getId() + ":CELL");
 
-		if (_Style.checkStyle("background-repeat", "repeat"))
-			_Cells.back()->setTextureTile(true);
-
-		if (_Style.checkStyle("background-size", "100%"))
-			_Cells.back()->setTextureScale(true);
-
-		if (_Style.hasStyle("background-image"))
-		{
-			string image = _Style.getStyle("background-image");
-			addImageDownload(image, _Cells.back(), CStyleParams(), NormalImage, "");
-		}
-		else
-		{
-			// will be set in addImageDownload if background-image is set
-			_Cells.back()->setModulateGlobalColor(_Style.Current.GlobalColor);
-		}
+		setupBackground(_Cells.back()->Background);
+		_Cells.back()->setModulateGlobalColor(_Style.Current.GlobalColor);
 
 		if (elm.hasNonEmptyAttribute("colspan"))
 			fromString(elm.getAttribute("colspan"), _Cells.back()->ColSpan);
 		if (elm.hasNonEmptyAttribute("rowspan"))
 			fromString(elm.getAttribute("rowspan"), _Cells.back()->RowSpan);
 
-		_Cells.back()->BgColor = _CellParams.back().BgColor;
 		_Cells.back()->Align = _CellParams.back().Align;
 		_Cells.back()->VAlign = _CellParams.back().VAlign;
 		_Cells.back()->LeftMargin = _CellParams.back().LeftMargin;
@@ -6685,32 +6667,35 @@ namespace NLGUI
 
 		_Cells.back()->NewLine = getTR();
 
-		// border from <table border="1">
-		if (table->CellBorder)
-		{
-			_Cells.back()->Border->setWidth(1, 1, 1, 1);
-			_Cells.back()->Border->setColor(table->Border->TopColor, table->Border->RightColor, table->Border->BottomColor, table->Border->LeftColor);
-			_Cells.back()->Border->setStyle(CSS_LINE_STYLE_INSET, CSS_LINE_STYLE_INSET, CSS_LINE_STYLE_INSET, CSS_LINE_STYLE_INSET);
-		}
+		CSSRect<CSSBorder> border;
+		border.Top.set(   table->CellBorder ? 1 : 0, CSS_LINE_STYLE_INSET, _Style.Current.TextColor);
+		border.Right.set( table->CellBorder ? 1 : 0, CSS_LINE_STYLE_INSET, _Style.Current.TextColor);
+		border.Bottom.set(table->CellBorder ? 1 : 0, CSS_LINE_STYLE_INSET, _Style.Current.TextColor);
+		border.Left.set(  table->CellBorder ? 1 : 0, CSS_LINE_STYLE_INSET, _Style.Current.TextColor);
+
+		if (_Style.hasStyle("border-top-width"))	border.Top.Width = _Style.Current.Border.Top.Width;
+		if (_Style.hasStyle("border-right-width"))	border.Right.Width = _Style.Current.Border.Right.Width;
+		if (_Style.hasStyle("border-bottom-width"))	border.Bottom.Width = _Style.Current.Border.Bottom.Width;
+		if (_Style.hasStyle("border-left-width"))	border.Left.Width = _Style.Current.Border.Left.Width;
 
-		if (_Style.hasStyle("border-top-width"))	_Cells.back()->Border->TopWidth = _Style.Current.BorderTopWidth;
-		if (_Style.hasStyle("border-right-width"))	_Cells.back()->Border->RightWidth = _Style.Current.BorderRightWidth;
-		if (_Style.hasStyle("border-bottom-width"))	_Cells.back()->Border->BottomWidth = _Style.Current.BorderBottomWidth;
-		if (_Style.hasStyle("border-left-width"))	_Cells.back()->Border->LeftWidth = _Style.Current.BorderLeftWidth;
+		if (_Style.hasStyle("border-top-color"))	border.Top.Color = _Style.Current.Border.Top.Color;
+		if (_Style.hasStyle("border-right-color"))	border.Right.Color = _Style.Current.Border.Right.Color;
+		if (_Style.hasStyle("border-bottom-color"))	border.Bottom.Color = _Style.Current.Border.Bottom.Color;
+		if (_Style.hasStyle("border-left-color"))	border.Left.Color = _Style.Current.Border.Left.Color;
 
-		if (_Style.hasStyle("border-top-color"))	_Cells.back()->Border->TopColor = _Style.Current.BorderTopColor;
-		if (_Style.hasStyle("border-right-color"))	_Cells.back()->Border->RightColor = _Style.Current.BorderRightColor;
-		if (_Style.hasStyle("border-bottom-color"))	_Cells.back()->Border->BottomColor = _Style.Current.BorderBottomColor;
-		if (_Style.hasStyle("border-left-color"))	_Cells.back()->Border->LeftColor = _Style.Current.BorderLeftColor;
+		if (_Style.hasStyle("border-top-style"))	border.Top.Style = _Style.Current.Border.Top.Style;
+		if (_Style.hasStyle("border-right-style"))	border.Right.Style = _Style.Current.Border.Right.Style;
+		if (_Style.hasStyle("border-bottom-style"))	border.Bottom.Style = _Style.Current.Border.Bottom.Style;
+		if (_Style.hasStyle("border-left-style"))	border.Left.Style = _Style.Current.Border.Left.Style;
 
-		if (_Style.hasStyle("border-top-style"))	_Cells.back()->Border->TopStyle = _Style.Current.BorderTopStyle;
-		if (_Style.hasStyle("border-right-style"))	_Cells.back()->Border->RightStyle = _Style.Current.BorderRightStyle;
-		if (_Style.hasStyle("border-bottom-style"))	_Cells.back()->Border->BottomStyle = _Style.Current.BorderBottomStyle;
-		if (_Style.hasStyle("border-left-style"))	_Cells.back()->Border->LeftStyle = _Style.Current.BorderLeftStyle;
+		_Cells.back()->Border->setBorder(border);
+		_Cells.back()->Border->setFontSize(_Style.Root.FontSize, _Style.Current.FontSize);
+		_Cells.back()->Border->setViewport(getList()->getParentPos() ? getList()->getParentPos() : this);
 
 		// padding from <table cellpadding="1">
 		if (table->CellPadding)
 		{
+			// FIXME: padding is ignored by vertical align
 			_Cells.back()->PaddingTop = table->CellPadding;
 			_Cells.back()->PaddingRight = table->CellPadding;
 			_Cells.back()->PaddingBottom = table->CellPadding;
diff --git a/nel/src/gui/group_table.cpp b/nel/src/gui/group_table.cpp
index 6b1d320aa..86d98ae8d 100644
--- a/nel/src/gui/group_table.cpp
+++ b/nel/src/gui/group_table.cpp
@@ -29,6 +29,7 @@
 #include "nel/misc/i18n.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/css_border_renderer.h"
+#include "nel/gui/css_background_renderer.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -44,9 +45,7 @@ namespace NLGUI
 
 	// ----------------------------------------------------------------------------
 	CGroupCell::CGroupCell(const TCtorParam &param)
-	: CInterfaceGroup(param),
-		BgColor (0,0,0,0)
-
+	: CInterfaceGroup(param)
 	{
 		NewLine = false;
 		TableRatio = 0.f;
@@ -58,6 +57,7 @@ namespace NLGUI
 		Group = new CInterfaceGroup(CViewBase::TCtorParam());
 		// TODO: only initialize if border is set
 		Border = new CSSBorderRenderer();
+		Background = new CSSBackgroundRenderer();
 		PaddingTop = PaddingRight = PaddingBottom = PaddingLeft = 0;
 		Align = Left;
 		VAlign = Middle;
@@ -66,12 +66,6 @@ namespace NLGUI
 		IgnoreMaxWidth = false;
 		IgnoreMinWidth = false;
 		AddChildW = false;
-		_TextureTiled = false;
-		_TextureScaled = false;
-		_TextureXReal = 0;
-		_TextureYReal = 0;
-		_TextureWReal = 0;
-		_TextureHReal = 0;
 		setEnclosedGroupDefaultParams();
 		addGroup (Group);
 	}
@@ -84,6 +78,11 @@ namespace NLGUI
 			delete Border;
 			Border = NULL;
 		}
+		if (Background)
+		{
+			delete Background;
+			Background = NULL;
+		}
 	}
 
 	// ----------------------------------------------------------------------------
@@ -151,7 +150,9 @@ namespace NLGUI
 		else
 		if( name == "bgcolor" )
 		{
-			return toString( BgColor );
+			if (Background)
+				return toString( Background->getColor() );
+			return toString(CRGBA::Transparent);
 		}
 		else
 		if( name == "width" )
@@ -233,9 +234,12 @@ namespace NLGUI
 		else
 		if( name == "bgcolor" )
 		{
+			if (!Background)
+				Background = new CSSBackgroundRenderer();
+
 			CRGBA c;
 			if( fromString( value, c ) )
-				BgColor = c;
+				Background->setColor(c);
 			return;
 		}
 		else
@@ -342,7 +346,8 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "valign", BAD_CAST "" );
 		xmlSetProp( node, BAD_CAST "left_margin", BAD_CAST toString( LeftMargin ).c_str() );
 		xmlSetProp( node, BAD_CAST "nowrap", BAD_CAST toString( NoWrap ).c_str() );
-		xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( BgColor ).c_str() );
+		if (Background)
+			xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( Background->getColor() ).c_str() );
 
 		if( WidthWanted != 0 )
 			xmlSetProp( node, BAD_CAST "width", BAD_CAST toString( WidthWanted ).c_str() );
@@ -435,7 +440,9 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"bgcolor" );
 		if (ptr)
 		{
-			BgColor = convertColor(ptr);
+			if (!Background)
+				Background = new CSSBackgroundRenderer();
+			Background->setColor(convertColor(ptr));
 		}
 		//
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"width" );
@@ -501,76 +508,39 @@ namespace NLGUI
 			rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal-1, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(0,255,255,255) );
 		}
 
-		uint8 CurrentAlpha = 255;
-		CGroupTable *table = NULL;
-		if (getParent ())
-		{
-			table = static_cast<CGroupTable*> (getParent ());
-			CurrentAlpha = table->CurrentAlpha;
-		}
-
-		// Draw the background
-		if (BgColor.A > 0 || !_TextureId.empty())
 		{
 			CViewRenderer &rVR = *CViewRenderer::getInstance();
-
-			// flush draw queue to force correct draw order for color+image
+			// flush draw queue to force correct draw order
 			rVR.flush();
 
-			bool flush = false;
-
-			if (BgColor.A > 0)
-			{
-				CRGBA finalColor = BgColor;
-				if (_ModulateGlobalColor)
-					finalColor.modulateFromColor (finalColor, CWidgetManager::getInstance()->getGlobalColor());
-				finalColor.A = (uint8) (((uint16) CurrentAlpha * (uint16) finalColor.A) >> 8);
-
-				if (finalColor.A > 0)
-					rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
-
-				flush = true;
-			}
-
-			if (CurrentAlpha > 0 && !_TextureId.empty())
+			if (Background)
 			{
-				CRGBA col = CRGBA::White;
-				col.A = CurrentAlpha;
-
-				sint32 oldSciX, oldSciY, oldSciW, oldSciH;
-				makeNewClip (oldSciX, oldSciY, oldSciW, oldSciH);
-
-				if (_TextureScaled && !_TextureTiled)
+				uint8 CurrentAlpha = 255;
+				CGroupTable *table = NULL;
+				if (getParent ())
 				{
-					rVR.drawRotFlipBitmap(_RenderLayer, _TextureXReal, _TextureYReal, _WReal, _HReal, 0, false, _TextureId, col);
+					table = static_cast<CGroupTable*> (getParent ());
+					CurrentAlpha = table->CurrentAlpha;
 				}
-				else
+				if (CurrentAlpha > 0)
 				{
-					if (!_TextureTiled)
-						rVR.drawRotFlipBitmap(_RenderLayer, _TextureXReal, _TextureYReal, _TextureWReal, _TextureHReal, 0, false, _TextureId, col);
-					else
-						rVR.drawRotFlipBitmapTiled(_RenderLayer, _TextureXReal, _TextureYReal, _WReal, _TextureHReal, 0, false, _TextureId, 0, col);
+					Background->CurrentAlpha = CurrentAlpha;
+					Background->setModulateGlobalColor(_ModulateGlobalColor);
+					Background->draw();
+					rVR.flush();
 				}
-
-				restoreClip (oldSciX, oldSciY, oldSciW, oldSciH);
-
-				flush = true;
 			}
 
-			if (flush)
-				rVR.flush();
-		}
-
-		if (Border)
-		{
-			// TODO: monitor these in checkCoords and update when changed
-			uint8 contentAlpha = CWidgetManager::getInstance()->getGlobalColorForContent().A;
-			if (contentAlpha > 0)
+			if (Border)
 			{
-				Border->CurrentAlpha = contentAlpha;
-				Border->setRenderLayer(_RenderLayer);
-				Border->setModulateGlobalColor(_ModulateGlobalColor);
-				Border->draw();
+				Border->CurrentAlpha = CWidgetManager::getInstance()->getGlobalColorForContent().A;
+				if (Border->CurrentAlpha > 0)
+				{
+					Border->setRenderLayer(_RenderLayer);
+					Border->setModulateGlobalColor(_ModulateGlobalColor);
+					Border->draw();
+					rVR.flush();
+				}
 			}
 		}
 
@@ -599,62 +569,35 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	void CGroupCell::setTexture(const std::string & TxName)
 	{
-		if (TxName.empty() || TxName == "none")
-		{
-			_TextureId.clear();
-		}
-		else
-		{
-			_TextureId.setTexture (TxName.c_str (), 0, 0, -1, -1, false);
-
-			updateTextureCoords();
-		}
+		if (Background)
+			Background->setImage(TxName);
 	}
 
 	// ----------------------------------------------------------------------------
 	void CGroupCell::setTextureTile(bool tiled)
 	{
-		_TextureTiled = tiled;
+		if (Background)
+			Background->setImageRepeat(tiled);
 	}
 
 	// ----------------------------------------------------------------------------
 	void CGroupCell::setTextureScale(bool scaled)
 	{
-		_TextureScaled = scaled;
-	}
-
-	// ----------------------------------------------------------------------------
-	void CGroupCell::updateTextureCoords()
-	{
-		if (_TextureId.empty()) return;
-
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		rVR.getTextureSizeFromId (_TextureId, _TextureWReal, _TextureHReal);
-
-		_TextureXReal = _XReal;
-		_TextureYReal = _YReal + _HReal - _TextureHReal;
-		if (_TextureTiled && _TextureHReal > 0)
-		{
-			sint diff = (_HReal / _TextureHReal) * _TextureHReal;
-			_TextureYReal -= diff;
-			_TextureHReal += diff;
-		}
+		if (Background)
+			Background->setImageCover(scaled);
 	}
 
 	// ----------------------------------------------------------------------------
 	void CGroupCell::updateCoords()
 	{
 		CInterfaceGroup::updateCoords();
-
-		updateTextureCoords();
 	}
 
 	// ----------------------------------------------------------------------------
 	NLMISC_REGISTER_OBJECT(CViewBase, CGroupTable, std::string, "table");
 
 	CGroupTable::CGroupTable(const TCtorParam &param)
-	:	CInterfaceGroup(param),
-		BgColor(0,0,0,255)
+	:	CInterfaceGroup(param)
 	{
 		_ContentValidated = false;
 		TableRatio = 0.f;
@@ -662,18 +605,12 @@ namespace NLGUI
 
 		// TODO: only initialize when needed
 		Border = new CSSBorderRenderer();
+		Background = new CSSBackgroundRenderer();
 
 		CellBorder = false;
 		CellPadding=1;
 		CellSpacing=2;
 		ContinuousUpdate = false;
-
-		_TextureTiled = false;
-		_TextureScaled = false;
-		_TextureXReal = 0;
-		_TextureYReal = 0;
-		_TextureWReal = 0;
-		_TextureHReal = 0;
 	}
 
 	// ----------------------------------------------------------------------------
@@ -741,6 +678,12 @@ namespace NLGUI
 			Border = NULL;
 		}
 
+		if (Background)
+		{
+			delete Background;
+			Background = NULL;
+		}
+
 	/*	uint i;
 		for (i=0; i<_Cells.size(); i++)
 			delete _Cells[i];
@@ -750,46 +693,22 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	void CGroupTable::setTexture(const std::string & TxName)
 	{
-		if (TxName.empty() || TxName == "none")
-		{
-			_TextureId.clear();
-		}
-		else
-		{
-			_TextureId.setTexture (TxName.c_str (), 0, 0, -1, -1, false);
-
-			updateTextureCoords();
-		}
+		if (Background)
+			Background->setImage(TxName);
 	}
 
 	// ----------------------------------------------------------------------------
 	void CGroupTable::setTextureTile(bool tiled)
 	{
-		_TextureTiled = tiled;
+		if (Background)
+			Background->setImageRepeat(tiled);
 	}
 
 	// ----------------------------------------------------------------------------
 	void CGroupTable::setTextureScale(bool scaled)
 	{
-		_TextureScaled = scaled;
-	}
-
-	// ----------------------------------------------------------------------------
-	void CGroupTable::updateTextureCoords()
-	{
-		if (_TextureId.empty()) return;
-
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		rVR.getTextureSizeFromId (_TextureId, _TextureWReal, _TextureHReal);
-
-		_TextureXReal = _XReal;
-		_TextureYReal = _YReal + _HReal - _TextureHReal;
-		if (_TextureTiled && _TextureHReal > 0)
-		{
-			sint diff = (_HReal / _TextureHReal) * _TextureHReal;
-			_TextureYReal -= diff;
-			_TextureHReal += diff;
-		}
+		if (Background)
+			Background->setImageCover(scaled);
 	}
 
 	// ----------------------------------------------------------------------------
@@ -1303,14 +1222,35 @@ namespace NLGUI
 
 		CInterfaceGroup::updateCoords();
 
-		updateTextureCoords();
-
 		// update borders if present
 		if (Border)
 		{
 			Border->setRect(_XReal + _MarginLeft, _YReal, _WReal, _HReal);
 		}
 
+		if (Background)
+		{
+			sint32 l = _XReal + _MarginLeft;
+			sint32 b = _YReal;
+			sint32 w = _WReal;
+			sint32 h = _HReal;
+			Background->setBorderArea(l, b, w, h);
+			if (Border) {
+				l += Border->getLeftWidth();
+				b += Border->getBottomWidth();
+				w -= Border->getLeftRightWidth();
+				h -= Border->getTopBottomWidth();
+			}
+			Background->setPaddingArea(l, b, w, h);
+			// TODO: padding
+			//CSSRect<sint32> Padding;
+			//l += Padding.Left;
+			//b += Padding.Bottom;
+			//w -= Padding.Left - Padding.Right;
+			//h -= Padding.Top - Padding.Bottom;
+			Background->setContentArea(l, b, w, h);
+		}
+
 		// update cell borders if present
 		for (uint32  i=0; i<_Cells.size(); i++)
 		{
@@ -1318,6 +1258,28 @@ namespace NLGUI
 			{
 				_Cells[i]->Border->setRect(_Cells[i]->_XReal, _Cells[i]->_YReal, _Cells[i]->_WReal, _Cells[i]->_HReal);
 			}
+			if (_Cells[i]->Background)
+			{
+				sint32 l = _Cells[i]->_XReal;
+				sint32 b = _Cells[i]->_YReal;
+				sint32 w = _Cells[i]->_WReal;
+				sint32 h = _Cells[i]->_HReal;
+				_Cells[i]->Background->setBorderArea(l, b, w, h);
+				if (_Cells[i]->Border) {
+					l += Border->getLeftWidth();
+					b += Border->getBottomWidth();
+					w -= Border->getLeftRightWidth();
+					h -= Border->getTopBottomWidth();
+				}
+				_Cells[i]->Background->setPaddingArea(l, b, w, h);
+				// TODO: padding
+				//CSSRect<sint32> Padding;
+				//l += Padding.Left;
+				//b += Padding.Bottom;
+				//w -= Padding.Left - Padding.Right;
+				//h -= Padding.Top - Padding.Bottom;
+				_Cells[i]->Background->setContentArea(l, b, w, h);
+			}
 		}
 
 		// Validated
@@ -1506,60 +1468,24 @@ namespace NLGUI
 			bool flush = false;
 			CViewRenderer &rVR = *CViewRenderer::getInstance();
 
-			// flush draw queue to force correct draw order for color+image
-			if (BgColor.A >0 || !_TextureId.empty())
-				rVR.flush();
-
-			if (BgColor.A > 0)
-			{
-				CRGBA finalColor = BgColor;
-				if (_ModulateGlobalColor)
-					finalColor.modulateFromColor (finalColor, CWidgetManager::getInstance()->getGlobalColor());
-				finalColor.A = (uint8) (((uint16) CurrentAlpha * (uint16) finalColor.A) >> 8);
-
-				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
-
-				flush = true;
-			}
-
-			// Draw the background
-			if (CurrentAlpha > 0 && !_TextureId.empty())
+			// TODO: monitor these in checkCoords and update when changed
+			uint8 contentAlpha = CWidgetManager::getInstance()->getGlobalColorForContent().A;
+			if (contentAlpha > 0)
 			{
-				sint32 oldSciX, oldSciY, oldSciW, oldSciH;
-				makeNewClip (oldSciX, oldSciY, oldSciW, oldSciH);
-
-				CRGBA col = CRGBA::White;
-				col.A = CurrentAlpha;
-
-				if (_TextureScaled && !_TextureTiled)
+				if (Background)
 				{
-					rVR.drawRotFlipBitmap(_RenderLayer, _TextureXReal, _TextureYReal, _WReal, _HReal, 0, false, _TextureId, col);
+					Background->CurrentAlpha = CurrentAlpha;
+					Background->setModulateGlobalColor(_ModulateGlobalColor);
+					Background->draw();
+					rVR.flush();
 				}
-				else
-				{
-					if (!_TextureTiled)
-						rVR.drawRotFlipBitmap(_RenderLayer, _TextureXReal, _TextureYReal, _TextureWReal, _TextureHReal, 0, false, _TextureId, col);
-					else
-						rVR.drawRotFlipBitmapTiled(_RenderLayer, _TextureXReal, _TextureYReal, _WReal, _TextureHReal, 0, false, _TextureId, 0, col);
-				}
-
-				restoreClip (oldSciX, oldSciY, oldSciW, oldSciH);
-				flush = true;
-			}
-
-			if (flush)
-				rVR.flush();
-
-			if (Border)
-			{
-				// TODO: monitor these in checkCoords and update when changed
-				uint8 contentAlpha = CWidgetManager::getInstance()->getGlobalColorForContent().A;
-				if (contentAlpha > 0)
+				if (Border)
 				{
 					Border->CurrentAlpha = CurrentAlpha;
 					Border->setRenderLayer(_RenderLayer);
 					Border->setModulateGlobalColor(_ModulateGlobalColor);
 					Border->draw();
+					rVR.flush();
 				}
 			}
 		}
@@ -1575,14 +1501,14 @@ namespace NLGUI
 		if( name == "border" )
 		{
 			if (Border)
-				return toString( Border->TopWidth );
+				return toString( Border->getTopWidth() );
 			return "0";
 		}
 		else
 		if( name == "bordercolor" )
 		{
 			if (Border)
-				return toString( Border->TopColor );
+				return toString( Border->getTopColor() );
 			return toString(CRGBA::Transparent);
 		}
 		else
@@ -1598,7 +1524,9 @@ namespace NLGUI
 		else
 		if( name == "bgcolor" )
 		{
-			return toString( BgColor );
+			if (Background)
+				return toString( Background->getColor() );
+			return toString( CRGBA::Transparent );
 		}
 		else
 		if( name == "width" )
@@ -1621,10 +1549,7 @@ namespace NLGUI
 			{
 				if (!Border)
 					Border = new CSSBorderRenderer();
-				Border->TopWidth = i;
-				Border->RightWidth = i;
-				Border->BottomWidth = i;
-				Border->LeftWidth = i;
+				Border->setWidth(i);
 			}
 			return;
 		}
@@ -1636,10 +1561,7 @@ namespace NLGUI
 			{
 				if (!Border)
 					Border = new CSSBorderRenderer();
-				Border->TopColor = c;
-				Border->RightColor = c;
-				Border->BottomColor = c;
-				Border->LeftColor = c;
+				Border->setColor(c);
 			}
 			return;
 		}
@@ -1662,9 +1584,12 @@ namespace NLGUI
 		else
 		if( name == "bgcolor" )
 		{
+			if (!Background)
+				Background = new CSSBackgroundRenderer();
+
 			CRGBA c;
 			if( fromString( value, c ) )
-				BgColor = c;
+				Background->setColor(c);
 			return;
 		}
 		else
@@ -1687,12 +1612,16 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "type", BAD_CAST "table" );
 		if (Border)
 		{
-			xmlSetProp( node, BAD_CAST "border", BAD_CAST toString( Border->TopWidth ).c_str() );
-			xmlSetProp( node, BAD_CAST "bordercolor", BAD_CAST toString( Border->TopColor ).c_str() );
+			xmlSetProp( node, BAD_CAST "border", BAD_CAST toString( Border->getTopWidth() ).c_str() );
+			xmlSetProp( node, BAD_CAST "bordercolor", BAD_CAST toString( Border->getTopColor() ).c_str() );
 		}
 		xmlSetProp( node, BAD_CAST "cellpadding", BAD_CAST toString( CellPadding ).c_str() );
 		xmlSetProp( node, BAD_CAST "cellspacing", BAD_CAST toString( CellSpacing ).c_str() );
-		xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( BgColor ).c_str() );
+		if (Background)
+		{
+			xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( Background->getColor() ).c_str() );
+			// TODO: Texture
+		}
 
 		if( ForceWidthMin != 0 )
 			xmlSetProp( node, BAD_CAST "width", BAD_CAST toString( ForceWidthMin ).c_str() );
@@ -1715,7 +1644,7 @@ namespace NLGUI
 			fromString((const char*)ptr, w);
 			if (!Border)
 				Border = new CSSBorderRenderer();
-			Border->setWidth(w, w, w, w);
+			Border->setWidth(w);
 		}
 		//
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"bordercolor" );
@@ -1724,7 +1653,7 @@ namespace NLGUI
 			CRGBA c = convertColor((const char*)ptr);
 			if (!Border)
 				Border = new CSSBorderRenderer();
-			Border->setColor(c, c, c, c);
+			Border->setColor(c);
 		}
 		//
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"cellpadding" );
@@ -1742,7 +1671,10 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"bgcolor" );
 		if (ptr)
 		{
-			BgColor = convertColor((const char *) ptr);
+			if (!Background)
+				Background = new CSSBackgroundRenderer();
+
+			Background->setColor(convertColor((const char *) ptr));
 		}
 		//
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"width" );

From 3f3991816bf76011d87e33964588a5687da57904 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 9 Sep 2021 13:57:32 +0300
Subject: [PATCH 282/292] Fix missing css length type

---
 nel/src/gui/css_length.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nel/src/gui/css_length.cpp b/nel/src/gui/css_length.cpp
index fde47b644..79465c27d 100644
--- a/nel/src/gui/css_length.cpp
+++ b/nel/src/gui/css_length.cpp
@@ -152,6 +152,9 @@ void CSSLength::setUnit(const std::string &unit)
 
 float CSSLength::calculate(uint32 relValue, uint32 emSize, uint32 remSize, uint32 vwSize, uint32 vhSize = 0) const
 {
+	if (m_Kind == Auto)
+		return 0;
+
 	float value = getValue();
 	switch(m_Unit)
 	{

From 028f6cdd3e32d23e1412c8c77a8444057284587c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Sep 2021 17:26:53 +0300
Subject: [PATCH 283/292] Add -ryzom-modulate-text-color to separate text from
 background, ryzom/ryzomcore#644

---
 nel/include/nel/gui/css_style.h |  3 +++
 nel/src/gui/css_style.cpp       | 10 ++++++++++
 nel/src/gui/group_html.cpp      | 12 +++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
index 042486d17..674f0268e 100644
--- a/nel/include/nel/gui/css_style.h
+++ b/nel/include/nel/gui/css_style.h
@@ -63,6 +63,7 @@ namespace NLGUI
 			Underlined=false;
 			StrikeThrough=false;
 			GlobalColor=false;
+			GlobalColorText=false;
 			DisplayBlock=false;
 			Width=-1;
 			Height=-1;
@@ -93,6 +94,7 @@ namespace NLGUI
 		NLMISC::CRGBA TextColor;
 		STextShadow TextShadow;
 		bool GlobalColor;
+		bool GlobalColorText;
 		bool Underlined;
 		bool StrikeThrough;
 		bool DisplayBlock;
@@ -215,6 +217,7 @@ namespace NLGUI
 			_StyleStack.push_back(Current);
 
 			Current.GlobalColor = false;
+			// inherit GlobalColorText
 			Current.DisplayBlock = false;
 			Current.Width=-1;
 			Current.Height=-1;
diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
index 912ff04d4..567ffe42a 100644
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@@ -936,6 +936,16 @@ namespace NLGUI
 					style.GlobalColor = b;
 			}
 			else
+			if (it->first == "-ryzom-modulate-text-color")
+			{
+				bool b;
+				if (it->second == "inherit")
+					style.GlobalColorText = current.GlobalColorText;
+				else
+				if (fromString(it->second, b))
+					style.GlobalColorText = b;
+			}
+			else
 			if (it->first == "background-color")
 			{
 				if (it->second == "inherit")
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 1dd28d473..0cb32f25e 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -2551,7 +2551,7 @@ namespace NLGUI
 			(embolden == text->getEmbolden()) &&
 			(style.FontOblique == text->getOblique()) &&
 			(getLink() == text->Link) &&
-			(style.GlobalColor == text->getModulateGlobalColor());
+			(style.GlobalColorText == text->getModulateGlobalColor());
 	}
 
 	// ***************************************************************************
@@ -2588,7 +2588,10 @@ namespace NLGUI
 			nlinfo("Text button template '%s' is missing :button or :b text element", tpl.c_str());
 			return;
 		}
-		ctrlButton->setModulateGlobalColorAll(false);
+		ctrlButton->setModulateGlobalColorAll(_Style.Current.GlobalColor);
+		ctrlButton->setTextModulateGlobalColorNormal(_Style.Current.GlobalColorText);
+		ctrlButton->setTextModulateGlobalColorOver(_Style.Current.GlobalColorText);
+		ctrlButton->setTextModulateGlobalColorPushed(_Style.Current.GlobalColorText);
 
 		// Translate the tooltip
 		ctrlButton->setText(text);
@@ -2619,7 +2622,7 @@ namespace NLGUI
 		newLink->setText(text);
 		newLink->setMultiLineSpace((uint)((float)(_Style.Current.FontSize)*LineSpaceFontFactor));
 		newLink->setMultiLine(true);
-		newLink->setModulateGlobalColor(_Style.Current.GlobalColor);
+		newLink->setModulateGlobalColor(_Style.Current.GlobalColorText);
 		setTextStyle(newLink, _Style.Current);
 
 		registerAnchor(newLink);
@@ -5247,6 +5250,9 @@ namespace NLGUI
 			if (ctrlButton)
 			{
 				ctrlButton->setModulateGlobalColorAll (_Style.Current.GlobalColor);
+				ctrlButton->setTextModulateGlobalColorNormal(_Style.Current.GlobalColorText);
+				ctrlButton->setTextModulateGlobalColorOver(_Style.Current.GlobalColorText);
+				ctrlButton->setTextModulateGlobalColorPushed(_Style.Current.GlobalColorText);
 
 				// Translate the tooltip
 				if (!tooltip.empty())

From 5c53148907435dd301c44f99ea332d20f738bd7a Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Sep 2021 17:30:25 +0300
Subject: [PATCH 284/292] Fix downloaded background images not showing

---
 nel/src/gui/group_html.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 0cb32f25e..5d7a66eed 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -350,7 +350,7 @@ namespace NLGUI
 	void CGroupHTML::TextureDownloadCB::finish()
 	{
 		// tmpdest file does not exist if download skipped (ie cache was used)
-		if (CFile::fileExists(tmpdest) && CFile::getFileSize(tmpdest) == 0)
+		if (CFile::fileExists(tmpdest) && CFile::getFileSize(tmpdest) > 0)
 		{
 			if (CFile::fileExists(dest))
 				CFile::deleteFile(dest);

From fc6ecc7dbd62723463410f9c9199b2f8ca6a35e7 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Sep 2021 17:40:41 +0300
Subject: [PATCH 285/292] Fix html,body background not using container opacity

---
 nel/src/gui/group_html.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 5d7a66eed..021a3691a 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -4120,6 +4120,22 @@ namespace NLGUI
 
 	void CGroupHTML::draw ()
 	{
+		uint8 CurrentAlpha = 255;
+		// search a parent container
+		CInterfaceGroup *gr = getParent();
+		while (gr)
+		{
+			if (gr->isGroupContainer())
+			{
+				CGroupContainer *gc = static_cast<CGroupContainer *>(gr);
+				CurrentAlpha = gc->getCurrentContainerAlpha();
+				break;
+			}
+			gr = gr->getParent();
+		}
+		m_HtmlBackground.CurrentAlpha = CurrentAlpha;
+		m_BodyBackground.CurrentAlpha = CurrentAlpha;
+
 		m_HtmlBackground.draw();
 		m_BodyBackground.draw();
 		CGroupScrollText::draw ();

From 9ecda657916edf4301e515b81e101749a7e41af2 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 19 Sep 2021 14:08:16 +0300
Subject: [PATCH 286/292] Fix table td background color inheriting from row

---
 nel/include/nel/gui/group_html.h |  3 +++
 nel/src/gui/group_html.cpp       | 18 +++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h
index 4315d8059..8b6ad19b6 100644
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@@ -391,6 +391,9 @@ namespace NLGUI
 		CSSBackgroundRenderer m_HtmlBackground;
 		CSSBackgroundRenderer m_BodyBackground;
 
+		// active table.tr background color from css or from bgcolor attribute
+		std::vector<NLMISC::CRGBA> m_TableRowBackgroundColor;
+
 		// Valid base href was found
 		bool            _IgnoreBaseUrlTag;
 		// Fragment from loading url
diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
index 021a3691a..10472851c 100644
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@@ -3076,6 +3076,7 @@ namespace NLGUI
 		_IgnoreHeadTag = false;
 		_IgnoreBaseUrlTag = false;
 		_AutoIdSeq = 0;
+		m_TableRowBackgroundColor.clear();
 
 		paragraphChange ();
 
@@ -6607,20 +6608,11 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::htmlTD(const CHtmlElement &elm)
 	{
-		CRGBA rowColor = CRGBA::Transparent;
-		// remember row color so we can blend it with cell color
-		if (!_CellParams.empty())
-			rowColor = _CellParams.back().BgColor;
-
 		// Get cells parameters
 		getCellsParameters(elm, true);
 
-		// if cell has own background,then it must be blended with row
-		if (rowColor.A > 0 && _Style.Current.Background.color.A < 255)
-		{
-			_Style.Current.Background.color.blendFromui(rowColor,
-				_Style.Current.Background.color, _Style.Current.Background.color.A);
-		}
+		if (!m_TableRowBackgroundColor.empty() && m_TableRowBackgroundColor.back().A > 0)
+			_Style.Current.Background.color.blendFromui(m_TableRowBackgroundColor.back(), _Style.Current.Background.color, _Style.Current.Background.color.A);
 
 		if (elm.ID == HTML_TH)
 		{
@@ -6836,6 +6828,9 @@ namespace NLGUI
 		// Get cells parameters
 		getCellsParameters(elm, true);
 
+		m_TableRowBackgroundColor.push_back(_CellParams.back().BgColor);
+		_CellParams.back().BgColor = CRGBA::Transparent;
+
 		// TODO: this probably ends up in first cell
 		renderPseudoElement(":before", elm);
 
@@ -6850,6 +6845,7 @@ namespace NLGUI
 		renderPseudoElement(":after", elm);
 
 		popIfNotEmpty(_CellParams);
+		popIfNotEmpty(m_TableRowBackgroundColor);
 	}
 
 	// ***************************************************************************

From 0de15805200bf4ec0c9815f2c4415331e7853906 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Fri, 24 Sep 2021 08:32:04 +0300
Subject: [PATCH 287/292] Fix background overflow on items limited with
 maxw/maxh

---
 nel/src/gui/css_background_renderer.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nel/src/gui/css_background_renderer.cpp b/nel/src/gui/css_background_renderer.cpp
index 4d7df021e..230807068 100644
--- a/nel/src/gui/css_background_renderer.cpp
+++ b/nel/src/gui/css_background_renderer.cpp
@@ -140,13 +140,6 @@ namespace NLGUI
 		// flush draw cache to ensure correct draw order
 		rVR.flush();
 
-		sint32 clipX, clipY, clipW, clipH;
-		if (m_Viewport)
-		{
-			rVR.getClipWindow(clipX, clipY, clipW, clipH);
-			rVR.setClipWindow(m_Viewport->getXReal(), m_Viewport->getYReal(), m_Viewport->getWReal(), m_Viewport->getHReal());
-		}
-
 		// TODO: no need for widget manager, if global color is set from parent
 		CRGBA globalColor;
 		if (m_ModulateGlobalColor)
@@ -166,9 +159,6 @@ namespace NLGUI
 
 		// flush draw cache to ensure correct draw order
 		rVR.flush();
-
-		if (m_Viewport)
-			rVR.setClipWindow(clipX, clipY, clipW, clipH);
 	}
 
 	// ----------------------------------------------------------------------------

From 90161cd1216448f871b31aef950eeabaa28a82bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= <ulukyn@gmail.com>
Date: Sat, 25 Sep 2021 16:22:34 +0100
Subject: [PATCH 288/292] Fix resell issue (use uint16 instead of uint8 for
 Index)

---
 .../src/interface_v3/bot_chat_page_trade.cpp       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index cbc1a30c1..39a4a7e0c 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -509,15 +509,15 @@ uint32 CBotChatPageTrade::getUserFactionPoints(PVP_CLAN::TPVPClan clan) const
 
 // ***************************************************************************************
 void CBotChatPageTrade::notifyDownloadComplete(bool completed)
-{	
+{
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
 	if (!gc) return;
 	class CDBListVisitor : public CInterfaceElementVisitor
 	{
-	public:		
+	public:
 		bool DownloadComplete;
-		virtual void visitGroup(CInterfaceGroup *group) 
+		virtual void visitGroup(CInterfaceGroup *group)
 		{
 			CDBGroupListSheetText *dbGroup = dynamic_cast<CDBGroupListSheetText *>(group);
 			if (dbGroup)
@@ -1285,15 +1285,15 @@ void CBotChatPageTrade::confirmTrade( bool enableResale )
 					NLMISC::CBitMemStream out;
 					if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
 					{
-						uint8	u8Inv		 = (uint8) _CurrItemInventory;
-						uint8	u8Index    = (uint8) _CurrItemIndex;
-						uint32	u32resalePrice = (uint32)max((sint32)0, resalePrice);
+						uint8 u8Inv = (uint8) _CurrItemInventory;
+						uint16 u16Index = (uint16) _CurrItemIndex;
+						uint32 u32resalePrice = (uint32)max((sint32)0, resalePrice);
 						out.serial(u8Inv);
 						out.serial(u8Index);
 						out.serial(u16Quantity);
 						out.serial(u32resalePrice);
 						NetMngr.push(out);
-						//nlinfo("impulseCallBack sent: %s %d %d %d %d", msg, u8Inv, u8Index, u16Quantity, u32resalePrice);
+						//nlinfo("impulseCallBack sent: %s %d %d %d %d", msg, u8Inv, u16Index, u16Quantity, u32resalePrice);
 					}
 					else
 						nlwarning(" unknown message name '%s'", msg);

From bdea7d24d274b4d4ce975472b7089ef2b93c696e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= <ulukyn@gmail.com>
Date: Sat, 25 Sep 2021 16:24:29 +0100
Subject: [PATCH 289/292] Fix resell issue (use uint16 instead of uint8 for
 Index)

---
 ryzom/client/src/interface_v3/bot_chat_page_trade.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 39a4a7e0c..2ca15c4fa 100644
--- a/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -1289,7 +1289,7 @@ void CBotChatPageTrade::confirmTrade( bool enableResale )
 						uint16 u16Index = (uint16) _CurrItemIndex;
 						uint32 u32resalePrice = (uint32)max((sint32)0, resalePrice);
 						out.serial(u8Inv);
-						out.serial(u8Index);
+						out.serial(u16Index);
 						out.serial(u16Quantity);
 						out.serial(u32resalePrice);
 						NetMngr.push(out);

From f76ad7a3eb3557be0f091999277d3fa85c767d1f Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 14 Oct 2021 15:14:51 +0300
Subject: [PATCH 290/292] Remove loading certs from native Windows cert store.

---
 nel/src/web/curl_certificates.cpp | 41 -------------------------------
 1 file changed, 41 deletions(-)

diff --git a/nel/src/web/curl_certificates.cpp b/nel/src/web/curl_certificates.cpp
index fdf69604f..52f04fe25 100644
--- a/nel/src/web/curl_certificates.cpp
+++ b/nel/src/web/curl_certificates.cpp
@@ -131,13 +131,6 @@ namespace NLWEB
 			// only use OpenSSL callback if not using Windows SSPI and using OpenSSL backend
 			if (useOpenSSLBackend && !(data && data->features & CURL_VERSION_SSPI))
 			{
-#ifdef NL_OS_WINDOWS
-				// load native Windows CA Certs
-				addCertificatesFrom("CA");
-				addCertificatesFrom("AuthRoot");
-				addCertificatesFrom("ROOT");
-#endif
-
 				isUsingOpenSSLBackend = true;
 			}
 			else
@@ -179,40 +172,6 @@ namespace NLWEB
 			return name;
 		}
 
-#ifdef NL_OS_WINDOWS
-		void addCertificatesFrom(LPCSTR root)
-		{
-			HCERTSTORE hStore;
-			PCCERT_CONTEXT pContext = NULL;
-			X509 *x509;
-			hStore = CertOpenSystemStore(NULL, root);
-			if (hStore)
-			{
-				while (pContext = CertEnumCertificatesInStore(hStore, pContext))
-				{
-					x509 = NULL;
-					x509 = d2i_X509(NULL, (const unsigned char **)&pContext->pbCertEncoded, pContext->cbCertEncoded);
-
-					if (x509)
-					{
-						CertEntry entry;
-						entry.cert = x509;
-						entry.file = root;
-						entry.name = getCertName(x509);
-
-						CertList.push_back(entry);
-					}
-				}
-
-				CertFreeCertificateContext(pContext);
-				CertCloseStore(hStore, 0);
-			}
-
-			// this is called before debug context is set and log ends up in log.log
-			//nlinfo("Loaded %d certificates from '%s' certificate store", (int)CertList.size(), root);
-		}
-#endif
-
 		void addCertificatesFromFile(const std::string &cert)
 		{
 			if (!isInitialized)

From 36c2ff5b866a511a203bb9ceaa351184ed5d1e6f Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Wed, 20 Oct 2021 13:31:14 +0200
Subject: [PATCH 291/292] Remove files in code

---
 code/nel/tools/build_gamedata/0_setup.py      |  594 ----
 .../nel/tools/build_gamedata/b1_client_dev.py |  108 -
 .../tools/build_gamedata/c1_shard_patch.py    |  123 -
 .../build_gamedata/configuration/scripts.py   |  610 ----
 .../build_gamedata/configuration/tools.py     |  102 -
 .../tools/build_gamedata/d1_client_patch.py   |  181 -
 .../processes/ai_wmap/2_build.py              |   97 -
 .../processes/cartographer/0_setup.py         |  120 -
 .../build_gamedata/processes/font/1_export.py |   63 -
 .../processes/font/3_install.py               |   62 -
 .../build_gamedata/processes/ig/2_build.py    |  275 --
 .../build_gamedata/processes/ligo/0_setup.py  |  121 -
 .../build_gamedata/processes/rbank/2_build.py |  339 --
 .../build_gamedata/processes/shape/2_build.py |  198 --
 .../build_gamedata/processes/zone/2_build.py  |  175 -
 .../processes/zone_light/2_build.py           |  105 -
 .../translation/make_merge_all.py             |   70 -
 .../translation/make_merge_wk.py              |  115 -
 .../src/interface_v3/bot_chat_page_trade.cpp  | 3072 -----------------
 19 files changed, 6530 deletions(-)
 delete mode 100644 code/nel/tools/build_gamedata/0_setup.py
 delete mode 100644 code/nel/tools/build_gamedata/b1_client_dev.py
 delete mode 100644 code/nel/tools/build_gamedata/c1_shard_patch.py
 delete mode 100644 code/nel/tools/build_gamedata/configuration/scripts.py
 delete mode 100644 code/nel/tools/build_gamedata/configuration/tools.py
 delete mode 100644 code/nel/tools/build_gamedata/d1_client_patch.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/cartographer/0_setup.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/font/1_export.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/font/3_install.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/ig/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/ligo/0_setup.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/rbank/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/shape/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/zone/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/processes/zone_light/2_build.py
 delete mode 100644 code/nel/tools/build_gamedata/translation/make_merge_all.py
 delete mode 100644 code/nel/tools/build_gamedata/translation/make_merge_wk.py
 delete mode 100644 code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp

diff --git a/code/nel/tools/build_gamedata/0_setup.py b/code/nel/tools/build_gamedata/0_setup.py
deleted file mode 100644
index 12441fb05..000000000
--- a/code/nel/tools/build_gamedata/0_setup.py
+++ /dev/null
@@ -1,594 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief Run all setup processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all setup processes
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Setup')
-parser.add_argument('--noconf', '-nc', action='store_true')
-parser.add_argument('--noverify', '-nv', action='store_true')
-parser.add_argument('--preset', '-p', action='store_true')
-# parser.add_argument('--haltonerror', '-eh', action='store_true')
-parser.add_argument('--includeproject', '-ipj', nargs='+')
-parser.add_argument('--excludeproject', '-epj', nargs='+')
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if not args.includeproject == None and not args.excludeproject == None:
-	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
-	exit()
-
-if not args.includeprocess == None and not args.excludeprocess == None:
-	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
-	exit()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-try:
-	from buildsite import *
-except ImportError:
-	printLog(log, "*** FIRST RUN ***")
-	if args.noconf:
-		printLog(log, "ERROR --noconf is invalid on first run, exit.")
-		exit()
-from tools import *
-
-if not args.noconf:
-	try:
-		BuildQuality
-	except NameError:
-		BuildQuality = 1
-	try:
-		if args.preset:
-			DummyUnknownName
-		RemapLocalFrom
-	except NameError:
-		RemapLocalFrom = 'R:'
-	try:
-		if args.preset:
-			DummyUnknownName
-		RemapLocalTo
-	except NameError:
-		RemapLocalTo = os.getenv('RC_ROOT').replace('\\', '/')
-		if (not RemapLocalTo) or (not ':' in RemapLocalTo):
-			RemapLocalTo = 'R:'
-	try:
-		if args.preset:
-			DummyUnknownName
-		ToolDirectories
-	except NameError:
-		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64', 'R:/distribution/ryzom_tools_win_x64' ]
-	try:
-		ToolSuffix
-	except NameError:
-		ToolSuffix = ".exe"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ScriptDirectory
-	except NameError:
-		ScriptDirectory = "R:/code/nel/tools/build_gamedata"
-	try:
-		if args.preset:
-			DummyUnknownName
-		WorkspaceDirectory
-	except NameError:
-		WorkspaceDirectory = "R:/leveldesign/workspace"
-	try:
-		if args.preset:
-			DummyUnknownName
-		DatabaseDirectory
-	except NameError:
-		DatabaseDirectory = "R:/graphics"
-	try:
-		if args.preset:
-			DummyUnknownName
-		SoundDirectory
-	except NameError:
-		SoundDirectory = "R:/sound"
-	try:
-		if args.preset:
-			DummyUnknownName
-		SoundDfnDirectory
-	except NameError:
-		SoundDfnDirectory = "R:/sound/DFN"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ExportBuildDirectory
-	except NameError:
-		ExportBuildDirectory = "R:/pipeline/export"
-	try:
-		if args.preset:
-			DummyUnknownName
-		InstallDirectory
-	except NameError:
-		InstallDirectory = "R:/pipeline/install"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ClientDevDirectory
-	except NameError:
-		ClientDevDirectory = "R:/pipeline/client_dev"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ClientDevLiveDirectory
-	except NameError:
-		ClientDevLiveDirectory = "R:/pipeline/client_dev_live"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ClientPatchDirectory
-	except NameError:
-		ClientPatchDirectory = "R:/pipeline/client_patch"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ClientInstallDirectory
-	except NameError:
-		ClientInstallDirectory = "R:/pipeline/client_install"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ShardInstallDirectory
-	except NameError:
-		ShardInstallDirectory = "R:/pipeline/shard"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ShardDevDirectory
-	except NameError:
-		ShardDevDirectory = "R:/pipeline/shard_dev"
-	try:
-		if args.preset:
-			DummyUnknownName
-		WorldEditInstallDirectory
-	except NameError:
-		WorldEditInstallDirectory = "R:/pipeline/worldedit"
-	try:
-		if args.preset:
-			DummyUnknownName
-		WorldEditorFilesDirectory
-	except NameError:
-		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDirectory
-	except NameError:
-		LeveldesignDirectory = "R:/leveldesign"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDfnDirectory
-	except NameError:
-		LeveldesignDfnDirectory = "R:/leveldesign/DFN"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignWorldDirectory
-	except NameError:
-		LeveldesignWorldDirectory = "R:/leveldesign/world"
-	try:
-		if args.preset:
-			DummyUnknownName
-		PrimitivesDirectory
-	except NameError:
-		PrimitivesDirectory = "R:/leveldesign/primitives"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDataCommonDirectory
-	except NameError:
-		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDataShardDirectory
-	except NameError:
-		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
-	try:
-		if args.preset:
-			DummyUnknownName
-		TranslationDirectory
-	except NameError:
-		TranslationDirectory = "R:/leveldesign/translation"
-	try:
-		if args.preset:
-			DummyUnknownName
-		GamedevDirectory
-	except NameError:
-		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
-	try:
-		if args.preset:
-			DummyUnknownName
-		DataCommonDirectory
-	except NameError:
-		DataCommonDirectory = "R:/code/ryzom/common/data_common"
-	try:
-		if args.preset:
-			DummyUnknownName
-		DataShardDirectory
-	except NameError:
-		DataShardDirectory = "R:/code/ryzom/server/data_shard"
-	try:
-		if args.preset:
-			DummyUnknownName
-		WindowsExeDllCfgDirectories
-	except NameError:
-		# TODO: Separate 64bit and 32bit
-		WindowsExeDllCfgDirectories = [ '', 'R:/build/fv_x64/bin/Release', 'R:/distribution/external_x64', 'R:/code/ryzom/client', '', '', '' ]
-	try:
-		if args.preset:
-			DummyUnknownName
-		LinuxServiceExecutableDirectory
-	except NameError:
-		LinuxServiceExecutableDirectory = "R:/build/server_gcc/bin"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LinuxClientExecutableDirectory
-	except NameError:
-		LinuxClientExecutableDirectory = "R:/build/client_gcc/bin"
-	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanDevDirectory
-	except NameError:
-		PatchmanDevDirectory = "R:/patchman/terminal_dev"
-	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanCfgAdminDirectory
-	except NameError:
-		PatchmanCfgAdminDirectory = "R:/patchman/admin_install"
-	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanCfgDefaultDirectory
-	except NameError:
-		PatchmanCfgDefaultDirectory = "R:/patchman/default"
-	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanBridgeServerDirectory
-	except NameError:
-		PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server"
-	try:
-		SignToolExecutable
-	except NameError:
-		SignToolExecutable = "C:/Program Files/Microsoft SDKs/Windows/v6.0A/Bin/signtool.exe"
-	try:
-		SignToolSha1
-	except NameError:
-		SignToolSha1 = ""
-	try:
-		SignToolTimestamp
-	except NameError:
-		SignToolTimestamp = "http://timestamp.comodoca.com/authenticode"
-	try:
-		MaxAvailable
-	except NameError:
-		MaxAvailable = 1
-	try:
-		MaxDirectory
-	except NameError:
-		MaxDirectory = "C:/Program Files (x86)/Autodesk/3ds Max 2010"
-	try:
-		MaxUserDirectory
-	except NameError:
-		import os
-		try:
-			MaxUserDirectory = os.path.normpath(os.environ["LOCALAPPDATA"] + "/Autodesk/3dsMax/2010 - 32bit/enu")
-		except KeyError:
-			MaxAvailable = 0
-			MaxUserDirectory = "C:/Users/Kaetemi/AppData/Local/Autodesk/3dsMax/2010 - 32bit/enu"
-	try:
-		MaxExecutable
-	except NameError:
-		MaxExecutable = "3dsmax.exe"
-
-	printLog(log, "")
-	printLog(log, "-------")
-	printLog(log, "--- Setup build site")
-	printLog(log, "-------")
-	printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-	printLog(log, "")
-	printLog(log, "This script will set up the buildsite configuration, and create needed directories.")
-	printLog(log, "To use the defaults, simply hit ENTER, else type in the new value.")
-	printLog(log, "Use -- if you need to insert an empty value.")
-	printLog(log, "")
-	BuildQuality = int(askVar(log, "Build Quality", str(BuildQuality)))
-	if not args.preset:
-		ToolDirectories[0] = askVar(log, "[IN] Primary Tool Directory", ToolDirectories[0]).replace("\\", "/")
-		ToolDirectories[1] = askVar(log, "[IN] Secondary Tool Directory", ToolDirectories[1]).replace("\\", "/")
-		ToolSuffix = askVar(log, "Tool Suffix", ToolSuffix)
-		ScriptDirectory = askVar(log, "[IN] Script Directory", os.getcwd().replace("\\", "/")).replace("\\", "/")
-		WorkspaceDirectory = askVar(log, "[IN] Workspace Directory", WorkspaceDirectory).replace("\\", "/")
-		DatabaseDirectory = askVar(log, "[IN] Database Directory", DatabaseDirectory).replace("\\", "/")
-		SoundDirectory = askVar(log, "[IN] Sound Directory", SoundDirectory).replace("\\", "/")
-		SoundDfnDirectory = askVar(log, "[IN] Sound DFN Directory", SoundDfnDirectory).replace("\\", "/")
-		ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
-		InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
-		ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
-		ClientDevLiveDirectory = askVar(log, "[OUT] Client Dev Live Directory", ClientDevLiveDirectory).replace("\\", "/")
-		ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
-		ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
-		ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
-		ShardDevDirectory = askVar(log, "[OUT] Shard Dev Directory", ShardDevDirectory).replace("\\", "/")
-		WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
-		LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
-		LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
-		LeveldesignWorldDirectory = askVar(log, "[IN] Leveldesign World Directory", LeveldesignWorldDirectory).replace("\\", "/")
-		PrimitivesDirectory = askVar(log, "[IN] Primitives Directory", PrimitivesDirectory).replace("\\", "/")
-		GamedevDirectory = askVar(log, "[IN] Gamedev Directory", GamedevDirectory).replace("\\", "/")
-		DataShardDirectory = askVar(log, "[IN] Data Shard Directory", DataShardDirectory).replace("\\", "/")
-		DataCommonDirectory = askVar(log, "[IN] Data Common Directory", DataCommonDirectory).replace("\\", "/")
-		TranslationDirectory = askVar(log, "[IN] Translation Directory", TranslationDirectory).replace("\\", "/")
-		LeveldesignDataShardDirectory = askVar(log, "[IN] Leveldesign Data Shard Directory", LeveldesignDataShardDirectory).replace("\\", "/")
-		LeveldesignDataCommonDirectory = askVar(log, "[IN] Leveldesign Data Common Directory", LeveldesignDataCommonDirectory).replace("\\", "/")
-		WorldEditorFilesDirectory = askVar(log, "[IN] World Editor Files Directory", WorldEditorFilesDirectory).replace("\\", "/")
-		WindowsExeDllCfgDirectories[0] = askVar(log, "[IN] Primary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[0]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[1] = askVar(log, "[IN] Secondary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[1]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[2] = askVar(log, "[IN] Tertiary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[2]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[3] = askVar(log, "[IN] Quaternary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[3]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[4] = askVar(log, "[IN] Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[5] = askVar(log, "[IN] Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/")
-		WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
-		LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
-		LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
-		PatchmanDevDirectory = askVar(log, "[IN] Patchman Directory", PatchmanDevDirectory).replace("\\", "/")
-		PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
-		PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
-		PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
-	SignToolExecutable = askVar(log, "Sign Tool Executable", SignToolExecutable).replace("\\", "/")
-	SignToolSha1 = askVar(log, "Sign Tool Signature SHA1", SignToolSha1)
-	SignToolTimestamp = askVar(log, "Sign Tool Timestamp Authority", SignToolTimestamp)
-	MaxAvailable = int(askVar(log, "3dsMax Available", str(MaxAvailable)))
-	if MaxAvailable:
-		MaxDirectory = askVar(log, "3dsMax Directory", MaxDirectory).replace("\\", "/")
-		MaxUserDirectory = askVar(log, "3dsMax User Directory", MaxUserDirectory).replace("\\", "/")
-		MaxExecutable = askVar(log, "3dsMax Executable", MaxExecutable)
-	if os.path.isfile("configuration/buildsite.py"):
-		os.remove("configuration/buildsite.py")
-	sf = open("configuration/buildsite.py", "w")
-	sf.write("#!/usr/bin/python\n")
-	sf.write("# \n")
-	sf.write("# \\file site.py\n")
-	sf.write("# \\brief Site configuration\n")
-	sf.write("# \\date " + time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "\n")
-	sf.write("# \\author Jan Boon (Kaetemi)\n")
-	sf.write("# Python port of game data build pipeline.\n")
-	sf.write("# Site configuration.\n")
-	sf.write("# \n")
-	sf.write("# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>\n")
-	sf.write("# Copyright (C) 2009-2014  by authors\n")
-	sf.write("# \n")
-	sf.write("# This program is free software: you can redistribute it and/or modify\n")
-	sf.write("# it under the terms of the GNU Affero General Public License as\n")
-	sf.write("# published by the Free Software Foundation, either version 3 of the\n")
-	sf.write("# License, or (at your option) any later version.\n")
-	sf.write("# \n")
-	sf.write("# This program is distributed in the hope that it will be useful,\n")
-	sf.write("# but WITHOUT ANY WARRANTY; without even the implied warranty of\n")
-	sf.write("# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n")
-	sf.write("# GNU Affero General Public License for more details.\n")
-	sf.write("# \n")
-	sf.write("# You should have received a copy of the GNU Affero General Public License\n")
-	sf.write("# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n")
-	sf.write("# \n")
-	sf.write("\n")
-	sf.write("\n")
-	sf.write("# *** SITE INSTALLATION ***\n")
-	sf.write("\n")
-	sf.write("# Use '/' in path name, not '\'\n")
-	sf.write("# Don't put '/' at the end of a directory name\n")
-	sf.write("\n")
-	sf.write("\n")
-	sf.write("# Quality option for this site (1 for BEST, 0 for DRAFT)\n")
-	sf.write("BuildQuality = " + str(BuildQuality) + "\n")
-	sf.write("\n")
-	sf.write("RemapLocalFrom = \"" + str(RemapLocalFrom) + "\"\n")
-	sf.write("RemapLocalTo = \"" + str(RemapLocalTo) + "\"\n")
-	sf.write("\n")
-	sf.write("ToolDirectories = " + str(ToolDirectories) + "\n")
-	sf.write("ToolSuffix = \"" + str(ToolSuffix) + "\"\n")
-	sf.write("\n")
-	sf.write("# Build script directory\n")
-	sf.write("ScriptDirectory = \"" + str(ScriptDirectory) + "\"\n")
-	sf.write("WorkspaceDirectory = \"" + str(WorkspaceDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Data build directories\n")
-	sf.write("DatabaseDirectory = \"" + str(DatabaseDirectory) + "\"\n")
-	sf.write("SoundDirectory = \"" + str(SoundDirectory) + "\"\n")
-	sf.write("SoundDfnDirectory = \"" + str(SoundDfnDirectory) + "\"\n")
-	sf.write("ExportBuildDirectory = \"" + str(ExportBuildDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Install directories\n")
-	sf.write("InstallDirectory = \"" + str(InstallDirectory) + "\"\n")
-	sf.write("ClientDevDirectory = \"" + str(ClientDevDirectory) + "\"\n")
-	sf.write("ClientDevLiveDirectory = \"" + str(ClientDevLiveDirectory) + "\"\n")
-	sf.write("ClientPatchDirectory = \"" + str(ClientPatchDirectory) + "\"\n")
-	sf.write("ClientInstallDirectory = \"" + str(ClientInstallDirectory) + "\"\n")
-	sf.write("ShardInstallDirectory = \"" + str(ShardInstallDirectory) + "\"\n")
-	sf.write("ShardDevDirectory = \"" + str(ShardDevDirectory) + "\"\n")
-	sf.write("WorldEditInstallDirectory = \"" + str(WorldEditInstallDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Utility directories\n")
-	sf.write("WorldEditorFilesDirectory = \"" + str(WorldEditorFilesDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Leveldesign directories\n")
-	sf.write("LeveldesignDirectory = \"" + str(LeveldesignDirectory) + "\"\n")
-	sf.write("LeveldesignDfnDirectory = \"" + str(LeveldesignDfnDirectory) + "\"\n")
-	sf.write("LeveldesignWorldDirectory = \"" + str(LeveldesignWorldDirectory) + "\"\n")
-	sf.write("PrimitivesDirectory = \"" + str(PrimitivesDirectory) + "\"\n")
-	sf.write("LeveldesignDataCommonDirectory = \"" + str(LeveldesignDataCommonDirectory) + "\"\n")
-	sf.write("LeveldesignDataShardDirectory = \"" + str(LeveldesignDataShardDirectory) + "\"\n")
-	sf.write("TranslationDirectory = \"" + str(TranslationDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Misc data directories\n")
-	sf.write("GamedevDirectory = \"" + str(GamedevDirectory) + "\"\n")
-	sf.write("DataCommonDirectory = \"" + str(DataCommonDirectory) + "\"\n")
-	sf.write("DataShardDirectory = \"" + str(DataShardDirectory) + "\"\n")
-	sf.write("WindowsExeDllCfgDirectories = " + str(WindowsExeDllCfgDirectories) + "\n")
-	sf.write("LinuxServiceExecutableDirectory = \"" + str(LinuxServiceExecutableDirectory) + "\"\n")
-	sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n")
-	sf.write("PatchmanDevDirectory = \"" + str(PatchmanDevDirectory) + "\"\n")
-	sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n")
-	sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n")
-	sf.write("PatchmanBridgeServerDirectory = \"" + str(PatchmanBridgeServerDirectory) + "\"\n")
-	sf.write("\n")
-	sf.write("# Sign tool\n")
-	sf.write("SignToolExecutable = \"" + str(SignToolExecutable) + "\"\n")
-	sf.write("SignToolSha1 = \"" + str(SignToolSha1) + "\"\n")
-	sf.write("SignToolTimestamp = \"" + str(SignToolTimestamp) + "\"\n")
-	sf.write("\n")
-	sf.write("# 3dsMax directives\n")
-	sf.write("MaxAvailable = " + str(MaxAvailable) + "\n")
-	sf.write("MaxDirectory = \"" + str(MaxDirectory) + "\"\n")
-	sf.write("MaxUserDirectory = \"" + str(MaxUserDirectory) + "\"\n")
-	sf.write("MaxExecutable = \"" + str(MaxExecutable) + "\"\n")
-	sf.write("\n")
-	sf.write("\n")
-	sf.write("# end of file\n")
-	sf.flush()
-	sf.close()
-	sf = open("configuration/buildsite_local.py", "w")
-	sfr = open("configuration/buildsite.py", "r")
-	for l in sfr:
-		sf.write(l.replace(RemapLocalFrom + '/', RemapLocalTo + '/'))
-	sf.flush()
-	sfr.close()
-	sf.close()
-
-from buildsite_local import *
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Run the setup projects")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each project
-for projectName in ProjectsToProcess:
-	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
-		printLog(log, "PROJECT " + projectName)
-		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
-		os.chdir("processes")
-		try:
-			if not args.includeprocess == None:
-				subprocess.call([ "python", "0_setup.py", "--includeprocess" ] + args.includeprocess)
-			elif not args.excludeprocess == None:
-				subprocess.call([ "python", "0_setup.py", "--excludeprocess" ] + args.excludeprocess)
-			else:
-				subprocess.call([ "python", "0_setup.py" ])
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-		os.chdir("..")
-		try:
-			projectLog = open("processes/log.log", "r")
-			projectLogData = projectLog.read()
-			projectLog.close()
-			log.write(projectLogData)
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-	else:
-		printLog(log, "IGNORE PROJECT " + projectName)
-printLog(log, "")
-
-# Additional directories
-printLog(log, ">>> Setup additional directories <<<")
-mkPath(log, ClientDevDirectory)
-mkPath(log, ClientDevLiveDirectory)
-mkPath(log, ClientPatchDirectory)
-mkPath(log, ClientInstallDirectory)
-
-if not args.noverify:
-	printLog(log, "")
-	printLog(log, "-------")
-	printLog(log, "--- Verify tool paths")
-	printLog(log, "-------")
-	printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-	printLog(log, "")
-	if MaxAvailable:
-		findMax(log, MaxDirectory, MaxExecutable)
-	findTool(log, ToolDirectories, TgaToDdsTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildInterfaceTool, ToolSuffix)
-	findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildSmallbankTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildFarbankTool, ToolSuffix)
-	findTool(log, ToolDirectories, ZoneDependenciesTool, ToolSuffix)
-	findTool(log, ToolDirectories, ZoneWelderTool, ToolSuffix)
-	findTool(log, ToolDirectories, ZoneElevationTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildRbankTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildIndoorRbankTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildIgBoxesTool, ToolSuffix)
-	findTool(log, ToolDirectories, GetNeighborsTool, ToolSuffix)
-	findTool(log, ToolDirectories, ZoneLighterTool, ToolSuffix)
-	findTool(log, ToolDirectories, ZoneIgLighterTool, ToolSuffix)
-	findTool(log, ToolDirectories, IgLighterTool, ToolSuffix)
-	findTool(log, ToolDirectories, AnimBuilderTool, ToolSuffix)
-	findTool(log, ToolDirectories, TileEditTool, ToolSuffix)
-	# findTool(log, ToolDirectories, BuildImagesetTool, ToolSuffix) # kaetemi stuff, ignore this
-	findTool(log, ToolDirectories, MakeSheetIdTool, ToolSuffix)
-	# findTool(log, ToolDirectories, BuildSheetsTool, ToolSuffix) # kaetemi stuff, ignore this
-	# findTool(log, ToolDirectories, BuildSoundTool, ToolSuffix) # kaetemi stuff, ignore this
-	# findTool(log, ToolDirectories, BuildSoundTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildSoundbankTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildSamplebankTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildCoarseMeshTool, ToolSuffix)
-	findTool(log, ToolDirectories, LightmapOptimizerTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildClodtexTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildShadowSkinTool, ToolSuffix)
-	findTool(log, ToolDirectories, PanoplyMakerTool, ToolSuffix)
-	findTool(log, ToolDirectories, HlsBankMakerTool, ToolSuffix)
-	findTool(log, ToolDirectories, LandExportTool, ToolSuffix)
-	findTool(log, ToolDirectories, PrimExportTool, ToolSuffix)
-	findTool(log, ToolDirectories, IgElevationTool, ToolSuffix)
-	findTool(log, ToolDirectories, IgAddTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildClodBankTool, ToolSuffix)
-	findTool(log, ToolDirectories, SheetsPackerTool, ToolSuffix)
-	findTool(log, ToolDirectories, BnpMakeTool, ToolSuffix)
-	findTool(log, ToolDirectories, AiBuildWmapTool, ToolSuffix)
-	findTool(log, ToolDirectories, TgaCutTool, ToolSuffix)
-	findTool(log, ToolDirectories, PatchGenTool, ToolSuffix)
-	findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
-	findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
-	findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
-	findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)
-
-log.close()
-if os.path.isfile("0_setup.log"):
-	os.remove("0_setup.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_setup.log")
-shutil.move("log.log", "0_setup.log")
diff --git a/code/nel/tools/build_gamedata/b1_client_dev.py b/code/nel/tools/build_gamedata/b1_client_dev.py
deleted file mode 100644
index 87ce0f998..000000000
--- a/code/nel/tools/build_gamedata/b1_client_dev.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/python
-# 
-# \file b1_client_dev.py
-# \brief Install to client dev
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install to client dev
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util, socket
-sys.path.append("configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite_local import *
-from tools import *
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install to client dev")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-mkPath(log, ClientDevLiveDirectory)
-if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate live dev client.cfg <<<")
-	cfg = open(ClientDevLiveDirectory + "/client.cfg", "w")
-	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
-	cfg.write("PreDataPath          = {\n")
-	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
-	cfg.write("};\n")
-	cfg.write("PreLoadPath          = \"" + InstallDirectory + "\";\n")
-	cfg.write("PatchWanted          = 0;\n")
-	cfg.write("DisplayLuaDebugInfo  = 1;\n")
-	cfg.write("AllowDebugLua        = 1;\n")
-	cfg.write("FullScreen           = 0;\n")
-	cfg.flush()
-	cfg.close()
-	printLog(log, "")
-
-mkPath(log, ClientDevDirectory)
-if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate local dev client.cfg <<<")
-	cfg = open(ClientDevDirectory + "/client.cfg", "w")
-	cfgr = open(ClientDevLiveDirectory + "/client.cfg", "r")
-	for l in cfgr:
-		cfg.write(l)
-	cfgr.close()
-	cfg.write("StartupHost          = \"http://" + socket.gethostname() + ":9042\";\n")
-	cfg.write("Application          = {\n")
-	cfg.write("	\"dev\", \"./client_ryzom_r.exe\", \"./\" \n")
-	cfg.write("};\n")
-	cfg.flush()
-	cfg.close()
-	printLog(log, "")
-
-printLog(log, ">>> Install data <<<")
-for category in InstallClientData:
-	if (category["UnpackTo"] != None):
-		printLog(log, "CATEGORY " + category["Name"])
-		targetPath = ClientDevDirectory
-		targetPathLive = ClientDevLiveDirectory
-		if (category["UnpackTo"] != ""):
-			targetPath += "/" + category["UnpackTo"]
-			targetPathLive += "/" + category["UnpackTo"]
-		mkPath(log, targetPath)
-		mkPath(log, targetPathLive)
-		for package in category["Packages"]:
-			printLog(log, "PACKAGE " + package[0])
-			mkPath(log, InstallDirectory + "/" + package[0])
-			if "exedll" in package[0]:
-				if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath)
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive)
-			else:
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive)
-printLog(log, "")
-
-log.close()
-if os.path.isfile("b1_client_dev.log"):
-	os.remove("b1_client_dev.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_client_dev.log")
-shutil.move("log.log", "b1_client_dev.log")
diff --git a/code/nel/tools/build_gamedata/c1_shard_patch.py b/code/nel/tools/build_gamedata/c1_shard_patch.py
deleted file mode 100644
index 30cb88bb8..000000000
--- a/code/nel/tools/build_gamedata/c1_shard_patch.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/python
-# 
-# \file c1_shard_patch.py
-# \brief Create a new patch for the patchman bridge
-# \date 2014-02-20 00:27GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Create a new patch for the patchman bridge
-# 
-# NeL - MMORPG Framework <http://www.ryzomcore.org/>
-# Copyright (C) 2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util, tarfile, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Shard Patch')
-parser.add_argument('--admininstall', '-ai', action='store_true')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite_local import *
-from tools import *
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Create a new patch for the patchman bridge")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-SevenZip = findTool(log, ToolDirectories, SevenZipTool, ToolSuffix)
-
-# List the directories that will be used
-archiveDirectories = [ ]
-for dir in InstallShardDataDirectories:
-	if not dir in archiveDirectories:
-		archiveDirectories += [ dir ]
-for package in InstallShardDataFiles:
-	dstDir = package[0]
-	if not dstDir in archiveDirectories:
-		archiveDirectories += [ dstDir ]
-for multiDir in InstallShardDataMultiDirectories:
-	dstDir = multiDir[0]
-	if not dstDir in archiveDirectories:
-		archiveDirectories += [ dstDir ]
-for multiDir in InstallShardDataPrimitivesDirectories:
-	dstDir = multiDir[0]
-	if not dstDir in archiveDirectories:
-		archiveDirectories += [ dstDir ]
-for execDir in InstallShardDataExecutables:
-	dstDir = execDir[0]
-	if not dstDir in archiveDirectories:
-		archiveDirectories += [ dstDir ]
-
-printLog(log, ">>> Archive new admin_install.tgz <<<")
-mkPath(log, PatchmanBridgeServerDirectory)
-adminInstallTgz = PatchmanBridgeServerDirectory + "/admin_install.tgz"
-patchmanExecutable = LinuxServiceExecutableDirectory + "/ryzom_patchman_service"
-if needUpdateDirNoSubdirFile(log, PatchmanCfgAdminDirectory + "/bin", adminInstallTgz) or needUpdateDirNoSubdirFile(log, PatchmanCfgAdminDirectory + "/patchman", adminInstallTgz) or needUpdate(log, patchmanExecutable, adminInstallTgz):
-	printLog(log, "WRITE " + adminInstallTgz)
-	if os.path.isfile(adminInstallTgz):
-		os.remove(adminInstallTgz)
-	tar = tarfile.open(adminInstallTgz, "w:gz")
-	tar.add(PatchmanCfgAdminDirectory + "/bin", arcname = "bin")
-	tar.add(PatchmanCfgAdminDirectory + "/patchman", arcname = "patchman")
-	tar.add(patchmanExecutable, arcname = "patchman/ryzom_patchman_service")
-	tar.close()
-else:
-	printLog(log, "SKIP " + adminInstallTgz)
-printLog(log, "")
-
-if not args.admininstall:
-	if SevenZip == "":
-		toolLogFail(log, SevenZipTool, ToolSuffix)
-	else:
-		printLog(log, ">>> Create new version <<<")
-		newVersion = 1
-		vstr = str(newVersion).zfill(6)
-		vpath = PatchmanBridgeServerDirectory + "/" + vstr
-		while os.path.exists(vpath):
-			newVersion = newVersion + 1
-			vstr = str(newVersion).zfill(6)
-			vpath = PatchmanBridgeServerDirectory + "/" + vstr
-		mkPath(log, vpath)
-		for dir in archiveDirectories:
-			mkPath(log, ShardInstallDirectory + "/" + dir)
-			# tgzPath = vpath + "/" + dir + ".tgz"
-			# printLog(log, "WRITE " + tgzPath)
-			# tar = tarfile.open(tgzPath, "w:gz")
-			# tar.add(ShardInstallDirectory + "/" + dir, arcname = dir)
-			# tar.close()
-			sevenZipPath = vpath + "/" + dir + ".7z"
-			printLog(log, "WRITE " + sevenZipPath)
-			subprocess.call([ SevenZip, "a", sevenZipPath, ShardInstallDirectory + "/" + dir ])
-		printLog(log, "")
-
-log.close()
-if os.path.isfile("c1_shard_patch.log"):
-	os.remove("c1_shard_patch.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_patch.log")
-shutil.move("log.log", "c1_shard_patch.log")
diff --git a/code/nel/tools/build_gamedata/configuration/scripts.py b/code/nel/tools/build_gamedata/configuration/scripts.py
deleted file mode 100644
index 4dcfaaac5..000000000
--- a/code/nel/tools/build_gamedata/configuration/scripts.py
+++ /dev/null
@@ -1,610 +0,0 @@
-#!/usr/bin/python
-# 
-# \file export.py
-# \brief Useful scripts
-# \date 2009-02-18 09:22GMT
-# \author Jan Boon (Kaetemi)
-# Useful scripts
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util, multiprocessing, math
-
-ActiveProjectDirectory = os.getenv("NELBUILDACTIVEPROJECT", "configuration/project")
-sys.path.append(ActiveProjectDirectory)
-
-def printLog(log, text):
-	log.write(text + "\n")
-	print text
-
-pendingProcesses = []
-processLimit = math.ceil(multiprocessing.cpu_count() * 0.75)
-
-def callParallelProcess(command):
-	res = 0
-	if len(pendingProcesses) >= processLimit:
-		waitingProc = pendingProcesses.pop(0)
-		res = waitingProc.wait()
-	proc = subprocess.Popen(command)
-	pendingProcesses.append(proc)
-	return res
-
-def flushParallelProcesses():
-	res = 0
-	while (len(pendingProcesses) > 0):
-		waitingProc = pendingProcesses.pop(0)
-		procRes = waitingProc.wait()
-		if procRes != 0:
-			res = procRes
-	return res
-
-def mkPath(log, path):
-	printLog(log, "DIR " + path)
-	distutils.dir_util.mkpath(path)
-
-def needUpdate(log, source, dest):
-	if (os.path.isfile(source)):
-		if (os.path.isfile(dest)):
-			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
-				return 1
-			else:
-				return 0
-		return 1
-	printLog(log, "MISSING " + source)
-	return 0
-
-def needUpdateRemoveDest(log, source, dest):
-	if (os.path.isfile(source)):
-		if (os.path.isfile(dest)):
-			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
-				os.remove(dest)
-				return 1
-			else:
-				return 0
-		return 1
-	printLog(log, "MISSING " + source)
-	return 0
-
-def needUpdateLogRemoveDest(log, source, dest):
-	if (os.path.isfile(source)):
-		if (os.path.isfile(dest)):
-			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
-				os.remove(dest)
-				printLog(log, source + " -> " + dest)
-				return 1
-			else:
-				printLog(log, "SKIP " + dest)
-				return 0
-		printLog(log, source + " -> " + dest)
-		return 1
-	printLog(log, "MISSING " + source)
-	printLog(log, "SKIP " + dest)
-	return 0
-
-def copyFileList(log, dir_source, dir_target, files):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				if needUpdateLogRemoveDest(log, dir_source + "/" + fileName, dir_target + "/" + fileName):
-					shutil.copy(dir_source + "/" + fileName, dir_target + "/" + fileName)
-
-def copyFileListLogless(log, dir_source, dir_target, files):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				if needUpdateRemoveDest(log, dir_source + "/" + fileName, dir_target + "/" + fileName):
-					shutil.copy(dir_source + "/" + fileName, dir_target + "/" + fileName)
-
-def copyFileListNoTree(log, dir_source, dir_target, files):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				printLog(log, dir_source + "/" + fileName + " -> " + dir_target + "/" + os.path.basename(fileName))
-				shutil.copy(dir_source + "/" + fileName, dir_target + "/" + os.path.basename(fileName))
-
-def copyFileListNoTreeIfNeeded(log, dir_source, dir_target, files):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				srcFile = dir_source + "/" + fileName
-				destFile = dir_target + "/" + os.path.basename(fileName)
-				if needUpdateLogRemoveDest(log, srcFile, destFile):
-					shutil.copy(srcFile, destFile)
-
-def removeFilesRecursive(log, dir_files):
-	files = os.listdir(dir_files)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*"):
-			if os.path.isdir(dir_files + "/" + fileName):
-				removeFilesRecursive(log, dir_files + "/" + fileName)
-			else:
-				printLog(log, "RM " + dir_files + "/" + fileName)
-				os.remove(dir_files + "/" + fileName)
-
-def removeFilesDirsRecursive(log, dir_files):
-	files = os.listdir(dir_files)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*"):
-			if os.path.isdir(dir_files + "/" + fileName):
-				removeFilesRecursive(log, dir_files + "/" + fileName)
-			else:
-				printLog(log, "RM " + dir_files + "/" + fileName)
-				os.remove(dir_files + "/" + fileName)
-	printLog(log, "RMDIR " + dir_files)
-	os.rmdir(dir_files)
-
-def removeFilesRecursiveExt(log, dir_files, file_ext):
-	files = os.listdir(dir_files)
-	len_file_ext = len(file_ext)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*"):
-			if os.path.isdir(dir_files + "/" + fileName):
-				removeFilesRecursiveExt(log, dir_files + "/" + fileName, file_ext)
-			elif (fileName[-len_file_ext:].lower() == file_ext.lower()):
-				printLog(log, "RM " + dir_files + "/" + fileName)
-				os.remove(dir_files + "/" + fileName)
-
-def copyFilesRecursive(log, dir_source, dir_target):
-	files = os.listdir(dir_source)
-	mkPath(log, dir_target)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*"):
-			if os.path.isdir(dir_source + "/" + fileName):
-				copyFilesRecursive(log, dir_source + "/" + fileName, dir_target + "/" + fileName)
-			else:
-				printLog(log, dir_source + "/" + fileName + " -> " + dir_target + "/" + fileName)
-				shutil.copy(dir_source + "/" + fileName, dir_target + "/" + fileName)
-
-def copyFiles(log, dir_source, dir_target):
-	copyFileList(log, dir_source, dir_target, os.listdir(dir_source))
-
-def copyFilesLogless(log, dir_source, dir_target):
-	copyFileListLogless(log, dir_source, dir_target, os.listdir(dir_source))
-
-def copyFilesExt(log, dir_source, dir_target, file_ext):
-	files = os.listdir(dir_source)
-	len_file_ext = len(file_ext)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*") and (fileName[-len_file_ext:].lower() == file_ext.lower()):
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				printLog(log, dir_source + "/" + fileName + " -> " + dir_target + "/" + fileName)
-				shutil.copy(dir_source + "/" + fileName, dir_target + "/" + fileName)
-
-def copyFilesRenamePrefixExt(log, dir_source, dir_target, old_prefix, new_prefix, file_ext):
-	files = os.listdir(dir_source)
-	len_file_ext = len(file_ext)
-	len_prefix = len(old_prefix)
-	for fileName in files:
-		if (fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*") and (fileName[-len_file_ext:].lower() == file_ext.lower()) and ((fileName[:len_prefix].lower() == old_prefix.lower())):
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				printLog(log, dir_source + "/" + fileName + " -> " + dir_target + "/" + new_prefix + fileName[-(len(fileName) - len_prefix):])
-				shutil.copy(dir_source + "/" + fileName, dir_target + "/" + new_prefix + fileName[-(len(fileName) - len_prefix):])
-
-def copyFilesExtNoSubdir(log, dir_source, dir_target, file_ext):
-	files = findFilesNoSubdir(log, dir_source, file_ext)
-	copyFileListNoTree(log, dir_source, dir_target, files)
-
-def copyFilesExtNoTree(log, dir_source, dir_target, file_ext):
-	files = findFiles(log, dir_source, "", file_ext)
-	copyFileListNoTree(log, dir_source, dir_target, files)
-
-def copyFilesExtNoTreeIfNeeded(log, dir_source, dir_target, file_ext):
-	files = findFiles(log, dir_source, "", file_ext)
-	copyFileListNoTreeIfNeeded(log, dir_source, dir_target, files)
-
-def copyFilesExtNoSubdirIfNeeded(log, dir_source, dir_target, file_ext):
-	files = findFilesNoSubdir(log, dir_source, file_ext)
-	copyFileListNoTreeIfNeeded(log, dir_source, dir_target, files)
-
-def copyFilesNoTreeIfNeeded(log, dir_source, dir_target):
-	copyFileListNoTreeIfNeeded(log, dir_source, dir_target, os.listdir(dir_source))
-
-def copyFilesRecursiveNoTreeIfNeeded(log, dir_source, dir_target):
-	files = findFilesRecursive(log, dir_source, "")
-	copyFileListNoTreeIfNeeded(log, dir_source, dir_target, files)
-
-def copyFileListExtReplaceNoTreeIfNeeded(log, dir_source, dir_target, files, file_ext, target_ext):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				srcFile = dir_source + "/" + fileName
-				destFile = dir_target + "/" + os.path.basename(fileName)[0:-len(file_ext)] + target_ext
-				if needUpdateLogRemoveDest(log, srcFile, destFile):
-					shutil.copy(srcFile, destFile)
-	
-def copyFilesExtReplaceNoTreeIfNeeded(log, dir_source, dir_target, file_ext, target_ext):
-	files = findFiles(log, dir_source, "", file_ext)
-	copyFileListExtReplaceNoTreeIfNeeded(log, dir_source, dir_target, files, file_ext, target_ext)
-
-def copyFileIfNeeded(log, srcFile, destFile):
-	if needUpdateLogRemoveDest(log, srcFile, destFile):
-		shutil.copy(srcFile, destFile)
-
-def moveFileListNoTree(log, dir_source, dir_target, files):
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			if (os.path.isfile(dir_source + "/" + fileName)):
-				printLog(log, "MOVE " + dir_source + "/" + fileName + " -> " + dir_target + "/" + os.path.basename(fileName))
-				shutil.move(dir_source + "/" + fileName, dir_target + "/" + os.path.basename(fileName))
-
-def moveFilesExtNoTree(log, dir_source, dir_target, file_ext):
-	files = findFiles(log, dir_source, "", file_ext)
-	moveFileListNoTree(log, dir_source, dir_target, files)
-
-def moveFilesNoSubdir(log, dir_source, dir_target):
-	files = os.listdir(dir_source)
-	moveFileListNoTree(log, dir_source, dir_target, files)
-
-def moveDir(log, dir_source, dir_target):
-	printLog(log, "MOVE " + dir_source + " -> " + dir_target)
-	shutil.move(dir_source, dir_target)
-
-def findFilesRecursive(log, dir_where, dir_sub):
-	result = [ ]
-	files = os.listdir(dir_where + "/" + dir_sub)
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			filePath = dir_sub + fileName
-			fileFull = dir_where + "/" + dir_sub + fileName
-			if os.path.isfile(fileFull):
-				result += [ filePath ]
-			elif os.path.isdir(fileFull):
-				result += findFilesRecursive(log, dir_where, filePath + "/")
-			else:
-				printLog(log, "findFilesRecursive: file not dir or file?!" + filePath)
-	return result
-
-def findFiles(log, dir_where, dir_sub, file_ext):
-	result = [ ]
-	files = os.listdir(dir_where + "/" + dir_sub)
-	len_file_ext = len(file_ext)
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			filePath = dir_sub + fileName
-			fileFull = dir_where + "/" + dir_sub + fileName
-			if os.path.isfile(fileFull):
-				if fileName[-len_file_ext:].lower() == file_ext.lower():
-					result += [ filePath ]
-			elif os.path.isdir(fileFull):
-				result += findFiles(log, dir_where, filePath + "/", file_ext)
-			else:
-				printLog(log, "findFiles: file not dir or file?!" + filePath)
-	return result
-
-def isLegalFileName(fileName):
-	return fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*"
-
-def findFilesNoSubdir(log, dir_where, file_ext):
-	result = [ ]
-	files = os.listdir(dir_where)
-	len_file_ext = len(file_ext)
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			fileFull = dir_where + "/" + fileName
-			if os.path.isfile(fileFull):
-				if fileName[-len_file_ext:].lower() == file_ext.lower():
-					result += [ fileName ]
-			elif not os.path.isdir(fileFull):
-				printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull)
-	return result
-
-def findFilesNoSubdirFiltered(log, dir_where, file_ext, filter):
-	if len(filter) == 0:
-		return findFilesNoSubdir(log, dir_where, file_ext)
-	result = [ ]
-	files = os.listdir(dir_where)
-	len_file_ext = len(file_ext)
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			fileFull = dir_where + "/" + fileName
-			if os.path.isfile(fileFull):
-				if fileName[-len_file_ext:].lower() == file_ext.lower():
-					fileNameLower = fileName.lower()
-					for filterWord in filter:
-						if filterWord in fileNameLower:
-							result += [ fileName ]
-							break
-			elif not os.path.isdir(fileFull):
-				printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull)
-	return result
-
-def findFile(log, dir_where, file_name):
-	files = os.listdir(dir_where)
-	for fileName in files:
-		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
-			filePath = dir_where + "/" + fileName
-			if os.path.isfile(filePath):
-				if fileName == file_name:
-					return filePath
-			elif os.path.isdir(filePath):
-				result = findFile(log, filePath, file_name)
-				if result != "":
-					return result
-			else:
-				printLog(log, "findFile: file not dir or file?! " + filePath)
-	return ""
-
-def needUpdateDirByLowercaseTagLog(log, dir_source, ext_source, dir_dest, ext_dest):
-	updateCount = 0
-	skipCount = 0
-	lenSrcExt = len(ext_source)
-	sourceFiles = findFilesNoSubdir(log, dir_source, ext_source)
-	destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
-	for file in sourceFiles:
-		sourceFile = dir_source + "/" + file
-		tagFile = dir_dest + "/" + file[0:-lenSrcExt].lower() + ext_dest
-		if os.path.isfile(tagFile):
-			sourceTime = os.stat(sourceFile).st_mtime
-			tagTime = os.stat(tagFile).st_mtime
-			if (sourceTime > tagTime):
-				updateCount = updateCount + 1
-			else:
-				skipCount = skipCount + 1
-		else:
-			updateCount = updateCount + 1
-	if updateCount > 0:
-		printLog(log, "UPDATE " + str(updateCount) + " / " + str(len(sourceFiles)) + "; SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 1
-	else:
-		printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 0
-
-def needUpdateDirByTagLogFiltered(log, dir_source, ext_source, dir_dest, ext_dest, filter):
-	updateCount = 0
-	skipCount = 0
-	lenSrcExt = len(ext_source)
-	sourceFiles = findFilesNoSubdirFiltered(log, dir_source, ext_source, filter)
-	destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
-	for file in sourceFiles:
-		sourceFile = dir_source + "/" + file
-		tagFile = dir_dest + "/" + file[0:-lenSrcExt] + ext_dest
-		if os.path.isfile(tagFile):
-			sourceTime = os.stat(sourceFile).st_mtime
-			tagTime = os.stat(tagFile).st_mtime
-			if (sourceTime > tagTime):
-				updateCount = updateCount + 1
-			else:
-				skipCount = skipCount + 1
-		else:
-			updateCount = updateCount + 1
-	if updateCount > 0:
-		printLog(log, "UPDATE " + str(updateCount) + " / " + str(len(sourceFiles)) + "; SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 1
-	else:
-		printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 0
-
-def needUpdateDirByTagLog(log, dir_source, ext_source, dir_dest, ext_dest):
-	updateCount = 0
-	skipCount = 0
-	lenSrcExt = len(ext_source)
-	sourceFiles = findFilesNoSubdir(log, dir_source, ext_source)
-	destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
-	for file in sourceFiles:
-		sourceFile = dir_source + "/" + file
-		tagFile = dir_dest + "/" + file[0:-lenSrcExt] + ext_dest
-		if os.path.isfile(tagFile):
-			sourceTime = os.stat(sourceFile).st_mtime
-			tagTime = os.stat(tagFile).st_mtime
-			if (sourceTime > tagTime):
-				updateCount = updateCount + 1
-			else:
-				skipCount = skipCount + 1
-		else:
-			updateCount = updateCount + 1
-	if updateCount > 0:
-		printLog(log, "UPDATE " + str(updateCount) + " / " + str(len(sourceFiles)) + "; SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 1
-	else:
-		printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
-		return 0
-
-def needUpdateDirNoSubdirFile(log, dir_source, file_dest):
-	if not os.path.isfile(file_dest):
-		return 1
-	destTime = os.stat(file_dest).st_mtime
-	sourceFiles = os.listdir(dir_source)
-	for file in sourceFiles:
-		filePath = dir_source + "/" + file
-		if os.path.isfile(filePath):
-			fileTime = os.stat(filePath).st_mtime
-			if fileTime > destTime:
-				return 1
-	else:
-		return 0
-
-def needUpdateFileDirNoSubdir(log, file_source, dir_dest):
-	if not os.path.isfile(file_source):
-		printLog(log, "WARNING MISSING " + file_source)
-		return 0
-	sourceTime = os.stat(file_source).st_mtime
-	destFiles = os.listdir(dir_dest)
-	for file in destFiles:
-		filePath = dir_dest + "/" + file
-		if os.path.isfile(filePath):
-			fileTime = os.stat(filePath).st_mtime
-			if sourceTime > fileTime:
-				return 1
-	else:
-		return 0
-
-def needUpdateDirNoSubdirMultiFile(log, dir_source, root_file, files_dest):
-	for file_dest in files_dest:
-		if needUpdateDirNoSubdirFile(log, dir_source, root_file + "/" + file_dest):
-			return 1
-	return 0
-
-def needUpdateDirNoSubdirMultiFileExt(log, dir_source, root_file, files_dest, file_ext):
-	for file_dest in files_dest:
-		if needUpdateDirNoSubdirFile(log, dir_source, root_file + "/" + file_dest + file_ext):
-			return 1
-	return 0
-
-def needUpdateMultiDirNoSubdirFile(log, root_dir, dirs_source, file_dest):
-	for dir_source in dirs_source:
-		if needUpdateDirNoSubdirFile(log, root_dir + "/" + dir_source, file_dest):
-			return 1
-	return 0
-
-def needUpdateMultiDirNoSubdirMultiFileExt(log, root_dir, dirs_source, root_file, files_dest, file_ext):
-	for file_dest in files_dest:
-		if needUpdateMultiDirNoSubdirFile(log, root_dir, dirs_source, root_file + "/" + file_dest + file_ext):
-			return 1
-	return 0
-
-def needUpdateMultiDirNoSubdir(log, root_dir, dirs_source, dir_dest):
-	for dir_source in dirs_source:
-		if needUpdateDirNoSubdir(log, root_dir + "/" + dir_source, dir_dest):
-			return 1
-	return 0
-
-def needUpdateDirNoSubdirExtFile(log, dir_source, dir_ext, file_dest):
-	if not os.path.isfile(file_dest):
-		return 1
-	destTime = os.stat(file_dest).st_mtime
-	sourceFiles = os.listdir(dir_source)
-	for file in sourceFiles:
-		if file.endswith(dir_ext):
-			filePath = dir_source + "/" + file
-			if os.path.isfile(filePath):
-				fileTime = os.stat(filePath).st_mtime
-				if fileTime > destTime:
-					return 1
-	else:
-		return 0
-
-def needUpdateDirNoSubdirExtMultiFileExt(log, dir_source, dir_ext, root_file, files_dest, file_ext):
-	for file_dest in files_dest:
-		if needUpdateDirNoSubdirExtFile(log, dir_source, dir_ext, root_file + "/" + file_dest + file_ext):
-			return 1
-	return 0
-
-def needUpdateDirNoSubdir(log, dir_source, dir_dest):
-	latestSourceFile = 0
-	oldestDestFile = 0
-	sourceFiles = os.listdir(dir_source)
-	destFiles = os.listdir(dir_dest)
-	for file in sourceFiles:
-		filePath = dir_source + "/" + file
-		if os.path.isfile(filePath):
-			fileTime = os.stat(filePath).st_mtime
-			if fileTime > latestSourceFile:
-				latestSourceFile = fileTime
-	for file in destFiles:
-		filePath = dir_dest + "/" + file
-		if os.path.isfile(filePath):
-			fileTime = os.stat(filePath).st_mtime
-			if oldestDestFile == 0 or fileTime < oldestDestFile:
-				oldestDestFile = fileTime
-	if latestSourceFile > oldestDestFile:
-		return 1
-	else:
-		return 0
-
-def needUpdateDirNoSubdirLogExt(log, dir_source, ext_source, dir_dest, ext_dest):
-	latestSourceFile = 0
-	latestDestFile = 0
-	sourceFiles = findFilesNoSubdir(log, dir_source, ext_source)
-	destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
-	for file in sourceFiles:
-		fileTime = os.stat(dir_source + "/" + file).st_mtime
-		if (fileTime > latestSourceFile):
-			latestSourceFile = fileTime
-	for file in destFiles:
-		fileTime = os.stat(dir_dest + "/" + file).st_mtime
-		if (fileTime > latestDestFile):
-			latestDestFile = fileTime
-	if latestSourceFile > latestDestFile or len(sourceFiles) > len(destFiles):
-		printLog(log, "UPDATE; Source: " + str(latestSourceFile) + ", " + str(len(sourceFiles)) + " files; Dest: " + str(latestDestFile) + ", " + str(len(destFiles)) + " files")
-		return 1
-	else:
-		printLog(log, "SKIP *")
-		return 0
-
-def needUpdateDirNoSubdirLogExtMultidir(log, all_dir_base, all_dir_source, dir_source, ext_source, dir_dest, ext_dest):
-	latestSourceFile = 0
-	latestDestFile = 0
-	sourceFilesAll = [ ]
-	for dir in all_dir_source:
-		sourceFilesAll += findFilesNoSubdir(log, all_dir_base + "/" + dir, ext_source)
-	sourceFiles = findFilesNoSubdir(log, dir_source, ext_source)
-	destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
-	for file in sourceFiles:
-		fileTime = os.stat(dir_source + "/" + file).st_mtime
-		if (fileTime > latestSourceFile):
-			latestSourceFile = fileTime
-	for file in destFiles:
-		fileTime = os.stat(dir_dest + "/" + file).st_mtime
-		if (fileTime > latestDestFile):
-			latestDestFile = fileTime
-	if latestSourceFile > latestDestFile or len(sourceFilesAll) > len(destFiles):
-		printLog(log, "UPDATE; Source: " + str(latestSourceFile) + ", " + str(len(sourceFilesAll)) + " files; Dest: " + str(latestDestFile) + ", " + str(len(destFiles)) + " files")
-		return 1
-	else:
-		printLog(log, "SKIP *")
-		return 0
-
-def findFileMultiDir(log, dirs_where, file_name):
-	try:
-		for dir in dirs_where:
-			if dir != "":
-				file = findFile(log, dir, file_name)
-				if file != "":
-					return file
-	except Exception, e:
-		printLog(log, "EXCEPTION " + str(e))
-	printLog(log, "FILE NOT FOUND " + file_name)
-	return ""
-
-def findTool(log, dirs_where, file_name, suffix):
-	try:
-		for dir in dirs_where:
-			if dir != "":
-				tool = findFile(log, dir, file_name + suffix)
-				if tool != "":
-					printLog(log, "TOOL " + tool)
-					return tool
-	except Exception, e:
-		printLog(log, "EXCEPTION " + str(e))
-	printLog(log, "TOOL NOT FOUND " + file_name + suffix)
-	return ""
-
-def findMax(log, dir, file):
-	tool = dir + "/" + file
-	if os.path.isfile(tool):
-		printLog(log, "3DSMAX " + tool)
-		return tool
-	printLog(log, "3DSMAX NOT FOUND " + file)
-	return ""
-
-def toolLogFail(log, tool, suffix):
-	printLog(log, "FAIL " + tool + suffix + " is not found")
-
-def askVar(log, name, default):
-	sys.stdout.write(name + " (" + default + "): ")
-	line = sys.stdin.readline()
-	linestrip = line.strip()
-	if linestrip == "--":
-		log.write(name + " (" + default + "): ''\n")
-		return ""
-	elif linestrip == "":
-		log.write(name + " (" + default + "): '" + default + "'\n")
-		return default
-	else:
-		log.write(name + " (" + default + "): '" + linestrip + "'\n")
-		return linestrip
diff --git a/code/nel/tools/build_gamedata/configuration/tools.py b/code/nel/tools/build_gamedata/configuration/tools.py
deleted file mode 100644
index cbf1e63f5..000000000
--- a/code/nel/tools/build_gamedata/configuration/tools.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/python
-# 
-# \file process.py
-# \brief Tools configuration
-# \date 2009-03-10 11:33GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Tools configuration.
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-# *** PROCESS TIMEOUT ***
-SkelExportTimeout = 600000
-SwtExportTimeout = 600000
-ShapeExportTimeout = 3600000
-ZoneExportTimeout = 1800000
-ZoneBuildDependTimeout = 1800000
-ZoneBuildWeldTimeout = 60000
-ZoneLightBuildTimeout = 600000
-ZoneIgLightBuildTimeout = 600000
-SmallbankBuildTimeout = 60000
-FarbankBuildTimeout = 180000
-AnimExportTimeout = 1800000
-IgExportTimeout = 600000
-CmbExportTimeout = 60000
-RbankBuildTesselTimeout = 6000000
-RbankBuildSmoothTimeout = 6000000
-RbankBuildProclocalTimeout = 6000000
-RbankBuildProcglobalTimeout = 18000000
-RbankBuildIndoorTimeout = 18000000
-# WmapBuildTimeout = 60000
-LigoExportTimeout = 3600000
-LigoBuildTimeout = 1800000
-PacsPrimExportTimeout = 600000
-
-MapsBuildTimeout = 60000 # 1min
-MaxShapeExportTimeout = 600000 # 10min
-
-# *** TOOLS CONFIGURATION ***
-
-TgaToDdsTool = "tga2dds"
-BuildInterfaceTool = "build_interface"
-ExecTimeoutTool = "exec_timeout"
-BuildSmallbankTool = "build_smallbank"
-BuildFarbankTool = "build_far_bank"
-ZoneDependenciesTool = "zone_dependencies"
-ZoneWelderTool = "zone_welder"
-ZoneElevationTool = "zone_elevation"
-BuildRbankTool = "build_rbank"
-BuildIndoorRbankTool = "build_indoor_rbank"
-BuildIgBoxesTool = "build_ig_boxes"
-GetNeighborsTool = "get_neighbors"
-ZoneLighterTool = "zone_lighter"
-ZoneIgLighterTool = "zone_ig_lighter"
-IgLighterTool = "ig_lighter"
-AnimBuilderTool = "anim_builder"
-TileEditTool = "tile_edit"
-# BuildImagesetTool = "th_build_imageset" # kaetemi stuff, ignore this
-MakeSheetIdTool = "make_sheet_id"
-# BuildSheetsTool = "th_build_sheets" # kaetemi stuff, ignore this
-# BuildSoundTool = "th_build_sound" # kaetemi stuff, ignore this
-# BuildSoundTool = "build_sound"
-BuildSoundbankTool = "build_soundbank"
-BuildSamplebankTool = "build_samplebank"
-BuildCoarseMeshTool = "build_coarse_mesh"
-LightmapOptimizerTool = "lightmap_optimizer"
-BuildClodtexTool = "build_clodtex"
-BuildShadowSkinTool = "build_shadow_skin"
-PanoplyMakerTool = "panoply_maker"
-HlsBankMakerTool = "hls_bank_maker"
-LandExportTool = "land_export"
-PrimExportTool = "prim_export"
-IgElevationTool = "ig_elevation"
-IgAddTool = "ig_add"
-BuildClodBankTool = "build_clod_bank"
-SheetsPackerTool = "sheets_packer"
-SheetsPackerShardTool = "sheets_packer_shard"
-BnpMakeTool = "bnp_make"
-SnpMakeTool = "snp_make"
-AiBuildWmapTool = "ai_build_wmap"
-TgaCutTool = "tga_cut"
-PatchGenTool = "patch_gen"
-TranslationToolsTool = "translation_tools"
-BuildWorldPackedColTool = "build_world_packed_col"
-R2IslandsTexturesTool = "r2_islands_textures"
-PatchmanServiceTool = "ryzom_patchman_service"
-SevenZipTool = "7za"
diff --git a/code/nel/tools/build_gamedata/d1_client_patch.py b/code/nel/tools/build_gamedata/d1_client_patch.py
deleted file mode 100644
index 608f24766..000000000
--- a/code/nel/tools/build_gamedata/d1_client_patch.py
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/python
-# 
-# \file d1_client_patch.py
-# \brief Install to client patch
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install to client patch
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Client Patch')
-parser.add_argument('--bnponly', '-bo', action='store_true')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite_local import *
-from tools import *
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install to client patch")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-BnpMake = findTool(log, ToolDirectories, BnpMakeTool, ToolSuffix)
-SnpMake = findTool(log, ToolDirectories, SnpMakeTool, ToolSuffix);
-PatchGen = findTool(log, ToolDirectories, PatchGenTool, ToolSuffix)
-printLog(log, "")
-
-# Find **** HARDCODED **** WINDOWS **** tools ... TODO: fix patch_gen tool !!!
-Lzma = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, "lzma.exe")
-printLog(log, "LZMA " + Lzma)
-XDelta = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, "xdelta.exe")
-printLog(log, "XDELTA " + XDelta)
-printLog(log, "")
-
-if BnpMake == "":
-	toolLogFail(log, BnpMakeTool, ToolSuffix)
-elif PatchGen == "" and not args.bnponly:
-	toolLogFail(log, PatchGenTool, ToolSuffix)
-elif Lzma == "" and not args.bnponly:
-	toolLogFail(log, "LZMA", ToolSuffix)
-elif XDelta == "" and not args.bnponly:
-	toolLogFail(log, "XDELTA", ToolSuffix)
-elif os.path.dirname(Lzma) != os.path.dirname(XDelta):
-	printLog(log, "FAIL lzma.exe and xdelta.exe must be in the same directory")
-else:
-	mkPath(log, ClientPatchDirectory)
-	if not args.bnponly:
-		productXml = ClientPatchDirectory + "/" + ProductName + ".xml"
-		if not os.path.isfile(productXml):
-			printLog(log, ">>> Create new product <<<")
-			subprocess.call([ PatchGen, "createNewProduct", productXml ])
-		printLog(log, "")
-		printLog(log, ">>> Rewrite " + ProductName + ".xml <<<") # because we know better.
-		shutil.move(productXml, productXml + ".old")
-		oldCfg = open(productXml + ".old", "r")
-		cfg = open(productXml, "w")
-		inCategories = 0
-		for line in oldCfg:
-			if not inCategories:
-				if line.strip() == "<_Categories>":
-					inCategories = 1
-					cfg.write("\t<_Categories>\n")
-					for category in InstallClientData:
-						packExt = ".bnp"
-						if (category["StreamedPackages"]):
-							packExt = ".snp"
-						cfg.write("\t\t<_Category>\n")
-						cfg.write("\t\t\t<_Name type=\"STRING\" value=\"" + category["Name"] + "\"/>\n")
-						if category["UnpackTo"] != None:
-							if category["UnpackTo"] != "":
-								cfg.write("\t\t\t<_UnpackTo type=\"STRING\" value=\"./" + category["UnpackTo"] + "/\"/>\n")
-							else:
-								cfg.write("\t\t\t<_UnpackTo type=\"STRING\" value=\"./\"/>\n")
-						cfg.write("\t\t\t<_IsOptional type=\"SINT32\" value=\"" + str(category["IsOptional"]) + "\"/>\n")
-						cfg.write("\t\t\t<_IsIncremental type=\"SINT32\" value=\"" + str(category["IsIncremental"]) + "\"/>\n")
-						for package in category["Packages"]:
-							if (len(package[1]) > 0):
-								cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[1][0] + "\"/>\n")
-							else:
-								cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[0] + packExt + "\"/>\n")
-						for ref in category["Refs"]:
-							cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + ref + "_.ref\"/>\n")
-						cfg.write("\t\t</_Category>\n")
-					cfg.write("\t</_Categories>\n")
-				else:
-					cfg.write(line)
-			else:
-				if line.strip() == "</_Categories>":
-					inCategories = 0
-		oldCfg.close()
-		cfg.close()
-		os.remove(productXml + ".old")
-	printLog(log, "")
-	printLog(log, ">>> Make bnp <<<")
-	targetPath = ClientPatchDirectory + "/bnp"
-	tagPath = ClientPatchDirectory + "/bnp_tag"
-	mkPath(log, targetPath)
-	mkPath(log, tagPath)
-	for category in InstallClientData:
-		packExt = ".bnp"
-		if (category["StreamedPackages"]):
-			packExt = ".snp"
-		for package in category["Packages"]:
-			printLog(log, "PACKAGE " + package[0])
-			sourcePath = InstallDirectory + "/" + package[0]
-			mkPath(log, sourcePath)
-			targetBnp = targetPath + "/" + package[0] + packExt
-			tagBnp = tagPath + "/" + package[0] + packExt + ".tag"
-			if (len(package[1]) > 0):
-				targetBnp = targetPath + "/" + package[1][0]
-				tagBnp = tagPath + "/" + package[1][0] + ".tag"
-				printLog(log, "TARGET " + package[1][0])
-			needUpdateBnp = 1
-			if (len(package) > 2):
-				needUpdateBnp = needUpdate(log, sourcePath + "/" + package[2], tagBnp)
-			else:
-				needUpdateBnp = needUpdateDirNoSubdirFile(log, sourcePath, tagBnp)
-			if (needUpdateBnp):
-				subRet = 0
-				open(tagBnp, 'a').close()
-				os.utime(tagBnp, None)
-				if (category["StreamedPackages"]):
-					printLog(log, "SNP " + targetBnp)
-					# cwDir = os.getcwd().replace("\\", "/")
-					# toolDir = os.path.dirname(Lzma).replace("\\", "/")
-					# os.chdir(toolDir)
-					subRet = subprocess.call([ SnpMake, "-p", sourcePath, targetBnp, ClientPatchDirectory + "/stream" ] + package[1][1:])
-					# os.chdir(cwDir)
-				else:
-					printLog(log, "BNP " + targetBnp)
-					subRet = subprocess.call([ BnpMake, "-p", sourcePath, "-o", targetBnp ] + package[1][1:])
-				if (subRet != 0):
-					os.remove(tagBnp)
-			else:
-				printLog(log, "SKIP " + targetBnp)
-	printLog(log, "")
-	if not args.bnponly:
-		printLog(log, ">>> Update product <<<")
-		cwDir = os.getcwd().replace("\\", "/")
-		toolDir = os.path.dirname(Lzma).replace("\\", "/")
-		os.chdir(toolDir)
-		subprocess.call([ PatchGen, "updateProduct", productXml ])
-		os.chdir(cwDir)
-		printLog(log, "")
-
-
-log.close()
-if os.path.isfile("d1_client_patch.log"):
-	os.remove("d1_client_patch.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_client_patch.log")
-shutil.move("log.log", "d1_client_patch.log")
diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py b/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
deleted file mode 100644
index a59c7e09e..000000000
--- a/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build ai_wmap
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build ai_wmap
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build ai_wmap")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-AiBuildWmap = findTool(log, ToolDirectories, AiBuildWmapTool, ToolSuffix)
-TgaCut = findTool(log, ToolDirectories, TgaCutTool, ToolSuffix)
-
-if AiBuildWmap == "":
-	toolLogFail(log, AiBuildWmapTool, ToolSuffix)
-if TgaCut == "":
-	toolLogFail(log, TgaCutTool, ToolSuffix)
-else:
-	printLog(log, ">>> Copy ai_build_wmap.cfg <<<")
-	cfgPath = ActiveProjectDirectory + "/generated/ai_build_wmap.cfg"
-	tagPath = ExportBuildDirectory + "/" + AiWmapBuildTagDirectory + "/ai_wmap_build.tag"
-	shutil.copy(cfgPath, "ai_build_wmap.cfg")
-	printLog(log, ">>> Check up packed sheets <<<")
-	subprocess.call([ AiBuildWmap, "checkPackedSheets" ])
-	printLog(log, ">>> Build ai_wmap <<<")
-	mkPath(log, ExportBuildDirectory + "/" + RbankOutputBuildDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildTagDirectory)
-	if (needUpdate(log, "continents.packed_sheets", tagPath) or needUpdateMultiDirNoSubdirFile(log, ExportBuildDirectory, [ RbankOutputBuildDirectory ] + IgLookupDirectories + PacsPrimLookupDirectories, tagPath)):
-		printLog(log, ">>> Generate wmap <<<")
-		subprocess.call([ AiBuildWmap, "pacsCrunch " + AiWmapContinentName ])
-		printLog(log, ">>> Generate sized wmap <<<")
-		subprocess.call([ AiBuildWmap, "pacsBuildGabarit " + AiWmapContinentName ])
-		printLog(log, ">>> Generate cwmaps for each size <<<")
-		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_0" ])
-		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_1" ])
-		callParallelProcess([ AiBuildWmap, "pacsBuildWmap " + AiWmapContinentName + "_2" ])
-		flushParallelProcesses()
-		printLog(log, ">>> Generate bitmap for each size <<<")
-		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_0" ])
-		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_1" ])
-		callParallelProcess([ AiBuildWmap, "pacsBuildBitmap " + AiWmapContinentName + "_2" ])
-		flushParallelProcesses()
-		printLog(log, ">>> Clear height maps for size 1 and 2 <<<")
-		subprocess.call([ AiBuildWmap, "pacsClearHeightmap " + AiWmapContinentName ])
-		printLog(log, ">>> Cut tga for world editor <<<")
-		subprocess.call([ TgaCut, ExportBuildDirectory + "/" + AiWmapBuildDirectory + "/" + AiWmapContinentName + "_0.tga" ])
-		moveFilesExtNoTree(log, ".", ExportBuildDirectory + "/" + AiWmapBuildDirectory, ".tga")
-		printLog(log, ">>> Remove wmap <<<")
-		removeFilesRecursiveExt(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory, ".wmap")
-		tagFile = open(tagPath, "w")
-		tagFile.write(time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())) + "\n")
-		tagFile.close()
-	else:
-		printLog(log, "SKIP *")
-printLog(log, "")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/cartographer/0_setup.py b/code/nel/tools/build_gamedata/processes/cartographer/0_setup.py
deleted file mode 100644
index eda395771..000000000
--- a/code/nel/tools/build_gamedata/processes/cartographer/0_setup.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup cartographer
-# \date 2014-09-13 13:32GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup cartographer
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2014  Jan BOON
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup cartographer")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + CartographerBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + CartographerMapBuildDirectory)
-
-# Setup lookup directories
-printLog(log, ">>> Setup lookup directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory) # IN
-mkPath(log, ExportBuildDirectory + "/" + ZoneLightBuildDirectory) # IN (.zonel)
-mkPath(log, ExportBuildDirectory + "/" + ZoneLightIgLandBuildDirectory) # IN (.ig)
-mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory) # IN
-mkPath(log, ExportBuildDirectory + "/" + FarbankBuildDirectory) # IN
-mkPath(log, ExportBuildDirectory + "/" + DisplaceExportDirectory) # IN
-mkPath(log, ExportBuildDirectory + "/" + TilesExportDirectory) # IN
-mkPath(log, LeveldesignDataCommonDirectory) # IN
-mkPath(log, LeveldesignDfnDirectory) # IN
-mkPath(log, LeveldesignDirectory) # IN
-for dir in PropertiesExportBuildSearchPaths:
-	mkPath(log, ExportBuildDirectory + "/" + dir)
-
-# Setup client directories
-printLog(log, ">>> Setup install directories <<<")
-mkPath(log, InstallDirectory + "/" + CartographerInstallDirectory)
-mkPath(log, InstallDirectory + "/" + IslandsInstallDirectory)
-
-# Setup client directories
-printLog(log, ">>> Setup configuration <<<")
-mkPath(log, ActiveProjectDirectory + "/generated")
-cfg = open(ActiveProjectDirectory + "/generated/island_screenshots.cfg", "w")
-cfg.write("\n")
-cfg.write("// BUILD CARTOGRAPHER CONFIGURATION\n")
-cfg.write("\n")
-cfg.write("SearchPaths = {\n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + AiWmapBuildDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + ZoneLightBuildDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + ZoneLightIgLandBuildDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + FarbankBuildDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + DisplaceExportDirectory + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + TilesExportDirectory + "\", \n")
-cfg.write("\t\"" + LeveldesignDataCommonDirectory + "\", \n")
-cfg.write("\t\"" + LeveldesignDfnDirectory + "\", \n")
-cfg.write("\t\"" + LeveldesignDirectory + "\", \n")
-for dir in PropertiesExportBuildSearchPaths:
-	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.write("OutDir = \"" + ExportBuildDirectory + "/" + CartographerBuildDirectory + "\";\n")
-cfg.write("\n")
-cfg.write("Continents = {\n")
-cfg.write("\t\"" + CartographerContinent + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.write("SeasonSuffixes = {\n")
-if CartographerSeasonSuffixes:
-	for suffix in CartographerSeasonSuffixes:
-		cfg.write("\t\"" + suffix + "\", \n")
-else:
-	for suffix in MultipleTilesPostfix:
-		cfg.write("\t\"" + suffix + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.write("InverseZTest = true;\n")
-cfg.write("Vegetation = true;\n")
-cfg.write("MeterPixelSize = 2;\n")
-cfg.write("\n")
-cfg.write("CompleteIslandsFile = \"" + ExportBuildDirectory + "/" + CartographerBuildDirectory + "/" + IslandsXmlFile + "\";\n")
-cfg.write("EntryPointsFile = \"r2_entry_points.txt\";\n")
-cfg.write("\n")
-cfg.close()
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/font/1_export.py b/code/nel/tools/build_gamedata/processes/font/1_export.py
deleted file mode 100644
index 0bad904f6..000000000
--- a/code/nel/tools/build_gamedata/processes/font/1_export.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 1_export.py
-# \brief Export font
-# \date 2009-03-10-19-43-GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Export font
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Export font")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-printLog(log, ">>> Export font <<<")
-fontExportDir = ExportBuildDirectory + "/" + FontExportDirectory
-mkPath(log, fontExportDir)
-for dir in FontSourceDirectories:
-	mkPath(log, DatabaseDirectory + "/" + dir)
-	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".ttf")
-	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".otf")
-	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".afm")
-	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".pfb")
-	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, fontExportDir, ".pfm")
-
-
-printLog(log, "")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/font/3_install.py b/code/nel/tools/build_gamedata/processes/font/3_install.py
deleted file mode 100644
index 3d244989a..000000000
--- a/code/nel/tools/build_gamedata/processes/font/3_install.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Install font
-# \date 2009-03-10-19-43-GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install font
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite_local import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install font")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-installPath = InstallDirectory + "/" + FontInstallDirectory
-mkPath(log, installPath)
-fontExportDir = ExportBuildDirectory + "/" + FontExportDirectory
-mkPath(log, fontExportDir)
-
-printLog(log, ">>> Install font <<<")
-copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".ttf")
-copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".otf")
-copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".afm")
-copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".pfb")
-copyFilesExtNoTreeIfNeeded(log, fontExportDir, installPath, ".pfm")
-
-printLog(log, "")
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/ig/2_build.py b/code/nel/tools/build_gamedata/processes/ig/2_build.py
deleted file mode 100644
index 159be465c..000000000
--- a/code/nel/tools/build_gamedata/processes/ig/2_build.py
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build ig
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build ig
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build ig")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-PrimExport = findTool(log, ToolDirectories, PrimExportTool , ToolSuffix)
-IgElevation = findTool(log, ToolDirectories, IgElevationTool, ToolSuffix)
-IgAdd = findTool(log, ToolDirectories, IgAddTool, ToolSuffix)
-
-configDir = ActiveProjectDirectory + "/generated"
-mkPath(log, configDir)
-
-def igElevation(inputIgDir, outputIgDir):
-	printLog(log, ">>> IG Elevation <<<")
-	mkPath(log, inputIgDir)
-	mkPath(log, outputIgDir)
-	needUpdateIg = needUpdateDirByTagLog(log, inputIgDir, ".ig", outputIgDir, ".ig")
-	if needUpdateIg:
-		printLog(log, "DETECT UPDATE IG->Elevated")
-	else:
-		printLog(log, "DETECT SKIP IG->Elevated")
-	needUpdateHeightMap = needUpdateFileDirNoSubdir(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap1, outputIgDir) or needUpdateFileDirNoSubdir(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2, outputIgDir)
-	if needUpdateHeightMap:
-		printLog(log, "DETECT UPDATE HeightMap->Elevated")
-	else:
-		printLog(log, "DETECT SKIP HeightMap->Elevated")
-	needUpdateLand = needUpdateFileDirNoSubdir(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportLand, outputIgDir)
-	if needUpdateLand:
-		printLog(log, "DETECT UPDATE Land->Elevated")
-	else:
-		printLog(log, "DETECT SKIP Land->Elevated")
-	if needUpdateIg or needUpdateHeightMap or needUpdateLand:
-		printLog(log, "DETECT DECIDE UPDATE")
-		mkPath(log, inputIgDir)
-		mkPath(log, outputIgDir)
-		mkPath(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory)
-		
-		configFile = configDir + "/ig_elevation.cfg"
-		if os.path.isfile(configFile):
-			os.remove(configFile)
-		
-		printLog(log, "CONFIG " + configFile)
-		cf = open(configFile, "w")
-		cf.write("// ig_elevation.cfg\n")
-		cf.write("\n")
-		cf.write("InputIGDir = \"" + inputIgDir + "\";\n")
-		cf.write("OutputIGDir = \"" + outputIgDir + "\";\n")
-		cf.write("\n")
-		cf.write("CellSize = 160.0;")
-		cf.write("\n")
-		cf.write("HeightMapFile1 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap1 + "\";\n")
-		cf.write("ZFactor1 = " + LigoExportZFactor1 + ";\n")
-		cf.write("HeightMapFile2 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2 + "\";\n")
-		cf.write("ZFactor2 = " + LigoExportZFactor2 + ";\n")
-		cf.write("ExtendCoords = " + str(LigoExportExtendCoords) + ";\n")
-		cf.write("\n")
-		cf.write("LandFile = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportLand + "\";\n")
-		cf.write("\n")
-		cf.close()
-		subprocess.call([ IgElevation, configFile ])
-		os.remove(configFile)
-		
-		# Copy remaining IG files
-		#BUG:copyFilesLogless(log, inputIgDir, outputIgDir)
-	else:
-		printLog(log, "DETECT DECIDE SKIP")
-		printLog(log, "SKIP *")
-
-# Build process
-if (ContinentLeveldesignWorldDirectory != "") or (len(IgOtherSourceDirectories) > 0):
-	printLog(log, ">>> Prim IG: ON <<<")
-	configFile = configDir + "/prim_export.cfg"
-	if os.path.isfile(configFile):
-		os.remove(configFile)
-	
-	outIgDir = ExportBuildDirectory + "/" + IgElevLandPrimBuildDirectory
-	mkPath(log, outIgDir)
-	zoneWDir = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory
-	mkPath(log, zoneWDir)
-	smallBank = DatabaseDirectory + "/" + TileRootSourceDirectory + "/" + BankTileBankName + ".bank"
-	farBank = ExportBuildDirectory + "/" + FarbankBuildDirectory + "/" + BankTileBankName + MultipleTilesPostfix[0] + ".farbank"
-	displaceDir = DatabaseDirectory + "/" + DisplaceSourceDirectory
-	continentDir = LeveldesignWorldDirectory + "/" + ContinentLeveldesignWorldDirectory
-	mkPath(log, continentDir)
-	formDir = LeveldesignDirectory
-	mkPath(log, LeveldesignDirectory)
-	worldEditorFiles = WorldEditorFilesDirectory
-	mkPath(log, WorldEditorFilesDirectory)
-	
-	printLog(log, "CONFIG " + configFile)
-	cf = open(configFile, "w")
-	cf.write("// prim_export.cfg\n")
-	cf.write("\n")
-	cf.write("OutIGDir = \"" + outIgDir + "\";\n")
-	cf.write("ZoneWDir = \"" + zoneWDir + "\";\n")
-	cf.write("\n")
-	cf.write("SmallBank = \"" + smallBank + "\";\n")
-	cf.write("FarBank = \"" + farBank + "\";\n")
-	cf.write("DisplaceDir = \"" + displaceDir + "\";\n")
-	cf.write("\n")
-	cf.write("CellSize = 160.0;")
-	cf.write("\n")
-	cf.write("PrimDirs = {\n")
-	cf.write("\t\"" + continentDir + "\", \n")
-	for dir in IgPrimitiveSourceDirectories:
-		mkPath(log, DatabaseDirectory + "/" + dir)
-		cf.write("\t\"" + DatabaseDirectory + "/" + dir + "\", \n")
-	cf.write("};\n")
-	cf.write("\n")
-	cf.write("FormDir = \"" + formDir + "\";\n")
-	cf.write("WorldEditorFiles = \"" + worldEditorFiles + "\";\n")
-	cf.write("\n")
-	cf.close()
-	subprocess.call([ PrimExport, configFile ])
-	os.remove(configFile)
-	
-	igElevation(ExportBuildDirectory + "/" + LigoIgLandBuildDirectory, ExportBuildDirectory + "/" + IgElevLandLigoBuildDirectory)
-	
-	igElevation(ExportBuildDirectory + "/" + IgStaticLandExportDirectory, ExportBuildDirectory + "/" + IgElevLandStaticBuildDirectory)
-
-printLog(log, ">>> Merge land IGs <<<")
-mkPath(log, ExportBuildDirectory + "/" + IgTempLandMergeBuildDirectory)
-removeFilesRecursive(log, ExportBuildDirectory + "/" + IgTempLandMergeBuildDirectory)
-
-mkPath(log, ExportBuildDirectory + "/" + IgLandBuildDirectory)
-
-mkPath(log, ExportBuildDirectory + "/" + IgElevLandPrimBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + IgElevLandLigoBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + IgElevLandStaticBuildDirectory)
-igFilesPrim = findFiles(log, ExportBuildDirectory + "/" + IgElevLandPrimBuildDirectory, "", ".ig")
-igFilesLigo = findFiles(log, ExportBuildDirectory + "/" + IgElevLandLigoBuildDirectory, "", ".ig")
-igFilesStatic = findFiles(log, ExportBuildDirectory + "/" + IgElevLandStaticBuildDirectory, "", ".ig")
-igFilesAll = [ ]
-for igFile in igFilesPrim:
-	if not igFile in igFilesAll:
-		igFilesAll += [ igFile ]
-for igFile in igFilesLigo:
-	if not igFile in igFilesAll:
-		igFilesAll += [ igFile ]
-for igFile in igFilesStatic:
-	if not igFile in igFilesAll:
-		igFilesAll += [ igFile ]
-igFilesAll.sort()
-for igFile in igFilesAll:
-	primIgFile = ExportBuildDirectory + "/" + IgElevLandPrimBuildDirectory + "/" + igFile
-	ligoIgFile = ExportBuildDirectory + "/" + IgElevLandLigoBuildDirectory + "/" + igFile
-	staticIgFile = ExportBuildDirectory + "/" + IgElevLandStaticBuildDirectory + "/" + igFile
-	tempIgFile = ExportBuildDirectory + "/" + IgTempLandMergeBuildDirectory + "/" + igFile
-	outIgFile = ExportBuildDirectory + "/" + IgLandBuildDirectory + "/" + igFile
-	activeFile = ""
-	needsUpdate = 0
-	sourceTools = ""
-	if igFile in igFilesPrim:
-		if needUpdate(log, primIgFile, outIgFile):
-			needsUpdate = 1
-	if not needsUpdate == 1 and igFile in igFilesLigo:
-		if needUpdate(log, ligoIgFile, outIgFile):
-			needsUpdate = 1
-	if not needsUpdate == 1 and igFile in igFilesStatic:
-		if needUpdate(log, staticIgFile, outIgFile):
-			needsUpdate = 1
-	if needsUpdate == 1:
-		if os.path.isfile(outIgFile):
-			os.remove(outIgFile)
-		if igFile in igFilesPrim:
-			sourceTools += " [Prim]"
-			activeFile = primIgFile
-		if igFile in igFilesLigo:
-			if activeFile == "":
-				activeFile = ligoIgFile
-			else:
-				sourceTools += " [Ligo]"
-				subprocess.call([ IgAdd, tempIgFile, ligoIgFile, activeFile ])
-				activeFile = tempIgFile
-		if igFile in igFilesStatic:
-			if activeFile == "":
-				activeFile = staticIgFile
-			else:
-				sourceTools += " [Static]"
-				subprocess.call([ IgAdd, outIgFile, staticIgFile, activeFile ])
-				activeFile = outIgFile
-		else:
-			shutil.copy(activeFile, outIgFile)
-		printLog(log, "MERGE " + igFile + sourceTools)
-	else:
-		printLog(log, "SKIP " + igFile)
-		
-# Remove temporary land IGs
-printLog(log, ">>> Remove temporary land IGs <<<")
-mkPath(log, ExportBuildDirectory + "/" + IgTempLandMergeBuildDirectory)
-removeFilesRecursive(log, ExportBuildDirectory + "/" + IgTempLandMergeBuildDirectory)
-
-# Remove outdated land IGs
-printLog(log, ">>> Remove outdated land IGs <<<")
-igFilesOut = findFiles(log, ExportBuildDirectory + "/" + IgLandBuildDirectory, "", ".ig")
-for igFile in igFilesOut:
-	if not igFile in igFilesAll:
-		printLog(log, "RM " + ExportBuildDirectory + "/" + IgLandBuildDirectory + "/" + igFile)
-		os.remove(ExportBuildDirectory + "/" + IgLandBuildDirectory + "/" + igFile)
-		
-# Verify land IGs
-printLog(log, ">>> Verify land IGs <<<")
-for igFile in igFilesAll:
-	if not igFile in igFilesOut:
-		printLog(log, "MISSING " + igFile)
-
-# Write land IGs TXT
-printLog(log, ">>> Write land IGs TXT <<<")
-igTxtFile = ExportBuildDirectory + "/" + IgLandBuildDirectory + "/" + LandscapeName + "_ig.txt"
-if needUpdateDirNoSubdirFile(log, ExportBuildDirectory + "/" + IgLandBuildDirectory, igTxtFile):
-	printLog(log, "WRITE " + ExportBuildDirectory + "/" + IgLandBuildDirectory + "/" + LandscapeName + "_ig.txt")
-	if os.path.isfile(igTxtFile):
-		os.remove(igTxtFile)
-	igTxt = open(igTxtFile, "w")
-	for igFile in igFilesAll:
-		igTxt.write(igFile + "\n")
-	igTxt.close()
-else:
-	printLog(log, "SKIP *")
-
-# Merge other IGs
-printLog(log, ">>> Merge other IGs <<<") # (not true merge, since not necesserary)
-mkPath(log, ExportBuildDirectory + "/" + IgStaticOtherExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + IgOtherBuildDirectory)
-# copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + IgStaticOtherExportDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory, ".ig")
-igElevation(ExportBuildDirectory + "/" + IgStaticOtherExportDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory)
-copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory, ExportBuildDirectory + "/" + IgOtherBuildDirectory, ".ig")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py b/code/nel/tools/build_gamedata/processes/ligo/0_setup.py
deleted file mode 100644
index 18d5ea6f7..000000000
--- a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup ligo
-# \date 2010-05-24 08:13GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup ligo
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup ligo")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup source directories
-printLog(log, ">>> Setup source directories <<<")
-mkPath(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory)
-mkPath(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory)
-mkPath(log, DatabaseDirectory + "/" + ZoneSourceDirectory[0])
-
-# Setup export directories
-printLog(log, ">>> Setup export directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneLigoExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory)
-mkPath(log, ExportBuildDirectory + "/" + ZoneExportDirectory)
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-if LigoExportLand != "":
-	mkPath(log, ExportBuildDirectory + "/" + LigoZoneBuildDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + LigoIgLandBuildDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + RBankCmbExportDirectory)
-
-# Setup client directories
-printLog(log, ">>> Setup client directories <<<")
-
-# Setup land exporter cfg
-if LigoExportLand != "":
-	printLog(log, ">>> Setup land exporter cfg <<<")
-	mkPath(log, ActiveProjectDirectory + "/generated")
-	cf = open(ActiveProjectDirectory + "/generated/land_exporter.cfg", "w")
-	cf.write("\n")
-	cf.write("// Ligo settings\n")
-	cf.write("\n")
-	cf.write("OutZoneDir = \"" + ExportBuildDirectory + "/" + LigoZoneBuildDirectory + "\";\n")
-	cf.write("OutIGDir  = \"" + ExportBuildDirectory + "/" + LigoIgLandBuildDirectory + "\";\n")
-	cf.write("AdditionnalIGOutDir = \"" + ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory + "\";\n")
-	cf.write("\n")
-	cf.write("RefZoneDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemZoneExportDirectory+ "\";\n") # FIXME
-	cf.write("RefIGDir  = \"" + ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory + "\";\n")
-	cf.write("AdditionnalIGInDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory + "\";\n") # FIXME
-	cf.write("ContinentsDir = \"" + LeveldesignWorldDirectory + "\";\n")
-	cf.write("LigoBankDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemZoneLigoExportDirectory + "\";\n") # FIXME
-	cf.write("\n")
-	cf.write("TileBankFile = \"" + DatabaseDirectory + "/" + LigoTileBankFile + "\";\n")
-	cf.write("\n")
-	cf.write("ColorMapFile = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportColormap + "\";\n")
-	cf.write("HeightMapFile1 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap1 + "\";\n")
-	cf.write("ZFactor1 = " + LigoExportZFactor1 + ";\n")
-	cf.write("HeightMapFile2 = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2 + "\";\n")
-	cf.write("ZFactor2 = " + LigoExportZFactor2 + ";\n")
-	cf.write("ExtendCoords = " + str(LigoExportExtendCoords) + ";\n")
-	cf.write("\n")
-	cf.write("ZoneLight = 0;\n")
-	cf.write("CellSize = 160;\n")
-	cf.write("Threshold = 1;\n")
-	cf.write("\n")
-	cf.write("DFNDir = \"" + LeveldesignDfnDirectory + "\";\n")
-	cf.write("RefCMBDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory + "\";\n") # FIXME
-	cf.write("OutCMBDir = \"" + ExportBuildDirectory + "/" + RBankCmbExportDirectory + "\";\n")
-	cf.write("\n")
-	cf.write("ContinentFile = \"" + LeveldesignWorldDirectory + "/" + ContinentFile + "\";\n")
-	cf.write("\n")
-	cf.write("ExportCollisions = 1;\n")
-	cf.write("ExportAdditionnalIGs = 1;\n")
-	cf.write("\n")
-	cf.write("ZoneRegionFile = \"" + DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportLand + "\";\n")
-	cf.write("\n")
-	cf.close()
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/rbank/2_build.py b/code/nel/tools/build_gamedata/processes/rbank/2_build.py
deleted file mode 100644
index 1f872b968..000000000
--- a/code/nel/tools/build_gamedata/processes/rbank/2_build.py
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build rbank
-# \date 2009-03-10-22-43-GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build rbank
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build rbank")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-BuildIgBoxes = findTool(log, ToolDirectories, BuildIgBoxesTool, ToolSuffix)
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-BuildRbank = findTool(log, ToolDirectories, BuildRbankTool, ToolSuffix)
-GetNeighbors = findTool(log, ToolDirectories, GetNeighborsTool, ToolSuffix)
-BuildIndoorRbank = findTool(log, ToolDirectories, BuildIndoorRbankTool, ToolSuffix)
-# AiBuildWmap = findTool(log, ToolDirectories, AiBuildWmapTool, ToolSuffix)
-printLog(log, "")
-
-# Build rbank bbox
-printLog(log, ">>> Build rbank bbox <<<")
-tempBbox = ExportBuildDirectory + "/" + RbankBboxBuildDirectory + "/temp.bbox"
-rebuiltBbox = False
-if BuildIgBoxes == "":
-	toolLogFail(log, BuildIgBoxesTool, ToolSuffix)
-else:
-	mkPath(log, ExportBuildDirectory + "/" + RbankBboxBuildDirectory)
-	needUpdateIg = needUpdateMultiDirNoSubdirFile(log, ExportBuildDirectory, IgLookupDirectories, tempBbox)
-	if needUpdateIg:
-		printLog(log, "DETECT UPDATE IG->Bbox")
-	else:
-		printLog(log, "DETECT SKIP IG->Bbox")
-	needUpdateShape = needUpdateMultiDirNoSubdirFile(log, ExportBuildDirectory, ShapeLookupDirectories, tempBbox)
-	if needUpdateShape:
-		printLog(log, "DETECT UPDATE Shape->Bbox")
-	else:
-		printLog(log, "DETECT SKIP Shape->Bbox")
-	if needUpdateIg or needUpdateShape:
-		rebuiltBbox = True
-		printLog(log, "DETECT DECIDE UPDATE")
-		cf = open("build_ig_boxes.cfg", "w")
-		cf.write("\n")
-		cf.write("Pathes = {\n")
-		for dir in IgLookupDirectories:
-			mkPath(log, ExportBuildDirectory + "/" + dir)
-			cf.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-		for dir in ShapeLookupDirectories:
-			mkPath(log, ExportBuildDirectory + "/" + dir)
-			cf.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-		cf.write("};\n")
-		cf.write("\n")
-		cf.write("IGs = {\n")
-		for dir in IgLookupDirectories:
-			files = findFiles(log, ExportBuildDirectory + "/" + dir, "", ".ig")
-			for file in files:
-				cf.write("\t\"" + os.path.basename(file)[0:-len(".ig")] + "\", \n")
-		cf.write("};\n")
-		cf.write("\n")
-		cf.write("Output = \"" + tempBbox + "\";\n")
-		cf.write("\n")
-		cf.close()
-		subprocess.call([ BuildIgBoxes ])
-		os.remove("build_ig_boxes.cfg")
-	else:
-		printLog(log, "DETECT DECIDE SKIP")
-		printLog(log, "SKIP *")
-printLog(log, "")
-
-printLog(log, ">>> Build rbank build config <<<")
-cf = open("build_rbank.cfg", "w")
-cf.write("\n")
-cf.write("// Rbank settings\n")
-cf.write("\n")
-cf.write("Verbose = " + str(RBankVerbose) + ";\n")
-cf.write("CheckConsistency = " + str(RBankConsistencyCheck) + ";\n")
-mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-cf.write("ZonePath = \"" + ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/\";\n")
-mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
-cf.write("BanksPath = \"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "/\";\n")
-cf.write("Bank = \"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "/" + BankTileBankName + ".smallbank\";\n")
-cf.write("ZoneExt = \".zonew\";\n")
-cf.write("ZoneNHExt = \".zonenhw\";\n")
-cf.write("IGBoxes = \"" + tempBbox + "\";\n")
-mkPath(log, LeveldesignWorldDirectory)
-cf.write("LevelDesignWorldPath = \"" + LeveldesignWorldDirectory + "\";\n")
-mkPath(log, ExportBuildDirectory + "/" + IgLandBuildDirectory)
-cf.write("IgLandPath = \"" + ExportBuildDirectory + "/" + IgLandBuildDirectory + "\";\n")
-mkPath(log, ExportBuildDirectory + "/" + IgOtherBuildDirectory)
-cf.write("IgVillagePath = \"" + ExportBuildDirectory + "/" + IgOtherBuildDirectory + "\";\n")
-cf.write("\n")
-mkPath(log, ExportBuildDirectory + "/" + RbankTessellationBuildDirectory)
-cf.write("TessellationPath = \"" + ExportBuildDirectory + "/" + RbankTessellationBuildDirectory + "/\";\n")
-cf.write("TessellateLevel = " + str(BuildQuality) + ";\n") # BuildQuality
-cf.write("\n")
-cf.write("WaterThreshold = 1.0;\n")
-cf.write("\n")
-cf.write("OutputRootPath = \"" + ExportBuildDirectory + "/\";\n")
-mkPath(log, ExportBuildDirectory + "/" + RbankSmoothBuildDirectory)
-cf.write("SmoothDirectory = \"" + RbankSmoothBuildDirectory + "/\";\n")
-mkPath(log, ExportBuildDirectory + "/" + RbankRawBuildDirectory)
-cf.write("RawDirectory = \"" + RbankRawBuildDirectory + "/\";\n")
-cf.write("\n")
-cf.write("ReduceSurfaces = " + str(RbankReduceSurfaces) + ";\n")
-cf.write("SmoothBorders = " + str(RbankSmoothBorders) + ";\n")
-cf.write("\n")
-cf.write("ComputeElevation = " + str(RbankComputeElevation) + ";\n")
-cf.write("ComputeLevels = " + str(RbankComputeLevels) + ";\n")
-cf.write("\n")
-cf.write("LinkElements = " + str(RbankLinkElements) + ";\n")
-cf.write("\n")
-cf.write("CutEdges = " + str(RbankCutEdges) + ";\n")
-cf.write("\n")
-cf.write("UseZoneSquare = " + str(RbankUseZoneSquare) + ";\n")
-cf.write("\n")
-cf.write("// The whole landscape\n")
-cf.write("ZoneUL = \"" + RbankZoneUl + "\";\n")
-cf.write("ZoneDR = \"" + RbankZoneDr + "\";\n")
-cf.write("\n")
-mkPath(log, ExportBuildDirectory + "/" + RbankPreprocBuildDirectory)
-cf.write("PreprocessDirectory = \"" + ExportBuildDirectory + "/" + RbankPreprocBuildDirectory + "/\";\n")
-cf.write("\n")
-cf.write("// The global retriever processing settings\n")
-cf.write("GlobalRetriever = \"temp.gr\";\n")
-cf.write("RetrieverBank = \"temp.rbank\";\n")
-cf.write("\n")
-cf.write("GlobalUL = \"" + RbankZoneUl + "\";\n")
-cf.write("GlobalDR = \"" + RbankZoneDr + "\";\n")
-cf.write("\n")
-cf.write("// Which kind of stuff to do\n")
-cf.write("TessellateZones = 0;\n")
-cf.write("MoulineZones = 0;\n")
-cf.write("ProcessRetrievers = 0;\n")
-cf.write("ProcessGlobal = 0;\n")
-cf.write("\n")
-cf.write("Zones = {\n")
-mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonew")
-for file in files:
-	cf.write("\t\"" + os.path.basename(file) + "\", \n")
-cf.write("};\n")
-cf.write("\n")
-cf.write("Pathes = {\n")
-mkPath(log, WorldEditorFilesDirectory);
-cf.write("\t\"" + WorldEditorFilesDirectory + "\", \n");
-for dir in IgLookupDirectories:
-	mkPath(log, ExportBuildDirectory + "/" + dir)
-	cf.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-for dir in ShapeLookupDirectories:
-	mkPath(log, ExportBuildDirectory + "/" + dir)
-	cf.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-cf.write("};\n")
-cf.write("\n")
-cf.close()
-printLog(log, "")
-
-printLog(log, ">>> Build rbank check prims <<<")
-if BuildRbank == "":
-	toolLogFail(log, BuildRbankTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	subprocess.call([ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-C", "-p", "-g" ])
-printLog(log, "")
-
-printLog(log, ">>> Build rbank process all passes <<<")
-if BuildRbank == "":
-	toolLogFail(log, BuildRbankTool, ToolSuffix)
-if GetNeighbors == "":
-	toolLogFail(log, GetNeighborsTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	zonefiles = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonew")
-	zonesToBuild = []
-	for zonefile in zonefiles:
-		zone = os.path.basename(zonefile)[0:-len(".zonew")]
-		lr1 = ExportBuildDirectory + "/" + RbankSmoothBuildDirectory + "/" + zone + ".lr"
-		nearzones = subprocess.Popen([ GetNeighbors, zone ], stdout = subprocess.PIPE).communicate()[0].strip().split(" ")
-		printLog(log, "ZONE " + zone + ": " + str(nearzones))
-		zoneToBuild = 0
-		for nearzone in nearzones:
-			sourcePath = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + nearzone + ".zonew"
-			if (os.path.isfile(sourcePath)):
-				if (rebuiltBbox or needUpdate(log, sourcePath, lr1)):
-					zoneToBuild = 1
-					zonesToBuild.append(os.path.basename(zonefile))
-		sourcePath = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + zone + ".zonew"
-		if zoneToBuild:
-			printLog(log, sourcePath + " -> " + lr1)
-			# subprocess.call([ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g", os.path.basename(zonefile) ])
-		else:
-			printLog(log, "SKIP " + lr1)
-	while len(zonesToBuild) > 0:
-		processCommand = [ ExecTimeout, str(RbankBuildTesselTimeout), BuildRbank, "-c", "-P", "-g" ]
-		processCommand.extend(zonesToBuild[:min(len(zonesToBuild), 64)])
-		if len(zonesToBuild) > 64:
-			zonesToBuild = zonesToBuild[64:]
-		else:
-			zonesToBuild = []
-		print processCommand
-		callParallelProcess(processCommand)
-	flushParallelProcesses()
-printLog(log, "")
-
-printLog(log, ">>> Detect modifications to rebuild lr <<<")
-needUpdateCmbLr = needUpdateDirByTagLog(log, ExportBuildDirectory + "/" + RBankCmbExportDirectory, ".cmb", ExportBuildDirectory + "/" + RbankRetrieversBuildDirectory, ".lr")
-if needUpdateCmbLr:
-	printLog(log, "DETECT UPDATE Cmb->Lr")
-else:
-	printLog(log, "DETECT SKIP Cmb->Lr")
-needUpdateCmbRbank = needUpdateDirNoSubdirFile(log, ExportBuildDirectory + "/" + RBankCmbExportDirectory, ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "/" + RbankRbankName + ".rbank")
-if needUpdateCmbRbank:
-	printLog(log, "DETECT UPDATE Cmb->Rbank")
-else:
-	printLog(log, "DETECT SKIP Cmb->Rbank")
-needUpdateLrRbank = needUpdateDirNoSubdirFile(log, ExportBuildDirectory + "/" + RbankSmoothBuildDirectory, ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "/" + RbankRbankName + ".rbank")
-if needUpdateLrRbank:
-	printLog(log, "DETECT UPDATE Lr->Rbank")
-else:
-	printLog(log, "DETECT SKIP Lr->Rbank")
-needUpdateBboxRbank = needUpdate(log, tempBbox, ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "/" + RbankRbankName + ".rbank")
-if needUpdateBboxRbank:
-	printLog(log, "DETECT UPDATE Lr->Rbank")
-else:
-	printLog(log, "DETECT SKIP Lr->Rbank")
-
-if rebuiltBbox or needUpdateCmbLr or needUpdateCmbRbank or needUpdateLrRbank or needUpdateBboxRbank:
-	printLog(log, "DETECT DECIDE UPDATE")
-	printLog(log, ">>> Build rbank process global <<<") # This generates temp lr files. TODO: Check if the LR changed?
-	if BuildRbank == "":
-		toolLogFail(log, BuildRbankTool, ToolSuffix)
-	elif ExecTimeout == "":
-		toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-	else:
-		subprocess.call([ ExecTimeout, str(RbankBuildProcglobalTimeout), BuildRbank, "-c", "-P", "-G" ])
-	printLog(log, "")
-	os.remove("build_rbank.cfg")
-
-	printLog(log, ">>> Build rbank indoor <<<") # This generates the retrievers for the ig that have the cmb export
-	if BuildIndoorRbank == "":
-		toolLogFail(log, BuildIndoorRbankTool, ToolSuffix)
-	elif ExecTimeout == "":
-		toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-	else:
-		retrieversDir = ExportBuildDirectory + "/" + RbankRetrieversBuildDirectory
-		mkPath(log, retrieversDir)
-		removeFilesRecursiveExt(log, retrieversDir, ".rbank")
-		removeFilesRecursiveExt(log, retrieversDir, ".gr")
-		removeFilesRecursiveExt(log, retrieversDir, ".lr")
-		cf = open("build_indoor_rbank.cfg", "w")
-		cf.write("\n")
-		mkPath(log, ExportBuildDirectory + "/" + RBankCmbExportDirectory)
-		cf.write("MeshPath = \"" + ExportBuildDirectory + "/" + RBankCmbExportDirectory + "/\";\n")
-		# cf.write("Meshes = { };\n")
-		cf.write("Meshes = \n")
-		cf.write("{\n")
-		meshFiles = findFilesNoSubdir(log, ExportBuildDirectory + "/" + RBankCmbExportDirectory, ".cmb")
-		lenCmbExt = len(".cmb")
-		for file in meshFiles:
-			cf.write("\t\"" + file[0:-lenCmbExt] + "\", \n")
-		cf.write("};\n")
-		cf.write("OutputPath = \"" + retrieversDir + "/\";\n")
-		# mkPath(log, ExportBuildDirectory + "/" + RbankOutputBuildDirectory)
-		# cf.write("OutputPath = \"" + ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "/\";\n")
-		cf.write("OutputPrefix = \"unused\";\n")
-		cf.write("Merge = 1;\n")
-		mkPath(log, ExportBuildDirectory + "/" + RbankSmoothBuildDirectory)
-		cf.write("MergePath = \"" + ExportBuildDirectory + "/" + RbankSmoothBuildDirectory + "/\";\n")
-		cf.write("MergeInputPrefix = \"temp\";\n")
-		cf.write("MergeOutputPrefix = \"tempMerged\";\n")
-		# cf.write("MergeOutputPrefix = \"" + RbankRbankName + "\";\n")
-		cf.write("AddToRetriever = 1;\n")
-		cf.write("\n")
-		cf.close()
-		subprocess.call([ ExecTimeout, str(RbankBuildIndoorTimeout), BuildIndoorRbank ])
-		os.remove("build_indoor_rbank.cfg")
-	printLog(log, "")
-
-	retrieversDir = ExportBuildDirectory + "/" + RbankRetrieversBuildDirectory
-	mkPath(log, retrieversDir)
-	outputDir = ExportBuildDirectory + "/" + RbankOutputBuildDirectory
-	mkPath(log, outputDir)
-	printLog(log, ">>> Move gr, rbank and lr <<<") # This simply renames everything
-	if needUpdateDirNoSubdir(log, retrieversDir, outputDir):
-		removeFilesRecursiveExt(log, outputDir, ".rbank")
-		removeFilesRecursiveExt(log, outputDir, ".gr")
-		removeFilesRecursiveExt(log, outputDir, ".lr")
-		copyFilesRenamePrefixExt(log, retrieversDir, outputDir, "tempMerged", RbankRbankName, ".rbank")
-		copyFilesRenamePrefixExt(log, retrieversDir, outputDir, "tempMerged", RbankRbankName, ".gr")
-		copyFilesRenamePrefixExt(log, retrieversDir, outputDir, "tempMerged_", RbankRbankName + "_", ".lr")
-	else:
-		printLog(log, "SKIP *")
-else:
-	printLog(log, "DETECT DECIDE SKIP")
-	printLog(log, "SKIP *")
-
-# Remove pacs.packed_prims when done
-if os.path.isfile("pacs.packed_prims"):
-	os.remove("pacs.packed_prims")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/shape/2_build.py b/code/nel/tools/build_gamedata/processes/shape/2_build.py
deleted file mode 100644
index 3881a35ec..000000000
--- a/code/nel/tools/build_gamedata/processes/shape/2_build.py
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build shape
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build shape
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build shape")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-BuildShadowSkin = findTool(log, ToolDirectories, BuildShadowSkinTool, ToolSuffix)
-BuildClodtex = findTool(log, ToolDirectories, BuildClodtexTool, ToolSuffix)
-LightmapOptimizer = findTool(log, ToolDirectories, LightmapOptimizerTool, ToolSuffix)
-TgaToDds = findTool(log, ToolDirectories, TgaToDdsTool, ToolSuffix)
-BuildCoarseMesh = findTool(log, ToolDirectories, BuildCoarseMeshTool, ToolSuffix)
-
-shapeDirectory = ExportBuildDirectory + "/" + ShapeNotOptimizedExportDirectory
-if BuildShadowSkinEnabled:
-	mkPath(log, shapeDirectory)
-	shadowSkinBuildDirectory = ExportBuildDirectory + "/" + ShapeShadowSkinBuildDirectory
-	printLog(log, ">>> BuildShadowSkin <<<")
-	shadowSkinShapes = findFilesNoSubdir(log, shapeDirectory, ".shape")
-	for shadowSkinShape in shadowSkinShapes:
-		srcShape = shapeDirectory + "/" + shadowSkinShape
-		dstShape = shadowSkinBuildDirectory + "/" + shadowSkinShape
-		if needUpdateLogRemoveDest(log, srcShape, dstShape):
-			subprocess.call([ BuildShadowSkin, srcShape, dstShape, str(BuildShadowSkinRatio), str(BuildShadowSkinMaxface) ])
-	shapeDirectory = shadowSkinBuildDirectory
-
-mkPath(log, shapeDirectory)
-mkPath(log, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory)
-if ClodConfigFile != "":
-	mkPath(log, ExportBuildDirectory + "/" + ClodExportDirectory)
-	printLog(log, ">>> Build CLodTex <<<")
-	subprocess.call([ BuildClodtex, "-d", DatabaseDirectory + "/" + ClodConfigFile, ExportBuildDirectory + "/" + ClodExportDirectory, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory ])
-else:
-	printLog(log, ">>> Copy Shape <<<")
-	copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
-
-printLog(log, ">>> Copy non-ShadowSkin non-CLodTex Shape <<<")
-shapeDirectory = ExportBuildDirectory + "/" + ShapeNotOptimizedExportDirectory
-mkPath(log, shapeDirectory)
-mkPath(log, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory)
-copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
-shapeDirectory = ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory
-
-# copy lightmap_not_optimized to lightmap
-printLog(log, ">>> Optimize lightmaps <<<")
-loPathLightmapsOriginal = ExportBuildDirectory + "/" + ShapeLightmapNotOptimizedExportDirectory
-loPathShapesOriginal = ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory
-mkPath(log, loPathLightmapsOriginal)
-loPathLightmaps = ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory
-loPathShapes = ExportBuildDirectory + "/" + ShapeOptimizedBuildDirectory
-loPathTags = ExportBuildDirectory + "/" + ShapeTagExportDirectory
-mkPath(log, loPathLightmaps)
-mkPath(log, loPathShapes)
-mkPath(log, loPathTags)
-if needUpdateDirByTagLog(log, loPathLightmapsOriginal, ".txt", loPathLightmaps, ".txt") or needUpdateDirNoSubdir(log, loPathLightmapsOriginal, loPathLightmaps) or needUpdateDirNoSubdir(log, loPathShapesOriginal, loPathShapes) or needUpdateDirNoSubdir(log, loPathShapes, loPathLightmaps) or needUpdateDirNoSubdir(log, loPathTags, loPathLightmaps):
-	removeFilesRecursive(log, loPathLightmaps)
-	copyFiles(log, loPathLightmapsOriginal, loPathLightmaps)
-	removeFilesRecursive(log, loPathShapes)
-	copyFiles(log, loPathShapesOriginal, loPathShapes)
-	# Optimize lightmaps if any. Additionnaly, output a file indicating which lightmaps are 8 bits
-	# lightmap_optimizer <path_lightmaps> <path_shapes> [path_tags] [path_flag8bit]
-	subprocess.call([ LightmapOptimizer, loPathLightmaps, loPathShapes, loPathTags, ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory + "/list_lm_8bit.txt" ])
-else:
-	printLog(log, "SKIP *")
-
-# Convert lightmap in 16 bits mode if they are not 8 bits lightmap
-printLog(log, ">>> Convert lightmaps in 16 or 8 bits <<<")
-mkPath(log, ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + ShapeLightmap16BitsBuildDirectory)
-lightMapTgas = findFilesNoSubdir(log, ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory, ".tga")
-listLm8Bit = [ ]
-listLm8BitFile = open(ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory + "/list_lm_8bit.txt", "r")
-for line in listLm8BitFile:
-	lineStrip = line.strip()
-	if (len(lineStrip) > 0):
-		listLm8Bit += [ lineStrip ]
-for lightMapTga in lightMapTgas:
-	srcTga = ExportBuildDirectory + "/" + ShapeLightmapBuildDirectory + "/" + lightMapTga
-	dstTga = ExportBuildDirectory + "/" + ShapeLightmap16BitsBuildDirectory + "/" + lightMapTga
-	if needUpdateLogRemoveDest(log, srcTga, dstTga):
-		if lightMapTga in listLm8Bit: # THIS MAY NOT WORK, PLEASE VERIFY CONTENTS OF list_lm_8bit.txt!!!
-			subprocess.call([ TgaToDds, srcTga, "-o", dstTga, "-a", "tga8" ])
-		else:
-			subprocess.call([ TgaToDds, srcTga, "-o", dstTga, "-a", "tga16" ])
-
-# Corse meshes for this process ?
-if len(CoarseMeshTextureNames) > 0:
-	printLog(log, ">>> Build coarse meshes <<<")
-	shapeWithCoarseMesh = ExportBuildDirectory + "/" + ShapeWithCoarseMeshExportDirectory
-	mkPath(log, shapeWithCoarseMesh)
-	shapeWithCoarseMeshBuilded = ExportBuildDirectory + "/" + ShapeWithCoarseMeshBuildDirectory
-	mkPath(log, shapeWithCoarseMeshBuilded)
-	# This builds from shapeWithCoarseMesh .shape to shapeWithCoarseMesh .tga
-	# And from shapeWithCoarseMesh .shape to shapeWithCoarseMeshBuilded .shape
-	# Then builds from shapeWithCoarseMesh .tga to shapeWithCoarseMeshBuilded .tga
-	# Depends on MapLookupDirectories
-	needUpdateMaps = needUpdateMultiDirNoSubdirMultiFileExt(log, ExportBuildDirectory, MapLookupDirectories, shapeWithCoarseMesh, CoarseMeshTextureNames, ".tga") or needUpdateMultiDirNoSubdir(log, ExportBuildDirectory, MapLookupDirectories, shapeWithCoarseMeshBuilded)
-	if needUpdateMaps:
-		printLog(log, "DETECT UPDATE Maps->*")
-	else:
-		printLog(log, "DETECT SKIP Maps->*")
-	needUpdateShapeShape = needUpdateDirByTagLog(log, shapeWithCoarseMesh, ".shape", shapeWithCoarseMeshBuilded, ".shape")
-	if needUpdateShapeShape:
-		printLog(log, "DETECT UPDATE Shape->Shape")
-	else:
-		printLog(log, "DETECT SKIP Shape->Shape")
-	needUpdateShapeCoarse = needUpdateDirNoSubdirExtMultiFileExt(log, shapeWithCoarseMesh, ".shape", shapeWithCoarseMesh, CoarseMeshTextureNames, ".tga")
-	if needUpdateShapeCoarse:
-		printLog(log, "DETECT UPDATE Shape->Coarse")
-	else:
-		printLog(log, "DETECT SKIP Shape->Coarse")
-	if needUpdateMaps or needUpdateShapeShape or needUpdateShapeCoarse:
-		cf = open("config_generated.cfg", "w")
-		cf.write("texture_mul_size = " + TextureMulSizeValue + ";\n")
-		cf.write("\n")
-		cf.write("search_path = \n")
-		cf.write("{\n")
-		cf.write("\t\"" + shapeWithCoarseMesh + "\", \n")
-		for dir in MapLookupDirectories:
-			cf.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-		cf.write("};\n")
-		cf.write("\n")
-		cf.write("list_mesh = \n")
-		cf.write("{\n")
-		# For each shape with coarse mesh
-		files = findFiles(log, shapeWithCoarseMesh, "", ".shape")
-		for file in files:
-			sourceFile = shapeWithCoarseMesh + "/" + file
-			if os.path.isfile(sourceFile):
-				destFile = shapeWithCoarseMeshBuilded + "/" + file
-				cf.write("\t\"" + file + "\", \"" + destFile + "\", \n")
-		cf.write("};\n")
-		cf.write("\n")
-		cf.write("output_textures = \n")
-		cf.write("{\n")
-		# For each shape with coarse mesh
-		for tn in CoarseMeshTextureNames:
-			cf.write("\t\"" + shapeWithCoarseMesh + "/" + tn + ".tga\", \n")
-		cf.write("};\n")
-		cf.close()
-		subprocess.call([ BuildCoarseMesh, "config_generated.cfg" ])
-		os.remove("config_generated.cfg")
-	needUpdateCoarse = needUpdateDirNoSubdirExtMultiFileExt(log, shapeWithCoarseMesh, ".tga", shapeWithCoarseMeshBuilded, CoarseMeshTextureNames, ".dds")
-	if needUpdateCoarse:
-		printLog(log, "DETECT UPDATE Coarse->DDS")
-	else:
-		printLog(log, "DETECT SKIP Coarse->DDS")
-	# Convert the coarse texture to dds
-	if needUpdateCoarse:
-		for tn in CoarseMeshTextureNames:
-			subprocess.call([ TgaToDds, shapeWithCoarseMesh + "/" + tn + ".tga", "-o", shapeWithCoarseMeshBuilded + "/" + tn + ".dds", "-a", "5" ])
-else:
-	printLog(log, ">>> No coarse meshes <<<")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/zone/2_build.py b/code/nel/tools/build_gamedata/processes/zone/2_build.py
deleted file mode 100644
index 4d19f5abc..000000000
--- a/code/nel/tools/build_gamedata/processes/zone/2_build.py
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build zone
-# \date 2009-03-10-22-23-GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build zone
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build zone")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-ZoneDependencies = findTool(log, ToolDirectories, ZoneDependenciesTool, ToolSuffix)
-ZoneWelder = findTool(log, ToolDirectories, ZoneWelderTool, ToolSuffix)
-ZoneElevation = findTool(log, ToolDirectories, ZoneElevationTool, ToolSuffix)
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-printLog(log, "")
-
-# We are in BEST mode
-if BuildQuality == 1:
-	printLog(log, ">>> Build zone dependencies <<<")
-	if ZoneDependencies == "":
-		toolLogFail(log, ZoneDependenciesTool, ToolSuffix)
-	elif ExecTimeout == "":
-		toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-	else:
-		mkPath(log, ExportBuildDirectory + "/" + ZoneExportDirectory)
-		mkPath(log, ExportBuildDirectory + "/" + ZoneDependBuildDirectory)
-		needUpdateZoneDepend = needUpdateDirByLowercaseTagLog(log, ExportBuildDirectory + "/" + ZoneExportDirectory, ".zone", ExportBuildDirectory + "/" + ZoneDependBuildDirectory, ".depend")
-		if needUpdateZoneDepend:
-			printLog(log, "DETECT UPDATE Zone->Depend")
-		else:
-			printLog(log, "DETECT SKIP Zone->Depend")
-		needUpdateContinentDepend = needUpdateFileDirNoSubdir(log, LeveldesignWorldDirectory + "/" + ContinentFile, ExportBuildDirectory + "/" + ZoneDependBuildDirectory)
-		if needUpdateContinentDepend:
-			printLog(log, "DETECT UPDATE Continent->Depend")
-		else:
-			printLog(log, "DETECT SKIP Continent->Depend")
-		needUpdateSearchPaths = needUpdateMultiDirNoSubdir(log, ExportBuildDirectory, PropertiesExportBuildSearchPaths, ExportBuildDirectory + "/" + ZoneDependBuildDirectory)
-		if needUpdateSearchPaths:
-			printLog(log, "DETECT UPDATE SearchPaths->Depend")
-		else:
-			printLog(log, "DETECT SKIP SearchPaths->Depend")
-		if needUpdateZoneDepend or needUpdateContinentDepend or needUpdateSearchPaths:
-			printLog(log, "DETECT DECIDE UPDATE")
-			mkPath(log, ActiveProjectDirectory + "/generated")
-			configFile = ActiveProjectDirectory + "/generated/zone_dependencies.cfg"
-			templateCf = open(ActiveProjectDirectory + "/generated/properties.cfg", "r")
-			cf = open(configFile, "w")
-			for line in templateCf:
-				cf.write(line)
-			cf.write("\n");
-			cf.write("level_design_directory = \"" + LeveldesignDirectory + "\";\n");
-			cf.write("level_design_world_directory = \"" + LeveldesignWorldDirectory + "\";\n");
-			cf.write("level_design_dfn_directory = \"" + LeveldesignDfnDirectory + "\";\n");
-			cf.write("continent_name = \"" + ContinentName + "\";\n");
-			cf.write("\n");
-			cf.close()
-			
-			for zoneRegion in ZoneRegions:
-				# zone_dependencies [properties.cfg] [firstZone.zone] [lastzone.zone] [output_dependencies.cfg]
-				subprocess.call([ ExecTimeout, str(ZoneBuildDependTimeout), ZoneDependencies, configFile, ExportBuildDirectory + "/" + ZoneExportDirectory + "/" + zoneRegion[0] + ".zone", ExportBuildDirectory + "/" + ZoneExportDirectory + "/" + zoneRegion[1] + ".zone", ExportBuildDirectory + "/" + ZoneDependBuildDirectory + "/doomy.depend" ])
-		else:
-			printLog(log, "DETECT DECIDE SKIP")
-			printLog(log, "SKIP *")
-	printLog(log, "")
-
-# For each zone directory
-#printLog(log, ">>> Build zone weld <<<")
-#if ZoneWelder == "":
-#	toolLogFail(log, ZoneWelderTool, ToolSuffix)
-#elif ExecTimeout == "":
-#	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-#else:
-#	mkPath(log, ExportBuildDirectory + "/" + ZoneExportDirectory)
-#	mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-#	files = findFiles(log, ExportBuildDirectory + "/" + ZoneExportDirectory, "", ".zone")
-#	for file in files:
-#		sourceFile = ExportBuildDirectory + "/" + ZoneExportDirectory + "/" + file
-#		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zone")] + ".zonew"
-#		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-#			subprocess.call([ ExecTimeout, str(ZoneBuildWeldTimeout), ZoneWelder, sourceFile, destFile ])
-#printLog(log, "")
-
-# For each zone directory
-printLog(log, ">>> Weld zone without heightmap <<<")
-if ZoneWelder == "":
-	toolLogFail(log, ZoneWelderTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	mkPath(log, ExportBuildDirectory + "/" + ZoneExportDirectory)
-	mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-	files = findFiles(log, ExportBuildDirectory + "/" + ZoneExportDirectory, "", ".zonenh")
-	for file in files:
-		sourceFile = ExportBuildDirectory + "/" + ZoneExportDirectory + "/" + file
-		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenh")] + ".zonenhw"
-		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-			subprocess.call([ ExecTimeout, str(ZoneBuildWeldTimeout), ZoneWelder, sourceFile, destFile ])
-printLog(log, "")
-
-printLog(log, ">>> Apply zone heightmap to welded zone <<<")
-if ZoneElevation == "":
-	toolLogFail(log, ZoneElevationTool, ToolSuffix)
-else:
-	mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-	mkPath(log, DatabaseDirectory + "/" + LigoBaseSourceDirectory);
-	land = DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportLand
-	heightMap1 = DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap1
-	heightMap2 = DatabaseDirectory + "/" + LigoBaseSourceDirectory + "/" + LigoExportHeightmap2
-	files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonenhw")
-	for file in files:
-		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
-		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zone"
-		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-			command = [ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ]
-			if LigoExportExtendCoords != 0:
-				command.append("--extendcoords")
-			callParallelProcess(command)
-	flushParallelProcesses()
-printLog(log, "")
-
-printLog(log, ">>> Re-weld zone with heightmap <<<")
-if ZoneWelder == "":
-	toolLogFail(log, ZoneWelderTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogFail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
-	files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zone")
-	for file in files:
-		sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
-		destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zone")] + ".zonew"
-		if needUpdateLogRemoveDest(log, sourceFile, destFile):
-			subprocess.call([ ExecTimeout, str(ZoneBuildWeldTimeout), ZoneWelder, sourceFile, destFile ])
-printLog(log, "")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/processes/zone_light/2_build.py b/code/nel/tools/build_gamedata/processes/zone_light/2_build.py
deleted file mode 100644
index 6d08f81d4..000000000
--- a/code/nel/tools/build_gamedata/processes/zone_light/2_build.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build zone_light
-# \date 2009-03-11-13-45-GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build zone_light
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../../configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build zone_light")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-ZoneLighter = findTool(log, ToolDirectories, ZoneLighterTool, ToolSuffix)
-ZoneIgLighter = findTool(log, ToolDirectories, ZoneIgLighterTool, ToolSuffix)
-printLog(log, "")
-
-# For each zone_light directory
-printLog(log, ">>> Build zone_light <<<")
-if ZoneLighter == "":
-	toolLogFail(log, ZoneLighterTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogfail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	srcDir = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory
-	mkPath(log, srcDir)
-	destDir = ExportBuildDirectory + "/" + ZoneLightBuildDirectory
-	mkPath(log, destDir)
-	dependDir = ExportBuildDirectory + "/" + ZoneDependBuildDirectory
-	mkPath(log, dependDir)
-	files = findFiles(log, srcDir, "", ".zonew")
-	for file in files:
-		srcFile = srcDir + "/" + file
-		destFile = destDir + "/" + file[0:-len(".zonew")] + ".zonel"
-		if (needUpdateLogRemoveDest(log, srcFile, destFile)):
-			dependFile = dependDir + "/" + file[0:-len(".zonew")] + ".depend"
-			callParallelProcess([ ExecTimeout, str(ZoneLightBuildTimeout), ZoneLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
-	flushParallelProcesses()
-printLog(log, "")
-
-# For each zone_light ig
-printLog(log, ">>> Build zone_light ig <<<")
-if ZoneIgLighter == "":
-	toolLogFail(log,  ZoneIgLighterTool, ToolSuffix)
-elif ExecTimeout == "":
-	toolLogfail(log, ExecTimeoutTool, ToolSuffix)
-else:
-	srcDir = ExportBuildDirectory + "/" + ZoneLightBuildDirectory
-	mkPath(log, srcDir)
-	igsrcDir = ExportBuildDirectory + "/" + IgLandBuildDirectory
-	mkPath(log, igsrcDir)
-	destDir = ExportBuildDirectory + "/" + ZoneLightIgLandBuildDirectory
-	mkPath(log, destDir)
-	dependDir = ExportBuildDirectory + "/" + ZoneDependBuildDirectory
-	mkPath(log, dependDir)
-	files = findFiles(log, srcDir, "", ".zonel")
-	for file in files:
-		igsrcFile = igsrcDir + "/" + os.path.basename(file)[0:-len(".zonel")] + ".ig"
-		destFile = destDir + "/" + os.path.basename(file)[0:-len(".zonel")] + ".ig"
-		if (os.path.isfile(igsrcFile)):
-			if (needUpdateLogRemoveDest(log, igsrcFile, destFile)):
-				srcFile = srcDir + "/" + file
-				dependFile = dependDir + "/" + file[0:-len(".zonel")] + ".depend"
-				callParallelProcess([ ExecTimeout, str(ZoneIgLightBuildTimeout), ZoneIgLighter, srcFile, destFile, ActiveProjectDirectory + "/generated/properties.cfg", dependFile ])
-	flushParallelProcesses()
-printLog(log, "")
-
-log.close()
-
-
-# end of file
diff --git a/code/nel/tools/build_gamedata/translation/make_merge_all.py b/code/nel/tools/build_gamedata/translation/make_merge_all.py
deleted file mode 100644
index 91fc4712b..000000000
--- a/code/nel/tools/build_gamedata/translation/make_merge_all.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/python
-# 
-# \author Jan Boon (Kaetemi)
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../configuration")
-from scripts import *
-from buildsite import *
-from tools import *
-os.chdir(TranslationDirectory)
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Make and merge all translations")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-
-TranslationTools = findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
-try:
-	subprocess.call([ TranslationTools, "make_phrase_diff" ])
-	subprocess.call([ TranslationTools, "merge_phrase_diff" ])
-	subprocess.call([ TranslationTools, "make_clause_diff" ])
-	subprocess.call([ TranslationTools, "merge_clause_diff" ])
-	subprocess.call([ TranslationTools, "make_words_diff" ])
-	subprocess.call([ TranslationTools, "merge_words_diff" ])
-	subprocess.call([ TranslationTools, "make_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_string_diff" ])
-	subprocess.call([ TranslationTools, "clean_string_diff" ])
-	subprocess.call([ TranslationTools, "make_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "clean_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "clean_words_diff" ])
-	subprocess.call([ TranslationTools, "clean_clause_diff" ])
-	subprocess.call([ TranslationTools, "clean_phrase_diff" ])
-	subprocess.call([ TranslationTools, "make_worksheet_diff", "bot_names.txt" ])
-	subprocess.call([ TranslationTools, "merge_worksheet_diff", "bot_names.txt" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-log.close()
-if os.path.isfile("make_merge_all.log"):
-	os.remove("make_merge_all.log")
-shutil.copy("log.log", "make_merge_all_" + time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + ".log")
-shutil.move("log.log", "make_merge_all.log")
-
-raw_input("PRESS ANY KEY TO EXIT")
diff --git a/code/nel/tools/build_gamedata/translation/make_merge_wk.py b/code/nel/tools/build_gamedata/translation/make_merge_wk.py
deleted file mode 100644
index 43c1ac325..000000000
--- a/code/nel/tools/build_gamedata/translation/make_merge_wk.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/python
-# 
-# \author Jan Boon (Kaetemi)
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2014  by authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("../configuration")
-from scripts import *
-from buildsite import *
-from tools import *
-os.chdir(TranslationDirectory)
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Make, merge and clean work")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-
-TranslationTools = findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
-printLog(log, ">>> Override languages.txt <<<")
-if not os.path.isfile("make_merge_wk_languages.txt"):
-	shutil.move("languages.txt", "make_merge_wk_languages.txt")
-languagesTxt = open("languages.txt", "w")
-languagesTxt.write("wk\n")
-languagesTxt.close()
-
-
-printLog(log, ">>> Merge diff <<<") # This is necessary, because when we crop lines, we should only do this from untranslated files
-try:
-	subprocess.call([ TranslationTools, "merge_phrase_diff" ])
-	subprocess.call([ TranslationTools, "merge_clause_diff" ])
-	subprocess.call([ TranslationTools, "merge_words_diff" ])
-	subprocess.call([ TranslationTools, "merge_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_worksheet_diff", "bot_names.txt" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-printLog(log, ">>> Make diff <<<")
-try:
-	subprocess.call([ TranslationTools, "make_phrase_diff" ])
-	subprocess.call([ TranslationTools, "make_clause_diff" ])
-	subprocess.call([ TranslationTools, "make_words_diff" ])
-	subprocess.call([ TranslationTools, "make_string_diff" ])
-	subprocess.call([ TranslationTools, "make_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "make_worksheet_diff", "bot_names.txt" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-
-
-printLog(log, ">>> Mark diffs as translated <<<")
-diffFiles = os.listdir("diff")
-for diffFile in diffFiles:
-	if "wk_diff_" in diffFile:
-		printLog(log, "DIFF " + "diff/" + diffFile)
-		subprocess.call([ TranslationTools, "crop_lines", "diff/" + diffFile, "3" ])
-
-#printLog(log, ">>> Clean diff <<<")
-#try:
-#	subprocess.call([ TranslationTools, "clean_string_diff" ])
-#	subprocess.call([ TranslationTools, "clean_phrase_diff" ])
-#	subprocess.call([ TranslationTools, "clean_clause_diff" ])
-#	subprocess.call([ TranslationTools, "clean_words_diff" ])
-#except Exception, e:
-#	printLog(log, "<" + processName + "> " + str(e))
-#printLog(log, "")
-
-printLog(log, ">>> Merge diff <<<")
-try:
-	subprocess.call([ TranslationTools, "merge_phrase_diff" ])
-	subprocess.call([ TranslationTools, "merge_clause_diff" ])
-	subprocess.call([ TranslationTools, "merge_words_diff" ])
-	subprocess.call([ TranslationTools, "merge_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_r2_string_diff" ])
-	subprocess.call([ TranslationTools, "merge_worksheet_diff", "bot_names.txt" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-printLog(log, ">>> Restore languages.txt <<<")
-os.remove("languages.txt")
-shutil.move("make_merge_wk_languages.txt", "languages.txt")
-
-
-log.close()
-if os.path.isfile("make_merge_wk.log"):
-	os.remove("make_merge_wk.log")
-shutil.copy("log.log", "make_merge_wk_" + time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + ".log")
-shutil.move("log.log", "make_merge_wk.log")
-
-raw_input("PRESS ANY KEY TO EXIT")
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
deleted file mode 100644
index 045aba4e4..000000000
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ /dev/null
@@ -1,3072 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This source file has been modified by the following contributors:
-// Copyright (C) 2012  Matt RAYKOWSKI (sfb) <matt.raykowski@gmail.com>
-// Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-
-#include "stdpch.h"
-
-#include "game_share/trade_slot_type.h"
-#include "game_share/skills.h"
-#include "game_share/bot_chat_types.h"
-#include "game_share/msg_ais_egs_gen.h"
-#include "../client_sheets/item_sheet.h"
-#include "../client_sheets/outpost_building_sheet.h"
-//
-#include "bot_chat_page_trade.h"
-#include "interface_manager.h"
-#include "nel/gui/interface_group.h"
-#include "inventory_manager.h"
-#include "../net_manager.h"
-#include "nel/gui/action_handler.h"
-#include "bot_chat_page_all.h"
-#include "bot_chat_manager.h"
-#include "dbctrl_sheet.h"
-#include "nel/gui/group_editbox.h"
-#include "nel/gui/group_tab.h"
-#include "nel/gui/group_container.h"
-#include "action_handler_help.h"
-#include "../string_manager_client.h"
-#include "nel/gui/group_container.h"
-#include "dbgroup_list_sheet_text.h"
-#include "nel/gui/ctrl_text_button.h"
-#include "../client_cfg.h"
-#include "../init_main_loop.h"
-#include "guild_manager.h"
-#include "../sheet_manager.h"
-#include "../user_entity.h"
-#include "nel/gui/view_bitmap.h"
-#include "nel/misc/common.h"
-
-using namespace std::rel_ops;
-
-
-using namespace std;
-using namespace NLMISC;
-
-static const char *WIN_BOT_CHAT_PAGE_TRADE = "ui:interface:bot_chat_trade";
-static const char *WIN_BOT_CHAT_PAGE_BUY   = "ui:interface:bot_chat_buy";
-static const char *WIN_BOT_CHAT_SELL_BUY_ITEM = "ui:interface:bot_chat_buy_sell_item";
-static const char *WIN_BOT_CHAT_CHANGE_BUY_FILTER = "ui:interface:bot_chat_change_buy_filter";
-static const char *WIN_BOT_CHAT_CHANGE_BUY_FILTER_MP = "ui:interface:bot_chat_change_buy_filter_mp";
-static const char *WIN_BOT_CHAT_CHANGE_BUY_FILTER_CLASS = "ui:interface:bot_chat_change_buy_filter_class";
-static const char *WIN_BOT_CHAT_CHANGE_BUY_FILTER_ITEM_TYPE = "ui:interface:bot_chat_change_buy_filter_item_type";
-static const char *WIN_BOT_CHAT_DESTROY_ITEM = "ui:interface:bot_chat_destroy_confirm_modal";
-
-
-#define DB_BOT_CHAT_BASE_BUY_FILTER "UI:SAVE:BOTCHAT_FILTER"
-
-
-// fill the help setup infos for the trade modal
-static void fillHelpSetupInfosForTrade(CSheetHelpSetup &dest, CDBCtrlSheet *sheet, CInterfaceGroup *helpGroup)
-{
-	dest.HelpWindow = helpGroup;
-	dest.SrcSheet = sheet;
-	dest.DestSheet = dynamic_cast<CDBCtrlSheet *>(helpGroup->getCtrl("buy_sell_slot"));
-	dest.ViewText = "help_text";
-	dest.ScrollTextGroup = "scroll_text";
-	dest.PrefixForExtra= ":header_opened:scroll_text:text_list:";
-	dest.FromBotChat= true;
-
-	// hide some interface elements by default
-	resetSheetHelp(dest);
-}
-
-
-/** Listener to update items infos in the buy / sell dlg
-  */
-class	CInfoWindow : public IItemInfoWaiter
-{
-public:
-	// the sheet for which help must be updated
-	CDBCtrlSheet *Sheet;
-public:
-	virtual void	infoReceived()
-	{
-		CSheetHelpSetup helpSetup;
-		CInterfaceManager *im = CInterfaceManager::getInstance();
-		CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-		fillHelpSetupInfosForTrade(helpSetup, Sheet, ig);
-		refreshItemHelp(helpSetup);
-	}
-};
-static CInfoWindow InfoWindowUpdater;
-
-
-// ***************************************************************************
-void		CBotChatPageTrade::CItemCheck::reset()
-{
-	_SheetId= 0;
-	_Quality= 0;
-	_Quantity= 0;
-	_Price= 0;
-	_ResaleFlag= 0;
-}
-void		CBotChatPageTrade::CItemCheck::init(CDBCtrlSheet *ctrl)
-{
-	nlassert(ctrl);
-	_SheetId= ctrl->getSheetId();
-	_Quality= ctrl->getQuality();
-	_Quantity= ctrl->getQuantity();
-	_Price= ctrl->getItemPrice();
-	_ResaleFlag= ctrl->getItemResaleFlag();
-}
-bool		CBotChatPageTrade::CItemCheck::test(CDBCtrlSheet *ctrl) const
-{
-	nlassert(ctrl);
-	return
-		_SheetId== ctrl->getSheetId() &&
-		_Quality== ctrl->getQuality() &&
-		_Quantity== ctrl->getQuantity() &&
-		_Price== ctrl->getItemPrice() &&
-		_ResaleFlag== ctrl->getItemResaleFlag();
-}
-
-
-// *******************************************************************************************
-CBotChatPageTrade::CBotChatPageTrade()
-{
-	_TradePagesObs.setListType(CHugeListObs::Trading);
-	_BuyDlgOn = false;
-	_SellDlgOn = false;
-	_ResaleEdit = false;
-	_QuantityEdit = false;
-	_UsePriceRetire = false;
-	_CannotValidateBecauseRetireNotAvailable = false;
-	_QuantityCheck = 0;
-	_CurrItemIndex = 0;
-	_BuyOnly = false;
-	_CurrItemSheet = NULL;
-	_BuyMean = Money;
-	_FamePriceFactorLeaf = NULL;
-	_FilterBuyDlgMaxValue= 0;
-	_DownloadComplete = false;
-}
-
-// *******************************************************************************************
-void CBotChatPageTrade::init()
-{
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	if (NLGUI::CDBManager::getInstance()->getDbBranch("SERVER:TRADING"))
-	{
-		NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:TRADING", &_TradePagesObs);
-	}
-
-	_FamePriceFactorLeaf = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:FAME_PRICE_FACTOR");
-}
-
-// *******************************************************************************************
-void	CBotChatPageTrade::invalidateCoords()
-{
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
-	if (!gc) return;
-	// invalidate buy group
-	gc->invalidateCoords();
-}
-
-// *******************************************************************************************
-void CBotChatPageTrade::begin()
-{
-	CBotChatPage::begin();
-	if (!_BuyOnly)
-	{
-		activateWindow(WIN_BOT_CHAT_PAGE_TRADE, true);
-	}
-	else
-	{
-		activateWindow(WIN_BOT_CHAT_PAGE_BUY, true);
-	}
-	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	NLGUI::CDBManager::getInstance()->getDbProp(BOT_CHAT_BASE_DB_PATH ":TRADE")->setValue32(0);
-
-	// at each new bot chat trade, we must reset filter for ItemPart and ItemType (NB: server should do the same)
-	resetItemPartAndTypeFilters();
-
-	// reset also the filters at each open if user wants to
-	CCDBNodeLeaf	*dbResetFilterOnOpen= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":RESET_ON_OPEN" , false);
-	if(dbResetFilterOnOpen && dbResetFilterOnOpen->getValueBool() && (_BuyMean == Money) )
-	{
-		// temporary value for conversions
-		sint32 value;
-
-		// Reset Price
-		CCDBNodeLeaf	*dbPriceMin= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_PRICE") , false);
-		CCDBNodeLeaf	*dbPriceMax= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_PRICE") , false);
-		if(dbPriceMin)	dbPriceMin->setValue32(0);
-		if(dbPriceMax)
-		{
-			fromString(CWidgetManager::getInstance()->getParser()->getDefine("bot_chat_filter_max_price"), value);
-			dbPriceMax->setValue32(value);
-		}
-
-		// Reset Quality
-		CCDBNodeLeaf	*dbQualityMin= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_QUALITY") , false);
-		CCDBNodeLeaf	*dbQualityMax= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_QUALITY") , false);
-		if(dbQualityMin)	dbQualityMin->setValue32(0);
-		if(dbQualityMax)
-		{
-			fromString(CWidgetManager::getInstance()->getParser()->getDefine("bot_chat_filter_max_quality"), value);
-			dbQualityMax->setValue32(value);
-		}
-
-		// Reset Class
-		CCDBNodeLeaf	*dbClassMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_CLASS" , false);
-		CCDBNodeLeaf	*dbClassMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_CLASS" , false);
-		if(dbClassMin) dbClassMin->setValue32(0);
-		if(dbClassMax) dbClassMax->setValue32(RM_CLASS_TYPE::NumTRMClassType-1);
-
-		// send the filter, but don't reset the list, since will do just after :)
-		sendCurrentBuyFilterToServer(false);
-	}
-
-
-	// Start the HugeList
-	_TradePagesObs.start();
-	// If BuyMean is skillpoints, means its phrase selling => allow phrase price update (and possible client fill)
-	_TradePagesObs.allowPhrasePriceUpdateAndClientFill(_BuyMean == SkillPoints);
-	notifyDownloadComplete(false);
-	_DownloadComplete = false;
-
-	// update interface
-	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
-	if (gc)
-	{
-		// set the title
-		gc->setUCTitle(_Title);
-		// show the buy mean
-		CInterfaceGroup *money = dynamic_cast<CInterfaceGroup *>(gc->getGroup("money"));
-		if (money) money->setActive((_BuyMean == Money) || (_BuyMean == MoneyFactionPoints));
-		CInterfaceGroup *factionPoints = dynamic_cast<CInterfaceGroup *>(gc->getGroup("fp"));
-		if (factionPoints) factionPoints->setActive(_BuyMean == MoneyFactionPoints);
-		CInterfaceGroup *skillPoints = dynamic_cast<CInterfaceGroup *>(gc->getGroup("sp"));
-		if (skillPoints) skillPoints->setActive(_BuyMean == SkillPoints);
-		CInterfaceGroup *pMoneyGuildXP = dynamic_cast<CInterfaceGroup *>(gc->getGroup("money_guild_xp"));
-		if (pMoneyGuildXP) pMoneyGuildXP->setActive((_BuyMean == MoneyGuildXP)||(_BuyMean == GuildXP));
-		CInterfaceGroup *pMoney = dynamic_cast<CInterfaceGroup *>(gc->getGroup("money_guild_xp:money"));
-		if (pMoney) pMoney->setActive(_BuyMean == MoneyGuildXP);
-
-		CInterfaceGroup *pGuildMoneyGuildXP = dynamic_cast<CInterfaceGroup *>(gc->getGroup("guild_money_guild_xp"));
-		if (pGuildMoneyGuildXP) pGuildMoneyGuildXP->setActive((_BuyMean == GuildMoneyGuildXP) || (_BuyMean == GuildMoney));
-		CViewText *pGuildXPText = dynamic_cast<CViewText*>(gc->getView("guild_money_guild_xp:xp_text"));
-		if (pGuildXPText) pGuildXPText->setActive(_BuyMean == GuildMoneyGuildXP);
-		CViewText *pGuildXPValue = dynamic_cast<CViewText*>(gc->getView("guild_money_guild_xp:xp_value"));
-		if (pGuildXPValue) pGuildXPValue->setActive(_BuyMean == GuildMoneyGuildXP);
-
-		CViewText *pBuyTitle = dynamic_cast<CViewText*>(gc->getView("buy_title"));
-		if (pBuyTitle)
-		{
-			if(_BuyMean == Money)
-				pBuyTitle->setHardText("uiBuyFrom");
-			else if(_BuyMean == SkillPoints)
-				pBuyTitle->setHardText("uiLearnFrom");
-			// MoneyAndFactionPoints, MoneyGuildXP or GuildXP
-			else
-				pBuyTitle->setHardText("uiBuyFrom");
-		}
-
-		// show/hide skill Tabs
-		CGroupTab *pTab = dynamic_cast<CGroupTab*>(gc->getGroup("buy_filter:tab"));
-		if ( pTab )
-		{
-			bool activeSkillTabs = (_BuyMean == SkillPoints);
-			pTab->setActive(activeSkillTabs);
-		}
-
-		// unselect any list
-		unselectBuyList(gc);
-		if (!_BuyOnly)
-			unselectSellList(gc);
-	}
-
-}
-
-// *****************************************************************************************
-void CBotChatPageTrade::end()
-{
-	activateWindow(WIN_BOT_CHAT_PAGE_TRADE, false);
-	activateWindow(WIN_BOT_CHAT_PAGE_BUY, false);
-	endTradeModal();
-
-	// Important to avoid update of the remaining phrase in the DB.
-	_TradePagesObs.allowPhrasePriceUpdateAndClientFill(false);
-}
-
-// *****************************************************************************************
-void CBotChatPageTrade::update()
-{
-	updateTradeModal();
-}
-
-
-// ***************************************************************************************
-uint32 CBotChatPageTrade::getCurrItemQuantity() const
-{
-	if (!_CurrItemSheet) return std::numeric_limits<uint32>::max();
-	if(!_QuantityEdit) return 1;
-	if (_CurrItemSheet->getType() == CCtrlSheetInfo::SheetType_Item)
-	{
-		const CItemSheet *itemSheet = _CurrItemSheet->asItemSheet();
-		if (itemSheet && itemSheet->Family != ITEMFAMILY::TELEPORT &&
-			itemSheet->Family != ITEMFAMILY::GUILD_OPTION)
-		{
-			CInterfaceManager *im = CInterfaceManager::getInstance();
-			CInterfaceGroup *ig = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-			if (!ig) return std::numeric_limits<uint32>::max();
-			// TODO: edit box in faction points?
-			CGroupEditBox *ed = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:standard_price:quantity:edit:eb"));
-			if (!ed) return std::numeric_limits<uint32>::max();
-			uint32 intQuantity;
-			if (fromString(ed->getInputString().toString(), intQuantity))
-			{
-				return intQuantity;
-			}
-			else
-			{
-				return std::numeric_limits<uint32>::max();
-			}
-		}
-		else
-		{
-			return 1;
-		}
-		return std::numeric_limits<uint32>::max();
-	}
-	return 1;
-}
-
-// ***************************************************************************************
-uint32 CBotChatPageTrade::getCurrItemPriceResale() const
-{
-	if (!_CurrItemSheet) return 0;
-	if (!_ResaleEdit) return 0;
-	if (_CurrItemSheet->getType() == CCtrlSheetInfo::SheetType_Item)
-	{
-//		const CItemSheet *itemSheet = _CurrItemSheet->asItemSheet();
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		// get the edited resale price
-		CInterfaceGroup *ig = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-		if (!ig) return 0;
-		CGroupEditBox *resaleMarginBox = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:resell_group:can_resell:choose_resell:edit:eb"));
-		if (!resaleMarginBox) return 0;
-
-		// Calculate the resale price from the resale margin
-		uint32 margin = (uint32)resaleMarginBox->getInputStringAsInt();
-		// temp uint64 because we add case where basePrice= 50000, and margin= 99999% => 50000*99999 > 4gig
-		uint64 basePrice = getCurrItemPrice(false);	// base Price without fame margin
-		return uint32(basePrice + basePrice * margin / 100);
-	}
-
-	return 0;
-}
-
-
-// ***************************************************************************************
-uint64 CBotChatPageTrade::getCurrItemPrice(bool mulByFame) const
-{
-	if (!_CurrItemSheet) return std::numeric_limits<uint64>::max();
-	if (_BuyDlgOn && (_BuyMean == MoneyGuildXP || _BuyMean == GuildMoneyGuildXP || _BuyMean == GuildMoney) )
-	{
-		if (_BuyMean == MoneyGuildXP)
-		{
-			// get the price from the sheet
-			const CItemSheet *pIS = _CurrItemSheet->asItemSheet();
-			if (pIS != NULL)
-			{
-				if (pIS->Family == ITEMFAMILY::GUILD_OPTION)
-					return pIS->GuildOption.MoneyCost;
-			}
-		}
-		if ((_BuyMean == GuildMoneyGuildXP) || (_BuyMean == GuildMoney))
-		{
-			// This is perhaps an outpost building
-			const COutpostBuildingSheet *pOB = _CurrItemSheet->asOutpostBuildingSheet();
-			if (pOB != NULL)
-				return pOB->CostDapper;
-		}
-	}
-	else
-	{
-		// for item to buy/sell, price has been received in the db
-		if (_CurrItemSheet->getRootBranch())
-		{
-			// for item to buy/sell, price has already been stored in the database
-			ICDBNode *node;
-			// take the PRICE_RETIRE if buying an item which actually belongs to the user
-			if(_UsePriceRetire)
-				node= _CurrItemSheet->getRootBranch()->getNode(ICDBNode::CTextId("PRICE_RETIRE"), false);
-			else
-				node= _CurrItemSheet->getRootBranch()->getNode(ICDBNode::CTextId("PRICE"), false);
-			CCDBNodeLeaf *priceLeaf = dynamic_cast<CCDBNodeLeaf *>(node);
-			if (priceLeaf)
-			{
-				uint64 price = (uint64) priceLeaf->getValue32();
-				if (_BuyDlgOn || !mulByFame)
-					return price;
-				else
-					return (uint64)(price * _FamePriceFactorLeaf->getValue16()/10000.0f);
-			}
-		}
-	}
-	return std::numeric_limits<uint64>::max();
-}
-
-// ***************************************************************************************
-uint64 CBotChatPageTrade::getCurrItemXP() const
-{
-	if (_BuyMean == MoneyGuildXP)
-	{
-		// get the cp from the sheet
-		const CItemSheet *pIS = _CurrItemSheet->asItemSheet();
-		if (pIS != NULL)
-		{
-			if (pIS->Family == ITEMFAMILY::GUILD_OPTION)
-				return pIS->GuildOption.XPCost;
-		}
-	}
-	if ((_BuyMean == GuildMoneyGuildXP) || (_BuyMean == GuildMoney))
-	{
-		return 0; // By now no need for XP even if xp guild required
-	}
-
-	return std::numeric_limits<uint64>::max();
-}
-
-
-// ***************************************************************************
-void	CBotChatPageTrade::getItemFactionTypePoints(CDBCtrlSheet *sheet, PVP_CLAN::TPVPClan &pvpClan, uint32 &points) const
-{
-	pvpClan= PVP_CLAN::None;
-	points= 0;
-
-	// Bad setup => abort
-	if ((_BuyMean != MoneyFactionPoints) ||	(sheet == NULL))
-		return;
-
-	//CCDBNodeLeaf *currencyLeaf = dynamic_cast<CCDBNodeLeaf *>(sheet->getRootBranch()->getNode(ICDBNode::CTextId("CURRENCY"), false));
-	//if (currencyLeaf == NULL)
-	//	return;
-
-	//RYMSG::TTradeCurrency currency((RYMSG::TTradeCurrency::TValues) currencyLeaf->getValue32());
-	//if (currency != RYMSG::TTradeCurrency::tc_faction_points)
-	//	return;
-
-	// bad DB => abort
-	CCDBNodeLeaf *ftLeaf = dynamic_cast<CCDBNodeLeaf *>(sheet->getRootBranch()->getNode(ICDBNode::CTextId("FACTION_TYPE"), false));
-	CCDBNodeLeaf *fppLeaf = dynamic_cast<CCDBNodeLeaf *>(sheet->getRootBranch()->getNode(ICDBNode::CTextId("PRICE"), false));
-	if (ftLeaf == NULL || fppLeaf == NULL)
-		return;
-
-	// else copy
-	pvpClan= (PVP_CLAN::TPVPClan)ftLeaf->getValue32();
-	points= fppLeaf->getValue32();
-
-	// if only one is disabled, consider full disabled
-	if(pvpClan==PVP_CLAN::None || points==0)
-	{
-		pvpClan= PVP_CLAN::None;
-		points= 0;
-	}
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::getCurrItemFactionTypePoints(PVP_CLAN::TPVPClan &pvpClan, uint32 &points) const
-{
-	getItemFactionTypePoints(_CurrItemSheet, pvpClan, points);
-}
-
-// ***************************************************************************
-uint32 CBotChatPageTrade::getUserFactionPoints(PVP_CLAN::TPVPClan clan) const
-{
-	if ((clan < PVP_CLAN::BeginClans) || (clan > PVP_CLAN::EndClans))
-		return 0;
-
-	uint32 nClan = clan - PVP_CLAN::BeginClans;
-	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	CCDBNodeLeaf *pLeaf = NLGUI::CDBManager::getInstance()->getDbProp(toString("LOCAL:USER:FACTION_POINTS_%d:VALUE", nClan), false);
-	if (pLeaf == NULL)
-		return 0;
-
-	return pLeaf->getValue32();
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::notifyDownloadComplete(bool completed)
-{
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
-	if (!gc) return;
-	class CDBListVisitor : public CInterfaceElementVisitor
-	{
-	public:
-		bool DownloadComplete;
-		virtual void visitGroup(CInterfaceGroup *group)
-		{
-			CDBGroupListSheetText *dbGroup = dynamic_cast<CDBGroupListSheetText *>(group);
-			if (dbGroup)
-			{
-				dbGroup->notifyDownloadComplete(DownloadComplete);
-			}
-		}
-	};
-	CDBListVisitor visitor;
-	visitor.DownloadComplete = completed;
-	gc->visit(&visitor);
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::updateTradeModal()
-{
-	// if loading is finished, then signal it to all sheet list, so they can display an help message if they
-	// are empty
-	if (_DownloadComplete != _TradePagesObs.isDownloadComplete())
-	{
-		notifyDownloadComplete(true);
-		_DownloadComplete = _TradePagesObs.isDownloadComplete();
-	}
-
-	if(_CurrItemSheet)
-	{
-		// update buy dialog if it is currently shown
-		if (_BuyDlgOn || _SellDlgOn)
-		{
-			// check that curr item hasn't been modified (so that the index remains valid)
-			// this could happen if there was a db correction from the server
-			// in this case, the dialog is closed
-			if ( !_CurrItemCheck.test(_CurrItemSheet) )
-			{
-				endTradeModal();
-				return;
-			}
-			// get pointers on interface elements
-			CInterfaceManager *im = CInterfaceManager::getInstance();
-			CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-			CInterfaceGroup *confirmTradeGroup = ig->getGroup("confirm_trade");
-			CCtrlBase *confirmResellGroup = ig->getCtrl("confirm_trade_resell");
-			CInterfaceGroup *cantTradeGroup = ig->getGroup("cant_trade");
-			CInterfaceGroup *destroyTradeGroup = ig->getGroup("destroy_trade");
-
-			CCtrlTextButton *cantTradeButton =  dynamic_cast<CCtrlTextButton*>(ig->getCtrl("cant_trade_button"));
-
-			// **** update destroy options
-			// if the item belongs to the user, can always destroy it from the resale
-			destroyTradeGroup->setActive(_UsePriceRetire);
-
-			// **** update confirmation
-			// update price from quantity is the object is an item and not a teleport
-			uint32 quantity = getCurrItemQuantity();
-			// get price (without fame)
-			uint64 priceWithoutFame = getCurrItemPrice(false);
-			// get price (with fame)
-			uint64 priceWithFame = getCurrItemPrice(true);
-			// update resale price from quantity
-			uint32	resalePrice = getCurrItemPriceResale();
-
-			// get faction points and type from current item
-			PVP_CLAN::TPVPClan	fpType;
-			uint32				fpCost;
-			getCurrItemFactionTypePoints(fpType, fpCost);
-			uint32 userFactionPoints = getUserFactionPoints(fpType);
-
-			// Special case for guild options
-			if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoney) || (_BuyMean == GuildMoneyGuildXP))
-			{
-				uint64 totalPrice = (uint64) priceWithoutFame * (uint64) quantity;
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE")->setValue64(totalPrice);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_WITH_FAME")->setValue64(totalPrice);
-				uint64 totalXP = (uint64) getCurrItemXP() * (uint64) quantity;
-				CGuildManager *pGM = CGuildManager::getInstance();
-
-				uint64 moneyOwned = (_BuyMean == MoneyGuildXP)?getInventory().getMoney():pGM->getMoney();
-				if (totalPrice > moneyOwned)
-				{
-					if (confirmTradeGroup)	confirmTradeGroup->setActive(false);
-					if (cantTradeGroup)		cantTradeGroup->setActive(true);
-					if (_BuyMean == MoneyGuildXP)
-					{
-						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
-					}
-					else
-					{
-						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildMoney"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildMoney"));
-					}
-					return;
-				}
-				if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoneyGuildXP))
-				{
-					if (totalXP > pGM->getXP())
-					{
-						if (confirmTradeGroup)	confirmTradeGroup->setActive(false);
-						if (cantTradeGroup)		cantTradeGroup->setActive(true);
-						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
-						return;
-					}
-				}
-
-				if (confirmTradeGroup) confirmTradeGroup->setActive(true);
-				if (cantTradeGroup) cantTradeGroup->setActive(false);
-
-				return;
-			}
-
-
-			// if price/quantity is valid
-			bool	validSetup= priceWithoutFame != std::numeric_limits<uint64>::max() && quantity != std::numeric_limits<uint32>::max() && quantity != 0;
-			if(validSetup && _BuyMean==MoneyFactionPoints)
-			{
-				// valid if at least one price type is not 0
-				validSetup= priceWithoutFame!=0 || fpCost!=0;
-			}
-			else if(validSetup && _BuyMean==SkillPoints)
-			{
-				// (nb: skillpoint==0 is a valid buy)
-				validSetup= true;
-			}
-			else if(validSetup)
-			{
-				// valid if price is not 0
-				validSetup= priceWithoutFame != 0;
-			}
-
-			// if the setup is finaly valid
-			if(	validSetup )
-			{
-				// basic price
-				uint64 totalPriceWithoutFame = (uint64) priceWithoutFame * (uint64) quantity;
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE")->setValue64(priceWithoutFame);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE")->setValue64(totalPriceWithoutFame);
-				// price with fame
-				uint64 totalPriceWithFame = (uint64) priceWithFame * (uint64) quantity;
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_WITH_FAME")->setValue64(priceWithFame);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_WITH_FAME")->setValue64(totalPriceWithFame);
-				// resale price
-				uint64 totalResalePrice = (uint64) resalePrice * (uint64) quantity;
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_RESALE")->setValue64(resalePrice);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_RESALE")->setValue64(totalResalePrice);
-				// quantity edit box
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:EDIT_QUANTITY")->setValue64(quantity);
-				// Faction Points
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_FACTION")->setValue64(fpCost);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_FACTION")->setValue64(fpCost*quantity);
-
-
-				// Special retire Check
-				bool	ok= true;
-				if(_CannotValidateBecauseRetireNotAvailable)
-				{
-					if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-					if (confirmResellGroup) confirmResellGroup->setActive(false);
-					if (cantTradeGroup) cantTradeGroup->setActive(true);
-					// can't sell more than what is in inventory
-					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBCNotAvailable"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBCNotAvailable"));
-					ok= false;
-				}
-
-				// Quantity Check (only if previous check passed)
-				if(ok && _QuantityCheck)
-				{
-					// check if not bad quantity edited
-					if ((sint32)quantity > _QuantityCheck)
-					{
-						if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-						if (confirmResellGroup) confirmResellGroup->setActive(false);
-						if (cantTradeGroup) cantTradeGroup->setActive(true);
-						// can't sell more than what is in inventory
-						if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-						if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
-						ok= false;
-					}
-				}
-
-				// test only if quantity check passed
-				if(ok)
-				{
-					// see if player has enough money
-					if (_BuyDlgOn)
-					{
-						if ((_BuyMean == Money) || (_BuyMean == MoneyFactionPoints))
-						{
-							if (totalPriceWithoutFame > getInventory().getMoney())
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-								if (cantTradeGroup) cantTradeGroup->setActive(true);
-								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughMoney"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughMoney"));
-							}
-							else if (_BuyMean == MoneyFactionPoints)
-							{
-								// Check if the player has enough faction point for the object selected
-								if ((confirmTradeGroup != NULL) && (cantTradeButton != NULL) && (cantTradeGroup != NULL))
-								{
-									if ((fpCost*quantity) > userFactionPoints)
-									{
-										confirmTradeGroup->setActive(false);
-										cantTradeGroup->setActive(true);
-										cantTradeButton->setText(CI18N::get("uiNotEnoughFP_"+PVP_CLAN::toString(fpType)));
-										cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughFP_"+PVP_CLAN::toString(fpType)));
-									}
-									else
-									{
-										confirmTradeGroup->setActive(true);
-										cantTradeGroup->setActive(false);
-									}
-								}
-							}
-							else
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(true);
-								if (cantTradeGroup) cantTradeGroup->setActive(false);
-							}
-						}
-						else if (_BuyMean == SkillPoints)
-						{
-							uint32 numSkillPoints = getSkillPointUsedForCurrentRoleMaster();
-							if (totalPriceWithoutFame > numSkillPoints)
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-								if (cantTradeGroup) cantTradeGroup->setActive(true);
-								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughSkillPoints"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughSkillPoints"));
-							}
-							else
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(true);
-								if (cantTradeGroup) cantTradeGroup->setActive(false);
-							}
-						}
-						else if (_BuyMean == GuildXP)
-						{
-							CGuildManager *pGM = CGuildManager::getInstance();
-							if (totalPriceWithoutFame > pGM->getXP())
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-								if (cantTradeGroup) cantTradeGroup->setActive(true);
-								if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiNotEnoughGuildXP"));
-								if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittNotEnoughGuildXP"));
-							}
-							else
-							{
-								if (confirmTradeGroup) confirmTradeGroup->setActive(true);
-								if (cantTradeGroup) cantTradeGroup->setActive(false);
-							}
-						}
-					}
-					else
-					{
-						// check ResalePrice
-						if(_ResaleEdit && resalePrice<priceWithoutFame)
-						{
-							if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-							if (confirmResellGroup) confirmResellGroup->setActive(false);
-							if (cantTradeGroup) cantTradeGroup->setActive(true);
-							// can't sell less than the basic price
-							if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadResalePrice"));
-							if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadResalePrice"));
-						}
-						// else ok, can resell
-						else
-						{
-							if (confirmTradeGroup) confirmTradeGroup->setActive(true);
-							if (_ResaleEdit && confirmResellGroup) confirmResellGroup->setActive(true);
-							if (cantTradeGroup) cantTradeGroup->setActive(false);
-						}
-					}
-				}
-			}
-			// else price is not valid
-			else
-			{
-				// set value in database
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_WITH_FAME")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_WITH_FAME")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_RESALE")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_RESALE")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:EDIT_QUANTITY")->setValue64(0);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_FACTION")->setValue64(-1);
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE_FACTION")->setValue64(-1);
-				// and update ok/cancel groups
-				if (confirmTradeGroup) confirmTradeGroup->setActive(false);
-				if (confirmResellGroup) confirmResellGroup->setActive(false);
-				if (cantTradeGroup) cantTradeGroup->setActive(true);
-				if (_SellDlgOn && priceWithoutFame == 0)
-				{
-					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiWontBuyThis"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittWontBuyThis"));
-				}
-				else if (_SellDlgOn && priceWithoutFame == std::numeric_limits<uint64>::max())
-				{
-					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiPriceNotReceived"));
-				}
-				else if (quantity == 0 || quantity == std::numeric_limits<uint32>::max())
-				{
-					if (cantTradeButton)	cantTradeButton->setText(CI18N::get("uiBadQuantity"));
-					if (cantTradeButton)	cantTradeButton->setDefaultContextHelp(CI18N::get("uittBadQuantity"));
-				}
-			}
-		}
-	}
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::setupBuyMeanInModal(CInterfaceGroup *modal)
-{
-	if (!modal) return;
-	CViewBase *equal = modal->getView("standard_price:total_price:equal");
-	CInterfaceGroup *money = modal->getGroup("standard_price:total_price:item_price");
-	CInterfaceGroup *skillPoints = modal->getGroup("standard_price:total_price:sp");
-	if (equal) equal->setActive(_BuyMean == Money);
-	if (money) money->setActive(_BuyMean == Money);
-	if (skillPoints) skillPoints->setActive(_BuyMean == SkillPoints);
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::startBuyDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCaller */)
-{
-	if (!sheet) return;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-	if (!ig) return;
-
-	// don't know why but in some case, the sheetId is 0
-	if(sheet->getSheetId()==0)
-		return;
-
-	bool isSPhrase = sheet->isSPhrase();
-	bool isItem = !isSPhrase;
-
-	// If this item is a User Item already sold (-1), cancel the RETIRE (in list only for information)
-	if( sheet->getType()==CCtrlSheetInfo::SheetType_Item &&
-		(sheet->getItemSellerType()==BOTCHATTYPE::User || sheet->getItemSellerType()==BOTCHATTYPE::UserRetirable ) &&
-		sheet->getItemPrice()==-1 )
-		return;
-
-	// Set price label
-	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
-	if ( _BuyMean == Money && priceLabel )
-	{
-		priceLabel->setText( CI18N::get( "uiPrice" ) );
-		priceLabel->setActive(true);
-	}
-	else
-		priceLabel->setActive( false );
-
-	// show quantity dialog if a correct item (only stackable items etc....)
-	uint	defaultQuantity= initQuantityMode(false, sheet);
-	setupPriceGroupQuantity(ig->getGroup("standard_price"), defaultQuantity);
-
-	// hide resell group, (cause its a buy)
-	setupResellGroup(false, defaultQuantity, ig, sheet);
-
-	// setup edit focus
-	setupEditFocus(ig);
-
-	// setup which price to use
-	setupPriceOrPriceRetire(false, sheet);
-
-	// setup faction point price group
-	setupFactionPointPrice(false, defaultQuantity, ig, sheet);
-
-	// set confirm button text
-	CCtrlTextButton *confirmButton =  dynamic_cast<CCtrlTextButton*>(ig->getCtrl("ok"));
-	if (confirmButton)
-	{
-		confirmButton->setActive( true );
-		// no need any context help because too simple
-		confirmButton->setDefaultContextHelp(ucstring());
-		if(isItem)
-		{
-			CItemSheet * itemSheet = dynamic_cast<CItemSheet*> ( SheetMngr.get( CSheetId( sheet->getSheetId() ) ) );
-			if ( itemSheet && itemSheet->Family == ITEMFAMILY::COSMETIC )
-			{
-				EGSPD::CPeople::TPeople people = ITEM_ORIGIN::itemOriginStringToPeopleEnum( ITEM_ORIGIN::enumToString( itemSheet->ItemOrigin ) );
-				if ( UserEntity->getGender() != itemSheet->Cosmetic.Gender || UserEntity->people() != people )
-					confirmButton->setActive( false );
-				else
-					confirmButton->setText(CI18N::get(_UsePriceRetire?"uiRetire":"uiBuy"));
-			}
-			else
-				confirmButton->setText(CI18N::get(_UsePriceRetire?"uiRetire":"uiBuy"));
-		}
-		else
-			confirmButton->setText(CI18N::get("uiLearn"));
-	}
-
-	// Hide direct sell button
-	CCtrlBase *resellButton = ig->getCtrl("confirm_trade_resell");
-	if ( resellButton )
-		resellButton->setActive(false);
-
-	// set help for item
-	CSheetHelpSetup helpSetup;
-	fillHelpSetupInfosForTrade(helpSetup, sheet, ig);
-	setupSheetHelp(helpSetup);
-	//
-	ig->setActive(true);
-	ig->updateCoords();
-	ig->center();
-	ig->setModalParentList(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE);
-	CWidgetManager::getInstance()->setTopWindow(ig);
-	//
-	_CurrItemSheet = sheet;
-	_CurrItemIndex  = sheet->getIndexInDB();
-	_CurrItemCheck.init(_CurrItemSheet);
-	_BuyDlgOn = true;
-	NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:IS_SELL_DLG")->setValueBool( false );
-	// setup trade mean
-	setupBuyMeanInModal(ig);
-	// Add waiter to refresh items infos
-	InfoWindowUpdater.ItemSheet= _CurrItemSheet->getSheetId();
-	InfoWindowUpdater.ItemSlotId= getInventory().getItemSlotId(_CurrItemSheet);
-	InfoWindowUpdater.Sheet = _CurrItemSheet;
-	// Add the waiter only if really needed (not for raw materials)
-	const CItemSheet	*itemSheet= _CurrItemSheet->asItemSheet();
-	if(itemSheet && itemSheet->Family != ITEMFAMILY::RAW_MATERIAL )
-		getInventory().addItemInfoWaiter(&InfoWindowUpdater);
-}
-
-// ***************************************************************************
-void CBotChatPageTrade::updateSPhraseBuyDialog()
-{
-	if(!_CurrItemSheet)
-		return;
-
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-	if (!ig) return;
-
-	CSheetHelpSetup helpSetup;
-	fillHelpSetupInfosForTrade(helpSetup, _CurrItemSheet, ig);
-	setupSheetHelp(helpSetup);
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCaller */)
-{
-	nlassert(!_BuyOnly);
-	if (!sheet) return;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-	if (!ig) return;
-
-	// If this sheet is grayed cause of an "Animal Inventory unavailable" flag, quit
-	if (sheet->getItemBeastGrayed()) return;
-
-	// Set price label
-	CViewText *priceLabel = dynamic_cast<CViewText*>(ig->getView( "standard_price:total_price_header" ));
-	if ( priceLabel )
-	{
-		priceLabel->setText( CI18N::get( "uiImmediatePrice" ) );
-		priceLabel->setActive(true);
-	}
-
-	// show quantity dialog if a correct item (only stackable items etc....)
-	uint	defaultQuantity= initQuantityMode(true, sheet);
-	setupPriceGroupQuantity(ig->getGroup("standard_price"), defaultQuantity);
-
-	// Setup resell group, only if item (cause its a sell)
-	setupResellGroup(true, defaultQuantity, ig, sheet);
-
-	// setup edit focus
-	setupEditFocus(ig);
-
-	// setup which price to use
-	setupPriceOrPriceRetire(true, sheet);
-
-	// setup faction point price
-	setupFactionPointPrice(true, defaultQuantity, ig, sheet);
-
-	// set confirm button text
-	CCtrlTextButton *confirmButton =  dynamic_cast<CCtrlTextButton*>(ig->getCtrl("ok"));
-	if (confirmButton)
-	{
-		confirmButton->setActive( !sheet->getLockedByOwner() );
-		confirmButton->setText(CI18N::get("uiSellImmediately"));
-		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
-	}
-
-	// set item or skill name
-	CViewText *itemNameView = dynamic_cast<CViewText *>(ig->getView("object_name"));
-	if (itemNameView)
-	{
-		ucstring itemName;
-		itemName = sheet->getItemActualName();
-		itemNameView->setText(itemName);
-	}
-
-	// set help for item
-	CSheetHelpSetup helpSetup;
-	fillHelpSetupInfosForTrade(helpSetup, sheet, ig);
-	setupSheetHelp(helpSetup);
-	//
-	ig->setActive(true);
-	ig->updateCoords();
-	ig->center();
-	ig->setModalParentList(WIN_BOT_CHAT_PAGE_TRADE);
-	CWidgetManager::getInstance()->setTopWindow(ig);
-	//
-	_CurrItemSheet = sheet;
-	_CurrItemIndex  = sheet->getIndexInDB();
-	_CurrItemInventory = sheet->getInventoryIndex();
-	_CurrItemCheck.init(_CurrItemSheet);
-	_SellDlgOn = true;
-	NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:IS_SELL_DLG")->setValueBool( true );
-	updateTradeModal();
-	setupBuyMeanInModal(ig);
-	// Add waiter to refresh items infos
-	InfoWindowUpdater.ItemSheet= _CurrItemSheet->getSheetId();
-	InfoWindowUpdater.ItemSlotId= getInventory().getItemSlotId(_CurrItemSheet);
-	InfoWindowUpdater.Sheet = _CurrItemSheet;
-	// Add the waiter only if really needed (not for raw materials)
-	const CItemSheet	*itemSheet= _CurrItemSheet->asItemSheet();
-	if(itemSheet && itemSheet->Family != ITEMFAMILY::RAW_MATERIAL )
-		getInventory().addItemInfoWaiter(&InfoWindowUpdater);
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::endTradeModal()
-{
-	// do the cancel now (NB: will be recalled at close of the window....)
-	cancelTrade();
-
-	// hide the dialog
-	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	CGroupContainer *ig = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-	if (ig)	ig->setActive(false);
-
-	// Hide any confirmation dialog related to trade (important for building MessageBox confirmation)
-	std::string		vmbOnOk;
-	if(pIM->getCurrentValidMessageBoxOnOk(vmbOnOk))
-	{
-		if(vmbOnOk=="confirm_trade")
-			CWidgetManager::getInstance()->disableModalWindow();
-	}
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::setFocusOnEditBox(CInterfaceGroup *ebi)
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(ebi);
-	if (eb)
-	{
-		CWidgetManager::getInstance()->setCaptureKeyboard(eb);
-		eb->setSelectionAll();
-	}
-}
-
-// ***************************************************************************************
-bool CBotChatPageTrade::isTradeValid( bool enableResale ) const
-{
-	// If the Current Item has been canceled (eg: move out), then not valid!
-	if(!_CurrItemSheet)
-		return false;
-
-	uint32 quantity= getCurrItemQuantity();
-	uint64 priceWithoutFame = getCurrItemPrice(false);
-	sint32 resalePrice = getCurrItemPriceResale();
-
-	// Special case for guild options
-	if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoney) || (_BuyMean == GuildMoneyGuildXP))
-	{
-		uint64 totalPrice = (uint64) priceWithoutFame * (uint64) quantity;
-		uint64 totalXP = (uint64) getCurrItemXP() * (uint64) quantity;
-		CGuildManager *pGM = CGuildManager::getInstance();
-		uint64 moneyOwned = (_BuyMean == MoneyGuildXP)?getInventory().getMoney():pGM->getMoney();
-		if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoneyGuildXP))
-			return (totalPrice <= moneyOwned) && (totalXP <= pGM->getXP());
-		return (totalPrice <= moneyOwned);
-	}
-
-	// retrieve faction points
-	PVP_CLAN::TPVPClan	fpType;
-	uint32				fpCost;
-	getCurrItemFactionTypePoints(fpType, fpCost);
-
-	// if price/quantity is valid
-	bool	validSetup= priceWithoutFame != std::numeric_limits<uint64>::max() && quantity != std::numeric_limits<uint32>::max() && quantity != 0;
-	if(validSetup && _BuyMean==MoneyFactionPoints)
-	{
-		// valid if at least one price type is not 0
-		validSetup= priceWithoutFame!=0 || fpCost!=0;
-	}
-	else if(validSetup && _BuyMean==SkillPoints)
-	{
-		// (nb: skillpoint==0 is a valid buy)
-		validSetup= true;
-	}
-	else if(validSetup)
-	{
-		// valid if price is not 0
-		validSetup= priceWithoutFame != 0;
-	}
-
-	// if the setup is finaly valid
-	if(	validSetup )
-	{
-		// special retire check
-		if(_CannotValidateBecauseRetireNotAvailable)
-			return false;
-
-		// quantity check
-		if(_QuantityCheck)
-		{
-			if( (sint32)quantity > _QuantityCheck )
-				return false;
-		}
-
-		// Buy dlg
-		if (_BuyDlgOn)
-		{
-			uint64 totalPrice = (uint64) priceWithoutFame * (uint64) quantity;
-			if (_BuyMean == Money)
-			{
-				return totalPrice <= getInventory().getMoney();
-			}
-			if (_BuyMean == MoneyFactionPoints)
-			{
-				return ((totalPrice <= getInventory().getMoney()) &&
-						(quantity*fpCost <= getUserFactionPoints(fpType)));
-			}
-			else if (_BuyMean == SkillPoints)
-			{
-				uint32 numSkillPoints = getSkillPointUsedForCurrentRoleMaster();
-				return totalPrice <= numSkillPoints;
-			}
-			else if (_BuyMean == GuildXP)
-			{
-				CGuildManager *pGM = CGuildManager::getInstance();
-				return totalPrice <= pGM->getXP();
-			}
-		}
-		// Sell dlg
-		else
-		{
-			return (!_ResaleEdit || !enableResale || (sint32)priceWithoutFame <= resalePrice);
-		}
-	}
-	return false;
-}
-
-
-// ***************************************************************************************
-void CBotChatPageTrade::confirmTrade( bool enableResale )
-{
-	bool resaleEnabled = _SellDlgOn && enableResale;
-
-	if (!_CurrItemSheet)
-	{
-		endTradeModal();
-		return;
-	}
-	if (_BuyDlgOn || _SellDlgOn)
-	{
-		uint32	quantity = getCurrItemQuantity();
-		sint32	resalePrice = resaleEnabled ? getCurrItemPriceResale() : 0; // getCurrItemPriceResale() returns 0 is !_ResaleEdit
-		if (quantity != std::numeric_limits<uint32>::max())
-		{
-			uint16 u16Quantity = (uint16) quantity;
-			// The Item bought is a SPhrase ?
-			if(_CurrItemSheet->isSPhrase())
-			{
-				// cant sell phrase
-				if ( _SellDlgOn )
-					return;
-
-				// code in action_handler_phrase.cpp
-				extern	void	phraseBuyBotChat(CDBCtrlSheet *ctrl, uint8 index, bool useBuySheetMsg);
-				// client Side fill Mode? => use PHRASE:BUY_SHEET
-				phraseBuyBotChat(_CurrItemSheet, (uint8) _CurrItemIndex, _TradePagesObs.isPhraseClientFill());
-
-				// lower the SkillPoints available.
-				sint32 price = (sint32)getCurrItemPrice(false);
-				sint32 totalPrice= quantity * price;
-				addSkillPointForCurrentRoleMaster(-totalPrice);
-
-				// hide the phrase
-				_CurrItemSheet->setSheetId(0);
-			}
-			// Else standard buy.
-			else
-			{
-				if (_BuyDlgOn)
-				{
-					NLMISC::CBitMemStream out;
-
-					if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoney) || ((_BuyMean == GuildMoneyGuildXP)))
-					{
-						const char	*msg="BOTCHAT:BUY_GUILD_OPTION";
-						if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-						{
-							uint8 u8Index    = (uint) _CurrItemIndex;
-							out.serial(u8Index);
-							NetMngr.push(out);
-							//nlinfo("impulseCallBack sent: %s %d", msg, u8Index);
-						}
-						else
-							nlwarning(" unknown message name '%s'", msg);
-					}
-					else
-					{
-						// bug #212: Server should check if player has enough room in his inventory
-						// before removing items in trade window
-						// Temp fix on client side : check room in player's bag before removing items
-
-						// Get inventory manager instance
-						CInventoryManager *pInv = CInventoryManager::getInstance();
-
-						// Check if player has enough space in his bag
-						bool isSpaceInBag = pInv->isSpaceInBagForItem(_CurrItemSheet, quantity, 0);
-
-						const char	*msg="BOTCHAT:BUY";
-						if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-						{
-							uint16 u16Index    = (uint16) _CurrItemIndex;
-							out.serial(u16Index);
-							out.serial(u16Quantity);
-							NetMngr.push(out);
-							//nlinfo("impulseCallBack sent: %s %d %d", msg, u16Index, u16Quantity);
-						}
-						else
-							nlwarning(" unknown message name '%s'", msg);
-
-						// If player has enough space in his bag...
-						if (isSpaceInBag)
-						{
-							// If the Buy is from a Player item or User item (retire) localy delete it
-							if (_BuyMean == Money && _CurrItemSheet->getItemSellerType()!=BOTCHATTYPE::NPC)
-							{
-								// if item stackable, the player was allowed to buy only a subset
-								if(_QuantityEdit)
-								{
-									sint32	curQuantity= _CurrItemSheet->getQuantity();
-									if(u16Quantity<curQuantity)
-										// lower the quantity
-										_CurrItemSheet->setQuantity(curQuantity-u16Quantity);
-									else
-										// hide the item
-										_CurrItemSheet->setSheetId(0);
-								}
-								else
-								{
-									// hide the item
-									_CurrItemSheet->setSheetId(0);
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					const char	*msg="BOTCHAT:SELL";
-					NLMISC::CBitMemStream out;
-					if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-					{
-						uint8 u8Inv = (uint8) _CurrItemInventory;
-						uint16 u16Index = (uint16) _CurrItemIndex;
-						uint32 u32resalePrice = (uint32)max((sint32)0, resalePrice);
-						out.serial(u8Inv);
-						out.serial(u16Index);
-						out.serial(u16Quantity);
-						out.serial(u32resalePrice);
-						NetMngr.push(out);
-						//nlinfo("impulseCallBack sent: %s %d %d %d %d", msg, u8Inv, u16Index, u16Quantity, u32resalePrice);
-					}
-					else
-						nlwarning(" unknown message name '%s'", msg);
-
-					// Write the value of the resale margin to the persistant database
-					if ( _ResaleEdit )
-					{
-						CInterfaceManager *pIM = CInterfaceManager::getInstance();
-						CInterfaceGroup *ig = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-						if (ig)
-						{
-							CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:resell_group:can_resell:choose_resell:edit:eb"));
-							if (eb)
-							{
-								NLGUI::CDBManager::getInstance()->getDbProp( "UI:SAVE:TRADE_ITEM:RESALE_MARGIN" )->setValue32( eb->getInputStringAsInt() );
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// get itemSheet before _CurrItemSheet set to NULL in endTradeModal()
-	const CItemSheet *itemSheet = _CurrItemSheet->asItemSheet();
-
-	// close modal dialog
-	endTradeModal();
-
-	// Close all if its a guild option
-	if (itemSheet && itemSheet->Family == ITEMFAMILY::GUILD_OPTION)
-		CBotChatManager::getInstance()->endDialog();
-
-}
-
-// ***************************************************************************************
-void CBotChatPageTrade::cancelTrade()
-{
-	// remove infos waiter (if not already canceled)
-	if (_CurrItemSheet)
-	{
-		// Add the waiter only if really needed (not for raw materials)
-		const CItemSheet	*itemSheet= _CurrItemSheet->asItemSheet();
-		if(itemSheet && itemSheet->Family != ITEMFAMILY::RAW_MATERIAL )
-			getInventory().removeItemInfoWaiter(&InfoWindowUpdater);
-	}
-	//
-	_BuyDlgOn  = false;
-	_SellDlgOn = false;
-	_ResaleEdit = false;
-	_QuantityEdit = false;
-	_UsePriceRetire = false;
-	_CannotValidateBecauseRetireNotAvailable = false;
-	_QuantityCheck = 0;
-	_CurrItemSheet = NULL;
-	_CurrItemCheck.reset();
-}
-
-// ***************************************************************************
-sint32 CBotChatPageTrade::getSkillPointUsedForCurrentRoleMaster() const
-{
-	// get the current phrase rolemaster type
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	uint	rmt= NLGUI::CDBManager::getInstance()->getDbProp("SERVER:BOTCHAT:ROLEMASTER_TYPE")->getValue32();
-	// get the prop (use local for less lag)
-	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(toString("LOCAL:USER:SKILL_POINTS_%d:VALUE", rmt), false);
-	if(node)
-		return node->getValue32();
-	else
-		return 0;
-}
-
-
-// ***************************************************************************
-void	CBotChatPageTrade::addSkillPointForCurrentRoleMaster(sint32 addValue) const
-{
-	// get the current phrase rolemaster type
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	uint	rmt= NLGUI::CDBManager::getInstance()->getDbProp("SERVER:BOTCHAT:ROLEMASTER_TYPE")->getValue32();
-	// add the local prop !!
-	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(toString("LOCAL:USER:SKILL_POINTS_%d:VALUE", rmt), false);
-	if(node)
-	{
-		node->setValue32(node->getValue32() + addValue);
-	}
-}
-
-
-
-// ***************************************************************************
-uint	CBotChatPageTrade::initQuantityMode(bool sellMode, CDBCtrlSheet *sheet)
-{
-	nlassert(sheet);
-
-	// default
-	_QuantityEdit= false;
-	_QuantityCheck = 0;
-	uint	defaultQuantity= 0;
-
-	// Quantity only for some items
-	const CItemSheet	*pIS= sheet->asItemSheet();
-	if( pIS && (pIS->Stackable>1 || pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) && pIS->Family!=ITEMFAMILY::TELEPORT )
-	{
-		// if sell, init quantity with the whole inventory stack
-		if(sellMode)
-		{
-			defaultQuantity= std::max((sint32) 1, sheet->getQuantity());
-			_QuantityCheck= defaultQuantity;
-		}
-		// else
-		else
-		{
-			// Depends on SellerType: If NPC, set 1 by default
-			if(sheet->getItemSellerType() == BOTCHATTYPE::NPC)
-			{
-				defaultQuantity= 1;
-				// no quantity check cause infinite
-				_QuantityCheck= 0;
-			}
-			// else set the whole stack (player or user resale)
-			else
-			{
-				defaultQuantity= std::max((sint32) 1, sheet->getQuantity());
-				_QuantityCheck= defaultQuantity;
-			}
-		}
-
-		// edit ok!
-		_QuantityEdit= true;
-	}
-
-	return defaultQuantity;
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::setupPriceGroupQuantity(CInterfaceGroup *priceGroup, sint32 defaultQuantity)
-{
-	// if window not found, quit
-	if(!priceGroup)
-		return;
-
-	// If don't want to enable quantity
-	if(!_QuantityEdit)
-	{
-		// hide elements and headers
-		CInterfaceGroup *quantityGroup = priceGroup->getGroup("quantity");
-		if (quantityGroup)	quantityGroup->setActive(false);
-		CViewBase *elt = priceGroup->getView("quantity_header");
-		if ( elt ) elt->setActive(false);
-		elt = priceGroup->getGroup("unit_price");
-		if ( elt ) elt->setActive(false);
-		elt = priceGroup->getView("unit_price_header");
-		if ( elt ) elt->setActive(false);
-	}
-	else
-	{
-		// show elements and header
-		CInterfaceGroup *quantityGroup = priceGroup->getGroup("quantity");
-		if (quantityGroup)	quantityGroup->setActive(true);
-		CViewBase *elt = priceGroup->getView("quantity_header");
-		if ( elt ) elt->setActive(true);
-		elt = priceGroup->getGroup("unit_price");
-		if ( elt ) elt->setActive(true);
-		elt = priceGroup->getView("unit_price_header");
-		if ( elt ) elt->setActive(true);
-
-		// setup the quantity in the edit box
-		if(quantityGroup)
-		{
-			// NB: some group don't have an edit box (just a replication of quantity)
-			CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(quantityGroup->getGroup("edit:eb"));
-			if (eb)
-			{
-				eb->setInputString(toString(defaultQuantity));
-			}
-		}
-	}
-
-
-}
-
-
-// ***************************************************************************
-void	CBotChatPageTrade::setupResellGroup(bool sellMode, uint defaultQuantity, CInterfaceGroup *parentGroup, CDBCtrlSheet *sheet)
-{
-	nlassert(sheet);
-
-	// default
-	_ResaleEdit= false;
-
-	// if window not found, quit
-	if(!parentGroup)
-		return;
-
-	// must be a sell, must be an item, and must be in a standard BuyMean, also must be a ressellable item
-	CInterfaceGroup *resellGroup = parentGroup->getGroup("resell_group");
-	if ( ! resellGroup )
-		return;
-
-	// Yoyo: can resell only on a "money only" reseler
-	const CItemSheet	*pIS= sheet->asItemSheet();
-	bool	resellable= sellMode && pIS && _BuyMean == Money && ITEMFAMILY::isResellable(pIS->Family) ;
-	// also cannot resell Raw Material that don't have any item part (formula materials, because cannot filter them)
-	if(pIS && pIS->Family==ITEMFAMILY::RAW_MATERIAL && !pIS->canBuildSomeItemPart())
-		resellable= false;
-
-	// cannot resell?
-	if( !resellable )
-	{
-		// hide
-		if ( resellGroup ) resellGroup->setActive(false);
-		CCtrlBase *confirmResellGroup = parentGroup->getCtrl("confirm_trade_resell");
-		if ( confirmResellGroup ) confirmResellGroup->setActive(false);
-		_ResaleEdit = false;
-	}
-	else
-	{
-		// show
-		if ( resellGroup ) resellGroup->setActive(true);
-
-		// get sub elements
-		CInterfaceGroup		*canResellGroup= resellGroup->getGroup("can_resell");
-		CInterfaceGroup		*cantResellGroup= resellGroup->getGroup("cant_resell");
-		CInterfaceGroup		*chooseResellGroup= resellGroup->getGroup("can_resell:choose_resell");
-		CCtrlBase			*confirmResellGroup = parentGroup->getCtrl("confirm_trade_resell");
-		if(!canResellGroup || !cantResellGroup || !chooseResellGroup || !confirmResellGroup)
-		{
-			nlwarning("XML error, cannot setup resale");
-			resellGroup->setActive(false);
-			_ResaleEdit = false;
-			return;
-		}
-
-		// Get item state
-		string	baseDB= sheet->getSheet();
-		BOTCHATTYPE::TBotChatResaleFlag		resaleFlag= (BOTCHATTYPE::TBotChatResaleFlag)sheet->getItemResaleFlag();
-//		sint	basePrice = sint(sheet->getItemPrice() * _FamePriceFactorLeaf->getValue16()/10000.0f);
-
-		// if cannot resell this item, setup "cant_resell group"
-		if(resaleFlag!=BOTCHATTYPE::ResaleOk)
-		{
-			canResellGroup->setActive(false);
-			confirmResellGroup->setActive(false);
-			cantResellGroup->setActive(true);
-			// resale is not possible!
-			_ResaleEdit = false;
-
-			// setup the reason
-			CViewText *vt= dynamic_cast<CViewText*>(cantResellGroup->getView("reason"));
-			if(vt)
-			{
-				if(resaleFlag == BOTCHATTYPE::ResaleKOBroken)
-					vt->setHardText("uiCantResaleCauseDamaged");
-				else if (resaleFlag == BOTCHATTYPE::ResaleKONoTimeLeft)
-					vt->setHardText("uiCantResaleCauseTooLate");
-				else
-					vt->setHardText("uiCantResaleLockedByOwner");
-			}
-		}
-		// else setup "can_resell:choose_resell group"
-		else
-		{
-			canResellGroup->setActive(true);
-			confirmResellGroup->setActive(true);
-			cantResellGroup->setActive(false);
-			// resale is possible!
-			_ResaleEdit = true;
-
-			// setup the quantity of the "choose resell" group
-			setupPriceGroupQuantity(chooseResellGroup, defaultQuantity);
-
-			// setup resale margin using value stored in database
-			CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(chooseResellGroup->getGroup("edit:eb"));
-			if (eb)
-			{
-				sint32	resaleMargin= NLGUI::CDBManager::getInstance()->getDbProp( "UI:SAVE:TRADE_ITEM:RESALE_MARGIN" )->getValue32();
-				clamp(resaleMargin, 0, (sint32)MaxResaleMargin);
-				eb->setInputString( toString( resaleMargin ) );
-				eb->setPositiveIntegerMaxValue(MaxResaleMargin);
-			}
-		}
-	}
-}
-
-
-// ***************************************************************************
-void	CBotChatPageTrade::setupEditFocus(CInterfaceGroup *parentGroup)
-{
-	// TODODO: edit box in faction points?
-	// if Quantity edited, always start focus in quantity edit box
-	if(_QuantityEdit)
-	{
-		nlassert(parentGroup);
-
-		CGroupEditBox	*eb= dynamic_cast<CGroupEditBox*>(parentGroup->getGroup("standard_price:quantity:edit:eb"));
-		if(eb)
-		{
-			// set focus
-			setFocusOnEditBox(eb);
-		}
-	}
-}
-
-
-// ***************************************************************************
-void	CBotChatPageTrade::setupPriceOrPriceRetire(bool sellMode, CDBCtrlSheet *sheet)
-{
-	nlassert(sheet);
-
-	// default
-	_UsePriceRetire= false;
-	_CannotValidateBecauseRetireNotAvailable= false;
-
-	// must be a buy, must be an item, and must be in a standard BuyMean
-	const CItemSheet	*pIS= sheet->asItemSheet();
-	if( !sellMode && pIS && _BuyMean == Money )
-	{
-		// test SELLER_TYPE. if User or ResaleAndUser, then this item belongs to us
-		// => just pay the PRICE_RETIRE, not the Full Price
-		sint32	st= sheet->getItemSellerType();
-		if( st==BOTCHATTYPE::UserRetirable || st==BOTCHATTYPE::ResaleAndUserRetirable ||
-			st==BOTCHATTYPE::User || st==BOTCHATTYPE::ResaleAndUser )
-		{
-			_UsePriceRetire= true;
-			// if not retirable, can't validate
-			if(st==BOTCHATTYPE::User || st==BOTCHATTYPE::ResaleAndUser)
-				_CannotValidateBecauseRetireNotAvailable= true;
-		}
-
-		// Check that we can take cosmetic that cannot be applied to the player
-		if (pIS->Family == ITEMFAMILY::COSMETIC)
-		{
-			EGSPD::CPeople::TPeople people = ITEM_ORIGIN::itemOriginStringToPeopleEnum( ITEM_ORIGIN::enumToString( pIS->ItemOrigin ) );
-			if (UserEntity->getGender() != pIS->Cosmetic.Gender || UserEntity->people() != people )
-				_CannotValidateBecauseRetireNotAvailable= true;
-		}
-	}
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::setupFactionPointPrice(bool /* sellMode */, uint defaultQuantity, CInterfaceGroup *parentGroup, CDBCtrlSheet *sheet)
-{
-	nlassert(sheet);
-
-	// if window not found, quit
-	if(!parentGroup)
-		return;
-
-	// get the faction point cost and type
-	CInterfaceGroup	*fpGroup= parentGroup->getGroup("faction_price");
-	CViewBase *upView= parentGroup->getView("standard_price:unit_price_header");
-	CInterfaceGroup *upGroup= parentGroup->getGroup("standard_price:unit_price");
-
-	if(!fpGroup || !upView || !upGroup)
-		return;
-
-	// get the current faction point cost and type
-	PVP_CLAN::TPVPClan	fpType;
-	uint32				fpCost;
-	getItemFactionTypePoints(sheet, fpType, fpCost);
-	if(fpCost==0 || fpType==PVP_CLAN::None)
-	{
-		// disable faction price group
-		fpGroup->setActive(false);
-		upView->setActive(true);
-		upGroup->setActive(true);
-	}
-	else
-	{
-
-		//Disable Price
-		upView->setActive(false);
-		upGroup->setActive(false);
-
-		// enable faction price gropu
-		fpGroup->setActive(true);
-
-		// Setup quantity view in this group
-		setupPriceGroupQuantity(fpGroup, defaultQuantity);
-
-		// setup faction name according to pvp clan
-		string		factionName= PVP_CLAN::toString(fpType);
-		CViewText	*vt= dynamic_cast<CViewText*>(fpGroup->getView("unit_price_header"));
-		if(vt)
-		{
-			ucstring	fmt= CI18N::get("uiUnitFPPrice");
-			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt);
-		}
-		vt= dynamic_cast<CViewText*>(fpGroup->getView("total_price_header"));
-		if(vt)
-		{
-			ucstring	fmt= CI18N::get("uiTotalFPPrice");
-			strFindReplace(fmt, "%fac", factionName);
-			vt->setText(fmt);
-		}
-
-		// setup icon according to pvp clan
-		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-		factionName = NLMISC::toLower(factionName);
-		string	factionIcon= CWidgetManager::getInstance()->getParser()->getDefine(toString("faction_icon_%s", factionName.c_str()));
-		CViewBitmap		*vBmp= dynamic_cast<CViewBitmap*>(fpGroup->getView("unit_price:item_price:icone"));
-		if(vBmp)	vBmp->setTexture(factionIcon);
-		vBmp= dynamic_cast<CViewBitmap*>(fpGroup->getView("total_price:item_price:icone"));
-		if(vBmp)	vBmp->setTexture(factionIcon);
-	}
-
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::startChangeBuyFilterDialog(const std::string &dbext, const std::string &title, uint32 maxValue)
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	_FilterBuyDlgDBExt= dbext;
-	_FilterBuyDlgMaxValue= maxValue;
-
-	// change the title
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER));
-	if(!ig)	return;
-	CViewText	*vtitle= dynamic_cast<CViewText*>(ig->getView("title"));
-	if(vtitle)
-		vtitle->setHardText(title);
-
-	// init min and max edit box
-	CGroupEditBox	*edMin = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_min:eb"));
-	CGroupEditBox	*edMax = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_max:eb"));
-	CCDBNodeLeaf	*dbRangeMin= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_") + _FilterBuyDlgDBExt, false);
-	CCDBNodeLeaf	*dbRangeMax= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_") + _FilterBuyDlgDBExt, false);
-	sint	rangeMin= 0;
-	sint	rangeMax= 0;
-	if(dbRangeMin)	rangeMin= dbRangeMin->getValue32();
-	if(dbRangeMax)	rangeMax= dbRangeMax->getValue32();
-	if(edMin)	edMin->setInputString(toString(rangeMin));
-	if(edMax)	edMax->setInputString(toString(rangeMax));
-	if(edMin)	edMin->setPositiveIntegerMaxValue(maxValue);
-	if(edMax)	edMax->setPositiveIntegerMaxValue(maxValue);
-
-	// set focus on MIN edit box
-	setFocusOnEditBox(ig->getGroup("edit_min:eb"));
-
-	// go
-	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::resetBuyFilterDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// get the modal window
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER));
-	if(!ig)	return;
-
-	// reset the edited values
-	CGroupEditBox	*edMin = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_min:eb"));
-	CGroupEditBox	*edMax = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_max:eb"));
-	CCDBNodeLeaf	*dbRangeMin= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_") + _FilterBuyDlgDBExt, false);
-	CCDBNodeLeaf	*dbRangeMax= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_") + _FilterBuyDlgDBExt, false);
-	sint	rangeMin= 0;
-	sint	rangeMax= _FilterBuyDlgMaxValue;
-	// write result in EditBox, and in db
-	if(edMin)	edMin->setInputString(toString(rangeMin));
-	if(edMax)	edMax->setInputString(toString(rangeMax));
-	if(dbRangeMin)	dbRangeMin->setValue32(rangeMin);
-	if(dbRangeMax)	dbRangeMax->setValue32(rangeMax);
-
-	// reset validate also the filter (as in confirm)
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::confirmChangeBuyFilterDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// get the modal window
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER));
-	if(!ig)	return;
-
-	// retrieve the edited values
-	CGroupEditBox	*edMin = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_min:eb"));
-	CGroupEditBox	*edMax = dynamic_cast<CGroupEditBox *>(ig->getGroup("edit_max:eb"));
-	CCDBNodeLeaf	*dbRangeMin= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_") + _FilterBuyDlgDBExt, false);
-	CCDBNodeLeaf	*dbRangeMax= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_") + _FilterBuyDlgDBExt, false);
-	sint	rangeMin= 0;
-	sint	rangeMax= 0;
-	if(edMin)	rangeMin= edMin->getInputStringAsInt();
-	if(edMax)	rangeMax= edMax->getInputStringAsInt();
-	// only positive values are posssible here
-	rangeMin= max(0, rangeMin);
-	rangeMax= max(rangeMin, rangeMax);
-
-	// write result in DB
-	if(dbRangeMin)	dbRangeMin->setValue32(rangeMin);
-	if(dbRangeMax)	dbRangeMax->setValue32(rangeMax);
-
-	// Then send new filter to Server, and reset item list
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::giveFocusToMaxEBChangeBuyFilterDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// get the modal window
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER));
-	if(!ig)	return;
-
-	// set focus on max
-	setFocusOnEditBox(ig->getGroup("edit_max:eb"));
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::startChangeBuyFilterMPDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// show the modal
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER_MP));
-	if(!ig)	return;
-
-	// go
-	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
-{
-	ft= min(ft, (uint)RM_FABER_TYPE::Unknown);
-
-	// set ItemPart DB
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	CCDBNodeLeaf	*dbItemPart= NLGUI::CDBManager::getInstance()->getDbProp(string(DB_BOT_CHAT_BASE_BUY_FILTER":MP_ITEM_PART"), false);
-	if(dbItemPart)	dbItemPart->setValue32(ft);
-
-	// Then send new filter to Server, and reset item list
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::resetItemPartAndTypeFilters()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	CCDBNodeLeaf	*dbItemPart= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MP_ITEM_PART" , false);
-	CCDBNodeLeaf	*dbItemType= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":ITEM_TYPE" , false);
-
-	if(dbItemPart)	dbItemPart->setValue32(RM_FABER_TYPE::Unknown);
-	if(dbItemType)	dbItemType->setValue32(ITEM_TYPE::UNDEFINED);
-}
-
-// ***************************************************************************
-void	CBotChatPageTrade::sendCurrentBuyFilterToServer(bool resetBuyList)
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// **** retrieve current DB values
-	CCDBNodeLeaf	*dbQualityMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_QUALITY" , false);
-	CCDBNodeLeaf	*dbQualityMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_QUALITY" , false);
-	CCDBNodeLeaf	*dbPriceMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_PRICE" , false);
-	CCDBNodeLeaf	*dbPriceMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_PRICE" , false);
-	CCDBNodeLeaf	*dbClassMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_CLASS" , false);
-	CCDBNodeLeaf	*dbClassMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_CLASS" , false);
-	CCDBNodeLeaf	*dbItemPart= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MP_ITEM_PART" , false);
-	CCDBNodeLeaf	*dbItemType= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":ITEM_TYPE" , false);
-
-	uint32			qualityMin=0, qualityMax=0;
-	uint32			priceMin=0, priceMax=0;
-	uint8			classMin= 0, classMax= RM_CLASS_TYPE::NumTRMClassType-1;	// max class is 4
-	// Yoyo: XML is hardcoded for max_class==4. (config.xml and bot_chat_v4.xml)
-	nlctassert(RM_CLASS_TYPE::NumTRMClassType-1==4);
-	uint8			itemPart= RM_FABER_TYPE::Unknown;
-	uint8			itemType= ITEM_TYPE::UNDEFINED;
-	if(dbQualityMin)	qualityMin= dbQualityMin->getValue32();
-	if(dbQualityMax)	qualityMax= dbQualityMax->getValue32();
-	if(dbPriceMin)		priceMin= dbPriceMin->getValue32();
-	if(dbPriceMax)		priceMax= dbPriceMax->getValue32();
-	if(dbClassMin)		classMin= (uint8)dbClassMin->getValue32();
-	if(dbClassMax)		classMax= (uint8)dbClassMax->getValue32();
-	if(dbItemPart)		itemPart= (uint8)dbItemPart->getValue32();
-	if(dbItemType)		itemType= (uint8)dbItemType->getValue32();
-
-	// **** send msg
-	const char *msg="BOTCHAT:SET_FILTERS";
-	NLMISC::CBitMemStream out;
-	if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-	{
-		out.serial(qualityMin);
-		out.serial(qualityMax);
-		out.serial(priceMin);
-		out.serial(priceMax);
-		out.serial(classMin);
-		out.serial(classMax);
-		out.serial(itemPart);
-		out.serial(itemType);
-		NetMngr.push(out);
-		//nlinfo("impulseCallBack sent: %s %d %d %d %d %d %d %d %d", msg, qualityMin, qualityMax, priceMin, priceMax, classMin, classMax, itemPart, itemType);
-	}
-	else
-		nlwarning(" unknown message name '%s'", msg);
-
-
-	// **** Server has incremented SessionId, do it on our side
-	// increment session id on our side
-	CBotChatManager::getInstance()->incrementSessionID();
-
-	// and reset hugeListObs
-	if(resetBuyList)
-	{
-		// Start the HugeList
-		_TradePagesObs.start();
-
-		// update interface
-		CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
-		if (gc)
-		{
-			// unselect just buy list (don't need for sell)
-			unselectBuyList(gc);
-		}
-	}
-
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::unselectBuyList(CGroupContainer *gc)
-{
-	CInterfaceGroup *buyGroup = gc->getGroup("buy");
-	if (buyGroup)
-	{
-		// unselect NPC/Player group
-		CDBGroupListSheetText *buyListSheet = dynamic_cast<CDBGroupListSheetText *>(buyGroup->getGroup("general_buy"));
-		if (buyListSheet)
-			buyListSheet->unselect();
-		// unselect Player group
-		buyListSheet = dynamic_cast<CDBGroupListSheetText *>(buyGroup->getGroup("player_buy"));
-		if (buyListSheet)
-			buyListSheet->unselect();
-	}
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::unselectSellList(CGroupContainer *gc)
-{
-	CInterfaceGroup *sellGroup = gc->getGroup("sell");
-	if (sellGroup)
-	{
-		// unselect the bag
-		CDBGroupListSheetText *sellListSheet = dynamic_cast<CDBGroupListSheetText *>(sellGroup->getGroup("bag_sell"));
-		if (sellListSheet)
-			sellListSheet->unselect();
-		// unselect all pack animals
-		for(uint i=0;i<MAX_INVENTORY_ANIMAL;i++)
-		{
-			sellListSheet = dynamic_cast<CDBGroupListSheetText *>(sellGroup->getGroup(toString("beast%d_sell", i)));
-			if (sellListSheet)
-				sellListSheet->unselect();
-		}
-	}
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::refreshResale()
-{
-	// **** send msg
-	const char *msg="BOTCHAT:REFRESH_TRADE_LIST";
-	NLMISC::CBitMemStream out;
-	if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-	{
-		NetMngr.push(out);
-		//nlinfo("impulseCallBack sent: %s", msg);
-	}
-	else
-		nlwarning(" unknown message name '%s'", msg);
-
-
-	// **** Server has incremented SessionId, do it on our side
-	// increment session id on our side
-	CBotChatManager::getInstance()->incrementSessionID();
-
-	// and reset hugeListObs
-	{
-		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-		// Start the HugeList
-		_TradePagesObs.start();
-
-		// update interface
-		CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(_BuyOnly ? WIN_BOT_CHAT_PAGE_BUY : WIN_BOT_CHAT_PAGE_TRADE));
-		if (gc)
-		{
-			// unselect just buy list (don't need for sell)
-			unselectBuyList(gc);
-		}
-	}
-}
-
-
-// ***************************************************************************
-void		CBotChatPageTrade::startChangeBuyFilterClassDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// Copy from save to Temp edition
-	CCDBNodeLeaf	*dbClassMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_CLASS" , false);
-	CCDBNodeLeaf	*dbClassMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_CLASS" , false);
-	CCDBNodeLeaf	*tempClassMin= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MIN_CLASS");
-	CCDBNodeLeaf	*tempClassMax= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MAX_CLASS");
-	if(dbClassMin) tempClassMin->setValue32(dbClassMin->getValue32());
-	if(dbClassMax) tempClassMax->setValue32(dbClassMax->getValue32());
-
-	// show the modal
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER_CLASS));
-	if(!ig)	return;
-
-	// go
-	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
-}
-
-
-// ***************************************************************************
-void		CBotChatPageTrade::resetBuyFilterClassDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// Copy from save to Temp edition
-	CCDBNodeLeaf	*dbClassMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_CLASS" , false);
-	CCDBNodeLeaf	*dbClassMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_CLASS" , false);
-	CCDBNodeLeaf	*tempClassMin= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MIN_CLASS");
-	CCDBNodeLeaf	*tempClassMax= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MAX_CLASS");
-	// write in both DB
-	tempClassMin->setValue32(0);
-	tempClassMax->setValue32(RM_CLASS_TYPE::NumTRMClassType-1);
-	if(dbClassMin) dbClassMin->setValue32(0);
-	if(dbClassMax) dbClassMax->setValue32(RM_CLASS_TYPE::NumTRMClassType-1);
-
-	// Reset also validate the filter, commit
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::confirmChangeBuyFilterClassDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// Copy from temp edit to final
-	CCDBNodeLeaf	*dbClassMin= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MIN_CLASS" , false);
-	CCDBNodeLeaf	*dbClassMax= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":MAX_CLASS" , false);
-	CCDBNodeLeaf	*tempClassMin= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MIN_CLASS");
-	CCDBNodeLeaf	*tempClassMax= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:BOTCHAT:TEMP_FILTER_MAX_CLASS");
-	sint	minClass= tempClassMin->getValue32();
-	sint	maxClass= tempClassMax->getValue32();
-	// min must be => 0 and max must be >= min
-	minClass= max(minClass, 0);
-	maxClass= max(minClass, maxClass);
-	if(dbClassMin) dbClassMin->setValue32(minClass);
-	if(dbClassMax) dbClassMax->setValue32(maxClass);
-
-	// Then send new filter to Server, and reset item list
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-
-// ***************************************************************************
-std::string	CBotChatPageTrade::getItemSheetNameForItemType(ITEM_TYPE::TItemType it)
-{
-	// The definition is in .xml
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	string	itemTypeDef= "item_type_to_item_sheet_";
-	itemTypeDef+= ITEM_TYPE::toString(it);
-
-	// return empty string if not found
-	return CWidgetManager::getInstance()->getParser()->getDefine(itemTypeDef);
-}
-
-
-// ***************************************************************************
-void		CBotChatPageTrade::startChangeBuyFilterItemTypeDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// the list of possible item type to select is filled when the DB of bitfield change
-
-	// show the modal
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_CHANGE_BUY_FILTER_ITEM_TYPE));
-	if(!ig)	return;
-
-	// go
-	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::confirmChangeBuyFilterItemTypeDialog(ITEM_TYPE::TItemType itemType)
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	// Copy result to final DB
-	CCDBNodeLeaf	*dbItemType= NLGUI::CDBManager::getInstance()->getDbProp(DB_BOT_CHAT_BASE_BUY_FILTER":ITEM_TYPE" , false);
-	if(dbItemType) dbItemType->setValue32(itemType);
-
-	// Then send new filter to Server, and reset item list
-	sendCurrentBuyFilterToServer(true);
-
-	// and leave modal
-	CWidgetManager::getInstance()->disableModalWindow();
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::startDestroyItemDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	if(!_CurrItemSheet)
-		return;
-
-	// setup the quantity to destroy (if edited correctly)
-	uint32	quantity= getCurrItemQuantity();
-	if(quantity==0 || quantity==std::numeric_limits<uint32>::max())
-		return;
-	// if quantity check, maximize with it (if user entered to big value...)
-	if(_QuantityCheck)
-		quantity= min(quantity, (uint32)_QuantityCheck);
-	// set view
-	NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:DESTROY_QUANTITY")->setValue32(quantity);
-
-	// show the modal
-	CInterfaceGroup		*ig= dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_DESTROY_ITEM));
-	if(!ig)	return;
-	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
-}
-
-// ***************************************************************************
-void		CBotChatPageTrade::confirmDestroyItemDialog()
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-	if(!_CurrItemSheet)
-		return;
-
-	// get the quantity destroyed
-	uint32	quantity= getCurrItemQuantity();
-	// if correct quantity
-	if(quantity!=0 && quantity!=std::numeric_limits<uint32>::max())
-	{
-		// if quantity check, maximize with it (if user entered too big value...)
-		if(_QuantityCheck)
-			quantity= min(quantity, (uint32)_QuantityCheck);
-
-		// **** then send msg to server
-		uint16	u16Index    = (uint16) _CurrItemIndex;
-		uint16	u16Quantity	= (uint16) quantity;
-
-		const char *msg="BOTCHAT:DESTROY_ITEM";
-		NLMISC::CBitMemStream out;
-		if(GenericMsgHeaderMngr.pushNameToStream(msg, out))
-		{
-			out.serial(u16Index);
-			out.serial(u16Quantity);
-			NetMngr.push(out);
-			//nlinfo("impulseCallBack sent: %s %d %d", msg, u16Index, u16Quantity);
-		}
-		else
-			nlwarning(" unknown message name '%s'", msg);
-
-
-		// **** destroy localy
-		// if item stackable, the player was allowed to destroy only a subset
-		if(_QuantityEdit)
-		{
-			sint32	curQuantity= _CurrItemSheet->getQuantity();
-			if(u16Quantity<curQuantity)
-				// lower the quantity
-				_CurrItemSheet->setQuantity(curQuantity-u16Quantity);
-			else
-				// hide the item
-				_CurrItemSheet->setSheetId(0);
-		}
-		else
-		{
-			// hide the item
-			_CurrItemSheet->setSheetId(0);
-		}
-	}
-
-	// in all cases, close the modal
-	CWidgetManager::getInstance()->disableModalWindow();
-
-	// if the quantity entered was correct
-	if(quantity!=0 && quantity!=std::numeric_limits<uint32>::max())
-	{
-		// close also the container modal
-		endTradeModal();
-	}
-
-}
-
-
-/////////////////////
-// ACTION HANDLERS //
-/////////////////////
-
-// ***************************************************************************************
-// the player has clicked on an item to buy it
-class CAHBuyItem : public IActionHandler
-{
-	virtual void execute (CCtrlBase *pCaller, const string &/* params */)
-	{
-		CDBCtrlSheet *sheet = dynamic_cast<CDBCtrlSheet *>(pCaller);
-		BotChatPageAll->Trade->startBuyDialog(sheet, pCaller);
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBuyItem, "buy_item");
-
-// ***************************************************************************************
-// the player has clicked on an item to sell it
-class CAHSellItem : public IActionHandler
-{
-	virtual void execute (CCtrlBase *pCaller, const string &/* params */)
-	{
-		CDBCtrlSheet *sheet = dynamic_cast<CDBCtrlSheet *>(pCaller);
-		BotChatPageAll->Trade->startSellDialog(sheet, pCaller);
-	}
-};
-REGISTER_ACTION_HANDLER(CAHSellItem, "sell_item");
-
-
-// ***************************************************************************************
-// confirm sell or buy item
-class CAHConfirmTrade : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &params)
-	{
-		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-		// parse resale param
-		bool enableResale;
-		uint resaleParam;
-		fromString(getParam(params, "resale"), resaleParam);
-		switch ( resaleParam )
-		{
-		case 0:		enableResale = false; break;
-		case 1:		enableResale = true; break;
-		default: // 2: comes only from Enter of Shift+Enter key from an edit box or in the modal window
-			{
-				const NLGUI::CEventDescriptorKey& keyEvent = CWidgetManager::getInstance()->getLastKeyEvent();
-				enableResale = ! keyEvent.getKeyShift();
-			}
-		}
-
-		// test if we need to confirm the buy?
-		bool	canTestConfirmation;
-		fromString(getParam(params, "noconfirm"), canTestConfirmation);
-		canTestConfirmation = !canTestConfirmation;
-		bool	mustConfirm= false;
-		if(canTestConfirmation)
-		{
-			// Building:
-			if(NLGUI::CDBManager::getInstance()->getDbValue32("SERVER:TRADING:BUILDING_LOSS_WARNING") == 1)
-				mustConfirm= true;
-		}
-
-		// don't confirm?
-		if(!mustConfirm)
-		{
-			if (BotChatPageAll->Trade->isTradeValid( enableResale ))
-				BotChatPageAll->Trade->confirmTrade( enableResale );
-		}
-		else
-		{
-			// need to ask user first. Important unexecpected consequence, so use a warning icon
-			pIM->validMessageBox(CInterfaceManager::WarningIconMsg, CI18N::get("uiQReplaceAppartment"),
-				"confirm_trade", toString("resale=%d|noconfirm=1", (uint)enableResale));
-		}
-	}
-};
-REGISTER_ACTION_HANDLER(CAHConfirmTrade, "confirm_trade");
-
-
-// ***************************************************************************************
-// Trade has been canceled
-class CAHCancelTrade : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->cancelTrade();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHCancelTrade, "cancel_trade");
-
-
-// ***************************************************************************
-// Request to Change the Min/Max of Price or quantity
-class CAHEnterChangeBotChatBuyFilter : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &params)
-	{
-		string dbext= getParam(params, "dbext");
-		string title= getParam(params, "title");
-		uint32 maxvalue;
-		fromString(getParam(params, "maxvalue"), maxvalue);
-		BotChatPageAll->Trade->startChangeBuyFilterDialog(dbext, title, maxvalue);
-	}
-};
-REGISTER_ACTION_HANDLER(CAHEnterChangeBotChatBuyFilter, "enter_change_botchat_buy_filter");
-
-
-// ***************************************************************************
-// Validate Change the Min/Max of Price or quantity
-class CAHConfirmChangeBotChatBuyFilter : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->confirmChangeBuyFilterDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHConfirmChangeBotChatBuyFilter ,"confirm_change_botchat_buy_filter");
-
-
-// ***************************************************************************
-// Reset the Min/Max of Price or quantity
-class CAHResetBotChatBuyFilter : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->resetBuyFilterDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHResetBotChatBuyFilter, "reset_botchat_buy_filter");
-
-
-// ***************************************************************************
-// Min EditBox validated, give focus to max EditBox.
-class CAHChangeBotChatBuyFilterGiveFocusToMax : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->giveFocusToMaxEBChangeBuyFilterDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHChangeBotChatBuyFilterGiveFocusToMax ,"change_botchat_buy_filter_give_focus_to_max");
-
-
-
-// ***************************************************************************
-// Request to Change the Min/Max of Price or quantity
-class CAHEnterChangeBotChatBuyFilterMP : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->startChangeBuyFilterMPDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHEnterChangeBotChatBuyFilterMP, "enter_change_botchat_buy_filter_mp");
-
-
-// ***************************************************************************
-// Validate Change the Min/Max of Price or quantity
-class CAHConfirmChangeBotChatBuyFilterMP : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const string &params)
-	{
-		BotChatPageAll->Trade->confirmChangeBuyFilterMPDialog(RM_FABER_TYPE::toFaberType(params));
-	}
-};
-REGISTER_ACTION_HANDLER(CAHConfirmChangeBotChatBuyFilterMP, "confirm_change_botchat_buy_filter_mp");
-
-
-// ***************************************************************************
-// Ask for Refresh of the User list
-class CAHBotChatRefreshResale : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->refreshResale();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBotChatRefreshResale, "botchat_refresh_resale");
-
-
-// ***************************************************************************
-// client requires change of Item Class bounds
-class CAHEnterChangeBotChatBuyFilterClass : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->startChangeBuyFilterClassDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHEnterChangeBotChatBuyFilterClass, "enter_change_botchat_buy_filter_class");
-
-
-// ***************************************************************************
-// client confirms change of Item Class bounds
-class CAHConfirmChangeBotChatBuyFilterClass : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->confirmChangeBuyFilterClassDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHConfirmChangeBotChatBuyFilterClass, "confirm_change_botchat_buy_filter_class");
-
-
-// ***************************************************************************
-// client confirms change of Item Class bounds
-class CAHResetBotChatBuyFilterClass : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
-	{
-		BotChatPageAll->Trade->resetBuyFilterClassDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHResetBotChatBuyFilterClass, "reset_botchat_buy_filter_class");
-
-
-// ***************************************************************************
-class CHandlerBotChatTTItemType : public IActionHandler
-{
-public:
-	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		// \todo yoyo: for now disable tooltip
-		CWidgetManager::getInstance()->setContextHelpText(ucstring());
-	}
-};
-REGISTER_ACTION_HANDLER(CHandlerBotChatTTItemType, "botchat_tt_item_type");
-
-
-// ***************************************************************************
-class CAHEnterChangeBotchatBuyFilterItemType : public IActionHandler
-{
-	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		BotChatPageAll->Trade->startChangeBuyFilterItemTypeDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHEnterChangeBotchatBuyFilterItemType, "enter_change_botchat_buy_filter_item_type");
-
-
-// ***************************************************************************
-class CAHConfirmChangeBotchatBuyFilterItemType : public IActionHandler
-{
-	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
-	{
-		ITEM_TYPE::TItemType	itemType= ITEM_TYPE::UNDEFINED;
-
-		// From the index of the ctrl sheet in DB, we can now the item type setuped
-		CDBCtrlSheet	*ctrlSheet= dynamic_cast<CDBCtrlSheet*>(pCaller);
-		if(ctrlSheet)
-		{
-			// if it is not the empty sheet (detect empty sheetId)
-			if(ctrlSheet->getSheetId())
-			{
-				sint	index= ctrlSheet->getIndexInDB();
-				if(index>=0 && index<ITEM_TYPE::UNDEFINED)
-					itemType= (ITEM_TYPE::TItemType)index;
-			}
-		}
-
-		// then change the filter
-		BotChatPageAll->Trade->confirmChangeBuyFilterItemTypeDialog(itemType);
-	}
-};
-REGISTER_ACTION_HANDLER(CAHConfirmChangeBotchatBuyFilterItemType, "confirm_change_botchat_buy_filter_item_type");
-
-// ***************************************************************************
-class CAHBotChatRefilItemTypeChoiceList : public IActionHandler
-{
-	void execute (CCtrlBase * /* pCaller */, const std::string &sParams)
-	{
-		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-		string	destDB= getParam(sParams, "dest");
-		string	srcDB= getParam(sParams, "src");
-		uint	offset;
-		fromString(getParam(sParams, "offset"), offset);
-
-		/* If ItemType grows too big, must change SERVER and CLIENT!!! because of ItemType bitfield system:
-			use SERVER:TRADING:ITEM_TYPE_SELLER_BITFILED_0_63 which is a 64 bits
-				SERVER:TRADING:ITEM_TYPE_SELLER_BITFILED_64_127 which is a 64 bits
-			(param offset gives which part of enum to use)
-		*/
-		nlctassert(ITEM_TYPE::UNDEFINED<=128);
-
-		// get the src bitfield
-		CCDBNodeLeaf	*nodeSrc= NLGUI::CDBManager::getInstance()->getDbProp(srcDB, false);
-		if(!nodeSrc)
-			return;
-		uint64	bfItemType= nodeSrc->getValue64();
-
-		// For all item type possible
-		for(uint i=0;i<64;i++)
-		{
-			bool present= ((bfItemType>>i)&1)!=0;
-			// get the dest node
-			CCDBNodeLeaf	*nodeDst= NLGUI::CDBManager::getInstance()->getDbProp(destDB+toString(":%d:SHEET", i+offset), false);
-			if(nodeDst)
-			{
-				if(present)
-				{
-					// get the item sheet id associated to this item type
-					CSheetId	sheetId;
-					sheetId.buildSheetId(CBotChatPageTrade::getItemSheetNameForItemType((ITEM_TYPE::TItemType)(i+offset)));
-					// and set it
-					nodeDst->setValue32(sheetId.asInt());
-				}
-				else
-				{
-					// reset (cannot select this item type)
-					nodeDst->setValue32(0);
-				}
-			}
-		}
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBotChatRefilItemTypeChoiceList, "botchat_refill_item_type_choice_list");
-
-
-// ***************************************************************************
-class CAHBotChatEnterDestroy : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		BotChatPageAll->Trade->startDestroyItemDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBotChatEnterDestroy, "botchat_enter_destroy");
-
-// ***************************************************************************
-class CAHBotChatConfirmDestroy : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		BotChatPageAll->Trade->confirmDestroyItemDialog();
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBotChatConfirmDestroy, "botchat_confirm_destroy");
-
-// ***************************************************************************
-class CAHBotChatChangeResaleMargin : public IActionHandler
-{
-	virtual void execute(CCtrlBase * /* pCaller */, const std::string &sParams)
-	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		CInterfaceGroup *ig = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(WIN_BOT_CHAT_SELL_BUY_ITEM));
-		if (!ig) return;
-		CGroupEditBox *resaleMarginBox = dynamic_cast<CGroupEditBox *>(ig->getGroup("header_opened:resell_group:can_resell:choose_resell:edit:eb"));
-		if (resaleMarginBox)
-		{
-			sint32 delta;
-			fromString(sParams, delta);
-			sint32 newValue = resaleMarginBox->getInputStringAsInt() + delta;
-			clamp(newValue, 0, (sint32)CBotChatPageTrade::MaxResaleMargin);
-			resaleMarginBox->setInputStringAsInt( newValue );
-		}
-	}
-};
-REGISTER_ACTION_HANDLER(CAHBotChatChangeResaleMargin, "change_resale_margin");
-
-// ***************************************************************************
-static DECLARE_INTERFACE_USER_FCT(getPriceWithFame)
-{
-	if (args.size() != 2) return false;
-	if (!args[0].toInteger()) return false;
-	if (!args[1].toInteger()) return false;
-
-	sint	value= (sint)args[0].getInteger();
-	sint	valueFame= (sint)args[1].getInteger();
-	if(value==-1)
-		result.setUCString(CI18N::get("uiBadPrice"));
-	else if(value==valueFame)
-		result.setUCString(NLMISC::formatThousands(toString(value)));
-	else
-		result.setUCString(NLMISC::formatThousands(toString(valueFame)) + " (" + NLMISC::formatThousands(toString(value)) + ")");
-
-	return true;
-}
-REGISTER_INTERFACE_USER_FCT("getPriceWithFame", getPriceWithFame)
-
-// ***************************************************************************
-static DECLARE_INTERFACE_USER_FCT(getBonusOnResale)
-{
-	if (args.size() != 2) return false;
-	if (!args[0].toInteger()) return false;
-	if (!args[1].toInteger()) return false;
-
-	sint	valueHigh= (sint)args[0].getInteger();
-	sint	valueLow= (sint)args[1].getInteger();
-	sint	diff = valueHigh - valueLow;
-	result.setUCString("+" + NLMISC::formatThousands(toString(diff)));
-
-	return true;
-}
-REGISTER_INTERFACE_USER_FCT("getBonusOnResale", getBonusOnResale)
-
-//////////////
-// COMMANDS //
-//////////////
-
-#if !FINAL_VERSION
-// TEMP TEMP TEMP
-
-NLMISC_COMMAND( testColorItems, "Temp : test some items to trade", "" )
-{
-	if (args.size() < 1) return false;
-	if (args.size() > 2) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	std::string itemName = "icfahv.sitem";
-	if (args.size() > 1)
-	{
-		itemName = args[1];
-	}
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(100);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:USER_COLOR")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:USER_COLOR")->setValue32(1);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:USER_COLOR")->setValue32(2);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SLOT_TYPE")->setValue32(0);//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:USER_COLOR")->setValue32(3);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(100);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:USER_COLOR")->setValue32(4);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:USER_COLOR")->setValue32(5);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:USER_COLOR")->setValue32(6);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId(itemName).asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:USER_COLOR")->setValue32(7);
-	//
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	//
-	return true;
-}
-
-
-NLMISC_COMMAND( testTradeItems, "Temp : test some items to trade", "" )
-{
-	if (args.size() != 1) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	//NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("icfm1bm.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("guild_main_building.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(100);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SLOT_TYPE")->setValue32(0);
-	//
-	//NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("icfm1bs.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("guild_rm_craft.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SLOT_TYPE")->setValue32(0);
-	//
-	//NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("icfm1pd.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("guild_rm_fight.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:NAMEID")->setValue32(8);
-	//
-	//NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("icfr2l.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("guild_rm_harvest.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SLOT_TYPE")->setValue32(0);//
-	//
-	//NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("ictr2b.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("guild_rm_magic.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(100);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId("icfp1pb.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId("icragt.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId("icmss.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SLOT_TYPE")->setValue32(0);
-	//
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	//
-	return true;
-}
-
-
-NLMISC_COMMAND( testTradeItems2, "Temp : test some items to trade (2)", "" )
-{
-	// item with faction points
-	if (args.size() != 1) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("icfm1bm.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(100);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:FACTION_TYPE")->setValue32(0);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(130);		// should result to none
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("icfm1bs.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:FACTION_TYPE")->setValue32(PVP_CLAN::Kami);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:FACTION_POINT_PRICE")->setValue32(0);		// should result to none
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("icfm1pd.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(10);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:NAMEID")->setValue32(8);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:FACTION_TYPE")->setValue32(PVP_CLAN::Kami);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:FACTION_POINT_PRICE")->setValue32(13);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("icfr2l.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SLOT_TYPE")->setValue32(0);//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:FACTION_TYPE")->setValue32(PVP_CLAN::Tryker);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:FACTION_POINT_PRICE")->setValue32(10);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("ictr2b.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:FACTION_TYPE")->setValue32(PVP_CLAN::Fyros);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:FACTION_POINT_PRICE")->setValue32(8);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId("icfp1pb.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:FACTION_TYPE")->setValue32(PVP_CLAN::Tryker);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:FACTION_POINT_PRICE")->setValue32(7);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId("icragt.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:FACTION_TYPE")->setValue32(PVP_CLAN::Karavan);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:FACTION_POINT_PRICE")->setValue32(1);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId("icmss.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SLOT_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:FACTION_TYPE")->setValue32(PVP_CLAN::Kami);
-//	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:FACTION_POINT_PRICE")->setValue32(1350);
-	//
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	//
-	return true;
-}
-
-NLMISC_COMMAND( testTradeItems3, "Temp : test some items to trade (3)", "" )
-{
-	// items
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:SHEET")->setValue32(CSheetId("fyros_buckler_lvl_01_05.item").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:SHEET")->setValue32(CSheetId("fyros_buckler_lvl_01_05.item").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:SHEET")->setValue32(CSheetId("fyros_buckler_lvl_01_05.item").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:SHEET")->setValue32(CSheetId("fyros_buckler_lvl_01_05.item").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:PRICE")->setValue32(200);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:QUALITY")->setValue32(25);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:SLOT_TYPE")->setValue32(0);
-
-	return true;
-}
-
-NLMISC_COMMAND( testTradeItems4, "Temp : test some items to trade (4)", "" )
-{
-	// pacts
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:SHEET")->setValue32(CSheetId("pacts.death_impact").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:0:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:SHEET")->setValue32(CSheetId("kami_pactes.death_impact").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:1:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:SHEET")->setValue32(CSheetId("karavan_pactes.death_impact").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:2:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:SHEET")->setValue32(CSheetId("kami_pactes.death_impact").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:QUALITY")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("LOCAL:TRADING:3:SLOT_TYPE")->setValue32(0);
-	//
-	return true;
-}
-
-
-NLMISC_COMMAND( testPhrases, "Temp : test some items to trade", "" )
-{
-	if (args.size() != 1) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("abfaimhame09.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(11);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("abfaimhcme07.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(22);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("abfaimhfme04.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(33);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("abfaimhfme08.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(44);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("abfma05.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(55);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SLOT_TYPE")->setValue32(0);
-
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId("abm_mt_ae_acid_00055.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(66);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId("abm_mt_heal_00140.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(77);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId("abm_mt_cannibalism_00020.sphrase").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(88);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SLOT_TYPE")->setValue32(0);
-	//
-
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:ROLEMASTER_FLAGS")->setValue32(0);
-
-	return true;
-}
-
-
-NLMISC_COMMAND( testResaleItems, "Temp : test resale", "" )
-{
-	if (args.size() < 1) return false;
-	uint	pageId;
-	fromString(args[0], pageId);
-	uint	pf= pageId+1;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("m0006dxajf01.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:QUALITY")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SELLER_TYPE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE_RETIRE")->setValue32(111);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:QUANTITY")->setValue32(62);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("icfm1bs.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(1*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:QUALITY")->setValue32(11);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SELLER_TYPE")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE_RETIRE")->setValue32(222);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:QUANTITY")->setValue32(1);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("icfm1pd.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(-1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:QUALITY")->setValue32(22);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:NAMEID")->setValue32(8);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SELLER_TYPE")->setValue32(2);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE_RETIRE")->setValue32(333);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:QUANTITY")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:RESALE_TIME_LEFT")->setValue32(10);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("icfr2l.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(3*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:QUALITY")->setValue32(33);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SELLER_TYPE")->setValue32(3);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE_RETIRE")->setValue32(444);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:QUANTITY")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:RESALE_TIME_LEFT")->setValue32(100);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("m0006dxajf01.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(4*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:QUALITY")->setValue32(44);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SELLER_TYPE")->setValue32(4);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE_RETIRE")->setValue32(555);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:QUANTITY")->setValue32(1);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId("icfp1pb.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(5*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:QUALITY")->setValue32(55);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SELLER_TYPE")->setValue32(5);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE_RETIRE")->setValue32(666);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:QUANTITY")->setValue32(23);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId("m0119dxajd01.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(6*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:QUALITY")->setValue32(66);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SELLER_TYPE")->setValue32(2);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE_RETIRE")->setValue32(777);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:QUANTITY")->setValue32(19);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:RESALE_TIME_LEFT")->setValue32(48);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId("icmss.sitem").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(7*pf);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:QUALITY")->setValue32(77);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SELLER_TYPE")->setValue32(5);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE_RETIRE")->setValue32(888);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:QUANTITY")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:RESALE_TIME_LEFT")->setValue32(10);
-
-
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(pageId);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	//
-
-	// Force for next page
-	IngameDbMngr.flushObserverCalls();
-	NLGUI::CDBManager::getInstance()->flushObserverCalls();
-
-	return true;
-}
-
-
-NLMISC_COMMAND( testClientPhrases, "", "" )
-{
-	if (args.size() != 3) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	fromString(args[1], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:ROLEMASTER_FLAGS")->setValue32(value);
-	fromString(args[2], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:ROLEMASTER_RACE")->setValue32(value);
-
-	return true;
-}
-
-
-NLMISC_COMMAND( testOutpostBuildings, "Temp : test some items to trade", "" )
-{
-	if (args.size() != 1) return false;
-	CInterfaceManager *im = CInterfaceManager::getInstance();
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SHEET")->setValue32(CSheetId("driller_bountybeaches_kami_u1_100a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:0:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SHEET")->setValue32(CSheetId("driller_citiesofintuition_kami_u2_50a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:1:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SHEET")->setValue32(CSheetId("driller_couloirbrule_kami_u2_150b.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:2:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SHEET")->setValue32(CSheetId("driller_bountybeaches_karavan_u1_100a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:3:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SHEET")->setValue32(CSheetId("driller_bountybeaches_karavan_u1_150a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:4:SLOT_TYPE")->setValue32(0);
-
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SHEET")->setValue32(CSheetId("driller_bountybeaches_karavan_u1_200a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:5:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SHEET")->setValue32(CSheetId("driller_bountybeaches_karavan_u2_100a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:6:SLOT_TYPE")->setValue32(0);
-	//
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SHEET")->setValue32(CSheetId("driller_bountybeaches_karavan_u2_150a.outpost_building").asInt());
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:PRICE")->setValue32(0);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:7:SLOT_TYPE")->setValue32(0);
-	//
-
-	sint32 value;
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:SESSION")->setValue32(CBotChatManager::getInstance()->getSessionID());
-	fromString(args[0], value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:PAGE_ID")->setValue32(value);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:HAS_NEXT")->setValue32(1);
-	NLGUI::CDBManager::getInstance()->getDbProp("SERVER:TRADING:ROLEMASTER_FLAGS")->setValue32(0);
-
-	return true;
-}
-
-
-
-
-#endif
-